ProjectExplorer: Compile with QT_NO_CAST_FROM_ASCII.

- Add missing translations
- Remove some unneeded conversions.

Change-Id: Ia30e5c838099e52a9f38ca4854395c10c0391075
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

1 files changed, 78 insertions, 75 deletions

diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp
index 76a793aec4..f6094984fe 100644
--- a/src/plugins/projectexplorer/gccparser.cpp
+++ b/src/plugins/projectexplorer/gccparser.cpp
@@ -44,10 +44,12 @@ static const char COMMAND_PATTERN[] = "^(.*[\\\\/])?([a-z0-9]+-[a-z0-9]+-[a-z0-9
 GccParser::GccParser()
 {
     setObjectName(QLatin1String("GCCParser"));
-    m_regExp.setPattern(QString(QChar('^')) + QString::fromLatin1(FILE_PATTERN) + QLatin1String("(\\d+):(\\d+:)?\\s+((fatal |#)?(warning|error|note):?\\s)?([^\\s].+)$"));
+    m_regExp.setPattern(QLatin1Char('^') + QLatin1String(FILE_PATTERN)
+                        + QLatin1String("(\\d+):(\\d+:)?\\s+((fatal |#)?(warning|error|note):?\\s)?([^\\s].+)$"));
     m_regExp.setMinimal(true);
 
-    m_regExpIncluded.setPattern(QString::fromLatin1("\\bfrom\\s") + QString::fromLatin1(FILE_PATTERN) + QLatin1String("(\\d+)(:\\d+)?[,:]?$"));
+    m_regExpIncluded.setPattern(QString::fromLatin1("\\bfrom\\s") + QLatin1String(FILE_PATTERN)
+                                + QLatin1String("(\\d+)(:\\d+)?[,:]?$"));
     m_regExpIncluded.setMinimal(true);
 
     // optional path with trailing slash
@@ -55,7 +57,7 @@ GccParser::GccParser()
     // name of executable
     // optional trailing version number
     // optional .exe postfix
-    m_regExpGccNames.setPattern(COMMAND_PATTERN);
+    m_regExpGccNames.setPattern(QLatin1String(COMMAND_PATTERN));
     m_regExpGccNames.setMinimal(true);
 
     appendOutputParser(new LdParser);
@@ -79,7 +81,7 @@ void GccParser::stdError(const QString &line)
                           lne /* description */,
                           QString() /* filename */,
                           -1 /* linenumber */,
-                          Constants::TASK_CATEGORY_COMPILE));
+                          QLatin1String(Constants::TASK_CATEGORY_COMPILE)));
         return;
     } else if (m_regExpGccNames.indexIn(lne) > -1) {
         QString description = lne.mid(m_regExpGccNames.matchedLength());
@@ -87,7 +89,7 @@ void GccParser::stdError(const QString &line)
                   description,
                   QString(), /* filename */
                   -1, /* line */
-                  Constants::TASK_CATEGORY_COMPILE);
+                  QLatin1String(Constants::TASK_CATEGORY_COMPILE));
         if (description.startsWith(QLatin1String("warning: "))) {
             task.type = Task::Warning;
             task.description = description.mid(9);
@@ -102,7 +104,7 @@ void GccParser::stdError(const QString &line)
         Task task(Task::Unknown,
                   m_regExp.cap(8) /* description */,
                   filename, lineno,
-                  Constants::TASK_CATEGORY_COMPILE);
+                  QLatin1String(Constants::TASK_CATEGORY_COMPILE));
         if (m_regExp.cap(7) == QLatin1String("warning"))
             task.type = Task::Warning;
         else if (m_regExp.cap(7) == QLatin1String("error") ||
@@ -111,7 +113,7 @@ void GccParser::stdError(const QString &line)
 
         // Prepend "#warning" or "#error" if that triggered the match on (warning|error)
         // We want those to show how the warning was triggered
-        if (m_regExp.cap(5).startsWith(QChar('#')))
+        if (m_regExp.cap(5).startsWith(QLatin1Char('#')))
             task.description = m_regExp.cap(5) + task.description;
 
         emit addTask(task);
@@ -121,7 +123,7 @@ void GccParser::stdError(const QString &line)
                           lne /* description */,
                           m_regExpIncluded.cap(1) /* filename */,
                           m_regExpIncluded.cap(3).toInt() /* linenumber */,
-                          Constants::TASK_CATEGORY_COMPILE));
+                          QLatin1String(Constants::TASK_CATEGORY_COMPILE)));
         return;
     }
     IOutputParser::stdError(line);
