QLogger should use category of QMessageLogger

Change-Id: I4d91314f2d18375025ec87d21a66d74a3d380c39
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

3 files changed, 83 insertions, 117 deletions

diff --git a/examples/logger/main.cpp b/examples/logger/main.cpp
index c82c02c..0ca78a9 100644
--- a/examples/logger/main.cpp
+++ b/examples/logger/main.cpp
@@ -74,9 +74,9 @@ static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &con
     QFile outFile(LOGOUTPUTFILE);
     if (outFile.open(QIODevice::WriteOnly | QIODevice::Append)) {
         QByteArray message;
-//        message.append("<");
-//        message.append(context.category);
-//        message.append(">");
+        message.append("<");
+        message.append(context.category);
+        message.append(">");
 
         message.append(msg);
         message.append('\n');
@@ -133,8 +133,7 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
 
-//    qputenv ("QT_MESSAGE_PATTERN", QString("%{category}: %{type},%{message}").toLatin1());
-    qputenv ("QT_MESSAGE_PATTERN", QString("%{type} %{message}").toLatin1());
+    qputenv ("QT_MESSAGE_PATTERN", QString("%{category}: %{type},%{message}").toLatin1());
     oldMessageHandler = qInstallMessageHandler(myCustomMessageHandler);
 
     //delete old logoutput file
diff --git a/src/logger/qlogger.h b/src/logger/qlogger.h
index ba527de..a6811b1 100644
--- a/src/logger/qlogger.h
+++ b/src/logger/qlogger.h
@@ -79,31 +79,31 @@ QT_LOGGER_USE_NAMESPACE
 #  undef qDebug
 #endif
 
-#define qDebug                                                               \
-    if (!QLoggingCategory::defaultCategory().isEnabled(QtDebugMsg))          \
-        /*NOP*/;                                                             \
-    else                                                                     \
-        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).debug
+#define qDebug                                                                                                      \
+    if (!QLoggingCategory::defaultCategory().isEnabled(QtDebugMsg))                                                 \
+        /*NOP*/;                                                                                                    \
+    else                                                                                                            \
+    QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, QLoggingCategory::defaultCategory().categoryName()).debug
 
 #if defined(qWarning)
 #  undef qWarning
 #endif
 
-#define qWarning                                                             \
-    if (!QLoggingCategory::defaultCategory().isEnabled(QtWarningMsg))        \
-        /*NOP*/;                                                             \
-    else                                                                     \
-        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).warning
+#define qWarning                                                                                                    \
+    if (!QLoggingCategory::defaultCategory().isEnabled(QtWarningMsg))                                               \
+        /*NOP*/;                                                                                                    \
+    else                                                                                                            \
+        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, QLoggingCategory::defaultCategory().categoryName()).warning
 
 #if defined(qCritical)
 #  undef qCritical
 #endif
 
-#define qCritical                                                             \
-    if (!QLoggingCategory::defaultCategory().isEnabled(QtCriticalMsg))        \
-        /*NOP*/;                                                              \
-    else                                                                      \
-        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).critical
+#define qCritical                                                                                                   \
+    if (!QLoggingCategory::defaultCategory().isEnabled(QtCriticalMsg))                                              \
+        /*NOP*/;                                                                                                    \
+    else                                                                                                            \
+        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, QLoggingCategory::defaultCategory().categoryName()).critical
 
 //This marco creates the QLoggingCategory object in an empty namespace
 //to prevent linker problems if someone else uses the categorytype in an other place.
@@ -116,18 +116,18 @@ QT_LOGGER_USE_NAMESPACE
     if (!category.isEnabled(QtDebugMsg))                                                             \
         /*NOP*/;                                                                                     \
     else                                                                                             \
-        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).debug() << category.categoryName() << ": "
+        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category.categoryName()).debug()
 
 #define qCWarning(category)                                                                          \
     if (!category.isEnabled(QtWarningMsg))                                                           \
         /*NOP*/;                                                                                     \
     else                                                                                             \
