projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qt4-b-gone: Remove all code supporting Qt < 5.5 and KDE4
[quassel.git]
/
src
/
common
/
logger.cpp
diff --git
a/src/common/logger.cpp
b/src/common/logger.cpp
index
ed8d802
..
a72c68f
100644
(file)
--- 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)));
connect(this, SIGNAL(messageLogged(Logger::LogEntry)), this, SLOT(onMessageLogged(Logger::LogEntry)));
-#if QT_VERSION < 0x050000
- qInstallMsgHandler(Logger::messageHandler);
-#else
qInstallMessageHandler(Logger::messageHandler);
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)
void Logger::messageHandler(QtMsgType type, const QMessageLogContext &, const QString &message)
-#endif
{
Quassel::instance()->logger()->handleMessage(type, message);
}
{
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;
case QtDebugMsg:
handleMessage(LogLevel::Debug, msg);
break;
-#if QT_VERSION >= 0x050500
case QtInfoMsg:
handleMessage(LogLevel::Info, msg);
break;
case QtInfoMsg:
handleMessage(LogLevel::Info, msg);
break;
-#endif
case QtWarningMsg:
handleMessage(LogLevel::Warning, msg);
break;
case QtWarningMsg:
handleMessage(LogLevel::Warning, msg);
break;