diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index 93ef558da1a..8de20012b95 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -972,13 +972,11 @@ static inline bool isWatchIName(const QByteArray &iname) return iname.startsWith("watch"); } -void CdbEngine::updateWatchData(const WatchData &dataIn, - const WatchUpdateFlags & flags) +void CdbEngine::updateWatchData(const WatchData &dataIn) { if (debug || debugLocals || debugWatches) - qDebug("CdbEngine::updateWatchData() %dms accessible=%d %s incr=%d: %s", + qDebug("CdbEngine::updateWatchData() %dms accessible=%d %s: %s", elapsedLogTime(), m_accessible, stateName(state()), - flags.tryIncremental, qPrintable(dataIn.toString())); if (!m_accessible) // Add watch data while running? diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 1b6845552a2..6bd1cf942c6 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -89,8 +89,7 @@ public: virtual void shutdownEngine(); virtual void abortDebugger(); virtual void detachDebugger(); - virtual void updateWatchData(const WatchData &data, - const WatchUpdateFlags & flags = WatchUpdateFlags()); + virtual void updateWatchData(const WatchData &data); virtual bool hasCapability(unsigned cap) const; virtual void watchPoint(const QPoint &); virtual void setRegisterValue(const QByteArray &name, const QString &value); diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index d675fe77002..a151eff0971 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -1440,7 +1440,7 @@ bool DebuggerEngine::setToolTipExpression(TextEditorWidget *, return false; } -void DebuggerEngine::updateWatchData(const WatchData &, const WatchUpdateFlags &) +void DebuggerEngine::updateWatchData(const WatchData &) { } diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index c65a4485683..8de13f30e23 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -78,12 +78,6 @@ class MemoryViewSetupData; class Terminal; class ThreadId; -struct WatchUpdateFlags -{ - WatchUpdateFlags() : tryIncremental(false) {} - bool tryIncremental; -}; - class Location { public: @@ -146,8 +140,7 @@ public: virtual bool setToolTipExpression(TextEditor::TextEditorWidget *, const Internal::DebuggerToolTipContext &); - virtual void updateWatchData(const Internal::WatchData &data, - const Internal::WatchUpdateFlags & flags = Internal::WatchUpdateFlags()); + virtual void updateWatchData(const Internal::WatchData &data); virtual void watchDataSelected(const QByteArray &iname); virtual void startDebugger(DebuggerRunControl *runControl); diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index a45e1c9c853..a4bf2d1b17b 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -3725,10 +3725,10 @@ void GdbEngine::reloadLocals() updateLocals(); } -void GdbEngine::updateWatchData(const WatchData &data, const WatchUpdateFlags &flags) +void GdbEngine::updateWatchData(const WatchData &data) { UpdateParameters params; - params.tryPartial = flags.tryIncremental && m_pendingBreakpointRequests == 0; + params.tryPartial = m_pendingBreakpointRequests == 0; params.varList = data.iname; updateLocalsPython(params); } diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index 9fe2b4d8611..24520daa8e9 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -399,7 +399,7 @@ protected: virtual void watchPoint(const QPoint &); void handleWatchPoint(const DebuggerResponse &response); - void updateWatchData(const WatchData &data, const WatchUpdateFlags &flags); + void updateWatchData(const WatchData &data); void rebuildWatchModel(); void showToolTip(); diff --git a/src/plugins/debugger/lldb/lldbengine.cpp b/src/plugins/debugger/lldb/lldbengine.cpp index 71a16d2187b..8dc55c0ac57 100644 --- a/src/plugins/debugger/lldb/lldbengine.cpp +++ b/src/plugins/debugger/lldb/lldbengine.cpp @@ -844,10 +844,9 @@ void LldbEngine::assignValueInDebugger(const Internal::WatchData *data, runCommand(cmd); } -void LldbEngine::updateWatchData(const WatchData &data, const WatchUpdateFlags &flags) +void LldbEngine::updateWatchData(const WatchData &data) { Q_UNUSED(data); - Q_UNUSED(flags); updateLocals(); } diff --git a/src/plugins/debugger/lldb/lldbengine.h b/src/plugins/debugger/lldb/lldbengine.h index e6a7e316d32..bdcda805cf5 100644 --- a/src/plugins/debugger/lldb/lldbengine.h +++ b/src/plugins/debugger/lldb/lldbengine.h @@ -120,7 +120,7 @@ private: bool supportsThreads() const { return true; } bool isSynchronous() const { return true; } - void updateWatchData(const WatchData &data, const WatchUpdateFlags &flags); + void updateWatchData(const WatchData &data); void setRegisterValue(const QByteArray &name, const QString &value); void fetchMemory(Internal::MemoryAgent *, QObject *, quint64 addr, quint64 length); diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index f0f48655625..21dc7a2bbad 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -395,10 +395,9 @@ void PdbEngine::assignValueInDebugger(const WatchData *, const QString &expressi updateLocals(); } -void PdbEngine::updateWatchData(const WatchData &data, const WatchUpdateFlags &flags) +void PdbEngine::updateWatchData(const WatchData &data) { Q_UNUSED(data); - Q_UNUSED(flags); updateAll(); } diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index a30155627ba..22f794c1a48 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -97,7 +97,7 @@ private: bool supportsThreads() const { return true; } bool isSynchronous() const { return true; } - void updateWatchData(const WatchData &data, const WatchUpdateFlags &flags); + void updateWatchData(const WatchData &data); QString mainPythonFile() const; void runCommand(const DebuggerCommand &cmd); diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 49082fd30ed..23e0187f636 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -115,13 +115,12 @@ bool QmlCppEngine::setToolTipExpression(TextEditor::TextEditorWidget *editorWidg return success; } -void QmlCppEngine::updateWatchData(const WatchData &data, - const WatchUpdateFlags &flags) +void QmlCppEngine::updateWatchData(const WatchData &data) { if (data.isInspect()) - m_qmlEngine->updateWatchData(data, flags); + m_qmlEngine->updateWatchData(data); else - m_activeEngine->updateWatchData(data, flags); + m_activeEngine->updateWatchData(data); } void QmlCppEngine::watchDataSelected(const QByteArray &iname) diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h index 4546f177ee7..917bc98af12 100644 --- a/src/plugins/debugger/qml/qmlcppengine.h +++ b/src/plugins/debugger/qml/qmlcppengine.h @@ -49,8 +49,7 @@ public: bool canDisplayTooltip() const; bool setToolTipExpression(TextEditor::TextEditorWidget *editorWidget, const DebuggerToolTipContext &); - void updateWatchData(const WatchData &data, - const WatchUpdateFlags &flags); + void updateWatchData(const WatchData &data); void watchDataSelected(const QByteArray &iname); void watchPoint(const QPoint &); diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index 41a4373517a..f961ca578da 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -999,8 +999,7 @@ void QmlEngine::assignValueInDebugger(const WatchData *data, } } -void QmlEngine::updateWatchData(const WatchData &data, - const WatchUpdateFlags &) +void QmlEngine::updateWatchData(const WatchData &data) { // qDebug() << "UPDATE WATCH DATA" << data.toString(); //showStatusMessage(tr("Stopped."), 5000); diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index cec9556618b..aed646888ea 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -159,8 +159,7 @@ private: void reloadFullStack() {} bool supportsThreads() const { return false; } - void updateWatchData(const WatchData &data, - const WatchUpdateFlags &flags); + void updateWatchData(const WatchData &data); void watchDataSelected(const QByteArray &iname); void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); bool evaluateScript(const QString &expression); diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index 7ef0e3890e0..7ff91ffd9f7 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -628,9 +628,7 @@ void WatchItem::fetchMore() fetchTriggered = true; if (children().isEmpty()) { d.setChildrenNeeded(); - WatchUpdateFlags flags; - flags.tryIncremental = true; - watchModel()->engine()->updateWatchData(d, flags); + watchModel()->engine()->updateWatchData(d); } }