diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp index 462ffff82e02a7e563f465d70959856e4820eb06..2ab4f3a365dd557c032731fa081989864f3fa9a9 100644 --- a/src/plugins/debugger/gdb/pythongdbengine.cpp +++ b/src/plugins/debugger/gdb/pythongdbengine.cpp @@ -51,7 +51,7 @@ void GdbEngine::updateLocalsPython(const QByteArray &varList) PRECONDITION; m_processedNames.clear(); - manager()->watchHandler()->beginCycle(true); + manager()->watchHandler()->beginCycle(); //m_toolTipExpression.clear(); WatchHandler *handler = m_manager->watchHandler(); diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index e3b52a9deecc07f8bb4f8448c681dd30076ae3b6..0a998faa88b7421d222f28914f37fc6ecdaf7f0f 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -402,16 +402,15 @@ void WatchModel::emitAllChanged() emit layoutChanged(); } -void WatchModel::beginCycle(bool clearFetchTriggered) +void WatchModel::beginCycle() { emit enableUpdates(false); - if (clearFetchTriggered) - m_fetchTriggered.clear(); } void WatchModel::endCycle() { removeOutdated(); + m_fetchTriggered.clear(); emit enableUpdates(true); } @@ -1196,12 +1195,12 @@ WatchHandler::WatchHandler(DebuggerManager *manager) SIGNAL(triggered()), this, SLOT(emitAllChanged())); } -void WatchHandler::beginCycle(bool clearFetchTriggered) +void WatchHandler::beginCycle() { ++generationCounter; - m_locals->beginCycle(clearFetchTriggered); - m_watchers->beginCycle(clearFetchTriggered); - m_tooltips->beginCycle(clearFetchTriggered); + m_locals->beginCycle(); + m_watchers->beginCycle(); + m_tooltips->beginCycle(); } void WatchHandler::endCycle() diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h index 23d3f26f40c4ed26271e9533b51449e16dd30671..effec1e7329862537b3b12e2a373ae744814565d 100644 --- a/src/plugins/debugger/watchhandler.h +++ b/src/plugins/debugger/watchhandler.h @@ -225,8 +225,8 @@ private: void emitDataChanged(int column, const QModelIndex &parentIndex = QModelIndex()); - void beginCycle(bool clearFetchTriggered); // called at begin of updateLocals() cycle - void endCycle(); // called after all results have been received + void beginCycle(); // Called at begin of updateLocals() cycle. + void endCycle(); // Called after all results have been received. friend QDebug operator<<(QDebug d, const WatchModel &m); @@ -255,18 +255,16 @@ public: WatchModel *model(WatchType type) const; WatchModel *modelForIName(const QByteArray &iname) const; -//public slots: void cleanup(); - Q_SLOT void watchExpression(); // data in action->data().toString() + Q_SLOT void watchExpression(); // Data passed in action->data().toString() Q_SLOT void watchExpression(const QString &exp); Q_SLOT void removeWatchExpression(); Q_SLOT void removeWatchExpression(const QString &exp); Q_SLOT void emitAllChanged(); - // called at begin of updateLocals() cycle - void beginCycle(bool clearFetchTriggered = true); - void updateWatchers(); // called after locals are fetched - void endCycle(); // called after all results have been received + void beginCycle(); // Called at begin of updateLocals() cycle + void updateWatchers(); // Called after locals are fetched + void endCycle(); // Called after all results have been received void showEditValue(const WatchData &data); void insertData(const WatchData &data);