diff options
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeparser.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparser.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparser.cpp b/src/plugins/qmakeprojectmanager/qmakeparser.cpp index 4af888cc2c..ed6abf5ca7 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparser.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparser.cpp @@ -59,7 +59,7 @@ void QMakeParser::stdError(const QString &line) type = Task::Error; Task task = Task(type, description, - Utils::FileName::fromUserInput(fileName), + Utils::FilePath::fromUserInput(fileName), m_error.cap(2).toInt() /* line */, Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); emit addTask(task, 1); @@ -70,7 +70,7 @@ void QMakeParser::stdError(const QString &line) const QString description = lne.mid(lne.indexOf(QLatin1Char(':')) + 2); Task task = Task(Task::Error, description, - Utils::FileName() /* filename */, + Utils::FilePath() /* filename */, -1 /* linenumber */, Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); emit addTask(task, 1); @@ -81,7 +81,7 @@ void QMakeParser::stdError(const QString &line) const QString description = lne.mid(lne.indexOf(QLatin1Char(':')) + 2); Task task = Task(Task::Warning, description, - Utils::FileName() /* filename */, + Utils::FilePath() /* filename */, -1 /* linenumber */, Core::Id(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); emit addTask(task, 1); @@ -110,29 +110,29 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data() QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdErrLines"); - QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); + QTest::addColumn<Tasks >("tasks"); QTest::addColumn<QString>("outputLines"); QTest::newRow("pass-through stdout") << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext\n") << QString() - << QList<ProjectExplorer::Task>() + << Tasks() << QString(); QTest::newRow("pass-through stderr") << QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString() << QString::fromLatin1("Sometext\n") - << QList<ProjectExplorer::Task>() + << Tasks() << QString(); QTest::newRow("qMake error") << QString::fromLatin1("Project ERROR: undefined file") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (Tasks() << Task(Task::Error, QLatin1String("undefined file"), - Utils::FileName(), -1, + Utils::FilePath(), -1, categoryBuildSystem)) << QString(); @@ -140,10 +140,10 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data() << QString::fromLatin1("e:\\project.pro:14: Parse Error ('sth odd')") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (Tasks() << Task(Task::Error, QLatin1String("Parse Error ('sth odd')"), - Utils::FileName::fromUserInput(QLatin1String("e:\\project.pro")), + Utils::FilePath::fromUserInput(QLatin1String("e:\\project.pro")), 14, categoryBuildSystem)) << QString(); @@ -152,10 +152,10 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data() << QString::fromLatin1("Project WARNING: bearer module might require ReadUserData capability") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (Tasks() << Task(Task::Warning, QLatin1String("bearer module might require ReadUserData capability"), - Utils::FileName(), -1, + Utils::FilePath(), -1, categoryBuildSystem)) << QString(); @@ -163,10 +163,10 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data() << QString::fromLatin1("WARNING: Failure to find: blackberrycreatepackagestepconfigwidget.cpp") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (Tasks() << Task(Task::Warning, QLatin1String("Failure to find: blackberrycreatepackagestepconfigwidget.cpp"), - Utils::FileName(), -1, + Utils::FilePath(), -1, categoryBuildSystem)) << QString(); @@ -174,20 +174,20 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers_data() << QString::fromLatin1("WARNING: e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl:1: Unescaped backslashes are deprecated.") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (Tasks() << Task(Task::Warning, QLatin1String("Unescaped backslashes are deprecated."), - Utils::FileName::fromUserInput(QLatin1String("e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl")), 1, + Utils::FilePath::fromUserInput(QLatin1String("e:\\QtSDK\\Simulator\\Qt\\msvc2008\\lib\\qtmaind.prl")), 1, categoryBuildSystem)) << QString(); QTest::newRow("moc note") << QString::fromLatin1("/home/qtwebkithelpviewer.h:0: Note: No relevant classes found. No output generated.") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (Tasks() << Task(Task::Unknown, QLatin1String("Note: No relevant classes found. No output generated."), - Utils::FileName::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0, + Utils::FilePath::fromUserInput(QLatin1String("/home/qtwebkithelpviewer.h")), 0, categoryBuildSystem) ) << QString();} @@ -198,7 +198,7 @@ void QmakeProjectManagerPlugin::testQmakeOutputParsers() testbench.appendOutputParser(new QMakeParser); QFETCH(QString, input); QFETCH(OutputParserTester::Channel, inputChannel); - QFETCH(QList<Task>, tasks); + QFETCH(Tasks, tasks); QFETCH(QString, childStdOutLines); QFETCH(QString, childStdErrLines); QFETCH(QString, outputLines); |