Qnx: Remove unneeded qualifications

Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I78a70180927d085822e215ffb2b8ad256301e4a7
Reviewed-by: hjk <hjk@theqtcompany.com>

11 files changed, 70 insertions, 71 deletions

diff --git a/src/plugins/qnx/bardescriptoreditorwidget.cpp b/src/plugins/qnx/bardescriptoreditorwidget.cpp
index d0de2eef49..0fc9267739 100644
--- a/src/plugins/qnx/bardescriptoreditorwidget.cpp
+++ b/src/plugins/qnx/bardescriptoreditorwidget.cpp
@@ -171,9 +171,9 @@ void BarDescriptorEditorWidget::initSourcePage()
 {
     TextDocumentPtr doc(new TextDocument);
     doc->setId(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); // FIXME: This looks odd.
-    doc->setIndenter(new TextEditor::NormalIndenter);
+    doc->setIndenter(new NormalIndenter);
 
-    m_xmlSourceWidget = new TextEditor::TextEditorWidget(this);
+    m_xmlSourceWidget = new TextEditorWidget(this);
     m_xmlSourceWidget->setTextDocument(doc);
     m_xmlSourceWidget->setupAsPlainEditor();
     addWidget(m_xmlSourceWidget);
@@ -187,7 +187,7 @@ void BarDescriptorEditorWidget::initPanelSize(ProjectExplorer::PanelsWidget *pan
     panelsWidget->widget()->setMinimumWidth(0);
 }
 
-TextEditor::TextEditorWidget *BarDescriptorEditorWidget::sourceWidget() const
+TextEditorWidget *BarDescriptorEditorWidget::sourceWidget() const
 {
     return m_xmlSourceWidget;
 }
diff --git a/src/plugins/qnx/blackberryapilevelconfiguration.cpp b/src/plugins/qnx/blackberryapilevelconfiguration.cpp
index 0aa3b53834..ba5df95920 100644
--- a/src/plugins/qnx/blackberryapilevelconfiguration.cpp
+++ b/src/plugins/qnx/blackberryapilevelconfiguration.cpp
@@ -88,7 +88,7 @@ BlackBerryApiLevelConfiguration::BlackBerryApiLevelConfiguration(const ConfigIns
     // The QNX_TARGET value is using Unix-like separator on all platforms.
     m_targetName = ndkInstallInfo.target.split(sep).first().split(QLatin1Char('/')).last();
     m_sysRoot = FileName::fromString(ndkInstallInfo.target);
-    m_autoDetectionSource = Utils::FileName::fromString(ndkInstallInfo.installationXmlFilePath);
+    m_autoDetectionSource = FileName::fromString(ndkInstallInfo.installationXmlFilePath);
     setVersion(QnxVersionNumber(ndkInstallInfo.version));
     ctor();
 }
@@ -120,7 +120,7 @@ BlackBerryApiLevelConfiguration::BlackBerryApiLevelConfiguration(const QVariantM
     m_targetName = data.value(NDKTargetKey).toString().split(sep).first().split(QLatin1Char('/')).last();
     m_sysRoot = FileName::fromString(data.value(NDKTargetKey).toString());
     if (data.value(QLatin1String(NDKAutoDetectedKey)).toBool())
-        m_autoDetectionSource = Utils::FileName::fromString(data.value(NDKAutoDetectionSourceKey).toString());
+        m_autoDetectionSource = FileName::fromString(data.value(NDKAutoDetectionSourceKey).toString());
 
     ctor();
 }
@@ -128,8 +128,8 @@ BlackBerryApiLevelConfiguration::BlackBerryApiLevelConfiguration(const QVariantM
 void BlackBerryApiLevelConfiguration::ctor()
 {
     QString host = qnxHost().toString();
-    FileName qmake4Path = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(host + QLatin1String("/usr/bin/qmake")));
-    FileName qmake5Path = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(host + QLatin1String("/usr/bin/qt5/qmake")));
+    FileName qmake4Path = FileName::fromString(HostOsInfo::withExecutableSuffix(host + QLatin1String("/usr/bin/qmake")));
+    FileName qmake5Path = FileName::fromString(HostOsInfo::withExecutableSuffix(host + QLatin1String("/usr/bin/qt5/qmake")));
     if (qmake4Path.exists())
         m_qmake4BinaryFile = qmake4Path;
 
@@ -157,7 +157,7 @@ bool BlackBerryApiLevelConfiguration::isAutoDetected() const
     return !m_autoDetectionSource.isEmpty();
 }
 
