ProjectExplorer: Remove redundant namespace qualifications

Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc
Reviewed-by: hjk <hjk121@nokiamail.com>

src/plugins/projectexplorer/abi.cpp

@@ -307,26 +307,26 @@ Abi::Abi(const Architecture &a, const OS &o,
     m_architecture(a), m_os(o), m_osFlavor(of), m_binaryFormat(f), m_wordWidth(w)
 {
     switch (m_os) {
-    case ProjectExplorer::Abi::UnknownOS:
+    case Abi::UnknownOS:
         m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::LinuxOS:
+    case Abi::LinuxOS:
         if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > AndroidLinuxFlavor)
             m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::BsdOS:
+    case Abi::BsdOS:
         if (m_osFlavor < FreeBsdFlavor || m_osFlavor > OpenBsdFlavor)
             m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::MacOS:
+    case Abi::MacOS:
         if (m_osFlavor < GenericMacFlavor || m_osFlavor > GenericMacFlavor)
             m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::UnixOS:
+    case Abi::UnixOS:
         if (m_osFlavor < GenericUnixFlavor || m_osFlavor > SolarisUnixFlavor)
             m_osFlavor = UnknownFlavor;
         break;
-    case ProjectExplorer::Abi::WindowsOS:
+    case Abi::WindowsOS:
         if (m_osFlavor < WindowsMsvc2005Flavor || m_osFlavor > WindowsCEFlavor)
             m_osFlavor = UnknownFlavor;
         break;
@@ -628,37 +628,37 @@ QString Abi::toString(const OS &o)
 QString Abi::toString(const OSFlavor &of)
 {
     switch (of) {
-    case ProjectExplorer::Abi::GenericLinuxFlavor:
+    case Abi::GenericLinuxFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::AndroidLinuxFlavor:
+    case Abi::AndroidLinuxFlavor:
         return QLatin1String("android");
-    case ProjectExplorer::Abi::FreeBsdFlavor:
+    case Abi::FreeBsdFlavor:
         return QLatin1String("freebsd");
-    case ProjectExplorer::Abi::NetBsdFlavor:
+    case Abi::NetBsdFlavor:
         return QLatin1String("netbsd");
-    case ProjectExplorer::Abi::OpenBsdFlavor:
+    case Abi::OpenBsdFlavor:
         return QLatin1String("openbsd");
-    case ProjectExplorer::Abi::GenericMacFlavor:
+    case Abi::GenericMacFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::GenericUnixFlavor:
+    case Abi::GenericUnixFlavor:
         return QLatin1String("generic");
-    case ProjectExplorer::Abi::SolarisUnixFlavor:
+    case Abi::SolarisUnixFlavor:
         return QLatin1String("solaris");
-    case ProjectExplorer::Abi::WindowsMsvc2005Flavor:
+    case Abi::WindowsMsvc2005Flavor:
         return QLatin1String("msvc2005");
-    case ProjectExplorer::Abi::WindowsMsvc2008Flavor:
+    case Abi::WindowsMsvc2008Flavor:
         return QLatin1String("msvc2008");
-    case ProjectExplorer::Abi::WindowsMsvc2010Flavor:
+    case Abi::WindowsMsvc2010Flavor:
         return QLatin1String("msvc2010");
-    case ProjectExplorer::Abi::WindowsMsvc2012Flavor:
+    case Abi::WindowsMsvc2012Flavor:
         return QLatin1String("msvc2012");
-    case ProjectExplorer::Abi::WindowsMsvc2013Flavor:
+    case Abi::WindowsMsvc2013Flavor:
         return QLatin1String("msvc2013");
-    case ProjectExplorer::Abi::WindowsMSysFlavor:
+    case Abi::WindowsMSysFlavor:
         return QLatin1String("msys");
-    case ProjectExplorer::Abi::WindowsCEFlavor:
+    case Abi::WindowsCEFlavor:
         return QLatin1String("ce");
-    case ProjectExplorer::Abi::UnknownFlavor: // fall through!
+    case Abi::UnknownFlavor: // fall through!
     default:
         return QLatin1String("unknown");
     }

src/plugins/projectexplorer/abstractprocessstep.cpp

@@ -116,17 +116,17 @@ AbstractProcessStep::~AbstractProcessStep()
      Derived classes need to call this function.
 */
 
-void AbstractProcessStep::setOutputParser(ProjectExplorer::IOutputParser *parser)
+void AbstractProcessStep::setOutputParser(IOutputParser *parser)
 {
     delete m_outputParserChain;
     m_outputParserChain = new AnsiFilterParser;
     m_outputParserChain->appendOutputParser(parser);
 
     if (m_outputParserChain) {
-        connect(m_outputParserChain, SIGNAL(addOutput(QString,ProjectExplorer::BuildStep::OutputFormat)),
-                this, SLOT(outputAdded(QString,ProjectExplorer::BuildStep::OutputFormat)));
-        connect(m_outputParserChain, SIGNAL(addTask(ProjectExplorer::Task)),
-                this, SLOT(taskAdded(ProjectExplorer::Task)));
+        connect(m_outputParserChain, &IOutputParser::addOutput,
+                this, &AbstractProcessStep::outputAdded);
+        connect(m_outputParserChain, &IOutputParser::addTask,
+                this, &AbstractProcessStep::taskAdded);
     }
 }
 
@@ -134,7 +134,7 @@ void AbstractProcessStep::setOutputParser(ProjectExplorer::IOutputParser *parser
     Appends the given output parser to the existing chain of parsers.
 */
 
-void AbstractProcessStep::appendOutputParser(ProjectExplorer::IOutputParser *parser)
+void AbstractProcessStep::appendOutputParser(IOutputParser *parser)
 {
     if (!parser)
         return;
@@ -144,7 +144,7 @@ void AbstractProcessStep::appendOutputParser(ProjectExplorer::IOutputParser *par
     return;
 }
 
-ProjectExplorer::IOutputParser *AbstractProcessStep::outputParser() const
+IOutputParser *AbstractProcessStep::outputParser() const
 {
     return m_outputParserChain;
 }
@@ -382,7 +382,7 @@ void AbstractProcessStep::checkForCancel()
     }
 }
 
-void AbstractProcessStep::taskAdded(const ProjectExplorer::Task &task)
+void AbstractProcessStep::taskAdded(const Task &task)
 {
     // Do not bother to report issues if we do not care about the results of
     // the buildstep anyway:
@@ -407,7 +407,7 @@ void AbstractProcessStep::taskAdded(const ProjectExplorer::Task &task)
 
         QList<QFileInfo> possibleFiles;
         QString fileName = QFileInfo(filePath).fileName();
-        foreach (const QString &file, project()->files(ProjectExplorer::Project::AllFiles)) {
+        foreach (const QString &file, project()->files(Project::AllFiles)) {
             QFileInfo candidate(file);
             if (candidate.fileName() == fileName)
                 possibleFiles << candidate;
@@ -437,7 +437,7 @@ void AbstractProcessStep::taskAdded(const ProjectExplorer::Task &task)
     emit addTask(editable);
 }
 
-void AbstractProcessStep::outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format)
+void AbstractProcessStep::outputAdded(const QString &string, BuildStep::OutputFormat format)
 {
     emit addOutput(string, format, BuildStep::DontAppendNewline);
 }

src/plugins/projectexplorer/abstractprocessstep.h

@@ -62,9 +62,9 @@ public:
     bool ignoreReturnValue();
     void setIgnoreReturnValue(bool b);
 
-    void setOutputParser(ProjectExplorer::IOutputParser *parser);
-    void appendOutputParser(ProjectExplorer::IOutputParser *parser);
-    ProjectExplorer::IOutputParser *outputParser() const;
+    void setOutputParser(IOutputParser *parser);
+    void appendOutputParser(IOutputParser *parser);
+    IOutputParser *outputParser() const;
 
     void emitFaultyConfigurationMessage();
 
@@ -89,9 +89,9 @@ private slots:
 
     void cleanUp();
 
-    void taskAdded(const ProjectExplorer::Task &task);
+    void taskAdded(const Task &task);
 
-    void outputAdded(const QString &string, ProjectExplorer::BuildStep::OutputFormat format);
+    void outputAdded(const QString &string, BuildStep::OutputFormat format);
 
 private:
     QTimer *m_timer;
@@ -99,7 +99,7 @@ private:
     ProcessParameters m_param;
     bool m_ignoreReturnValue;
     Utils::QtcProcess *m_process;
-    ProjectExplorer::IOutputParser *m_outputParserChain;
+    IOutputParser *m_outputParserChain;
     bool m_killProcess;
     bool m_skipFlush;
 };

src/plugins/projectexplorer/ansifilterparser.h

@@ -34,7 +34,7 @@
 
 namespace ProjectExplorer {
 
-class AnsiFilterParser : public ProjectExplorer::IOutputParser
+class AnsiFilterParser : public IOutputParser
 {
     Q_OBJECT
 

src/plugins/projectexplorer/appoutputpane.cpp

@@ -150,7 +150,7 @@ AppOutputPane::AppOutputPane() :
     setObjectName(QLatin1String("AppOutputPane")); // Used in valgrind engine
 
     // Rerun
-    m_reRunButton->setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL)));
+    m_reRunButton->setIcon(QIcon(QLatin1String(Constants::ICON_RUN_SMALL)));
     m_reRunButton->setToolTip(tr("Re-run this run-configuration"));
     m_reRunButton->setAutoRaise(true);
     m_reRunButton->setEnabled(false);
@@ -177,7 +177,7 @@ AppOutputPane::AppOutputPane() :
     // Attach
     m_attachButton->setToolTip(msgAttachDebuggerTooltip());
     m_attachButton->setEnabled(false);
-    m_attachButton->setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_DEBUG_SMALL)));
+    m_attachButton->setIcon(QIcon(QLatin1String(Constants::ICON_DEBUG_SMALL)));
     m_attachButton->setAutoRaise(true);
 
     connect(m_attachButton, SIGNAL(clicked()),
@@ -430,7 +430,7 @@ void AppOutputPane::attachToRunControl()
 {
     const int index = currentIndex();
     QTC_ASSERT(index != -1, return);
-    ProjectExplorer::RunControl *rc = m_runControlTabs.at(index).runControl;
+    RunControl *rc = m_runControlTabs.at(index).runControl;
     QTC_ASSERT(rc->isRunning(), return);
     ExtensionSystem::Invoker<void>(debuggerCore(), "attachExternalApplication", rc);
 }
@@ -546,7 +546,7 @@ void AppOutputPane::enableButtons(const RunControl *rc /* = 0 */, bool isRunning
         }
     } else {
         m_reRunButton->setEnabled(false);
-        m_reRunButton->setIcon(QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL)));
+        m_reRunButton->setIcon(QIcon(QLatin1String(Constants::ICON_RUN_SMALL)));
         m_attachButton->setEnabled(false);
         m_attachButton->setToolTip(msgAttachDebuggerTooltip());
         m_stopAction->setEnabled(false);
