Commit 21032137 authored by hjk's avatar hjk

Editors: Some renamings to enhance consistency

The base pattern is FooEditor for BaseTextEditor derived classes
and FooEditorWidget for BaseTextEditorWidget derived classes. So:

CPPEditorWidget -> CppEditorWidget
CPPEditorWidgetPrivate -> CppEditorWidgetPrivate
...::EditorWidget -> PythonEditorWidget
GLSLTextEditorWidget -> GlslEditorWidget
GLSLEditorEditable -> GlslEditor

Change-Id: I76d34a3694c2fb35491982d86e83f7e4774c0be6
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent f6b48950
...@@ -41,7 +41,7 @@ using namespace CPlusPlus; ...@@ -41,7 +41,7 @@ using namespace CPlusPlus;
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
CanonicalSymbol::CanonicalSymbol(CPPEditorWidget *editor, CanonicalSymbol::CanonicalSymbol(CppEditorWidget *editor,
const Document::Ptr &document, const Document::Ptr &document,
const Snapshot &snapshot) const Snapshot &snapshot)
: m_editorWidget(editor), : m_editorWidget(editor),
......
...@@ -39,12 +39,12 @@ QT_FORWARD_DECLARE_CLASS(QTextCursor) ...@@ -39,12 +39,12 @@ QT_FORWARD_DECLARE_CLASS(QTextCursor)
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
class CPPEditorWidget; class CppEditorWidget;
class CanonicalSymbol class CanonicalSymbol
{ {
public: public:
CanonicalSymbol(CPPEditorWidget *editorWidget, CanonicalSymbol(CppEditorWidget *editorWidget,
const CPlusPlus::Document::Ptr &document, const CPlusPlus::Document::Ptr &document,
const CPlusPlus::Snapshot &snapshot); const CPlusPlus::Snapshot &snapshot);
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
CPlusPlus::TypeOfExpression &typeOfExpression); CPlusPlus::TypeOfExpression &typeOfExpression);
private: private:
CPPEditorWidget *m_editorWidget; CppEditorWidget *m_editorWidget;
CPlusPlus::Document::Ptr m_document; CPlusPlus::Document::Ptr m_document;
CPlusPlus::Snapshot m_snapshot; CPlusPlus::Snapshot m_snapshot;
......
...@@ -1369,8 +1369,8 @@ void CppCodeModelInspectorDialog::refresh() ...@@ -1369,8 +1369,8 @@ void CppCodeModelInspectorDialog::refresh()
dumper.dumpSnapshot(editorSnapshot, editorSnapshotTitle); dumper.dumpSnapshot(editorSnapshot, editorSnapshotTitle);
m_ui->snapshotSelector->addItem(editorSnapshotTitle); m_ui->snapshotSelector->addItem(editorSnapshotTitle);
} }
CppEditor::Internal::CPPEditorWidget *cppEditorWidget CppEditor::Internal::CppEditorWidget *cppEditorWidget
= qobject_cast<CppEditor::Internal::CPPEditorWidget *>(editor->editorWidget()); = qobject_cast<CppEditor::Internal::CppEditorWidget *>(editor->editorWidget());
if (cppEditorWidget) { if (cppEditorWidget) {
SemanticInfo semanticInfo = cppEditorWidget->semanticInfo(); SemanticInfo semanticInfo = cppEditorWidget->semanticInfo();
CPlusPlus::Snapshot snapshot; CPlusPlus::Snapshot snapshot;
......
This diff is collapsed.
...@@ -50,15 +50,16 @@ namespace CppEditor { ...@@ -50,15 +50,16 @@ namespace CppEditor {
namespace Internal { namespace Internal {
class CppEditorOutline; class CppEditorOutline;
class CPPEditorWidget; class CppEditorWidget;
class CPPEditorWidgetPrivate; class CppEditorWidgetPrivate;
class FollowSymbolUnderCursor; class FollowSymbolUnderCursor;
class CPPEditor : public TextEditor::BaseTextEditor class CPPEditor : public TextEditor::BaseTextEditor
{ {
Q_OBJECT Q_OBJECT
public: public:
CPPEditor(CPPEditorWidget *); CPPEditor(CppEditorWidget *);
Core::IEditor *duplicate() QTC_OVERRIDE; Core::IEditor *duplicate() QTC_OVERRIDE;
...@@ -69,7 +70,7 @@ public: ...@@ -69,7 +70,7 @@ public:
TextEditor::CompletionAssistProvider *completionAssistProvider() QTC_OVERRIDE; TextEditor::CompletionAssistProvider *completionAssistProvider() QTC_OVERRIDE;
}; };
class CPPEditorWidget : public TextEditor::BaseTextEditorWidget class CppEditorWidget : public TextEditor::BaseTextEditorWidget
{ {
Q_OBJECT Q_OBJECT
...@@ -78,9 +79,9 @@ public: ...@@ -78,9 +79,9 @@ public:
static QString identifierUnderCursor(QTextCursor *macroCursor); static QString identifierUnderCursor(QTextCursor *macroCursor);
public: public:
CPPEditorWidget(QWidget *parent = 0); CppEditorWidget(QWidget *parent = 0);
CPPEditorWidget(CPPEditorWidget *other); CppEditorWidget(CppEditorWidget *other);
~CPPEditorWidget(); ~CppEditorWidget();
CPPEditorDocument *cppEditorDocument() const; CPPEditorDocument *cppEditorDocument() const;
CppEditorOutline *outline() const; CppEditorOutline *outline() const;
...@@ -155,7 +156,7 @@ private slots: ...@@ -155,7 +156,7 @@ private slots:
private: private:
static bool openCppEditorAt(const Link &, bool inNextSplit = false); static bool openCppEditorAt(const Link &, bool inNextSplit = false);
CPPEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity CppEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity
void ctor(); void ctor();
void createToolBar(CPPEditor *editable); void createToolBar(CPPEditor *editable);
...@@ -174,7 +175,7 @@ private: ...@@ -174,7 +175,7 @@ private:
const QList<TextEditor::HighlightingResult> &uses); const QList<TextEditor::HighlightingResult> &uses);
private: private:
QScopedPointer<CPPEditorWidgetPrivate> d; QScopedPointer<CppEditorWidgetPrivate> d;
}; };
} // namespace Internal } // namespace Internal
......
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
/*! /*!
\class CppEditor::Internal::CppEditorOutline \class CppEditor::Internal::CppEditorOutline
\brief A helper class of CPPEditorWidget that provides the outline model \brief A helper class of CppEditorWidget that provides the outline model
and widget, e.g. for the editor's tool bar. and widget, e.g. for the editor's tool bar.
\internal \internal
The caller is responsible for deleting the widget returned by widget(). The caller is responsible for deleting the widget returned by widget().
\sa CppEditor::Internal::CPPEditorWidget \sa CppEditor::Internal::CppEditorWidget
*/ */
enum { UpdateOutlineIntervalInMs = 500 }; enum { UpdateOutlineIntervalInMs = 500 };
...@@ -95,7 +95,7 @@ QTimer *newSingleShotTimer(QObject *parent, int msInternal) ...@@ -95,7 +95,7 @@ QTimer *newSingleShotTimer(QObject *parent, int msInternal)
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
CppEditorOutline::CppEditorOutline(CPPEditorWidget *editorWidget) CppEditorOutline::CppEditorOutline(CppEditorWidget *editorWidget)
: QObject(editorWidget) : QObject(editorWidget)
, m_editorWidget(editorWidget) , m_editorWidget(editorWidget)
, m_combo(new Utils::TreeViewComboBox) , m_combo(new Utils::TreeViewComboBox)
...@@ -249,7 +249,7 @@ void CppEditorOutline::gotoSymbolInEditor() ...@@ -249,7 +249,7 @@ void CppEditorOutline::gotoSymbolInEditor()
if (!symbol) if (!symbol)
return; return;
const TextEditor::BaseTextEditorWidget::Link &link = CPPEditorWidget::linkToSymbol(symbol); const TextEditor::BaseTextEditorWidget::Link &link = CppEditorWidget::linkToSymbol(symbol);
if (!link.hasValidTarget()) if (!link.hasValidTarget())
return; return;
......
...@@ -45,7 +45,7 @@ namespace Utils { class TreeViewComboBox; } ...@@ -45,7 +45,7 @@ namespace Utils { class TreeViewComboBox; }
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
class CPPEditorWidget; class CppEditorWidget;
class CppEditorOutline : public QObject class CppEditorOutline : public QObject
{ {
...@@ -53,7 +53,7 @@ class CppEditorOutline : public QObject ...@@ -53,7 +53,7 @@ class CppEditorOutline : public QObject
Q_DISABLE_COPY(CppEditorOutline) Q_DISABLE_COPY(CppEditorOutline)
public: public:
explicit CppEditorOutline(CPPEditorWidget *editorWidget); explicit CppEditorOutline(CppEditorWidget *editorWidget);
void update(); void update();
...@@ -83,7 +83,7 @@ private: ...@@ -83,7 +83,7 @@ private:
const QModelIndex &rootIndex = QModelIndex()) const; const QModelIndex &rootIndex = QModelIndex()) const;
private: private:
CPPEditorWidget *m_editorWidget; CppEditorWidget *m_editorWidget;
Utils::TreeViewComboBox *m_combo; // Not owned Utils::TreeViewComboBox *m_combo; // Not owned
CPlusPlus::OverviewModel *m_model; CPlusPlus::OverviewModel *m_model;
......
...@@ -97,7 +97,7 @@ CppEditorFactory::CppEditorFactory(CppEditorPlugin *owner) : ...@@ -97,7 +97,7 @@ CppEditorFactory::CppEditorFactory(CppEditorPlugin *owner) :
IEditor *CppEditorFactory::createEditor() IEditor *CppEditorFactory::createEditor()
{ {
CPPEditorWidget *editor = new CPPEditorWidget(); CppEditorWidget *editor = new CppEditorWidget();
editor->setRevisionsVisible(true); editor->setRevisionsVisible(true);
m_owner->initializeEditor(editor); m_owner->initializeEditor(editor);
return editor->editor(); return editor->editor();
...@@ -129,7 +129,7 @@ CppEditorPlugin *CppEditorPlugin::instance() ...@@ -129,7 +129,7 @@ CppEditorPlugin *CppEditorPlugin::instance()
return m_instance; return m_instance;
} }
void CppEditorPlugin::initializeEditor(CPPEditorWidget *editor) void CppEditorPlugin::initializeEditor(CppEditorWidget *editor)
{ {
editor->setLanguageSettingsId(CppTools::Constants::CPP_SETTINGS_ID); editor->setLanguageSettingsId(CppTools::Constants::CPP_SETTINGS_ID);
TextEditor::TextEditorSettings::initializeEditor(editor); TextEditor::TextEditorSettings::initializeEditor(editor);
...@@ -343,38 +343,38 @@ ExtensionSystem::IPlugin::ShutdownFlag CppEditorPlugin::aboutToShutdown() ...@@ -343,38 +343,38 @@ ExtensionSystem::IPlugin::ShutdownFlag CppEditorPlugin::aboutToShutdown()
return SynchronousShutdown; return SynchronousShutdown;
} }
static CPPEditorWidget *currentCppEditorWidget() static CppEditorWidget *currentCppEditorWidget()
{ {
return qobject_cast<CPPEditorWidget*>(EditorManager::currentEditor()->widget()); return qobject_cast<CppEditorWidget*>(EditorManager::currentEditor()->widget());
} }
void CppEditorPlugin::switchDeclarationDefinition() void CppEditorPlugin::switchDeclarationDefinition()
{ {
if (CPPEditorWidget *editorWidget = currentCppEditorWidget()) if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->switchDeclarationDefinition(/*inNextSplit*/ false); editorWidget->switchDeclarationDefinition(/*inNextSplit*/ false);
} }
void CppEditorPlugin::openDeclarationDefinitionInNextSplit() void CppEditorPlugin::openDeclarationDefinitionInNextSplit()
{ {
if (CPPEditorWidget *editorWidget = currentCppEditorWidget()) if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->switchDeclarationDefinition(/*inNextSplit*/ true); editorWidget->switchDeclarationDefinition(/*inNextSplit*/ true);
} }
void CppEditorPlugin::renameSymbolUnderCursor() void CppEditorPlugin::renameSymbolUnderCursor()
{ {
if (CPPEditorWidget *editorWidget = currentCppEditorWidget()) if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->renameSymbolUnderCursor(); editorWidget->renameSymbolUnderCursor();
} }
void CppEditorPlugin::findUsages() void CppEditorPlugin::findUsages()
{ {
if (CPPEditorWidget *editorWidget = currentCppEditorWidget()) if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->findUsages(); editorWidget->findUsages();
} }
void CppEditorPlugin::showPreProcessorDialog() void CppEditorPlugin::showPreProcessorDialog()
{ {
if (CPPEditorWidget *editorWidget = currentCppEditorWidget()) if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->showPreProcessorWidget(); editorWidget->showPreProcessorWidget();
} }
......
...@@ -42,7 +42,7 @@ namespace TextEditor { class BaseTextEditor; } ...@@ -42,7 +42,7 @@ namespace TextEditor { class BaseTextEditor; }
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
class CPPEditorWidget; class CppEditorWidget;
class CppCodeModelInspectorDialog; class CppCodeModelInspectorDialog;
class CppQuickFixCollector; class CppQuickFixCollector;
class CppQuickFixAssistProvider; class CppQuickFixAssistProvider;
...@@ -63,7 +63,7 @@ public: ...@@ -63,7 +63,7 @@ public:
ShutdownFlag aboutToShutdown(); ShutdownFlag aboutToShutdown();
// Connect editor to settings changed signals. // Connect editor to settings changed signals.
void initializeEditor(CPPEditorWidget *editor); void initializeEditor(CppEditorWidget *editor);
bool sortedOutline() const; bool sortedOutline() const;
......
...@@ -63,14 +63,14 @@ TestCase::~TestCase() ...@@ -63,14 +63,14 @@ TestCase::~TestCase()
bool TestCase::openCppEditor(const QString &fileName, bool TestCase::openCppEditor(const QString &fileName,
Internal::CPPEditor **editor, Internal::CPPEditor **editor,
Internal::CPPEditorWidget **editorWidget) Internal::CppEditorWidget **editorWidget)
{ {
using namespace CppEditor::Internal; using namespace CppEditor::Internal;
if (CPPEditor *e = dynamic_cast<CPPEditor *>(Core::EditorManager::openEditor(fileName))) { if (CPPEditor *e = dynamic_cast<CPPEditor *>(Core::EditorManager::openEditor(fileName))) {
if (editor) if (editor)
*editor = e; *editor = e;
if (editorWidget) { if (editorWidget) {
if (CPPEditorWidget *w = dynamic_cast<CPPEditorWidget *>(e->editorWidget())) { if (CppEditorWidget *w = dynamic_cast<CppEditorWidget *>(e->editorWidget())) {
*editorWidget = w; *editorWidget = w;
return true; return true;
} else { } else {
...@@ -85,7 +85,7 @@ bool TestCase::openCppEditor(const QString &fileName, ...@@ -85,7 +85,7 @@ bool TestCase::openCppEditor(const QString &fileName,
} }
CPlusPlus::Document::Ptr TestCase::waitForRehighlightedSemanticDocument( CPlusPlus::Document::Ptr TestCase::waitForRehighlightedSemanticDocument(
Internal::CPPEditorWidget *editorWidget) Internal::CppEditorWidget *editorWidget)
{ {
editorWidget->semanticRehighlight(true); editorWidget->semanticRehighlight(true);
while (editorWidget->semanticInfo().doc.isNull()) while (editorWidget->semanticInfo().doc.isNull())
......
...@@ -39,7 +39,7 @@ namespace CppEditor { ...@@ -39,7 +39,7 @@ namespace CppEditor {
namespace Internal { namespace Internal {
class CPPEditor; class CPPEditor;
class CPPEditorWidget; class CppEditorWidget;
namespace Tests { namespace Tests {
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
public: public:
int m_cursorPosition; int m_cursorPosition;
Internal::CPPEditor *m_editor; Internal::CPPEditor *m_editor;
Internal::CPPEditorWidget *m_editorWidget; Internal::CppEditorWidget *m_editorWidget;
}; };
class TestCase : public CppTools::Tests::TestCase class TestCase : public CppTools::Tests::TestCase
...@@ -64,10 +64,10 @@ public: ...@@ -64,10 +64,10 @@ public:
static bool openCppEditor(const QString &fileName, static bool openCppEditor(const QString &fileName,
Internal::CPPEditor **editor, Internal::CPPEditor **editor,
Internal::CPPEditorWidget **editorWidget = 0); Internal::CppEditorWidget **editorWidget = 0);
static CPlusPlus::Document::Ptr waitForRehighlightedSemanticDocument( static CPlusPlus::Document::Ptr waitForRehighlightedSemanticDocument(
Internal::CPPEditorWidget *editorWidget); Internal::CppEditorWidget *editorWidget);
}; };
} // namespace Tests } // namespace Tests
......
...@@ -301,7 +301,7 @@ CppDeclarableElement::CppDeclarableElement(Symbol *declaration) ...@@ -301,7 +301,7 @@ CppDeclarableElement::CppDeclarableElement(Symbol *declaration)
} }
tooltip = overview.prettyType(declaration->type(), qualifiedName); tooltip = overview.prettyType(declaration->type(), qualifiedName);
link = CPPEditorWidget::linkToSymbol(declaration); link = CppEditorWidget::linkToSymbol(declaration);
helpMark = name; helpMark = name;
} }
......
...@@ -50,7 +50,7 @@ namespace CppTools { class CppModelManagerInterface; } ...@@ -50,7 +50,7 @@ namespace CppTools { class CppModelManagerInterface; }
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
class CPPEditorWidget; class CppEditorWidget;
class CppElement; class CppElement;
class CppElementEvaluator class CppElementEvaluator
......
...@@ -306,8 +306,8 @@ inline LookupItem skipForwardDeclarations(const QList<LookupItem> &resolvedSymbo ...@@ -306,8 +306,8 @@ inline LookupItem skipForwardDeclarations(const QList<LookupItem> &resolvedSymbo
return result; return result;
} }
CPPEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor, CppEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor,
CPPEditorWidget *, CPlusPlus::Snapshot snapshot, const CPlusPlus::Document::Ptr &document, CppEditorWidget *, CPlusPlus::Snapshot snapshot, const CPlusPlus::Document::Ptr &document,
SymbolFinder *symbolFinder) SymbolFinder *symbolFinder)
{ {
Link result; Link result;
...@@ -365,7 +365,7 @@ CPPEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor, ...@@ -365,7 +365,7 @@ CPPEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor,
} }
if (target) { if (target) {
result = CPPEditorWidget::linkToSymbol(target); result = CppEditorWidget::linkToSymbol(target);
unsigned startLine, startColumn, endLine, endColumn; unsigned startLine, startColumn, endLine, endColumn;
document->translationUnit()->getTokenStartPosition(name->firstToken(), &startLine, document->translationUnit()->getTokenStartPosition(name->firstToken(), &startLine,
...@@ -396,7 +396,7 @@ Symbol *findDefinition(Symbol *symbol, const Snapshot &snapshot, SymbolFinder *s ...@@ -396,7 +396,7 @@ Symbol *findDefinition(Symbol *symbol, const Snapshot &snapshot, SymbolFinder *s
} // anonymous namespace } // anonymous namespace
FollowSymbolUnderCursor::FollowSymbolUnderCursor(CPPEditorWidget *widget) FollowSymbolUnderCursor::FollowSymbolUnderCursor(CppEditorWidget *widget)
: m_widget(widget) : m_widget(widget)
, m_virtualFunctionAssistProvider(new VirtualFunctionAssistProvider) , m_virtualFunctionAssistProvider(new VirtualFunctionAssistProvider)
{ {
...@@ -592,7 +592,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor & ...@@ -592,7 +592,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &
const Macro *macro = doc->findMacroDefinitionAt(line); const Macro *macro = doc->findMacroDefinitionAt(line);
if (macro) { if (macro) {
QTextCursor macroCursor = cursor; QTextCursor macroCursor = cursor;
const QByteArray name = CPPEditorWidget::identifierUnderCursor(&macroCursor).toUtf8(); const QByteArray name = CppEditorWidget::identifierUnderCursor(&macroCursor).toUtf8();
if (macro->name() == name) if (macro->name() == name)
return link; //already on definition! return link; //already on definition!
} else if (const Document::MacroUse *use = doc->findMacroUseAt(endOfToken - 1)) { } else if (const Document::MacroUse *use = doc->findMacroUseAt(endOfToken - 1)) {
...@@ -723,7 +723,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor & ...@@ -723,7 +723,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &
// Handle macro uses // Handle macro uses
QTextCursor macroCursor = cursor; QTextCursor macroCursor = cursor;
const QByteArray name = CPPEditorWidget::identifierUnderCursor(&macroCursor).toUtf8(); const QByteArray name = CppEditorWidget::identifierUnderCursor(&macroCursor).toUtf8();
link = findMacroLink(name, documentFromSemanticInfo); link = findMacroLink(name, documentFromSemanticInfo);
if (link.hasValidTarget()) { if (link.hasValidTarget()) {
link.linkTextStart = macroCursor.selectionStart(); link.linkTextStart = macroCursor.selectionStart();
......
...@@ -43,7 +43,7 @@ namespace CppTools { class SymbolFinder; } ...@@ -43,7 +43,7 @@ namespace CppTools { class SymbolFinder; }
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
class CPPEditorWidget; class CppEditorWidget;
class VirtualFunctionAssistProvider; class VirtualFunctionAssistProvider;
class FollowSymbolUnderCursor class FollowSymbolUnderCursor
...@@ -51,7 +51,7 @@ class FollowSymbolUnderCursor ...@@ -51,7 +51,7 @@ class FollowSymbolUnderCursor
public: public:
typedef TextEditor::BaseTextEditorWidget::Link Link; typedef TextEditor::BaseTextEditorWidget::Link Link;
FollowSymbolUnderCursor(CPPEditorWidget *widget); FollowSymbolUnderCursor(CppEditorWidget *widget);
~FollowSymbolUnderCursor(); ~FollowSymbolUnderCursor();
Link findLink(const QTextCursor &cursor, bool resolveTarget, Link findLink(const QTextCursor &cursor, bool resolveTarget,
...@@ -63,7 +63,7 @@ public: ...@@ -63,7 +63,7 @@ public:
void setVirtualFunctionAssistProvider(VirtualFunctionAssistProvider *provider); void setVirtualFunctionAssistProvider(VirtualFunctionAssistProvider *provider);
private: private:
CPPEditorWidget *m_widget; CppEditorWidget *m_widget;
VirtualFunctionAssistProvider *m_virtualFunctionAssistProvider; VirtualFunctionAssistProvider *m_virtualFunctionAssistProvider;
}; };
......
...@@ -287,7 +287,7 @@ static bool namesEqual(const Name *n1, const Name *n2) ...@@ -287,7 +287,7 @@ static bool namesEqual(const Name *n1, const Name *n2)
return n1 == n2 || (n1 && n2 && n1->match(n2)); return n1 == n2 || (n1 && n2 && n1->match(n2));
} }
void FunctionDeclDefLink::apply(CPPEditorWidget *editor, bool jumpToMatch) void FunctionDeclDefLink::apply(CppEditorWidget *editor, bool jumpToMatch)
{ {
Snapshot snapshot = editor->semanticInfo().snapshot; Snapshot snapshot = editor->semanticInfo().snapshot;
...@@ -323,7 +323,7 @@ static QList<TextEditor::RefactorMarker> removeMarkersOfType(const QList<TextEdi ...@@ -323,7 +323,7 @@ static QList<TextEditor::RefactorMarker> removeMarkersOfType(const QList<TextEdi
return result; return result;
} }
void FunctionDeclDefLink::hideMarker(CPPEditorWidget *editor) void FunctionDeclDefLink::hideMarker(CppEditorWidget *editor)
{ {
if (!hasMarker) if (!hasMarker)
return; return;
...@@ -332,7 +332,7 @@ void FunctionDeclDefLink::hideMarker(CPPEditorWidget *editor) ...@@ -332,7 +332,7 @@ void FunctionDeclDefLink::hideMarker(CPPEditorWidget *editor)
hasMarker = false; hasMarker = false;
} }
void FunctionDeclDefLink::showMarker(CPPEditorWidget *editor) void FunctionDeclDefLink::showMarker(CppEditorWidget *editor)
{ {
if (hasMarker) if (hasMarker)
return; return;
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
namespace CppEditor { namespace CppEditor {
namespace Internal { namespace Internal {
class CPPEditorWidget; class CppEditorWidget;
class FunctionDeclDefLink; class FunctionDeclDefLink;
class FunctionDeclDefLinkFinder : public QObject class FunctionDeclDefLinkFinder : public QObject
...@@ -80,9 +80,9 @@ public: ...@@ -80,9 +80,9 @@ public:
bool isValid() const; bool isValid() const;