Skip to content
GitLab
Menu
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
2548779d
Commit
2548779d
authored
Dec 11, 2009
by
hjk
Browse files
debugger: Remove EmbedToken fglag for gdb commands.
The token is not needed anymore.
parent
abdd3d9d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/gdbengine.cpp
View file @
2548779d
...
...
@@ -801,8 +801,6 @@ void GdbEngine::flushCommand(const GdbCommand &cmd0)
cmd
.
postTime
=
QTime
::
currentTime
();
m_cookieForToken
[
currentToken
()]
=
cmd
;
cmd
.
command
=
QString
::
number
(
currentToken
())
+
cmd
.
command
;
if
(
cmd
.
flags
&
EmbedToken
)
cmd
.
command
=
cmd
.
command
.
arg
(
currentToken
());
gdbInputAvailable
(
LogInput
,
cmd
.
command
);
m_gdbAdapter
->
write
(
cmd
.
command
.
toLatin1
()
+
"
\r\n
"
);
...
...
@@ -2968,11 +2966,10 @@ void GdbEngine::runDebuggingHelper(const WatchData &data0, bool dumpChildren)
QString
cmd
;
QTextStream
(
&
cmd
)
<<
"call "
<<
"(void*)qDumpObjectData440("
<<
protocol
<<
','
<<
"%1+1"
// placeholder for token
<<
','
<<
addr
<<
','
<<
(
dumpChildren
?
"1"
:
"0"
)
protocol
<<
",0,"
<<
addr
<<
','
<<
(
dumpChildren
?
"1"
:
"0"
)
<<
','
<<
extraArgs
.
join
(
QString
(
_c
(
','
)))
<<
')'
;
postCommand
(
cmd
,
WatchUpdate
|
EmbedToken
);
postCommand
(
cmd
,
WatchUpdate
);
showStatusMessage
(
msgRetrievingWatchData
(
m_pendingRequests
+
1
),
10000
);
...
...
@@ -4094,7 +4091,7 @@ void GdbEngine::tryLoadDebuggingHelpers()
void
GdbEngine
::
tryQueryDebuggingHelpers
()
{
// retrieve list of dumpable classes
postCommand
(
_
(
"call (void*)qDumpObjectData440(1,
%1+1
,0,0,0,0,0,0)"
)
,
EmbedToken
);
postCommand
(
_
(
"call (void*)qDumpObjectData440(1,
0
,0,0,0,0,0,0)"
));
postCommand
(
_
(
"p (char*)&qDumpOutBuffer"
),
CB
(
handleQueryDebuggingHelper
));
}
...
...
@@ -4102,7 +4099,7 @@ void GdbEngine::recheckDebuggingHelperAvailability()
{
if
(
m_gdbAdapter
->
dumperHandling
()
!=
AbstractGdbAdapter
::
DumperNotAvailable
)
{
// retreive list of dumpable classes
postCommand
(
_
(
"call (void*)qDumpObjectData440(1,
%1+1
,0,0,0,0,0,0)"
)
,
EmbedToken
);
postCommand
(
_
(
"call (void*)qDumpObjectData440(1,
0
,0,0,0,0,0,0)"
));
postCommand
(
_
(
"p (char*)&qDumpOutBuffer"
),
CB
(
handleQueryDebuggingHelper
));
}
}
...
...
src/plugins/debugger/gdb/gdbengine.h
View file @
2548779d
...
...
@@ -177,7 +177,6 @@ private: ////////// Gdb Command Management //////////
Discardable
=
2
,
// No need to wait for the reply before continuing inferior
RebuildModel
=
4
,
// Trigger model rebuild when no such commands are pending any more
WatchUpdate
=
Discardable
|
RebuildModel
,
EmbedToken
=
8
,
// Expand %1 in the command to the command token
RunRequest
=
16
,
// Callback expects GdbResultRunning instead of GdbResultDone
ExitRequest
=
32
,
// Callback expects GdbResultExit instead of GdbResultDone
LosesChild
=
64
// Auto-set inferior shutdown related states
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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