@@ -591,7 +591,7 @@ void AppOutputPane::slotRunControlStarted()
 
 void AppOutputPane::slotRunControlFinished()
 {
-    ProjectExplorer::RunControl *rc = qobject_cast<RunControl *>(sender());
+    RunControl *rc = qobject_cast<RunControl *>(sender());
     QMetaObject::invokeMethod(this, "slotRunControlFinished2", Qt::QueuedConnection,
                               Q_ARG(ProjectExplorer::RunControl *, rc));
     rc->outputFormatter()->flush();

src/plugins/projectexplorer/buildconfiguration.cpp

@@ -152,7 +152,7 @@ void BuildConfiguration::setBuildDirectory(const Utils::FileName &dir)
 
 QList<NamedWidget *> BuildConfiguration::createSubConfigWidgets()
 {
-    return QList<NamedWidget *>() << new ProjectExplorer::BuildEnvironmentWidget(this);
+    return QList<NamedWidget *>() << new BuildEnvironmentWidget(this);
 }
 
 Utils::AbstractMacroExpander *BuildConfiguration::macroExpander()
@@ -218,8 +218,8 @@ bool BuildConfiguration::fromMap(const QVariantMap &map)
     }
 
     // We currently assume there to be at least a clean and build list!
-    QTC_CHECK(knownStepLists().contains(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD)));
-    QTC_CHECK(knownStepLists().contains(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN)));
+    QTC_CHECK(knownStepLists().contains(Core::Id(Constants::BUILDSTEPS_BUILD)));
+    QTC_CHECK(knownStepLists().contains(Core::Id(Constants::BUILDSTEPS_CLEAN)));
 
     return ProjectConfiguration::fromMap(map);
 }

