X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.cpp;h=eb4ee8f81759709aeab89ab5ca353512502bb7a7;hp=3c82e815daa8a55cdf00b1c69711ed0592dcd49a;hb=42ff71aaa8d3cee9e348a45758c56c380a4f1b45;hpb=077d44f36d2f5c730283ef6be839aea7dd073d56 diff --git a/src/common/global.cpp b/src/common/global.cpp index 3c82e815..eb4ee8f8 100644 --- a/src/common/global.cpp +++ b/src/common/global.cpp @@ -17,16 +17,14 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include +#include #include "global.h" #include "logger.h" -#include "core.h" #include "message.h" #include "util.h" -#include -#include - extern void messageHandler(QtMsgType type, const char *msg); Global *Global::instanceptr = 0; @@ -136,7 +134,7 @@ BufferId::BufferId(uint _id, QString _net, QString _buf, uint _gid) : id(_id), g } -QString BufferId::buffer() { +QString BufferId::buffer() const { if(isChannelName(buf)) return buf; else return nickFromMask(buf); }