Debugger: Move aspect data into separate structure

For easier copying to DebuggerStartParameter later

Change-Id: I41672af7e8540393a6bf32c6644f6e56020503b4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

1 files changed, 17 insertions, 11 deletions

diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.h b/src/plugins/debugger/debuggerrunconfigurationaspect.h
index fe1d2b30d5..1c1642e2f4 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.h
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.h
@@ -32,6 +32,7 @@
 #define DEBUGGERRUNCONFIGURATIONASPECT_H
 
 #include "debugger_global.h"
+#include "debuggerconstants.h"
 
 #include <projectexplorer/runconfiguration.h>
 
@@ -39,6 +40,21 @@ namespace Debugger {
 
 namespace Internal { class DebuggerRunConfigWidget;  }
 
+enum DebuggerLanguageStatus {
+    DisabledLanguage = 0,
+    EnabledLanguage,
+    AutoEnabledLanguage
+};
+
+class DEBUGGER_EXPORT DebuggerRunConfigurationAspectData
+{
+public:
+    DebuggerLanguageStatus useCppDebugger = AutoEnabledLanguage;
+    DebuggerLanguageStatus useQmlDebugger = AutoEnabledLanguage;
+    uint qmlDebugServerPort = Constants::QML_DEFAULT_DEBUG_SERVER_PORT;
+    bool useMultiProcess = false;
+};
+
 class DEBUGGER_EXPORT DebuggerRunConfigurationAspect
     : public ProjectExplorer::IRunConfigurationAspect
 {
@@ -48,12 +64,6 @@ public:
     DebuggerRunConfigurationAspect(ProjectExplorer::RunConfiguration *runConfiguration);
     DebuggerRunConfigurationAspect *create(ProjectExplorer::RunConfiguration *runConfiguration) const;
 
-    enum DebuggerLanguageStatus {
-        DisabledLanguage = 0,
-        EnabledLanguage,
-        AutoEnabledLanguage
-    };
-
     void fromMap(const QVariantMap &map);
     void toMap(QVariantMap &map) const;
 
@@ -70,12 +80,8 @@ public:
     bool isQmlDebuggingSpinboxSuppressed() const;
 
 private:
-    DebuggerLanguageStatus m_useCppDebugger;
-    DebuggerLanguageStatus m_useQmlDebugger;
-    uint m_qmlDebugServerPort;
-    bool m_useMultiProcess;
-
     friend class Internal::DebuggerRunConfigWidget;
+    DebuggerRunConfigurationAspectData d;
 };
 
 } // namespace Debugger