From be899de35ce9efb1d90380336253eb42acbdb707 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 20 Feb 2020 18:04:36 +0100
Subject: [PATCH] CMake: Move CMakeBuildStepConfigWidget definition to .cpp

Slimmer interface.

Change-Id: I34b8c172864456f67216efce7a09967c0ffec8be
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../cmakeprojectmanager/cmakebuildstep.cpp    | 31 ++++++++++++++--
 .../cmakeprojectmanager/cmakebuildstep.h      | 37 +------------------
 2 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 0d938eb0cab..50bf99a924b 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -60,16 +60,36 @@
 #include <QListWidget>
 #include <QRadioButton>
 
-using namespace CMakeProjectManager;
-using namespace CMakeProjectManager::Internal;
 using namespace ProjectExplorer;
 
-namespace {
+namespace CMakeProjectManager {
+namespace Internal {
+
 const char BUILD_TARGETS_KEY[] = "CMakeProjectManager.MakeStep.BuildTargets";
 const char TOOL_ARGUMENTS_KEY[] = "CMakeProjectManager.MakeStep.AdditionalArguments";
 const char ADD_RUNCONFIGURATION_ARGUMENT_KEY[] = "CMakeProjectManager.MakeStep.AddRunConfigurationArgument";
 const char ADD_RUNCONFIGURATION_TEXT[] = "Current executable";
-}
+
+class CMakeBuildStepConfigWidget : public BuildStepConfigWidget
+{
+    Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager::Internal::CMakeBuildStepConfigWidget)
+
+public:
+    explicit CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep);
+
+private:
+    void itemChanged(QListWidgetItem *);
+    void toolArgumentsEdited();
+    void updateDetails();
+    void buildTargetsChanged();
+    void updateBuildTarget();
+
+    QRadioButton *itemWidget(QListWidgetItem *item);
+
+    CMakeBuildStep *m_buildStep;
+    QLineEdit *m_toolArguments;
+    QListWidget *m_buildTargetsList;
+};
 
 static bool isCurrentExecutableTarget(const QString &target)
 {
@@ -554,3 +574,6 @@ void CMakeBuildStep::processFinished(int exitCode, QProcess::ExitStatus status)
     AbstractProcessStep::processFinished(exitCode, status);
     emit progress(100, QString());
 }
+
+} // Internal
+} // CMakeProjectManager
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index 1938c88b10f..cd41f77f412 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -27,22 +27,9 @@
 
 #include <projectexplorer/abstractprocessstep.h>
 
-#include <QRegExp>
+namespace Utils { class CommandLine; }
 
-QT_BEGIN_NAMESPACE
-class QLineEdit;
-class QListWidget;
-class QListWidgetItem;
-class QRadioButton;
-QT_END_NAMESPACE
-
-namespace Utils {
-class CommandLine;
-} // Utils
-
-namespace ProjectExplorer {
-class RunConfiguration;
-} // ProjectManager
+namespace ProjectExplorer { class RunConfiguration; }
 
 namespace CMakeProjectManager {
 namespace Internal {
@@ -117,26 +104,6 @@ private:
     bool m_waiting = false;
 };
 
-class CMakeBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
-{
-    Q_OBJECT
-public:
-    CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep);
-
-private:
-    void itemChanged(QListWidgetItem*);
-    void toolArgumentsEdited();
-    void updateDetails();
-    void buildTargetsChanged();
-    void updateBuildTarget();
-
-    QRadioButton *itemWidget(QListWidgetItem *item);
-
-    CMakeBuildStep *m_buildStep;
-    QLineEdit *m_toolArguments;
-    QListWidget *m_buildTargetsList;
-};
-
 class CMakeBuildStepFactory : public ProjectExplorer::BuildStepFactory
 {
 public: