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

Cpp/QmlJSEditor: Add some 'override'

Browse Source 
Change-Id: Ic73f1602922fffa6cb8610e45ada292c759669c5
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2017-12-15 13:32:28 +01:00
parent dabfd1d7ac
commit a137ece13b
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/plugins/cppeditor/cppquickfixes.h
View File

@@ -71,7 +71,7 @@ public:
class AddIncludeForUndefinedIdentifier : public CppQuickFixFactory class AddIncludeForUndefinedIdentifier : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
// Exposed for tests // Exposed for tests
@@ -98,7 +98,7 @@ private:
class FlipLogicalOperands: public CppQuickFixFactory class FlipLogicalOperands: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -112,7 +112,7 @@ public:
class InverseLogicalComparison: public CppQuickFixFactory class InverseLogicalComparison: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -127,7 +127,7 @@ public:
class RewriteLogicalAnd: public CppQuickFixFactory class RewriteLogicalAnd: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
private: private:
ASTMatcher matcher; ASTMatcher matcher;
@@ -147,7 +147,7 @@ private:
class ConvertCStringToNSString: public CppQuickFixFactory class ConvertCStringToNSString: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -172,7 +172,7 @@ public:
class ConvertNumericLiteral: public CppQuickFixFactory class ConvertNumericLiteral: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -191,7 +191,7 @@ public:
class TranslateStringLiteral: public CppQuickFixFactory class TranslateStringLiteral: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -233,7 +233,7 @@ public:
enum Type { TypeString, TypeObjCString, TypeChar, TypeNone }; enum Type { TypeString, TypeObjCString, TypeChar, TypeNone };
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
static QString replacement(unsigned actions); static QString replacement(unsigned actions);
static QByteArray stringToCharEscapeSequences(const QByteArray &content); static QByteArray stringToCharEscapeSequences(const QByteArray &content);
@@ -258,7 +258,7 @@ private:
class ConvertToCamelCase : public CppQuickFixFactory class ConvertToCamelCase : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -274,7 +274,7 @@ public:
class MoveDeclarationOutOfIf: public CppQuickFixFactory class MoveDeclarationOutOfIf: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -290,7 +290,7 @@ public:
class MoveDeclarationOutOfWhile: public CppQuickFixFactory class MoveDeclarationOutOfWhile: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -319,7 +319,7 @@ public:
class SplitIfStatement: public CppQuickFixFactory class SplitIfStatement: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -335,7 +335,7 @@ public:
class SplitSimpleDeclaration: public CppQuickFixFactory class SplitSimpleDeclaration: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
private: private:
static bool checkDeclaration(SimpleDeclarationAST *declaration); static bool checkDeclaration(SimpleDeclarationAST *declaration);
@@ -355,7 +355,7 @@ private:
class AddLocalDeclaration: public CppQuickFixFactory class AddLocalDeclaration: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -374,7 +374,7 @@ public:
class AddBracesToIf: public CppQuickFixFactory class AddBracesToIf: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -386,7 +386,7 @@ public:
class RearrangeParamDeclarationList : public CppQuickFixFactory class RearrangeParamDeclarationList : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -401,7 +401,7 @@ public:
class ReformatPointerDeclaration : public CppQuickFixFactory class ReformatPointerDeclaration : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -410,7 +410,7 @@ public:
class CompleteSwitchCaseStatement: public CppQuickFixFactory class CompleteSwitchCaseStatement: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, QuickFixOperations &result); void match(const CppQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
/*! /*!
@@ -419,7 +419,7 @@ public:
class InsertDeclFromDef: public CppQuickFixFactory class InsertDeclFromDef: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -428,7 +428,7 @@ public:
class InsertDefFromDecl: public CppQuickFixFactory class InsertDefFromDecl: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -440,7 +440,7 @@ public:
typedef std::function<QString ()> FunctionNameGetter; typedef std::function<QString ()> FunctionNameGetter;
ExtractFunction(FunctionNameGetter functionNameGetter = FunctionNameGetter()); ExtractFunction(FunctionNameGetter functionNameGetter = FunctionNameGetter());
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
private: private:
FunctionNameGetter m_functionNameGetter; // For tests to avoid GUI pop-up. FunctionNameGetter m_functionNameGetter; // For tests to avoid GUI pop-up.
@@ -454,7 +454,7 @@ private:
class ExtractLiteralAsParameter : public CppQuickFixFactory class ExtractLiteralAsParameter : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -465,7 +465,7 @@ public:
class ConvertFromAndToPointer : public CppQuickFixFactory class ConvertFromAndToPointer : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -474,7 +474,7 @@ public:
class GenerateGetterSetter : public CppQuickFixFactory class GenerateGetterSetter : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -483,7 +483,7 @@ public:
class InsertQtPropertyMembers : public CppQuickFixFactory class InsertQtPropertyMembers : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -492,7 +492,7 @@ public:
class ConvertQt4Connect : public CppQuickFixFactory class ConvertQt4Connect : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -501,7 +501,7 @@ public:
class ApplyDeclDefLinkChanges: public CppQuickFixFactory class ApplyDeclDefLinkChanges: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -511,7 +511,7 @@ public:
class MoveFuncDefOutside: public CppQuickFixFactory class MoveFuncDefOutside: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -520,7 +520,7 @@ public:
class MoveAllFuncDefOutside: public CppQuickFixFactory class MoveAllFuncDefOutside: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -529,7 +529,7 @@ public:
class MoveFuncDefToDecl: public CppQuickFixFactory class MoveFuncDefToDecl: public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -538,7 +538,7 @@ public:
class AssignToLocalVariable : public CppQuickFixFactory class AssignToLocalVariable : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -548,7 +548,7 @@ public:
class OptimizeForLoop : public CppQuickFixFactory class OptimizeForLoop : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
/*! /*!
@@ -561,7 +561,7 @@ public:
class EscapeStringLiteral : public CppQuickFixFactory class EscapeStringLiteral : public CppQuickFixFactory
{ {
public: public:
void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result); void match(const CppQuickFixInterface &interface, TextEditor::QuickFixOperations &result) override;
}; };
} // namespace Internal } // namespace Internal

2
src/plugins/qmljseditor/qmljscomponentfromobjectdef.h
View File

@@ -32,7 +32,7 @@ namespace QmlJSEditor {
class QMLJSEDITOR_EXPORT ComponentFromObjectDef : public QmlJSQuickFixFactory class QMLJSEDITOR_EXPORT ComponentFromObjectDef : public QmlJSQuickFixFactory
{ {
public: public:
void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result); void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) override;
static void perform(const QString &fileName, QmlJS::AST::UiObjectDefinition *objDef); static void perform(const QString &fileName, QmlJS::AST::UiObjectDefinition *objDef);
}; };

4
src/plugins/qmljseditor/qmljsquickfixes.cpp
View File

@@ -59,7 +59,7 @@ namespace {
*/ */
class SplitInitializerOp: public QmlJSQuickFixFactory class SplitInitializerOp: public QmlJSQuickFixFactory
{ {
void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) override
{ {
UiObjectInitializer *objectInitializer = 0; UiObjectInitializer *objectInitializer = 0;
@@ -129,7 +129,7 @@ class AddAnalysisMessageSuppressionComment: public QmlJSQuickFixFactory
{ {
Q_DECLARE_TR_FUNCTIONS(QmlJSEditor::AddAnalysisMessageSuppressionComment) Q_DECLARE_TR_FUNCTIONS(QmlJSEditor::AddAnalysisMessageSuppressionComment)
public: public:
void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) override
{ {
const QList<StaticAnalysis::Message> &messages = interface->semanticInfo().staticAnalysisMessages; const QList<StaticAnalysis::Message> &messages = interface->semanticInfo().staticAnalysisMessages;

2
src/plugins/qmljseditor/qmljswrapinloader.h
View File

@@ -32,7 +32,7 @@ namespace Internal {
class WrapInLoader: public QmlJSQuickFixFactory class WrapInLoader: public QmlJSQuickFixFactory
{ {
void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result); void match(const QmlJSQuickFixInterface &interface, QuickFixOperations &result) override;
}; };
} // namespace Internal } // namespace Internal