src/plugins/projectexplorer/buildconfiguration.h

@@ -59,7 +59,7 @@ public:
     Utils::FileName buildDirectory() const;
     Utils::FileName rawBuildDirectory() const;
 
-    virtual ProjectExplorer::NamedWidget *createConfigWidget() = 0;
+    virtual NamedWidget *createConfigWidget() = 0;
     virtual QList<NamedWidget *> createSubConfigWidgets();
 
     // Maybe the BuildConfiguration is not the best place for the environment

src/plugins/projectexplorer/buildconfigurationmodel.cpp

@@ -160,7 +160,7 @@ QModelIndex BuildConfigurationModel::indexFor(BuildConfiguration *rc)
     return index(idx, 0);
 }
 
-void BuildConfigurationModel::addedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
+void BuildConfigurationModel::addedBuildConfiguration(BuildConfiguration *bc)
 {
     // Find the right place to insert
     BuildConfigurationComparer compare;
@@ -179,7 +179,7 @@ void BuildConfigurationModel::addedBuildConfiguration(ProjectExplorer::BuildConf
             this, SLOT(displayNameChanged()));
 }
 
-void BuildConfigurationModel::removedBuildConfiguration(ProjectExplorer::BuildConfiguration *bc)
+void BuildConfigurationModel::removedBuildConfiguration(BuildConfiguration *bc)
 {
     int i = m_buildConfigurations.indexOf(bc);
     beginRemoveRows(QModelIndex(), i, i);

src/plugins/projectexplorer/buildmanager.cpp

@@ -340,7 +340,7 @@ void BuildManager::showBuildResults()
     //toggleTaskWindow();
 }
 
