diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-05-31 12:16:31 +1000 |
|---|---|---|
| committer | Zsolt Simon <zsolt.simon@nokia.com> | 2012-05-31 06:43:32 +0200 |
| commit | 3e775d929d04759fe5a6f90fdf5e9223a0109661 (patch) | |
| tree | 8ed1a7a0f6d4b954e7f51b42c814e94057e98e22 | |
| parent | 2e636e534b81538841694dd392c0aff30d7debb8 (diff) | |
Upgrade const char * to QString message handlers.
The const char * based message handler functions will be removed
so update the code to use the new QString based message handler
functions.
Change-Id: I9f80cdc86d7e344934c4339452d2de9442f1168d
Reviewed-by: Zsolt Simon <zsolt.simon@nokia.com>
| -rw-r--r-- | examples/logger/main.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/logger/tst_qlogger.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/loggerenvar/tst_qloggerenvar.cpp | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/examples/logger/main.cpp b/examples/logger/main.cpp index 0ca78a9..5bacd9d 100644 --- a/examples/logger/main.cpp +++ b/examples/logger/main.cpp @@ -62,12 +62,12 @@ QT_LOG_CATEGORY(NOKIA_DRIVER_EVENT, "Nokia.driver.event") //![1] QMutex mutex; -QMessageHandler oldMessageHandler; +QtMessageHandler oldMessageHandler; QT_LOGGER_USE_NAMESPACE //Messagehandler to write into a file -static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &context, const char *msg) +static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { //Lock against other threads accessing the file QMutexLocker locker(&mutex); @@ -78,7 +78,7 @@ static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &con message.append(context.category); message.append(">"); - message.append(msg); + message.append(qPrintable(msg)); message.append('\n'); outFile.write(message); } diff --git a/tests/auto/logger/tst_qlogger.cpp b/tests/auto/logger/tst_qlogger.cpp index 4e439ba..1ed40af 100644 --- a/tests/auto/logger/tst_qlogger.cpp +++ b/tests/auto/logger/tst_qlogger.cpp @@ -56,7 +56,7 @@ QT_LOG_CATEGORY(Nokia_Ulm_Office_com, "Nokia.Ulm.Office.com") QT_USE_NAMESPACE -QMessageHandler oldMessageHandler; +QtMessageHandler oldMessageHandler; QString logMessage; bool multithreadtest = false; QStringList threadtest; @@ -64,7 +64,7 @@ QMutex threadmutex; bool usedefaultformat = false; QByteArray qMyMessageFormatString(QtMsgType type, const QMessageLogContext &context, - const char *str) + const QString &str) { QByteArray message; if (!usedefaultformat) { @@ -76,17 +76,17 @@ QByteArray qMyMessageFormatString(QtMsgType type, const QMessageLogContext &cont case QtFatalMsg: message.append(".fatal"); break; } message.append(": "); - message.append(str); + message.append(qPrintable(str)); message.append('\n'); } else { - message.append(str); + message.append(qPrintable(str)); message.append('\n'); } return message; } -static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &context, const char *msg) +static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { QMutexLocker locker(&threadmutex); logMessage = qMyMessageFormatString(type, context, msg); diff --git a/tests/auto/loggerenvar/tst_qloggerenvar.cpp b/tests/auto/loggerenvar/tst_qloggerenvar.cpp index 668ce3a..0cfa62e 100644 --- a/tests/auto/loggerenvar/tst_qloggerenvar.cpp +++ b/tests/auto/loggerenvar/tst_qloggerenvar.cpp @@ -69,23 +69,23 @@ QT_LOG_CATEGORY(My_Category_C, "My.Category.C") QT_USE_NAMESPACE -QMessageHandler oldMessageHandler; +QtMessageHandler oldMessageHandler; bool logReceived = false; QMutex threadmutex; -QByteArray qMyMessageFormatString(QtMsgType type, const QMessageLogContext &context, - const char *str) +QByteArray qMyMessageFormatString(QtMsgType /*type*/, const QMessageLogContext &/*context*/, + const QString &str) { QByteArray message; { - message.append(str); + message.append(qPrintable(str)); message.append('\n'); } return message; } -static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &context, const char *msg) +static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { QMutexLocker locker(&threadmutex); QString logmsg = qMyMessageFormatString(type, context, msg); |