-        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).warning() << category.categoryName() << ": "
+        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category.categoryName()).warning()
 
 #define qCCritical(category)                                                                         \
     if (!category.isEnabled(QtCriticalMsg))                                                          \
         /*NOP*/;                                                                                     \
     else                                                                                             \
-        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).critical() << category.categoryName() << ": "
+        QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category.categoryName()).critical()
 
 #endif // QLOGGER_H
diff --git a/tests/auto/logger/tst_qlogger.cpp b/tests/auto/logger/tst_qlogger.cpp
index 0bdbb4e..4e439ba 100644
--- a/tests/auto/logger/tst_qlogger.cpp
+++ b/tests/auto/logger/tst_qlogger.cpp
@@ -61,40 +61,22 @@ QString logMessage;
 bool multithreadtest = false;
 QStringList threadtest;
 QMutex threadmutex;
-bool usedefaultformat = true;
+bool usedefaultformat = false;
 
 QByteArray qMyMessageFormatString(QtMsgType type, const QMessageLogContext &context,
                                               const char *str)
 {
-/*
     QByteArray message;
     if (!usedefaultformat) {
         message.append(context.category);
-        message.append(": ");
         switch (type) {
-            case QtDebugMsg:   message.append("debug"); break;
-            case QtWarningMsg: message.append("warning"); break;
-            case QtCriticalMsg:message.append("critical"); break;
-            case QtFatalMsg:   message.append("fatal"); break;
+        case QtDebugMsg:   message.append(".debug"); break;
+        case QtWarningMsg: message.append(".warning"); break;
+        case QtCriticalMsg:message.append(".critical"); break;
+        case QtFatalMsg:   message.append(".fatal"); break;
         }
-        message.append(",");
-        message.append(str);
-        message.append('\n');
-    } else {
-        message.append(str);
-        message.append('\n');
-    }
-*/
-    QByteArray message;
-    if (!usedefaultformat) {
+        message.append(": ");
         message.append(str);
-        int idx = message.indexOf(":");
-        switch (type) {
-            case QtDebugMsg:   message.insert(idx + 1, "debug,"); break;
-            case QtWarningMsg: message.insert(idx + 1, "warning,"); break;
-            case QtCriticalMsg:message.insert(idx + 1, "critical,"); break;
-            case QtFatalMsg:   message.insert(idx + 1, "fatal,"); break;
-        }
         message.append('\n');
     } else {
         message.append(str);
@@ -108,10 +90,8 @@ static void myCustomMessageHandler(QtMsgType type, const QMessageLogContext &con
 {
     QMutexLocker locker(&threadmutex);
     logMessage = qMyMessageFormatString(type, context, msg);
-//    if (isEnabled() && context.category){
-        if (multithreadtest)
-            threadtest.append(logMessage);
-  //  }
+    if (multithreadtest)
+        threadtest.append(logMessage);
 }
 
 class CfgFile
@@ -241,17 +221,17 @@ private slots:
     void checkNoCategoryLogActive()
     {
         //check default debug
-        QString buf = QString::fromLatin1("Check default Debug with no log active");
+        QString buf = QString::fromLatin1("default.debug: Check default Debug with no log active");
         qDebug() << "Check default Debug with no log active";
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //check default warning
-        buf = QString::fromLatin1("Check default Warning with no log active");
+        buf = QString::fromLatin1("default.warning: Check default Warning with no log active");
         qWarning() << "Check default Warning with no log active";
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //check default critical
-        buf = QString::fromLatin1("Check default Critical with no log active");
+        buf = QString::fromLatin1("default.critical: Check default Critical with no log active");
         qCritical() << "Check default Critical with no log active";
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
@@ -262,14 +242,12 @@ private slots:
         QCOMPARE(logMessage, buf);
 
         //check default warning
-//        buf = QString::fromLatin1("Check category Warning with no log active");
-        buf = QString::fromLatin1("tst.log: Check category Warning with no log active");
+        buf = QString::fromLatin1("tst.log.warning: Check category Warning with no log active");
         qCWarning(TST_LOG) << "Check category Warning with no log active";
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //check default critical
-//        buf = QString::fromLatin1("Check category Critical with no log active");
-        buf = QString::fromLatin1("tst.log: Check category Critical with no log active");
+        buf = QString::fromLatin1("tst.log.critical: Check category Critical with no log active");
         qCCritical(TST_LOG) << "Check category Critical with no log active";
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
     }
@@ -281,7 +259,7 @@ private slots:
         logMessage = "";
         _configFile->addKey("tst.log", true);
         qSetLoggingRules(_configFile->array());
-        QString buf = QString::fromLatin1("tst.log: debug,Check for default messagePattern");
+        QString buf = QString::fromLatin1("tst.log.debug: Check for default messagePattern");
         qCDebug(TST_LOG) << "Check for default messagePattern";
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
@@ -289,18 +267,18 @@ private slots:
         _configFile->addKey("tst.log1", true);
         qSetLoggingRules(_configFile->array());
         qCDebug(TST_LOG) << "1";
-        buf = QString::fromLatin1("tst.log: debug,1");
+        buf = QString::fromLatin1("tst.log.debug: 1");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //wite out all different types
         qCDebug(TST_LOG) << "DebugType";
-        buf = QString::fromLatin1("tst.log: debug,DebugType");
+        buf = QString::fromLatin1("tst.log.debug: DebugType");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCWarning(TST_LOG) << "WarningType";
-        buf = QString::fromLatin1("tst.log: warning,WarningType");
+        buf = QString::fromLatin1("tst.log.warning: WarningType");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCCritical(TST_LOG) << "CriticalType";
-        buf = QString::fromLatin1("tst.log: critical,CriticalType");
+        buf = QString::fromLatin1("tst.log.critical: CriticalType");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
     }
 
@@ -308,18 +286,15 @@ private slots:
     {
         logMessage = "";
         qDebug() << "DefaultDebug";
-//        QString buf = QString::fromLatin1("default: debug,DefaultDebug");
-        QString buf = QString::fromLatin1("debug,DefaultDebug");
+        QString buf = QString::fromLatin1("default.debug: DefaultDebug");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //default Debug off by default, warning and critical are on
         qWarning() << "DefaultWarning";
-//        buf = QString::fromLatin1("default: warning,DefaultWarning");
-        buf = QString::fromLatin1("warning,DefaultWarning");
+        buf = QString::fromLatin1("default.warning: DefaultWarning");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCritical() << "DefaultCritical";
-//        buf = QString::fromLatin1("default: critical,DefaultCritical");
-        buf = QString::fromLatin1("critical,DefaultCritical");
+        buf = QString::fromLatin1("default.critical: DefaultCritical");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //enable default debug
@@ -327,16 +302,13 @@ private slots:
         qSetLoggingRules(_configFile->array());
 
         qDebug() << "DefaultDebug1";
-//        buf = QString::fromLatin1("default: debug,DefaultDebug1");
-        buf = QString::fromLatin1("debug,DefaultDebug1");
+        buf = QString::fromLatin1("default.debug: DefaultDebug1");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qWarning() << "DefaultWarning1";
-//        buf = QString::fromLatin1("default: warning,DefaultWarning1");
-        buf = QString::fromLatin1("warning,DefaultWarning1");
+        buf = QString::fromLatin1("default.warning: DefaultWarning1");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCritical() << "DefaultCritical1";
-//        buf = QString::fromLatin1("default: critical,DefaultCritical1");
-        buf = QString::fromLatin1("critical,DefaultCritical1");
+        buf = QString::fromLatin1("default.critical: DefaultCritical1");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //disable qWarning
@@ -344,16 +316,14 @@ private slots:
         qSetLoggingRules(_configFile->array());
 
         qDebug() << "DefaultDebug2";
-//        buf = QString::fromLatin1("default: debug,DefaultDebug2");
-        buf = QString::fromLatin1("debug,DefaultDebug2");
+        buf = QString::fromLatin1("default.debug: DefaultDebug2");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         logMessage = "no change";
         qWarning() << "DefaultWarning2";
         buf = QString::fromLatin1("no change");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCritical() << "DefaultCritical2";
-//        buf = QString::fromLatin1("default: critical,DefaultCritical2");
-        buf = QString::fromLatin1("critical,DefaultCritical2");
+        buf = QString::fromLatin1("default.critical: DefaultCritical2");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //disable qCritical
@@ -378,16 +348,13 @@ private slots:
 
         //ensure all are on
         qDebug() << "DefaultDebug4";
-//        buf = QString::fromLatin1("default: debug,DefaultDebug4");
-        buf = QString::fromLatin1("debug,DefaultDebug4");
+        buf = QString::fromLatin1("default.debug: DefaultDebug4");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qWarning() << "DefaultWarning4";
-//        buf = QString::fromLatin1("default: warning,DefaultWarning4");
-        buf = QString::fromLatin1("warning,DefaultWarning4");
+        buf = QString::fromLatin1("default.warning: DefaultWarning4");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCritical() << "DefaultCritical4";
-//        buf = QString::fromLatin1("default: critical,DefaultCritical4");
-        buf = QString::fromLatin1("critical,DefaultCritical4");
+        buf = QString::fromLatin1("default.critical: DefaultCritical4");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //disable default log
@@ -415,11 +382,11 @@ private slots:
         QCOMPARE(cleanLogLine(logMessage), QString("checkLegacyMessageLogger2"));
         QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).critical() << "checkLegacyMessageLogger3";
         QCOMPARE(cleanLogLine(logMessage), QString("checkLegacyMessageLogger3"));
+        usedefaultformat = false;
     }
 
     void checkFiltering()
     {
-        usedefaultformat = false;
         //enable default logs
         _configFile->clear();
         _configFile->addKey("Nokia.Brisbane.Office.com", false);
@@ -441,13 +408,13 @@ private slots:
         qSetLoggingRules(_configFile->array());
 
         qCDebug(Nokia_Brisbane_Office_com) << "Nokia.Brisbane.Office.com 2";
-        buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Nokia.Brisbane.Office.com 2");
+        buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Nokia.Brisbane.Office.com 2");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCDebug(Nokia_Tampere_Office_com) << "Nokia.Tampere.Office.com 2";
-        buf = QString::fromLatin1("Nokia.Tampere.Office.com: debug,Nokia.Tampere.Office.com 2");
+        buf = QString::fromLatin1("Nokia.Tampere.Office.com.debug: Nokia.Tampere.Office.com 2");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCDebug(Nokia_Ulm_Office_com) << "Nokia.Ulm.Office.com 2";
-        buf = QString::fromLatin1("Nokia.Ulm.Office.com: debug,Nokia.Ulm.Office.com 2");
+        buf = QString::fromLatin1("Nokia.Ulm.Office.com.debug: Nokia.Ulm.Office.com 2");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //Check right filter
@@ -458,13 +425,13 @@ private slots:
         qSetLoggingRules(_configFile->array());
 
         qCDebug(Nokia_Brisbane_Office_com) << "Nokia.Brisbane.Office.com 3";
-        buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Nokia.Brisbane.Office.com 3");
+        buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Nokia.Brisbane.Office.com 3");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCDebug(Nokia_Tampere_Office_com) << "Nokia.Tampere.Office.com 3";
-        buf = QString::fromLatin1("Nokia.Tampere.Office.com: debug,Nokia.Tampere.Office.com 3");
+        buf = QString::fromLatin1("Nokia.Tampere.Office.com.debug: Nokia.Tampere.Office.com 3");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCDebug(Nokia_Ulm_Office_com) << "Nokia.Ulm.Office.com 3";
-        buf = QString::fromLatin1("Nokia.Ulm.Office.com: debug,Nokia.Ulm.Office.com 3");
+        buf = QString::fromLatin1("Nokia.Ulm.Office.com.debug: Nokia.Ulm.Office.com 3");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //Check left filter
@@ -473,7 +440,7 @@ private slots:
         qSetLoggingRules(_configFile->array());
 
         qCDebug(Nokia_Brisbane_Office_com) << "Debug: Nokia.Brisbane.Office.com 4";
-        buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Debug: Nokia.Brisbane.Office.com 4");
+        buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Debug: Nokia.Brisbane.Office.com 4");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         logMessage = "no change";
         buf = QString::fromLatin1("no change");
@@ -487,13 +454,13 @@ private slots:
         qSetLoggingRules(_configFile->array());
 
         qCDebug(Nokia_Brisbane_Office_com) << "Debug: Nokia.Brisbane.Office.com 5";
-        buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Debug: Nokia.Brisbane.Office.com 5");
+        buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Debug: Nokia.Brisbane.Office.com 5");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCWarning(Nokia_Tampere_Office_com) << "Warning: Nokia.Tampere.Office.com 5";
-        buf = QString::fromLatin1("Nokia.Tampere.Office.com: warning,Warning: Nokia.Tampere.Office.com 5");
+        buf = QString::fromLatin1("Nokia.Tampere.Office.com.warning: Warning: Nokia.Tampere.Office.com 5");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCCritical(Nokia_Ulm_Office_com) << "Critical: Nokia.Ulm.Office.com 5";
-        buf = QString::fromLatin1("Nokia.Ulm.Office.com: critical,Critical: Nokia.Ulm.Office.com 5");
+        buf = QString::fromLatin1("Nokia.Ulm.Office.com.critical: Critical: Nokia.Ulm.Office.com 5");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
         //Check mid filter
@@ -511,13 +478,13 @@ private slots:
         qSetLoggingRules(_configFile->array());
 
         qCDebug(Nokia_Brisbane_Office_com) << "Debug: Nokia.Brisbane.Office.com 7";
-        buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Debug: Nokia.Brisbane.Office.com 7");
+        buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Debug: Nokia.Brisbane.Office.com 7");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCWarning(Nokia_Tampere_Office_com) << "Warning: Nokia.Tampere.Office.com 7";
-        buf = QString::fromLatin1("Nokia.Tampere.Office.com: warning,Warning: Nokia.Tampere.Office.com 7");
+        buf = QString::fromLatin1("Nokia.Tampere.Office.com.warning: Warning: Nokia.Tampere.Office.com 7");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         qCCritical(Nokia_Ulm_Office_com) << "Critical: Nokia.Ulm.Office.com 7";
-        buf = QString::fromLatin1("Nokia.Ulm.Office.com: critical,Critical: Nokia.Ulm.Office.com 7");
+        buf = QString::fromLatin1("Nokia.Ulm.Office.com.critical: Critical: Nokia.Ulm.Office.com 7");
         QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
     }
 
@@ -532,28 +499,28 @@ private slots:
             pcategorybject = &mycategoryobject;
             logMessage = "no change";
 
-            QString buf = QString::fromLatin1("LoggingCategoryObject: debug, My Category Object");
+            QString buf = QString::fromLatin1("LoggingCategoryObject.debug: My Category Object");
             qCDebug(mycategoryobject) << "My Category Object";
             QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
-            buf = QString::fromLatin1("LoggingCategoryObject: warning, My Category Object");
+            buf = QString::fromLatin1("LoggingCategoryObject.warning: My Category Object");
             qCWarning(mycategoryobject) << "My Category Object";
             QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
-            buf = QString::fromLatin1("LoggingCategoryObject: critical, My Category Object");
+            buf = QString::fromLatin1("LoggingCategoryObject.critical: My Category Object");
             qCCritical(mycategoryobject) << "My Category Object";
             QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
             QLoggingCategory mycategoryobject2("LoggingCategoryObject");
-            buf = QString::fromLatin1("LoggingCategoryObject: debug, My Category Object");
+            buf = QString::fromLatin1("LoggingCategoryObject.debug: My Category Object");
             qCDebug(mycategoryobject) << "My Category Object";
             QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
-            buf = QString::fromLatin1("LoggingCategoryObject: warning, My Category Object");
+            buf = QString::fromLatin1("LoggingCategoryObject.warning: My Category Object");
             qCWarning(mycategoryobject) << "My Category Object";
             QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
 
-            buf = QString::fromLatin1("LoggingCategoryObject: critical, My Category Object");
+            buf = QString::fromLatin1("LoggingCategoryObject.critical: My Category Object");
             qCCritical(mycategoryobject) << "My Category Object";
             QCOMPARE(cleanLogLine(logMessage), cleanLogLine(buf));
         }
