From 047cb50a6be978bc6d476a3c9c9454926e8866f9 Mon Sep 17 00:00:00 2001 From: Bill King Date: Wed, 9 Mar 2011 17:04:07 +0100 Subject: [PATCH] Fix build. --- .../qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp | 8 ++++---- .../qt-maemo/maemopackagecreationstep.cpp | 2 +- .../qt4projectmanager/qt-maemo/maemopackageinstaller.cpp | 6 +++--- .../qt4projectmanager/qt-maemo/maemopackageinstaller.h | 4 ++-- .../qt-maemo/maemoremotecopyfacility.cpp | 5 +++-- .../qt4projectmanager/qt-maemo/maemoremotecopyfacility.h | 4 ++-- .../qt-maemo/maemouploadandinstalldeploystep.cpp | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp index 1e420b06597..33d0b069ce8 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploybymountstep.cpp @@ -217,9 +217,9 @@ void MaemoMountAndInstallDeployStep::ctor() m_installer = new MaemoDebianPackageInstaller(this); else m_installer = new MaemoRpmPackageInstaller(this); - connect(m_installer, SIGNAL(stdout(QString)), + connect(m_installer, SIGNAL(stdoutData(QString)), SLOT(handleRemoteStdout(QString))); - connect(m_installer, SIGNAL(stderr(QString)), + connect(m_installer, SIGNAL(stderrData(QString)), SLOT(handleRemoteStderr(QString))); connect(m_installer, SIGNAL(finished(QString)), SLOT(handleInstallationFinished(QString))); @@ -293,9 +293,9 @@ void MaemoMountAndCopyDeployStep::ctor() setDefaultDisplayName(DisplayName); m_copyFacility = new MaemoRemoteCopyFacility(this); - connect(m_copyFacility, SIGNAL(stdout(QString)), + connect(m_copyFacility, SIGNAL(stdoutData(QString)), SLOT(handleRemoteStdout(QString))); - connect(m_copyFacility, SIGNAL(stderr(QString)), + connect(m_copyFacility, SIGNAL(stderrData(QString)), SLOT(handleRemoteStderr(QString))); connect(m_copyFacility, SIGNAL(progress(QString)), SLOT(handleProgressReport(QString))); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp index 415defb4878..53aa0da54e2 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp @@ -633,7 +633,7 @@ const QString MaemoRpmPackageCreationStep::CreatePackageId -class PROJECTEXPLORER_EXPORT CreateTarStepWidget : public BuildStepConfigWidget +class CreateTarStepWidget : public BuildStepConfigWidget { Q_OBJECT public: diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp index fbbbdc9b488..a0cb4e2ae5a 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.cpp @@ -115,12 +115,12 @@ void AbstractMaemoPackageInstaller::handleInstallationFinished(int exitStatus) void AbstractMaemoPackageInstaller::handleInstallerOutput(const QByteArray &output) { - emit stdout(QString::fromUtf8(output)); + emit stdoutData(QString::fromUtf8(output)); } void AbstractMaemoPackageInstaller::handleInstallerErrorOutput(const QByteArray &output) { - emit stderr(QString::fromUtf8(output)); + emit stderrData(QString::fromUtf8(output)); } void AbstractMaemoPackageInstaller::setFinished() @@ -134,7 +134,7 @@ void AbstractMaemoPackageInstaller::setFinished() MaemoDebianPackageInstaller::MaemoDebianPackageInstaller(QObject *parent) : AbstractMaemoPackageInstaller(parent) { - connect(this, SIGNAL(stderr(QString)), + connect(this, SIGNAL(stderrData(QString)), SLOT(handleInstallerErrorOutput(QString))); } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h b/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h index 7ffb8cf50a6..c587ba20c42 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackageinstaller.h @@ -57,8 +57,8 @@ public: void cancelInstallation(); signals: - void stdout(const QString &output); - void stderr(const QString &output); + void stdoutData(const QString &output); + void stderrData(const QString &output); void finished(const QString &errorMsg = QString()); protected: diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.cpp index c6dd99bb2a2..eaac7590ce2 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.cpp @@ -33,6 +33,7 @@ #include "maemoremotecopyfacility.h" #include "maemoglobal.h" +#include #include #include @@ -92,12 +93,12 @@ void MaemoRemoteCopyFacility::handleConnectionError() void MaemoRemoteCopyFacility::handleRemoteStdout(const QByteArray &output) { - emit stdout(QString::fromUtf8(output)); + emit stdoutData(QString::fromUtf8(output)); } void MaemoRemoteCopyFacility::handleRemoteStderr(const QByteArray &output) { - emit stderr(QString::fromUtf8(output)); + emit stderrData(QString::fromUtf8(output)); } void MaemoRemoteCopyFacility::handleCopyFinished(int exitStatus) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.h b/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.h index ed85dc841f3..c61ea7f8a19 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotecopyfacility.h @@ -60,8 +60,8 @@ public: void cancel(); signals: - void stdout(const QString &output); - void stderr(const QString &output); + void stdoutData(const QString &output); + void stderrData(const QString &output); void progress(const QString &message); void fileCopied(const MaemoDeployable &deployable); void finished(const QString &errorMsg = QString()); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.cpp index 60108eed09f..c1c69a72b45 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemouploadandinstalldeploystep.cpp @@ -83,9 +83,9 @@ void MaemoUploadAndInstallDeployStep::ctor() m_installer = new MaemoRpmPackageInstaller(this); else m_installer = new MaemoTarPackageInstaller(this); - connect(m_installer, SIGNAL(stdout(QString)), + connect(m_installer, SIGNAL(stdoutData(QString)), SLOT(handleRemoteStdout(QString))); - connect(m_installer, SIGNAL(stderr(QString)), + connect(m_installer, SIGNAL(stderrData(QString)), SLOT(handleRemoteStderr(QString))); connect(m_installer, SIGNAL(finished(QString)), SLOT(handleInstallationFinished(QString)));