Commit ed890bc9 authored by hjk's avatar hjk

Debugger: Move dockwidget object names into a more private place

Change-Id: I5a3565179fdd8627387ba01370e6484d668e2160
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 3aecfc4c
......@@ -36,6 +36,7 @@
#include "debuggeractions.h"
#include "debuggercore.h"
#include "debuggerprotocol.h"
#include "debuggermainwindow.h"
#include "debuggerstartparameters.h"
#include "debuggertooltipmanager.h"
#include "disassembleragent.h"
......@@ -2235,9 +2236,9 @@ void CdbEngine::processStop(const GdbMi &stopReason, bool conditionalBreakPointT
// Fire off remaining commands asynchronously
if (!m_pendingBreakpointMap.isEmpty())
postCommandSequence(CommandListBreakPoints);
if (debuggerCore()->isDockVisible(QLatin1String(Constants::DOCKWIDGET_REGISTER)))
if (debuggerCore()->isDockVisible(QLatin1String(DOCKWIDGET_REGISTER)))
postCommandSequence(CommandListRegisters);
if (debuggerCore()->isDockVisible(QLatin1String(Constants::DOCKWIDGET_MODULES)))
if (debuggerCore()->isDockVisible(QLatin1String(DOCKWIDGET_MODULES)))
postCommandSequence(CommandListModules);
}
// After the sequence has been sent off and CDB is pondering the commands,
......
......@@ -64,19 +64,6 @@ const char QML_UPDATE_ON_SAVE[] = "Debugger.QmlUpdateOnSave";
const char QML_SELECTTOOL[] = "Debugger.QmlSelectTool";
const char QML_ZOOMTOOL[] = "Debugger.QmlZoomTool";
// DebuggerMainWindow dock widget names
const char DOCKWIDGET_BREAK[] = "Debugger.Docks.Break";
const char DOCKWIDGET_MODULES[] = "Debugger.Docks.Modules";
const char DOCKWIDGET_REGISTER[] = "Debugger.Docks.Register";
const char DOCKWIDGET_OUTPUT[] = "Debugger.Docks.Output";
const char DOCKWIDGET_SNAPSHOTS[] = "Debugger.Docks.Snapshots";
const char DOCKWIDGET_STACK[] = "Debugger.Docks.Stack";
const char DOCKWIDGET_SOURCE_FILES[] = "Debugger.Docks.SourceFiles";
const char DOCKWIDGET_THREADS[] = "Debugger.Docks.Threads";
const char DOCKWIDGET_WATCHERS[] = "Debugger.Docks.LocalsAndWatchers";
const char DOCKWIDGET_QML_INSPECTOR[] = "Debugger.Docks.QmlInspector";
const char DOCKWIDGET_DEFAULT_AREA[] = "Debugger.Docks.DefaultArea";
const char TASK_CATEGORY_DEBUGGER_TEST[] = "DebuggerTest";
const char TASK_CATEGORY_DEBUGGER_DEBUGINFO[] = "Debuginfo";
......
......@@ -46,7 +46,20 @@ class DebuggerEngine;
namespace Internal {
class DebuggerMainWindowPrivate;
}
// DebuggerMainWindow dock widget names
const char DOCKWIDGET_BREAK[] = "Debugger.Docks.Break";
const char DOCKWIDGET_MODULES[] = "Debugger.Docks.Modules";
const char DOCKWIDGET_REGISTER[] = "Debugger.Docks.Register";
const char DOCKWIDGET_OUTPUT[] = "Debugger.Docks.Output";
const char DOCKWIDGET_SNAPSHOTS[] = "Debugger.Docks.Snapshots";
const char DOCKWIDGET_STACK[] = "Debugger.Docks.Stack";
const char DOCKWIDGET_SOURCE_FILES[] = "Debugger.Docks.SourceFiles";
const char DOCKWIDGET_THREADS[] = "Debugger.Docks.Threads";
const char DOCKWIDGET_WATCHERS[] = "Debugger.Docks.LocalsAndWatchers";
const char DOCKWIDGET_QML_INSPECTOR[] = "Debugger.Docks.QmlInspector";
const char DOCKWIDGET_DEFAULT_AREA[] = "Debugger.Docks.DefaultArea";
} // namespace Internal
class DEBUGGER_EXPORT DebuggerMainWindow : public Utils::FancyMainWindow
{
......
......@@ -42,6 +42,7 @@
#include "debuggeractions.h"
#include "debuggercore.h"
#include "debuggermainwindow.h"
#include "debuggerplugin.h"
#include "debuggerprotocol.h"
#include "debuggerstringutils.h"
......@@ -3831,7 +3832,7 @@ void GdbEngine::handleMakeSnapshot(const GdbResponse &response)
void GdbEngine::reloadRegisters()
{
if (!debuggerCore()->isDockVisible(_(Constants::DOCKWIDGET_REGISTER)))
if (!debuggerCore()->isDockVisible(_(DOCKWIDGET_REGISTER)))
return;
if (state() != InferiorStopOk && state() != InferiorUnrunnable)
......
......@@ -1358,7 +1358,7 @@ WatchTreeView *QmlEngine::inspectorTreeView() const
{
DebuggerMainWindow *dw = qobject_cast<DebuggerMainWindow *>(debuggerCore()->mainWindow());
LocalsAndExpressionsWindow *leW = qobject_cast<LocalsAndExpressionsWindow *>(
dw->dockWidget(QLatin1String(Constants::DOCKWIDGET_WATCHERS))->widget());
dw->dockWidget(_(DOCKWIDGET_WATCHERS))->widget());
WatchWindow *inspectorWindow = qobject_cast<WatchWindow *>(leW->inspectorWidget());
return qobject_cast<WatchTreeView *>(inspectorWindow->treeView());
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment