From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 13 Feb 2012 19:52:25 +0000 (+0100)
Subject: Cleanups
X-Git-Tag: 0.8-beta1~9
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0a79f71c41f69643fdbf0c32c061f1b11d14346d;hp=9c15e81b15a20e861c707e240c2cfee56bdf4bc9

Cleanups
---

diff --git a/src/common/main.cpp b/src/common/main.cpp
index d0dde88a..24a71588 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -113,7 +113,7 @@ int main(int argc, char **argv) {
   cliParser->addSwitch("add-user", 0, "Starts an interactive session to add a new core user");
   cliParser->addOption("change-userpass <username>", 0, "Starts an interactive session to change the password of the user identified by username");
   cliParser->addSwitch("oidentd", 0, "Enable oidentd integration");
-  cliParser->addOption("oidentd-conffile <file>", 0, "change path to oidentd configuration file");
+  cliParser->addOption("oidentd-conffile <file>", 0, "Set path to oidentd configuration file");
 #endif
 
 #ifdef HAVE_KDE
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index a6d3f206..b6694247 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -24,7 +24,6 @@ set(SOURCES
     coreircuser.cpp
     corenetwork.cpp
     corenetworkconfig.cpp
-    oidentdconfiggenerator.cpp
     coresession.cpp
     coresessioneventprocessor.cpp
     coresettings.cpp
@@ -34,6 +33,7 @@ set(SOURCES
     eventstringifier.cpp
     ircparser.cpp
     netsplit.cpp
+    oidentdconfiggenerator.cpp
     postgresqlstorage.cpp
     sessionthread.cpp
     sqlitestorage.cpp
@@ -57,7 +57,6 @@ set(MOC_HDRS
     coreircuser.h
     corenetwork.h
     corenetworkconfig.h
-    oidentdconfiggenerator.h
     coresession.h
     coresessioneventprocessor.h
     coreuserinputhandler.h
@@ -65,6 +64,7 @@ set(MOC_HDRS
     eventstringifier.h
     ircparser.h
     netsplit.h
+    oidentdconfiggenerator.h
     postgresqlstorage.h
     sqlitestorage.h
     storage.h
diff --git a/src/core/core.h b/src/core/core.h
index 8ee11296..6ee511a4 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -33,12 +33,12 @@
 #  include <QTcpSocket>
 #  include <QTcpServer>
 #endif
-#include "oidentdconfiggenerator.h"
 
-#include "storage.h"
 #include "bufferinfo.h"
 #include "message.h"
+#include "oidentdconfiggenerator.h"
 #include "sessionthread.h"
+#include "storage.h"
 #include "types.h"
 
 class CoreSession;
@@ -405,7 +405,7 @@ public:
 
   static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; }
 
-  inline OidentdConfigGenerator *oidentdConfigGenerator() { return _oidentdConfigGenerator; }
+  inline OidentdConfigGenerator *oidentdConfigGenerator() const { return _oidentdConfigGenerator; }
 
   static const int AddClientEventId;
 
diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h
index 8093bb61..7ad13f43 100644
--- a/src/core/corenetwork.h
+++ b/src/core/corenetwork.h
@@ -33,7 +33,6 @@
 #else
 # include <QTcpSocket>
 #endif
-#include <QAbstractSocket>
 
 #ifdef HAVE_QCA2
 #  include "cipher.h"