From a74f494974e402c6aa275aa0917e6774bb194f27 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 15 May 2009 14:47:28 +0200
Subject: [PATCH] Add a menu item for the Locals and Watchers panel.
Reviewed-by: hjk <qtc-committer@nokia.com>
---
src/plugins/debugger/debuggermanager.cpp | 19 ++++++++-----------
src/plugins/debugger/debuggermanager.h | 1 -
src/plugins/debugger/debuggerplugin.cpp | 7 -------
3 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 303884b0fa4..d0e607fb1f6 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -430,6 +430,14 @@ void DebuggerManager::init()
m_threadsDock = createDockForWidget(m_threadsWindow);
+ QSplitter *localsAndWatchers = new QSplitter(Qt::Vertical, 0);
+ localsAndWatchers->setWindowTitle(m_localsWindow->windowTitle());
+ localsAndWatchers->addWidget(m_localsWindow);
+ localsAndWatchers->addWidget(m_watchersWindow);
+ localsAndWatchers->setStretchFactor(0, 3);
+ localsAndWatchers->setStretchFactor(1, 1);
+ m_watchDock = createDockForWidget(localsAndWatchers);
+
setStatus(DebuggerProcessNotReady);
}
@@ -457,17 +465,6 @@ IDebuggerManagerAccessForEngines *DebuggerManager::engineInterface()
return dynamic_cast<IDebuggerManagerAccessForEngines *>(this);
}
-void DebuggerManager::createDockWidgets()
-{
- QSplitter *localsAndWatchers = new QSplitter(Qt::Vertical, 0);
- localsAndWatchers->setWindowTitle(m_localsWindow->windowTitle());
- localsAndWatchers->addWidget(m_localsWindow);
- localsAndWatchers->addWidget(m_watchersWindow);
- localsAndWatchers->setStretchFactor(0, 3);
- localsAndWatchers->setStretchFactor(1, 1);
- m_watchDock = createDockForWidget(localsAndWatchers);
-}
-
void DebuggerManager::createNewDock(QWidget *widget)
{
QDockWidget *dockWidget = new QDockWidget(widget->windowTitle(), m_mainWindow);
diff --git a/src/plugins/debugger/debuggermanager.h b/src/plugins/debugger/debuggermanager.h
index 3db8271a246..bd3655a3387 100644
--- a/src/plugins/debugger/debuggermanager.h
+++ b/src/plugins/debugger/debuggermanager.h
@@ -316,7 +316,6 @@ private:
//
QWidget *threadsWindow() const { return m_threadsWindow; }
QList<QDockWidget*> dockWidgets() const { return m_dockWidgets; }
- void createDockWidgets();
virtual bool qtDumperLibraryEnabled() const;
virtual QString qtDumperLibraryName() const;
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f7081d89970..66e99a2b486 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -173,10 +173,6 @@ class DebugMode : public Core::BaseMode
public:
DebugMode(QObject *parent = 0);
~DebugMode();
-
- // IMode
- void activated() {}
- void shutdown() {}
};
DebugMode::DebugMode(QObject *parent)
@@ -409,8 +405,6 @@ DebuggerPlugin::~DebuggerPlugin()
void DebuggerPlugin::shutdown()
{
- if (m_debugMode)
- m_debugMode->shutdown(); // saves state including manager information
QTC_ASSERT(m_manager, /**/);
if (m_manager)
m_manager->shutdown();
@@ -758,7 +752,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
toolBarAddingLayout->addWidget(rightPaneSplitter);
toolBarAddingLayout->addWidget(debugToolBar);
- m_manager->createDockWidgets();
m_manager->setSimpleDockWidgetArrangement();
readSettings();
--
GitLab