From 1dd44cfba19be1063e2b8ba73a10df4ba36625ea Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 19 Aug 2013 15:51:26 +0200 Subject: [PATCH] Remove some useless Core::Id(...) and ProjectExplorer:: Change-Id: Iebf4302bb5e3f893dc573e504efc214861d80848 Reviewed-by: Daniel Teske --- src/plugins/projectexplorer/clangparser.cpp | 6 +- src/plugins/projectexplorer/customparser.cpp | 2 +- src/plugins/projectexplorer/gccparser.cpp | 10 +-- src/plugins/projectexplorer/gnumakeparser.cpp | 12 ++-- src/plugins/projectexplorer/ldparser.cpp | 6 +- .../projectexplorer/linuxiccparser.cpp | 8 +-- src/plugins/projectexplorer/msvcparser.cpp | 61 ++++++++++--------- src/plugins/qtsupport/qtparser.cpp | 10 +-- 8 files changed, 58 insertions(+), 57 deletions(-) diff --git a/src/plugins/projectexplorer/clangparser.cpp b/src/plugins/projectexplorer/clangparser.cpp index cc55157358..51604d812c 100644 --- a/src/plugins/projectexplorer/clangparser.cpp +++ b/src/plugins/projectexplorer/clangparser.cpp @@ -63,7 +63,7 @@ void ClangParser::stdError(const QString &line) m_commandRegExp.cap(4), Utils::FileName(), /* filename */ -1, /* line */ - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); if (m_commandRegExp.cap(3) == QLatin1String("warning")) task.type = Task::Warning; else if (m_commandRegExp.cap(3) == QLatin1String("note")) @@ -78,7 +78,7 @@ void ClangParser::stdError(const QString &line) lne.trimmed(), Utils::FileName::fromUserInput(m_inLineRegExp.cap(2)), /* filename */ m_inLineRegExp.cap(3).toInt(), /* line */ - Core::Id(Constants::TASK_CATEGORY_COMPILE))); + Constants::TASK_CATEGORY_COMPILE)); return; } @@ -127,7 +127,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data() QTest::addColumn >("tasks"); QTest::addColumn("outputLines"); - const Core::Id categoryCompile = Core::Id(Constants::TASK_CATEGORY_COMPILE); + const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; QTest::newRow("pass-through stdout") << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp index 3622f24994..4df78c2e5d 100644 --- a/src/plugins/projectexplorer/customparser.cpp +++ b/src/plugins/projectexplorer/customparser.cpp @@ -170,7 +170,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() QTest::addColumn >("tasks"); QTest::addColumn("outputLines"); - const Core::Id categoryCompile = Core::Id(Constants::TASK_CATEGORY_COMPILE); + const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; const QString simplePattern = QLatin1String("^([a-z]+\\.[a-z]+):(\\d+): error: ([^\\s].+)$"); const Utils::FileName fileName = Utils::FileName::fromUserInput(QLatin1String("main.c")); diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index 1753e12258..93e42b9810 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/src/plugins/projectexplorer/gccparser.cpp @@ -83,7 +83,7 @@ void GccParser::stdError(const QString &line) lne /* description */, Utils::FileName() /* filename */, -1 /* linenumber */, - Core::Id(Constants::TASK_CATEGORY_COMPILE))); + Constants::TASK_CATEGORY_COMPILE)); return; } else if (m_regExpGccNames.indexIn(lne) > -1) { QString description = lne.mid(m_regExpGccNames.matchedLength()); @@ -91,7 +91,7 @@ void GccParser::stdError(const QString &line) description, Utils::FileName(), /* filename */ -1, /* line */ - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); if (description.startsWith(QLatin1String("warning: "))) { task.type = Task::Warning; task.description = description.mid(9); @@ -106,7 +106,7 @@ void GccParser::stdError(const QString &line) Task task(Task::Unknown, m_regExp.cap(8) /* description */, filename, lineno, - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); if (m_regExp.cap(7) == QLatin1String("warning")) task.type = Task::Warning; else if (m_regExp.cap(7) == QLatin1String("error") || @@ -126,7 +126,7 @@ void GccParser::stdError(const QString &line) lne.trimmed() /* description */, Utils::FileName::fromUserInput(m_regExpIncluded.cap(1)) /* filename */, m_regExpIncluded.cap(3).toInt() /* linenumber */, - Core::Id(Constants::TASK_CATEGORY_COMPILE))); + Constants::TASK_CATEGORY_COMPILE)); return; } else if (lne.startsWith(QLatin1Char(' '))) { amendDescription(lne, true); @@ -194,7 +194,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data() QTest::addColumn >("tasks"); QTest::addColumn("outputLines"); - const Core::Id categoryCompile = Core::Id(Constants::TASK_CATEGORY_COMPILE); + const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; QTest::newRow("pass-through stdout") << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT diff --git a/src/plugins/projectexplorer/gnumakeparser.cpp b/src/plugins/projectexplorer/gnumakeparser.cpp index a1d19cc64f..781da4842e 100644 --- a/src/plugins/projectexplorer/gnumakeparser.cpp +++ b/src/plugins/projectexplorer/gnumakeparser.cpp @@ -429,12 +429,12 @@ void ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data() QLatin1String("no filename, no mangling"), Utils::FileName(), -1, - Core::Id(Constants::TASK_CATEGORY_COMPILE)) + Constants::TASK_CATEGORY_COMPILE) << Task(Task::Error, QLatin1String("no filename, no mangling"), Utils::FileName(), -1, - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); QTest::newRow("no mangling") << QStringList() << QStringList() @@ -442,12 +442,12 @@ void ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data() QLatin1String("unknown filename, no mangling"), Utils::FileName::fromUserInput(QLatin1String("some/path/unknown.cpp")), -1, - Core::Id(Constants::TASK_CATEGORY_COMPILE)) + Constants::TASK_CATEGORY_COMPILE) << Task(Task::Error, QLatin1String("unknown filename, no mangling"), Utils::FileName::fromUserInput(QLatin1String("some/path/unknown.cpp")), -1, - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); QTest::newRow("find file") << (QStringList(QLatin1String("test/file.cpp"))) << (QStringList(QLatin1String("test"))) @@ -455,12 +455,12 @@ void ProjectExplorerPlugin::testGnuMakeParserTaskMangling_data() QLatin1String("mangling"), Utils::FileName::fromUserInput(QLatin1String("file.cpp")), 10, - Core::Id(Constants::TASK_CATEGORY_COMPILE)) + Constants::TASK_CATEGORY_COMPILE) << Task(Task::Error, QLatin1String("mangling"), Utils::FileName::fromUserInput(QLatin1String("$TMPDIR/test/file.cpp")), 10, - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); } void ProjectExplorerPlugin::testGnuMakeParserTaskMangling() diff --git a/src/plugins/projectexplorer/ldparser.cpp b/src/plugins/projectexplorer/ldparser.cpp index 47ff09bc4c..ff32ad8a16 100644 --- a/src/plugins/projectexplorer/ldparser.cpp +++ b/src/plugins/projectexplorer/ldparser.cpp @@ -74,7 +74,7 @@ void LdParser::stdError(const QString &line) lne /* description */, Utils::FileName() /* filename */, -1 /* linenumber */, - Core::Id(Constants::TASK_CATEGORY_COMPILE))); + Constants::TASK_CATEGORY_COMPILE)); return; } else if (m_regExpGccNames.indexIn(lne) > -1) { QString description = lne.mid(m_regExpGccNames.matchedLength()); @@ -82,7 +82,7 @@ void LdParser::stdError(const QString &line) description, Utils::FileName(), /* filename */ -1, /* line */ - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); if (description.startsWith(QLatin1String("warning: "))) { task.type = Task::Warning; task.description = description.mid(9); @@ -105,7 +105,7 @@ void LdParser::stdError(const QString &line) } QString description = m_regExpLinker.cap(8).trimmed(); Task task(Task::Error, description, filename, lineno, - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); if (description.startsWith(QLatin1String("At global scope")) || description.startsWith(QLatin1String("At top level")) || description.startsWith(QLatin1String("instantiated from ")) || diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp index 901c3afe23..a9de97acbf 100644 --- a/src/plugins/projectexplorer/linuxiccparser.cpp +++ b/src/plugins/projectexplorer/linuxiccparser.cpp @@ -70,7 +70,7 @@ void LinuxIccParser::stdError(const QString &line) m_temporary = ProjectExplorer::Task(Task::Unknown, m_firstLine.cap(6).trimmed(), Utils::FileName::fromUserInput(m_firstLine.cap(1)), m_firstLine.cap(2).toInt(), - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); QString category = m_firstLine.cap(4); if (category == QLatin1String("error")) m_temporary.type = Task::Error; @@ -152,7 +152,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data() << Task(Task::Error, QLatin1String("identifier \"f\" is undefined\nf(0);"), Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 13, - Core::Id(Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("private function") @@ -166,7 +166,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data() << Task(Task::Error, QLatin1String("function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible\nb.privatefunc();"), Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 53, - Core::Id(Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("simple warning") @@ -180,7 +180,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data() << Task(Task::Warning, QLatin1String("use of \"=\" where \"==\" may have been intended\nwhile (a = true)"), Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 41, - Core::Id(Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); } diff --git a/src/plugins/projectexplorer/msvcparser.cpp b/src/plugins/projectexplorer/msvcparser.cpp index 56c4e4bc69..0744ddd063 100644 --- a/src/plugins/projectexplorer/msvcparser.cpp +++ b/src/plugins/projectexplorer/msvcparser.cpp @@ -117,7 +117,7 @@ void MsvcParser::stdOutput(const QString &line) line.mid(6).trimmed(), /* description */ Utils::FileName(), /* fileName */ -1, /* linenumber */ - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); return; } if (line.startsWith(QLatin1String("Warning:"))) { @@ -125,7 +125,7 @@ void MsvcParser::stdOutput(const QString &line) line.mid(8).trimmed(), /* description */ Utils::FileName(), /* fileName */ -1, /* linenumber */ - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); return; } if (infoPos > -1) { @@ -133,7 +133,7 @@ void MsvcParser::stdOutput(const QString &line) m_additionalInfoRegExp.cap(3).trimmed(), /* description */ Utils::FileName::fromUserInput(m_additionalInfoRegExp.cap(1)), /* fileName */ m_additionalInfoRegExp.cap(2).toInt(), /* linenumber */ - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); return; } IOutputParser::stdOutput(line); @@ -155,7 +155,7 @@ bool MsvcParser::processCompileLine(const QString &line) m_lastTask = Task(Task::Unknown, m_compileRegExp.cap(4).trimmed() /* description */, position.first, position.second, - Core::Id(Constants::TASK_CATEGORY_COMPILE)); + Constants::TASK_CATEGORY_COMPILE); if (m_compileRegExp.cap(3) == QLatin1String("warning")) m_lastTask.type = Task::Warning; else if (m_compileRegExp.cap(3) == QLatin1String("error")) @@ -186,6 +186,7 @@ void MsvcParser::doFlush() # include "projectexplorer/outputparser_test.h" using namespace ProjectExplorer::Internal; +using namespace ProjectExplorer; void ProjectExplorerPlugin::testMsvcOutputParsers_data() { @@ -193,39 +194,39 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data() QTest::addColumn("inputChannel"); QTest::addColumn("childStdOutLines"); QTest::addColumn("childStdErrLines"); - QTest::addColumn >("tasks"); + QTest::addColumn >("tasks"); QTest::addColumn("outputLines"); QTest::newRow("pass-through stdout") << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext\n") << QString() - << QList() + << QList() << QString(); QTest::newRow("pass-through stderr") << QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString() << QString::fromLatin1("Sometext\n") - << QList() + << QList() << QString(); QTest::newRow("labeled error") << QString::fromLatin1("qmlstandalone\\main.cpp(54) : error C4716: 'findUnresolvedModule' : must return a value") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Error, QLatin1String("C4716: 'findUnresolvedModule' : must return a value"), Utils::FileName::fromUserInput(QLatin1String("qmlstandalone\\main.cpp")), 54, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("labeled warning") << QString::fromLatin1("x:\\src\\plugins\\projectexplorer\\msvcparser.cpp(69) : warning C4100: 'something' : unreferenced formal parameter") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Warning, QLatin1String("C4100: 'something' : unreferenced formal parameter"), Utils::FileName::fromUserInput(QLatin1String("x:\\src\\plugins\\projectexplorer\\msvcparser.cpp")), 69, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("additional information") @@ -233,26 +234,26 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data() " x:\\src\\plugins\\texteditor\\completionsupport.h(39) : see declaration of 'TextEditor::CompletionItem'") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Warning, QLatin1String("C4099: 'TextEditor::CompletionItem' : type name first seen using 'struct' now seen using 'class'"), Utils::FileName::fromUserInput(QLatin1String("x:\\src\\plugins\\texteditor\\icompletioncollector.h")), 50, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) + Constants::TASK_CATEGORY_COMPILE) << Task(Task::Unknown, QLatin1String("see declaration of 'TextEditor::CompletionItem'"), Utils::FileName::fromUserInput(QLatin1String("x:\\src\\plugins\\texteditor\\completionsupport.h")), 39, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("fatal linker error") << QString::fromLatin1("LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Error, QLatin1String("LNK1146: no argument specified with option '/LIBPATH:'"), Utils::FileName(), -1, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); // This actually comes through stderr! @@ -260,11 +261,11 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data() << QString::fromLatin1("cl : Command line warning D9002 : ignoring unknown option '-fopenmp'") << OutputParserTester::STDERR << QString() << QString() - << (QList() + << (QList() << Task(Task::Warning, QLatin1String("D9002 : ignoring unknown option '-fopenmp'"), Utils::FileName(), -1, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("complex error") << QString::fromLatin1("..\\untitled\\main.cpp(19) : error C2440: 'initializing' : cannot convert from 'int' to 'std::_Tree<_Traits>::iterator'\n" @@ -275,7 +276,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data() " No constructor could take the source type, or constructor overload resolution was ambiguous") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Error, QLatin1String("C2440: 'initializing' : cannot convert from 'int' to 'std::_Tree<_Traits>::iterator'\n" "with\n" @@ -284,37 +285,37 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data() "]\n" "No constructor could take the source type, or constructor overload resolution was ambiguous"), Utils::FileName::fromUserInput(QLatin1String("..\\untitled\\main.cpp")), 19, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("Linker error 1") << QString::fromLatin1("main.obj : error LNK2019: unresolved external symbol \"public: void __thiscall Data::doit(void)\" (?doit@Data@@QAEXXZ) referenced in function _main") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Error, QLatin1String("LNK2019: unresolved external symbol \"public: void __thiscall Data::doit(void)\" (?doit@Data@@QAEXXZ) referenced in function _main"), Utils::FileName::fromUserInput(QLatin1String("main.obj")), -1, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("Linker error 2") << QString::fromLatin1("debug\\Experimentation.exe : fatal error LNK1120: 1 unresolved externals") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Error, QLatin1String("LNK1120: 1 unresolved externals"), Utils::FileName::fromUserInput(QLatin1String("debug\\Experimentation.exe")), -1, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("Linker error 3") << QString::fromLatin1("Error: dependent '..\\..\\..\\..\\creator-2.5\\src\\plugins\\coreplugin\\ifile.h' does not exist.") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Error, QLatin1String("dependent '..\\..\\..\\..\\creator-2.5\\src\\plugins\\coreplugin\\ifile.h' does not exist."), Utils::FileName(), -1, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("Multiline error") @@ -328,15 +329,15 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data() " ]") << OutputParserTester::STDOUT << QString() << QString() - << (QList() + << (QList() << Task(Task::Warning, QLatin1String("C4996: 'std::_Copy_impl': Function call with parameters that may be unsafe - this call relies on the caller to check that the passed values are correct. To disable this warning, use -D_SCL_SECURE_NO_WARNINGS. See documentation on how to use Visual C++ 'Checked Iterators'"), Utils::FileName::fromUserInput(QLatin1String("c:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\INCLUDE\\xutility")), 2227, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) + Constants::TASK_CATEGORY_COMPILE) << Task(Task::Unknown, QLatin1String("see declaration of 'std::_Copy_impl'"), Utils::FileName::fromUserInput(QLatin1String("c:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\INCLUDE\\xutility")), 2212, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) + Constants::TASK_CATEGORY_COMPILE) << Task(Task::Unknown, QLatin1String("see reference to function template instantiation '_OutIt std::copy(_InIt,_InIt,_OutIt)' being compiled\n" "with\n" @@ -345,7 +346,7 @@ void ProjectExplorerPlugin::testMsvcOutputParsers_data() " _InIt=const unsigned char *\n" "]"), Utils::FileName::fromUserInput(QLatin1String("symbolgroupvalue.cpp")), 2314, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + Constants::TASK_CATEGORY_COMPILE)) << QString(); } diff --git a/src/plugins/qtsupport/qtparser.cpp b/src/plugins/qtsupport/qtparser.cpp index 3e64cc4efc..42bab6995f 100644 --- a/src/plugins/qtsupport/qtparser.cpp +++ b/src/plugins/qtsupport/qtparser.cpp @@ -57,7 +57,7 @@ void QtParser::stdError(const QString &line) m_mocRegExp.cap(5).trimmed(), Utils::FileName::fromUserInput(m_mocRegExp.cap(1)) /* filename */, lineno, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)); + ProjectExplorer::Constants::TASK_CATEGORY_COMPILE); if (m_mocRegExp.cap(4).compare(QLatin1String("Warning"), Qt::CaseInsensitive) == 0) task.type = Task::Warning; emit addTask(task); @@ -121,7 +121,7 @@ void QtSupportPlugin::testQtOutputParser_data() << (QList() << Task(Task::Warning, QLatin1String("Can't create link to 'Object Trees & Ownership'"), Utils::FileName::fromUserInput(QLatin1String("/home/user/dev/qt5/qtscript/src/script/api/qscriptengine.cpp")), 295, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("moc warning") << QString::fromLatin1("..\\untitled\\errorfile.h:0: Warning: No relevant classes found. No output generated.") @@ -130,7 +130,7 @@ void QtSupportPlugin::testQtOutputParser_data() << (QList() << Task(Task::Warning, QLatin1String("No relevant classes found. No output generated."), Utils::FileName::fromUserInput(QLatin1String("..\\untitled\\errorfile.h")), 0, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("moc warning 2") << QString::fromLatin1("c:\\code\\test.h(96): Warning: Property declaration ) has no READ accessor function. The property will be invalid.") @@ -139,7 +139,7 @@ void QtSupportPlugin::testQtOutputParser_data() << (QList() << Task(Task::Warning, QLatin1String("Property declaration ) has no READ accessor function. The property will be invalid."), Utils::FileName::fromUserInput(QLatin1String("c:\\code\\test.h")), 96, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) << QString(); QTest::newRow("ninja with moc") << QString::fromLatin1("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h(54): Error: Undefined interface") @@ -148,7 +148,7 @@ void QtSupportPlugin::testQtOutputParser_data() << (QList() << Task(Task::Error, QLatin1String("Undefined interface"), Utils::FileName::fromUserInput(QLatin1String("E:/sandbox/creator/loaden/src/libs/utils/iwelcomepage.h")), 54, - Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE))) + ProjectExplorer::Constants::TASK_CATEGORY_COMPILE)) << QString(); } -- GitLab