summaryrefslogtreecommitdiff
path: root/src/logbuffer.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2013-06-15 14:42:20 +0200
committerTannin <devnull@localhost>2013-06-15 14:42:20 +0200
commit49cbe0349184419530d22782cc670946b61c9f01 (patch)
treea73c952c93f0624771df97fa9b2b724b51ed0956 /src/logbuffer.cpp
parent6069decb159ec30b7a69649294ee0e89783bb717 (diff)
- completed Qt5 compatibility
- added GetFileVerisonInfoW hook for Windows 8 compatibility - fixed BossDummy to compile correctly with current version of the RGiesecke.DllExport assembly - fixed NCC components compiling with different Framewerk versions - dropped files-list in Nexus-tab of modinfo dialog
Diffstat (limited to 'src/logbuffer.cpp')
-rw-r--r--src/logbuffer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/logbuffer.cpp b/src/logbuffer.cpp
index d563f796..a3b6f1b5 100644
--- a/src/logbuffer.cpp
+++ b/src/logbuffer.cpp
@@ -36,7 +36,7 @@ LogBuffer::LogBuffer(int messageCount, QtMsgType minMsgType, const QString &outp
LogBuffer::~LogBuffer()
{
-#if QT_VERSION >= 0x050000
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
qInstallMessageHandler(0);
#else
qInstallMsgHandler(0);
@@ -91,14 +91,14 @@ void LogBuffer::init(int messageCount, QtMsgType minMsgType, const QString &outp
s_Instance.reset();
}
s_Instance.reset(new LogBuffer(messageCount, minMsgType, outputFileName));
-#if QT_VERSION >= 0x050000
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
qInstallMessageHandler(LogBuffer::log);
#else
qInstallMsgHandler(LogBuffer::log);
#endif
}
-#if QT_VERSION >= 0x050000
+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
void LogBuffer::log(QtMsgType type, const QMessageLogContext &context, const QString &message)
{
@@ -106,7 +106,7 @@ void LogBuffer::log(QtMsgType type, const QMessageLogContext &context, const QSt
if (!s_Instance.isNull()) {
s_Instance->logMessage(type, message);
}
- fprintf(stdout, "(%s:%u, %s) %s\n", context.file, context.line, context.function, message.toLocal8Bit());
+ fprintf(stdout, "(%s:%u) %s\n", context.file, context.line, qPrintable(message));
fflush(stdout);
}