feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppTools: Use override consistently

Browse Source 
clang-tidy fixes from modernize-use-override check.

Change-Id: I0e6d6a9df3e87b8042ccc5ea0adc70070a3821d6
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Tobias Hunger
2018-05-07 15:06:32 +02:00
parent f531f76d04
commit 91c19ab19d
21 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/abstracteditorsupport.h
View File

@@ -38,7 +38,7 @@ class CPPTOOLS_EXPORT AbstractEditorSupport : public QObject
Q_OBJECT
public:
explicit AbstractEditorSupport(CppModelManager *modelmanager, QObject *parent = 0);
~AbstractEditorSupport();
~AbstractEditorSupport() override;
/// \returns the contents, encoded as UTF-8
virtual QByteArray contents() const = 0;

2
src/plugins/cpptools/baseeditordocumentparser.h
View File

@@ -72,7 +72,7 @@ public:
public:
BaseEditorDocumentParser(const QString &filePath);
virtual ~BaseEditorDocumentParser();
~BaseEditorDocumentParser() override;
QString filePath() const;
Configuration configuration() const;

2
src/plugins/cpptools/baseeditordocumentprocessor.h
View File

@@ -67,7 +67,7 @@ class CPPTOOLS_EXPORT BaseEditorDocumentProcessor : public QObject
public:
BaseEditorDocumentProcessor(QTextDocument *textDocument, const QString &filePath);
virtual ~BaseEditorDocumentProcessor();
~BaseEditorDocumentProcessor() override;
void run(bool projectsUpdated = false);
virtual void semanticRehighlight() = 0;

2
src/plugins/cpptools/builtineditordocumentprocessor.h
View File

@@ -40,7 +40,7 @@ class CPPTOOLS_EXPORT BuiltinEditorDocumentProcessor : public BaseEditorDocument
public:
BuiltinEditorDocumentProcessor(TextEditor::TextDocument *document,
bool enableSemanticHighlighter = true);
~BuiltinEditorDocumentProcessor();
~BuiltinEditorDocumentProcessor() override;
// BaseEditorDocumentProcessor interface
void runImpl(const BaseEditorDocumentParser::UpdateParams &updateParams) override;

2
src/plugins/cpptools/clangdiagnosticconfigswidget.h
View File

@@ -58,7 +58,7 @@ public:
const ClangDiagnosticConfigsModel &diagnosticConfigsModel = ClangDiagnosticConfigsModel(),
const Core::Id &configToSelect = Core::Id(),
QWidget *parent = 0);
~ClangDiagnosticConfigsWidget();
~ClangDiagnosticConfigsWidget() override;
Core::Id currentConfigId() const;
ClangDiagnosticConfigs customConfigs() const;

64
src/plugins/cpptools/cppchecksymbols.h
View File

@@ -45,12 +45,12 @@ class CPPTOOLS_EXPORT CheckSymbols:
{
Q_OBJECT
public:
virtual ~CheckSymbols();
~CheckSymbols() override;
typedef TextEditor::HighlightingResult Result;
typedef SemanticHighlighter::Kind Kind;
virtual void run();
void run() override;
typedef QFuture<Result> Future;
@@ -141,44 +141,44 @@ protected:
CPlusPlus::FunctionDefinitionAST *enclosingFunctionDefinition(bool skipTopOfStack = false) const;
CPlusPlus::TemplateDeclarationAST *enclosingTemplateDeclaration() const;
virtual bool preVisit(CPlusPlus::AST *);
virtual void postVisit(CPlusPlus::AST *);
bool preVisit(CPlusPlus::AST *) override;
void postVisit(CPlusPlus::AST *) override;
virtual bool visit(CPlusPlus::NamespaceAST *);
virtual bool visit(CPlusPlus::UsingDirectiveAST *);
virtual bool visit(CPlusPlus::SimpleDeclarationAST *);
virtual bool visit(CPlusPlus::TypenameTypeParameterAST *ast);
virtual bool visit(CPlusPlus::TemplateTypeParameterAST *ast);
virtual bool visit(CPlusPlus::FunctionDefinitionAST *ast);
virtual bool visit(CPlusPlus::ParameterDeclarationAST *ast);
bool visit(CPlusPlus::NamespaceAST *) override;
bool visit(CPlusPlus::UsingDirectiveAST *) override;
bool visit(CPlusPlus::SimpleDeclarationAST *) override;
bool visit(CPlusPlus::TypenameTypeParameterAST *ast) override;
bool visit(CPlusPlus::TemplateTypeParameterAST *ast) override;
bool visit(CPlusPlus::FunctionDefinitionAST *ast) override;
bool visit(CPlusPlus::ParameterDeclarationAST *ast) override;
virtual bool visit(CPlusPlus::ElaboratedTypeSpecifierAST *ast);
bool visit(CPlusPlus::ElaboratedTypeSpecifierAST *ast) override;
virtual bool visit(CPlusPlus::ObjCProtocolDeclarationAST *ast);
virtual bool visit(CPlusPlus::ObjCProtocolForwardDeclarationAST *ast);
virtual bool visit(CPlusPlus::ObjCClassDeclarationAST *ast);
virtual bool visit(CPlusPlus::ObjCClassForwardDeclarationAST *ast);
virtual bool visit(CPlusPlus::ObjCProtocolRefsAST *ast);
bool visit(CPlusPlus::ObjCProtocolDeclarationAST *ast) override;
bool visit(CPlusPlus::ObjCProtocolForwardDeclarationAST *ast) override;
bool visit(CPlusPlus::ObjCClassDeclarationAST *ast) override;
bool visit(CPlusPlus::ObjCClassForwardDeclarationAST *ast) override;
bool visit(CPlusPlus::ObjCProtocolRefsAST *ast) override;
virtual bool visit(CPlusPlus::SimpleNameAST *ast);
virtual bool visit(CPlusPlus::DestructorNameAST *ast);
virtual bool visit(CPlusPlus::QualifiedNameAST *ast);
virtual bool visit(CPlusPlus::TemplateIdAST *ast);
bool visit(CPlusPlus::SimpleNameAST *ast) override;
bool visit(CPlusPlus::DestructorNameAST *ast) override;
bool visit(CPlusPlus::QualifiedNameAST *ast) override;
bool visit(CPlusPlus::TemplateIdAST *ast) override;
virtual bool visit(CPlusPlus::MemberAccessAST *ast);
virtual bool visit(CPlusPlus::CallAST *ast);
virtual bool visit(CPlusPlus::ObjCSelectorArgumentAST *ast);
virtual bool visit(CPlusPlus::NewExpressionAST *ast);
bool visit(CPlusPlus::MemberAccessAST *ast) override;
bool visit(CPlusPlus::CallAST *ast) override;
bool visit(CPlusPlus::ObjCSelectorArgumentAST *ast) override;
bool visit(CPlusPlus::NewExpressionAST *ast) override;
virtual bool visit(CPlusPlus::GotoStatementAST *ast);
virtual bool visit(CPlusPlus::LabeledStatementAST *ast);
virtual bool visit(CPlusPlus::SimpleSpecifierAST *ast);
virtual bool visit(CPlusPlus::ClassSpecifierAST *ast);
bool visit(CPlusPlus::GotoStatementAST *ast) override;
bool visit(CPlusPlus::LabeledStatementAST *ast) override;
bool visit(CPlusPlus::SimpleSpecifierAST *ast) override;
bool visit(CPlusPlus::ClassSpecifierAST *ast) override;
virtual bool visit(CPlusPlus::MemInitializerAST *ast);
virtual bool visit(CPlusPlus::EnumeratorAST *ast);
bool visit(CPlusPlus::MemInitializerAST *ast) override;
bool visit(CPlusPlus::EnumeratorAST *ast) override;
virtual bool visit(CPlusPlus::DotDesignatorAST *ast);
bool visit(CPlusPlus::DotDesignatorAST *ast) override;
CPlusPlus::NameAST *declaratorId(CPlusPlus::DeclaratorAST *ast) const;

2
src/plugins/cpptools/cppclassesfilter.h
View File

@@ -39,7 +39,7 @@ class CPPTOOLS_EXPORT CppClassesFilter : public Internal::CppLocatorFilter
public:
CppClassesFilter(CppLocatorData *locatorData);
~CppClassesFilter();
~CppClassesFilter() override;
protected:
IndexItem::ItemType matchTypes() const override { return IndexItem::Class; }

12
src/plugins/cpptools/cppcodeformatter.h
View File

@@ -260,14 +260,14 @@ public:
void setCodeStyleSettings(const CppCodeStyleSettings &settings);
protected:
virtual void onEnter(int newState, int *indentDepth, int *savedIndentDepth, int *paddingDepth, int *savedPaddingDepth) const;
virtual void adjustIndent(const CPlusPlus::Tokens &tokens, int lexerState, int *indentDepth, int *paddingDepth) const;
void onEnter(int newState, int *indentDepth, int *savedIndentDepth, int *paddingDepth, int *savedPaddingDepth) const override;
void adjustIndent(const CPlusPlus::Tokens &tokens, int lexerState, int *indentDepth, int *paddingDepth) const override;
virtual void saveBlockData(QTextBlock *block, const BlockData &data) const;
virtual bool loadBlockData(const QTextBlock &block, BlockData *data) const;
void saveBlockData(QTextBlock *block, const BlockData &data) const override;
bool loadBlockData(const QTextBlock &block, BlockData *data) const override;
virtual void saveLexerState(QTextBlock *block, int state) const;
virtual int loadLexerState(const QTextBlock &block) const;
void saveLexerState(QTextBlock *block, int state) const override;
int loadLexerState(const QTextBlock &block) const override;
static bool shouldClearPaddingOnEnter(int state);

10
src/plugins/cpptools/cppcodestylepreferences.h
View File

@@ -39,16 +39,16 @@ public:
explicit CppCodeStylePreferences(
QObject *parent = 0);
virtual QVariant value() const;
virtual void setValue(const QVariant &);
QVariant value() const override;
void setValue(const QVariant &) override;
CppCodeStyleSettings codeStyleSettings() const;
// tracks parent hierarchy until currentParentSettings is null
CppCodeStyleSettings currentCodeStyleSettings() const;
virtual void toMap(const QString &prefix, QVariantMap *map) const;
virtual void fromMap(const QString &prefix, const QVariantMap &map);
void toMap(const QString &prefix, QVariantMap *map) const override;
void fromMap(const QString &prefix, const QVariantMap &map) override;
public slots:
void setCodeStyleSettings(const CppTools::CppCodeStyleSettings &data);
@@ -58,7 +58,7 @@ signals:
void currentCodeStyleSettingsChanged(const CppTools::CppCodeStyleSettings &);
protected:
virtual QString settingsSuffix() const;
QString settingsSuffix() const override;
private:
void slotCurrentValueChanged(const QVariant &);

2
src/plugins/cpptools/cppindexingsupport.h
View File

@@ -68,7 +68,7 @@ public:
public:
SymbolSearcher(QObject *parent = 0);
virtual ~SymbolSearcher() = 0;
~SymbolSearcher() override = 0;
virtual void runSearch(QFutureInterface<Core::SearchResultItem> &future) = 0;
};