-void BuildManager::addToTaskWindow(const ProjectExplorer::Task &task)
+void BuildManager::addToTaskWindow(const Task &task)
 {
     d->m_outputWindow->registerPositionOf(task);
     // Distribute to all others

src/plugins/projectexplorer/buildsettingspropertiespage.h

@@ -56,8 +56,8 @@ public:
     ~BuildSettingsWidget();
 
     void clearWidgets();
-    void addSubWidget(ProjectExplorer::NamedWidget *widget);
-    QList<ProjectExplorer::NamedWidget *> subWidgets() const;
+    void addSubWidget(NamedWidget *widget);
+    QList<NamedWidget *> subWidgets() const;
 
 private slots:
     void updateBuildSettings();

src/plugins/projectexplorer/compileoutputwindow.cpp

@@ -182,7 +182,7 @@ static QColor mix_colors(const QColor &a, const QColor &b)
                   (a.blue() + 2* b.blue()) / 3, (a.alpha() + 2 * b.alpha()) / 3);
 }
 
-void CompileOutputWindow::appendText(const QString &text, ProjectExplorer::BuildStep::OutputFormat format)
+void CompileOutputWindow::appendText(const QString &text, BuildStep::OutputFormat format)
 {
     QPalette p = m_outputWindow->palette();
     QTextCharFormat textFormat;

src/plugins/projectexplorer/compileoutputwindow.h

@@ -67,7 +67,7 @@ public:
     int priorityInStatusBar() const;
     void clearContents();
     void visibilityChanged(bool visible);
-    void appendText(const QString &text, ProjectExplorer::BuildStep::OutputFormat format);
+    void appendText(const QString &text, BuildStep::OutputFormat format);
     bool canFocus() const;
     bool hasFocus() const;
     void setFocus();

src/plugins/projectexplorer/configtaskhandler.cpp

@@ -47,13 +47,13 @@ ConfigTaskHandler::ConfigTaskHandler(const Task &pattern, Core::Id group, Core::
     m_targetPage(page)
 { }
 
-bool ConfigTaskHandler::canHandle(const ProjectExplorer::Task &task) const
+bool ConfigTaskHandler::canHandle(const Task &task) const
 {
     return task.description == m_pattern.description
             && task.category == m_pattern.category;
 }
 
-void ConfigTaskHandler::handle(const ProjectExplorer::Task &task)
+void ConfigTaskHandler::handle(const Task &task)
 {
     Q_UNUSED(task);
     Core::ICore::showOptionsDialog(m_targetGroup, m_targetPage);

src/plugins/projectexplorer/copytaskhandler.cpp

@@ -39,7 +39,7 @@
 
 using namespace ProjectExplorer::Internal;
 
-void CopyTaskHandler::handle(const ProjectExplorer::Task &task)
+void CopyTaskHandler::handle(const Task &task)
 {
     QString type;
     switch (task.type) {

src/plugins/projectexplorer/customparserconfigdialog.cpp

@@ -66,7 +66,7 @@ void CustomParserConfigDialog::setExampleSettings()
     ui->errorMessage->setText(QLatin1String("#error /home/user/src/test.c:891: Unknown identifier `test`"));
 }
 
-void CustomParserConfigDialog::setSettings(const ProjectExplorer::CustomParserSettings &settings)
+void CustomParserConfigDialog::setSettings(const CustomParserSettings &settings)
 {
     if (settings.errorPattern.isEmpty()) {
         setExampleSettings();
@@ -79,9 +79,9 @@ void CustomParserConfigDialog::setSettings(const ProjectExplorer::CustomParserSe
     setMessageCap(settings.messageCap);
 }
 
-ProjectExplorer::CustomParserSettings CustomParserConfigDialog::settings() const
+CustomParserSettings CustomParserConfigDialog::settings() const
 {
-    ProjectExplorer::CustomParserSettings result;
+    CustomParserSettings result;
     result.errorPattern = errorPattern();
     result.fileNameCap = fileNameCap();
     result.lineNumberCap = lineNumberCap();

src/plugins/projectexplorer/customparserconfigdialog.h

@@ -48,8 +48,8 @@ public:
     ~CustomParserConfigDialog();
 
     void setExampleSettings();
-    void setSettings(const ProjectExplorer::CustomParserSettings &settings);
-    ProjectExplorer::CustomParserSettings settings() const;
+    void setSettings(const CustomParserSettings &settings);
+    CustomParserSettings settings() const;
     void setErrorPattern(const QString &errorPattern);
     QString errorPattern() const;
     void setFileNameCap(int fileNameCap);

src/plugins/projectexplorer/deployconfiguration.cpp

@@ -122,7 +122,7 @@ bool DeployConfiguration::fromMap(const QVariantMap &map)
     }
 
     // We assume that we hold the deploy list
-    Q_ASSERT(m_stepList && m_stepList->id() == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
+    Q_ASSERT(m_stepList && m_stepList->id() == Constants::BUILDSTEPS_DEPLOY);
 
     return true;
 }

src/plugins/projectexplorer/deployconfigurationmodel.cpp

@@ -158,7 +158,7 @@ QModelIndex DeployConfigurationModel::indexFor(DeployConfiguration *rc)
     return index(idx, 0);
 }
 
-void DeployConfigurationModel::addedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
+void DeployConfigurationModel::addedDeployConfiguration(DeployConfiguration *dc)
 {
     // Find the right place to insert
     DeployConfigurationComparer compare;
@@ -176,7 +176,7 @@ void DeployConfigurationModel::addedDeployConfiguration(ProjectExplorer::DeployC
             this, SLOT(displayNameChanged()));
 }
 
-void DeployConfigurationModel::removedDeployConfiguration(ProjectExplorer::DeployConfiguration *dc)
+void DeployConfigurationModel::removedDeployConfiguration(DeployConfiguration *dc)
 {
     int i = m_deployConfigurations.indexOf(dc);
     if (i < 0)

src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h

@@ -44,7 +44,7 @@ class PROJECTEXPLORER_EXPORT DeviceCheckBuildStep : public BuildStep
     Q_OBJECT
 public:
     DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id);
-    DeviceCheckBuildStep(ProjectExplorer::BuildStepList *bsl, DeviceCheckBuildStep *bs);
+    DeviceCheckBuildStep(BuildStepList *bsl, DeviceCheckBuildStep *bs);
 
     bool init();
 

src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp

@@ -51,7 +51,7 @@ public:
     bool finished;
 };
 
-DeviceTestDialog::DeviceTestDialog(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration,
+DeviceTestDialog::DeviceTestDialog(const IDevice::ConstPtr &deviceConfiguration,
                                    QWidget *parent)
     : QDialog(parent), d(new DeviceTestDialogPrivate(deviceConfiguration->createDeviceTester()))
 {
@@ -87,12 +87,12 @@ void DeviceTestDialog::handleErrorMessage(const QString &message)
     addText(message, QLatin1String("red"), false);
 }
 
-void DeviceTestDialog::handleTestFinished(ProjectExplorer::DeviceTester::TestResult result)
+void DeviceTestDialog::handleTestFinished(DeviceTester::TestResult result)
 {
     d->finished = true;
     d->ui.buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close"));
 
-    if (result == ProjectExplorer::DeviceTester::TestSuccess)
+    if (result == DeviceTester::TestSuccess)
         addText(tr("Device test finished successfully."), QLatin1String("blue"), true);
     else
         addText(tr("Device test failed."), QLatin1String("red"), true);

src/plugins/projectexplorer/editorconfiguration.cpp

@@ -388,7 +388,7 @@ void EditorConfiguration::setWrapColumn(int column)
     }
 }
 
-void EditorConfiguration::slotAboutToRemoveProject(ProjectExplorer::Project *project)
+void EditorConfiguration::slotAboutToRemoveProject(Project *project)
 {
     if (project->editorConfiguration() != this)
         return;

src/plugins/projectexplorer/environmentaspectwidget.cpp

@@ -85,7 +85,7 @@ EnvironmentAspectWidget::EnvironmentAspectWidget(EnvironmentAspect *aspect, QWid
     if (additionalWidget)
         baseLayout->addWidget(additionalWidget);
 
-    m_environmentWidget = new ProjectExplorer::EnvironmentWidget(this, baseEnvironmentWidget);
+    m_environmentWidget = new EnvironmentWidget(this, baseEnvironmentWidget);
     m_environmentWidget->setBaseEnvironment(m_aspect->baseEnvironment());
     m_environmentWidget->setBaseEnvironmentText(baseDisplayName);
     m_environmentWidget->setUserChanges(m_aspect->userEnvironmentChanges());

src/plugins/projectexplorer/environmentaspectwidget.h

@@ -76,7 +76,7 @@ private:
     QWidget *m_additionalWidget;
     QComboBox *m_baseEnvironmentComboBox;
     Utils::DetailsWidget *m_detailsContainer;
-    ProjectExplorer::EnvironmentWidget *m_environmentWidget;
+    EnvironmentWidget *m_environmentWidget;
 };
 
 } // namespace ProjectExplorer

src/plugins/projectexplorer/gccparser.cpp

@@ -204,18 +204,18 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
     QTest::newRow("pass-through stdout")
             << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT
             << QString::fromLatin1("Sometext\n") << QString()
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
     QTest::newRow("pass-through stderr")
             << QString::fromLatin1("Sometext") << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("Sometext\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
 
     QTest::newRow("ar output")
             << QString::fromLatin1("../../../../x86/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ar: creating lib/libSkyView.a") << OutputParserTester::STDERR
             << QString() << QString::fromLatin1("../../../../x86/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ar: creating lib/libSkyView.a\n")
-            << QList<ProjectExplorer::Task>()
+            << QList<Task>()
             << QString();
 
     QTest::newRow("GCCE error")
@@ -224,7 +224,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "/temp/test/untitled8/main.cpp:9: error: (Each undeclared identifier is reported only once for each function it appears in.)")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Unknown,
                         QLatin1String("In function `int main(int, char**)':"),
                         Utils::FileName::fromUserInput(QLatin1String("/temp/test/untitled8/main.cpp")), -1,
@@ -243,7 +243,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("/src/corelib/global/qglobal.h:1635: warning: inline function `QDebug qDebug()' used but never defined")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Warning,
                         QLatin1String("inline function `QDebug qDebug()' used but never defined"),
                         Utils::FileName::fromUserInput(QLatin1String("/src/corelib/global/qglobal.h")), 1635,
@@ -253,7 +253,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("main.cpp:7:2: warning: Some warning")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>() << Task(Task::Warning,
+            << (QList<Task>() << Task(Task::Warning,
                                                        QLatin1String("Some warning"),
                                                        Utils::FileName::fromUserInput(QLatin1String("main.cpp")), 7,
                                                        categoryCompile))
@@ -262,7 +262,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:7: #error Symbian error")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Error,
                         QLatin1String("#error Symbian error"),
                         Utils::FileName::fromUserInput(QLatin1String("C:\\temp\\test\\untitled8\\main.cpp")), 7,
@@ -273,7 +273,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("C:\\temp\\test\\untitled8\\main.cpp:8: warning: #warning Symbian warning")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Warning,
                         QLatin1String("#warning Symbian warning"),
                         Utils::FileName::fromUserInput(QLatin1String("C:\\temp\\test\\untitled8\\main.cpp")), 8,
@@ -283,7 +283,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
             << QString::fromLatin1("/temp/test/untitled8/main.cpp:8:2: warning: #warning Symbian warning")
             << OutputParserTester::STDERR
             << QString() << QString()
-            << (QList<ProjectExplorer::Task>()
+            << (QList<Task>()
                 << Task(Task::Warning,
                         QLatin1String("#warning Symbian warning"),
                         Utils::FileName::fromUserInput(QLatin1String("/temp/test/untitled8/main.cpp")), 8,
@@ -295,7 +295,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data()
                                    "collect2: ld returned 1 exit status")
             << OutputParserTester::STDERR
             << QString() << QString()