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

TextEditor: Merge ITextEditor and BaseTextEditor

Browse Source 
Adjust all callers, de-export BaseTextEditorAnimator

Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
hjk
2014-07-23 19:10:38 +02:00
parent 15421995ab
commit bf5e43be94
70 changed files with 557 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljseditorplugin.h
View File

@@ -47,7 +47,7 @@ class ActionManager;
class IEditor;
}
namespace TextEditor { class ITextEditor; }
namespace TextEditor { class BaseTextEditor; }
namespace QmlJS { class ModelManagerInterface; }

5
src/plugins/qmljseditor/qmljshoverhandler.cpp
View File

@@ -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();

6
src/plugins/qmljseditor/qmljshoverhandler.h
View File

@@ -41,7 +41,7 @@ QT_END_NAMESPACE
namespace Core { class IEditor; }
namespace TextEditor { class ITextEditor; }
namespace TextEditor { class BaseTextEditor; }
namespace QmlJS {
class ScopeChain;
@@ -67,8 +67,8 @@ private:
void reset();
virtual bool acceptEditor(Core::IEditor *editor);
virtual void identifyMatch(TextEditor::ITextEditor *editor, int pos);
virtual void operateTooltip(TextEditor::ITextEditor *editor, const QPoint &point);
virtual void identifyMatch(TextEditor::BaseTextEditor *editor, int pos);
virtual void operateTooltip(TextEditor::BaseTextEditor *editor, const QPoint &point);
bool matchDiagnosticMessage(QmlJSTextEditorWidget *qmlEditor, int pos);
bool matchColorItem(const QmlJS::ScopeChain &lookupContext,