From bf5e43be94b24517d6e62acbfd18fdc5a25ede73 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Wed, 23 Jul 2014 19:10:38 +0200
Subject: TextEditor: Merge ITextEditor and BaseTextEditor

Adjust all callers, de-export BaseTextEditorAnimator

Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/plugins/qmljseditor/qmljshoverhandler.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/plugins/qmljseditor/qmljshoverhandler.cpp')

diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index b632de221e..90333eea2d 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -45,7 +45,6 @@
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljsutils.h>
 #include <qmljs/qmljsqrcparser.h>
-#include <texteditor/itexteditor.h>
 #include <texteditor/basetexteditor.h>
 #include <texteditor/helpitem.h>
 #include <utils/tooltip/tooltip.h>
@@ -184,7 +183,7 @@ bool HoverHandler::setQmlTypeHelp(const ScopeChain &scopeChain, const Document::
     return true;
 }
 
-void HoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos)
+void HoverHandler::identifyMatch(TextEditor::BaseTextEditor *editor, int pos)
 {
     reset();
 
@@ -377,7 +376,7 @@ void HoverHandler::reset()
     m_colorTip = QColor();
 }
 
-void HoverHandler::operateTooltip(TextEditor::ITextEditor *editor, const QPoint &point)
+void HoverHandler::operateTooltip(TextEditor::BaseTextEditor *editor, const QPoint &point)
 {
     if (toolTip().isEmpty())
         Utils::ToolTip::hide();
-- 
cgit v1.2.1