diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-01-26 13:38:25 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-01-30 11:34:43 +0100 |
| commit | 97496df1bf889c69f686edf707ba71a226064067 (patch) | |
| tree | 216d2101026dd9f8ca6b19d87a41a14d86490d5e /src/plugins/projectexplorer/linuxiccparser.cpp | |
| parent | 2f021edfddc0483202d1bb434cb30accb8059899 (diff) | |
Task: Update Task to use Utils::FileName and Core::Id
Use Utils::FileName and Core::Id in Task structure.
Change-Id: Ia0ed459f86df36ffe547abde7c240b0ac409bcf5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/projectexplorer/linuxiccparser.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/linuxiccparser.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp index 6a932b4b9b..11abb9859a 100644 --- a/src/plugins/projectexplorer/linuxiccparser.cpp +++ b/src/plugins/projectexplorer/linuxiccparser.cpp @@ -73,9 +73,9 @@ void LinuxIccParser::stdError(const QString &line) if (m_expectFirstLine && m_firstLine.indexIn(line) != -1) { // Clear out old task m_temporary = ProjectExplorer::Task(Task::Unknown, m_firstLine.cap(6).trimmed(), - m_firstLine.cap(1), + Utils::FileName::fromUserInput(m_firstLine.cap(1)), m_firstLine.cap(2).toInt(), - QLatin1String(Constants::TASK_CATEGORY_COMPILE)); + Core::Id(Constants::TASK_CATEGORY_COMPILE)); QString category = m_firstLine.cap(4); if (category == QLatin1String("error")) m_temporary.type = Task::Error; @@ -126,8 +126,6 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_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 << QString::fromLatin1("Sometext\n") << QString() @@ -149,8 +147,8 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data() << (QList<ProjectExplorer::Task>() << Task(Task::Error, QLatin1String("identifier \"f\" is undefined\nf(0);"), - QLatin1String("main.cpp"), 13, - categoryCompile)) + Utils::FileName::fromUserInput("main.cpp"), 13, + Core::Id(Constants::TASK_CATEGORY_COMPILE))) << QString(); QTest::newRow("private function") @@ -163,8 +161,8 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data() << (QList<ProjectExplorer::Task>() << Task(Task::Error, QLatin1String("function \"AClass::privatefunc\" (declared at line 4 of \"main.h\") is inaccessible\nb.privatefunc();"), - QLatin1String("main.cpp"), 53, - categoryCompile)) + Utils::FileName::fromUserInput("main.cpp"), 53, + Core::Id(Constants::TASK_CATEGORY_COMPILE))) << QString(); QTest::newRow("simple warning") @@ -177,8 +175,8 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data() << (QList<ProjectExplorer::Task>() << Task(Task::Warning, QLatin1String("use of \"=\" where \"==\" may have been intended\nwhile (a = true)"), - QLatin1String("main.cpp"), 41, - categoryCompile)) + Utils::FileName::fromUserInput("main.cpp"), 41, + Core::Id(Constants::TASK_CATEGORY_COMPILE))) << QString(); } |