diff options
author | hjk <hjk121@nokiamail.com> | 2014-07-23 19:10:38 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-07-25 13:45:55 +0200 |
commit | bf5e43be94b24517d6e62acbfd18fdc5a25ede73 (patch) | |
tree | 6f977217f47634c08e30aadc20105654b3ae6918 /src/plugins/debugger/qml/qmlcppengine.cpp | |
parent | 15421995ab1d4eada18e721a3503c87f58e94db9 (diff) | |
download | qt-creator-bf5e43be94b24517d6e62acbfd18fdc5a25ede73.tar.gz |
TextEditor: Merge ITextEditor and BaseTextEditor
Adjust all callers, de-export BaseTextEditorAnimator
Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
-rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 8cea03a430..439d4bf31c 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -35,7 +35,7 @@ #include <debugger/watchhandler.h> #include <utils/qtcassert.h> -#include <texteditor/itexteditor.h> +#include <texteditor/basetexteditor.h> #include <qmljseditor/qmljseditorconstants.h> #include <cppeditor/cppeditorconstants.h> #include <qmljs/consolemanagerinterface.h> @@ -89,7 +89,7 @@ bool QmlCppEngine::canDisplayTooltip() const return m_cppEngine->canDisplayTooltip() || m_qmlEngine->canDisplayTooltip(); } -bool QmlCppEngine::setToolTipExpression(TextEditor::ITextEditor *editor, const DebuggerToolTipContext &ctx) +bool QmlCppEngine::setToolTipExpression(TextEditor::BaseTextEditor *editor, const DebuggerToolTipContext &ctx) { QTC_ASSERT(editor, return false); bool success = false; |