I am starting to clean up the mess that is Global right now, and to implement a clean...

[quassel.git] / src / common / global.cpp

diff --git a/src/common/global.cpp b/src/common/global.cpp
index 3c82e81..eb4ee8f 100644 (file)
--- 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 <QObject>
+#include <QStringList>
 
 #include "global.h"
 #include "logger.h"
-#include "core.h"
 #include "message.h"
 #include "util.h"
 
-#include <QtCore>
-#include <QDomDocument>
-
 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);
 }