ProjectNodes: Refactor runConfigurationsFor()

Rename to runConfigurations() and remove the node argument which is
available as 'this'. Adjust const-ness of node argument in
RunConfigurationFactory::runConfigurationsForNode

Change-Id: Icb63e96a305152f90135a2656536de2581faafaf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

22 files changed, 24 insertions, 54 deletions

diff --git a/src/plugins/android/androidrunfactories.cpp b/src/plugins/android/androidrunfactories.cpp
index 4476ce588a..7ec8105055 100644
--- a/src/plugins/android/androidrunfactories.cpp
+++ b/src/plugins/android/androidrunfactories.cpp
@@ -131,7 +131,7 @@ bool AndroidRunConfigurationFactory::canHandle(Target *t) const
     return AndroidManager::supportsAndroid(t);
 }
 
-QList<RunConfiguration *> AndroidRunConfigurationFactory::runConfigurationsForNode(Target *t, ProjectExplorer::Node *n)
+QList<RunConfiguration *> AndroidRunConfigurationFactory::runConfigurationsForNode(Target *t, const Node *n)
 {
     QList<ProjectExplorer::RunConfiguration *> result;
     foreach (ProjectExplorer::RunConfiguration *rc, t->runConfigurations())
diff --git a/src/plugins/android/androidrunfactories.h b/src/plugins/android/androidrunfactories.h
index 3e3260582f..673a9ac58e 100644
--- a/src/plugins/android/androidrunfactories.h
+++ b/src/plugins/android/androidrunfactories.h
@@ -61,7 +61,7 @@ public:
     ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source);
 
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
-                                                                        ProjectExplorer::Node *n);
+                                                                        const ProjectExplorer::Node *n);
 
 private:
     bool canHandle(ProjectExplorer::Target *t) const;
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
index f7bee79cbd..d9d31ba18e 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp
@@ -103,9 +103,3 @@ bool AutotoolsProjectNode::renameFile(const QString &filePath,
     Q_UNUSED(newFilePath);
     return false;
 }
-
-QList<RunConfiguration *> AutotoolsProjectNode::runConfigurationsFor(Node *node)
-{
-    Q_UNUSED(node);
-    return QList<RunConfiguration *>();
-}
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
index 8c96d0977a..1fbad035bc 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h
@@ -67,7 +67,6 @@ public:
     bool deleteFiles(const QStringList &filePaths);
     bool renameFile(const QString &filePath,
                     const QString &newFilePath);
-    QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
 
 private:
     AutotoolsProject *m_project;
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
index ec7abf0d90..c5c84d965f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp
@@ -93,9 +93,3 @@ bool CMakeProjectNode::renameFile(const QString &filePath, const QString &newFil
     Q_UNUSED(newFilePath)
     return false;
 }
-
-QList<ProjectExplorer::RunConfiguration *> CMakeProjectNode::runConfigurationsFor(Node *node)
-{
-    Q_UNUSED(node)
-    return QList<ProjectExplorer::RunConfiguration *>();
-}
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
index f2bfe1c869..aecf2d9181 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.h
@@ -55,7 +55,6 @@ public:
     virtual bool deleteFiles(const QStringList &filePaths);
     virtual bool renameFile(const QString &filePath,
                             const QString &newFilePath);
-    virtual QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
 };
 
 } // namespace Internal
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
index 294505a981..91198bde29 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp
@@ -284,11 +284,5 @@ bool GenericProjectNode::renameFile(const QString &filePath, const QString &newF
     return m_project->renameFile(filePath, newFilePath);
 }
 
-QList<RunConfiguration *> GenericProjectNode::runConfigurationsFor(Node *node)
-{
-    Q_UNUSED(node)
-    return QList<RunConfiguration *>();
-}
-
 } // namespace Internal
 } // namespace GenericProjectManager
diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.h b/src/plugins/genericprojectmanager/genericprojectnodes.h
index c8763e049f..4cd949b5de 100644
--- a/src/plugins/genericprojectmanager/genericprojectnodes.h
+++ b/src/plugins/genericprojectmanager/genericprojectnodes.h
@@ -65,8 +65,6 @@ public:
     bool deleteFiles(const QStringList &filePaths);
     bool renameFile(const QString &filePath, const QString &newFilePath);
 
-    QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
-
     void refresh(QSet<QString> oldFileList = QSet<QString>());
 
 private:
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index c4d8609437..137d2cf9be 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -127,7 +127,7 @@ bool IosRunConfigurationFactory::canHandle(Target *t) const
     return IosManager::supportsIos(t);
 }
 
