Qbs: Simplify qbsmanager

Change-Id: I6755e28e1f75788203a0e734cd1b6dabd2308919
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

3 files changed, 6 insertions, 10 deletions

diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 05c6daaa3f..9016e3b881 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -437,7 +437,7 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
     baseConfig.insert(specialKey, userConfig.take(specialKey));
     params.setBuildConfiguration(baseConfig);
     params.setOverriddenValues(userConfig);
-    qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings());
+    qbs::ErrorInfo err = params.expandBuildConfiguration(QbsManager::settings());
     if (err.hasError()) {
         generateErrors(err);
         return;
@@ -478,7 +478,7 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
     QTC_ASSERT(!m_qbsSetupProjectJob, return);
 
     m_qbsSetupProjectJob
-            = qbs::Project::setupProject(params, m_manager->logSink(), 0);
+            = qbs::Project::setupProject(params, QbsManager::logSink(), 0);
 
     connect(m_qbsSetupProjectJob, SIGNAL(finished(bool,qbs::AbstractJob*)),
             this, SLOT(handleQbsParsingDone(bool)));
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
index 3ba25457dd..302b6263a7 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
@@ -59,6 +59,7 @@ static QString qtcProfilePrefix() { return qtcProfileGroup() + sep; }
 namespace QbsProjectManager {
 
 qbs::Settings *QbsManager::m_settings = 0;
+Internal::QbsLogSink *QbsManager::m_logSink = 0;
 
 QbsManager::QbsManager() :
     m_defaultPropertyProvider(new DefaultPropertyProvider)
@@ -120,11 +121,6 @@ void QbsManager::setProfileForKit(const QString &name, const ProjectExplorer::Ki
     m_settings->setValue(qtcProfilePrefix() + k->id().toString(), name);
 }
 
-qbs::Settings *QbsManager::settings()
-{
-    return m_settings;
-}
-
 void QbsManager::addProfile(const QString &name, const QVariantMap &data)
 {
     qbs::Profile profile(name, settings());
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.h b/src/plugins/qbsprojectmanager/qbsprojectmanager.h
index 378689e75b..4874a130fe 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.h
@@ -72,8 +72,8 @@ public:
     QString profileForKit(const ProjectExplorer::Kit *k) const;
     void setProfileForKit(const QString &name, const ProjectExplorer::Kit *k);
 
-    static qbs::Settings *settings();
-    Internal::QbsLogSink *logSink() { return m_logSink; }
+    static qbs::Settings *settings() { return m_settings; }
+    static Internal::QbsLogSink *logSink() { return m_logSink; }
 
 private slots:
     void pushKitsToQbs();
@@ -84,7 +84,7 @@ private:
     void addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k);
     void addProfileFromKit(const ProjectExplorer::Kit *k);
 
-    Internal::QbsLogSink *m_logSink;
+    static Internal::QbsLogSink *m_logSink;
     static qbs::Settings *m_settings;
 
     DefaultPropertyProvider *m_defaultPropertyProvider;