X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.h;h=e6701fe0d3c46e2aec46f97a8149f7893c2f0d97;hp=8c1f2f003788d1ef7fe71bddaada8fa0c36538b4;hb=ce250a863bce3198096e65d4c7a68269495302dd;hpb=37110ceaa070167b4f40ed449ac9ea130503a792

diff --git a/src/common/logger.h b/src/common/logger.h
index 8c1f2f00..e6701fe0 100644
--- a/src/common/logger.h
+++ b/src/common/logger.h
@@ -61,9 +61,9 @@ public:
      * and won't store further ones.
      *
      * @param keepMessages Whether messages should be kept
-     * @returns true, if initialization was successful
+     * @throws ExitException, if command line options are invalid
      */
-    bool setup(bool keepMessages);
+    void setup(bool keepMessages);
 
     /**
      * Accesses the stores log messages, e.g. for consumption by DebugLogWidget.
@@ -72,11 +72,7 @@ public:
      */
     std::vector<Logger::LogEntry> messages() const;
 
-#if QT_VERSION < 0x050000
-    static void messageHandler(QtMsgType type, const char *message);
-#else
     static void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &message);
-#endif
 
     /**
      * Takes the given message with the given log level, formats it and emits the @a messageLogged() signal.