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

Debugger: Remove some deprecated methods

Browse Source 
Change-Id: I67254bb6d3d23e9fa9e121df0b3b923330cfe84a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
This commit is contained in:
hjk
2013-08-17 00:59:42 +02:00
parent e666da622c
commit adc9817671
5 changed files with 11 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/debugger/debuggerengine.cpp
View File

@@ -446,31 +446,6 @@ QAbstractItemModel *DebuggerEngine::threadsModel() const
return model; return model;
} }
QAbstractItemModel *DebuggerEngine::localsModel() const
{
return watchHandler()->model();
}
QAbstractItemModel *DebuggerEngine::watchersModel() const
{
return watchHandler()->model();
}
QAbstractItemModel *DebuggerEngine::returnModel() const
{
return watchHandler()->model();
}
QAbstractItemModel *DebuggerEngine::inspectorModel() const
{
return watchHandler()->model();
}
QAbstractItemModel *DebuggerEngine::toolTipsModel() const
{
return watchHandler()->model();
}
QAbstractItemModel *DebuggerEngine::watchModel() const QAbstractItemModel *DebuggerEngine::watchModel() const
{ {
return watchHandler()->model(); return watchHandler()->model();

5
src/plugins/debugger/debuggerengine.h
View File

@@ -223,11 +223,6 @@ public:
virtual QAbstractItemModel *registerModel() const; virtual QAbstractItemModel *registerModel() const;
virtual QAbstractItemModel *stackModel() const; virtual QAbstractItemModel *stackModel() const;
virtual QAbstractItemModel *threadsModel() const; virtual QAbstractItemModel *threadsModel() const;
virtual QAbstractItemModel *localsModel() const; // Deprecated, FIXME: use watchModel
virtual QAbstractItemModel *watchersModel() const; // Deprecated, FIXME: use watchModel
virtual QAbstractItemModel *returnModel() const; // Deprecated, FIXME: use watchModel
virtual QAbstractItemModel *inspectorModel() const; // Deprecated, FIXME: use watchModel
virtual QAbstractItemModel *toolTipsModel() const; // Deprecated, FIXME: use watchModel
virtual QAbstractItemModel *watchModel() const; virtual QAbstractItemModel *watchModel() const;
virtual QAbstractItemModel *sourceFilesModel() const; virtual QAbstractItemModel *sourceFilesModel() const;

8
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2074,15 +2074,15 @@ void DebuggerPluginPrivate::connectEngine(DebuggerEngine *engine)
m_currentEngine->resetLocation(); m_currentEngine->resetLocation();
m_currentEngine = engine; m_currentEngine = engine;
m_localsWindow->setModel(engine->localsModel()); m_localsWindow->setModel(engine->watchModel());
m_modulesWindow->setModel(engine->modulesModel()); m_modulesWindow->setModel(engine->modulesModel());
m_registerWindow->setModel(engine->registerModel()); m_registerWindow->setModel(engine->registerModel());
m_returnWindow->setModel(engine->returnModel()); m_returnWindow->setModel(engine->watchModel());
m_sourceFilesWindow->setModel(engine->sourceFilesModel()); m_sourceFilesWindow->setModel(engine->sourceFilesModel());
m_stackWindow->setModel(engine->stackModel()); m_stackWindow->setModel(engine->stackModel());
m_threadsWindow->setModel(engine->threadsModel()); m_threadsWindow->setModel(engine->threadsModel());
m_watchersWindow->setModel(engine->watchersModel()); m_watchersWindow->setModel(engine->watchModel());
m_inspectorWindow->setModel(engine->inspectorModel()); m_inspectorWindow->setModel(engine->watchModel());
engine->watchHandler()->rebuildModel(); engine->watchHandler()->rebuildModel();

4
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -372,7 +372,7 @@ void QmlEngine::connectionEstablished()
if (!watchHandler()->watcherNames().isEmpty()) if (!watchHandler()->watcherNames().isEmpty())
synchronizeWatchers(); synchronizeWatchers();
connect(watchersModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers())); connect(watchModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
if (state() == EngineRunRequested) if (state() == EngineRunRequested)
notifyEngineRunAndInferiorRunOk(); notifyEngineRunAndInferiorRunOk();
@@ -560,7 +560,7 @@ void QmlEngine::gotoLocation(const Location &location)
void QmlEngine::closeConnection() void QmlEngine::closeConnection()
{ {
disconnect(watchersModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers())); disconnect(watchModel(),SIGNAL(layoutChanged()),this,SLOT(synchronizeWatchers()));
m_adapter.closeConnection(); m_adapter.closeConnection();
} }

9
src/plugins/debugger/qml/qmlv8debuggerclient.cpp
View File

@@ -254,13 +254,14 @@ void QmlV8DebuggerClientPrivate::evaluate(const QString expr, bool global,
args.setProperty(_(DISABLE_BREAK), QScriptValue(disableBreak)); args.setProperty(_(DISABLE_BREAK), QScriptValue(disableBreak));
if (addContext) { if (addContext) {
QAbstractItemModel *localsModel = engine->localsModel(); WatchHandler *watchHandler = engine->watchHandler();
int rowCount = localsModel->rowCount(); QAbstractItemModel *watchModel = watchHandler->model();
int rowCount = watchModel->rowCount();
QScriptValue ctxtList = parser.call(QScriptValue(), QScriptValueList() << _(ARRAY )); QScriptValue ctxtList = parser.call(QScriptValue(), QScriptValueList() << _(ARRAY ));
while (rowCount) { while (rowCount) {
QModelIndex index = localsModel->index(--rowCount, 0); QModelIndex index = watchModel->index(--rowCount, 0);
const WatchData *data = engine->watchHandler()->watchData(index); const WatchData *data = watchHandler->watchData(index);
QScriptValue ctxt = parser.call(QScriptValue(), QScriptValueList() << QScriptValue(_(OBJECT))); QScriptValue ctxt = parser.call(QScriptValue(), QScriptValueList() << QScriptValue(_(OBJECT)));
ctxt.setProperty(_(NAME), QScriptValue(data->name)); ctxt.setProperty(_(NAME), QScriptValue(data->name));
ctxt.setProperty(_(HANDLE), QScriptValue(int(data->id))); ctxt.setProperty(_(HANDLE), QScriptValue(int(data->id)));