aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2015-02-03 23:51:02 +0200
committerOrgad Shaneh <[email protected]>2015-02-04 13:21:40 +0000
commit3f1fd49c71ebb3bcfa4914d35d801ebd98eb72cd (patch)
tree644d416ffab9506b8ac9800e0a054aef06e943a8 /src/plugins/remotelinux/remotelinuxpackageinstaller.cpp
parentb197566eecab7c2f975bf56b849337de96a9a2d0 (diff)
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]>
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxpackageinstaller.cpp')
-rw-r--r--src/plugins/remotelinux/remotelinuxpackageinstaller.cpp12
1 files changed, 6 insertions, 6 deletions
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);