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/texteditor/basehoverhandler.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/texteditor/basehoverhandler.cpp')
-rw-r--r-- | src/plugins/texteditor/basehoverhandler.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index ffee52f447..3b0e5845ab 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -28,7 +28,6 @@ ****************************************************************************/ #include "basehoverhandler.h" -#include "itexteditor.h" #include "basetexteditor.h" #include <coreplugin/icore.h> @@ -41,7 +40,7 @@ using namespace Core; namespace TextEditor { -static BaseTextEditorWidget *baseTextEditor(ITextEditor *editor) +static BaseTextEditorWidget *baseTextEditor(BaseTextEditor *editor) { if (!editor) return 0; @@ -63,16 +62,16 @@ void BaseHoverHandler::editorOpened(Core::IEditor *editor) if (acceptEditor(editor)) { BaseTextEditor *textEditor = qobject_cast<BaseTextEditor *>(editor); if (textEditor) { - connect(textEditor, SIGNAL(tooltipRequested(TextEditor::ITextEditor*,QPoint,int)), - this, SLOT(showToolTip(TextEditor::ITextEditor*,QPoint,int))); + connect(textEditor, SIGNAL(tooltipRequested(TextEditor::BaseTextEditor*,QPoint,int)), + this, SLOT(showToolTip(TextEditor::BaseTextEditor*,QPoint,int))); - connect(textEditor, SIGNAL(contextHelpIdRequested(TextEditor::ITextEditor*,int)), - this, SLOT(updateContextHelpId(TextEditor::ITextEditor*,int))); + connect(textEditor, SIGNAL(contextHelpIdRequested(TextEditor::BaseTextEditor*,int)), + this, SLOT(updateContextHelpId(TextEditor::BaseTextEditor*,int))); } } } -void BaseHoverHandler::showToolTip(TextEditor::ITextEditor *editor, const QPoint &point, int pos) +void BaseHoverHandler::showToolTip(TextEditor::BaseTextEditor *editor, const QPoint &point, int pos) { BaseTextEditorWidget *baseEditor = baseTextEditor(editor); if (!baseEditor) @@ -84,7 +83,7 @@ void BaseHoverHandler::showToolTip(TextEditor::ITextEditor *editor, const QPoint operateTooltip(editor, point); } -void BaseHoverHandler::updateContextHelpId(TextEditor::ITextEditor *editor, int pos) +void BaseHoverHandler::updateContextHelpId(TextEditor::BaseTextEditor *editor, int pos) { BaseTextEditorWidget *baseEditor = baseTextEditor(editor); if (!baseEditor) @@ -150,7 +149,7 @@ void BaseHoverHandler::clear() m_lastHelpItemIdentified = HelpItem(); } -void BaseHoverHandler::process(ITextEditor *editor, int pos) +void BaseHoverHandler::process(BaseTextEditor *editor, int pos) { clear(); identifyMatch(editor, pos); @@ -172,7 +171,7 @@ void BaseHoverHandler::decorateToolTip() } } -void BaseHoverHandler::operateTooltip(ITextEditor *editor, const QPoint &point) +void BaseHoverHandler::operateTooltip(BaseTextEditor *editor, const QPoint &point) { if (m_toolTip.isEmpty()) Utils::ToolTip::hide(); |