@@ -596,32 +563,32 @@ private slots:
 
         //Check if each log line is complete
         QStringList compareagainst;
-        QString buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Brisbane  \"from Thread 1\"  :true");
+        QString buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Brisbane  \"from Thread 1\"  :true");
         compareagainst.append(cleanLogLine(buf));
-        buf = QString::fromLatin1("Nokia.Tampere.Office.com: debug,Tampere  \"from Thread 1\"  :true");
+        buf = QString::fromLatin1("Nokia.Tampere.Office.com.debug: Tampere  \"from Thread 1\"  :true");
         compareagainst.append(cleanLogLine(buf));
-        buf = QString::fromLatin1("Nokia.Ulm.Office.com: debug,Ulm  \"from Thread 1\"  :true");
+        buf = QString::fromLatin1("Nokia.Ulm.Office.com.debug: Ulm  \"from Thread 1\"  :true");
         compareagainst.append(cleanLogLine(buf));
 
-        buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Brisbane  \"from Thread 1\"  :false");
+        buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Brisbane  \"from Thread 1\"  :false");
         compareagainst.append(cleanLogLine(buf));
-        buf = QString::fromLatin1("Nokia.Tampere.Office.com: debug,Tampere  \"from Thread 1\"  :false");
+        buf = QString::fromLatin1("Nokia.Tampere.Office.com.debug: Tampere  \"from Thread 1\"  :false");
         compareagainst.append(cleanLogLine(buf));
