Commit bf5e43be authored by hjk's avatar hjk
Browse files

TextEditor: Merge ITextEditor and BaseTextEditor



Adjust all callers, de-export BaseTextEditorAnimator

Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 15421995
...@@ -65,20 +65,16 @@ CPlusPlus::Symbol *AnalyzerUtils::findSymbolUnderCursor() ...@@ -65,20 +65,16 @@ CPlusPlus::Symbol *AnalyzerUtils::findSymbolUnderCursor()
IEditor *editor = EditorManager::currentEditor(); IEditor *editor = EditorManager::currentEditor();
if (!editor) if (!editor)
return 0; return 0;
TextEditor::ITextEditor *textEditor = qobject_cast<TextEditor::ITextEditor *>(editor); TextEditor::BaseTextEditor *textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor);
if (!textEditor) if (!textEditor)
return 0; return 0;
TextEditor::BaseTextEditorWidget *editorWidget = qobject_cast<TextEditor::BaseTextEditorWidget *>(editor->widget()); TextEditor::BaseTextEditorWidget *editorWidget = textEditor->editorWidget();
if (!editorWidget) if (!editorWidget)
return 0; return 0;
QPlainTextEdit *ptEdit = qobject_cast<QPlainTextEdit *>(editor->widget());
if (!ptEdit)
return 0;
QTextCursor tc; QTextCursor tc;
tc = ptEdit->textCursor(); tc = editorWidget->textCursor();
int line = 0; int line = 0;
int column = 0; int column = 0;
const int pos = tc.position(); const int pos = tc.position();
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h>
#include <utils/tooltip/tooltip.h> #include <utils/tooltip/tooltip.h>
#include <utils/tooltip/tipcontents.h> #include <utils/tooltip/tipcontents.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
...@@ -410,7 +410,7 @@ QVariant BookmarkManager::data(const QModelIndex &index, int role) const ...@@ -410,7 +410,7 @@ QVariant BookmarkManager::data(const QModelIndex &index, int role) const
void BookmarkManager::toggleBookmark() void BookmarkManager::toggleBookmark()
{ {
ITextEditor *editor = ITextEditor::currentTextEditor(); BaseTextEditor *editor = BaseTextEditor::currentTextEditor();
if (!editor) if (!editor)
return; return;
...@@ -524,7 +524,7 @@ void BookmarkManager::prevInDocument() ...@@ -524,7 +524,7 @@ void BookmarkManager::prevInDocument()
void BookmarkManager::documentPrevNext(bool next) void BookmarkManager::documentPrevNext(bool next)
{ {
ITextEditor *editor = ITextEditor::currentTextEditor(); BaseTextEditor *editor = BaseTextEditor::currentTextEditor();
int editorLine = editor->currentLine(); int editorLine = editor->currentLine();
QFileInfo fi(editor->document()->filePath()); QFileInfo fi(editor->document()->filePath());
if (!m_bookmarksMap.contains(fi.path())) if (!m_bookmarksMap.contains(fi.path()))
...@@ -613,7 +613,7 @@ BookmarkManager::State BookmarkManager::state() const ...@@ -613,7 +613,7 @@ BookmarkManager::State BookmarkManager::state() const
if (m_bookmarksMap.empty()) if (m_bookmarksMap.empty())
return NoBookMarks; return NoBookMarks;
ITextEditor *editor = ITextEditor::currentTextEditor(); BaseTextEditor *editor = BaseTextEditor::currentTextEditor();
if (!editor) if (!editor)
return HasBookMarks; return HasBookMarks;
...@@ -795,7 +795,7 @@ void BookmarkManager::saveBookmarks() ...@@ -795,7 +795,7 @@ void BookmarkManager::saveBookmarks()
SessionManager::setValue(QLatin1String("Bookmarks"), list); SessionManager::setValue(QLatin1String("Bookmarks"), list);
} }
void BookmarkManager::operateTooltip(ITextEditor *textEditor, const QPoint &pos, Bookmark *mark) void BookmarkManager::operateTooltip(BaseTextEditor *textEditor, const QPoint &pos, Bookmark *mark)
{ {
if (!mark) if (!mark)
return; return;
...@@ -817,15 +817,15 @@ void BookmarkManager::loadBookmarks() ...@@ -817,15 +817,15 @@ void BookmarkManager::loadBookmarks()
updateActionStatus(); updateActionStatus();
} }
void BookmarkManager::handleBookmarkRequest(ITextEditor *textEditor, void BookmarkManager::handleBookmarkRequest(BaseTextEditor *textEditor,
int line, int line,
ITextEditor::MarkRequestKind kind) BaseTextEditor::MarkRequestKind kind)
{ {
if (kind == ITextEditor::BookmarkRequest && textEditor->document()) if (kind == BaseTextEditor::BookmarkRequest && textEditor->document())
toggleBookmark(textEditor->document()->filePath(), line); toggleBookmark(textEditor->document()->filePath(), line);
} }
void BookmarkManager::handleBookmarkTooltipRequest(ITextEditor *textEditor, const QPoint &pos, void BookmarkManager::handleBookmarkTooltipRequest(BaseTextEditor *textEditor, const QPoint &pos,
int line) int line)
{ {
if (textEditor->document()) { if (textEditor->document()) {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <coreplugin/icontext.h> #include <coreplugin/icontext.h>
#include <coreplugin/inavigationwidgetfactory.h> #include <coreplugin/inavigationwidgetfactory.h>
#include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h>
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QMultiMap> #include <QMultiMap>
...@@ -108,10 +108,10 @@ signals: ...@@ -108,10 +108,10 @@ signals:
private slots: private slots:
void updateActionStatus(); void updateActionStatus();
void loadBookmarks(); void loadBookmarks();
void handleBookmarkRequest(TextEditor::ITextEditor * textEditor, void handleBookmarkRequest(TextEditor::BaseTextEditor * textEditor,
int line, int line,
TextEditor::ITextEditor::MarkRequestKind kind); TextEditor::BaseTextEditor::MarkRequestKind kind);
void handleBookmarkTooltipRequest(TextEditor::ITextEditor *textEditor, void handleBookmarkTooltipRequest(TextEditor::BaseTextEditor *textEditor,
const QPoint &pos, const QPoint &pos,
int line); int line);
...@@ -123,7 +123,7 @@ private: ...@@ -123,7 +123,7 @@ private:
void addBookmark(const QString &s); void addBookmark(const QString &s);
static QString bookmarkToString(const Bookmark *b); static QString bookmarkToString(const Bookmark *b);
void saveBookmarks(); void saveBookmarks();
void operateTooltip(TextEditor::ITextEditor *textEditor, const QPoint &pos, Bookmark *mark); void operateTooltip(TextEditor::BaseTextEditor *textEditor, const QPoint &pos, Bookmark *mark);
typedef QMultiMap<QString, Bookmark *> FileNameBookmarksMap; typedef QMultiMap<QString, Bookmark *> FileNameBookmarksMap;
typedef QMap<QString, FileNameBookmarksMap *> DirectoryFileBookmarksMap; typedef QMap<QString, FileNameBookmarksMap *> DirectoryFileBookmarksMap;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h> #include <coreplugin/id.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h>
#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorconstants.h>
#include <QtPlugin> #include <QtPlugin>
...@@ -152,32 +152,32 @@ void BookmarksPlugin::updateActions(int state) ...@@ -152,32 +152,32 @@ void BookmarksPlugin::updateActions(int state)
void BookmarksPlugin::editorOpened(Core::IEditor *editor) void BookmarksPlugin::editorOpened(Core::IEditor *editor)
{ {
if (qobject_cast<ITextEditor *>(editor)) { if (qobject_cast<BaseTextEditor *>(editor)) {
connect(editor, SIGNAL(markContextMenuRequested(TextEditor::ITextEditor*,int,QMenu*)), connect(editor, SIGNAL(markContextMenuRequested(TextEditor::BaseTextEditor*,int,QMenu*)),
this, SLOT(requestContextMenu(TextEditor::ITextEditor*,int,QMenu*))); this, SLOT(requestContextMenu(TextEditor::BaseTextEditor*,int,QMenu*)));
connect(editor, connect(editor,
SIGNAL(markRequested(TextEditor::ITextEditor*,int, SIGNAL(markRequested(TextEditor::BaseTextEditor*,int,
TextEditor::ITextEditor::MarkRequestKind)), TextEditor::BaseTextEditor::MarkRequestKind)),
m_bookmarkManager, m_bookmarkManager,
SLOT(handleBookmarkRequest(TextEditor::ITextEditor*,int, SLOT(handleBookmarkRequest(TextEditor::BaseTextEditor*,int,
TextEditor::ITextEditor::MarkRequestKind))); TextEditor::BaseTextEditor::MarkRequestKind)));
connect(editor, connect(editor,
SIGNAL(markTooltipRequested(TextEditor::ITextEditor*,QPoint,int)), SIGNAL(markTooltipRequested(TextEditor::BaseTextEditor*,QPoint,int)),
m_bookmarkManager, m_bookmarkManager,
SLOT(handleBookmarkTooltipRequest(TextEditor::ITextEditor*,QPoint,int))); SLOT(handleBookmarkTooltipRequest(TextEditor::BaseTextEditor*,QPoint,int)));
} }
} }
void BookmarksPlugin::editorAboutToClose(Core::IEditor *editor) void BookmarksPlugin::editorAboutToClose(Core::IEditor *editor)
{ {
if (qobject_cast<ITextEditor *>(editor)) { if (qobject_cast<BaseTextEditor *>(editor)) {
disconnect(editor, SIGNAL(markContextMenuRequested(TextEditor::ITextEditor*,int,QMenu*)), disconnect(editor, SIGNAL(markContextMenuRequested(TextEditor::BaseTextEditor*,int,QMenu*)),
this, SLOT(requestContextMenu(TextEditor::ITextEditor*,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) int lineNumber, QMenu *menu)
{ {
// Don't set bookmarks in disassembler views. // Don't set bookmarks in disassembler views.
......
...@@ -42,7 +42,7 @@ QT_END_NAMESPACE ...@@ -42,7 +42,7 @@ QT_END_NAMESPACE
namespace Core { class IEditor; } namespace Core { class IEditor; }
namespace TextEditor { class ITextEditor; } namespace TextEditor { class BaseTextEditor; }
namespace Bookmarks { namespace Bookmarks {
namespace Internal { namespace Internal {
...@@ -67,7 +67,7 @@ public slots: ...@@ -67,7 +67,7 @@ public slots:
private slots: private slots:
void editorOpened(Core::IEditor *editor); void editorOpened(Core::IEditor *editor);
void editorAboutToClose(Core::IEditor *editor); void editorAboutToClose(Core::IEditor *editor);
void requestContextMenu(TextEditor::ITextEditor *editor, void requestContextMenu(TextEditor::BaseTextEditor *editor,
int lineNumber, QMenu *menu); int lineNumber, QMenu *menu);
void bookmarkMarginActionTriggered(); void bookmarkMarginActionTriggered();
void editBookmarkActionTriggered(); void editBookmarkActionTriggered();
......
...@@ -509,7 +509,7 @@ void ClangAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor ...@@ -509,7 +509,7 @@ void ClangAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor
} }
// Avoid inserting characters that are already there // Avoid inserting characters that are already there
const int endsPosition = editor->position(TextEditor::ITextEditor::EndOfLine); const int endsPosition = editor->position(TextEditor::BaseTextEditor::EndOfLine);
const QString existingText = editor->textDocument()->textAt(editor->position(), const QString existingText = editor->textDocument()->textAt(editor->position(),
endsPosition - editor->position()); endsPosition - editor->position());
int existLength = 0; int existLength = 0;
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h>
#include <QThread> #include <QThread>
#include <QMutex> #include <QMutex>
...@@ -458,7 +458,7 @@ void Manager::gotoLocations(const QList<QVariant> &list) ...@@ -458,7 +458,7 @@ void Manager::gotoLocations(const QList<QVariant> &list)
fileName = document->filePath(); fileName = document->filePath();
// if text file - what is current position? // if text file - what is current position?
TextEditor::ITextEditor *textEditor = qobject_cast<TextEditor::ITextEditor *>(editor); TextEditor::BaseTextEditor *textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor);
if (textEditor) { if (textEditor) {
// there is open currently text editor // there is open currently text editor
int position = textEditor->position(); int position = textEditor->position();
......
...@@ -109,7 +109,7 @@ void CMakeEditor::build() ...@@ -109,7 +109,7 @@ void CMakeEditor::build()
QString CMakeEditor::contextHelpId() const QString CMakeEditor::contextHelpId() const
{ {
int pos = position(); int pos = position();
TextEditor::ITextEditorDocument* doc = const_cast<CMakeEditor*>(this)->textDocument(); TextEditor::BaseTextEditorDocument* doc = const_cast<CMakeEditor*>(this)->textDocument();
QChar chr; QChar chr;
do { do {
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h>
#include <QtPlugin> #include <QtPlugin>
#include <QDebug> #include <QDebug>
...@@ -211,10 +211,10 @@ void CodepasterPlugin::postEditor() ...@@ -211,10 +211,10 @@ void CodepasterPlugin::postEditor()
const IDocument *document = editor->document(); const IDocument *document = editor->document();
const QString mimeType = document->mimeType(); const QString mimeType = document->mimeType();
QString data; QString data;
if (const ITextEditor *textEditor = qobject_cast<const ITextEditor *>(editor)) if (const BaseTextEditor *textEditor = qobject_cast<const BaseTextEditor *>(editor))
data = textEditor->selectedText(); data = textEditor->selectedText();
if (data.isEmpty()) { if (data.isEmpty()) {
if (const ITextEditorDocument *textDocument = qobject_cast<const ITextEditorDocument *>(document)) if (const BaseTextEditorDocument *textDocument = qobject_cast<const BaseTextEditorDocument *>(document))
data = textDocument->plainText(); data = textDocument->plainText();
} }
post(data, mimeType); post(data, mimeType);
......
...@@ -1054,7 +1054,7 @@ void CPPEditorWidget::onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefL ...@@ -1054,7 +1054,7 @@ void CPPEditorWidget::onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefL
Core::IDocument *targetDocument Core::IDocument *targetDocument
= Core::DocumentModel::documentForFilePath( d->m_declDefLink->targetFile->fileName()); = Core::DocumentModel::documentForFilePath( d->m_declDefLink->targetFile->fileName());
if (baseTextDocument() != targetDocument) { if (baseTextDocument() != targetDocument) {
if (TextEditor::ITextEditorDocument *textEditorDocument = qobject_cast<TextEditor::ITextEditorDocument *>(targetDocument)) if (TextEditor::BaseTextEditorDocument *textEditorDocument = qobject_cast<TextEditor::BaseTextEditorDocument *>(targetDocument))
connect(textEditorDocument, SIGNAL(contentsChanged()), connect(textEditorDocument, SIGNAL(contentsChanged()),
this, SLOT(abortDeclDefLink())); this, SLOT(abortDeclDefLink()));
} }
...@@ -1103,7 +1103,7 @@ void CPPEditorWidget::abortDeclDefLink() ...@@ -1103,7 +1103,7 @@ void CPPEditorWidget::abortDeclDefLink()
Core::IDocument *targetDocument Core::IDocument *targetDocument
= Core::DocumentModel::documentForFilePath(d->m_declDefLink->targetFile->fileName()); = Core::DocumentModel::documentForFilePath(d->m_declDefLink->targetFile->fileName());
if (baseTextDocument() != targetDocument) { if (baseTextDocument() != targetDocument) {
if (TextEditor::ITextEditorDocument *textEditorDocument = qobject_cast<TextEditor::ITextEditorDocument *>(targetDocument)) if (TextEditor::BaseTextEditorDocument *textEditorDocument = qobject_cast<TextEditor::BaseTextEditorDocument *>(targetDocument))
disconnect(textEditorDocument, SIGNAL(contentsChanged()), disconnect(textEditorDocument, SIGNAL(contentsChanged()),
this, SLOT(abortDeclDefLink())); this, SLOT(abortDeclDefLink()));
} }
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <QtPlugin> #include <QtPlugin>
#include <QAction> #include <QAction>
namespace TextEditor { class ITextEditor; } namespace TextEditor { class BaseTextEditor; }
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
...@@ -243,7 +243,7 @@ private: ...@@ -243,7 +243,7 @@ private:
QPointer<CppCodeModelInspectorDialog> m_cppCodeModelInspectorDialog; QPointer<CppCodeModelInspectorDialog> m_cppCodeModelInspectorDialog;
QPointer<TextEditor::ITextEditor> m_currentEditor; QPointer<TextEditor::BaseTextEditor> m_currentEditor;
}; };
class CppEditorFactory : public Core::IEditorFactory class CppEditorFactory : public Core::IEditorFactory
......
...@@ -54,7 +54,7 @@ bool CppHoverHandler::acceptEditor(IEditor *editor) ...@@ -54,7 +54,7 @@ bool CppHoverHandler::acceptEditor(IEditor *editor)
return editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID; return editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID;
} }
void CppHoverHandler::identifyMatch(TextEditor::ITextEditor *editor, int pos) void CppHoverHandler::identifyMatch(TextEditor::BaseTextEditor *editor, int pos)
{ {
using namespace TextEditor; using namespace TextEditor;
BaseTextEditorWidget *textEditor = qobject_cast<BaseTextEditorWidget *>(editor->widget()); BaseTextEditorWidget *textEditor = qobject_cast<BaseTextEditorWidget *>(editor->widget());
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
namespace Core { class IEditor; } namespace Core { class IEditor; }
namespace TextEditor { class ITextEditor; } namespace TextEditor { class BaseTextEditor; }
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
...@@ -50,7 +50,7 @@ public: ...@@ -50,7 +50,7 @@ public:
private: private:
virtual bool acceptEditor(Core::IEditor *editor); virtual bool acceptEditor(Core::IEditor *editor);
virtual void identifyMatch(TextEditor::ITextEditor *editor, int pos); virtual void identifyMatch(TextEditor::BaseTextEditor *editor, int pos);
virtual void decorateToolTip(); virtual void decorateToolTip();
}; };
......
...@@ -305,7 +305,7 @@ void CppAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor *e ...@@ -305,7 +305,7 @@ void CppAssistProposalItem::applyContextualContent(TextEditor::BaseTextEditor *e
// Determine the length of characters that should just be kept on the editor, but do // Determine the length of characters that should just be kept on the editor, but do
// not consider content that ends as an identifier (which could be undesired). // not consider content that ends as an identifier (which could be undesired).
const int lineEnd = editor->position(TextEditor::ITextEditor::EndOfLine); const int lineEnd = editor->position(TextEditor::BaseTextEditor::EndOfLine);
const QString inEditor = editor->textDocument()->textAt(editor->position(), const QString inEditor = editor->textDocument()->textAt(editor->position(),
lineEnd - editor->position()); lineEnd - editor->position());
int preserveLength = 0; int preserveLength = 0;
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
#include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
...@@ -447,7 +447,7 @@ void CdbEngine::syncVerboseLog(bool verboseLog) ...@@ -447,7 +447,7 @@ void CdbEngine::syncVerboseLog(bool verboseLog)
postCommand(m_verboseLog ? QByteArray("!sym noisy") : QByteArray("!sym quiet"), 0); postCommand(m_verboseLog ? QByteArray("!sym noisy") : QByteArray("!sym quiet"), 0);
} }
bool CdbEngine::setToolTipExpression(TextEditor::ITextEditor *editor, bool CdbEngine::setToolTipExpression(TextEditor::BaseTextEditor *editor,
const DebuggerToolTipContext &contextIn) const DebuggerToolTipContext &contextIn)
{ {
if (debug) if (debug)
......
...@@ -76,7 +76,7 @@ public: ...@@ -76,7 +76,7 @@ public:
// Factory function that returns 0 if the debug engine library cannot be found. // Factory function that returns 0 if the debug engine library cannot be found.
virtual bool setToolTipExpression(TextEditor::ITextEditor *editor, virtual bool setToolTipExpression(TextEditor::BaseTextEditor *editor,
const DebuggerToolTipContext &ctx); const DebuggerToolTipContext &ctx);
virtual void setupEngine(); virtual void setupEngine();
virtual void setupInferior(); virtual void setupInferior();
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
#include <texteditor/itexteditor.h> #include <texteditor/basetexteditor.h>
#include <utils/savedaction.h> #include <utils/savedaction.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
...@@ -1360,7 +1360,7 @@ DebuggerRunControl *DebuggerEngine::runControl() const ...@@ -1360,7 +1360,7 @@ DebuggerRunControl *DebuggerEngine::runControl() const
return d->runControl(); return d->runControl();
} }
bool DebuggerEngine::setToolTipExpression(TextEditor::ITextEditor *, bool DebuggerEngine::setToolTipExpression(TextEditor::BaseTextEditor *,
const DebuggerToolTipContext &) const DebuggerToolTipContext &)
{ {
return false; return false;
......
...@@ -45,7 +45,7 @@ class QMessageBox; ...@@ -45,7 +45,7 @@ class QMessageBox;
class QAbstractItemModel; class QAbstractItemModel;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace TextEditor { class ITextEditor; } namespace TextEditor { class BaseTextEditor; }
namespace Core { class IOptionsPage; } namespace Core { class IOptionsPage; }
namespace Debugger { namespace Debugger {
...@@ -143,7 +143,7 @@ public: ...@@ -143,7 +143,7 @@ public:
const DebuggerStartParameters &startParameters() const; const DebuggerStartParameters &startParameters() const;
DebuggerStartParameters &startParameters(); DebuggerStartParameters &startParameters();
virtual bool setToolTipExpression(TextEditor::ITextEditor *editor, virtual bool setToolTipExpression(TextEditor::BaseTextEditor *editor,
const Internal::DebuggerToolTipContext &); const Internal::DebuggerToolTipContext &);
virtual void updateWatchData(const Internal::WatchData &data, virtual void updateWatchData(const Internal::WatchData &data,
......
...@@ -690,7 +690,7 @@ bool fillParameters(DebuggerStartParameters *sp, const Kit *kit, QString *errorM ...@@ -690,7 +690,7 @@ bool fillParameters(DebuggerStartParameters *sp, const Kit *kit, QString *errorM
static bool currentTextEditorPosition(ContextData *data) static bool currentTextEditorPosition(ContextData *data)
{ {
ITextEditor *textEditor = ITextEditor::currentTextEditor(); BaseTextEditor *textEditor = BaseTextEditor::currentTextEditor();
if (!textEditor)