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

28
src/plugins/bookmarks/bookmarksplugin.cpp
View File

@@ -40,7 +40,7 @@
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h>
#include <texteditor/itexteditor.h>
#include <texteditor/basetexteditor.h>
#include <texteditor/texteditorconstants.h>
#include <QtPlugin>
@@ -152,32 +152,32 @@ void BookmarksPlugin::updateActions(int state)
void BookmarksPlugin::editorOpened(Core::IEditor *editor)
{
if (qobject_cast<ITextEditor *>(editor)) {
connect(editor, SIGNAL(markContextMenuRequested(TextEditor::ITextEditor*,int,QMenu*)),
this, SLOT(requestContextMenu(TextEditor::ITextEditor*,int,QMenu*)));
if (qobject_cast<BaseTextEditor *>(editor)) {
connect(editor, SIGNAL(markContextMenuRequested(TextEditor::BaseTextEditor*,int,QMenu*)),
this, SLOT(requestContextMenu(TextEditor::BaseTextEditor*,int,QMenu*)));
connect(editor,
SIGNAL(markRequested(TextEditor::ITextEditor*,int,
TextEditor::ITextEditor::MarkRequestKind)),
SIGNAL(markRequested(TextEditor::BaseTextEditor*,int,
TextEditor::BaseTextEditor::MarkRequestKind)),
m_bookmarkManager,
SLOT(handleBookmarkRequest(TextEditor::ITextEditor*,int,
TextEditor::ITextEditor::MarkRequestKind)));
SLOT(handleBookmarkRequest(TextEditor::BaseTextEditor*,int,
TextEditor::BaseTextEditor::MarkRequestKind)));
connect(editor,
SIGNAL(markTooltipRequested(TextEditor::ITextEditor*,QPoint,int)),
SIGNAL(markTooltipRequested(TextEditor::BaseTextEditor*,QPoint,int)),
m_bookmarkManager,
SLOT(handleBookmarkTooltipRequest(TextEditor::ITextEditor*,QPoint,int)));
SLOT(handleBookmarkTooltipRequest(TextEditor::BaseTextEditor*,QPoint,int)));
}
}
void BookmarksPlugin::editorAboutToClose(Core::IEditor *editor)
{
if (qobject_cast<ITextEditor *>(editor)) {
disconnect(editor, SIGNAL(markContextMenuRequested(TextEditor::ITextEditor*,int,QMenu*)),
this, SLOT(requestContextMenu(TextEditor::ITextEditor*,int,QMenu*)));
if (qobject_cast<BaseTextEditor *>(editor)) {
disconnect(editor, SIGNAL(markContextMenuRequested(TextEditor::BaseTextEditor*,int,QMenu*)),
this, SLOT(requestContextMenu(TextEditor::BaseTextEditor*,int,QMenu*)));
}
}
void BookmarksPlugin::requestContextMenu(TextEditor::ITextEditor *editor,
void BookmarksPlugin::requestContextMenu(TextEditor::BaseTextEditor *editor,
int lineNumber, QMenu *menu)
{
// Don't set bookmarks in disassembler views.