-QList<RunConfiguration *> IosRunConfigurationFactory::runConfigurationsForNode(Target *t, ProjectExplorer::Node *n)
+QList<RunConfiguration *> IosRunConfigurationFactory::runConfigurationsForNode(Target *t, const Node *n)
 {
     QList<ProjectExplorer::RunConfiguration *> result;
     foreach (ProjectExplorer::RunConfiguration *rc, t->runConfigurations())
diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h
index 3d66090fd4..7a66497026 100644
--- a/src/plugins/ios/iosrunfactories.h
+++ b/src/plugins/ios/iosrunfactories.h
@@ -64,7 +64,7 @@ public:
 
     bool canHandle(ProjectExplorer::Target *t) const QTC_OVERRIDE;
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
-                                                                        ProjectExplorer::Node *n
+                                                                        const ProjectExplorer::Node *n
                                                                         ) QTC_OVERRIDE;
 private:
     ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent,
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index b783042cf9..4f9d597840 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2711,7 +2711,7 @@ void ProjectExplorerPlugin::updateContextMenuActions()
             if (pn == d->m_currentProject->rootProjectNode()) {
                 d->m_runActionContextMenu->setVisible(true);
             } else {
-                QList<RunConfiguration *> runConfigs = pn->runConfigurationsFor(pn);
+                QList<RunConfiguration *> runConfigs = pn->runConfigurations();
                 if (runConfigs.count() == 1) {
                     d->m_runActionContextMenu->setVisible(true);
                     d->m_runActionContextMenu->setData(QVariant::fromValue(runConfigs.first()));
diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp
index e3470d259b..7af657df80 100644
--- a/src/plugins/projectexplorer/projectnodes.cpp
+++ b/src/plugins/projectexplorer/projectnodes.cpp
@@ -615,6 +615,16 @@ bool ProjectNode::deploysFolder(const QString &folder) const
     return false;
 }
 
+/*!
+  \function bool ProjectNode::runConfigurations() const
+
+  Returns a list of \c RunConfiguration suitable for this node.
+  */
+QList<RunConfiguration *> ProjectNode::runConfigurations() const
+{
+    return QList<RunConfiguration *>();
+}
+
 QList<NodesWatcher*> ProjectNode::watchers() const
 {
     return m_watchers;
diff --git a/src/plugins/projectexplorer/projectnodes.h b/src/plugins/projectexplorer/projectnodes.h
index d6dd28dfb8..fbf6909b5e 100644
--- a/src/plugins/projectexplorer/projectnodes.h
+++ b/src/plugins/projectexplorer/projectnodes.h
@@ -249,8 +249,7 @@ public:
     // by default returns false
     virtual bool deploysFolder(const QString &folder) const;
 
-    // TODO node parameter not really needed
-    virtual QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node) = 0;
+    virtual QList<ProjectExplorer::RunConfiguration *> runConfigurations() const;
 
 
     QList<NodesWatcher*> watchers() const;
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.cpp b/src/plugins/qbsprojectmanager/qbsnodes.cpp
index 213fd4afe3..4aaf25bd83 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.cpp
+++ b/src/plugins/qbsprojectmanager/qbsnodes.cpp
@@ -306,12 +306,6 @@ bool QbsBaseProjectNode::renameFile(const QString &filePath, const QString &newF
     return false;
 }
 
-QList<ProjectExplorer::RunConfiguration *> QbsBaseProjectNode::runConfigurationsFor(ProjectExplorer::Node *node)
-{
-    Q_UNUSED(node);
-    return QList<ProjectExplorer::RunConfiguration *>();
-}
-
 // --------------------------------------------------------------------
 // QbsGroupNode:
 // --------------------------------------------------------------------
@@ -548,9 +542,8 @@ void QbsProductNode::setQbsProductData(const qbs::ProductData prd)
         emitNodeUpdated();
 }
 
