diff options
| author | hjk <hjk121@nokiamail.com> | 2014-09-19 15:26:41 +0200 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2014-09-19 16:00:24 +0200 |
| commit | 970264a88e6bcc5360babda429f43d840501ffcf (patch) | |
| tree | 68e5f47175a308b1082ef67ada9cef26d3952660 /src/plugins/debugger/qml/qmlcppengine.cpp | |
| parent | 74f24c96e1341a6fe287e562a905f6e4e70f4ab4 (diff) | |
| download | qt-creator-970264a88e6bcc5360babda429f43d840501ffcf.tar.gz | |
Debugger: Operate tooltips on TextEditorWidgets, not TextEditor
Less indirection.
Change-Id: Ifbd7195e853d02bfd6562c817fc7f30079913faf
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 492b31c85c..8113c88e79 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -89,14 +89,15 @@ bool QmlCppEngine::canDisplayTooltip() const return m_cppEngine->canDisplayTooltip() || m_qmlEngine->canDisplayTooltip(); } -bool QmlCppEngine::setToolTipExpression(TextEditor::BaseTextEditor *editor, const DebuggerToolTipContext &ctx) +bool QmlCppEngine::setToolTipExpression(TextEditor::BaseTextEditorWidget *editorWidget, const DebuggerToolTipContext &ctx) { - QTC_ASSERT(editor, return false); + QTC_ASSERT(editorWidget, return false); bool success = false; - if (editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID) - success = m_cppEngine->setToolTipExpression(editor, ctx); - else if (editor->document()->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) - success = m_qmlEngine->setToolTipExpression(editor, ctx); + Core::Id id = editorWidget->textDocument()->id(); + if (id == CppEditor::Constants::CPPEDITOR_ID) + success = m_cppEngine->setToolTipExpression(editorWidget, ctx); + else if (id == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) + success = m_qmlEngine->setToolTipExpression(editorWidget, ctx); return success; } |