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
573ca3ad
Commit
573ca3ad
authored
Sep 29, 2009
by
hjk
Browse files
debugger: rename StepByInstruction into OperateByInstruction
parent
d42475fd
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggeractions.cpp
View file @
573ca3ad
...
...
@@ -152,11 +152,15 @@ DebuggerSettings *DebuggerSettings::instance()
instance
->
insertItem
(
LogTimeStamps
,
item
);
item
=
new
SavedAction
(
instance
);
item
->
setText
(
tr
(
"
S
te
p
by instruction"
));
item
->
setText
(
tr
(
"
Opera
te by instruction"
));
item
->
setCheckable
(
true
);
item
->
setDefaultValue
(
false
);
item
->
setIcon
(
QIcon
(
":/debugger/images/debugger_stepoverproc_small.png"
));
instance
->
insertItem
(
StepByInstruction
,
item
);
item
->
setToolTip
(
tr
(
"This switches the debugger to instruction-wise "
"operation mode. In this mode, stepping operates on single "
"instructions and the source location view also shows the "
"disassembled instructions."
));
instance
->
insertItem
(
OperateByInstruction
,
item
);
//
// Locals & Watchers
...
...
src/plugins/debugger/debuggeractions.h
View file @
573ca3ad
...
...
@@ -77,7 +77,7 @@ enum DebuggerActionCode
AutoQuit
,
LockView
,
LogTimeStamps
,
S
te
p
ByInstruction
,
Opera
teByInstruction
,
RecheckDebuggingHelpers
,
UseDebuggingHelpers
,
...
...
@@ -127,7 +127,8 @@ Core::Utils::SavedAction *theDebuggerAction(int code);
bool
theDebuggerBoolSetting
(
int
code
);
QString
theDebuggerStringSetting
(
int
code
);
struct
DebuggerManagerActions
{
struct
DebuggerManagerActions
{
QAction
*
continueAction
;
QAction
*
stopAction
;
QAction
*
resetAction
;
// FIXME: Should not be needed in a stable release
...
...
src/plugins/debugger/debuggermanager.cpp
View file @
573ca3ad
...
...
@@ -511,8 +511,8 @@ void DebuggerManager::init()
connect
(
theDebuggerAction
(
WatchPoint
),
SIGNAL
(
triggered
()),
this
,
SLOT
(
watchPoint
()));
connect
(
theDebuggerAction
(
S
te
p
ByInstruction
),
SIGNAL
(
triggered
()),
this
,
SLOT
(
s
te
p
ByInstructionTriggered
()));
connect
(
theDebuggerAction
(
Opera
teByInstruction
),
SIGNAL
(
triggered
()),
this
,
SLOT
(
opera
teByInstructionTriggered
()));
d
->
m_breakDock
=
d
->
m_mainWindow
->
addDockForWidget
(
d
->
m_breakWindow
);
...
...
@@ -1100,7 +1100,7 @@ void DebuggerManager::stepExec()
{
QTC_ASSERT
(
d
->
m_engine
,
return
);
resetLocation
();
if
(
theDebuggerBoolSetting
(
S
te
p
ByInstruction
))
if
(
theDebuggerBoolSetting
(
Opera
teByInstruction
))
d
->
m_engine
->
stepIExec
();
else
d
->
m_engine
->
stepExec
();
...
...
@@ -1117,7 +1117,7 @@ void DebuggerManager::nextExec()
{
QTC_ASSERT
(
d
->
m_engine
,
return
);
resetLocation
();
if
(
theDebuggerBoolSetting
(
S
te
p
ByInstruction
))
if
(
theDebuggerBoolSetting
(
Opera
teByInstruction
))
d
->
m_engine
->
nextIExec
();
else
d
->
m_engine
->
nextExec
();
...
...
@@ -1350,7 +1350,7 @@ void DebuggerManager::fileOpen(const QString &fileName)
emit
gotoLocationRequested
(
frame
,
false
);
}
void
DebuggerManager
::
s
te
p
ByInstructionTriggered
()
void
DebuggerManager
::
opera
teByInstructionTriggered
()
{
QTC_ASSERT
(
d
->
m_stackHandler
,
return
);
StackFrame
frame
=
d
->
m_stackHandler
->
currentFrame
();
...
...
src/plugins/debugger/debuggermanager.h
View file @
573ca3ad
...
...
@@ -248,7 +248,7 @@ private slots:
void
clearStatusMessage
();
void
attemptBreakpointSynchronization
();
void
reloadFullStack
();
void
s
te
p
ByInstructionTriggered
();
void
opera
teByInstructionTriggered
();
void
startFailed
();
private:
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
573ca3ad
...
...
@@ -120,7 +120,7 @@ const char * const TOGGLE_BREAK = "Debugger.ToggleBreak";
const
char
*
const
BREAK_BY_FUNCTION
=
"Debugger.BreakByFunction"
;
const
char
*
const
BREAK_AT_MAIN
=
"Debugger.BreakAtMain"
;
const
char
*
const
ADD_TO_WATCH
=
"Debugger.AddToWatch"
;
const
char
*
const
S
TE
P
_BY_INSTRUCTION
=
"Debugger.
S
te
p
ByInstruction"
;
const
char
*
const
OPERA
TE_BY_INSTRUCTION
=
"Debugger.
Opera
teByInstruction"
;
#ifdef Q_WS_MAC
const
char
*
const
INTERRUPT_KEY
=
"Shift+F5"
;
...
...
@@ -686,10 +686,6 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
cmd
->
setDefaultKeySequence
(
QKeySequence
(
Constants
::
STEPOUT_KEY
));
mdebug
->
addAction
(
cmd
);
cmd
=
am
->
registerAction
(
theDebuggerAction
(
StepByInstruction
),
Constants
::
STEP_BY_INSTRUCTION
,
debuggercontext
);
mdebug
->
addAction
(
cmd
);
cmd
=
am
->
registerAction
(
actions
.
runToLineAction
,
Constants
::
RUN_TO_LINE
,
debuggercontext
);
cmd
->
setDefaultKeySequence
(
QKeySequence
(
Constants
::
RUN_TO_LINE_KEY
));
...
...
@@ -716,6 +712,10 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
cmd
=
am
->
registerAction
(
sep
,
QLatin1String
(
"Debugger.Sep.Break"
),
globalcontext
);
mdebug
->
addAction
(
cmd
);
cmd
=
am
->
registerAction
(
theDebuggerAction
(
OperateByInstruction
),
Constants
::
OPERATE_BY_INSTRUCTION
,
debuggercontext
);
mdebug
->
addAction
(
cmd
);
cmd
=
am
->
registerAction
(
actions
.
breakAction
,
Constants
::
TOGGLE_BREAK
,
cppeditorcontext
);
cmd
->
setDefaultKeySequence
(
QKeySequence
(
Constants
::
TOGGLE_BREAK_KEY
));
...
...
@@ -829,7 +829,7 @@ bool DebuggerPlugin::initialize(const QStringList &arguments, QString *errorMess
debugToolBarLayout
->
addWidget
(
toolButton
(
am
->
command
(
Constants
::
NEXT
)
->
action
()));
debugToolBarLayout
->
addWidget
(
toolButton
(
am
->
command
(
Constants
::
STEP
)
->
action
()));
debugToolBarLayout
->
addWidget
(
toolButton
(
am
->
command
(
Constants
::
STEPOUT
)
->
action
()));
debugToolBarLayout
->
addWidget
(
toolButton
(
am
->
command
(
Constants
::
S
TE
P
_BY_INSTRUCTION
)
->
action
()));
debugToolBarLayout
->
addWidget
(
toolButton
(
am
->
command
(
Constants
::
OPERA
TE_BY_INSTRUCTION
)
->
action
()));
#ifdef USE_REVERSE_DEBUGGING
debugToolBarLayout
->
addWidget
(
new
Core
::
Utils
::
StyledSeparator
);
debugToolBarLayout
->
addWidget
(
toolButton
(
am
->
command
(
Constants
::
REVERSE
)
->
action
()));
...
...
@@ -1093,7 +1093,7 @@ void DebuggerPlugin::resetLocation()
void
DebuggerPlugin
::
gotoLocation
(
const
Debugger
::
Internal
::
StackFrame
&
frame
,
bool
setMarker
)
{
if
(
theDebuggerBoolSetting
(
S
te
p
ByInstruction
)
||
!
frame
.
isUsable
())
{
if
(
theDebuggerBoolSetting
(
Opera
teByInstruction
)
||
!
frame
.
isUsable
())
{
if
(
!
m_disassemblerViewAgent
)
m_disassemblerViewAgent
=
new
DisassemblerViewAgent
(
m_manager
);
m_disassemblerViewAgent
->
setFrame
(
frame
);
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
573ca3ad
...
...
@@ -2360,7 +2360,7 @@ void GdbEngine::handleStackListFrames(const GdbResponse &response)
theDebuggerAction
(
ExpandStack
)
->
setEnabled
(
canExpand
);
manager
()
->
stackHandler
()
->
setFrames
(
stackFrames
,
canExpand
);
if
(
topFrame
!=
-
1
||
theDebuggerBoolSetting
(
S
te
p
ByInstruction
))
{
if
(
topFrame
!=
-
1
||
theDebuggerBoolSetting
(
Opera
teByInstruction
))
{
const
StackFrame
&
frame
=
manager
()
->
stackHandler
()
->
currentFrame
();
gotoLocation
(
frame
,
true
);
}
...
...
src/plugins/debugger/stackhandler.cpp
View file @
573ca3ad
...
...
@@ -173,7 +173,7 @@ Qt::ItemFlags StackHandler::flags(const QModelIndex &index) const
return
QAbstractTableModel
::
flags
(
index
);
const
StackFrame
&
frame
=
m_stackFrames
.
at
(
index
.
row
());
const
bool
isValid
=
(
!
frame
.
file
.
isEmpty
()
&&
!
frame
.
function
.
isEmpty
())
||
theDebuggerBoolSetting
(
S
te
p
ByInstruction
);
||
theDebuggerBoolSetting
(
Opera
teByInstruction
);
return
isValid
?
QAbstractTableModel
::
flags
(
index
)
:
Qt
::
ItemFlags
(
0
);
}
...
...
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