Remove isApplication() and simplfy startup project logic

3 files changed, 5 insertions, 17 deletions

diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 10b6bb3953..79f4f8ba4a 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -72,7 +72,6 @@ public:
 
     virtual QList<Project *> dependsOn() = 0; //NBS TODO implement dependsOn
 
-    virtual bool isApplication() const = 0;
     bool hasActiveBuildSettings() const;
 
     // EditorConfiguration:
diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp
index 2f2c7340f7..da7ad5254c 100644
--- a/src/plugins/projectexplorer/session.cpp
+++ b/src/plugins/projectexplorer/session.cpp
@@ -598,8 +598,8 @@ void SessionManager::addProjects(const QList<Project*> &projects)
 
     // maybe we have a new startup project?
     if (!startupProject())
-        if (Project *newStartupProject = defaultStartupProject())
-            setStartupProject(newStartupProject);
+        if (!m_file->m_projects.isEmpty())
+            setStartupProject(m_file->m_projects.first());
 }
 
 void SessionManager::removeProject(Project *project)
@@ -631,7 +631,7 @@ bool SessionManager::createImpl(const QString &fileName)
         delete m_file;
         m_file = new SessionFile;
         m_file->setFileName(fileName);
-        setStartupProject(defaultStartupProject());
+        setStartupProject(0);
     }
 
     m_defaultVirginSession = false;
@@ -792,16 +792,6 @@ QStringList SessionManager::dependenciesOrder() const
     return ordered;
 }
 
-Project *SessionManager::defaultStartupProject() const
-{
-    // Just take first one
-    foreach (Project *p, m_file->m_projects) {
-        if (p->isApplication())
-            return p;
-    }
-    return 0;
-}
-
 QList<Project *> SessionManager::projectOrder(Project *project) const
 {
     QList<Project *> result;
@@ -1010,8 +1000,8 @@ void SessionManager::removeProjects(QList<Project *> remove)
     m_file->m_depMap = resMap;
 
     if (startupProject() == 0)
-        if (Project *newStartupProject = defaultStartupProject())
-            setStartupProject(newStartupProject);
+        if (!m_file->m_projects.isEmpty())
+            setStartupProject(m_file->m_projects.first());
 }
 
 void SessionManager::setValue(const QString &name, const QVariant &value)
diff --git a/src/plugins/projectexplorer/session.h b/src/plugins/projectexplorer/session.h
index f7b5d246d6..16397e4a1f 100644
--- a/src/plugins/projectexplorer/session.h
+++ b/src/plugins/projectexplorer/session.h
@@ -184,7 +184,6 @@ private:
     bool recursiveDependencyCheck(const QString &newDep, const QString &checkDep) const;
     QStringList dependencies(const QString &proName) const;
     QStringList dependenciesOrder() const;
-    Project *defaultStartupProject() const;
 
     void updateName(const QString &session);