From 1aa0b1509601202a79164e1df1915897347ec1d2 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Wed, 6 Jan 2016 15:05:04 +0100
Subject: [PATCH] CMake: Clean up CMakeOpenProjectWizard

Change-Id: Iffa47255df160da86717dde3c3333c204945c179
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../cmakeopenprojectwizard.cpp                 |  4 +---
 .../cmakeopenprojectwizard.h                   | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index f877e0db368..63838bd7c17 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -91,10 +91,8 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(QWidget *parent, CMakeManager *cm
       m_cmakeManager(cmakeManager),
       m_sourceDirectory(info->sourceDirectory),
       m_environment(info->environment),
-      m_kit(0)
+      m_kit(KitManager::find(info->kitId))
 {
-    m_kit = KitManager::find(info->kitId);
-
     CMakeRunPage::Mode rmode;
     if (mode == CMakeOpenProjectWizard::NeedToCreate)
         rmode = CMakeRunPage::Recreate;
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
index de3f1737ef2..4bcfb54bded 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
@@ -113,9 +113,11 @@ public:
     NoKitPage(CMakeOpenProjectWizard *cmakeWizard);
     bool isComplete() const override;
     void initializePage() override;
+
 private slots:
     void kitsChanged();
     void showOptions();
+
 private:
     QLabel *m_descriptionLabel;
     QPushButton *m_optionsButton;
@@ -136,9 +138,10 @@ class ShadowBuildPage : public QWizardPage
     Q_OBJECT
 public:
     explicit ShadowBuildPage(CMakeOpenProjectWizard *cmakeWizard, bool change = false);
-private slots:
-    void buildDirectoryChanged();
+
 private:
+    void buildDirectoryChanged();
+
     CMakeOpenProjectWizard *m_cmakeWizard;
     Utils::PathChooser *m_pc;
 };
@@ -149,10 +152,11 @@ class NoCMakePage : public QWizardPage
 public:
     NoCMakePage(CMakeOpenProjectWizard *cmakeWizard);
     bool isComplete() const;
-private slots:
+
+private:
     void cmakeToolsChanged();
     void showOptions();
-private:
+
     QLabel *m_descriptionLabel;
     QPushButton *m_optionsButton;
 };
@@ -172,14 +176,16 @@ public:
     virtual bool validatePage();
     virtual void cleanupPage();
     virtual bool isComplete() const;
-private slots:
+
+private:
     void runCMake();
     void cmakeFinished();
     void cmakeReadyReadStandardOutput();
     void cmakeReadyReadStandardError();
-private:
+
     void initWidgets();
     QByteArray cachedGeneratorFromFile(const QString &cache);
+
     CMakeOpenProjectWizard *m_cmakeWizard;
     QPlainTextEdit *m_output;
     QPushButton *m_runCMake;