From c64b202a2cafd2990d43c56f1e1b9bb2b766a870 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 4 Feb 2010 13:20:11 +0100 Subject: [PATCH] debugger: fix unneeded fetchMore() calls by removing a mis-placed beginCycle() --- src/plugins/debugger/gdb/pythongdbengine.cpp | 1 - src/plugins/debugger/watchhandler.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp index 35a5a2d0f87..24ec4c53457 100644 --- a/src/plugins/debugger/gdb/pythongdbengine.cpp +++ b/src/plugins/debugger/gdb/pythongdbengine.cpp @@ -50,7 +50,6 @@ void GdbEngine::updateLocalsPython(const QByteArray &varList) PRECONDITION; m_processedNames.clear(); - 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 f0b44581440..353b30b3fec 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -407,7 +407,7 @@ void WatchModel::endCycle() { removeOutdated(); emit enableUpdates(true); - // Prevent 'fetchMore()' from being triggered + // Prevent 'fetchMore()' from being triggered. m_inExtraLayoutChanged = true; emit layoutChanged(); QTimer::singleShot(0, this, SLOT(resetExtraLayoutChanged())); @@ -669,8 +669,10 @@ static QString formattedValue(const WatchData &data, int format) bool WatchModel::canFetchMore(const QModelIndex &index) const { + WatchItem *item = watchItem(index); + QTC_ASSERT(item, return false); return !m_inExtraLayoutChanged && index.isValid() - && !m_fetchTriggered.contains(watchItem(index)->iname); + && !m_fetchTriggered.contains(item->iname); } void WatchModel::fetchMore(const QModelIndex &index)