ProjectExplorer: Remove some pointerage around KitOptionsPage

Change-Id: Ib1736a80739c6052372896bac03aa324fd807151
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

4 files changed, 9 insertions, 22 deletions

diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp
index a4fe93c1f8..db578a403e 100644
--- a/src/plugins/projectexplorer/kitoptionspage.cpp
+++ b/src/plugins/projectexplorer/kitoptionspage.cpp
@@ -25,7 +25,9 @@ namespace Internal {
 
 // KitOptionsPageWidget
 
-static KitOptionsPageWidget *kitOptionsPageWidget = nullptr;
+class KitOptionsPageWidget;
+
+static QPointer<KitOptionsPageWidget> kitOptionsPageWidget;
 
 class KitOptionsPageWidget : public Core::IOptionsPageWidget
 {
@@ -242,11 +244,8 @@ QModelIndex KitOptionsPageWidget::currentIndex() const
 // KitOptionsPage:
 // --------------------------------------------------------------------------
 
-static KitOptionsPage *theKitOptionsPage = nullptr;
-
 KitOptionsPage::KitOptionsPage()
 {
-    theKitOptionsPage = this;
     setId(Constants::KITS_SETTINGS_PAGE_ID);
     setDisplayName(Tr::tr("Kits"));
     setCategory(Constants::KITS_SETTINGS_CATEGORY);
@@ -261,7 +260,8 @@ void KitOptionsPage::showKit(Kit *k)
         return;
 
     Internal::KitOptionsPageWidget *widget = Internal::kitOptionsPageWidget;
-    QTC_ASSERT(widget, return);
+    if (!widget)
+        return;
 
     QModelIndex index = widget->m_model->indexOf(k);
     widget->m_selectionModel->select(index,
@@ -271,9 +271,4 @@ void KitOptionsPage::showKit(Kit *k)
     widget->m_kitsView->scrollTo(index);
 }
 
-KitOptionsPage *KitOptionsPage::instance()
-{
-    return theKitOptionsPage;
-}
-
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/kitoptionspage.h b/src/plugins/projectexplorer/kitoptionspage.h
index b3378060be..a7a4ba29db 100644
--- a/src/plugins/projectexplorer/kitoptionspage.h
+++ b/src/plugins/projectexplorer/kitoptionspage.h
@@ -7,12 +7,8 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-#include <QPointer>
-
 namespace ProjectExplorer {
 
-namespace Internal { class KitOptionsPageWidget; }
-
 class Kit;
 
 class PROJECTEXPLORER_EXPORT KitOptionsPage : public Core::IOptionsPage
@@ -20,8 +16,7 @@ class PROJECTEXPLORER_EXPORT KitOptionsPage : public Core::IOptionsPage
 public:
     KitOptionsPage();
 
-    void showKit(Kit *k);
-    static KitOptionsPage *instance();
+    static void showKit(Kit *k);
 };
 
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index f44c5354fe..6d51ada410 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -743,8 +743,7 @@ public:
     void handleManageKits()
     {
         if (ProjectItem *projectItem = m_projectsModel.rootItem()->childAt(0)) {
-            if (auto kitPage = KitOptionsPage::instance())
-                kitPage->showKit(KitManager::kit(Id::fromSetting(projectItem->data(0, KitIdRole))));
+            KitOptionsPage::showKit(KitManager::kit(Id::fromSetting(projectItem->data(0, KitIdRole))));
         }
         ICore::showOptionsDialog(Constants::KITS_SETTINGS_PAGE_ID);
     }
diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp
index cae28fc3e1..63b61401d5 100644
--- a/src/plugins/projectexplorer/targetsetupwidget.cpp
+++ b/src/plugins/projectexplorer/targetsetupwidget.cpp
@@ -180,10 +180,8 @@ void TargetSetupWidget::manageKit()
     if (!m_kit)
         return;
 
-    if (auto kitPage = KitOptionsPage::instance()) {
-        kitPage->showKit(m_kit);
-        Core::ICore::showOptionsDialog(Constants::KITS_SETTINGS_PAGE_ID, parentWidget());
-    }
+    KitOptionsPage::showKit(m_kit);
+    Core::ICore::showOptionsDialog(Constants::KITS_SETTINGS_PAGE_ID, parentWidget());
 }
 
 void TargetSetupWidget::setProjectPath(const FilePath &projectPath)