-        buf = QString::fromLatin1("Nokia.Ulm.Office.com: debug,Ulm  \"from Thread 1\"  :false");
+        buf = QString::fromLatin1("Nokia.Ulm.Office.com.debug: Ulm  \"from Thread 1\"  :false");
         compareagainst.append(cleanLogLine(buf));
 
-        buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Brisbane  \"from Thread 2\"  :true");
+        buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Brisbane  \"from Thread 2\"  :true");
         compareagainst.append(cleanLogLine(buf));
-        buf = QString::fromLatin1("Nokia.Tampere.Office.com: debug,Tampere  \"from Thread 2\"  :true");
+        buf = QString::fromLatin1("Nokia.Tampere.Office.com.debug: Tampere  \"from Thread 2\"  :true");
         compareagainst.append(cleanLogLine(buf));
-        buf = QString::fromLatin1("Nokia.Ulm.Office.com: debug,Ulm  \"from Thread 2\"  :true");
+        buf = QString::fromLatin1("Nokia.Ulm.Office.com.debug: Ulm  \"from Thread 2\"  :true");
         compareagainst.append(cleanLogLine(buf));
 
-        buf = QString::fromLatin1("Nokia.Brisbane.Office.com: debug,Brisbane  \"from Thread 2\"  :false");
+        buf = QString::fromLatin1("Nokia.Brisbane.Office.com.debug: Brisbane  \"from Thread 2\"  :false");
         compareagainst.append(cleanLogLine(buf));
-        buf = QString::fromLatin1("Nokia.Tampere.Office.com: debug,Tampere  \"from Thread 2\"  :false");
+        buf = QString::fromLatin1("Nokia.Tampere.Office.com.debug: Tampere  \"from Thread 2\"  :false");
         compareagainst.append(cleanLogLine(buf));
-        buf = QString::fromLatin1("Nokia.Ulm.Office.com: debug,Ulm  \"from Thread 2\"  :false");
+        buf = QString::fromLatin1("Nokia.Ulm.Office.com.debug: Ulm  \"from Thread 2\"  :false");
         compareagainst.append(cleanLogLine(buf));
 
         for (int i = 0; i < threadtest.count(); i++) {