summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-09-13 15:34:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-16 14:00:11 +0200
commit560c446f6466fe560ea3eba73caada102f269c9a (patch)
tree495751522be5d9b81842c013f25270d491632017 /src
parentb37d3ab8c40e9e1fe04a9a181efd02c7fcf17b31 (diff)
Daemon: Use qInstallMessageHandler
qInstallMsgHandler got deprecated in Qt 5. Change-Id: I789cb34f36564a865f31da65a397d7e6901a3c77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/daemon/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index 843c71d..23d2cb1 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -136,22 +136,22 @@ static void usage(const char *errorMessage = 0)
}
static FILE *logstream = 0;
-void logMessageOutput(QtMsgType type, const char *msg)
+void logMessageOutput(QtMsgType type, const QMessageLogContext &, const QString &msg)
{
if (!logstream)
return;
switch (type) {
case QtDebugMsg:
- fprintf(logstream, "Debug: %s\n", msg);
+ fprintf(logstream, "Debug: %s\n", qPrintable(msg));
break;
case QtWarningMsg:
- fprintf(logstream, "Warning: %s\n", msg);
+ fprintf(logstream, "Warning: %s\n", qPrintable(msg));
break;
case QtCriticalMsg:
- fprintf(logstream, "Critical: %s\n", msg);
+ fprintf(logstream, "Critical: %s\n", qPrintable(msg));
break;
case QtFatalMsg:
- fprintf(logstream, "Fatal: %s\n", msg);
+ fprintf(logstream, "Fatal: %s\n", qPrintable(msg));
abort();
}
}
@@ -275,7 +275,7 @@ int main(int argc, char * argv[])
return errno;
}
::setbuf(logstream, 0);
- qInstallMsgHandler(logMessageOutput);
+ qInstallMessageHandler(logMessageOutput);
}
DBServer server(searchPath);