forked from qt-creator/qt-creator
Debugger: Call DebuggerItemManager::restoreDebuggers() more directly
Change-Id: I77a293a8754e2aa3dd521e0810006c5f10ae23ff Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -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()
|
||||
|
@@ -22,7 +22,7 @@ public:
|
||||
DebuggerItemManager();
|
||||
~DebuggerItemManager();
|
||||
|
||||
void extensionsInitialized();
|
||||
static void restoreDebuggers();
|
||||
|
||||
static const QList<DebuggerItem> debuggers();
|
||||
|
||||
|
@@ -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.
|
||||
|
Reference in New Issue
Block a user