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

Debugger: Expose WatchModel signals

Browse Source 
This opens it up to be used with Qt5 connects in the
TooltipManager and simpler user code.

Change-Id: Ifc6fcc3a04d325437f5a2bdf1da463d28d650ee3
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-11-07 13:50:09 +01:00
parent 6bb51244ca
commit 4b57427ee1
5 changed files with 91 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1140,14 +1140,13 @@ public:
DebuggerEngine *m_currentEngine;
DebuggerSettings *m_debuggerSettings;
QStringList m_arguments;
DebuggerToolTipManager *m_toolTipManager;
DebuggerToolTipManager m_toolTipManager;
CommonOptionsPage *m_commonOptionsPage;
DummyEngine *m_dummyEngine;
const QSharedPointer<GlobalDebuggerOptions> m_globalDebuggerOptions;
};
DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin) :
m_toolTipManager(new DebuggerToolTipManager(this)),
m_dummyEngine(0),
m_globalDebuggerOptions(new GlobalDebuggerOptions)
{
@@ -2036,7 +2035,7 @@ void DebuggerPluginPrivate::setInitialState()
setBusyCursor(false);
m_reverseDirectionAction->setChecked(false);
m_reverseDirectionAction->setEnabled(false);
m_toolTipManager->closeAllToolTips();
m_toolTipManager.closeAllToolTips();
m_startAndDebugApplicationAction->setEnabled(true);
m_attachToQmlPortAction->setEnabled(true);
@@ -2269,14 +2268,14 @@ void DebuggerPluginPrivate::onModeChanged(IMode *mode)
m_mainWindow->onModeChanged(mode);
if (mode->id() != Constants::MODE_DEBUG) {
m_toolTipManager->leavingDebugMode();
m_toolTipManager.leavingDebugMode();
return;
}
if (IEditor *editor = EditorManager::currentEditor())
editor->widget()->setFocus();
m_toolTipManager->debugModeEntered();
m_toolTipManager.debugModeEntered();
}
void DebuggerPluginPrivate::showSettingsDialog()
@@ -2334,7 +2333,7 @@ void DebuggerPluginPrivate::sessionLoaded()
void DebuggerPluginPrivate::aboutToUnloadSession()
{
m_toolTipManager->sessionAboutToChange();
m_toolTipManager.sessionAboutToChange();
}
void DebuggerPluginPrivate::aboutToSaveSession()