RemoteLinux: 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: Id48e46fdfed83b82071551f4375fab3310ed1f6e
Reviewed-by: Christian Kandeler <[email protected]>

15 files changed, 34 insertions, 34 deletions

diff --git a/src/plugins/remotelinux/abstractremotelinuxrunsupport.cpp b/src/plugins/remotelinux/abstractremotelinuxrunsupport.cpp
index be1cf028d40..530c0934553 100644
--- a/src/plugins/remotelinux/abstractremotelinuxrunsupport.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxrunsupport.cpp
@@ -59,7 +59,7 @@ public:
     AbstractRemoteLinuxRunSupport::State state;
     DeviceApplicationRunner appRunner;
     DeviceUsedPortsGatherer portsGatherer;
-    const ProjectExplorer::IDevice::ConstPtr device;
+    const IDevice::ConstPtr device;
     Utils::PortList portList;
     const QString remoteFilePath;
     const QStringList arguments;
diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp
index 08fed367c48..51c88cdc0f8 100644
--- a/src/plugins/remotelinux/genericdirectuploadservice.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp
@@ -156,7 +156,7 @@ void GenericDirectUploadService::handleSftpChannelError(const QString &message)
     handleDeploymentDone();
 }
 
-void GenericDirectUploadService::handleUploadFinished(QSsh::SftpJobId jobId, const QString &errorMsg)
+void GenericDirectUploadService::handleUploadFinished(SftpJobId jobId, const QString &errorMsg)
 {
     Q_UNUSED(jobId);
 
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 2fb9339b0d9..4af608644ce 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -96,13 +96,13 @@ public:
 
 } // namespace Internal
 
-GenericDirectUploadStep::GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Core::Id id)
+GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, Core::Id id)
     : AbstractRemoteLinuxDeployStep(bsl, id)
 {
     ctor();
 }
 
-GenericDirectUploadStep::GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, GenericDirectUploadStep *other)
+GenericDirectUploadStep::GenericDirectUploadStep(BuildStepList *bsl, GenericDirectUploadStep *other)
     : AbstractRemoteLinuxDeployStep(bsl, other)
 {
     ctor();
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
index de066684860..5d4013c674e 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.cpp
@@ -164,7 +164,7 @@ void GenericLinuxDeviceConfigurationWidget::hostKeyCheckingChanged(bool doCheck)
 {
     SshConnectionParameters sshParams = device()->sshParameters();
     sshParams.hostKeyCheckingMode
-            = doCheck ? QSsh::SshHostKeyCheckingAllowNoMatch : QSsh::SshHostKeyCheckingNone;
+            = doCheck ? SshHostKeyCheckingAllowNoMatch : SshHostKeyCheckingNone;
     device()->setSshParameters(sshParams);
 }
 
diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
index 53ea498288a..b3e2c11b0b9 100644
--- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
+++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
@@ -75,7 +75,7 @@ GenericLinuxDeviceConfigurationWizard::~GenericLinuxDeviceConfigurationWizard()
 
 IDevice::Ptr GenericLinuxDeviceConfigurationWizard::device()
 {
-    QSsh::SshConnectionParameters sshParams;
+    SshConnectionParameters sshParams;
     sshParams.options &= ~SshConnectionOptions(SshEnableStrictConformanceChecks); // For older SSH servers.
     sshParams.host = d->setupPage.hostName();
     sshParams.userName = d->setupPage.userName();
diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp
index 79da692d430..bc4157acbeb 100644
--- a/src/plugins/remotelinux/linuxdevice.cpp
+++ b/src/plugins/remotelinux/linuxdevice.cpp
@@ -123,7 +123,7 @@ private:
     }
 };
 
-class LinuxPortsGatheringMethod : public ProjectExplorer::PortsGatheringMethod
+class LinuxPortsGatheringMethod : public PortsGatheringMethod
 {
     QByteArray commandLine(QAbstractSocket::NetworkLayerProtocol protocol) const
     {
@@ -175,7 +175,7 @@ QString LinuxDevice::displayType() const
     return tr("Generic Linux");
 }
 
-ProjectExplorer::IDeviceWidget *LinuxDevice::createWidget()
+IDeviceWidget *LinuxDevice::createWidget()
 {
     return new GenericLinuxDeviceConfigurationWidget(sharedFromThis());
 }
@@ -224,7 +224,7 @@ LinuxDevice::Ptr LinuxDevice::create()
     return Ptr(new LinuxDevice);
 }
 
-ProjectExplorer::IDevice::Ptr LinuxDevice::clone() const
+IDevice::Ptr LinuxDevice::clone() const
 {
     return Ptr(new LinuxDevice(*this));
 }