-QList<ProjectExplorer::RunConfiguration *> QbsProductNode::runConfigurationsFor(ProjectExplorer::Node *node)
+QList<ProjectExplorer::RunConfiguration *> QbsProductNode::runConfigurations() const
 {
-    Q_UNUSED(node);
     QList<ProjectExplorer::RunConfiguration *> result;
     QbsProjectNode *pn = qobject_cast<QbsProjectNode *>(projectNode());
     if (!isEnabled() || !pn || !pn->qbsProject().isValid()
diff --git a/src/plugins/qbsprojectmanager/qbsnodes.h b/src/plugins/qbsprojectmanager/qbsnodes.h
index fe4315b63f..97c28fdf32 100644
--- a/src/plugins/qbsprojectmanager/qbsnodes.h
+++ b/src/plugins/qbsprojectmanager/qbsnodes.h
@@ -89,8 +89,6 @@ public:
     bool deleteFiles(const QStringList &filePaths);
     bool renameFile(const QString &filePath, const QString &newFilePath);
 
-    QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
-
 private:
     friend class QbsGroupNode;
 };
@@ -143,7 +141,7 @@ public:
     void setQbsProductData(const qbs::ProductData prd);
     const qbs::ProductData qbsProductData() const { return m_qbsProductData; }
 
-    QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
+    QList<ProjectExplorer::RunConfiguration *> runConfigurations() const;
 
 private:
     QbsGroupNode *findGroupNode(const QString &name);
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
index 98d8fbabfb..0090568e93 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
@@ -695,7 +695,7 @@ bool DesktopQmakeRunConfigurationFactory::canHandle(Target *t) const
     return devType == Constants::DESKTOP_DEVICE_TYPE;
 }
 
-QList<RunConfiguration *> DesktopQmakeRunConfigurationFactory::runConfigurationsForNode(Target *t, ProjectExplorer::Node *n)
+QList<RunConfiguration *> DesktopQmakeRunConfigurationFactory::runConfigurationsForNode(Target *t, const Node *n)
 {
     QList<RunConfiguration *> result;
     foreach (RunConfiguration *rc, t->runConfigurations())
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
index b24b1ba9c1..03481759da 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
@@ -197,7 +197,7 @@ public:
     QString displayNameForId(const Core::Id id) const;
 
     QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
-                                                                        ProjectExplorer::Node *n);
+                                                                        const ProjectExplorer::Node *n);
 
 private:
     bool canHandle(ProjectExplorer::Target *t) const;
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index db419d6604..9152e85250 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -817,11 +817,11 @@ bool QmakePriFileNode::deploysFolder(const QString &folder) const
     return false;
 }
 
-QList<ProjectExplorer::RunConfiguration *> QmakePriFileNode::runConfigurationsFor(Node *node)
+QList<ProjectExplorer::RunConfiguration *> QmakePriFileNode::runConfigurations() const
 {
     QmakeRunConfigurationFactory *factory = QmakeRunConfigurationFactory::find(m_project->activeTarget());
     if (factory)
-        return factory->runConfigurationsForNode(m_project->activeTarget(), node);
+        return factory->runConfigurationsForNode(m_project->activeTarget(), this);
     return QList<ProjectExplorer::RunConfiguration *>();
 }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h
index ff1342508e..7e5c3aa6dd 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.h
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.h
@@ -168,7 +168,7 @@ public:
     bool folderChanged(const QString &changedFolder, const QSet<Utils::FileName> &newFiles);
 
     bool deploysFolder(const QString &folder) const;
-    QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
+    QList<ProjectExplorer::RunConfiguration *> runConfigurations() const;
 
     QmakeProFileNode *proFileNode() const;
     QList<QmakePriFileNode*> subProjectNodesExact() const;
diff --git a/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h b/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h
index 8704e47edb..baadc2c7e4 100644
--- a/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h
+++ b/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h
@@ -47,7 +47,7 @@ public:
 
     virtual bool canHandle(ProjectExplorer::Target *t) const = 0;
     virtual QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
-                                                                                ProjectExplorer::Node *n) = 0;
+                                                                                const ProjectExplorer::Node *n) = 0;
 
     static QmakeRunConfigurationFactory *find(ProjectExplorer::Target *t);
 };
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
index d8a2e60ad6..3fb4588c5c 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp
@@ -221,11 +221,5 @@ bool QmlProjectNode::renameFile(const QString & /*filePath*/, const QString & /*
     return true;
 }
 
-QList<ProjectExplorer::RunConfiguration *> QmlProjectNode::runConfigurationsFor(Node *node)
-{
-    Q_UNUSED(node)
-    return QList<ProjectExplorer::RunConfiguration *>();
-}
-
 } // namespace Internal
 } // namespace QmlProjectManager
diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h
index f2b94c1121..d695c54f65 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h
@@ -65,8 +65,6 @@ public:
     virtual bool removeFiles(const QStringList &filePaths, QStringList *notRemoved = 0);
     virtual bool deleteFiles(const QStringList &filePaths);
     virtual bool renameFile(const QString &filePath, const QString &newFilePath);
-    virtual QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
-
 
     void refresh();