feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Task: Update Task to use Utils::FileName and Core::Id

Browse Source 
Use Utils::FileName and Core::Id in Task structure.

Change-Id: Ia0ed459f86df36ffe547abde7c240b0ac409bcf5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-01-26 13:38:25 +01:00
parent 2f021edfdd
commit 97496df1bf
44 changed files with 410 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qt4projectmanager/qmakeparser.cpp
View File

@@ -54,18 +54,18 @@ void QMakeParser::stdError(const QString &line)
const QString description = lne.mid(15);
emit addTask(Task(Task::Error,
description,
QString() /* filename */,
Utils::FileName() /* filename */,
-1 /* linenumber */,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return;
}
if (lne.startsWith(QLatin1String("Project WARNING:"))) {
const QString description = lne.mid(17);
emit addTask(Task(Task::Warning,
description,
QString() /* filename */,
Utils::FileName() /* filename */,
-1 /* linenumber */,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return;
}
if (m_error.indexIn(lne) > -1) {
@@ -79,9 +79,9 @@ void QMakeParser::stdError(const QString &line)
}
emit addTask(Task(type,
m_error.cap(3) /* description */,
fileName,
Utils::FileName::fromUserInput(fileName),
m_error.cap(2).toInt() /* line */,
QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)));
return;
}
IOutputParser::stdError(line);
@@ -102,7 +102,7 @@ using namespace ProjectExplorer;
void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
{
const QString categoryBuildSystem = QLatin1String(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
const Core::Id categoryBuildSystem = Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
QTest::addColumn<QString>("input");
QTest::addColumn<OutputParserTester::Channel>("inputChannel");
QTest::addColumn<QString>("childStdOutLines");
@@ -129,7 +129,7 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
<< (QList<ProjectExplorer::Task>()
<< Task(Task::Error,
QLatin1String("undefined file"),
QString(), -1,
Utils::FileName(), -1,
categoryBuildSystem))
<< QString();
@@ -140,7 +140,7 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
<< (QList<ProjectExplorer::Task>()
<< Task(Task::Error,
QLatin1String("Parse Error ('sth odd')"),
QLatin1String("e:\\project.pro"),
Utils::FileName::fromUserInput("e:\\project.pro"),
14,
categoryBuildSystem))
<< QString();
@@ -152,7 +152,7 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
<< (QList<ProjectExplorer::Task>()
<< Task(Task::Warning,
QLatin1String("bearer module might require ReadUserData capability"),
QString(), -1,
Utils::FileName(), -1,
categoryBuildSystem))
<< QString();
@@ -163,7 +163,7 @@ void Qt4ProjectManagerPlugin::testQmakeOutputParsers_data()
<< (QList<ProjectExplorer::Task>()
<< Task(Task::Warning,
QLatin1String("Unescaped backslashes are deprecated."),
QLatin1String("e:\\NokiaQtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl"), 1,
Utils::FileName::fromUserInput("e:\\NokiaQtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl"), 1,
categoryBuildSystem))
<< QString();
}