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

Debugger: Inline GdbEngine::rebuildWatchModel

Browse Source 
... into its only caller, remove duplicated and unused code.

Change-Id: Ibdd84eeda34e4f7b4b307dc619c9f31399d7ec5f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-03-19 14:21:20 +01:00
parent a1ec5cd096
commit 59172f9ab4
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3732,19 +3732,6 @@ void GdbEngine::updateWatchItem(WatchItem *item)
updateLocalsPython(params); updateLocalsPython(params);
} }
void GdbEngine::rebuildWatchModel()
{
static int count = 0;
++count;
PENDING_DEBUG("REBUILDING MODEL" << count);
if (boolSetting(LogTimeStamps))
showMessage(LogWindow::logTimeStamp(), LogMiscInput);
showMessage(_("<Rebuild Watchmodel %1>").arg(count), LogMiscInput);
showStatusMessage(tr("Finished retrieving data"), 400);
DebuggerToolTipManager::updateEngine(this);
}
void GdbEngine::handleVarAssign(const DebuggerResponse &) void GdbEngine::handleVarAssign(const DebuggerResponse &)
{ {
// Everything might have changed, force re-evaluation. // Everything might have changed, force re-evaluation.
@@ -4711,7 +4698,6 @@ void addGdbOptionPages(QList<IOptionsPage *> *opts)
void GdbEngine::updateLocalsPython(const UpdateParameters &params) void GdbEngine::updateLocalsPython(const UpdateParameters &params)
{ {
//m_pendingWatchRequests = 0;
m_pendingBreakpointRequests = 0; m_pendingBreakpointRequests = 0;
DebuggerCommand cmd("showData"); DebuggerCommand cmd("showData");
@@ -4820,17 +4806,16 @@ void GdbEngine::handleStackFramePython(const DebuggerResponse &response, bool pa
handler->purgeOutdatedItems(toDelete); handler->purgeOutdatedItems(toDelete);
//PENDING_DEBUG("AFTER handleStackFrame()"); static int count = 0;
// FIXME: This should only be used when updateLocals() was showMessage(_("<Rebuild Watchmodel %1 @ %2 >")
// triggered by expanding an item in the view. .arg(++count).arg(LogWindow::logTimeStamp()), LogMiscInput);
//if (m_pendingWatchRequests <= 0) { showStatusMessage(tr("Finished retrieving data"), 400);
//PENDING_DEBUG("\n\n .... AND TRIGGERS MODEL UPDATE\n");
rebuildWatchModel();
//}
if (!partial) {
emit stackFrameCompleted();
DebuggerToolTipManager::updateEngine(this); DebuggerToolTipManager::updateEngine(this);
}
if (!partial)
emit stackFrameCompleted();
} else { } else {
showMessage(_("DUMPER FAILED: " + response.toString())); showMessage(_("DUMPER FAILED: " + response.toString()));
} }

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

@@ -397,7 +397,6 @@ protected:
virtual void watchPoint(const QPoint &); virtual void watchPoint(const QPoint &);
void handleWatchPoint(const DebuggerResponse &response); void handleWatchPoint(const DebuggerResponse &response);
void rebuildWatchModel();
void updateWatchItem(WatchItem *item); void updateWatchItem(WatchItem *item);
void showToolTip(); void showToolTip();