diff options
author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-06-12 14:58:59 +0200 |
---|---|---|
committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-06-12 15:11:40 +0200 |
commit | de333ba02d6ed12c91ae7df9d02a201170942252 (patch) | |
tree | a57c53ed980fa55ef11e1a118baacb9093e05a05 | |
parent | ad93155a9e265e9708056ea3d14037255f18abb0 (diff) |
No need to pass non-required parameters around.
Reviewed-by: dt
-rw-r--r-- | src/plugins/coreplugin/welcomemode.cpp | 6 | ||||
-rw-r--r-- | src/plugins/coreplugin/welcomemode.h | 4 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.cpp | 12 | ||||
-rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.h | 2 |
4 files changed, 11 insertions, 13 deletions
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp index b59523c6354..14f9ca8108c 100644 --- a/src/plugins/coreplugin/welcomemode.cpp +++ b/src/plugins/coreplugin/welcomemode.cpp @@ -160,8 +160,8 @@ WelcomeMode::WelcomeMode() : connect(m_d->ui.openExampleButton, SIGNAL(clicked()), SLOT(slotOpenExample())); connect(m_d->ui.examplesComboBox, SIGNAL(currentIndexChanged(int)), SLOT(slotEnableExampleButton(int))); - connect(this, SIGNAL(updatedExamples(QString, QString, QString)), - this, SLOT(slotUpdateExamples(QString, QString, QString))); + connect(this, SIGNAL(updatedExamples(QString, QString)), + this, SLOT(slotUpdateExamples(QString, QString))); connect(m_d->rssFetcher, SIGNAL(newsItemReady(QString, QString, QString)), m_d->ui.newsTreeWidget, SLOT(slotAddNewsItem(QString, QString, QString))); @@ -310,7 +310,7 @@ void WelcomeMode::slotUrlClicked(const QString &data) QDesktopServices::openUrl(QUrl(data)); } -void WelcomeMode::slotUpdateExamples(const QString& examplePath, const QString& demosPath, const QString& docPath) +void WelcomeMode::slotUpdateExamples(const QString& examplePath, const QString& demosPath) { QString demoxml = demosPath + "/qtdemo/xml/examples.xml"; if (!QFile::exists(demoxml)) diff --git a/src/plugins/coreplugin/welcomemode.h b/src/plugins/coreplugin/welcomemode.h index f5e27f52a1e..936f6d8b251 100644 --- a/src/plugins/coreplugin/welcomemode.h +++ b/src/plugins/coreplugin/welcomemode.h @@ -81,14 +81,14 @@ signals: void openHelpPage(const QString& url); void openContextHelpPage(const QString& url); void manageSessions(); - void updatedExamples(const QString& examplePath, const QString& demosPath, const QString& docPath); + void updatedExamples(const QString& examplePath, const QString& demosPath); private slots: void slotFeedback(); void slotSessionClicked(const QString &data); void slotProjectClicked(const QString &data); void slotUrlClicked(const QString &data); - void slotUpdateExamples(const QString& examplePath, const QString& demosPath, const QString& docPath); + void slotUpdateExamples(const QString& examplePath, const QString& demosPath); void slotEnableExampleButton(int); void slotOpenExample(); void slotCreateNewProject(); diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index f86f4d5bf6a..6a98232367f 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -104,8 +104,8 @@ QtVersionManager::QtVersionManager() if (Core::Internal::WelcomeMode *welcomeMode = qobject_cast<Core::Internal::WelcomeMode*> (Core::ICore::instance()->modeManager()->mode(Core::Constants::MODE_WELCOME))) { - connect(this, SIGNAL(updatedExamples(QString,QString,QString)), - welcomeMode, SIGNAL(updatedExamples(QString,QString, QString))); + connect(this, SIGNAL(updatedExamples(QString, QString)), + welcomeMode, SIGNAL(updatedExamples(QString, QString))); } updateDocumentation(); updateExamples(); @@ -156,16 +156,14 @@ void QtVersionManager::updateExamples() QString docPath; QString demosPath; QtVersion *version = 0; - // try to find a version which has both, examples and docs, starting with default Qt + // try to find a version which has both, demos and examples, starting with default Qt foreach (version, versions) { if (version->hasExamples()) examplesPath = version->examplesPath(); if (version->hasDemos()) demosPath = version->demosPath(); - if (version->hasDocumentation()) - docPath = version->documentationPath(); - if (!examplesPath.isEmpty() && !demosPath.isEmpty() && !docPath.isEmpty()) { - emit updatedExamples(examplesPath, demosPath, docPath); + if (!examplesPath.isEmpty() && !demosPath.isEmpty()) { + emit updatedExamples(examplesPath, demosPath); return; } } diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index 6b6e6e4f999..5240d4fa75e 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -184,7 +184,7 @@ public: signals: void defaultQtVersionChanged(); void qtVersionsChanged(); - void updatedExamples(const QString& examplesPath, const QString& demosPath, const QString& docPath); + void updatedExamples(const QString& examplesPath, const QString& demosPath); private: // Used by QtOptionsPage void setNewQtVersions(QList<QtVersion *> newVersions, int newDefaultVersion); |