forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -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)));
|
||||
}
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user