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
0caf52f6
Commit
0caf52f6
authored
Nov 10, 2010
by
hjk
Browse files
debugger: remove recently introduced endless loop in resetLocation()
parent
c0ac7aaf
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/debuggercore.h
View file @
0caf52f6
...
...
@@ -92,6 +92,8 @@ public:
bool
setMarker
=
false
)
=
0
;
virtual
void
resetLocation
()
=
0
;
virtual
void
removeLocationMark
()
=
0
;
virtual
void
readSettings
()
=
0
;
virtual
void
writeSettings
()
const
=
0
;
...
...
src/plugins/debugger/debuggerengine.cpp
View file @
0caf52f6
...
...
@@ -516,7 +516,7 @@ void DebuggerEngine::resetLocation()
{
d
->
m_disassemblerViewAgent
.
resetLocation
();
d
->
m_stackHandler
.
setCurrentIndex
(
-
1
);
debuggerCore
()
->
re
set
Location
();
debuggerCore
()
->
re
move
Location
Mark
();
}
void
DebuggerEngine
::
gotoLocation
(
const
QString
&
fileName
,
int
lineNumber
,
bool
setMarker
)
...
...
@@ -531,7 +531,7 @@ void DebuggerEngine::gotoLocation(const StackFrame &frame, bool setMarker)
{
if
(
theDebuggerBoolSetting
(
OperateByInstruction
)
||
!
frame
.
isUsable
())
{
if
(
setMarker
)
debuggerCore
()
->
resetLocation
();
resetLocation
();
d
->
m_disassemblerViewAgent
.
setFrame
(
frame
);
}
else
{
debuggerCore
()
->
gotoLocation
(
frame
.
file
,
frame
.
line
,
setMarker
);
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
0caf52f6
...
...
@@ -1201,6 +1201,7 @@ public slots:
}
void
resetLocation
();
void
removeLocationMark
();
QVariant
sessionValue
(
const
QString
&
name
);
void
setSessionValue
(
const
QString
&
name
,
const
QVariant
&
value
);
QIcon
locationMarkIcon
()
const
{
return
m_locationMarkIcon
;
}
...
...
@@ -2910,9 +2911,10 @@ const CPlusPlus::Snapshot &DebuggerPluginPrivate::cppCodeModelSnapshot() const
void
DebuggerPluginPrivate
::
resetLocation
()
{
currentEngine
()
->
resetLocation
();
// FIXME: code should be moved here from the engine implementation.
//d->m_disassemblerViewAgent.resetLocation();
//d->m_stackHandler.setCurrentIndex(-1);
}
void
DebuggerPluginPrivate
::
removeLocationMark
()
{
m_locationMark
.
reset
();
}
...
...
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