diff --git a/src/plugins/remotelinux/maemodeploybymountsteps.cpp b/src/plugins/remotelinux/maemodeploybymountsteps.cpp index 342ed2e49624ddad68b2cdf2ffb4cc9548e35380..f51d8a77fce73b245f9ceb06ea6315acbe73b62d 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 fb8d5b9c3f5e8256fc353f7220e2924815058065..58e484a6f69f4cc8339c6fa8b172e4bc1488a52f 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 e56c7c87e2172fbe9331fd781833cef07eb7928b..a1fb3ca57cc8425ee5f494a1263b91b397dd280a 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; }