QtVersionManager et al: Code cosmetics

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

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

1 files changed, 4 insertions, 8 deletions

diff --git a/src/plugins/qtsupport/qtkitconfigwidget.cpp b/src/plugins/qtsupport/qtkitconfigwidget.cpp
index 560e1fd3a8..80c9a62f2c 100644
--- a/src/plugins/qtsupport/qtkitconfigwidget.cpp
+++ b/src/plugins/qtsupport/qtkitconfigwidget.cpp
@@ -50,10 +50,8 @@ QtKitConfigWidget::QtKitConfigWidget(ProjectExplorer::Kit *k, bool sticky) :
     m_combo = new QComboBox;
     m_combo->addItem(tr("None"), -1);
 
-    QtVersionManager *mgr = QtVersionManager::instance();
-    QList<BaseQtVersion *> versions = mgr->versions();
     QList<int> versionIds;
-    foreach (BaseQtVersion *v, versions)
+    foreach (BaseQtVersion *v, QtVersionManager::versions())
         versionIds.append(v->uniqueId());
     versionsChanged(versionIds, QList<int>(), QList<int>());
 
@@ -64,7 +62,7 @@ QtKitConfigWidget::QtKitConfigWidget(ProjectExplorer::Kit *k, bool sticky) :
 
     connect(m_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(currentWasChanged(int)));
 
-    connect(mgr, SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)),
+    connect(QtVersionManager::instance(), SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)),
             this, SLOT(versionsChanged(QList<int>,QList<int>,QList<int>)));
 
     connect(m_manageButton, SIGNAL(clicked()), this, SLOT(manageQtVersions()));
@@ -105,10 +103,8 @@ QWidget *QtKitConfigWidget::buttonWidget() const
 void QtKitConfigWidget::versionsChanged(const QList<int> &added, const QList<int> &removed,
                                         const QList<int> &changed)
 {
-    QtVersionManager *mgr = QtVersionManager::instance();
-
     foreach (const int id, added) {
-        BaseQtVersion *v = mgr->version(id);
+        BaseQtVersion *v = QtVersionManager::version(id);
         QTC_CHECK(v);
         if (!v->isValid())
             continue;
@@ -122,7 +118,7 @@ void QtKitConfigWidget::versionsChanged(const QList<int> &added, const QList<int
 
     }
     foreach (const int id, changed) {
-        BaseQtVersion *v = mgr->version(id);
+        BaseQtVersion *v = QtVersionManager::version(id);
         int pos = findQtVersion(id);
         if (pos >= 0) // We do not include invalid Qt versions, so do not try to remove those.
             m_combo->setItemText(pos, v->displayName());