Merge DebuggerItemManager and DebuggerItemModel data

Change-Id: I400fe94316433c538f82badde12ad704d722d730
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2016-11-28 18:47:18 +01:00
parent 3fa45170b5
commit 99f2c07403
8 changed files with 727 additions and 772 deletions

View File

@@ -39,7 +39,6 @@
#include "debuggermainwindow.h"
#include "debuggerrunconfigurationaspect.h"
#include "debuggerruncontrol.h"
#include "debuggeroptionspage.h"
#include "debuggerkitinformation.h"
#include "memoryagent.h"
#include "breakhandler.h"
@@ -1769,7 +1768,6 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
foreach (IOptionsPage *op, engineOptionPages)
m_plugin->addAutoReleasedObject(op);
m_plugin->addAutoReleasedObject(new LocalsAndExpressionsOptionsPage);
m_plugin->addAutoReleasedObject(new DebuggerOptionsPage);
connect(ModeManager::instance(), &ModeManager::currentModeChanged,
this, &DebuggerPluginPrivate::onModeChanged);
@@ -3266,7 +3264,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
mstart->addSeparator(Constants::G_SPECIAL);
addAutoReleasedObject(new DebuggerItemManager);
DebuggerItemManager::restoreDebuggers();
KitManager::registerKitInformation(new DebuggerKitInformation);