feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Visually fake instant breakpoint removal

Browse Source 
This partially reverts 38ec4dd6ae.
After using the new, "correct" behavior for some time I am
convinced that the original felt indeed better.

Change-Id: Ia921ccf8410bec33eb3053dc91bcca7b0328ef38
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-02-23 14:30:14 +01:00
parent 592ffe7377
commit 37bd3eab24
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -2593,14 +2593,6 @@ void GdbEngine::handleBreakInsert2(const DebuggerResponse &response, Breakpoint
} }
} }
void GdbEngine::handleBreakDelete(const DebuggerResponse &response, Breakpoint bp)
{
if (response.resultClass == ResultDone)
bp.notifyBreakpointRemoveOk();
else
bp.notifyBreakpointRemoveFailed();
}
void GdbEngine::handleBreakDisable(const DebuggerResponse &response, Breakpoint bp) void GdbEngine::handleBreakDisable(const DebuggerResponse &response, Breakpoint bp)
{ {
QTC_CHECK(response.resultClass == ResultDone); QTC_CHECK(response.resultClass == ResultDone);
@@ -2882,8 +2874,14 @@ void GdbEngine::removeBreakpoint(Breakpoint bp)
bp.notifyBreakpointRemoveProceeding(); bp.notifyBreakpointRemoveProceeding();
showMessage(_("DELETING BP %1 IN %2").arg(br.id.toString()).arg(bp.fileName())); showMessage(_("DELETING BP %1 IN %2").arg(br.id.toString()).arg(bp.fileName()));
postCommand("-break-delete " + br.id.toByteArray(), postCommand("-break-delete " + br.id.toByteArray(),
NeedsStop | RebuildBreakpointModel, NeedsStop | RebuildBreakpointModel);
[this, bp](const DebuggerResponse &r) { handleBreakDelete(r, bp); });
// Pretend it succeeds without waiting for response. Feels better.
// Otherwise, clicking in the gutter leaves the breakpoint visible
// for quite some time, so the user assumes a mis-click and clicks
// again, effectivly re-introducing the breakpoint.
bp.notifyBreakpointRemoveOk();
} else { } else {
// Breakpoint was scheduled to be inserted, but we haven't had // Breakpoint was scheduled to be inserted, but we haven't had
// an answer so far. Postpone activity by doing nothing. // an answer so far. Postpone activity by doing nothing.

1
src/plugins/debugger/gdb/gdbengine.h
View File

@@ -287,7 +287,6 @@ private: ////////// View & Data Stuff //////////
void handleBreakEnable(const DebuggerResponse &response, Breakpoint bp); void handleBreakEnable(const DebuggerResponse &response, Breakpoint bp);
void handleBreakInsert1(const DebuggerResponse &response, Breakpoint bp); void handleBreakInsert1(const DebuggerResponse &response, Breakpoint bp);
void handleBreakInsert2(const DebuggerResponse &response, Breakpoint bp); void handleBreakInsert2(const DebuggerResponse &response, Breakpoint bp);
void handleBreakDelete(const DebuggerResponse &response, Breakpoint bp);
void handleBreakCondition(const DebuggerResponse &response, Breakpoint bp); void handleBreakCondition(const DebuggerResponse &response, Breakpoint bp);
void handleBreakThreadSpec(const DebuggerResponse &response, Breakpoint bp); void handleBreakThreadSpec(const DebuggerResponse &response, Breakpoint bp);
void handleBreakLineNumber(const DebuggerResponse &response, Breakpoint bp); void handleBreakLineNumber(const DebuggerResponse &response, Breakpoint bp);