-Utils::FileName BlackBerryApiLevelConfiguration::autoDetectionSource() const
+FileName BlackBerryApiLevelConfiguration::autoDetectionSource() const
 {
     return m_autoDetectionSource;
 }
diff --git a/src/plugins/qnx/blackberryapplicationrunner.cpp b/src/plugins/qnx/blackberryapplicationrunner.cpp
index a98665f14f..4aa9548094 100644
--- a/src/plugins/qnx/blackberryapplicationrunner.cpp
+++ b/src/plugins/qnx/blackberryapplicationrunner.cpp
@@ -213,10 +213,10 @@ void BlackBerryApplicationRunner::startFinished(int exitCode, QProcess::ExitStat
     }
 }
 
-ProjectExplorer::RunControl::StopResult BlackBerryApplicationRunner::stop()
+RunControl::StopResult BlackBerryApplicationRunner::stop()
 {
     if (m_stopping)
-        return ProjectExplorer::RunControl::AsynchronousStop;
+        return RunControl::AsynchronousStop;
 
     m_stopping = true;
 
@@ -238,7 +238,7 @@ ProjectExplorer::RunControl::StopResult BlackBerryApplicationRunner::stop()
     }
 
     m_stopProcess->start(m_deployCmd, args);
-    return ProjectExplorer::RunControl::AsynchronousStop;
+    return RunControl::AsynchronousStop;
 }
 
 bool BlackBerryApplicationRunner::isRunning() const
diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp
index c1f78ed28d..a8a1089a9a 100644
--- a/src/plugins/qnx/qnxanalyzesupport.cpp
+++ b/src/plugins/qnx/qnxanalyzesupport.cpp
@@ -67,7 +67,7 @@ QnxAnalyzeSupport::QnxAnalyzeSupport(QnxRunConfiguration *runConfig,
     connect(&m_outputParser, SIGNAL(waitingForConnectionOnPort(quint16)),
             SLOT(remoteIsRunning()));
 
-    ProjectExplorer::IDevice::ConstPtr dev = ProjectExplorer::DeviceKitInformation::device(runConfig->target()->kit());
+    IDevice::ConstPtr dev = DeviceKitInformation::device(runConfig->target()->kit());
     QnxDeviceConfiguration::ConstPtr qnxDevice = dev.dynamicCast<const QnxDeviceConfiguration>();
 
     const QString applicationId = Utils::FileName::fromString(runConfig->remoteExecutableFilePath()).fileName();
diff --git a/src/plugins/qnx/qnxbaseconfiguration.cpp b/src/plugins/qnx/qnxbaseconfiguration.cpp
index bbff2fb9df..4e35a4296e 100644
--- a/src/plugins/qnx/qnxbaseconfiguration.cpp
+++ b/src/plugins/qnx/qnxbaseconfiguration.cpp
@@ -79,32 +79,32 @@ QnxBaseConfiguration::~QnxBaseConfiguration()
 {
 }
 
-Utils::FileName QnxBaseConfiguration::envFile() const
+FileName QnxBaseConfiguration::envFile() const
 {
     return m_envFile;
 }
 
-Utils::FileName QnxBaseConfiguration::qnxTarget() const
+FileName QnxBaseConfiguration::qnxTarget() const
 {
     return m_qnxTarget;
 }
 
-Utils::FileName QnxBaseConfiguration::qnxHost() const
+FileName QnxBaseConfiguration::qnxHost() const
 {
     return m_qnxHost;
 }
 
-Utils::FileName QnxBaseConfiguration::qccCompilerPath() const
+FileName QnxBaseConfiguration::qccCompilerPath() const
 {
     return m_qccCompiler;
 }
 
-Utils::FileName QnxBaseConfiguration::armDebuggerPath() const
+FileName QnxBaseConfiguration::armDebuggerPath() const
 {
     return m_armlev7Debugger;
 }
 
-Utils::FileName QnxBaseConfiguration::x86DebuggerPath() const
+FileName QnxBaseConfiguration::x86DebuggerPath() const
 {
     return m_x86Debugger;
 }
@@ -142,24 +142,24 @@ void QnxBaseConfiguration::ctor(const FileName &envScript)
 #endif
     m_envFile = envScript;
     m_qnxEnv = QnxUtils::qnxEnvironmentFromEnvFile(m_envFile.toString());
-    foreach (const Utils::EnvironmentItem &item, m_qnxEnv) {
+    foreach (const EnvironmentItem &item, m_qnxEnv) {
         if (item.name == QLatin1String("QNX_TARGET"))
-            m_qnxTarget = Utils::FileName::fromString(item.value);
+            m_qnxTarget = FileName::fromString(item.value);
 
         else if (item.name == QLatin1String("QNX_HOST"))
-            m_qnxHost = Utils::FileName::fromString(item.value);
+            m_qnxHost = FileName::fromString(item.value);
     }
 
-    FileName qccPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(
+    FileName qccPath = FileName::fromString(HostOsInfo::withExecutableSuffix(
         m_qnxHost.toString() + QLatin1String("/usr/bin/qcc")));
-    FileName armlev7GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(
+    FileName armlev7GdbPath = FileName::fromString(HostOsInfo::withExecutableSuffix(
         m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarm-gdb")));
     if (!armlev7GdbPath.exists()) {
-        armlev7GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(
+        armlev7GdbPath = FileName::fromString(HostOsInfo::withExecutableSuffix(
             m_qnxHost.toString() + QLatin1String("/usr/bin/ntoarmv7-gdb")));
     }
 
-    FileName x86GdbPath = FileName::fromString(Utils::HostOsInfo::withExecutableSuffix(
+    FileName x86GdbPath = FileName::fromString(HostOsInfo::withExecutableSuffix(
         m_qnxHost.toString() + QLatin1String("/usr/bin/ntox86-gdb")));
 
     if (qccPath.exists())
@@ -175,7 +175,7 @@ void QnxBaseConfiguration::ctor(const FileName &envScript)
 QVariant QnxBaseConfiguration::createDebuggerItem(QnxArchitecture arch,
                                               const QString &displayName)
 {
-    Utils::FileName command = (arch == X86) ? x86DebuggerPath() : armDebuggerPath();
+    FileName command = (arch == X86) ? x86DebuggerPath() : armDebuggerPath();
     Debugger::DebuggerItem debugger;
     debugger.setCommand(command);
     debugger.setEngineType(Debugger::GdbEngineType);
@@ -190,13 +190,13 @@ QnxToolChain *QnxBaseConfiguration::createToolChain(QnxArchitecture arch,
                                                     const QString &displayName,
                                                     const QString &ndkPath)
 {
-    QnxToolChain *toolChain = new QnxToolChain(ProjectExplorer::ToolChain::AutoDetection);
+    QnxToolChain *toolChain = new QnxToolChain(ToolChain::AutoDetection);
     toolChain->resetToolChain(m_qccCompiler);
     toolChain->setTargetAbi(Abi((arch == Qnx::ArmLeV7) ? Abi::ArmArchitecture : Abi::X86Architecture,
                                 Abi::LinuxOS, Abi::GenericLinuxFlavor, Abi::ElfFormat, 32));
     toolChain->setDisplayName(displayName);
     toolChain->setNdkPath(ndkPath);
-    ProjectExplorer::ToolChainManager::registerToolChain(toolChain);
+    ToolChainManager::registerToolChain(toolChain);
     return toolChain;
 }
 
diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp
index 3e543b0900..33aa4d980d 100644
--- a/src/plugins/qnx/qnxconfiguration.cpp
+++ b/src/plugins/qnx/qnxconfiguration.cpp
@@ -61,7 +61,7 @@ using namespace Debugger;
 
 namespace Qnx {
 namespace Internal {
-QnxConfiguration::QnxConfiguration(const Utils::FileName &sdpEnvFile)
+QnxConfiguration::QnxConfiguration(const FileName &sdpEnvFile)
     : QnxBaseConfiguration(sdpEnvFile)
 {
     readInformation();
@@ -120,16 +120,16 @@ void QnxConfiguration::deactivate()
     if (!isActive())
         return;
 
-    QList<ProjectExplorer::ToolChain *> toolChainsToRemove;
-    QList<Debugger::DebuggerItem> debuggersToRemove;
-    foreach (ProjectExplorer::ToolChain *tc,
-             ProjectExplorer::ToolChainManager::toolChains()) {
+    QList<ToolChain *> toolChainsToRemove;
+    QList<DebuggerItem> debuggersToRemove;
+    foreach (ToolChain *tc,
+             ToolChainManager::toolChains()) {
         if (tc->compilerCommand() == qccCompilerPath())
             toolChainsToRemove.append(tc);
     }
 
-    foreach (Debugger::DebuggerItem debuggerItem,
-             Debugger::DebuggerItemManager::debuggers()) {
+    foreach (DebuggerItem debuggerItem,
+             DebuggerItemManager::debuggers()) {
         if (debuggerItem.command() == armDebuggerPath() ||
                 debuggerItem.command() == x86DebuggerPath())
             debuggersToRemove.append(debuggerItem);
@@ -142,11 +142,11 @@ void QnxConfiguration::deactivate()
             KitManager::deregisterKit(kit);
     }
 
-    foreach (ProjectExplorer::ToolChain *tc, toolChainsToRemove)
-        ProjectExplorer::ToolChainManager::deregisterToolChain(tc);
+    foreach (ToolChain *tc, toolChainsToRemove)
+        ToolChainManager::deregisterToolChain(tc);
 
-    foreach (Debugger::DebuggerItem debuggerItem, debuggersToRemove)
-        Debugger::DebuggerItemManager::
+    foreach (DebuggerItem debuggerItem, debuggersToRemove)
+        DebuggerItemManager::
                 deregisterDebugger(debuggerItem.id());
 }
 
@@ -154,16 +154,16 @@ bool QnxConfiguration::isActive() const
 {
     bool hasToolChain = false;
     bool hasDebugger = false;
-    foreach (ProjectExplorer::ToolChain *tc,
-             ProjectExplorer::ToolChainManager::toolChains()) {
+    foreach (ToolChain *tc,
+             ToolChainManager::toolChains()) {
         if (tc->compilerCommand() == qccCompilerPath()) {
             hasToolChain = true;
             break;
         }
     }
 
-    foreach (Debugger::DebuggerItem debuggerItem,
-             Debugger::DebuggerItemManager::debuggers()) {
+    foreach (DebuggerItem debuggerItem,
+             DebuggerItemManager::debuggers()) {
         if (debuggerItem.command() == armDebuggerPath() ||
                 debuggerItem.command() == x86DebuggerPath()) {
             hasDebugger = true;
@@ -179,7 +179,7 @@ bool QnxConfiguration::canCreateKits() const
     return isValid() && (qnxQtVersion(ArmLeV7) || qnxQtVersion(X86));
 }
 
-Utils::FileName QnxConfiguration::sdpPath() const
+FileName QnxConfiguration::sdpPath() const
 {
     return envFile().parentDir();
 }
@@ -200,7 +200,7 @@ QnxQtVersion* QnxConfiguration::qnxQtVersion(QnxArchitecture arch) const
     return 0;
 }
 
-ProjectExplorer::Kit *QnxConfiguration::createKit(QnxArchitecture arch,
+Kit *QnxConfiguration::createKit(QnxArchitecture arch,
                                                   QnxToolChain *toolChain,
                                                   const QVariant &debuggerItemId,
                                                   const QString &displayName)
@@ -210,7 +210,7 @@ ProjectExplorer::Kit *QnxConfiguration::createKit(QnxArchitecture arch,
     if (!qnxQt)
         return 0;
 
-    Kit *kit = new ProjectExplorer::Kit;
+    Kit *kit = new Kit;
 
     QtKitInformation::setQtVersion(kit, qnxQt);
     ToolChainKitInformation::setToolChain(kit, toolChain);
diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index b969b2084b..27ee0f76d5 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -72,7 +72,7 @@ QnxDebugSupport::QnxDebugSupport(QnxRunConfiguration *runConfig, Debugger::Debug
             this, &QnxDebugSupport::handleAdapterSetupRequested);
 
     const QString applicationId = Utils::FileName::fromString(runConfig->remoteExecutableFilePath()).fileName();
-    ProjectExplorer::IDevice::ConstPtr dev = ProjectExplorer::DeviceKitInformation::device(runConfig->target()->kit());
+    IDevice::ConstPtr dev = DeviceKitInformation::device(runConfig->target()->kit());
     QnxDeviceConfiguration::ConstPtr qnxDevice = dev.dynamicCast<const QnxDeviceConfiguration>();
 
     m_slog2Info = new Slog2InfoRunner(applicationId, qnxDevice, this);
diff --git a/src/plugins/qnx/qnxdeviceconfiguration.cpp b/src/plugins/qnx/qnxdeviceconfiguration.cpp
index 2224a44e75..26b90e6fcf 100644
--- a/src/plugins/qnx/qnxdeviceconfiguration.cpp
+++ b/src/plugins/qnx/qnxdeviceconfiguration.cpp
@@ -95,7 +95,7 @@ void QnxDeviceProcess::doSignal(int sig)
 }
 
 
-class QnxPortsGatheringMethod : public ProjectExplorer::PortsGatheringMethod
+class QnxPortsGatheringMethod : public PortsGatheringMethod
 {
     // TODO: The command is probably needlessly complicated because the parsing method
     // used to be fixed. These two can now be matched to each other.
@@ -177,7 +177,7 @@ int QnxDeviceConfiguration::qnxVersion() const
 void QnxDeviceConfiguration::updateVersionNumber() const
 {
     QEventLoop eventLoop;
-    ProjectExplorer::SshDeviceProcess versionNumberProcess(sharedFromThis());
+    SshDeviceProcess versionNumberProcess(sharedFromThis());
     QObject::connect(&versionNumberProcess, SIGNAL(finished()), &eventLoop, SLOT(quit()));
     QObject::connect(&versionNumberProcess, SIGNAL(error(QProcess::ProcessError)), &eventLoop, SLOT(quit()));
 
@@ -218,27 +218,27 @@ QVariantMap QnxDeviceConfiguration::toMap() const
     return map;
 }
 
-ProjectExplorer::IDevice::Ptr QnxDeviceConfiguration::clone() const
+IDevice::Ptr QnxDeviceConfiguration::clone() const
 {
     return Ptr(new QnxDeviceConfiguration(*this));
 }
 
-ProjectExplorer::PortsGatheringMethod::Ptr QnxDeviceConfiguration::portsGatheringMethod() const
+PortsGatheringMethod::Ptr QnxDeviceConfiguration::portsGatheringMethod() const
 {
-    return ProjectExplorer::PortsGatheringMethod::Ptr(new QnxPortsGatheringMethod);
+    return PortsGatheringMethod::Ptr(new QnxPortsGatheringMethod);
 }
 
-ProjectExplorer::DeviceProcessList *QnxDeviceConfiguration::createProcessListModel(QObject *parent) const
+DeviceProcessList *QnxDeviceConfiguration::createProcessListModel(QObject *parent) const
 {
     return new QnxDeviceProcessList(sharedFromThis(), parent);
 }
 
-ProjectExplorer::DeviceTester *QnxDeviceConfiguration::createDeviceTester() const
+DeviceTester *QnxDeviceConfiguration::createDeviceTester() const
 {
     return new QnxDeviceTester;
 }
 
-ProjectExplorer::DeviceProcess *QnxDeviceConfiguration::createProcess(QObject *parent) const
+DeviceProcess *QnxDeviceConfiguration::createProcess(QObject *parent) const
 {
     return new QnxDeviceProcess(sharedFromThis(), parent);
 }
@@ -270,9 +270,9 @@ void QnxDeviceConfiguration::executeAction(Core::Id actionId, QWidget *parent)
     }
 }
 
-ProjectExplorer::DeviceProcessSignalOperation::Ptr QnxDeviceConfiguration::signalOperation() const
+DeviceProcessSignalOperation::Ptr QnxDeviceConfiguration::signalOperation() const
 {
-    return ProjectExplorer::DeviceProcessSignalOperation::Ptr(
+    return DeviceProcessSignalOperation::Ptr(
                 new QnxDeviceProcessSignalOperation(sshParameters()));
 }
 
diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp
index d73fa0bfac..8ad2fdb198 100644
--- a/src/plugins/qnx/qnxplugin.cpp
+++ b/src/plugins/qnx/qnxplugin.cpp
@@ -143,7 +143,7 @@ bool QnxPlugin::initialize(const QStringList &arguments, QString *errorString)
     }
     addAutoReleasedObject(new BarDescriptorEditorFactory);
 
-    connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()),
+    connect(KitManager::instance(), SIGNAL(kitsLoaded()),
             BlackBerryConfigurationManager::instance(), SLOT(loadSettings()));
 
     return true;
@@ -151,8 +151,7 @@ bool QnxPlugin::initialize(const QStringList &arguments, QString *errorString)
 
 void QnxPlugin::extensionsInitialized()
 {
-    ProjectExplorer::TaskHub::addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR,
-                                          tr("BAR Descriptor"));
+    TaskHub::addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR, tr("BAR Descriptor"));
 
     // Debug support
     QnxAttachDebugSupport *debugSupport = new QnxAttachDebugSupport(this);
@@ -169,7 +168,7 @@ void QnxPlugin::extensionsInitialized()
     Core::Command *cmd = Core::ActionManager::registerAction(m_attachToQnxApplication, "Debugger.AttachToQnxApplication", globalcontext);
     mstart->addAction(cmd, Constants::QNX_DEBUGGING_GROUP);
 
-    connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(updateDebuggerActions()));
+    connect(KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(updateDebuggerActions()));
 }
 
 ExtensionSystem::IPlugin::ShutdownFlag QnxPlugin::aboutToShutdown()
diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp
index 8bf7d4547e..e4a7430b41 100644
--- a/src/plugins/qnx/qnxruncontrolfactory.cpp
+++ b/src/plugins/qnx/qnxruncontrolfactory.cpp
@@ -88,8 +88,8 @@ static DebuggerStartParameters createDebuggerStartParameters(const QnxRunConfigu
     params.closeMode = KillAtClose;
     params.processArgs = runConfig->arguments().join(QLatin1Char(' '));
 
-    Debugger::DebuggerRunConfigurationAspect *aspect
-            = runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
+    DebuggerRunConfigurationAspect *aspect
+            = runConfig->extraAspect<DebuggerRunConfigurationAspect>();
     if (aspect->useQmlDebugger()) {
         params.languages |= QmlLanguage;
         params.qmlServerAddress = device->sshParameters().host;
@@ -97,13 +97,13 @@ static DebuggerStartParameters createDebuggerStartParameters(const QnxRunConfigu
     }
 
     if (aspect->useCppDebugger())
-        params.languages |= Debugger::CppLanguage;
+        params.languages |= CppLanguage;
 
-    if (const ProjectExplorer::Project *project = runConfig->target()->project()) {
+    if (const Project *project = runConfig->target()->project()) {
         params.projectSourceDirectory = project->projectDirectory().toString();
-        if (const ProjectExplorer::BuildConfiguration *buildConfig = runConfig->target()->activeBuildConfiguration())
+        if (const BuildConfiguration *buildConfig = runConfig->target()->activeBuildConfiguration())
             params.projectBuildDirectory = buildConfig->buildDirectory().toString();
-        params.projectSourceFiles = project->files(ProjectExplorer::Project::ExcludeGeneratedFiles);
+        params.projectSourceFiles = project->files(Project::ExcludeGeneratedFiles);
     }
 
     QnxQtVersion *qtVersion =
diff --git a/src/plugins/qnx/qnxutils.cpp b/src/plugins/qnx/qnxutils.cpp
index 8aa5f5c5b7..8759306087 100644
--- a/src/plugins/qnx/qnxutils.cpp
+++ b/src/plugins/qnx/qnxutils.cpp
@@ -58,14 +58,14 @@ QString QnxUtils::addQuotes(const QString &string)
     return QLatin1Char('"') + string + QLatin1Char('"');
 }
 
-Qnx::QnxArchitecture QnxUtils::cpudirToArch(const QString &cpuDir)
+QnxArchitecture QnxUtils::cpudirToArch(const QString &cpuDir)
 {
     if (cpuDir == QLatin1String("x86"))
-        return Qnx::X86;
+        return X86;
     else if (cpuDir == QLatin1String("armle-v7"))
-        return Qnx::ArmLeV7;
+        return ArmLeV7;
     else
-        return Qnx::UnknownArch;
+        return UnknownArch;
 }
 
 QStringList QnxUtils::searchPaths(QnxAbstractQtVersion *qtVersion)