From 5a7916d26e6df2f712e14d2ded9ba21c697c4142 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Mon, 19 May 2014 16:54:57 -0400 Subject: [PATCH] CppEditor: Clean up CppEditor/CppEditorWidget * Excess includes and forward declarations * Access protection levels * QTC_OVERRIDE * Remove declared but not implemented/used functions. * Remove unused class Change-Id: Ia19ddddccd9adde827a7875b466fde5ca4d96e7d Reviewed-by: Erik Verbruggen --- src/plugins/cppeditor/cppeditor.cpp | 41 +--------- src/plugins/cppeditor/cppeditor.h | 78 ++++++++----------- src/plugins/cppeditor/cppeditorplugin.cpp | 1 + .../cppeditor/cppfunctiondecldeflink.cpp | 1 + 4 files changed, 37 insertions(+), 84 deletions(-) diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 97d0a26c1a3..9c33eeef834 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -72,12 +72,10 @@ #include #include -#include #include #include #include #include -#include #include #include #include @@ -120,46 +118,9 @@ private: CPlusPlus::OverviewModel *m_sourceModel; }; -class FindFunctionDefinitions: protected SymbolVisitor +class CanonicalSymbol { - const Name *_declarationName; - QList *_functions; - public: - FindFunctionDefinitions() - : _declarationName(0), - _functions(0) - { } - - void operator()(const Name *declarationName, Scope *globals, - QList *functions) - { - _declarationName = declarationName; - _functions = functions; - - for (unsigned i = 0; i < globals->memberCount(); ++i) { - accept(globals->memberAt(i)); - } - } - -protected: - using SymbolVisitor::visit; - - virtual bool visit(Function *function) - { - const Name *name = function->name(); - if (const QualifiedNameId *q = name->asQualifiedNameId()) - name = q->name(); - - if (_declarationName->match(name)) - _functions->append(function); - - return false; - } -}; - -struct CanonicalSymbol -{ CPPEditorWidget *editor; TypeOfExpression typeOfExpression; SemanticInfo info; diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index bb97042eb68..1a4eec0c99e 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -36,19 +36,14 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include QT_BEGIN_NAMESPACE -class QComboBox; class QSortFilterProxyModel; class QToolButton; QT_END_NAMESPACE @@ -58,13 +53,6 @@ class OverviewModel; class Symbol; } -namespace CppTools { -class CppCodeStyleSettings; -class CppModelManagerInterface; -class CppRefactoringFile; -} - -namespace TextEditor { class FontSettings; } namespace Utils { class TreeViewComboBox; } namespace CppEditor { @@ -97,12 +85,14 @@ class CPPEditor : public TextEditor::BaseTextEditor public: CPPEditor(CPPEditorWidget *); - Core::IEditor *duplicate(); + Core::IEditor *duplicate() QTC_OVERRIDE; - bool open(QString *errorString, const QString &fileName, const QString &realFileName); + bool open(QString *errorString, + const QString &fileName, + const QString &realFileName) QTC_OVERRIDE; - const Utils::CommentDefinition *commentDefinition() const; - TextEditor::CompletionAssistProvider *completionAssistProvider(); + const Utils::CommentDefinition *commentDefinition() const QTC_OVERRIDE; + TextEditor::CompletionAssistProvider *completionAssistProvider() QTC_OVERRIDE; private: Utils::CommentDefinition m_commentDefinition; @@ -113,44 +103,39 @@ class CPPEditorWidget : public TextEditor::BaseTextEditorWidget Q_OBJECT public: - typedef TextEditor::TabSettings TabSettings; + static Link linkToSymbol(CPlusPlus::Symbol *symbol); + static QString identifierUnderCursor(QTextCursor *macroCursor); +public: CPPEditorWidget(QWidget *parent = 0); CPPEditorWidget(CPPEditorWidget *other); ~CPPEditorWidget(); CPPEditorDocument *cppEditorDocument() const; - void unCommentSelection(); - - unsigned editorRevision() const; - bool isOutdated() const; CppTools::SemanticInfo semanticInfo() const; CPlusPlus::OverviewModel *outlineModel() const; QModelIndex outlineModelIndex(); - virtual void paste(); // reimplemented from BaseTextEditorWidget - virtual void cut(); // reimplemented from BaseTextEditorWidget - virtual void selectAll(); // reimplemented from BaseTextEditorWidget - - bool openLink(const Link &link, bool inNextSplit) { return openCppEditorAt(link, inNextSplit); } - - static Link linkToSymbol(CPlusPlus::Symbol *symbol); - static QString identifierUnderCursor(QTextCursor *macroCursor); - - virtual TextEditor::IAssistInterface *createAssistInterface(TextEditor::AssistKind kind, - TextEditor::AssistReason reason) const; - QSharedPointer declDefLink() const; void applyDeclDefLinkChanges(bool jumpToMatch); + TextEditor::IAssistInterface *createAssistInterface( + TextEditor::AssistKind kind, + TextEditor::AssistReason reason) const QTC_OVERRIDE; + FollowSymbolUnderCursor *followSymbolUnderCursorDelegate(); // exposed for tests signals: void outlineModelIndexChanged(const QModelIndex &index); public slots: + void paste() QTC_OVERRIDE; + void cut() QTC_OVERRIDE; + void selectAll() QTC_OVERRIDE; + + void unCommentSelection() QTC_OVERRIDE; void setSortedOutline(bool sort); void switchDeclarationDefinition(bool inNextSplit); void renameSymbolUnderCursor(); @@ -163,17 +148,20 @@ public slots: unsigned revision); protected: - bool event(QEvent *e); - void contextMenuEvent(QContextMenuEvent *); - void keyPressEvent(QKeyEvent *e); + bool event(QEvent *e) QTC_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *) QTC_OVERRIDE; + void keyPressEvent(QKeyEvent *e) QTC_OVERRIDE; - void applyFontSettings(); - TextEditor::BaseTextEditor *createEditor(); + void applyFontSettings() QTC_OVERRIDE; + TextEditor::BaseTextEditor *createEditor() QTC_OVERRIDE; + + bool openLink(const Link &link, bool inNextSplit) QTC_OVERRIDE + { return openCppEditorAt(link, inNextSplit); } const CPlusPlus::Macro *findCanonicalMacro(const QTextCursor &cursor, CPlusPlus::Document::Ptr doc) const; protected slots: - void slotCodeStyleSettingsChanged(const QVariant &); + void slotCodeStyleSettingsChanged(const QVariant &) QTC_OVERRIDE; private slots: void jumpToOutlineElement(); @@ -206,12 +194,13 @@ private slots: private: CPPEditorWidget(TextEditor::BaseTextEditorWidget *); // avoid stupidity void ctor(); + + unsigned editorRevision() const; + bool isOutdated() const; + void markSymbols(const QTextCursor &tc, const CppTools::SemanticInfo &info); bool sortedOutline() const; - TextEditor::ITextEditor *openCppEditorAt(const QString &fileName, int line, - int column = 0); - void highlightUses(const QList &uses, QList *selections); @@ -223,7 +212,8 @@ private: Q_SLOT void abortDeclDefLink(); - Link findLinkAt(const QTextCursor &, bool resolveTarget = true, bool inNextSplit = false); + Link findLinkAt(const QTextCursor &, bool resolveTarget = true, + bool inNextSplit = false) QTC_OVERRIDE; bool openCppEditorAt(const Link &, bool inNextSplit = false); QModelIndex indexForPosition(int line, int column, diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index c8edf8a5e2c..d8202e5bfd0 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -53,6 +53,7 @@ #include #include #include +#include #include #include diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp index 9fa4bc030a0..fef082bac8d 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include