From f0b58a22ca3c2cff0d06b62c08539358cecbf2c9 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Tue, 22 Jul 2014 09:49:51 +0200
Subject: [PATCH] QbsProjectManager: Clean-ups in QbsProject class.

- Remove unneeded forward declarations (the header file is included
already).
- Move QVariantMap include from header to cpp file.
- Remove pointless "const" in front of function return type.
- In projectData(), return the stored value instead of fetching it again
from the project.

Change-Id: I9c8f4e8eaea070833953cd4d65e3452bae37998d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 src/plugins/qbsprojectmanager/qbsproject.cpp |  7 +++----
 src/plugins/qbsprojectmanager/qbsproject.h   | 18 +-----------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 77286d177a2..2747d3d5bfc 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -68,6 +68,7 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QFileInfo>
+#include <QVariantMap>
 
 using namespace Core;
 using namespace ProjectExplorer;
@@ -337,11 +338,9 @@ qbs::Project QbsProject::qbsProject() const
     return m_qbsProject;
 }
 
-const qbs::ProjectData QbsProject::qbsProjectData() const
+qbs::ProjectData QbsProject::qbsProjectData() const
 {
-    if (m_qbsProject.isValid())
-        return m_qbsProject.projectData();
-    return qbs::ProjectData();
+    return m_projectData;
 }
 
 bool QbsProject::needsSpecialDeployment() const
diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h
index e464d444815..3106d819fb9 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.h
+++ b/src/plugins/qbsprojectmanager/qbsproject.h
@@ -42,22 +42,6 @@
 
 #include <QFuture>
 #include <QTimer>
-#include <QVariantMap>
-
-namespace qbs {
-class BuildJob;
-class CleanJob;
-class Error;
-class GroupData;
-class ProductData;
-class ProjectData;
-class CleanOptions;
-class InstallJob;
-class InstallOptions;
-class Project;
-class ErrorInfo;
-class BuildOptions;
-} // namespace qbs
 
 namespace Core { class IDocument; }
 namespace ProjectExplorer { class BuildConfiguration; }
@@ -115,7 +99,7 @@ public:
                                                  const QString &bcName);
 
     qbs::Project qbsProject() const;
-    const qbs::ProjectData qbsProjectData() const;
+    qbs::ProjectData qbsProjectData() const;
 
     bool needsSpecialDeployment() const;
     void generateErrors(const qbs::ErrorInfo &e);