diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index b42a5a6eaa3..5783c3e3fc4 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -847,14 +847,6 @@ public slots: } } - void synchronizeWatchers() - { - for (int i = 0, n = m_snapshotHandler->size(); i != n; ++i) { - if (DebuggerEngine *engine = m_snapshotHandler->at(i)) - engine->watchHandler()->updateWatchers(); - } - } - void editorOpened(Core::IEditor *editor); void updateBreakMenuItem(Core::IEditor *editor); void setBusyCursor(bool busy); @@ -1025,7 +1017,6 @@ public slots: void handleExecJumpToLine() { - //removeTooltip(); currentEngine()->resetLocation(); ContextData data; if (currentTextEditorPosition(&data)) @@ -1034,7 +1025,6 @@ public slots: void handleExecRunToLine() { - //removeTooltip(); currentEngine()->resetLocation(); ContextData data; if (currentTextEditorPosition(&data)) diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index d9df0986fbb..c3dba1378f1 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -982,14 +982,6 @@ QString WatchModel::displayType(const WatchData &data) const return result; } -QString WatchModel::displayForAutoTest(const QByteArray &iname) const -{ - WatchItem *item = findItem(iname); - if (item) - return displayValue(*item) + QLatin1Char(' ') + displayType(*item); - return QString(); -} - QVariant WatchModel::data(const QModelIndex &idx, int role) const { if (!idx.isValid()) @@ -1880,20 +1872,6 @@ void WatchHandler::loadSessionData() watchExpression(exp); } -void WatchHandler::updateWatchers() -{ - m_model->destroyChildren(m_model->m_watchRoot); - // Copy over all watchers and mark all watchers as incomplete. - foreach (const QByteArray &exp, theWatcherNames.keys()) { - WatchData data; - data.iname = watcherName(exp); - data.setAllNeeded(); - data.name = QLatin1String(exp); - data.exp = exp; - insertIncompleteData(data); - } -} - QAbstractItemModel *WatchHandler::model() const { return m_model; @@ -1928,11 +1906,6 @@ const WatchData *WatchHandler::findCppLocalVariable(const QString &name) const return 0; } -QString WatchHandler::displayForAutoTest(const QByteArray &iname) const -{ - return m_model->displayForAutoTest(iname); -} - bool WatchHandler::hasItem(const QByteArray &iname) const { return m_model->findItem(iname); @@ -2022,11 +1995,6 @@ QString WatchHandler::editorContents() return contents; } -void WatchHandler::removeTooltip() -{ - m_model->destroyChildren(m_model->m_tooltipRoot); -} - void WatchHandler::setTypeFormats(const TypeFormats &typeFormats) { m_model->m_reportedTypeFormats = typeFormats; diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h index 04cba314b34..cfea032f9e2 100644 --- a/src/plugins/debugger/watchhandler.h +++ b/src/plugins/debugger/watchhandler.h @@ -80,20 +80,16 @@ public: void watchVariable(const QString &exp); Q_SLOT void clearWatches(); - void updateWatchers(); // Called after locals are fetched - void showEditValue(const WatchData &data); const WatchData *watchData(const QModelIndex &) const; const QModelIndex watchDataIndex(const QByteArray &iname) const; const WatchData *findData(const QByteArray &iname) const; const WatchData *findCppLocalVariable(const QString &name) const; - QString displayForAutoTest(const QByteArray &iname) const; bool hasItem(const QByteArray &iname) const; void loadSessionData(); void saveSessionData(); - void removeTooltip(); bool isExpandedIName(const QByteArray &iname) const; QSet expandedINames() const; @@ -115,7 +111,6 @@ public: static int unprintableBase(); QByteArray watcherName(const QByteArray &exp); - void synchronizeWatchers(); QString editorContents(); void editTypeFormats(bool includeLocals, const QByteArray &iname);