logger: Refactor the logging framework

[quassel.git] / src / core / core.cpp

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 1ff4ada..5818e2f 100644 (file)
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -26,8 +26,8 @@
 #include "coreauthhandler.h"
 #include "coresession.h"
 #include "coresettings.h"
-#include "logger.h"
 #include "internalpeer.h"
+#include "logmessage.h"
 #include "network.h"
 #include "postgresqlstorage.h"
 #include "quassel.h"
@@ -221,10 +221,10 @@ bool Core::init()
         if (Quassel::isOptionSet("oidentd")) {
             _oidentdConfigGenerator = new OidentdConfigGenerator(this);
         }
-        
+
 
         if (Quassel::isOptionSet("ident-daemon")) {
-            _identServer = new IdentServer(_strictIdentEnabled, this);
+            _identServer = new IdentServer(this);
         }
 
         Quassel::registerReloadHandler([]() {
@@ -670,7 +670,9 @@ bool Core::startListening()
     if (!success)
         quError() << qPrintable(tr("Could not open any network interfaces to listen on!"));
 
-    if (_identServer != nullptr) _identServer->startListening();
+    if (_identServer) {
+        _identServer->startListening();
+    }
 
     return success;
 }
@@ -678,7 +680,9 @@ bool Core::startListening()
 
 void Core::stopListening(const QString &reason)
 {
-    if (_identServer != nullptr) _identServer->stopListening(reason);
+    if (_identServer) {
+        _identServer->stopListening(reason);
+    }
 
     bool wasListening = false;
     if (_server.isListening()) {