X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;h=27a3f6d7a976357b4993f4046a52be97f26f879a;hb=bc544f569faedea50c7715844a2261872796c683;hp=8e35dcaf7d17f8fb34967b98e9f94087fb3e71f6;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e;p=quassel.git

diff --git a/src/common/logger.cpp b/src/common/logger.cpp
index 8e35dcaf..27a3f6d7 100644
--- a/src/common/logger.cpp
+++ b/src/common/logger.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -77,7 +77,7 @@ void Logger::log()
             prio = LOG_INFO;
             break;
         }
-        syslog(LOG_USER & prio, "%s", qPrintable(_buffer));
+        syslog(prio|LOG_USER, "%s", qPrintable(_buffer));
     }
 #endif
 
@@ -97,6 +97,7 @@ void Logger::log()
 }
 
 
+#if QT_VERSION < 0x050000
 void Logger::logMessage(QtMsgType type, const char *msg)
 {
     switch (type) {
@@ -115,3 +116,25 @@ void Logger::logMessage(QtMsgType type, const char *msg)
         return;
     }
 }
+#else
+void Logger::logMessage(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    Q_UNUSED(context)
+
+    switch (type) {
+    case QtDebugMsg:
+        Logger(Quassel::DebugLevel) << msg.toLocal8Bit().constData();
+        break;
+    case QtWarningMsg:
+        Logger(Quassel::WarningLevel) << msg.toLocal8Bit().constData();
+        break;
+    case QtCriticalMsg:
+        Logger(Quassel::ErrorLevel) << msg.toLocal8Bit().constData();
+        break;
+    case QtFatalMsg:
+        Logger(Quassel::ErrorLevel) << msg.toLocal8Bit().constData();
+        Quassel::logFatalMessage(msg.toLocal8Bit().constData());
+        return;
+    }
+}
+#endif