From 3bfc953c13253a19f631cabb8a91b680df2f5a13 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 6 Apr 2011 14:52:30 +0200 Subject: [PATCH] DebuggingHelpers: Reorder arguments of finished signal Allow slots that use the error ouput, but aren't interested in the list of the tools. Reviewed-by: dt --- src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp | 4 ++-- src/plugins/qt4projectmanager/debugginghelperbuildtask.h | 2 +- src/plugins/qt4projectmanager/qmakestep.cpp | 6 +++--- src/plugins/qt4projectmanager/qmakestep.h | 2 +- src/plugins/qt4projectmanager/qmldumptool.cpp | 6 +++--- src/plugins/qt4projectmanager/qtoptionspage.cpp | 6 +++--- src/plugins/qt4projectmanager/qtoptionspage.h | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp index cddc63f4c41..49001eec558 100644 --- a/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp +++ b/src/plugins/qt4projectmanager/debugginghelperbuildtask.cpp @@ -133,10 +133,10 @@ void DebuggingHelperBuildTask::run(QFutureInterface &future) success = buildDebuggingHelper(future, &output); if (success) { - emit finished(m_qtId, m_tools, output); + emit finished(m_qtId, output, m_tools); } else { qWarning("%s", qPrintable(m_errorMessage)); - emit finished(m_qtId, m_tools, m_errorMessage); + emit finished(m_qtId, m_errorMessage, m_tools); } deleteLater(); diff --git a/src/plugins/qt4projectmanager/debugginghelperbuildtask.h b/src/plugins/qt4projectmanager/debugginghelperbuildtask.h index 20d24fe3e29..952dda69a10 100644 --- a/src/plugins/qt4projectmanager/debugginghelperbuildtask.h +++ b/src/plugins/qt4projectmanager/debugginghelperbuildtask.h @@ -65,7 +65,7 @@ public: static Tools availableTools(const QtVersion *version); signals: - void finished(int qtVersionId, DebuggingHelperBuildTask::Tools tools, const QString &output); + void finished(int qtVersionId, const QString &output, DebuggingHelperBuildTask::Tools tools); private: bool buildDebuggingHelper(QFutureInterface &future, QString *output); diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp index e90c9790e40..520213d4ad9 100644 --- a/src/plugins/qt4projectmanager/qmakestep.cpp +++ b/src/plugins/qt4projectmanager/qmakestep.cpp @@ -544,8 +544,8 @@ void QMakeStepConfigWidget::buildQmlDebuggingHelper() DebuggingHelperBuildTask *buildTask = new DebuggingHelperBuildTask(version, DebuggingHelperBuildTask::QmlDebugging); - connect(buildTask, SIGNAL(finished(int,DebuggingHelperBuildTask::Tools,QString)), - this, SLOT(debuggingHelperBuildFinished()), + connect(buildTask, SIGNAL(finished(int,QString,DebuggingHelperBuildTask::Tools)), + this, SLOT(debuggingHelperBuildFinished(int,QString)), Qt::QueuedConnection); QFuture task = QtConcurrent::run(&DebuggingHelperBuildTask::run, buildTask); @@ -554,7 +554,7 @@ void QMakeStepConfigWidget::buildQmlDebuggingHelper() QLatin1String("Qt4ProjectManager::BuildHelpers")); } -void QMakeStepConfigWidget::debuggingHelperBuildFinished() +void QMakeStepConfigWidget::debuggingHelperBuildFinished(int qtVersionId, const QString &output) { m_step->qt4BuildConfiguration()->qtVersion()->invalidateCache(); m_ui.qmlDebuggingLibraryCheckBox->setChecked(m_step->linkQmlDebuggingLibrary()); diff --git a/src/plugins/qt4projectmanager/qmakestep.h b/src/plugins/qt4projectmanager/qmakestep.h index 24869cf0c19..163f0ddd93f 100644 --- a/src/plugins/qt4projectmanager/qmakestep.h +++ b/src/plugins/qt4projectmanager/qmakestep.h @@ -149,7 +149,7 @@ private slots: // other void buildQmlDebuggingHelper(); - void debuggingHelperBuildFinished(); + void debuggingHelperBuildFinished(int qtVersionId, const QString &output); private: void updateSummaryLabel(); diff --git a/src/plugins/qt4projectmanager/qmldumptool.cpp b/src/plugins/qt4projectmanager/qmldumptool.cpp index 823141b3eaa..8c8795b56a5 100644 --- a/src/plugins/qt4projectmanager/qmldumptool.cpp +++ b/src/plugins/qt4projectmanager/qmldumptool.cpp @@ -73,8 +73,8 @@ public: { qmlDumpBuilds()->insert(version->uniqueId(), this); - connect(m_buildTask, SIGNAL(finished(int,DebuggingHelperBuildTask::Tools,QString)), - this, SLOT(finish(int,DebuggingHelperBuildTask::Tools,QString)), + connect(m_buildTask, SIGNAL(finished(int,QString,DebuggingHelperBuildTask::Tools)), + this, SLOT(finish(int,QString,DebuggingHelperBuildTask::Tools)), Qt::QueuedConnection); } @@ -102,7 +102,7 @@ public: } private slots: - void finish(int qtId, DebuggingHelperBuildTask::Tools tools, const QString &output) + void finish(int qtId, const QString &output, DebuggingHelperBuildTask::Tools tools) { QtVersion *version = QtVersionManager::instance()->version(qtId); diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp index 026f2947638..c50b89e0831 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.cpp +++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp @@ -261,7 +261,7 @@ static inline int findVersionById(const QList &l, int id) } // Update with results of terminated helper build -void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, DebuggingHelperBuildTask::Tools tools, const QString &output) +void QtOptionsPageWidget::debuggingHelperBuildFinished(int qtVersionId, const QString &output, DebuggingHelperBuildTask::Tools tools) { const int index = findVersionById(m_versions, qtVersionId); if (index == -1) @@ -320,8 +320,8 @@ void QtOptionsPageWidget::buildDebuggingHelper(DebuggingHelperBuildTask::Tools t // Run a debugging helper build task in the background. DebuggingHelperBuildTask *buildTask = new DebuggingHelperBuildTask(version, tools); - connect(buildTask, SIGNAL(finished(int,DebuggingHelperBuildTask::Tools,QString)), - this, SLOT(debuggingHelperBuildFinished(int,DebuggingHelperBuildTask::Tools,QString)), + connect(buildTask, SIGNAL(finished(int,QString,DebuggingHelperBuildTask::Tools)), + this, SLOT(debuggingHelperBuildFinished(int,QString,DebuggingHelperBuildTask::Tools)), Qt::QueuedConnection); QFuture task = QtConcurrent::run(&DebuggingHelperBuildTask::run, buildTask); const QString taskName = tr("Building helpers"); diff --git a/src/plugins/qt4projectmanager/qtoptionspage.h b/src/plugins/qt4projectmanager/qtoptionspage.h index db40b9f212f..196be1ac98c 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.h +++ b/src/plugins/qt4projectmanager/qtoptionspage.h @@ -106,7 +106,7 @@ private slots: void buildQmlDebuggingLibrary(); void buildQmlObserver(); void slotShowDebuggingBuildLog(); - void debuggingHelperBuildFinished(int qtVersionId, DebuggingHelperBuildTask::Tools tools, const QString &output); + void debuggingHelperBuildFinished(int qtVersionId, const QString &output, DebuggingHelperBuildTask::Tools tools); private: void updateDescriptionLabel();