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;
namespace CppEditor {
namespace Internal {
CanonicalSymbol::CanonicalSymbol(CPPEditorWidget *editor,
CanonicalSymbol::CanonicalSymbol(CppEditorWidget *editor,
const Document::Ptr &document,
const Snapshot &snapshot)
: m_editorWidget(editor),
......
......@@ -39,12 +39,12 @@ QT_FORWARD_DECLARE_CLASS(QTextCursor)
namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class CanonicalSymbol
{
public:
CanonicalSymbol(CPPEditorWidget *editorWidget,
CanonicalSymbol(CppEditorWidget *editorWidget,
const CPlusPlus::Document::Ptr &document,
const CPlusPlus::Snapshot &snapshot);
......@@ -61,7 +61,7 @@ public:
CPlusPlus::TypeOfExpression &typeOfExpression);
private:
CPPEditorWidget *m_editorWidget;
CppEditorWidget *m_editorWidget;
CPlusPlus::Document::Ptr m_document;
CPlusPlus::Snapshot m_snapshot;
......
......@@ -1369,8 +1369,8 @@ void CppCodeModelInspectorDialog::refresh()
dumper.dumpSnapshot(editorSnapshot, editorSnapshotTitle);
m_ui->snapshotSelector->addItem(editorSnapshotTitle);
}
CppEditor::Internal::CPPEditorWidget *cppEditorWidget
= qobject_cast<CppEditor::Internal::CPPEditorWidget *>(editor->editorWidget());
CppEditor::Internal::CppEditorWidget *cppEditorWidget
= qobject_cast<CppEditor::Internal::CppEditorWidget *>(editor->editorWidget());
if (cppEditorWidget) {
SemanticInfo semanticInfo = cppEditorWidget->semanticInfo();
CPlusPlus::Snapshot snapshot;
......
This diff is collapsed.
......@@ -50,15 +50,16 @@ namespace CppEditor {
namespace Internal {
class CppEditorOutline;
class CPPEditorWidget;
class CPPEditorWidgetPrivate;
class CppEditorWidget;
class CppEditorWidgetPrivate;
class FollowSymbolUnderCursor;
class CPPEditor : public TextEditor::BaseTextEditor
{
Q_OBJECT
public:
CPPEditor(CPPEditorWidget *);
CPPEditor(CppEditorWidget *);
Core::IEditor *duplicate() QTC_OVERRIDE;
......@@ -69,7 +70,7 @@ public:
TextEditor::CompletionAssistProvider *completionAssistProvider() QTC_OVERRIDE;
};
class CPPEditorWidget : public TextEditor::BaseTextEditorWidget
class CppEditorWidget : public TextEditor::BaseTextEditorWidget
{
Q_OBJECT
......@@ -78,9 +79,9 @@ public:
static QString identifierUnderCursor(QTextCursor *macroCursor);
public:
CPPEditorWidget(QWidget *parent = 0);
CPPEditorWidget(CPPEditorWidget *other);
~CPPEditorWidget();
CppEditorWidget(QWidget *parent = 0);
CppEditorWidget(CppEditorWidget *other);
~CppEditorWidget();
CPPEditorDocument *cppEditorDocument() const;
CppEditorOutline *outline() const;
......@@ -155,7 +156,7 @@ private slots:
private:
static bool openCppEditorAt(const Link &, bool inNextSplit = false);
CPPEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity
CppEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity
void ctor();
void createToolBar(CPPEditor *editable);
......@@ -174,7 +175,7 @@ private:
const QList<TextEditor::HighlightingResult> &uses);
private:
QScopedPointer<CPPEditorWidgetPrivate> d;
QScopedPointer<CppEditorWidgetPrivate> d;
};
} // namespace Internal
......
......@@ -42,14 +42,14 @@
/*!
\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.
\internal
The caller is responsible for deleting the widget returned by widget().
\sa CppEditor::Internal::CPPEditorWidget
\sa CppEditor::Internal::CppEditorWidget
*/
enum { UpdateOutlineIntervalInMs = 500 };
......@@ -95,7 +95,7 @@ QTimer *newSingleShotTimer(QObject *parent, int msInternal)
namespace CppEditor {
namespace Internal {
CppEditorOutline::CppEditorOutline(CPPEditorWidget *editorWidget)
CppEditorOutline::CppEditorOutline(CppEditorWidget *editorWidget)
: QObject(editorWidget)
, m_editorWidget(editorWidget)
, m_combo(new Utils::TreeViewComboBox)
......@@ -249,7 +249,7 @@ void CppEditorOutline::gotoSymbolInEditor()
if (!symbol)
return;
const TextEditor::BaseTextEditorWidget::Link &link = CPPEditorWidget::linkToSymbol(symbol);
const TextEditor::BaseTextEditorWidget::Link &link = CppEditorWidget::linkToSymbol(symbol);
if (!link.hasValidTarget())
return;
......
......@@ -45,7 +45,7 @@ namespace Utils { class TreeViewComboBox; }
namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class CppEditorOutline : public QObject
{
......@@ -53,7 +53,7 @@ class CppEditorOutline : public QObject
Q_DISABLE_COPY(CppEditorOutline)
public:
explicit CppEditorOutline(CPPEditorWidget *editorWidget);
explicit CppEditorOutline(CppEditorWidget *editorWidget);
void update();
......@@ -83,7 +83,7 @@ private:
const QModelIndex &rootIndex = QModelIndex()) const;
private:
CPPEditorWidget *m_editorWidget;
CppEditorWidget *m_editorWidget;
Utils::TreeViewComboBox *m_combo; // Not owned
CPlusPlus::OverviewModel *m_model;
......
......@@ -97,7 +97,7 @@ CppEditorFactory::CppEditorFactory(CppEditorPlugin *owner) :
IEditor *CppEditorFactory::createEditor()
{
CPPEditorWidget *editor = new CPPEditorWidget();
CppEditorWidget *editor = new CppEditorWidget();
editor->setRevisionsVisible(true);
m_owner->initializeEditor(editor);
return editor->editor();
......@@ -129,7 +129,7 @@ CppEditorPlugin *CppEditorPlugin::instance()
return m_instance;
}
void CppEditorPlugin::initializeEditor(CPPEditorWidget *editor)
void CppEditorPlugin::initializeEditor(CppEditorWidget *editor)
{
editor->setLanguageSettingsId(CppTools::Constants::CPP_SETTINGS_ID);
TextEditor::TextEditorSettings::initializeEditor(editor);
......@@ -343,38 +343,38 @@ ExtensionSystem::IPlugin::ShutdownFlag CppEditorPlugin::aboutToShutdown()
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()
{
if (CPPEditorWidget *editorWidget = currentCppEditorWidget())
if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->switchDeclarationDefinition(/*inNextSplit*/ false);
}
void CppEditorPlugin::openDeclarationDefinitionInNextSplit()
{
if (CPPEditorWidget *editorWidget = currentCppEditorWidget())
if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->switchDeclarationDefinition(/*inNextSplit*/ true);
}
void CppEditorPlugin::renameSymbolUnderCursor()
{
if (CPPEditorWidget *editorWidget = currentCppEditorWidget())
if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->renameSymbolUnderCursor();
}
void CppEditorPlugin::findUsages()
{
if (CPPEditorWidget *editorWidget = currentCppEditorWidget())
if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->findUsages();
}
void CppEditorPlugin::showPreProcessorDialog()
{
if (CPPEditorWidget *editorWidget = currentCppEditorWidget())
if (CppEditorWidget *editorWidget = currentCppEditorWidget())
editorWidget->showPreProcessorWidget();
}
......
......@@ -42,7 +42,7 @@ namespace TextEditor { class BaseTextEditor; }
namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class CppCodeModelInspectorDialog;
class CppQuickFixCollector;
class CppQuickFixAssistProvider;
......@@ -63,7 +63,7 @@ public:
ShutdownFlag aboutToShutdown();
// Connect editor to settings changed signals.
void initializeEditor(CPPEditorWidget *editor);
void initializeEditor(CppEditorWidget *editor);
bool sortedOutline() const;
......
......@@ -63,14 +63,14 @@ TestCase::~TestCase()
bool TestCase::openCppEditor(const QString &fileName,
Internal::CPPEditor **editor,
Internal::CPPEditorWidget **editorWidget)
Internal::CppEditorWidget **editorWidget)
{
using namespace CppEditor::Internal;
if (CPPEditor *e = dynamic_cast<CPPEditor *>(Core::EditorManager::openEditor(fileName))) {
if (editor)
*editor = e;
if (editorWidget) {
if (CPPEditorWidget *w = dynamic_cast<CPPEditorWidget *>(e->editorWidget())) {
if (CppEditorWidget *w = dynamic_cast<CppEditorWidget *>(e->editorWidget())) {
*editorWidget = w;
return true;
} else {
......@@ -85,7 +85,7 @@ bool TestCase::openCppEditor(const QString &fileName,
}
CPlusPlus::Document::Ptr TestCase::waitForRehighlightedSemanticDocument(
Internal::CPPEditorWidget *editorWidget)
Internal::CppEditorWidget *editorWidget)
{
editorWidget->semanticRehighlight(true);
while (editorWidget->semanticInfo().doc.isNull())
......
......@@ -39,7 +39,7 @@ namespace CppEditor {
namespace Internal {
class CPPEditor;
class CPPEditorWidget;
class CppEditorWidget;
namespace Tests {
......@@ -53,7 +53,7 @@ public:
public:
int m_cursorPosition;
Internal::CPPEditor *m_editor;
Internal::CPPEditorWidget *m_editorWidget;
Internal::CppEditorWidget *m_editorWidget;
};
class TestCase : public CppTools::Tests::TestCase
......@@ -64,10 +64,10 @@ public:
static bool openCppEditor(const QString &fileName,
Internal::CPPEditor **editor,
Internal::CPPEditorWidget **editorWidget = 0);
Internal::CppEditorWidget **editorWidget = 0);
static CPlusPlus::Document::Ptr waitForRehighlightedSemanticDocument(
Internal::CPPEditorWidget *editorWidget);
Internal::CppEditorWidget *editorWidget);
};
} // namespace Tests
......
......@@ -301,7 +301,7 @@ CppDeclarableElement::CppDeclarableElement(Symbol *declaration)
}
tooltip = overview.prettyType(declaration->type(), qualifiedName);
link = CPPEditorWidget::linkToSymbol(declaration);
link = CppEditorWidget::linkToSymbol(declaration);
helpMark = name;
}
......
......@@ -50,7 +50,7 @@ namespace CppTools { class CppModelManagerInterface; }
namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class CppElement;
class CppElementEvaluator
......
......@@ -306,8 +306,8 @@ inline LookupItem skipForwardDeclarations(const QList<LookupItem> &resolvedSymbo
return result;
}
CPPEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor,
CPPEditorWidget *, CPlusPlus::Snapshot snapshot, const CPlusPlus::Document::Ptr &document,
CppEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor,
CppEditorWidget *, CPlusPlus::Snapshot snapshot, const CPlusPlus::Document::Ptr &document,
SymbolFinder *symbolFinder)
{
Link result;
......@@ -365,7 +365,7 @@ CPPEditorWidget::Link attemptFuncDeclDef(const QTextCursor &cursor,
}
if (target) {
result = CPPEditorWidget::linkToSymbol(target);
result = CppEditorWidget::linkToSymbol(target);
unsigned startLine, startColumn, endLine, endColumn;
document->translationUnit()->getTokenStartPosition(name->firstToken(), &startLine,
......@@ -396,7 +396,7 @@ Symbol *findDefinition(Symbol *symbol, const Snapshot &snapshot, SymbolFinder *s
} // anonymous namespace
FollowSymbolUnderCursor::FollowSymbolUnderCursor(CPPEditorWidget *widget)
FollowSymbolUnderCursor::FollowSymbolUnderCursor(CppEditorWidget *widget)
: m_widget(widget)
, m_virtualFunctionAssistProvider(new VirtualFunctionAssistProvider)
{
......@@ -592,7 +592,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &
const Macro *macro = doc->findMacroDefinitionAt(line);
if (macro) {
QTextCursor macroCursor = cursor;
const QByteArray name = CPPEditorWidget::identifierUnderCursor(&macroCursor).toUtf8();
const QByteArray name = CppEditorWidget::identifierUnderCursor(&macroCursor).toUtf8();
if (macro->name() == name)
return link; //already on definition!
} else if (const Document::MacroUse *use = doc->findMacroUseAt(endOfToken - 1)) {
......@@ -723,7 +723,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &
// Handle macro uses
QTextCursor macroCursor = cursor;
const QByteArray name = CPPEditorWidget::identifierUnderCursor(&macroCursor).toUtf8();
const QByteArray name = CppEditorWidget::identifierUnderCursor(&macroCursor).toUtf8();
link = findMacroLink(name, documentFromSemanticInfo);
if (link.hasValidTarget()) {
link.linkTextStart = macroCursor.selectionStart();
......
......@@ -43,7 +43,7 @@ namespace CppTools { class SymbolFinder; }
namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class VirtualFunctionAssistProvider;
class FollowSymbolUnderCursor
......@@ -51,7 +51,7 @@ class FollowSymbolUnderCursor
public:
typedef TextEditor::BaseTextEditorWidget::Link Link;
FollowSymbolUnderCursor(CPPEditorWidget *widget);
FollowSymbolUnderCursor(CppEditorWidget *widget);
~FollowSymbolUnderCursor();
Link findLink(const QTextCursor &cursor, bool resolveTarget,
......@@ -63,7 +63,7 @@ public:
void setVirtualFunctionAssistProvider(VirtualFunctionAssistProvider *provider);
private:
CPPEditorWidget *m_widget;
CppEditorWidget *m_widget;
VirtualFunctionAssistProvider *m_virtualFunctionAssistProvider;
};
......
......@@ -287,7 +287,7 @@ static bool namesEqual(const Name *n1, const Name *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;
......@@ -323,7 +323,7 @@ static QList<TextEditor::RefactorMarker> removeMarkersOfType(const QList<TextEdi
return result;
}
void FunctionDeclDefLink::hideMarker(CPPEditorWidget *editor)
void FunctionDeclDefLink::hideMarker(CppEditorWidget *editor)
{
if (!hasMarker)
return;
......@@ -332,7 +332,7 @@ void FunctionDeclDefLink::hideMarker(CPPEditorWidget *editor)
hasMarker = false;
}
void FunctionDeclDefLink::showMarker(CPPEditorWidget *editor)
void FunctionDeclDefLink::showMarker(CppEditorWidget *editor)
{
if (hasMarker)
return;
......
......@@ -43,7 +43,7 @@
namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class FunctionDeclDefLink;
class FunctionDeclDefLinkFinder : public QObject
......@@ -80,9 +80,9 @@ public:
bool isValid() const;
bool isMarkerVisible() const;
void apply(CPPEditorWidget *editor, bool jumpToMatch);
void hideMarker(CPPEditorWidget *editor);
void showMarker(CPPEditorWidget *editor);
void apply(CppEditorWidget *editor, bool jumpToMatch);
void hideMarker(CppEditorWidget *editor);
void showMarker(CppEditorWidget *editor);
Utils::ChangeSet changes(const CPlusPlus::Snapshot &snapshot, int targetOffset = -1);
QTextCursor linkSelection;
......
......@@ -38,7 +38,7 @@ namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class CppHighlighter : public TextEditor::SyntaxHighlighter
{
......
......@@ -67,7 +67,7 @@ public:
void setup(const QString &fileName, const QString &filePath)
{
setText(fileName);
m_link = CPPEditorWidget::Link(filePath);
m_link = CppEditorWidget::Link(filePath);
}
private:
......@@ -82,7 +82,7 @@ private:
Constants::CPPEDITOR_ID);
}
CPPEditorWidget::Link m_link;
CppEditorWidget::Link m_link;
};
// CppIncludeHierarchyWidget
......@@ -138,7 +138,7 @@ void CppIncludeHierarchyWidget::perform()
if (!m_editor)
return;
CPPEditorWidget *widget = qobject_cast<CPPEditorWidget *>(m_editor->widget());
CppEditorWidget *widget = qobject_cast<CppEditorWidget *>(m_editor->widget());
if (!widget)
return;
......
......@@ -55,7 +55,7 @@ namespace CppEditor {
namespace Internal {
class CPPEditor;
class CPPEditorWidget;
class CppEditorWidget;
class CppInclude;
class CppIncludeLabel;
class CppIncludeHierarchyModel;
......@@ -79,7 +79,7 @@ private:
void showNoIncludeHierarchyLabel();
void showIncludeHierarchy();
CPPEditorWidget *m_cppEditor;
CppEditorWidget *m_cppEditor;
CppIncludeHierarchyTreeView *m_treeView;
CppIncludeHierarchyModel *m_model;
Utils::AnnotatedItemDelegate *m_delegate;
......
......@@ -36,16 +36,16 @@
/*!
\class CppEditor::Internal::CppLocalRenaming
\brief A helper class of CPPEditorWidget that implements renaming local usages.
\brief A helper class of CppEditorWidget that implements renaming local usages.
\internal
Local use selections must be first set/updated with updateLocalUseSelections().
Afterwards the local renaming can be started with start(). The CPPEditorWidget
Afterwards the local renaming can be started with start(). The CppEditorWidget
can then delegate work related to the local renaming mode to the handle*
functions.
\sa CppEditor::Internal::CPPEditorWidget
\sa CppEditor::Internal::CppEditorWidget
*/
namespace {
......
......@@ -90,7 +90,7 @@ bool CppOutlineFilterModel::filterAcceptsRow(int sourceRow,
}
CppOutlineWidget::CppOutlineWidget(CPPEditorWidget *editor) :
CppOutlineWidget::CppOutlineWidget(CppEditorWidget *editor) :
TextEditor::IOutlineWidget(),
m_editor(editor),
m_treeView(new CppOutlineTreeView(this)),
......@@ -193,7 +193,7 @@ bool CppOutlineWidgetFactory::supportsEditor(Core::IEditor *editor) const
TextEditor::IOutlineWidget *CppOutlineWidgetFactory::createWidget(Core::IEditor *editor)
{
CPPEditor *cppEditor = qobject_cast<CPPEditor*>(editor);
CPPEditorWidget *cppEditorWidget = qobject_cast<CPPEditorWidget*>(cppEditor->widget());
CppEditorWidget *cppEditorWidget = qobject_cast<CppEditorWidget*>(cppEditor->widget());
QTC_ASSERT(cppEditorWidget, return 0);
CppOutlineWidget *widget = new CppOutlineWidget(cppEditorWidget);
......
......@@ -68,7 +68,7 @@ class CppOutlineWidget : public TextEditor::IOutlineWidget
{
Q_OBJECT
public:
CppOutlineWidget(CPPEditorWidget *editor);
CppOutlineWidget(CppEditorWidget *editor);
// IOutlineWidget
virtual QList<QAction*> filterMenuActions() const;
......@@ -84,7 +84,7 @@ private:
bool syncCursor();
private:
CPPEditorWidget *m_editor;
CppEditorWidget *m_editor;
CppOutlineTreeView *m_treeView;
CPlusPlus::OverviewModel *m_model;
CppOutlineFilterModel *m_proxyModel;
......
......@@ -251,7 +251,7 @@ private:
/// Apply the factory on the source and get back the resultIndex'th result or a null pointer.
QSharedPointer<TextEditor::QuickFixOperation> QuickFixTestCase::getFix(
CppQuickFixFactory *factory, CPPEditorWidget *editorWidget, int resultIndex)
CppQuickFixFactory *factory, CppEditorWidget *editorWidget, int resultIndex)
{
CppQuickFixInterface qfi(new CppQuickFixAssistInterface(editorWidget, ExplicitlyInvoked));
TextEditor::QuickFixOperations results;
......
......@@ -84,7 +84,7 @@ public:
CppQuickFixFactory *factory, const QString &incPath);
private:
QSharedPointer<TextEditor::QuickFixOperation> getFix(CppQuickFixFactory *factory,
CPPEditorWidget *editorWidget,
CppEditorWidget *editorWidget,
int resultIndex = 0);
private:
......
......@@ -84,7 +84,7 @@ const IAssistProvider *CppQuickFixAssistProcessor::provider() const
// --------------------------
// CppQuickFixAssistInterface
// --------------------------
CppQuickFixAssistInterface::CppQuickFixAssistInterface(CPPEditorWidget *editor,
CppQuickFixAssistInterface::CppQuickFixAssistInterface(CppEditorWidget *editor,
TextEditor::AssistReason reason)
: DefaultAssistInterface(editor->document(), editor->position(),
editor->baseTextDocument()->filePath(), reason)
......@@ -119,7 +119,7 @@ const LookupContext &CppQuickFixAssistInterface::context() const
return m_context;
}
CPPEditorWidget *CppQuickFixAssistInterface::editor() const
CppEditorWidget *CppQuickFixAssistInterface::editor() const
{
return m_editor;
}
......
......@@ -47,18 +47,18 @@ typedef QSharedPointer<CppRefactoringFile> CppRefactoringFilePtr;
namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class CppQuickFixAssistInterface : public TextEditor::DefaultAssistInterface
{
public:
CppQuickFixAssistInterface(CPPEditorWidget *editor, TextEditor::AssistReason reason);
CppQuickFixAssistInterface(CppEditorWidget *editor, TextEditor::AssistReason reason);
const QList<CPlusPlus::AST *> &path() const;
CPlusPlus::Snapshot snapshot() const;
CppTools::SemanticInfo semanticInfo() const;
const CPlusPlus::LookupContext &context() const;
CPPEditorWidget *editor() const;
CppEditorWidget *editor() const;
CppTools::CppRefactoringFilePtr currentFile() const;
......@@ -66,7 +66,7 @@ public:
bool isCursorOn(const CPlusPlus::AST *ast) const;
private:
CPPEditorWidget *m_editor;
CppEditorWidget *m_editor;
CppTools::SemanticInfo m_semanticInfo;
CPlusPlus::Snapshot m_snapshot;
CppTools::CppRefactoringFilePtr m_currentFile;
......
......@@ -4091,7 +4091,7 @@ public:
void perform()
{
CPPEditorWidget *editor = assistInterface()->editor();
CppEditorWidget *editor = assistInterface()->editor();
QSharedPointer<FunctionDeclDefLink> link = editor->declDefLink();
if (link == m_link)
editor->applyDeclDefLinkChanges(/*don't jump*/false);
......
......@@ -65,7 +65,7 @@ QStandardItem *itemForClass(const CppClass &cppClass)
item->setData(cppClass.qualifiedName, AnnotationRole);
item->setData(cppClass.icon, Qt::DecorationRole);
QVariant link;
link.setValue(CPPEditorWidget::Link(cppClass.link));
link.setValue(CppEditorWidget::Link(cppClass.link));
item->setData(link, LinkRole);
return item;
}
......@@ -102,7 +102,7 @@ public:
void clear()
{
QLabel::clear();
m_link = CPPEditorWidget::Link();
m_link = CppEditorWidget::Link();
}
private:
......@@ -117,7 +117,7 @@ private:
Constants::CPPEDITOR_ID);
}
CPPEditorWidget::Link m_link;
CppEditorWidget::Link m_link;
};
// CppTypeHierarchyWidget
......@@ -174,7 +174,7 @@ void CppTypeHierarchyWidget::perform()
if (!editor)
return;
CPPEditorWidget *widget = qobject_cast<CPPEditorWidget *>(editor->widget());
CppEditorWidget *widget = qobject_cast<CppEditorWidget *>(editor->widget());
if (!widget)
return;
......
......@@ -56,7 +56,7 @@ class AnnotatedItemDelegate;
namespace CppEditor {
namespace Internal {
class CPPEditorWidget;
class CppEditorWidget;
class CppClass;
class CppClassLabel;
......@@ -81,7 +81,7 @@ private:
void showTypeHierarchy();
void clearTypeHierarchy();
CPPEditorWidget *m_cppEditor;
CppEditorWidget *m_cppEditor;
Utils::NavigationTreeView *m_treeView;
QWidget *m_hierarchyWidget;
QStackedLayout *m_stackLayout;
......