From 9f1c99cb98c384a9ca101b7fbbb61ce2f5e79eae Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 9 Aug 2023 10:47:36 +0200
Subject: [PATCH] Debugger: Call DebuggerItemManager::restoreDebuggers() more
 directly

Change-Id: I77a293a8754e2aa3dd521e0810006c5f10ae23ff
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/debugger/debuggeritemmanager.cpp | 11 ++---------
 src/plugins/debugger/debuggeritemmanager.h   |  2 +-
 src/plugins/debugger/debuggerplugin.cpp      |  4 +---
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index c672cf4b94d..ff08d9d8d89 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -64,8 +64,6 @@ public:
     DebuggerItemManagerPrivate();
     ~DebuggerItemManagerPrivate();
 
-    void extensionsInitialized();
-
     void restoreDebuggers();
     void saveDebuggers();
 
@@ -896,11 +894,6 @@ DebuggerItemManagerPrivate::DebuggerItemManagerPrivate()
     m_optionsPage = new DebuggerOptionsPage;
 }
 
-void DebuggerItemManagerPrivate::extensionsInitialized()
-{
-    restoreDebuggers();
-}
-
 DebuggerItemManagerPrivate::~DebuggerItemManagerPrivate()
 {
     delete m_optionsPage;
@@ -1038,9 +1031,9 @@ DebuggerItemManager::~DebuggerItemManager()
     delete d;
 }
 
-void DebuggerItemManager::extensionsInitialized()
+void DebuggerItemManager::restoreDebuggers()
 {
-    d->extensionsInitialized();
+    d->restoreDebuggers();
 }
 
 const QList<DebuggerItem> DebuggerItemManager::debuggers()
diff --git a/src/plugins/debugger/debuggeritemmanager.h b/src/plugins/debugger/debuggeritemmanager.h
index 9be8c4faf6b..2fa588414f0 100644
--- a/src/plugins/debugger/debuggeritemmanager.h
+++ b/src/plugins/debugger/debuggeritemmanager.h
@@ -22,7 +22,7 @@ public:
     DebuggerItemManager();
     ~DebuggerItemManager();
 
-    void extensionsInitialized();
+    static void restoreDebuggers();
 
     static const QList<DebuggerItem> debuggers();
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index e9acc715755..fcd918038be 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2059,9 +2059,7 @@ void DebuggerPluginPrivate::remoteCommand(const QStringList &options)
 
 void DebuggerPluginPrivate::extensionsInitialized()
 {
-    QTimer::singleShot(0, this, [this]{
-        m_debuggerItemManager.extensionsInitialized();
-    });
+    QTimer::singleShot(0, this, &DebuggerItemManager::restoreDebuggers);
 
     // If the CppEditor or QmlJS editor plugin is there, we want to add something to
     // the editor context menu.