2
src/plugins/cpptools/cpplocatorfilter.h
View File

@@ -39,7 +39,7 @@ class CppLocatorFilter : public Core::ILocatorFilter
public:
CppLocatorFilter(CppLocatorData *locatorData);
~CppLocatorFilter();
~CppLocatorFilter() override;
QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future,
const QString &entry) override;

4
src/plugins/cpptools/cppmodelmanager.h
View File

@@ -91,7 +91,7 @@ public:
public:
CppModelManager();
~CppModelManager();
~CppModelManager() override;
static CppModelManager *instance();
static void createCppModelManager(Internal::CppToolsPlugin *parent);
@@ -130,7 +130,7 @@ public:
/// all loaded projects.
ProjectPart::Ptr fallbackProjectPart();
CPlusPlus::Snapshot snapshot() const;
CPlusPlus::Snapshot snapshot() const override;
Document::Ptr document(const QString &fileName) const;
bool replaceDocument(Document::Ptr newDoc);

14
src/plugins/cpptools/cpppointerdeclarationformatter.h
View File

@@ -89,13 +89,13 @@ public:
}
protected:
bool visit(SimpleDeclarationAST *ast);
bool visit(FunctionDefinitionAST *ast);
bool visit(ParameterDeclarationAST *ast);
bool visit(IfStatementAST *ast);
bool visit(WhileStatementAST *ast);
bool visit(ForStatementAST *ast);
bool visit(ForeachStatementAST *ast);
bool visit(SimpleDeclarationAST *ast) override;
bool visit(FunctionDefinitionAST *ast) override;
bool visit(ParameterDeclarationAST *ast) override;
bool visit(IfStatementAST *ast) override;
bool visit(WhileStatementAST *ast) override;
bool visit(ForStatementAST *ast) override;
bool visit(ForeachStatementAST *ast) override;
private:
class TokenRange {

2
src/plugins/cpptools/cppprojectupdater.h
View File

@@ -44,7 +44,7 @@ class CPPTOOLS_EXPORT CppProjectUpdater : public QObject
public:
CppProjectUpdater(ProjectExplorer::Project *project);
~CppProjectUpdater();
~CppProjectUpdater() override;
void update(const ProjectUpdateInfo &projectUpdateInfo);
void cancel();

2
src/plugins/cpptools/cpprefactoringchanges.h
View File

@@ -72,7 +72,7 @@ protected:
CppRefactoringFile(TextEditor::TextEditorWidget *editor);
CppRefactoringChangesData *data() const;
virtual void fileChanged();
void fileChanged() override;
mutable CPlusPlus::Document::Ptr m_cppDocument;

2
src/plugins/cpptools/cppsemanticinfoupdater.h
View File

@@ -40,7 +40,7 @@ class SemanticInfoUpdater : public QObject
public:
explicit SemanticInfoUpdater();
~SemanticInfoUpdater();
~SemanticInfoUpdater() override;
SemanticInfo semanticInfo() const;

2
src/plugins/cpptools/cpptoolssettings.h
View File

@@ -51,7 +51,7 @@ class CPPTOOLS_EXPORT CppToolsSettings : public QObject
public:
explicit CppToolsSettings(QObject *parent);
~CppToolsSettings();
~CppToolsSettings() override;
static CppToolsSettings *instance();

2
src/plugins/cpptools/cppvirtualfunctionproposalitem.h
View File

@@ -37,7 +37,7 @@ class CPPTOOLS_EXPORT VirtualFunctionProposalItem final : public TextEditor::Ass
public:
VirtualFunctionProposalItem(const Utils::Link &link,
bool openInSplit = true);
~VirtualFunctionProposalItem() Q_DECL_NOEXCEPT {}
~VirtualFunctionProposalItem() Q_DECL_NOEXCEPT override {}
void apply(TextEditor::TextDocumentManipulatorInterface &manipulator,
int basePosition) const override;
Utils::Link link() const { return m_link; } // Exposed for tests

6
src/plugins/cpptools/generatedcodemodelsupport.h
View File

@@ -49,11 +49,11 @@ public:
GeneratedCodeModelSupport(CppModelManager *modelmanager,
ProjectExplorer::ExtraCompiler *generator,
const Utils::FileName &generatedFile);
~GeneratedCodeModelSupport();
~GeneratedCodeModelSupport() override;
/// \returns the contents encoded in UTF-8.
QByteArray contents() const;
QString fileName() const; // The generated file
QByteArray contents() const override;
QString fileName() const override; // The generated file
static void update(const QList<ProjectExplorer::ExtraCompiler *> &generators);

44
src/plugins/cpptools/searchsymbols.h
View File

@@ -60,30 +60,30 @@ protected:
void accept(CPlusPlus::Symbol *symbol)
{ CPlusPlus::Symbol::visitSymbol(symbol, this); }
virtual bool visit(CPlusPlus::UsingNamespaceDirective *);
virtual bool visit(CPlusPlus::UsingDeclaration *);
virtual bool visit(CPlusPlus::NamespaceAlias *);
virtual bool visit(CPlusPlus::Declaration *);
virtual bool visit(CPlusPlus::Argument *);
virtual bool visit(CPlusPlus::TypenameArgument *);
virtual bool visit(CPlusPlus::BaseClass *);
virtual bool visit(CPlusPlus::Enum *);
virtual bool visit(CPlusPlus::Function *);
virtual bool visit(CPlusPlus::Namespace *);
virtual bool visit(CPlusPlus::Template *);
virtual bool visit(CPlusPlus::Class *);
virtual bool visit(CPlusPlus::Block *);
virtual bool visit(CPlusPlus::ForwardClassDeclaration *);
bool visit(CPlusPlus::UsingNamespaceDirective *) override;
bool visit(CPlusPlus::UsingDeclaration *) override;
bool visit(CPlusPlus::NamespaceAlias *) override;
bool visit(CPlusPlus::Declaration *) override;
bool visit(CPlusPlus::Argument *) override;
bool visit(CPlusPlus::TypenameArgument *) override;
bool visit(CPlusPlus::BaseClass *) override;
bool visit(CPlusPlus::Enum *) override;
bool visit(CPlusPlus::Function *) override;
bool visit(CPlusPlus::Namespace *) override;
bool visit(CPlusPlus::Template *) override;
bool visit(CPlusPlus::Class *) override;
bool visit(CPlusPlus::Block *) override;
bool visit(CPlusPlus::ForwardClassDeclaration *) override;
// Objective-C
virtual bool visit(CPlusPlus::ObjCBaseClass *);
virtual bool visit(CPlusPlus::ObjCBaseProtocol *);
virtual bool visit(CPlusPlus::ObjCClass *symbol);
virtual bool visit(CPlusPlus::ObjCForwardClassDeclaration *);
virtual bool visit(CPlusPlus::ObjCProtocol *symbol);
virtual bool visit(CPlusPlus::ObjCForwardProtocolDeclaration *);
virtual bool visit(CPlusPlus::ObjCMethod *symbol);
virtual bool visit(CPlusPlus::ObjCPropertyDeclaration *symbol);
bool visit(CPlusPlus::ObjCBaseClass *) override;
bool visit(CPlusPlus::ObjCBaseProtocol *) override;
bool visit(CPlusPlus::ObjCClass *symbol) override;
bool visit(CPlusPlus::ObjCForwardClassDeclaration *) override;
bool visit(CPlusPlus::ObjCProtocol *symbol) override;
bool visit(CPlusPlus::ObjCForwardProtocolDeclaration *) override;
bool visit(CPlusPlus::ObjCMethod *symbol) override;
bool visit(CPlusPlus::ObjCPropertyDeclaration *symbol) override;
QString scopedSymbolName(const QString &symbolName, const CPlusPlus::Symbol *symbol) const;
QString scopedSymbolName(const CPlusPlus::Symbol *symbol) const;

2
src/plugins/cpptools/semantichighlighter.h
View File

@@ -65,7 +65,7 @@ public:
public:
explicit SemanticHighlighter(TextEditor::TextDocument *baseTextDocument);
~SemanticHighlighter();
~SemanticHighlighter() override;
void setHighlightingRunner(HighlightingRunner highlightingRunner);
void updateFormatMapFromFontSettings();