ProjectExplorer et al: Code cosmetics

Apply static 'pattern' for ToolChainManager, de-noise using code.

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

1 files changed, 15 insertions, 26 deletions

diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h
index 2202643aac..e9e1af70db 100644
--- a/src/plugins/projectexplorer/toolchainmanager.h
+++ b/src/plugins/projectexplorer/toolchainmanager.h
@@ -32,22 +32,18 @@
 
 #include "projectexplorer_export.h"
 
-
 #include <QList>
 #include <QObject>
 #include <QString>
 
 namespace Utils { class FileName; }
+
 namespace ProjectExplorer {
+
 class ProjectExplorerPlugin;
 class ToolChain;
-class ToolChainFactory;
 class Abi;
 
-namespace Internal {
-class ToolChainManagerPrivate;
-}
-
 // --------------------------------------------------------------------------
 // ToolChainManager
 // --------------------------------------------------------------------------
@@ -57,21 +53,21 @@ class PROJECTEXPLORER_EXPORT ToolChainManager : public QObject
     Q_OBJECT
 
 public:
-    static ToolChainManager *instance();
+    static QObject *instance();
     ~ToolChainManager();
 
-    QList<ToolChain *> toolChains() const;
-    QList<ToolChain *> findToolChains(const Abi &abi) const;
-    ToolChain *findToolChain(const QString &id) const;
+    static QList<ToolChain *> toolChains();
+    static QList<ToolChain *> findToolChains(const Abi &abi);
+    static ToolChain *findToolChain(const QString &id);
 
-    Utils::FileName defaultDebugger(const Abi &abi) const;
+    static Utils::FileName defaultDebugger(const Abi &abi);
 
-    bool isLoaded() const;
+    static bool isLoaded();
 
-public slots:
-    bool registerToolChain(ProjectExplorer::ToolChain *tc);
-    void deregisterToolChain(ProjectExplorer::ToolChain *tc);
+    static bool registerToolChain(ToolChain *tc);
+    static void deregisterToolChain(ToolChain *tc);
 
+public slots:
     void saveToolChains();
 
 signals:
@@ -80,9 +76,9 @@ signals:
     void toolChainRemoved(ProjectExplorer::ToolChain *);
     // Tool chain was updated.
     void toolChainUpdated(ProjectExplorer::ToolChain *);
-    // Something changed:
+    // Something changed.
     void toolChainsChanged();
-
+    //
     void toolChainsLoaded();
 
 private:
@@ -90,16 +86,9 @@ private:
 
     // Make sure the this is only called after all
     // Tool chain Factories are registered!
-    void restoreToolChains();
-    QList<ToolChain *> restoreToolChains(const Utils::FileName &fileName);
-
-    void notifyAboutUpdate(ProjectExplorer::ToolChain *);
-
-    Internal::ToolChainManagerPrivate *const d;
-
-    static ToolChainManager *m_instance;
+    static void restoreToolChains();
+    static void notifyAboutUpdate(ToolChain *);
 
-    friend class Internal::ToolChainManagerPrivate; // for the restoreToolChains methods
     friend class ProjectExplorerPlugin; // for constructor
     friend class ToolChain;
 };