diff --git a/src/plugins/remotelinux/packageuploader.cpp b/src/plugins/remotelinux/packageuploader.cpp
index 5722fc35711..ad0256d4fb6 100644
--- a/src/plugins/remotelinux/packageuploader.cpp
+++ b/src/plugins/remotelinux/packageuploader.cpp
@@ -59,7 +59,7 @@ void PackageUploader::uploadPackage(SshConnection *connection,
     m_localFilePath = localFilePath;
     m_remoteFilePath = remoteFilePath;
     m_connection = connection;
-    connect(m_connection, &QSsh::SshConnection::error,
+    connect(m_connection, &SshConnection::error,
             this, &PackageUploader::handleConnectionFailure);
     m_uploader = m_connection->createSftpChannel();
     connect(m_uploader.data(), SIGNAL(initialized()), this,
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index f4b6ba66131..cdc0f2ac761 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
@@ -61,8 +61,8 @@ public:
     LinuxDeviceDebugSupportPrivate(const AbstractRemoteLinuxRunConfiguration *runConfig,
             DebuggerRunControl *runControl)
         : runControl(runControl),
-          qmlDebugging(runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>()->useQmlDebugger()),
-          cppDebugging(runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>()->useCppDebugger()),
+          qmlDebugging(runConfig->extraAspect<DebuggerRunConfigurationAspect>()->useQmlDebugger()),
+          cppDebugging(runConfig->extraAspect<DebuggerRunConfigurationAspect>()->useCppDebugger()),
           gdbServerPort(-1), qmlPort(-1)
     {
     }
@@ -93,8 +93,8 @@ DebuggerStartParameters LinuxDeviceDebugSupport::startParameters(const AbstractR
     if (ToolChain *tc = ToolChainKitInformation::toolChain(k))
         params.toolChainAbi = tc->targetAbi();
 
-    Debugger::DebuggerRunConfigurationAspect *aspect
-            = runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
+    DebuggerRunConfigurationAspect *aspect
+            = runConfig->extraAspect<DebuggerRunConfigurationAspect>();
     if (aspect->useQmlDebugger()) {
         params.languages |= QmlLanguage;
         params.qmlServerAddress = device->sshParameters().host;
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index be89b20803f..b8593d56dfe 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -37,14 +37,14 @@ namespace RemoteLinux {
 
 using namespace Internal;
 
-RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target,
+RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(Target *target,
         const Core::Id id, const QString &defaultDisplayName)
     : DeployConfiguration(target, id)
 {
     setDefaultDisplayName(defaultDisplayName);
 }
 
-RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target,
+RemoteLinuxDeployConfiguration::RemoteLinuxDeployConfiguration(Target *target,
         RemoteLinuxDeployConfiguration *source)
     : DeployConfiguration(target, source)
 { }
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
index 810ca26048a..225ed2e82f6 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
@@ -58,9 +58,9 @@ void RemoteLinuxEnvironmentReader::start()
         return;
     m_stop = false;
     m_deviceProcess = device->createProcess(this);
-    connect(m_deviceProcess, &ProjectExplorer::DeviceProcess::error,
+    connect(m_deviceProcess, &DeviceProcess::error,
             this, &RemoteLinuxEnvironmentReader::handleError);
-    connect(m_deviceProcess, &ProjectExplorer::DeviceProcess::finished,
+    connect(m_deviceProcess, &DeviceProcess::finished,
             this, &RemoteLinuxEnvironmentReader::remoteProcessFinished);
     m_deviceProcess->start(QLatin1String("env"));
 }
diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
index d20be3f6acb..fca20e1aa77 100644
--- a/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
+++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
@@ -45,8 +45,8 @@ public:
 
     bool isRunning;
     IDevice::ConstPtr deviceConfig;
-    QSsh::SshRemoteProcessRunner *installer;
-    QSsh::SshRemoteProcessRunner *killProcess;
+    SshRemoteProcessRunner *installer;
+    SshRemoteProcessRunner *killProcess;
 };
 
 } // namespace Internal
@@ -70,13 +70,13 @@ void AbstractRemoteLinuxPackageInstaller::installPackage(const IDevice::ConstPtr
     prepareInstallation();
     if (!d->installer)
         d->installer = new SshRemoteProcessRunner(this);
-    connect(d->installer, &QSsh::SshRemoteProcessRunner::connectionError,
+    connect(d->installer, &SshRemoteProcessRunner::connectionError,
             this, &AbstractRemoteLinuxPackageInstaller::handleConnectionError);
-    connect(d->installer, &QSsh::SshRemoteProcessRunner::readyReadStandardOutput,
+    connect(d->installer, &SshRemoteProcessRunner::readyReadStandardOutput,
             this, &AbstractRemoteLinuxPackageInstaller::handleInstallerOutput);
-    connect(d->installer, &QSsh::SshRemoteProcessRunner::readyReadStandardError,
+    connect(d->installer, &SshRemoteProcessRunner::readyReadStandardError,
             this, &AbstractRemoteLinuxPackageInstaller::handleInstallerErrorOutput);
-    connect(d->installer, &QSsh::SshRemoteProcessRunner::processClosed,
+    connect(d->installer, &SshRemoteProcessRunner::processClosed,
             this, &AbstractRemoteLinuxPackageInstaller::handleInstallationFinished);
 
     QString cmdLine = installCommandLine(packageFilePath);
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 1425a31ce7c..c87746040c4 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -90,7 +90,7 @@ RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *parent, Core::I
     init();
 }
 
-RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
+RemoteLinuxRunConfiguration::RemoteLinuxRunConfiguration(Target *parent,
         RemoteLinuxRunConfiguration *source)
     : AbstractRemoteLinuxRunConfiguration(parent, source),
       d(new RemoteLinuxRunConfigurationPrivate(source->d))
diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.cpp b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
index ec9a4dec48d..b9883bdbcff 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrol.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrol.cpp
@@ -48,7 +48,7 @@ class RemoteLinuxRunControl::RemoteLinuxRunControlPrivate
 {
 public:
     bool running;
-    ProjectExplorer::DeviceApplicationRunner runner;
+    DeviceApplicationRunner runner;
     IDevice::ConstPtr device;
     QString remoteExecutable;
     QStringList arguments;
@@ -57,7 +57,7 @@ public:
 };
 
 RemoteLinuxRunControl::RemoteLinuxRunControl(RunConfiguration *rc)
-        : RunControl(rc, ProjectExplorer::NormalRunMode), d(new RemoteLinuxRunControlPrivate)
+        : RunControl(rc, NormalRunMode), d(new RemoteLinuxRunControlPrivate)
 {
     setIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL));
 
@@ -80,15 +80,15 @@ void RemoteLinuxRunControl::start()
     d->running = true;
     emit started();
     d->runner.disconnect(this);
-    connect(&d->runner, &ProjectExplorer::DeviceApplicationRunner::reportError,
+    connect(&d->runner, &DeviceApplicationRunner::reportError,
             this, &RemoteLinuxRunControl::handleErrorMessage);
-    connect(&d->runner, &ProjectExplorer::DeviceApplicationRunner::remoteStderr,
+    connect(&d->runner, &DeviceApplicationRunner::remoteStderr,
             this, &RemoteLinuxRunControl::handleRemoteErrorOutput);
-    connect(&d->runner, &ProjectExplorer::DeviceApplicationRunner::remoteStdout,
+    connect(&d->runner, &DeviceApplicationRunner::remoteStdout,
             this, &RemoteLinuxRunControl::handleRemoteOutput);
-    connect(&d->runner, &ProjectExplorer::DeviceApplicationRunner::finished,
+    connect(&d->runner, &DeviceApplicationRunner::finished,
             this, &RemoteLinuxRunControl::handleRunnerFinished);
-    connect(&d->runner, &ProjectExplorer::DeviceApplicationRunner::reportProgress,
+    connect(&d->runner, &DeviceApplicationRunner::reportProgress,
             this, &RemoteLinuxRunControl::handleProgressReport);
     d->runner.setEnvironment(d->environment);
     d->runner.setWorkingDirectory(d->workingDir);
diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
index 8f843d8b386..b49cc9bc94e 100644
--- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
+++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.cpp
@@ -104,7 +104,7 @@ RunControl *RemoteLinuxRunControlFactory::create(RunConfiguration *runConfig, Ru
         }
 
         DebuggerStartParameters params = LinuxDeviceDebugSupport::startParameters(rc);
-        if (mode == ProjectExplorer::DebugRunModeWithBreakOnMain)
+        if (mode == DebugRunModeWithBreakOnMain)
             params.breakOnMain = true;
         DebuggerRunControl * const runControl
                 = DebuggerRunControlFactory::doCreate(params, rc, errorMessage);
diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
index 703eeb28b5b..be6e87849d8 100644
--- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
+++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
@@ -131,7 +131,7 @@ bool TypeSpecificDeviceConfigurationListModel::deviceMatches(IDevice::ConstPtr d
 {
     if (dev.isNull())
         return false;
-    Core::Id typeId = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(target()->kit());
+    Core::Id typeId = DeviceTypeKitInformation::deviceTypeId(target()->kit());
     return dev->type() == typeId;
 }