summaryrefslogtreecommitdiff
path: root/src/plugins/remotelinux
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2011-08-03 11:21:34 +0200
committerChristian Kandeler <christian.kandeler@nokia.com>2011-08-03 11:22:49 +0200
commit999265105bd30b7b30e6688fec35b1448eb276be (patch)
tree1bd38d20cb52cf48d0f964e9eaa9f822668910c3 /src/plugins/remotelinux
parent30676c1a17a6036d71ff821e4ae9efc6d5e82ca8 (diff)
downloadqt-creator-999265105bd30b7b30e6688fec35b1448eb276be.tar.gz
RemoteLinux: Use full namespace for signal/slot parameter.
Change-Id: I4cd5fb4084b2ba4872ca984c0adf3209feeebb89 Reviewed-on: http://codereview.qt.nokia.com/2551 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Diffstat (limited to 'src/plugins/remotelinux')
-rw-r--r--src/plugins/remotelinux/maemodeploybymountsteps.cpp6
-rw-r--r--src/plugins/remotelinux/maemoremotecopyfacility.h2
-rw-r--r--src/plugins/remotelinux/remotelinuxplugin.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/remotelinux/maemodeploybymountsteps.cpp b/src/plugins/remotelinux/maemodeploybymountsteps.cpp
index 342ed2e496..f51d8a77fc 100644
--- a/src/plugins/remotelinux/maemodeploybymountsteps.cpp
+++ b/src/plugins/remotelinux/maemodeploybymountsteps.cpp
@@ -131,7 +131,7 @@ private:
void cancelInstallation();
void handleInstallationSuccess();
- Q_SLOT void handleFileCopied(const DeployableFile &deployable);
+ Q_SLOT void handleFileCopied(const RemoteLinux::DeployableFile &deployable);
MaemoRemoteCopyFacility * const m_copyFacility;
mutable QList<DeployableFile> m_filesToCopy;
@@ -329,8 +329,8 @@ MaemoMountAndCopyFilesService::MaemoMountAndCopyFilesService(QObject *parent)
connect(m_copyFacility, SIGNAL(stdoutData(QString)), SIGNAL(stdOutData(QString)));
connect(m_copyFacility, SIGNAL(stderrData(QString)), SIGNAL(stdErrData(QString)));
connect(m_copyFacility, SIGNAL(progress(QString)), SIGNAL(progressMessage(QString)));
- connect(m_copyFacility, SIGNAL(fileCopied(DeployableFile)),
- SLOT(handleFileCopied(DeployableFile)));
+ connect(m_copyFacility, SIGNAL(fileCopied(RemoteLinux::DeployableFile)),
+ SLOT(handleFileCopied(RemoteLinux::DeployableFile)));
connect(m_copyFacility, SIGNAL(finished(QString)), SLOT(handleInstallationFinished(QString)));
}
diff --git a/src/plugins/remotelinux/maemoremotecopyfacility.h b/src/plugins/remotelinux/maemoremotecopyfacility.h
index fb8d5b9c3f..58e484a6f6 100644
--- a/src/plugins/remotelinux/maemoremotecopyfacility.h
+++ b/src/plugins/remotelinux/maemoremotecopyfacility.h
@@ -66,7 +66,7 @@ signals:
void stdoutData(const QString &output);
void stderrData(const QString &output);
void progress(const QString &message);
- void fileCopied(const DeployableFile &deployable);
+ void fileCopied(const RemoteLinux::DeployableFile &deployable);
void finished(const QString &errorMsg = QString());
private slots:
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index e56c7c87e2..a1fb3ca57c 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -94,7 +94,7 @@ bool RemoteLinuxPlugin::initialize(const QStringList &arguments,
addAutoReleasedObject(new RemoteLinuxDeployConfigurationFactory);
addAutoReleasedObject(new GenericRemoteLinuxDeployStepFactory);
- qRegisterMetaType<DeployableFile>("DeployableFile");
+ qRegisterMetaType<RemoteLinux::DeployableFile>("RemoteLinux::DeployableFile");
return true;
}