No need to pass non-required parameters around.

Reviewed-by: dt

diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index b59523c..14f9ca8 100644 (file)
--- 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 f5e27f5..936f6d8 100644 (file)
--- 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 f86f4d5..6a98232 100644 (file)
--- 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 6b6e6e4..5240d4f 100644 (file)
--- 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);