@@ -145,6 +147,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
     QTest::addColumn<QList<ProjectExplorer::Task> >("tasks");
     QTest::addColumn<QString>("outputLines");
 
+    const QString categoryCompile = QLatin1String(Constants::TASK_CATEGORY_COMPILE);
 
     QTest::newRow("pass-through stdout")
             << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
@@ -167,15 +170,15 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                                     QLatin1String("In function `int main(int, char**)':"),
                                     QLatin1String("/temp/test/untitled8/main.cpp"), -1,
-                                    Constants::TASK_CATEGORY_COMPILE)
+                                    categoryCompile)
                 << Task(Task::Error,
                                     QLatin1String("`sfasdf' undeclared (first use this function)"),
                                     QLatin1String("/temp/test/untitled8/main.cpp"), 9,
-                                    Constants::TASK_CATEGORY_COMPILE)
+                                    categoryCompile)
                 << Task(Task::Error,
                                     QLatin1String("(Each undeclared identifier is reported only once for each function it appears in.)"),
                                     QLatin1String("/temp/test/untitled8/main.cpp"), 9,
-                                    Constants::TASK_CATEGORY_COMPILE)
+                                    categoryCompile)
                 )
             << QString();
     QTest::newRow("GCCE warning")
@@ -186,7 +189,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Warning,
                         QLatin1String("inline function `QDebug qDebug()' used but never defined"),
                         QLatin1String("/src/corelib/global/qglobal.h"), 1635,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
     QTest::newRow("warning")
             << QString::fromLatin1("main.cpp:7:2: warning: Some warning")
@@ -195,7 +198,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << (QList<ProjectExplorer::Task>() << Task(Task::Warning,
                                                        QLatin1String("Some warning"),
                                                        QLatin1String("main.cpp"), 7,
-                                                       Constants::TASK_CATEGORY_COMPILE))
+                                                       categoryCompile))
             << QString();
     QTest::newRow("GCCE #error")
             << QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:7: #error Symbian error")
@@ -204,7 +207,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << (QList<ProjectExplorer::Task>() << Task(Task::Error,
                                                        QLatin1String("#error Symbian error"),
                                                        QLatin1String("C:\\temp\\test\\untitled8\\main.cpp"), 7,
-                                                       Constants::TASK_CATEGORY_COMPILE))
+                                                       categoryCompile))
             << QString();
     // Symbian reports #warning(s) twice (using different syntax).
     QTest::newRow("GCCE #warning1")
@@ -214,7 +217,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << (QList<ProjectExplorer::Task>() << Task(Task::Warning,
                                                        QLatin1String("#warning Symbian warning"),
                                                        QLatin1String("C:\\temp\\test\\untitled8\\main.cpp"), 8,
-                                                       Constants::TASK_CATEGORY_COMPILE))
+                                                       categoryCompile))
             << QString();
     QTest::newRow("GCCE #warning2")
             << QString::fromLatin1("/temp/test/untitled8/main.cpp:8:2: warning: #warning Symbian warning")
@@ -223,7 +226,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << (QList<ProjectExplorer::Task>() << Task(Task::Warning,
                                                        QLatin1String("#warning Symbian warning"),
                                                        QLatin1String("/temp/test/untitled8/main.cpp"), 8,
-                                                       Constants::TASK_CATEGORY_COMPILE))
+                                                       categoryCompile))
             << QString();
     QTest::newRow("Undefined reference (debug)")
             << QString::fromLatin1("main.o: In function `main':\n"
@@ -235,15 +238,15 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In function `main':"),
                         QLatin1String("main.o"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("undefined reference to `MainWindow::doSomething()'"),
                         QLatin1String("C:\\temp\\test\\untitled8/main.cpp"), 8,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("collect2: ld returned 1 exit status"),
                         QString(), -1,
-                                    Constants::TASK_CATEGORY_COMPILE)
+                                    categoryCompile)
                 )
             << QString();
     QTest::newRow("Undefined reference (release)")
@@ -256,15 +259,15 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In function `main':"),
                         QLatin1String("main.o"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("undefined reference to `MainWindow::doSomething()'"),
                         QLatin1String("C:\\temp\\test\\untitled8/main.cpp"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("collect2: ld returned 1 exit status"),
                         QString(), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 )
             << QString();
     QTest::newRow("linker: dll format not recognized")
