X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogger.cpp;fp=src%2Fcommon%2Flogger.cpp;h=a72c68f3029ee448b413ce50451d20550d58b818;hp=ed8d8023521357a24f8816911f96d1392d71a2ec;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hpb=c55df5f2d765b100b7a1ead5a72202f969aa9581 diff --git a/src/common/logger.cpp b/src/common/logger.cpp index ed8d8023..a72c68f3 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -53,11 +53,7 @@ Logger::Logger(QObject *parent) connect(this, SIGNAL(messageLogged(Logger::LogEntry)), this, SLOT(onMessageLogged(Logger::LogEntry))); -#if QT_VERSION < 0x050000 - qInstallMsgHandler(Logger::messageHandler); -#else qInstallMessageHandler(Logger::messageHandler); -#endif } @@ -130,11 +126,7 @@ bool Logger::setup(bool keepMessages) } -#if QT_VERSION < 0x050000 -void Logger::messageHandler(QtMsgType type, const char *message) -#else void Logger::messageHandler(QtMsgType type, const QMessageLogContext &, const QString &message) -#endif { Quassel::instance()->logger()->handleMessage(type, message); } @@ -146,11 +138,9 @@ void Logger::handleMessage(QtMsgType type, const QString &msg) case QtDebugMsg: handleMessage(LogLevel::Debug, msg); break; -#if QT_VERSION >= 0x050500 case QtInfoMsg: handleMessage(LogLevel::Info, msg); break; -#endif case QtWarningMsg: handleMessage(LogLevel::Warning, msg); break;