From 317a985dd6c74288b58c59775d2b2d56d224d231 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 8 Jul 2024 09:59:33 +0200
Subject: [PATCH] Debugger: Create separate class DebuggerModeWidget for mode
 widget

Change-Id: Iaf8d2f2b9bfaf80f2b3b231638c1609503f7850f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/debugger/debuggerplugin.cpp | 44 ++++++++++++++-----------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 10f2dabb6a6..d6fe2f6cf22 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -432,19 +432,11 @@ QAction *addCheckableAction(const QObject *parent, QMenu *menu, const QString &d
 //
 ///////////////////////////////////////////////////////////////////////
 
-class DebugMode : public IMode
+class DebugModeWidget final : public MiniSplitter
 {
 public:
-    DebugMode()
+    DebugModeWidget()
     {
-        setObjectName("DebugMode");
-        setContext(Context(C_DEBUGMODE, CC::C_NAVIGATION_PANE));
-        setDisplayName(Tr::tr("Debug"));
-        setIcon(Utils::Icon::modeIcon(Icons::MODE_DEBUGGER_CLASSIC,
-                                      Icons::MODE_DEBUGGER_FLAT, Icons::MODE_DEBUGGER_FLAT_ACTIVE));
-        setPriority(85);
-        setId(MODE_DEBUG);
-
         DebuggerMainWindow *mainWindow = DebuggerMainWindow::instance();
 
         auto editorHolderLayout = new QVBoxLayout;
@@ -483,19 +475,33 @@ public:
         mainWindowSplitter->setOrientation(Qt::Vertical);
 
         // Navigation and right-side window.
-        auto splitter = new MiniSplitter;
-        splitter->setFocusProxy(DebuggerMainWindow::centralWidgetStack());
-        splitter->addWidget(new NavigationWidgetPlaceHolder(MODE_DEBUG, Side::Left));
-        splitter->addWidget(mainWindowSplitter);
-        splitter->setStretchFactor(0, 0);
-        splitter->setStretchFactor(1, 1);
-        splitter->setObjectName("DebugModeWidget");
+        setFocusProxy(DebuggerMainWindow::centralWidgetStack());
+        addWidget(new NavigationWidgetPlaceHolder(MODE_DEBUG, Side::Left));
+        addWidget(mainWindowSplitter);
+        setStretchFactor(0, 0);
+        setStretchFactor(1, 1);
+        setObjectName("DebugModeWidget");
 
         mainWindow->addSubPerspectiveSwitcher(EngineManager::engineChooser());
         mainWindow->addSubPerspectiveSwitcher(EngineManager::dapEngineChooser());
+    }
+};
 
-        setWidget(splitter);
-        setMainWindow(mainWindow);
+class DebugMode final : public IMode
+{
+public:
+    DebugMode()
+    {
+        setObjectName("DebugMode");
+        setContext(Context(C_DEBUGMODE, CC::C_NAVIGATION_PANE));
+        setDisplayName(Tr::tr("Debug"));
+        setIcon(Utils::Icon::modeIcon(Icons::MODE_DEBUGGER_CLASSIC,
+                                      Icons::MODE_DEBUGGER_FLAT, Icons::MODE_DEBUGGER_FLAT_ACTIVE));
+        setPriority(85);
+        setId(MODE_DEBUG);
+
+        setWidget(new DebugModeWidget);
+        setMainWindow(DebuggerMainWindow::instance());
 
         setMenu(&DebuggerMainWindow::addPerspectiveMenu);
     }