@@ -275,7 +278,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Error,
                         QLatin1String("file not recognized: File format not recognized"),
                         QLatin1String("c:\\Qt\\4.6\\lib/QtGuid4.dll"), -1,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
     QTest::newRow("Invalid rpath")
             << QString::fromLatin1("g++: /usr/local/lib: No such file or directory")
@@ -285,7 +288,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Error,
                         QLatin1String("/usr/local/lib: No such file or directory"),
                         QString(), -1,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
 
     QTest::newRow("Invalid rpath")
@@ -298,15 +301,15 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In member function 'void Debugger::Internal::GdbEngine::handleBreakInsert2(const Debugger::Internal::GdbResponse&)':"),
                         QLatin1String("../../../../master/src/plugins/debugger/gdb/gdbengine.cpp"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("unused variable 'index'"),
                         QLatin1String("../../../../master/src/plugins/debugger/gdb/gdbengine.cpp"), 2114,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("unused variable 'handler'"),
                         QLatin1String("../../../../master/src/plugins/debugger/gdb/gdbengine.cpp"), 2115,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();    
     QTest::newRow("gnumakeparser.cpp errors")
             << QString::fromLatin1("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp: In member function 'void ProjectExplorer::ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data()':\n"
@@ -318,15 +321,15 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In member function 'void ProjectExplorer::ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data()':"),
                         QLatin1String("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("expected primary-expression before ':' token"),
                         QLatin1String("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp"), 264,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("expected ';' before ':' token"),
                         QLatin1String("/home/code/src/creator/src/plugins/projectexplorer/gnumakeparser.cpp"), 264,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
     QTest::newRow("distcc error(QTCREATORBUG-904)")
             << QString::fromLatin1("distcc[73168] (dcc_get_hostlist) Warning: no hostlist is set; can't distribute work\n"
@@ -344,7 +347,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Warning,
                          QLatin1String("Core::IEditor* QVariant::value<Core::IEditor*>() const has different visibility (hidden) in .obj/debug-shared/openeditorsview.o and (default) in .obj/debug-shared/editormanager.o"),
                          QString(), -1,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
     QTest::newRow("ld fatal")
             << QString::fromLatin1("ld: fatal: Symbol referencing errors. No output written to testproject")
@@ -354,7 +357,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Error,
                          QLatin1String("Symbol referencing errors. No output written to testproject"),
                          QString(), -1,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
     QTest::newRow("Teambuilder issues")
             << QString::fromLatin1("TeamBuilder Client:: error: could not find Scheduler, running Job locally...")
@@ -370,7 +373,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Unknown,
                          QLatin1String("initialized from here"),
                          QString::fromLatin1("/home/dev/creator/share/qtcreator/dumper/dumper.cpp"), 1079,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
     QTest::newRow("static member function")
             << QString::fromLatin1("/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c: In static member function 'static std::_Rb_tree_node_base* std::_Rb_global<_Dummy>::_Rebalance_for_erase(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&)':\n"
@@ -381,22 +384,22 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Unknown,
                          QLatin1String("In static member function 'static std::_Rb_tree_node_base* std::_Rb_global<_Dummy>::_Rebalance_for_erase(std::_Rb_tree_node_base*, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&, std::_Rb_tree_node_base*&)':"),
                          QString::fromLatin1("/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c"), -1,
-                         Constants::TASK_CATEGORY_COMPILE)
+                         categoryCompile)
                  << Task(Task::Warning,
                          QLatin1String("suggest explicit braces to avoid ambiguous 'else'"),
                          QString::fromLatin1("/Qt/4.6.2-Symbian/s60sdk/epoc32/include/stdapis/stlport/stl/_tree.c"), 194,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
     QTest::newRow("rm false positive")
             << QString::fromLatin1("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory")
             << OutputParserTester::STDERR
-            << QString() << QString("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory\n")
+            << QString() << QString(QLatin1String("rm: cannot remove `release/moc_mainwindow.cpp': No such file or directory\n"))
             << QList<ProjectExplorer::Task>()
             << QString();
     QTest::newRow("ranlib false positive")
             << QString::fromLatin1("ranlib: file: libSupport.a(HashTable.o) has no symbols")
             << OutputParserTester::STDERR
-            << QString() << QString("ranlib: file: libSupport.a(HashTable.o) has no symbols\n")
+            << QString() << QString(QLatin1String("ranlib: file: libSupport.a(HashTable.o) has no symbols\n"))
             << QList<ProjectExplorer::Task>()
             << QString();
     QTest::newRow("ld: missing library")
@@ -407,7 +410,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Error,
                          QLatin1String("cannot find -ldoesnotexist"),
                          QString(), -1,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
     QTest::newRow("In function")
             << QString::fromLatin1("../../scriptbug/main.cpp: In function void foo(i) [with i = double]:\n"
@@ -419,15 +422,15 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Unknown,
                          QLatin1String("In function void foo(i) [with i = double]:"),
                          QLatin1String("../../scriptbug/main.cpp"), -1,
-                         Constants::TASK_CATEGORY_COMPILE)
+                         categoryCompile)
                  << Task(Task::Unknown,
                          QLatin1String("instantiated from here"),
                          QLatin1String("../../scriptbug/main.cpp"), 22,
-                         Constants::TASK_CATEGORY_COMPILE)
+                         categoryCompile)
                  << Task(Task::Warning,
                          QLatin1String("unused variable c"),
                          QLatin1String("../../scriptbug/main.cpp"), 8,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
     QTest::newRow("instanciated from here")
             << QString::fromLatin1("main.cpp:10: instantiated from here  ")
@@ -437,7 +440,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Unknown,
                          QLatin1String("instantiated from here"),
                          QLatin1String("main.cpp"), 10,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
     QTest::newRow("In constructor")
             << QString::fromLatin1("/dev/creator/src/plugins/find/basetextfind.h: In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':")
@@ -447,7 +450,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Unknown,
                          QLatin1String("In constructor 'Find::BaseTextFind::BaseTextFind(QTextEdit*)':"),
                          QLatin1String("/dev/creator/src/plugins/find/basetextfind.h"), -1,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
 
     QTest::newRow("At global scope")
@@ -462,23 +465,23 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Unknown,
                          QLatin1String("At global scope:"),
                          QLatin1String("../../scriptbug/main.cpp"), -1,
-                         Constants::TASK_CATEGORY_COMPILE)
+                         categoryCompile)
                  << Task(Task::Unknown,
                          QLatin1String("In instantiation of void bar(i) [with i = double]:"),
                          QLatin1String("../../scriptbug/main.cpp"), -1,
-                         Constants::TASK_CATEGORY_COMPILE)
+                         categoryCompile)
                  << Task(Task::Unknown,
                          QLatin1String("instantiated from void foo(i) [with i = double]"),
                          QLatin1String("../../scriptbug/main.cpp"), 8,
-                         Constants::TASK_CATEGORY_COMPILE)
+                         categoryCompile)
                  << Task(Task::Unknown,
                          QLatin1String("instantiated from here"),
                          QLatin1String("../../scriptbug/main.cpp"), 22,
-                         Constants::TASK_CATEGORY_COMPILE)
+                         categoryCompile)
                  << Task(Task::Warning,
                          QLatin1String("unused parameter v"),
                          QLatin1String("../../scriptbug/main.cpp"), 5,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
 
     QTest::newRow("gcc 4.5 fatal error")
@@ -489,7 +492,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Error,
                          QLatin1String("test.moc: No such file or directory"),
                          QLatin1String("/home/code/test.cpp"), 54,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
 
     QTest::newRow("QTCREATORBUG-597")
@@ -503,19 +506,19 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In function `QPlotAxis':"),
                         QLatin1String("debug/qplotaxis.o"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("undefined reference to `vtable for QPlotAxis'"),
                         QLatin1String("M:\\Development\\x64\\QtPlot/qplotaxis.cpp"), 26,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("undefined reference to `vtable for QPlotAxis'"),
                         QLatin1String("M:\\Development\\x64\\QtPlot/qplotaxis.cpp"), 26,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Error,
                         QLatin1String("collect2: ld returned 1 exit status"),
                         QString(), -1,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
 
     QTest::newRow("instantiated from here should not be an error")
@@ -530,23 +533,23 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In member function typename _Vector_base<_Tp, _Alloc>::_Tp_alloc_type::const_reference Vector<_Tp, _Alloc>::at(int) [with _Tp = Point, _Alloc = Allocator<Point>]:"),
                         QLatin1String("../stl/main.cpp"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Unknown,
                         QLatin1String("instantiated from here"),
                         QLatin1String("../stl/main.cpp"), 38,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("returning reference to temporary"),
                         QLatin1String("../stl/main.cpp"), 31,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Unknown,
                         QLatin1String("At global scope:"),
                         QLatin1String("../stl/main.cpp"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("unused parameter index"),
                         QLatin1String("../stl/main.cpp"), 31,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
 
     QTest::newRow("GCCE from lines")
@@ -560,19 +563,19 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In file included from C:/Symbian_SDK/epoc32/include/e32cmn.h:6792,"),
                         QLatin1String("C:/Symbian_SDK/epoc32/include/e32cmn.h"), 6792,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Unknown,
                         QLatin1String("from C:/Symbian_SDK/epoc32/include/e32std.h:25,"),
                         QLatin1String("C:/Symbian_SDK/epoc32/include/e32std.h"), 25,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Unknown,
                         QLatin1String("In member function 'SSecureId::operator const TSecureId&() const':"),
                         QLatin1String("C:/Symbian_SDK/epoc32/include/e32cmn.inl"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("returning reference to temporary"),
                         QLatin1String("C:/Symbian_SDK/epoc32/include/e32cmn.inl"), 7094,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
 
     QTest::newRow("QTCREATORBUG-2206")
@@ -583,7 +586,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Unknown,
                          QLatin1String("At top level:"),
                          QLatin1String("../../../src/XmlUg/targetdelete.c"), -1,
-                         Constants::TASK_CATEGORY_COMPILE))
+                         categoryCompile))
             << QString();
 
     QTest::newRow("GCCE 4: commandline, includes")
@@ -596,15 +599,15 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                  << Task(Task::Unknown,
                          QLatin1String("In file included from /Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h:15,"),
                          QLatin1String("/Symbian/SDK/EPOC32/INCLUDE/GCCE/GCCE.h"), 15,
-                         Constants::TASK_CATEGORY_COMPILE)
+                         categoryCompile)
                 << Task(Task::Unknown,
                         QLatin1String("from <command line>:26:"),
                         QLatin1String("<command line>"), 26,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("no newline at end of file"),
                         QLatin1String("/Symbian/SDK/epoc32/include/variant/Symbian_OS.hrh"), 1134,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
 
     QTest::newRow("Linker fail (release build)")
@@ -615,7 +618,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Error,
                         QLatin1String("undefined reference to `MainWindow::doSomething()'"),
                         QLatin1String("main.cpp"), -1,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
 
     QTest::newRow("enumeration warning")
@@ -627,11 +630,11 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In member function 'ProFileEvaluator::Private::VisitReturn ProFileEvaluator::Private::evaluateConditionalFunction(const ProString&, const ProStringList&)':"),
                         QLatin1String("../../../src/shared/proparser/profileevaluator.cpp"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("case value '0' not in enumerated type 'ProFileEvaluator::Private::TestFunc'"),
                         QLatin1String("../../../src/shared/proparser/profileevaluator.cpp"), 2817,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
 
     QTest::newRow("include with line:column info")
@@ -643,11 +646,11 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In file included from <command-line>:0:0:"),
                         QLatin1String("<command-line>"), 0,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("\"STUPID_DEFINE\" redefined"),
                         QLatin1String("./mw.h"), 4,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
     QTest::newRow("instanciation with line:column info")
             << QString::fromLatin1("file.h: In function 'void UnitTest::CheckEqual(UnitTest::TestResults&, const Expected&, const Actual&, const UnitTest::TestDetails&) [with Expected = unsigned int, Actual = int]':\n"
@@ -659,15 +662,15 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Unknown,
                         QLatin1String("In function 'void UnitTest::CheckEqual(UnitTest::TestResults&, const Expected&, const Actual&, const UnitTest::TestDetails&) [with Expected = unsigned int, Actual = int]':"),
                         QLatin1String("file.h"), -1,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Unknown,
                         QLatin1String("instantiated from here"),
                         QLatin1String("file.cpp"), 87,
-                        Constants::TASK_CATEGORY_COMPILE)
+                        categoryCompile)
                 << Task(Task::Warning,
                         QLatin1String("comparison between signed and unsigned integer expressions [-Wsign-compare]"),
                         QLatin1String("file.h"), 21,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
     QTest::newRow("linker error") // QTCREATORBUG-3107
             << QString::fromLatin1("cns5k_ins_parser_tests.cpp:(.text._ZN20CNS5kINSParserEngine21DropBytesUntilStartedEP14CircularBufferIhE[CNS5kINSParserEngine::DropBytesUntilStarted(CircularBuffer<unsigned char>*)]+0x6d): undefined reference to `CNS5kINSPacket::SOH_BYTE'")
@@ -677,7 +680,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                 << Task(Task::Error,
                         QLatin1String("undefined reference to `CNS5kINSPacket::SOH_BYTE'"),
                         QLatin1String("cns5k_ins_parser_tests.cpp"), -1,
-                        Constants::TASK_CATEGORY_COMPILE))
+                        categoryCompile))
             << QString();
 }