Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
f1cd284a
Commit
f1cd284a
authored
Jun 22, 2010
by
hjk
Browse files
debugger: connect some loose ends
parent
0f1290b0
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggerconstants.h
View file @
f1cd284a
...
...
@@ -180,6 +180,7 @@ enum ModelRoles
RequestExecExitRole
,
RequestLoadSessionDataRole
,
RequestSaveSessionDataRole
,
RequestOperatedByInstructionTriggeredRole
,
// Breakpoints
BreakpointEnabledRole
,
...
...
src/plugins/debugger/debuggerengine.cpp
View file @
f1cd284a
...
...
@@ -260,6 +260,11 @@ bool CommandHandler::setData
case
RequestExecFrameUpRole
:
m_engine
->
frameUp
();
return
true
;
case
RequestOperatedByInstructionTriggeredRole
:
m_engine
->
gotoLocation
(
m_engine
->
stackHandler
()
->
currentFrame
(),
true
);
return
true
;
}
return
false
;
...
...
@@ -673,12 +678,6 @@ void DebuggerManager::executeJumpToLine()
}
*/
void
DebuggerEngine
::
operateByInstructionTriggered
()
{
StackFrame
frame
=
d
->
m_stackHandler
.
currentFrame
();
gotoLocation
(
frame
,
true
);
}
void
DebuggerEngine
::
cleanup
()
{
/*
...
...
src/plugins/debugger/debuggerengine.h
View file @
f1cd284a
...
...
@@ -236,7 +236,6 @@ public:
void
executeReturnX
();
void
executeWatchPointX
();
void
operateByInstructionTriggered
();
DebuggerState
state
()
const
;
// Dumper stuff (common to cdb and gdb).
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
f1cd284a
...
...
@@ -772,17 +772,12 @@ public slots:
void
updateWatchersHeader
(
int
section
,
int
,
int
newSize
)
{
m_watchersWindow
->
header
()
->
resizeSection
(
section
,
newSize
);
}
void
reloadSourceFiles
()
{
notifyCurrentEngine
(
RequestReloadSourceFilesRole
);
}
void
sourceFilesDockToggled
(
bool
on
)
{
if
(
on
)
reloadSourceFiles
();
}
void
reloadModules
()
{
notifyCurrentEngine
(
RequestReloadModulesRole
);
}
{
if
(
on
)
notifyCurrentEngine
(
RequestReloadSourceFilesRole
);
}
void
modulesDockToggled
(
bool
on
)
{
if
(
on
)
reloadModules
();
}
{
if
(
on
)
notifyCurrentEngine
(
RequestReloadModulesRole
);
}
void
registerDockToggled
(
bool
on
)
{
if
(
on
)
notifyCurrentEngine
(
RequestReloadRegistersRole
);
}
void
onAction
();
void
setSimpleDockWidgetArrangement
(
const
QString
&
activeLanguage
);
...
...
@@ -851,9 +846,7 @@ public slots:
void
resetLocation
();
void
gotoLocation
(
const
QString
&
file
,
int
line
,
bool
setMarker
);
void
registerDockToggled
(
bool
on
)
{}
// FIXME
void
clearStatusMessage
();
void
operateByInstructionTriggered
()
{}
// FIXME
void
sessionLoaded
();
void
aboutToUnloadSession
();
...
...
@@ -1122,6 +1115,9 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
m_actions
.
frameUpAction
->
setData
(
RequestExecFrameUpRole
);
m_actions
.
reverseDirectionAction
->
setCheckable
(
false
);
theDebuggerAction
(
OperateByInstruction
)
->
setData
(
RequestOperatedByInstructionTriggeredRole
);
connect
(
m_actions
.
continueAction
,
SIGNAL
(
triggered
()),
SLOT
(
onAction
()));
connect
(
m_actions
.
nextAction
,
SIGNAL
(
triggered
()),
SLOT
(
onAction
()));
connect
(
m_actions
.
stepAction
,
SIGNAL
(
triggered
()),
SLOT
(
onAction
()));
...
...
@@ -1146,7 +1142,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
SLOT
(
executeDebuggerCommand
()));
connect
(
theDebuggerAction
(
OperateByInstruction
),
SIGNAL
(
triggered
()),
SLOT
(
o
perateByInstructionTriggered
()));
SLOT
(
o
nAction
()));
m_plugin
->
readSettings
();
...
...
@@ -1160,26 +1156,28 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
// Dock widgets
m_breakDock
=
m_uiSwitcher
->
createDockWidget
(
LANG_CPP
,
m_breakWindow
);
m_modulesDock
=
m_uiSwitcher
->
createDockWidget
(
LANG_CPP
,
m_modulesWindow
,
Qt
::
TopDockWidgetArea
,
false
);
connect
(
m_modulesDock
->
toggleViewAction
(),
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
reloadModules
(
)),
Qt
::
QueuedConnection
);
SLOT
(
modulesDockToggled
(
bool
)),
Qt
::
QueuedConnection
);
m_registerDock
=
m_uiSwitcher
->
createDockWidget
(
LANG_CPP
,
m_registerWindow
,
Qt
::
TopDockWidgetArea
,
false
);
connect
(
m_registerDock
->
toggleViewAction
(),
SIGNAL
(
toggled
(
bool
)),
m_registerWindow
,
SLOT
(
reloadRegisters
(
)),
Qt
::
QueuedConnection
);
SLOT
(
registerDockToggled
(
bool
)),
Qt
::
QueuedConnection
);
m_outputDock
=
m_uiSwitcher
->
createDockWidget
(
LANG_CPP
,
m_outputWindow
,
Qt
::
TopDockWidgetArea
,
false
);
m_snapshotDock
=
m_uiSwitcher
->
createDockWidget
(
LANG_CPP
,
m_snapshotWindow
);
m_stackDock
=
m_uiSwitcher
->
createDockWidget
(
LANG_CPP
,
m_stackWindow
);
m_sourceFilesDock
=
m_uiSwitcher
->
createDockWidget
(
LANG_CPP
,
m_sourceFilesWindow
,
Qt
::
TopDockWidgetArea
,
false
);
connect
(
m_sourceFilesDock
->
toggleViewAction
(),
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
reloadSourceFiles
(
)),
Qt
::
QueuedConnection
);
SLOT
(
sourceFilesDockToggled
(
bool
)),
Qt
::
QueuedConnection
);
m_threadsDock
=
m_uiSwitcher
->
createDockWidget
(
LANG_CPP
,
m_threadsWindow
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment