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

debugger: fix e539f5bda

Browse Source
This commit is contained in:
hjk
2010-02-04 16:23:51 +01:00
parent e70530c5ad
commit 33695b8155
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/gdb/pythongdbengine.cpp
View File

@@ -50,6 +50,7 @@ void GdbEngine::updateLocalsPython(const QByteArray &varList)
PRECONDITION; PRECONDITION;
m_processedNames.clear(); m_processedNames.clear();
manager()->watchHandler()->beginCycle(false);
//m_toolTipExpression.clear(); //m_toolTipExpression.clear();
WatchHandler *handler = m_manager->watchHandler(); WatchHandler *handler = m_manager->watchHandler();

13
src/plugins/debugger/watchhandler.cpp
View File

@@ -397,10 +397,11 @@ void WatchModel::emitAllChanged()
emit layoutChanged(); emit layoutChanged();
} }
void WatchModel::beginCycle() void WatchModel::beginCycle(bool clearFetchTriggered)
{ {
m_fetchTriggered.clear();
emit enableUpdates(false); emit enableUpdates(false);
if (clearFetchTriggered)
m_fetchTriggered.clear();
} }
void WatchModel::endCycle() void WatchModel::endCycle()
@@ -1192,12 +1193,12 @@ WatchHandler::WatchHandler(DebuggerManager *manager)
SIGNAL(triggered()), this, SLOT(emitAllChanged())); SIGNAL(triggered()), this, SLOT(emitAllChanged()));
} }
void WatchHandler::beginCycle() void WatchHandler::beginCycle(bool clearFetchTriggered)
{ {
++generationCounter; ++generationCounter;
m_locals->beginCycle(); m_locals->beginCycle(clearFetchTriggered);
m_watchers->beginCycle(); m_watchers->beginCycle(clearFetchTriggered);
m_tooltips->beginCycle(); m_tooltips->beginCycle(clearFetchTriggered);
} }
void WatchHandler::endCycle() void WatchHandler::endCycle()

6
src/plugins/debugger/watchhandler.h
View File

@@ -225,7 +225,7 @@ private:
void emitDataChanged(int column, void emitDataChanged(int column,
const QModelIndex &parentIndex = QModelIndex()); const QModelIndex &parentIndex = QModelIndex());
void beginCycle(); // called at begin of updateLocals() cycle void beginCycle(bool clearFetchTriggered); // called at begin of updateLocals() cycle
void endCycle(); // called after all results have been received void endCycle(); // called after all results have been received
friend QDebug operator<<(QDebug d, const WatchModel &m); friend QDebug operator<<(QDebug d, const WatchModel &m);
@@ -266,7 +266,9 @@ public:
Q_SLOT void removeWatchExpression(); Q_SLOT void removeWatchExpression();
Q_SLOT void removeWatchExpression(const QString &exp); Q_SLOT void removeWatchExpression(const QString &exp);
Q_SLOT void emitAllChanged(); Q_SLOT void emitAllChanged();
void beginCycle(); // called at begin of updateLocals() cycle
// called at begin of updateLocals() cycle
void beginCycle(bool clearFetchTriggered = true);
void updateWatchers(); // called after locals are fetched void updateWatchers(); // called after locals are fetched
void endCycle(); // called after all results have been received void endCycle(); // called after all results have been received
void showEditValue(const WatchData &data); void showEditValue(const WatchData &data);