X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Flogger.cpp;h=97afb40d849ded62b8d78ec84e389f12f96092eb;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hp=a72c68f3029ee448b413ce50451d20550d58b818;hpb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;p=quassel.git

diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index a72c68f3..97afb40d 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -31,13 +31,14 @@
 
 #include "logger.h"
 #include "quassel.h"
+#include "types.h"
 
 namespace {
 
 QByteArray msgWithTime(const Logger::LogEntry &msg)
 {
     return (msg.timeStamp.toString("yyyy-MM-dd hh:mm:ss ") + msg.message + "\n").toUtf8();
-};
+}
 
 }
 
@@ -51,7 +52,7 @@ Logger::Logger(QObject *parent)
     }();
     Q_UNUSED(registered)
 
-    connect(this, SIGNAL(messageLogged(Logger::LogEntry)), this, SLOT(onMessageLogged(Logger::LogEntry)));
+    connect(this, &Logger::messageLogged, this, &Logger::onMessageLogged);
 
     qInstallMessageHandler(Logger::messageHandler);
 }
@@ -74,7 +75,7 @@ std::vector<Logger::LogEntry> Logger::messages() const
 }
 
 
-bool Logger::setup(bool keepMessages)
+void Logger::setup(bool keepMessages)
 {
     _keepMessages = keepMessages;
 
@@ -90,8 +91,7 @@ bool Logger::setup(bool keepMessages)
         else if (level == "error")
             _outputLevel = LogLevel::Error;
         else {
-            qCritical() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
-            return false;
+            throw ExitException{EXIT_FAILURE, qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level))};
         }
     }
 
@@ -121,8 +121,6 @@ bool Logger::setup(bool keepMessages)
     if (!_keepMessages) {
         _messages.clear();
     }
-
-    return true;
 }