Debugger: Remove WatchUpdateFlags

Only needed in the non-Python days. CDB didn't use it to start with.

Change-Id: Ia609218cc1a694f797e278c4d99ead68e6212938
Reviewed-by: hjk <hjk@theqtcompany.com>

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,
+void CdbEngine::updateWatchData(const WatchData &dataIn)
-                                const WatchUpdateFlags & flags)
 {
     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?

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,
+    virtual void updateWatchData(const WatchData &data);
-                                 const WatchUpdateFlags & flags = WatchUpdateFlags());
     virtual bool hasCapability(unsigned cap) const;
     virtual void watchPoint(const QPoint &);
     virtual void setRegisterValue(const QByteArray &name, const QString &value);

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 &)
 {
 }
 

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,
+    virtual void updateWatchData(const Internal::WatchData &data);
-        const Internal::WatchUpdateFlags & flags = Internal::WatchUpdateFlags());
     virtual void watchDataSelected(const QByteArray &iname);
 
     virtual void startDebugger(DebuggerRunControl *runControl);

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);
 }

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();
 

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();
 }
 

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);

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();
 }
 

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);

src/plugins/debugger/qml/qmlcppengine.cpp

@@ -115,13 +115,12 @@ bool QmlCppEngine::setToolTipExpression(TextEditor::TextEditorWidget *editorWidg
     return success;
 }
 
-void QmlCppEngine::updateWatchData(const WatchData &data,
+void QmlCppEngine::updateWatchData(const WatchData &data)
-    const WatchUpdateFlags &flags)
 {
     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)

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,
+    void updateWatchData(const WatchData &data);
-        const WatchUpdateFlags &flags);
     void watchDataSelected(const QByteArray &iname);
 
     void watchPoint(const QPoint &);

src/plugins/debugger/qml/qmlengine.cpp

@@ -999,8 +999,7 @@ void QmlEngine::assignValueInDebugger(const WatchData *data,
     }
 }
 
-void QmlEngine::updateWatchData(const WatchData &data,
+void QmlEngine::updateWatchData(const WatchData &data)
-    const WatchUpdateFlags &)
 {
 //    qDebug() << "UPDATE WATCH DATA" << data.toString();
     //showStatusMessage(tr("Stopped."), 5000);

src/plugins/debugger/qml/qmlengine.h

@@ -159,8 +159,7 @@ private:
     void reloadFullStack() {}
 
     bool supportsThreads() const { return false; }
-    void updateWatchData(const WatchData &data,
+    void updateWatchData(const WatchData &data);
-        const WatchUpdateFlags &flags);
     void watchDataSelected(const QByteArray &iname);
     void executeDebuggerCommand(const QString &command, DebuggerLanguages languages);
     bool evaluateScript(const QString &expression);

src/plugins/debugger/watchhandler.cpp

@@ -628,9 +628,7 @@ void WatchItem::fetchMore()
     fetchTriggered = true;
     if (children().isEmpty()) {
         d.setChildrenNeeded();
-        WatchUpdateFlags flags;
+        watchModel()->engine()->updateWatchData(d);
-        flags.tryIncremental = true;
-        watchModel()->engine()->updateWatchData(d, flags);
     }
 }