diff options
| author | hjk <hjk@theqtcompany.com> | 2015-03-06 13:36:42 +0100 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-03-06 13:57:53 +0000 |
| commit | 46fcfa90180f0ea705b06bb34ebb68be15011be9 (patch) | |
| tree | 96a3d33caf200306c28f9202f9996900b84ebc1a /src/plugins/debugger/qml/qmlcppengine.cpp | |
| parent | 34c807a11a6ea4a6768c001418eadc4e0d01ebb1 (diff) | |
| download | qt-creator-46fcfa90180f0ea705b06bb34ebb68be15011be9.tar.gz | |
Debugger: Remove widget argument from tooltip request
The only information ever used is whether it's c++ or not.
Change-Id: I4ca00663856dd66cbdf58c468f175a8c9e41d6a5
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 23e0187f63..dab64a71a4 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -32,6 +32,7 @@ #include "qmlengine.h" #include <debugger/debuggerruncontrol.h> +#include <debugger/debuggertooltipmanager.h> #include <debugger/debuggerstartparameters.h> #include <debugger/breakhandler.h> #include <debugger/stackhandler.h> @@ -39,8 +40,6 @@ #include <debugger/watchhandler.h> #include <utils/qtcassert.h> -#include <texteditor/texteditor.h> -#include <texteditor/textdocument.h> #include <qmljseditor/qmljseditorconstants.h> #include <cppeditor/cppeditorconstants.h> #include <qmljs/consolemanagerinterface.h> @@ -103,15 +102,13 @@ bool QmlCppEngine::canDisplayTooltip() const return m_cppEngine->canDisplayTooltip() || m_qmlEngine->canDisplayTooltip(); } -bool QmlCppEngine::setToolTipExpression(TextEditor::TextEditorWidget *editorWidget, const DebuggerToolTipContext &ctx) +bool QmlCppEngine::setToolTipExpression(const DebuggerToolTipContext &ctx) { - QTC_ASSERT(editorWidget, return false); bool success = false; - 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); + if (ctx.isCppEditor) + success = m_cppEngine->setToolTipExpression(ctx); + else + success = m_qmlEngine->setToolTipExpression(ctx); return success; } |