diff --git a/src/libs/qmljs/jsoncheck.h b/src/libs/qmljs/jsoncheck.h
index 5bef0ad9d4f1ddc385992da44801050893e3e3e2..c4a010e105d8d1019ce6a04d6f865f4f9124ed31 100644
--- a/src/libs/qmljs/jsoncheck.h
+++ b/src/libs/qmljs/jsoncheck.h
@@ -37,7 +37,6 @@
#include <qmljs/qmljsstaticanalysismessage.h>
#include <utils/json.h>
-#include <utils/qtcoverride.h>
#include <QStack>
#include <QList>
@@ -54,16 +53,16 @@ public:
QList<StaticAnalysis::Message> operator()(Utils::JsonSchema *schema);
private:
- bool preVisit(AST::Node *) QTC_OVERRIDE;
- void postVisit(AST::Node *) QTC_OVERRIDE;
-
- bool visit(AST::ObjectLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::ArrayLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::NullExpression *ast) QTC_OVERRIDE;
- bool visit(AST::TrueLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::FalseLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::NumericLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::StringLiteral *ast) QTC_OVERRIDE;
+ bool preVisit(AST::Node *) Q_DECL_OVERRIDE;
+ void postVisit(AST::Node *) Q_DECL_OVERRIDE;
+
+ bool visit(AST::ObjectLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ArrayLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NullExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::TrueLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FalseLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NumericLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::StringLiteral *ast) Q_DECL_OVERRIDE;
struct AnalysisData
{
diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h
index 7a453f3da3d884f3bf433cd490067810a1b6ed7c..790a341369a87525316f0180f6eb239ec6a6db27 100644
--- a/src/libs/qmljs/qmljsbind.h
+++ b/src/libs/qmljs/qmljsbind.h
@@ -32,7 +32,6 @@
#include <qmljs/parser/qmljsastvisitor_p.h>
#include <qmljs/qmljsvalueowner.h>
-#include <utils/qtcoverride.h>
#include <QHash>
#include <QCoreApplication>
@@ -69,21 +68,21 @@ protected:
void accept(AST::Node *node);
- bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
- bool visit(AST::Program *ast) QTC_OVERRIDE;
+ bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Program *ast) Q_DECL_OVERRIDE;
// Ui
- bool visit(AST::UiImport *ast) QTC_OVERRIDE;
- bool visit(AST::UiPublicMember *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectDefinition *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectBinding *ast) QTC_OVERRIDE;
- bool visit(AST::UiScriptBinding *ast) QTC_OVERRIDE;
- bool visit(AST::UiArrayBinding *ast) QTC_OVERRIDE;
+ bool visit(AST::UiImport *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE;
// QML/JS
- bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
- bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
- bool visit(AST::VariableDeclaration *ast) QTC_OVERRIDE;
+ bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::VariableDeclaration *ast) Q_DECL_OVERRIDE;
ObjectValue *switchObjectValue(ObjectValue *newObjectValue);
ObjectValue *bindObject(AST::UiQualifiedId *qualifiedTypeNameId, AST::UiObjectInitializer *initializer);
diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h
index 00fa9c36fb083b259031e18626c83eb4f56a63f6..a4e3798152510f66eed32d21f116a798bc2da933 100644
--- a/src/libs/qmljs/qmljscheck.h
+++ b/src/libs/qmljs/qmljscheck.h
@@ -34,7 +34,6 @@
#include <qmljs/qmljsscopechain.h>
#include <qmljs/qmljsstaticanalysismessage.h>
#include <qmljs/parser/qmljsastvisitor_p.h>
-#include <utils/qtcoverride.h>
#include <QCoreApplication>
#include <QSet>
@@ -61,43 +60,43 @@ public:
void disableMessage(StaticAnalysis::Type type);
protected:
- bool preVisit(AST::Node *ast) QTC_OVERRIDE;
- void postVisit(AST::Node *ast) QTC_OVERRIDE;
-
- bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectDefinition *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectBinding *ast) QTC_OVERRIDE;
- bool visit(AST::UiScriptBinding *ast) QTC_OVERRIDE;
- bool visit(AST::UiArrayBinding *ast) QTC_OVERRIDE;
- bool visit(AST::UiPublicMember *ast) QTC_OVERRIDE;
- bool visit(AST::IdentifierExpression *ast) QTC_OVERRIDE;
- bool visit(AST::FieldMemberExpression *ast) QTC_OVERRIDE;
- bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
- bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectInitializer *) QTC_OVERRIDE;
-
- bool visit(AST::BinaryExpression *ast) QTC_OVERRIDE;
- bool visit(AST::Block *ast) QTC_OVERRIDE;
- bool visit(AST::WithStatement *ast) QTC_OVERRIDE;
- bool visit(AST::VoidExpression *ast) QTC_OVERRIDE;
- bool visit(AST::Expression *ast) QTC_OVERRIDE;
- bool visit(AST::ExpressionStatement *ast) QTC_OVERRIDE;
- bool visit(AST::IfStatement *ast) QTC_OVERRIDE;
- bool visit(AST::ForStatement *ast) QTC_OVERRIDE;
- bool visit(AST::LocalForStatement *ast) QTC_OVERRIDE;
- bool visit(AST::WhileStatement *ast) QTC_OVERRIDE;
- bool visit(AST::DoWhileStatement *ast) QTC_OVERRIDE;
- bool visit(AST::CaseBlock *ast) QTC_OVERRIDE;
- bool visit(AST::NewExpression *ast) QTC_OVERRIDE;
- bool visit(AST::NewMemberExpression *ast) QTC_OVERRIDE;
- bool visit(AST::CallExpression *ast) QTC_OVERRIDE;
- bool visit(AST::StatementList *ast) QTC_OVERRIDE;
- bool visit(AST::ReturnStatement *ast) QTC_OVERRIDE;
- bool visit(AST::ThrowStatement *ast) QTC_OVERRIDE;
- bool visit(AST::DeleteExpression *ast) QTC_OVERRIDE;
- bool visit(AST::TypeOfExpression *ast) QTC_OVERRIDE;
-
- void endVisit(QmlJS::AST::UiObjectInitializer *) QTC_OVERRIDE;
+ bool preVisit(AST::Node *ast) Q_DECL_OVERRIDE;
+ void postVisit(AST::Node *ast) Q_DECL_OVERRIDE;
+
+ bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::IdentifierExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FieldMemberExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectInitializer *) Q_DECL_OVERRIDE;
+
+ bool visit(AST::BinaryExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Block *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::WithStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::VoidExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Expression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ExpressionStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::IfStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ForStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::LocalForStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::WhileStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::DoWhileStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::CaseBlock *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NewExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NewMemberExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::CallExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::StatementList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ReturnStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ThrowStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::DeleteExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::TypeOfExpression *ast) Q_DECL_OVERRIDE;
+
+ void endVisit(QmlJS::AST::UiObjectInitializer *) Q_DECL_OVERRIDE;
private:
void visitQmlObject(AST::Node *ast, AST::UiQualifiedId *typeId,
diff --git a/src/libs/qmljs/qmljscodeformatter.h b/src/libs/qmljs/qmljscodeformatter.h
index 0652e5f0c2bbad9acec866cf797ea085e5065ee8..5764ebe98c44999313a33ac53b7fb46a5cb7cbd9 100644
--- a/src/libs/qmljs/qmljscodeformatter.h
+++ b/src/libs/qmljs/qmljscodeformatter.h
@@ -34,7 +34,6 @@
#include "qmljsscanner.h"
-#include <utils/qtcoverride.h>
#include <QStack>
#include <QList>
#include <QVector>
@@ -324,8 +323,8 @@ public:
void setIndentSize(int size);
protected:
- void onEnter(int newState, int *indentDepth, int *savedIndentDepth) const QTC_OVERRIDE;
- void adjustIndent(const QList<QmlJS::Token> &tokens, int lexerState, int *indentDepth) const QTC_OVERRIDE;
+ void onEnter(int newState, int *indentDepth, int *savedIndentDepth) const Q_DECL_OVERRIDE;
+ void adjustIndent(const QList<QmlJS::Token> &tokens, int lexerState, int *indentDepth) const Q_DECL_OVERRIDE;
private:
int m_indentSize;
diff --git a/src/libs/qmljs/qmljsdescribevalue.cpp b/src/libs/qmljs/qmljsdescribevalue.cpp
index 9213646a843412a260bc41501e45d54a9ef03390..572c056a8af89a4a785bb75616274a0060543aee 100644
--- a/src/libs/qmljs/qmljsdescribevalue.cpp
+++ b/src/libs/qmljs/qmljsdescribevalue.cpp
@@ -187,7 +187,7 @@ public:
return true;
}
- bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) QTC_OVERRIDE
+ bool processProperty(const QString &name, const Value *value, const PropertyInfo &pInfo) Q_DECL_OVERRIDE
{
d.dumpNewline();
d.dump(name);
@@ -200,19 +200,19 @@ public:
d.closeContext("");
return true;
}
- bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE
+ bool processEnumerator(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
return dump(name, value);
}
- bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE
+ bool processSignal(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
return dump(name, value);
}
- bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE
+ bool processSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
return dump(name, value);
}
- bool processGeneratedSlot(const QString &name, const Value *value) QTC_OVERRIDE
+ bool processGeneratedSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
return dump(name, value);
}
diff --git a/src/libs/qmljs/qmljsdescribevalue.h b/src/libs/qmljs/qmljsdescribevalue.h
index 9707f303b46d74f669d811834a15ec15f9b9a17e..2f6e14fad184a12b17cf6e8ab1b03f9c4beff2c9 100644
--- a/src/libs/qmljs/qmljsdescribevalue.h
+++ b/src/libs/qmljs/qmljsdescribevalue.h
@@ -48,17 +48,17 @@ public:
virtual ~DescribeValueVisitor();
QString operator()(const Value *value);
- void visit(const NullValue *) QTC_OVERRIDE;
- void visit(const UndefinedValue *) QTC_OVERRIDE;
- void visit(const UnknownValue *) QTC_OVERRIDE;
- void visit(const NumberValue *) QTC_OVERRIDE;
- void visit(const BooleanValue *) QTC_OVERRIDE;
- void visit(const StringValue *) QTC_OVERRIDE;
- void visit(const ObjectValue *) QTC_OVERRIDE;
- void visit(const FunctionValue *) QTC_OVERRIDE;
- void visit(const Reference *) QTC_OVERRIDE;
- void visit(const ColorValue *) QTC_OVERRIDE;
- void visit(const AnchorLineValue *) QTC_OVERRIDE;
+ void visit(const NullValue *) Q_DECL_OVERRIDE;
+ void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
+ void visit(const UnknownValue *) Q_DECL_OVERRIDE;
+ void visit(const NumberValue *) Q_DECL_OVERRIDE;
+ void visit(const BooleanValue *) Q_DECL_OVERRIDE;
+ void visit(const StringValue *) Q_DECL_OVERRIDE;
+ void visit(const ObjectValue *) Q_DECL_OVERRIDE;
+ void visit(const FunctionValue *) Q_DECL_OVERRIDE;
+ void visit(const Reference *) Q_DECL_OVERRIDE;
+ void visit(const ColorValue *) Q_DECL_OVERRIDE;
+ void visit(const AnchorLineValue *) Q_DECL_OVERRIDE;
QString description() const;
void basicDump(const char *baseName, const Value *value, bool opensContext);
void dumpNewline();
diff --git a/src/libs/qmljs/qmljsevaluate.h b/src/libs/qmljs/qmljsevaluate.h
index 4b73c94d3e1d01279c8260fa2310bd750cc9d1ac..247aacea577d7109a7c2909f43787a161a08e0aa 100644
--- a/src/libs/qmljs/qmljsevaluate.h
+++ b/src/libs/qmljs/qmljsevaluate.h
@@ -34,7 +34,6 @@
#include "qmljsdocument.h"
#include "qmljsscopechain.h"
-#include <utils/qtcoverride.h>
namespace QmlJS {
@@ -65,99 +64,99 @@ protected:
const Value *switchResult(const Value *result);
// Ui
- bool visit(AST::UiProgram *ast) QTC_OVERRIDE;
- bool visit(AST::UiHeaderItemList *ast) QTC_OVERRIDE;
- bool visit(AST::UiQualifiedPragmaId *ast) QTC_OVERRIDE;
- bool visit(AST::UiPragma *ast) QTC_OVERRIDE;
- bool visit(AST::UiImport *ast) QTC_OVERRIDE;
- bool visit(AST::UiPublicMember *ast) QTC_OVERRIDE;
- bool visit(AST::UiSourceElement *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectDefinition *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectInitializer *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectBinding *ast) QTC_OVERRIDE;
- bool visit(AST::UiScriptBinding *ast) QTC_OVERRIDE;
- bool visit(AST::UiArrayBinding *ast) QTC_OVERRIDE;
- bool visit(AST::UiObjectMemberList *ast) QTC_OVERRIDE;
- bool visit(AST::UiArrayMemberList *ast) QTC_OVERRIDE;
- bool visit(AST::UiQualifiedId *ast) QTC_OVERRIDE;
+ bool visit(AST::UiProgram *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiHeaderItemList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiQualifiedPragmaId *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiPragma *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiImport *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiPublicMember *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiSourceElement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectDefinition *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectInitializer *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectBinding *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiScriptBinding *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiArrayBinding *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectMemberList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiArrayMemberList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UiQualifiedId *ast) Q_DECL_OVERRIDE;
// QmlJS
- bool visit(AST::ThisExpression *ast) QTC_OVERRIDE;
- bool visit(AST::IdentifierExpression *ast) QTC_OVERRIDE;
- bool visit(AST::NullExpression *ast) QTC_OVERRIDE;
- bool visit(AST::TrueLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::FalseLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::StringLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::NumericLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::RegExpLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::ArrayLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::ObjectLiteral *ast) QTC_OVERRIDE;
- bool visit(AST::ElementList *ast) QTC_OVERRIDE;
- bool visit(AST::Elision *ast) QTC_OVERRIDE;
- bool visit(AST::PropertyAssignmentList *ast) QTC_OVERRIDE;
- bool visit(AST::PropertyGetterSetter *ast) QTC_OVERRIDE;
- bool visit(AST::PropertyNameAndValue *ast) QTC_OVERRIDE;
- bool visit(AST::NestedExpression *ast) QTC_OVERRIDE;
- bool visit(AST::IdentifierPropertyName *ast) QTC_OVERRIDE;
- bool visit(AST::StringLiteralPropertyName *ast) QTC_OVERRIDE;
- bool visit(AST::NumericLiteralPropertyName *ast) QTC_OVERRIDE;
- bool visit(AST::ArrayMemberExpression *ast) QTC_OVERRIDE;
- bool visit(AST::FieldMemberExpression *ast) QTC_OVERRIDE;
- bool visit(AST::NewMemberExpression *ast) QTC_OVERRIDE;
- bool visit(AST::NewExpression *ast) QTC_OVERRIDE;
- bool visit(AST::CallExpression *ast) QTC_OVERRIDE;
- bool visit(AST::ArgumentList *ast) QTC_OVERRIDE;
- bool visit(AST::PostIncrementExpression *ast) QTC_OVERRIDE;
- bool visit(AST::PostDecrementExpression *ast) QTC_OVERRIDE;
- bool visit(AST::DeleteExpression *ast) QTC_OVERRIDE;
- bool visit(AST::VoidExpression *ast) QTC_OVERRIDE;
- bool visit(AST::TypeOfExpression *ast) QTC_OVERRIDE;
- bool visit(AST::PreIncrementExpression *ast) QTC_OVERRIDE;
- bool visit(AST::PreDecrementExpression *ast) QTC_OVERRIDE;
- bool visit(AST::UnaryPlusExpression *ast) QTC_OVERRIDE;
- bool visit(AST::UnaryMinusExpression *ast) QTC_OVERRIDE;
- bool visit(AST::TildeExpression *ast) QTC_OVERRIDE;
- bool visit(AST::NotExpression *ast) QTC_OVERRIDE;
- bool visit(AST::BinaryExpression *ast) QTC_OVERRIDE;
- bool visit(AST::ConditionalExpression *ast) QTC_OVERRIDE;
- bool visit(AST::Expression *ast) QTC_OVERRIDE;
- bool visit(AST::Block *ast) QTC_OVERRIDE;
- bool visit(AST::StatementList *ast) QTC_OVERRIDE;
- bool visit(AST::VariableStatement *ast) QTC_OVERRIDE;
- bool visit(AST::VariableDeclarationList *ast) QTC_OVERRIDE;
- bool visit(AST::VariableDeclaration *ast) QTC_OVERRIDE;
- bool visit(AST::EmptyStatement *ast) QTC_OVERRIDE;
- bool visit(AST::ExpressionStatement *ast) QTC_OVERRIDE;
- bool visit(AST::IfStatement *ast) QTC_OVERRIDE;
- bool visit(AST::DoWhileStatement *ast) QTC_OVERRIDE;
- bool visit(AST::WhileStatement *ast) QTC_OVERRIDE;
- bool visit(AST::ForStatement *ast) QTC_OVERRIDE;
- bool visit(AST::LocalForStatement *ast) QTC_OVERRIDE;
- bool visit(AST::ForEachStatement *ast) QTC_OVERRIDE;
- bool visit(AST::LocalForEachStatement *ast) QTC_OVERRIDE;
- bool visit(AST::ContinueStatement *ast) QTC_OVERRIDE;
- bool visit(AST::BreakStatement *ast) QTC_OVERRIDE;
- bool visit(AST::ReturnStatement *ast) QTC_OVERRIDE;
- bool visit(AST::WithStatement *ast) QTC_OVERRIDE;
- bool visit(AST::SwitchStatement *ast) QTC_OVERRIDE;
- bool visit(AST::CaseBlock *ast) QTC_OVERRIDE;
- bool visit(AST::CaseClauses *ast) QTC_OVERRIDE;
- bool visit(AST::CaseClause *ast) QTC_OVERRIDE;
- bool visit(AST::DefaultClause *ast) QTC_OVERRIDE;
- bool visit(AST::LabelledStatement *ast) QTC_OVERRIDE;
- bool visit(AST::ThrowStatement *ast) QTC_OVERRIDE;
- bool visit(AST::TryStatement *ast) QTC_OVERRIDE;
- bool visit(AST::Catch *ast) QTC_OVERRIDE;
- bool visit(AST::Finally *ast) QTC_OVERRIDE;
- bool visit(AST::FunctionDeclaration *ast) QTC_OVERRIDE;
- bool visit(AST::FunctionExpression *ast) QTC_OVERRIDE;
- bool visit(AST::FormalParameterList *ast) QTC_OVERRIDE;
- bool visit(AST::FunctionBody *ast) QTC_OVERRIDE;
- bool visit(AST::Program *ast) QTC_OVERRIDE;
- bool visit(AST::SourceElements *ast) QTC_OVERRIDE;
- bool visit(AST::FunctionSourceElement *ast) QTC_OVERRIDE;
- bool visit(AST::StatementSourceElement *ast) QTC_OVERRIDE;
- bool visit(AST::DebuggerStatement *ast) QTC_OVERRIDE;
+ bool visit(AST::ThisExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::IdentifierExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NullExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::TrueLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FalseLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::StringLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NumericLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::RegExpLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ArrayLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ObjectLiteral *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ElementList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Elision *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::PropertyAssignmentList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::PropertyGetterSetter *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::PropertyNameAndValue *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NestedExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::IdentifierPropertyName *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::StringLiteralPropertyName *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NumericLiteralPropertyName *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ArrayMemberExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FieldMemberExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NewMemberExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NewExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::CallExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ArgumentList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::PostIncrementExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::PostDecrementExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::DeleteExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::VoidExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::TypeOfExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::PreIncrementExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::PreDecrementExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UnaryPlusExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::UnaryMinusExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::TildeExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::NotExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::BinaryExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ConditionalExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Expression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Block *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::StatementList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::VariableStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::VariableDeclarationList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::VariableDeclaration *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::EmptyStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ExpressionStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::IfStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::DoWhileStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::WhileStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ForStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::LocalForStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ForEachStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::LocalForEachStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ContinueStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::BreakStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ReturnStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::WithStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::SwitchStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::CaseBlock *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::CaseClauses *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::CaseClause *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::DefaultClause *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::LabelledStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::ThrowStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::TryStatement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Catch *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Finally *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionDeclaration *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionExpression *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FormalParameterList *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionBody *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::Program *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::SourceElements *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionSourceElement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::StatementSourceElement *ast) Q_DECL_OVERRIDE;
+ bool visit(AST::DebuggerStatement *ast) Q_DECL_OVERRIDE;
private:
QmlJS::Document::Ptr _doc;
diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h
index cabd0df9af95ab77c24c9551650a860d53a02c09..47b28fba4c2c62bbd14f3f49abc71c96dd96d84d 100644
--- a/src/libs/qmljs/qmljsimportdependencies.h
+++ b/src/libs/qmljs/qmljsimportdependencies.h
@@ -34,7 +34,6 @@
#include "qmljsdialect.h"
#include <languageutils/componentversion.h>
-#include <utils/qtcoverride.h>
#include <QObject>
#include <QString>
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 405a2f7a71f4e7a93579f46161badb9ee22e7174..ab082185724f83f80a435c83ad8412832fea05bc 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -34,7 +34,6 @@
#include <qmljs/qmljsconstants.h>
#include <qmljs/qmljsdocument.h>
#include <qmljs/qmljsimportdependencies.h>
-#include <utils/qtcoverride.h>
#include <QFileInfoList>
#include <QHash>
@@ -331,61 +330,61 @@ template <> Q_INLINE_TEMPLATE const ASTSignal *value_cast(const Value *v)
class QMLJS_EXPORT NullValue: public Value
{
public:
- const NullValue *asNullValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+ const NullValue *asNullValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT UndefinedValue: public Value
{
public:
- const UndefinedValue *asUndefinedValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+ const UndefinedValue *asUndefinedValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT UnknownValue: public Value
{
public:
- const UnknownValue *asUnknownValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *) const QTC_OVERRIDE;
+ const UnknownValue *asUnknownValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT NumberValue: public Value
{
public:
- const NumberValue *asNumberValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+ const NumberValue *asNumberValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT RealValue: public NumberValue
{
public:
- const RealValue *asRealValue() const QTC_OVERRIDE;
+ const RealValue *asRealValue() const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT IntValue: public NumberValue
{
public:
- const IntValue *asIntValue() const QTC_OVERRIDE;
+ const IntValue *asIntValue() const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT BooleanValue: public Value
{
public:
- const BooleanValue *asBooleanValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+ const BooleanValue *asBooleanValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT StringValue: public Value
{
public:
- const StringValue *asStringValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+ const StringValue *asStringValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT UrlValue: public StringValue
{
public:
- const UrlValue *asUrlValue() const QTC_OVERRIDE;
+ const UrlValue *asUrlValue() const Q_DECL_OVERRIDE;
};
class PropertyInfo {
@@ -453,8 +452,8 @@ public:
ValueOwner *valueOwner() const;
// Value interface
- const Reference *asReference() const QTC_OVERRIDE;
- void accept(ValueVisitor *) const QTC_OVERRIDE;
+ const Reference *asReference() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
private:
virtual const Value *value(ReferenceContext *referenceContext) const;
@@ -467,16 +466,16 @@ class QMLJS_EXPORT ColorValue: public Value
{
public:
// Value interface
- const ColorValue *asColorValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *) const QTC_OVERRIDE;
+ const ColorValue *asColorValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT AnchorLineValue: public Value
{
public:
// Value interface
- const AnchorLineValue *asAnchorLineValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *) const QTC_OVERRIDE;
+ const AnchorLineValue *asAnchorLineValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT PropertyData {
@@ -523,8 +522,8 @@ public:
{ return lookupMember(name, context.data(), foundInObject, examinePrototypes); }
// Value interface
- const ObjectValue *asObjectValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+ const ObjectValue *asObjectValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
QString originId() const
{ return m_originId; }
@@ -576,7 +575,7 @@ public:
QmlEnumValue(const CppComponentValue *owner, int index);
~QmlEnumValue();
- const QmlEnumValue *asQmlEnumValue() const QTC_OVERRIDE;
+ const QmlEnumValue *asQmlEnumValue() const Q_DECL_OVERRIDE;
QString name() const;
QStringList keys() const;
@@ -599,9 +598,9 @@ public:
ValueOwner *valueOwner, const QString &originId);
~CppComponentValue();
- const CppComponentValue *asCppComponentValue() const QTC_OVERRIDE;
+ const CppComponentValue *asCppComponentValue() const Q_DECL_OVERRIDE;
- void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
+ void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
const Value *valueForCppName(const QString &typeName) const;
using ObjectValue::prototype;
@@ -670,8 +669,8 @@ public:
virtual const Value *argument(int index) const;
// Value interface
- const FunctionValue *asFunctionValue() const QTC_OVERRIDE;
- void accept(ValueVisitor *visitor) const QTC_OVERRIDE;
+ const FunctionValue *asFunctionValue() const Q_DECL_OVERRIDE;
+ void accept(ValueVisitor *visitor) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT Function: public FunctionValue
@@ -686,13 +685,13 @@ public:
void setOptionalNamedArgumentCount(int count);
// FunctionValue interface
- const Value *returnValue() const QTC_OVERRIDE;
- int namedArgumentCount() const QTC_OVERRIDE;
- int optionalNamedArgumentCount() const QTC_OVERRIDE;
- const Value *argument(int index) const QTC_OVERRIDE;
- QString argumentName(int index) const QTC_OVERRIDE;
- bool isVariadic() const QTC_OVERRIDE;
- const Function *asFunction() const QTC_OVERRIDE;
+ const Value *returnValue() const Q_DECL_OVERRIDE;
+ int namedArgumentCount() const Q_DECL_OVERRIDE;
+ int optionalNamedArgumentCount() const Q_DECL_OVERRIDE;
+ const Value *argument(int index) const Q_DECL_OVERRIDE;
+ QString argumentName(int index) const Q_DECL_OVERRIDE;
+ bool isVariadic() const Q_DECL_OVERRIDE;
+ const Function *asFunction() const Q_DECL_OVERRIDE;
private:
ValueList m_arguments;
@@ -784,13 +783,13 @@ public:
protected:
const Value *switchResult(const Value *value);
- void visit(const NullValue *) QTC_OVERRIDE;
- void visit(const UndefinedValue *) QTC_OVERRIDE;
- void visit(const NumberValue *) QTC_OVERRIDE;
- void visit(const BooleanValue *) QTC_OVERRIDE;
- void visit(const StringValue *) QTC_OVERRIDE;
- void visit(const ObjectValue *) QTC_OVERRIDE;
- void visit(const FunctionValue *) QTC_OVERRIDE;
+ void visit(const NullValue *) Q_DECL_OVERRIDE;
+ void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
+ void visit(const NumberValue *) Q_DECL_OVERRIDE;
+ void visit(const BooleanValue *) Q_DECL_OVERRIDE;
+ void visit(const StringValue *) Q_DECL_OVERRIDE;
+ void visit(const ObjectValue *) Q_DECL_OVERRIDE;
+ void visit(const FunctionValue *) Q_DECL_OVERRIDE;
private:
ValueOwner *m_valueOwner;
@@ -807,13 +806,13 @@ public:
protected:
const Value *switchResult(const Value *value);
- void visit(const NullValue *) QTC_OVERRIDE;
- void visit(const UndefinedValue *) QTC_OVERRIDE;
- void visit(const NumberValue *) QTC_OVERRIDE;
- void visit(const BooleanValue *) QTC_OVERRIDE;
- void visit(const StringValue *) QTC_OVERRIDE;
- void visit(const ObjectValue *) QTC_OVERRIDE;
- void visit(const FunctionValue *) QTC_OVERRIDE;
+ void visit(const NullValue *) Q_DECL_OVERRIDE;
+ void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
+ void visit(const NumberValue *) Q_DECL_OVERRIDE;
+ void visit(const BooleanValue *) Q_DECL_OVERRIDE;
+ void visit(const StringValue *) Q_DECL_OVERRIDE;
+ void visit(const ObjectValue *) Q_DECL_OVERRIDE;
+ void visit(const FunctionValue *) Q_DECL_OVERRIDE;
private:
ValueOwner *m_valueOwner;
@@ -830,13 +829,13 @@ public:
protected:
const Value *switchResult(const Value *value);
- void visit(const NullValue *) QTC_OVERRIDE;
- void visit(const UndefinedValue *) QTC_OVERRIDE;
- void visit(const NumberValue *) QTC_OVERRIDE;
- void visit(const BooleanValue *) QTC_OVERRIDE;
- void visit(const StringValue *) QTC_OVERRIDE;
- void visit(const ObjectValue *) QTC_OVERRIDE;
- void visit(const FunctionValue *) QTC_OVERRIDE;
+ void visit(const NullValue *) Q_DECL_OVERRIDE;
+ void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
+ void visit(const NumberValue *) Q_DECL_OVERRIDE;
+ void visit(const BooleanValue *) Q_DECL_OVERRIDE;
+ void visit(const StringValue *) Q_DECL_OVERRIDE;
+ void visit(const ObjectValue *) Q_DECL_OVERRIDE;
+ void visit(const FunctionValue *) Q_DECL_OVERRIDE;
private:
ValueOwner *m_valueOwner;
@@ -851,15 +850,15 @@ public:
QString operator()(const Value *value);
protected:
- void visit(const NullValue *) QTC_OVERRIDE;
- void visit(const UndefinedValue *) QTC_OVERRIDE;
- void visit(const NumberValue *) QTC_OVERRIDE;
- void visit(const BooleanValue *) QTC_OVERRIDE;
- void visit(const StringValue *) QTC_OVERRIDE;
- void visit(const ObjectValue *object) QTC_OVERRIDE;
- void visit(const FunctionValue *object) QTC_OVERRIDE;
- void visit(const ColorValue *) QTC_OVERRIDE;
- void visit(const AnchorLineValue *) QTC_OVERRIDE;
+ void visit(const NullValue *) Q_DECL_OVERRIDE;
+ void visit(const UndefinedValue *) Q_DECL_OVERRIDE;
+ void visit(const NumberValue *) Q_DECL_OVERRIDE;
+ void visit(const BooleanValue *) Q_DECL_OVERRIDE;
+ void visit(const StringValue *) Q_DECL_OVERRIDE;
+ void visit(const ObjectValue *object) Q_DECL_OVERRIDE;
+ void visit(const FunctionValue *object) Q_DECL_OVERRIDE;
+ void visit(const ColorValue *) Q_DECL_OVERRIDE;
+ void visit(const AnchorLineValue *) Q_DECL_OVERRIDE;
};
// internal
@@ -869,12 +868,12 @@ public:
QmlPrototypeReference(AST::UiQualifiedId *qmlTypeName, const Document *doc, ValueOwner *valueOwner);
~QmlPrototypeReference();
- const QmlPrototypeReference *asQmlPrototypeReference() const QTC_OVERRIDE;
+ const QmlPrototypeReference *asQmlPrototypeReference() const Q_DECL_OVERRIDE;
AST::UiQualifiedId *qmlTypeName() const;
private:
- const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
+ const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
AST::UiQualifiedId *m_qmlTypeName;
const Document *m_doc;
@@ -888,11 +887,11 @@ class QMLJS_EXPORT ASTVariableReference: public Reference
public:
ASTVariableReference(AST::VariableDeclaration *ast, const Document *doc, ValueOwner *valueOwner);
~ASTVariableReference();
- const ASTVariableReference *asAstVariableReference() const QTC_OVERRIDE;
+ const ASTVariableReference *asAstVariableReference() const Q_DECL_OVERRIDE;
const AST::VariableDeclaration *ast() const;
private:
- const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
- bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
+ const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
+ bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT ASTFunctionValue: public FunctionValue
@@ -908,12 +907,12 @@ public:
AST::FunctionExpression *ast() const;
- int namedArgumentCount() const QTC_OVERRIDE;
- QString argumentName(int index) const QTC_OVERRIDE;
- bool isVariadic() const QTC_OVERRIDE;
- const ASTFunctionValue *asAstFunctionValue() const QTC_OVERRIDE;
+ int namedArgumentCount() const Q_DECL_OVERRIDE;
+ QString argumentName(int index) const Q_DECL_OVERRIDE;
+ bool isVariadic() const Q_DECL_OVERRIDE;
+ const ASTFunctionValue *asAstFunctionValue() const Q_DECL_OVERRIDE;
- bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
+ bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT ASTPropertyReference: public Reference
@@ -926,15 +925,15 @@ public:
ASTPropertyReference(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
~ASTPropertyReference();
- const ASTPropertyReference *asAstPropertyReference() const QTC_OVERRIDE;
+ const ASTPropertyReference *asAstPropertyReference() const Q_DECL_OVERRIDE;
AST::UiPublicMember *ast() const { return m_ast; }
QString onChangedSlotName() const { return m_onChangedSlotName; }
- bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
+ bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
private:
- const Value *value(ReferenceContext *referenceContext) const QTC_OVERRIDE;
+ const Value *value(ReferenceContext *referenceContext) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT ASTSignal: public FunctionValue
@@ -948,19 +947,19 @@ public:
ASTSignal(AST::UiPublicMember *ast, const Document *doc, ValueOwner *valueOwner);
~ASTSignal();
- const ASTSignal *asAstSignal() const QTC_OVERRIDE;
+ const ASTSignal *asAstSignal() const Q_DECL_OVERRIDE;
AST::UiPublicMember *ast() const { return m_ast; }
QString slotName() const { return m_slotName; }
const ObjectValue *bodyScope() const { return m_bodyScope; }
// FunctionValue interface
- int namedArgumentCount() const QTC_OVERRIDE;
- const Value *argument(int index) const QTC_OVERRIDE;
- QString argumentName(int index) const QTC_OVERRIDE;
+ int namedArgumentCount() const Q_DECL_OVERRIDE;
+ const Value *argument(int index) const Q_DECL_OVERRIDE;
+ QString argumentName(int index) const Q_DECL_OVERRIDE;
// Value interface
- bool getSourceLocation(QString *fileName, int *line, int *column) const QTC_OVERRIDE;
+ bool getSourceLocation(QString *fileName, int *line, int *column) const Q_DECL_OVERRIDE;
};
class QMLJS_EXPORT ASTObjectValue: public ObjectValue
@@ -979,10 +978,10 @@ public:
ValueOwner *valueOwner);
~ASTObjectValue();
- const ASTObjectValue *asAstObjectValue() const QTC_OVERRIDE;
+ const ASTObjectValue *asAstObjectValue() const Q_DECL_OVERRIDE;
bool getSourceLocation(QString *fileName, int *line, int *column) const;
- void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
+ void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
QString defaultPropertyName() const;
@@ -1056,8 +1055,8 @@ public:
virtual const Value *lookupMember(const QString &name, const Context *context,
const ObjectValue **foundInObject = 0,
bool examinePrototypes = true) const;
- void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
- const TypeScope *asTypeScope() const QTC_OVERRIDE;
+ void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
+ const TypeScope *asTypeScope() const Q_DECL_OVERRIDE;
private:
const Imports *m_imports;
};
@@ -1070,8 +1069,8 @@ public:
virtual const Value *lookupMember(const QString &name, const Context *context,
const ObjectValue **foundInObject = 0,
bool examinePrototypes = true) const;
- void processMembers(MemberProcessor *processor) const QTC_OVERRIDE;
- const JSImportScope *asJSImportScope() const QTC_OVERRIDE;
+ void processMembers(MemberProcessor *processor) const Q_DECL_OVERRIDE;
+ const JSImportScope *asJSImportScope() const Q_DECL_OVERRIDE;
private:
const Imports *m_imports;
};
diff --git a/src/libs/qmljs/qmljsscopeastpath.h b/src/libs/qmljs/qmljsscopeastpath.h
index bb190c5fa5607f9c1ef05167a6ef521c172b8aea..5688cd63c6134f209ed9ef87f07b05fed476e17a 100644
--- a/src/libs/qmljs/qmljsscopeastpath.h
+++ b/src/libs/qmljs/qmljsscopeastpath.h
@@ -33,7 +33,6 @@
#include "qmljs_global.h"
#include "parser/qmljsastvisitor_p.h"
#include "qmljsdocument.h"
-#include <utils/qtcoverride.h>
namespace QmlJS {
@@ -49,13 +48,13 @@ protected:
using Visitor::visit;
- bool preVisit(AST::Node *node) QTC_OVERRIDE;
- bool visit(AST::UiPublicMember *node) QTC_OVERRIDE;
- bool visit(AST::UiScriptBinding *node) QTC_OVERRIDE;
- bool visit(AST::UiObjectDefinition *node) QTC_OVERRIDE;
- bool visit(AST::UiObjectBinding *node) QTC_OVERRIDE;
- bool visit(AST::FunctionDeclaration *node) QTC_OVERRIDE;
- bool visit(AST::FunctionExpression *node) QTC_OVERRIDE;
+ bool preVisit(AST::Node *node) Q_DECL_OVERRIDE;
+ bool visit(AST::UiPublicMember *node) Q_DECL_OVERRIDE;
+ bool visit(AST::UiScriptBinding *node) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectDefinition *node) Q_DECL_OVERRIDE;
+ bool visit(AST::UiObjectBinding *node) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionDeclaration *node) Q_DECL_OVERRIDE;
+ bool visit(AST::FunctionExpression *node) Q_DECL_OVERRIDE;
private:
bool containsOffset(AST::SourceLocation start, AST::SourceLocation end);
diff --git a/src/libs/qmljs/qmljssimplereader.h b/src/libs/qmljs/qmljssimplereader.h
index c7ee391543a328e7d38b72929f2aa6d1af0e9849..3a68ad832355a702e74903a2ee076921e5f78f89 100644
--- a/src/libs/qmljs/qmljssimplereader.h
+++ b/src/libs/qmljs/qmljssimplereader.h
@@ -33,7 +33,6 @@
#include <qmljs/qmljs_global.h>
#include <qmljs/parser/qmljsastfwd_p.h>
-#include <utils/qtcoverride.h>
#include <QHash>
#include <QList>
@@ -122,9 +121,9 @@ public:
SimpleReaderNode::Ptr readFromSource(const QString &source);
protected:
- void elementStart(const QString &name) QTC_OVERRIDE;
- void elementEnd() QTC_OVERRIDE;
- void propertyDefinition(const QString &name, const QVariant &value) QTC_OVERRIDE;
+ void elementStart(const QString &name) Q_DECL_OVERRIDE;
+ void elementEnd() Q_DECL_OVERRIDE;
+ void propertyDefinition(const QString &name, const QVariant &value) Q_DECL_OVERRIDE;
private:
SimpleReaderNode::Ptr m_rootNode;
diff --git a/src/libs/qmljs/qmljsvalueowner.cpp b/src/libs/qmljs/qmljsvalueowner.cpp
index 41cd4b2121054fb845dbfcfd99679a639f730ff0..ffd6bbf45ffb7ddcf2fbe5ca2adfbdf4266b91ce 100644
--- a/src/libs/qmljs/qmljsvalueowner.cpp
+++ b/src/libs/qmljs/qmljsvalueowner.cpp
@@ -53,7 +53,7 @@ public:
QtObjectPrototypeReference(ValueOwner *owner)
: Reference(owner)
{}
- const QtObjectPrototypeReference *asQtObjectPrototypeReference() const QTC_OVERRIDE
+ const QtObjectPrototypeReference *asQtObjectPrototypeReference() const Q_DECL_OVERRIDE
{
return this;
}
diff --git a/src/libs/utils/qtcoverride.h b/src/libs/utils/qtcoverride.h
deleted file mode 100644
index d0cfb3f8e46b5f7ecd2fb4c54980f89214e5baa3..0000000000000000000000000000000000000000
--- a/src/libs/utils/qtcoverride.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef QTC_OVERRIDE_H
-#define QTC_OVERRIDE_H
-
-#include <qglobal.h>
-
-#ifdef Q_DECL_OVERRIDE
-#define QTC_OVERRIDE Q_DECL_OVERRIDE
-#else
-#define QTC_OVERRIDE
-#endif
-
-#endif // QTC_OVERRIDE_H
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index 60045d2f54654ebdf4a2b6f649eb5aeaef1fce89..4647b5f1cceaa8768bb8d3b3996363037c06bf5f 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -176,7 +176,6 @@ HEADERS += \
$$PWD/tooltip/reuse.h \
$$PWD/tooltip/effects.h \
$$PWD/unixutils.h \
- $$PWD/qtcoverride.h \
$$PWD/ansiescapecodehandler.h \
$$PWD/execmenu.h \
$$PWD/completinglineedit.h \
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.h b/src/plugins/beautifier/artisticstyle/artisticstyle.h
index 4217172fd43e60fec8dce34361463931e984f807..abda7807d48bc14cf996fa034088af5de4359eb0 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.h
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.h
@@ -32,7 +32,6 @@
#include "../beautifierabstracttool.h"
-#include <utils/qtcoverride.h>
QT_FORWARD_DECLARE_CLASS(QAction)
@@ -52,9 +51,9 @@ class ArtisticStyle : public BeautifierAbstractTool
public:
explicit ArtisticStyle(BeautifierPlugin *parent = 0);
virtual ~ArtisticStyle();
- bool initialize() QTC_OVERRIDE;
- void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
- QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+ bool initialize() Q_DECL_OVERRIDE;
+ void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
+ QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
private slots:
void formatFile();
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h
index 95ee9be84d60688d57a6ffd8028705020328b10e..24c5264957bc41e7705777e3d6aaa04bbd98d04e 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h
+++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h
@@ -31,7 +31,6 @@
#define BEAUTIFIER_ARTISTICSTYLEOPTIONSPAGE_H
#include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
#include <QPointer>
#include <QWidget>
@@ -65,9 +64,9 @@ class ArtisticStyleOptionsPage : public Core::IOptionsPage
public:
explicit ArtisticStyleOptionsPage(ArtisticStyleSettings *settings, QObject *parent = 0);
- QWidget *widget() QTC_OVERRIDE;
- void apply() QTC_OVERRIDE;
- void finish() QTC_OVERRIDE;
+ QWidget *widget() Q_DECL_OVERRIDE;
+ void apply() Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
private:
QPointer<ArtisticStyleOptionsPageWidget> m_widget;
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
index bd6b6fbf21d5a316ebb10cbc3aae1830dd54766d..594128dd9b2ca220e6bea41c69c07096c27be1b1 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
@@ -32,7 +32,6 @@
#include "../abstractsettings.h"
-#include <utils/qtcoverride.h>
#include <QFuture>
#include <QFutureWatcher>
@@ -52,7 +51,7 @@ public:
ArtisticStyleSettings();
- void updateVersion() QTC_OVERRIDE;
+ void updateVersion() Q_DECL_OVERRIDE;
bool useOtherFiles() const;
void setUseOtherFiles(bool useOtherFiles);
@@ -66,8 +65,8 @@ public:
QString customStyle() const;
void setCustomStyle(const QString &customStyle);
- QString documentationFilePath() const QTC_OVERRIDE;
- void createDocumentationFile() const QTC_OVERRIDE;
+ QString documentationFilePath() const Q_DECL_OVERRIDE;
+ void createDocumentationFile() const Q_DECL_OVERRIDE;
private slots:
void helperSetVersion();
diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h
index fb241ebd6844d5ff457dfb064f72100ed9bdc795..cfbaf69869e22217f2dd9ae4ae70f2c066f2f4ee 100644
--- a/src/plugins/beautifier/beautifierplugin.h
+++ b/src/plugins/beautifier/beautifierplugin.h
@@ -33,7 +33,6 @@
#include "command.h"
#include <extensionsystem/iplugin.h>
-#include <utils/qtcoverride.h>
#include <QFutureInterface>
#include <QPlainTextEdit>
@@ -73,9 +72,9 @@ class BeautifierPlugin : public ExtensionSystem::IPlugin
public:
BeautifierPlugin();
~BeautifierPlugin();
- bool initialize(const QStringList &arguments, QString *errorString) QTC_OVERRIDE;
- void extensionsInitialized() QTC_OVERRIDE;
- ShutdownFlag aboutToShutdown() QTC_OVERRIDE;
+ bool initialize(const QStringList &arguments, QString *errorString) Q_DECL_OVERRIDE;
+ void extensionsInitialized() Q_DECL_OVERRIDE;
+ ShutdownFlag aboutToShutdown() Q_DECL_OVERRIDE;
QString format(const QString &text, const Command &command, const QString &fileName,
bool *timeout = 0);
diff --git a/src/plugins/beautifier/clangformat/clangformat.h b/src/plugins/beautifier/clangformat/clangformat.h
index e92d52cfddd5b793e179e7046a09bae560ab2623..cb646c77b2113a911f3174d849e0ff5e292492e8 100644
--- a/src/plugins/beautifier/clangformat/clangformat.h
+++ b/src/plugins/beautifier/clangformat/clangformat.h
@@ -33,7 +33,6 @@
#include "../beautifierabstracttool.h"
#include "../command.h"
-#include <utils/qtcoverride.h>
QT_FORWARD_DECLARE_CLASS(QAction)
@@ -53,9 +52,9 @@ class ClangFormat : public BeautifierAbstractTool
public:
explicit ClangFormat(BeautifierPlugin *parent = 0);
virtual ~ClangFormat();
- bool initialize() QTC_OVERRIDE;
- void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
- QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+ bool initialize() Q_DECL_OVERRIDE;
+ void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
+ QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
private slots:
void formatFile();
diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.h b/src/plugins/beautifier/clangformat/clangformatoptionspage.h
index 25c0001d76903653162fbed562f77fe44422f2a3..9e45ae8ff810fecdc34392b638d01adc98faa8d4 100644
--- a/src/plugins/beautifier/clangformat/clangformatoptionspage.h
+++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.h
@@ -31,7 +31,6 @@
#define BEAUTIFIER_CLANGFORMATOPTIONSPAGE_H
#include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
#include <QPointer>
#include <QWidget>
@@ -65,9 +64,9 @@ class ClangFormatOptionsPage : public Core::IOptionsPage
public:
explicit ClangFormatOptionsPage(ClangFormatSettings *settings, QObject *parent = 0);
- QWidget *widget() QTC_OVERRIDE;
- void apply() QTC_OVERRIDE;
- void finish() QTC_OVERRIDE;
+ QWidget *widget() Q_DECL_OVERRIDE;
+ void apply() Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
private:
QPointer<ClangFormatOptionsPageWidget> m_widget;
diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.h b/src/plugins/beautifier/clangformat/clangformatsettings.h
index 39931d131cdb704132f7fd04b1da6d5ca4fadc6f..a2004855be3a2934afacf2d7b92f997f76b3d585 100644
--- a/src/plugins/beautifier/clangformat/clangformatsettings.h
+++ b/src/plugins/beautifier/clangformat/clangformatsettings.h
@@ -32,7 +32,6 @@
#include "../abstractsettings.h"
-#include <utils/qtcoverride.h>
namespace Beautifier {
namespace Internal {
@@ -45,9 +44,9 @@ class ClangFormatSettings : public AbstractSettings
public:
explicit ClangFormatSettings();
- QString documentationFilePath() const QTC_OVERRIDE;
- void createDocumentationFile() const QTC_OVERRIDE;
- QStringList completerWords() QTC_OVERRIDE;
+ QString documentationFilePath() const Q_DECL_OVERRIDE;
+ void createDocumentationFile() const Q_DECL_OVERRIDE;
+ QStringList completerWords() Q_DECL_OVERRIDE;
bool usePredefinedStyle() const;
void setUsePredefinedStyle(bool usePredefinedStyle);
diff --git a/src/plugins/beautifier/configurationeditor.h b/src/plugins/beautifier/configurationeditor.h
index 4319fd6653d4c52727c1370d48128674122fe154..0638621955c3f87051d2a5c00d3eb40d4a7d30fb 100644
--- a/src/plugins/beautifier/configurationeditor.h
+++ b/src/plugins/beautifier/configurationeditor.h
@@ -30,7 +30,6 @@
#ifndef BEAUTIFIER_CONFIGURATIONEDITOR_H
#define BEAUTIFIER_CONFIGURATIONEDITOR_H
-#include <utils/qtcoverride.h>
#include <QPlainTextEdit>
#include <QRegExp>
@@ -61,7 +60,7 @@ public:
void setCommentExpression(const QRegExp &rx);
protected:
- void highlightBlock(const QString &text) QTC_OVERRIDE;
+ void highlightBlock(const QString &text) Q_DECL_OVERRIDE;
private:
QRegExp m_expressionKeyword;
@@ -80,8 +79,8 @@ public:
void setCommentExpression(const QRegExp &rx);
protected:
- bool eventFilter(QObject *object, QEvent *event) QTC_OVERRIDE;
- void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+ bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
private slots:
void insertCompleterText(const QString &text);
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.h b/src/plugins/beautifier/uncrustify/uncrustify.h
index 93dba09d2744c058ec5a82fa9d5fa1a4fceefb41..d798431111588fb1c062fe40732f55b561b0742e 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.h
+++ b/src/plugins/beautifier/uncrustify/uncrustify.h
@@ -32,7 +32,6 @@
#include "../beautifierabstracttool.h"
-#include <utils/qtcoverride.h>
QT_FORWARD_DECLARE_CLASS(QAction)
@@ -52,9 +51,9 @@ class Uncrustify : public BeautifierAbstractTool
public:
explicit Uncrustify(BeautifierPlugin *parent = 0);
virtual ~Uncrustify();
- bool initialize() QTC_OVERRIDE;
- void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
- QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+ bool initialize() Q_DECL_OVERRIDE;
+ void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
+ QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
private slots:
void formatFile();
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h
index e552ce9a7221474dc299a2dffec3265600bfc5bd..e57c44ab18262fdeb798d18b831609dff7b83e2b 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h
@@ -31,7 +31,6 @@
#define BEAUTIFIER_UNCRUSTIFYOPTIONSPAGE_H
#include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
#include <QPointer>
#include <QWidget>
@@ -65,9 +64,9 @@ class UncrustifyOptionsPage : public Core::IOptionsPage
public:
explicit UncrustifyOptionsPage(UncrustifySettings *settings, QObject *parent = 0);
- QWidget *widget() QTC_OVERRIDE;
- void apply() QTC_OVERRIDE;
- void finish() QTC_OVERRIDE;
+ QWidget *widget() Q_DECL_OVERRIDE;
+ void apply() Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
private:
QPointer<UncrustifyOptionsPageWidget> m_widget;
diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.h b/src/plugins/beautifier/uncrustify/uncrustifysettings.h
index 3398a64e1a93f58ca407b6ffaa20a34af1c68fc4..c6947b3d6295b54e013899dcad39832b00fea120 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifysettings.h
+++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.h
@@ -32,7 +32,6 @@
#include "../abstractsettings.h"
-#include <utils/qtcoverride.h>
namespace Beautifier {
namespace Internal {
@@ -55,8 +54,8 @@ public:
QString customStyle() const;
void setCustomStyle(const QString &customStyle);
- QString documentationFilePath() const QTC_OVERRIDE;
- void createDocumentationFile() const QTC_OVERRIDE;
+ QString documentationFilePath() const Q_DECL_OVERRIDE;
+ void createDocumentationFile() const Q_DECL_OVERRIDE;
};
} // namespace Uncrustify
diff --git a/src/plugins/clangcodemodel/clangeditordocumentparser.h b/src/plugins/clangcodemodel/clangeditordocumentparser.h
index 98017b6512b11f09d8d9164b10d9b8167009d305..650781632737aa64411352dbb670fc0d6e5ca8cd 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentparser.h
+++ b/src/plugins/clangcodemodel/clangeditordocumentparser.h
@@ -35,7 +35,6 @@
#include <cpptools/baseeditordocumentparser.h>
-#include <utils/qtcoverride.h>
namespace CppTools { class WorkingCopy; }
@@ -51,7 +50,7 @@ public:
public:
ClangEditorDocumentParser(const QString &filePath);
- void update(CppTools::WorkingCopy workingCopy) QTC_OVERRIDE;
+ void update(CppTools::WorkingCopy workingCopy) Q_DECL_OVERRIDE;
QList<Diagnostic> diagnostics() const;
QList<SemanticMarker::Range> ifdefedOutBlocks() const;
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
index e66b46dd8f0ccfddeda7cd8d4ce456ff38285827..1aa4df9085892da585f175b52c4a23344b1801f6 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
@@ -36,7 +36,6 @@
#include <cpptools/builtineditordocumentprocessor.h>
#include <cpptools/semantichighlighter.h>
-#include <utils/qtcoverride.h>
#include <QFutureWatcher>
@@ -51,11 +50,11 @@ public:
~ClangEditorDocumentProcessor();
// BaseEditorDocumentProcessor interface
- void run() QTC_OVERRIDE;
- void semanticRehighlight(bool force) QTC_OVERRIDE;
- CppTools::SemanticInfo recalculateSemanticInfo() QTC_OVERRIDE;
- CppTools::BaseEditorDocumentParser *parser() QTC_OVERRIDE;
- bool isParserRunning() const QTC_OVERRIDE;
+ void run() Q_DECL_OVERRIDE;
+ void semanticRehighlight(bool force) Q_DECL_OVERRIDE;
+ CppTools::SemanticInfo recalculateSemanticInfo() Q_DECL_OVERRIDE;
+ CppTools::BaseEditorDocumentParser *parser() Q_DECL_OVERRIDE;
+ bool isParserRunning() const Q_DECL_OVERRIDE;
private slots:
void onParserFinished();
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 0a62a08810fa1baf0ab7da3076644d601caa0e85..ae6170c011e66ba02d86e7e65abe6c92f023ff96 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -34,7 +34,6 @@
#include <texteditor/basetexteditor.h>
-#include <utils/qtcoverride.h>
#include <QScopedPointer>
@@ -81,15 +80,15 @@ public:
TextEditor::AssistInterface *createAssistInterface(
TextEditor::AssistKind kind,
- TextEditor::AssistReason reason) const QTC_OVERRIDE;
+ TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
FollowSymbolUnderCursor *followSymbolUnderCursorDelegate(); // exposed for tests
- TextEditor::CompletionAssistProvider *completionAssistProvider() const QTC_OVERRIDE;
+ TextEditor::CompletionAssistProvider *completionAssistProvider() const Q_DECL_OVERRIDE;
public slots:
- void paste() QTC_OVERRIDE;
- void cut() QTC_OVERRIDE;
- void selectAll() QTC_OVERRIDE;
+ void paste() Q_DECL_OVERRIDE;
+ void cut() Q_DECL_OVERRIDE;
+ void selectAll() Q_DECL_OVERRIDE;
void switchDeclarationDefinition(bool inNextSplit);
void showPreProcessorWidget();
@@ -99,22 +98,22 @@ public slots:
void renameUsages(const QString &replacement = QString());
protected:
- bool event(QEvent *e) QTC_OVERRIDE;
- void contextMenuEvent(QContextMenuEvent *) QTC_OVERRIDE;
- void keyPressEvent(QKeyEvent *e) QTC_OVERRIDE;
+ bool event(QEvent *e) Q_DECL_OVERRIDE;
+ void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
- void applyFontSettings() QTC_OVERRIDE;
+ void applyFontSettings() Q_DECL_OVERRIDE;
- bool openLink(const Link &link, bool inNextSplit) QTC_OVERRIDE
+ bool openLink(const Link &link, bool inNextSplit) Q_DECL_OVERRIDE
{ return openCppEditorAt(link, inNextSplit); }
Link findLinkAt(const QTextCursor &, bool resolveTarget = true,
- bool inNextSplit = false) QTC_OVERRIDE;
+ bool inNextSplit = false) Q_DECL_OVERRIDE;
- void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) QTC_OVERRIDE;
+ void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) Q_DECL_OVERRIDE;
protected slots:
- void slotCodeStyleSettingsChanged(const QVariant &) QTC_OVERRIDE;
+ void slotCodeStyleSettingsChanged(const QVariant &) Q_DECL_OVERRIDE;
private slots:
void updateFunctionDeclDefLink();
@@ -138,8 +137,8 @@ private slots:
void processKeyNormally(QKeyEvent *e);
private:
- void finalizeInitialization() QTC_OVERRIDE;
- void finalizeInitializationAfterDuplication(BaseTextEditorWidget *other) QTC_OVERRIDE;
+ void finalizeInitialization() Q_DECL_OVERRIDE;
+ void finalizeInitializationAfterDuplication(BaseTextEditorWidget *other) Q_DECL_OVERRIDE;
static bool openCppEditorAt(const Link &, bool inNextSplit = false);
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h
index 3f61f41f49d4f78bdccdc8ce78db5fb40c9ae267..d362c3fbdeb01d3d4d950c6d3c4ab7302895e918 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.h
+++ b/src/plugins/cppeditor/cppquickfixassistant.h
@@ -37,7 +37,6 @@
#include <cplusplus/LookupContext.h>
-#include <utils/qtcoverride.h>
namespace CppTools {
class CppRefactoringFile;
@@ -79,7 +78,7 @@ class CppQuickFixAssistProcessor : public TextEditor::QuickFixAssistProcessor
public:
CppQuickFixAssistProcessor(const TextEditor::IAssistProvider *provider);
- const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
+ const TextEditor::IAssistProvider *provider() const Q_DECL_OVERRIDE;
private:
const TextEditor::IAssistProvider *m_provider;
@@ -88,11 +87,11 @@ private:
class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
{
public:
- bool isAsynchronous() const QTC_OVERRIDE;
- bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
- TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+ bool isAsynchronous() const Q_DECL_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
- QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
+ QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE;
};
} // Internal
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
index dc33d8cc7fb0b33edb29edb686aa842915c24303..129baeaa747be57ac00d60c82d8f0d9f62bb546b 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
@@ -53,7 +53,6 @@
#include <texteditor/texteditorconstants.h>
#include <utils/qtcassert.h>
-#include <utils/qtcoverride.h>
using namespace CPlusPlus;
using namespace CppEditor::Internal;
@@ -89,7 +88,7 @@ protected:
return GenericProposalWidget::eventFilter(o, e);
}
- void showProposal(const QString &prefix) QTC_OVERRIDE
+ void showProposal(const QString &prefix) Q_DECL_OVERRIDE
{
GenericProposalModel *proposalModel = model();
if (proposalModel && proposalModel->size() == 1) {
@@ -112,9 +111,9 @@ public:
, m_openInSplit(openInSplit)
{}
- bool isFragile() const QTC_OVERRIDE { return true; }
+ bool isFragile() const Q_DECL_OVERRIDE { return true; }
- IAssistProposalWidget *createWidget() const QTC_OVERRIDE
+ IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE
{ return new VirtualFunctionProposalWidget(m_openInSplit); }
private:
@@ -128,7 +127,7 @@ public:
: m_params(params)
{}
- IAssistProposal *immediateProposal(const TextEditor::AssistInterface *) QTC_OVERRIDE
+ IAssistProposal *immediateProposal(const TextEditor::AssistInterface *) Q_DECL_OVERRIDE
{
QTC_ASSERT(m_params.function, return 0);
@@ -143,7 +142,7 @@ public:
return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit);
}
- IAssistProposal *perform(const AssistInterface *assistInterface) QTC_OVERRIDE
+ IAssistProposal *perform(const AssistInterface *assistInterface) Q_DECL_OVERRIDE
{
delete assistInterface;
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
index c07a2f71fa6404cc88363223685d3b7900d4452a..e1caf70be09a34da7e5c584b59247d8b49e794fd 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
@@ -36,7 +36,6 @@
#include <cplusplus/Symbols.h>
#include <cplusplus/TypeOfExpression.h>
-#include <utils/qtcoverride.h>
#include <QSharedPointer>
#include <QTextCursor>
@@ -64,9 +63,9 @@ public:
Parameters params() const { return m_params; }
void clearParams() { m_params = Parameters(); }
- bool isAsynchronous() const QTC_OVERRIDE;
- bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
- TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+ bool isAsynchronous() const Q_DECL_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
private:
Parameters m_params;
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index adab84088eb58ca60d6c490d15deedaabad461b9..2726ded2fd0f61b37066b9987f6933bcfde0c704 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -121,7 +121,7 @@ public:
// Invoke the processor already here to calculate the proposals. Return false in order to
// indicate that configure failed, so the actual code assist invocation leading to a pop-up
// will not happen.
- bool configure(const VirtualFunctionAssistProvider::Parameters ¶ms) QTC_OVERRIDE
+ bool configure(const VirtualFunctionAssistProvider::Parameters ¶ms) Q_DECL_OVERRIDE
{
VirtualFunctionAssistProvider::configure(params);
diff --git a/src/plugins/cpptools/builtineditordocumentparser.h b/src/plugins/cpptools/builtineditordocumentparser.h
index e951b09ef06e11c810ae77f1642176b4b4b2c5a7..4287f714ddd5db77d5c553f85a47d1e9d6711235 100644
--- a/src/plugins/cpptools/builtineditordocumentparser.h
+++ b/src/plugins/cpptools/builtineditordocumentparser.h
@@ -35,7 +35,6 @@
#include "cppmodelmanager.h"
#include <cplusplus/CppDocument.h>
-#include <utils/qtcoverride.h>
#include <QMutex>
#include <QString>
@@ -49,7 +48,7 @@ class CPPTOOLS_EXPORT BuiltinEditorDocumentParser : public BaseEditorDocumentPar
public:
BuiltinEditorDocumentParser(const QString &filePath);
- void update(WorkingCopy workingCopy) QTC_OVERRIDE;
+ void update(WorkingCopy workingCopy) Q_DECL_OVERRIDE;
void releaseResources();
CPlusPlus::Document::Ptr document() const;
diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.h b/src/plugins/cpptools/builtineditordocumentprocessor.h
index f82ca56e90f0bf59c7a842620ab7e646e00187ff..94c31e611228eb5fe5b5cd9f80b5a375cfe55dd0 100644
--- a/src/plugins/cpptools/builtineditordocumentprocessor.h
+++ b/src/plugins/cpptools/builtineditordocumentprocessor.h
@@ -36,7 +36,6 @@
#include "cpptools_global.h"
#include "semantichighlighter.h"
-#include <utils/qtcoverride.h>
namespace CppTools {
@@ -51,11 +50,11 @@ public:
~BuiltinEditorDocumentProcessor();
// BaseEditorDocumentProcessor interface
- void run() QTC_OVERRIDE;
- void semanticRehighlight(bool force) QTC_OVERRIDE;
- CppTools::SemanticInfo recalculateSemanticInfo() QTC_OVERRIDE;
- BaseEditorDocumentParser *parser() QTC_OVERRIDE;
- bool isParserRunning() const QTC_OVERRIDE;
+ void run() Q_DECL_OVERRIDE;
+ void semanticRehighlight(bool force) Q_DECL_OVERRIDE;
+ CppTools::SemanticInfo recalculateSemanticInfo() Q_DECL_OVERRIDE;
+ BaseEditorDocumentParser *parser() Q_DECL_OVERRIDE;
+ bool isParserRunning() const Q_DECL_OVERRIDE;
private:
void onParserFinished(CPlusPlus::Document::Ptr document, CPlusPlus::Snapshot snapshot);
diff --git a/src/plugins/cpptools/cppclassesfilter.h b/src/plugins/cpptools/cppclassesfilter.h
index d88c837565612e7655264df7a4fd907cd3de2b34..2f63ab8ac96ba37180517c961a4411ac4597819c 100644
--- a/src/plugins/cpptools/cppclassesfilter.h
+++ b/src/plugins/cpptools/cppclassesfilter.h
@@ -34,7 +34,6 @@
#include "cpplocatordata.h"
#include "cpplocatorfilter.h"
-#include <utils/qtcoverride.h>
namespace CppTools {
@@ -48,8 +47,8 @@ public:
~CppClassesFilter();
protected:
- IndexItem::ItemType matchTypes() const QTC_OVERRIDE { return IndexItem::Class; }
- Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) QTC_OVERRIDE;
+ IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Class; }
+ Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE;
};
} // namespace CppTools
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 703a3aaff58a0567262ba0f2655ba8d331041b5c..59cac54c1028b4610c019e213b66a4508901d86b 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -49,7 +49,6 @@
#include <texteditor/completionsettings.h>
#include <utils/qtcassert.h>
-#include <utils/qtcoverride.h>
#include <cplusplus/BackwardsScanner.h>
#include <cplusplus/CppRewriter.h>
@@ -90,8 +89,8 @@ public:
CppAssistProposalItem() :
m_isOverloaded(false) {}
- bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
- void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const QTC_OVERRIDE;
+ bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
+ void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE;
bool isOverloaded() const { return m_isOverloaded; }
void markAsOverloaded() { m_isOverloaded = true; }
@@ -350,10 +349,10 @@ public:
, m_typeOfExpression(typeOfExp)
{}
- void reset() QTC_OVERRIDE {}
- int size() const QTC_OVERRIDE { return m_functionSymbols.size(); }
- QString text(int index) const QTC_OVERRIDE;
- int activeArgument(const QString &prefix) const QTC_OVERRIDE;
+ void reset() Q_DECL_OVERRIDE {}
+ int size() const Q_DECL_OVERRIDE { return m_functionSymbols.size(); }
+ QString text(int index) const Q_DECL_OVERRIDE;
+ int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
private:
QList<Function *> m_functionSymbols;
@@ -439,8 +438,8 @@ public:
, m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow)
{}
- bool isCorrective() const QTC_OVERRIDE { return m_replaceDotForArrow; }
- void makeCorrection(BaseTextEditorWidget *editorWidget) QTC_OVERRIDE;
+ bool isCorrective() const Q_DECL_OVERRIDE { return m_replaceDotForArrow; }
+ void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
private:
bool m_replaceDotForArrow;
diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h
index 5254acd7ef4e29255d37af142cc6422fbb8192f2..a03405987b9143f44f3742c49bbc99d6b716066d 100644
--- a/src/plugins/cpptools/cppcompletionassist.h
+++ b/src/plugins/cpptools/cppcompletionassist.h
@@ -44,7 +44,6 @@
#include <texteditor/codeassist/iassistprocessor.h>
#include <texteditor/snippets/snippetassistcollector.h>
-#include <utils/qtcoverride.h>
#include <QStringList>
#include <QVariant>
@@ -73,8 +72,8 @@ public:
m_typeOfExpression->setExpandTemplates(true);
}
- bool isSortable(const QString &prefix) const QTC_OVERRIDE;
- TextEditor::AssistProposalItem *proposalItem(int index) const QTC_OVERRIDE;
+ bool isSortable(const QString &prefix) const Q_DECL_OVERRIDE;
+ TextEditor::AssistProposalItem *proposalItem(int index) const Q_DECL_OVERRIDE;
unsigned m_completionOperator;
bool m_replaceDotForArrow;
@@ -86,14 +85,14 @@ class InternalCompletionAssistProvider : public CppCompletionAssistProvider
Q_OBJECT
public:
- TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
TextEditor::AssistInterface *createAssistInterface(
const QString &filePath,
QTextDocument *document,
bool isObjCEnabled,
int position,
- TextEditor::AssistReason reason) const QTC_OVERRIDE;
+ TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
};
class CppCompletionAssistProcessor : public TextEditor::IAssistProcessor
@@ -102,7 +101,7 @@ public:
CppCompletionAssistProcessor();
~CppCompletionAssistProcessor();
- TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) QTC_OVERRIDE;
+ TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
private:
TextEditor::IAssistProposal *createContentProposal();
diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h
index 329055a4f95246ea2a14c0166449761a6c22210b..7a9b7fdcd747087d09772be4238da836358b6eba 100644
--- a/src/plugins/cpptools/cppcompletionassistprovider.h
+++ b/src/plugins/cpptools/cppcompletionassistprovider.h
@@ -35,7 +35,6 @@
#include <texteditor/codeassist/assistenums.h>
#include <texteditor/codeassist/completionassistprovider.h>
-#include <utils/qtcoverride.h>
QT_BEGIN_NAMESPACE
class QTextDocument;
@@ -53,10 +52,10 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio
Q_OBJECT
public:
- bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
- int activationCharSequenceLength() const QTC_OVERRIDE;
- bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
- bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
+ int activationCharSequenceLength() const Q_DECL_OVERRIDE;
+ bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE;
+ bool isContinuationChar(const QChar &c) const Q_DECL_OVERRIDE;
virtual TextEditor::AssistInterface *createAssistInterface(
const QString &filePath,
diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h
index fb112ef5c1e3dcc10a46131aeddf3427fbc15730..e075925caa7430604dd6fb228bdc87a728875af8 100644
--- a/src/plugins/cpptools/cppfunctionsfilter.h
+++ b/src/plugins/cpptools/cppfunctionsfilter.h
@@ -33,7 +33,6 @@
#include "cpplocatordata.h"
#include "cpplocatorfilter.h"
-#include <utils/qtcoverride.h>
namespace CppTools {
namespace Internal {
@@ -47,8 +46,8 @@ public:
~CppFunctionsFilter();
protected:
- IndexItem::ItemType matchTypes() const QTC_OVERRIDE { return IndexItem::Function; }
- Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) QTC_OVERRIDE;
+ IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Function; }
+ Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/cpptools/cppsemanticinfoupdater.cpp b/src/plugins/cpptools/cppsemanticinfoupdater.cpp
index dc8b4962ab242092246e7f80fcdbb1d29220a03f..6c1cda731ed2aee840933acef0a9c7d404d06b39 100644
--- a/src/plugins/cpptools/cppsemanticinfoupdater.cpp
+++ b/src/plugins/cpptools/cppsemanticinfoupdater.cpp
@@ -32,7 +32,6 @@
#include "cpplocalsymbols.h"
#include <utils/qtcassert.h>
-#include <utils/qtcoverride.h>
#include <utils/runextensions.h>
#include <cplusplus/Control.h>
diff --git a/src/plugins/cpptools/cppsourceprocessor.h b/src/plugins/cpptools/cppsourceprocessor.h
index 1843a8894d77bc2f0ee4bc034eb84f4c2c12f61c..e0a03d4bdf0b13999f01434e3d6c833a1f61439d 100644
--- a/src/plugins/cpptools/cppsourceprocessor.h
+++ b/src/plugins/cpptools/cppsourceprocessor.h
@@ -35,7 +35,6 @@
#include <cplusplus/PreprocessorEnvironment.h>
#include <cplusplus/pp-engine.h>
-#include <utils/qtcoverride.h>
#include <QHash>
#include <QPointer>
@@ -96,22 +95,22 @@ private:
void mergeEnvironment(CPlusPlus::Document::Ptr doc);
// Client interface
- void macroAdded(const CPlusPlus::Macro ¯o) QTC_OVERRIDE;
+ void macroAdded(const CPlusPlus::Macro ¯o) Q_DECL_OVERRIDE;
void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset,
- unsigned line, const CPlusPlus::Macro ¯o) QTC_OVERRIDE;
+ unsigned line, const CPlusPlus::Macro ¯o) Q_DECL_OVERRIDE;
void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset,
- const CPlusPlus::ByteArrayRef &name) QTC_OVERRIDE;
+ const CPlusPlus::ByteArrayRef &name) Q_DECL_OVERRIDE;
void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset,
- unsigned line, const CPlusPlus::Macro ¯o) QTC_OVERRIDE;
+ unsigned line, const CPlusPlus::Macro ¯o) Q_DECL_OVERRIDE;
void startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset,
unsigned line, const CPlusPlus::Macro ¯o,
- const QVector<CPlusPlus::MacroArgumentReference> &actuals) QTC_OVERRIDE;
- void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro ¯o) QTC_OVERRIDE;
- void markAsIncludeGuard(const QByteArray ¯oName) QTC_OVERRIDE;
- void startSkippingBlocks(unsigned utf16charsOffset) QTC_OVERRIDE;
- void stopSkippingBlocks(unsigned utf16charsOffset) QTC_OVERRIDE;
+ const QVector<CPlusPlus::MacroArgumentReference> &actuals) Q_DECL_OVERRIDE;
+ void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro ¯o) Q_DECL_OVERRIDE;
+ void markAsIncludeGuard(const QByteArray ¯oName) Q_DECL_OVERRIDE;
+ void startSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE;
+ void stopSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE;
void sourceNeeded(unsigned line, const QString &fileName, IncludeType type,
- const QStringList &initialIncludes) QTC_OVERRIDE;
+ const QStringList &initialIncludes) Q_DECL_OVERRIDE;
private:
CPlusPlus::Snapshot m_snapshot;
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index ca9ceee8a83c7389b120bacdb3181d6f347c9b7d..1c49452e30bba9b12188da412158b3d0ec44cc9c 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -76,7 +76,6 @@
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/pathchooser.h>
-#include <utils/qtcoverride.h>
#include <utils/savedaction.h>
#include <utils/stylehelper.h>
@@ -888,18 +887,18 @@ public:
: m_provider(const_cast<FakeVimCompletionAssistProvider *>(provider))
{}
- bool implicitlyApplies() const QTC_OVERRIDE
+ bool implicitlyApplies() const Q_DECL_OVERRIDE
{
return false;
}
- bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE
+ bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE
{
m_provider->appendNeedle(c);
return text() == m_provider->needle();
}
- void applyContextualContent(BaseTextEditorWidget *, int) const QTC_OVERRIDE
+ void applyContextualContent(BaseTextEditorWidget *, int) const Q_DECL_OVERRIDE
{
QTC_ASSERT(m_provider->handler(), return);
m_provider->handler()->handleReplay(text().mid(m_provider->needle().size()));
@@ -919,7 +918,7 @@ public:
loadContent(items);
}
- bool supportsPrefixExpansion() const QTC_OVERRIDE
+ bool supportsPrefixExpansion() const Q_DECL_OVERRIDE
{
return false;
}
@@ -932,7 +931,7 @@ public:
: m_provider(static_cast<const FakeVimCompletionAssistProvider *>(provider))
{}
- IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE
+ IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE
{
const QString &needle = m_provider->needle();
diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp
index 0667185da5f43fe3782da865af2565724ada5657..accdef3c268c22c699764c3fc0a85a69d7bde0fe 100644
--- a/src/plugins/glsleditor/glslcompletionassist.cpp
+++ b/src/plugins/glsleditor/glslcompletionassist.cpp
@@ -47,7 +47,6 @@
#include <cplusplus/ExpressionUnderCursor.h>
#include <utils/faketooltip.h>
-#include <utils/qtcoverride.h>
#include <QIcon>
#include <QPainter>
@@ -177,10 +176,10 @@ public:
, m_currentArg(-1)
{}
- void reset() QTC_OVERRIDE {}
- int size() const QTC_OVERRIDE { return m_items.size(); }
- QString text(int index) const QTC_OVERRIDE;
- int activeArgument(const QString &prefix) const QTC_OVERRIDE;
+ void reset() Q_DECL_OVERRIDE {}
+ int size() const Q_DECL_OVERRIDE { return m_items.size(); }
+ QString text(int index) const Q_DECL_OVERRIDE;
+ int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
private:
QVector<GLSL::Function *> m_items;
diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h
index 2cb41d7df02526ee1689e4fa1891f47363da0afd..786ea493962476a3448bb5d1d520618daf0a8a59 100644
--- a/src/plugins/glsleditor/glslcompletionassist.h
+++ b/src/plugins/glsleditor/glslcompletionassist.h
@@ -37,7 +37,6 @@
#include <texteditor/codeassist/assistinterface.h>
#include <texteditor/codeassist/ifunctionhintproposalmodel.h>
-#include <utils/qtcoverride.h>
#include <QIcon>
#include <QScopedPointer>
@@ -91,11 +90,11 @@ class GlslCompletionAssistProvider : public TextEditor::CompletionAssistProvider
Q_OBJECT
public:
- bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
- TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
- int activationCharSequenceLength() const QTC_OVERRIDE;
- bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
+ int activationCharSequenceLength() const Q_DECL_OVERRIDE;
+ bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE;
};
class GlslCompletionAssistProcessor : public TextEditor::IAssistProcessor
@@ -104,7 +103,7 @@ public:
GlslCompletionAssistProcessor();
~GlslCompletionAssistProcessor();
- TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) QTC_OVERRIDE;
+ TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
private:
TextEditor::IAssistProposal *createHintProposal(const QVector<GLSL::Function *> &symbols);
diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h
index 7081e6212dce7c508f64f24f0a0d1113a9518d3d..92140db843945178e4db9651c84759d53ccc6397 100644
--- a/src/plugins/ios/iosbuildstep.h
+++ b/src/plugins/ios/iosbuildstep.h
@@ -30,7 +30,6 @@
#define IOSBUILDSTEP_H
#include <projectexplorer/abstractprocessstep.h>
-#include <utils/qtcoverride.h>
QT_BEGIN_NAMESPACE
class QListWidgetItem;
@@ -54,11 +53,11 @@ public:
IosBuildStep(ProjectExplorer::BuildStepList *parent);
~IosBuildStep();
- bool init() QTC_OVERRIDE;
- void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
+ bool init() Q_DECL_OVERRIDE;
+ void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
- bool immutable() const QTC_OVERRIDE;
+ ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
+ bool immutable() const Q_DECL_OVERRIDE;
void setBaseArguments(const QStringList &args);
void setExtraArguments(const QStringList &extraArgs);
QStringList baseArguments() const;
@@ -69,11 +68,11 @@ public:
void setClean(bool clean);
bool isClean() const;
- QVariantMap toMap() const QTC_OVERRIDE;
+ QVariantMap toMap() const Q_DECL_OVERRIDE;
protected:
IosBuildStep(ProjectExplorer::BuildStepList *parent, IosBuildStep *bs);
IosBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
- bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
+ bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
private:
void ctor();
@@ -92,8 +91,8 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
IosBuildStepConfigWidget(IosBuildStep *buildStep);
~IosBuildStepConfigWidget();
- QString displayName() const QTC_OVERRIDE;
- QString summaryText() const QTC_OVERRIDE;
+ QString displayName() const Q_DECL_OVERRIDE;
+ QString summaryText() const Q_DECL_OVERRIDE;
private slots:
void buildArgumentsChanged();
@@ -114,18 +113,18 @@ class IosBuildStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosBuildStepFactory(QObject *parent = 0);
- bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const QTC_OVERRIDE;
- ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
+ bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
+ ProjectExplorer::BuildStep *source) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *source) QTC_OVERRIDE;
- bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
+ ProjectExplorer::BuildStep *source) Q_DECL_OVERRIDE;
+ bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
- const QVariantMap &map) QTC_OVERRIDE;
+ const QVariantMap &map) Q_DECL_OVERRIDE;
- QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
- QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const Q_DECL_OVERRIDE;
+ QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdeployconfiguration.h b/src/plugins/ios/iosdeployconfiguration.h
index e3f90a928353176b15dfa5efeb8fe05f27387f96..8f5bb3210f586cacf4ae5c914e3a1166460fcaac 100644
--- a/src/plugins/ios/iosdeployconfiguration.h
+++ b/src/plugins/ios/iosdeployconfiguration.h
@@ -30,7 +30,6 @@
#define IOSDEPLOYCONFIGURATION_H
#include <projectexplorer/deployconfiguration.h>
-#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -59,22 +58,22 @@ class IosDeployConfigurationFactory : public ProjectExplorer::DeployConfiguratio
public:
explicit IosDeployConfigurationFactory(QObject *parent = 0);
- bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const QTC_OVERRIDE;
- ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) QTC_OVERRIDE;
- bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
+ bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const Q_DECL_OVERRIDE;
+ ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) Q_DECL_OVERRIDE;
+ bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
- const QVariantMap &map) QTC_OVERRIDE;
+ const QVariantMap &map) Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::Target *parent,
- ProjectExplorer::DeployConfiguration *source) const QTC_OVERRIDE;
+ ProjectExplorer::DeployConfiguration *source) const Q_DECL_OVERRIDE;
ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
- ProjectExplorer::DeployConfiguration *source) QTC_OVERRIDE;
+ ProjectExplorer::DeployConfiguration *source) Q_DECL_OVERRIDE;
- QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const Q_DECL_OVERRIDE;
// used to translate the ids to names to display to the user
- QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+ QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
private:
- bool canHandle(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
+ bool canHandle(ProjectExplorer::Target *parent) const Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h
index a5e55bd5e0be4560a6a9e6b9a7e5ecb761f2444c..b65885772e797d277bcc1971cbbe32f1a1c32214 100644
--- a/src/plugins/ios/iosdeploystep.h
+++ b/src/plugins/ios/iosdeploystep.h
@@ -36,7 +36,6 @@
#include <projectexplorer/buildstep.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <qtsupport/baseqtversion.h>
-#include <utils/qtcoverride.h>
#include <QFutureInterface>
#include <QProcess>
@@ -68,10 +67,10 @@ public:
~IosDeployStep();
- bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
- QVariantMap toMap() const QTC_OVERRIDE;
+ bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
+ QVariantMap toMap() const Q_DECL_OVERRIDE;
- void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
+ void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
void cleanup();
void cancel();
signals:
@@ -90,10 +89,10 @@ private slots:
private:
IosDeployStep(ProjectExplorer::BuildStepList *bc,
IosDeployStep *other);
- bool init() QTC_OVERRIDE;
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
- bool immutable() const QTC_OVERRIDE { return true; }
- bool runInGuiThread() const QTC_OVERRIDE { return true; }
+ bool init() Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
+ bool immutable() const Q_DECL_OVERRIDE { return true; }
+ bool runInGuiThread() const Q_DECL_OVERRIDE { return true; }
ProjectExplorer::IDevice::ConstPtr device() const;
IosDevice::ConstPtr iosdevice() const;
IosSimulator::ConstPtr iossimulator() const;
diff --git a/src/plugins/ios/iosdeploystepfactory.h b/src/plugins/ios/iosdeploystepfactory.h
index e6288e981f1d3cb455b813a8f1d4793d20703102..9b23d4b89e329033f573c3298167ee0671a656f3 100644
--- a/src/plugins/ios/iosdeploystepfactory.h
+++ b/src/plugins/ios/iosdeploystepfactory.h
@@ -30,7 +30,6 @@
#define IOSDEPLOYSTEPFACTORY_H
#include <projectexplorer/buildstep.h>
-#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -41,20 +40,20 @@ class IosDeployStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosDeployStepFactory(QObject *parent = 0);
- QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const QTC_OVERRIDE;
- QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const Q_DECL_OVERRIDE;
+ QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
bool canCreate(ProjectExplorer::BuildStepList *parent,
- Core::Id id) const QTC_OVERRIDE;
- ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
+ Core::Id id) const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
- bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
- ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) QTC_OVERRIDE;
+ bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *product) const QTC_OVERRIDE;
+ ProjectExplorer::BuildStep *product) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *product) QTC_OVERRIDE;
+ ProjectExplorer::BuildStep *product) Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdeploystepwidget.h b/src/plugins/ios/iosdeploystepwidget.h
index ca4100543c14e679cfb387afe57640558e8796cf..1195a5c5c82f90a1098db3163dfb95bba1cbc8cf 100644
--- a/src/plugins/ios/iosdeploystepwidget.h
+++ b/src/plugins/ios/iosdeploystepwidget.h
@@ -30,7 +30,6 @@
#define IOSDEPLOYSTEPWIDGET_H
#include <projectexplorer/buildstep.h>
-#include <utils/qtcoverride.h>
QT_BEGIN_NAMESPACE
namespace Ui { class IosDeployStepWidget; }
@@ -49,8 +48,8 @@ public:
~IosDeployStepWidget();
private:
- QString summaryText() const QTC_OVERRIDE;
- QString displayName() const QTC_OVERRIDE;
+ QString summaryText() const Q_DECL_OVERRIDE;
+ QString displayName() const Q_DECL_OVERRIDE;
Ui::IosDeployStepWidget *ui;
IosDeployStep *m_step;
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index 10ff7cc97f5143647fb6c18088b261bb5cab0b2b..00933ed0ec5e9e0d1e28b8d1b7d3751f6ccd3b3c 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -32,7 +32,6 @@
#include "iostoolhandler.h"
#include <projectexplorer/devicesupport/idevice.h>
-#include <utils/qtcoverride.h>
#include <QVariantMap>
#include <QMap>
@@ -57,22 +56,22 @@ public:
typedef QSharedPointer<const IosDevice> ConstPtr;
typedef QSharedPointer<IosDevice> Ptr;
- ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE;
- ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE;
- QList<Core::Id> actionIds() const QTC_OVERRIDE;
- QString displayNameForActionId(Core::Id actionId) const QTC_OVERRIDE;
- void executeAction(Core::Id actionId, QWidget *parent = 0) QTC_OVERRIDE;
- ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const QTC_OVERRIDE;
- QString displayType() const QTC_OVERRIDE;
-
- ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE;
- void fromMap(const QVariantMap &map) QTC_OVERRIDE;
- QVariantMap toMap() const QTC_OVERRIDE;
+ ProjectExplorer::IDevice::DeviceInfo deviceInformation() const Q_DECL_OVERRIDE;
+ ProjectExplorer::IDeviceWidget *createWidget() Q_DECL_OVERRIDE;
+ QList<Core::Id> actionIds() const Q_DECL_OVERRIDE;
+ QString displayNameForActionId(Core::Id actionId) const Q_DECL_OVERRIDE;
+ void executeAction(Core::Id actionId, QWidget *parent = 0) Q_DECL_OVERRIDE;
+ ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const Q_DECL_OVERRIDE;
+ QString displayType() const Q_DECL_OVERRIDE;
+
+ ProjectExplorer::IDevice::Ptr clone() const Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
+ QVariantMap toMap() const Q_DECL_OVERRIDE;
QString uniqueDeviceID() const;
IosDevice(const QString &uid);
QString osVersion() const;
quint16 nextPort() const;
- bool canAutoDetectPorts() const QTC_OVERRIDE;
+ bool canAutoDetectPorts() const Q_DECL_OVERRIDE;
static QString name();
diff --git a/src/plugins/ios/iosdevicefactory.h b/src/plugins/ios/iosdevicefactory.h
index 2575897ed096b29a5ca70cdb1de1cad39cf8ffea..d7bc0a54800b45eb1230c4006311a96af66f0cae 100644
--- a/src/plugins/ios/iosdevicefactory.h
+++ b/src/plugins/ios/iosdevicefactory.h
@@ -30,7 +30,6 @@
#define IOSDEVICEFACTORY_H
#include <projectexplorer/devicesupport/idevicefactory.h>
-#include <utils/qtcoverride.h>
#include <QTimer>
#include <QMap>
@@ -45,13 +44,13 @@ class IosDeviceFactory : public ProjectExplorer::IDeviceFactory
public:
IosDeviceFactory();
- QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
- QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
+ QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
+ QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
- bool canCreate() const QTC_OVERRIDE;
- ProjectExplorer::IDevice::Ptr create(Core::Id id) const QTC_OVERRIDE;
- bool canRestore(const QVariantMap &map) const QTC_OVERRIDE;
- ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const QTC_OVERRIDE;
+ bool canCreate() const Q_DECL_OVERRIDE;
+ ProjectExplorer::IDevice::Ptr create(Core::Id id) const Q_DECL_OVERRIDE;
+ bool canRestore(const QVariantMap &map) const Q_DECL_OVERRIDE;
+ ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index 33e6114066f0683505705e2c0aa753a86904f2b8..2f6196272c290b6448b42f892a029a491ca690a9 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -30,7 +30,6 @@
#define IOSDSYMBUILDSTEP_H
#include <projectexplorer/abstractprocessstep.h>
-#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -49,11 +48,11 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
public:
~IosPresetBuildStep();
- bool init() QTC_OVERRIDE;
- void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
+ bool init() Q_DECL_OVERRIDE;
+ void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
- bool immutable() const QTC_OVERRIDE;
+ ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
+ bool immutable() const Q_DECL_OVERRIDE;
void setArguments(const QStringList &args);
QStringList arguments() const;
QStringList defaultArguments() const;
@@ -64,12 +63,12 @@ public:
void setClean(bool clean);
bool isDefault() const;
- QVariantMap toMap() const QTC_OVERRIDE;
+ QVariantMap toMap() const Q_DECL_OVERRIDE;
protected:
IosPresetBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
virtual bool completeSetup();
virtual bool completeSetupWithStep(ProjectExplorer::BuildStep *bs);
- bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
+ bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
virtual QStringList defaultCleanCmdList() const = 0;
virtual QStringList defaultCmdList() const = 0;
private:
@@ -85,8 +84,8 @@ class IosPresetBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWi
public:
IosPresetBuildStepConfigWidget(IosPresetBuildStep *buildStep);
~IosPresetBuildStepConfigWidget();
- QString displayName() const QTC_OVERRIDE;
- QString summaryText() const QTC_OVERRIDE;
+ QString displayName() const Q_DECL_OVERRIDE;
+ QString summaryText() const Q_DECL_OVERRIDE;
private slots:
void commandChanged();
@@ -107,14 +106,14 @@ class IosPresetBuildStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosPresetBuildStepFactory(QObject *parent = 0);
- ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) QTC_OVERRIDE;
+ ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
+ ProjectExplorer::BuildStep *source) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *source) QTC_OVERRIDE;
- bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
+ ProjectExplorer::BuildStep *source) Q_DECL_OVERRIDE;
+ bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
- const QVariantMap &map) QTC_OVERRIDE;
+ const QVariantMap &map) Q_DECL_OVERRIDE;
protected:
virtual IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
@@ -126,8 +125,8 @@ class IosDsymBuildStep : public IosPresetBuildStep
Q_OBJECT
friend class IosDsymBuildStepFactory;
protected:
- QStringList defaultCleanCmdList() const QTC_OVERRIDE;
- QStringList defaultCmdList() const QTC_OVERRIDE;
+ QStringList defaultCleanCmdList() const Q_DECL_OVERRIDE;
+ QStringList defaultCmdList() const Q_DECL_OVERRIDE;
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
};
@@ -135,11 +134,11 @@ class IosDsymBuildStepFactory : public IosPresetBuildStepFactory
{
Q_OBJECT
public:
- bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const QTC_OVERRIDE;
- QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
- QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
+ bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const Q_DECL_OVERRIDE;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const Q_DECL_OVERRIDE;
+ QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
- const Core::Id id) const QTC_OVERRIDE;
+ const Core::Id id) const Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosplugin.h b/src/plugins/ios/iosplugin.h
index 91bf6cf04c0e662a58f26a2b2b89720c5efbd523..f8ca12864443d2aa8485acf83f456bde7aac391c 100644
--- a/src/plugins/ios/iosplugin.h
+++ b/src/plugins/ios/iosplugin.h
@@ -30,7 +30,6 @@
#define IOSPLUGIN_H
#include <extensionsystem/iplugin.h>
-#include <utils/qtcoverride.h>
namespace Ios {
@@ -42,8 +41,8 @@ class IosPlugin : public ExtensionSystem::IPlugin
public:
IosPlugin();
- bool initialize(const QStringList &arguments, QString *errorMessage) QTC_OVERRIDE;
- void extensionsInitialized() QTC_OVERRIDE;
+ bool initialize(const QStringList &arguments, QString *errorMessage) Q_DECL_OVERRIDE;
+ void extensionsInitialized() Q_DECL_OVERRIDE;
private slots:
void kitsRestored();
};
diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h
index e95dfdccd0c9482054153d60713d21865c4bcfe6..523e8482a9ceb1339d16b8c8fbbed81486021ba1 100644
--- a/src/plugins/ios/iosqtversion.h
+++ b/src/plugins/ios/iosqtversion.h
@@ -30,7 +30,6 @@
#define IOSQTVERSION_H
#include <qtsupport/baseqtversion.h>
-#include <utils/qtcoverride.h>
#include <QCoreApplication>
@@ -46,20 +45,20 @@ public:
IosQtVersion(const Utils::FileName &path, bool isAutodetected = false,
const QString &autodetectionSource = QString());
- IosQtVersion *clone() const QTC_OVERRIDE;
- QString type() const QTC_OVERRIDE;
- bool isValid() const QTC_OVERRIDE;
- QString invalidReason() const QTC_OVERRIDE;
+ IosQtVersion *clone() const Q_DECL_OVERRIDE;
+ QString type() const Q_DECL_OVERRIDE;
+ bool isValid() const Q_DECL_OVERRIDE;
+ QString invalidReason() const Q_DECL_OVERRIDE;
- QList<ProjectExplorer::Abi> detectQtAbis() const QTC_OVERRIDE;
+ QList<ProjectExplorer::Abi> detectQtAbis() const Q_DECL_OVERRIDE;
- void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const QTC_OVERRIDE;
+ void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const Q_DECL_OVERRIDE;
- Core::FeatureSet availableFeatures() const QTC_OVERRIDE;
- QString platformName() const QTC_OVERRIDE;
- QString platformDisplayName() const QTC_OVERRIDE;
+ Core::FeatureSet availableFeatures() const Q_DECL_OVERRIDE;
+ QString platformName() const Q_DECL_OVERRIDE;
+ QString platformDisplayName() const Q_DECL_OVERRIDE;
- QString description() const QTC_OVERRIDE;
+ QString description() const Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosqtversionfactory.h b/src/plugins/ios/iosqtversionfactory.h
index 930a09282aaec10608fa27e8f17c2d1b63178c25..5265c13a7691288034c3660624ac6df70748f5a3 100644
--- a/src/plugins/ios/iosqtversionfactory.h
+++ b/src/plugins/ios/iosqtversionfactory.h
@@ -30,7 +30,6 @@
#define IOSQTVERSIONFACTORY_H
#include <qtsupport/qtversionfactory.h>
-#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -40,13 +39,13 @@ class IosQtVersionFactory : public QtSupport::QtVersionFactory
public:
explicit IosQtVersionFactory(QObject *parent = 0);
- bool canRestore(const QString &type) QTC_OVERRIDE;
- QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) QTC_OVERRIDE;
+ bool canRestore(const QString &type) Q_DECL_OVERRIDE;
+ QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) Q_DECL_OVERRIDE;
- int priority() const QTC_OVERRIDE;
+ int priority() const Q_DECL_OVERRIDE;
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false,
- const QString &autoDetectionSource = QString()) QTC_OVERRIDE;
+ const QString &autoDetectionSource = QString()) Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index 51954e30e4d285c8ff282ca4d244e41ccd3ae12a..10db8a0c14dcc8f63bb81d03e38bb02c204bf1c0 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -34,7 +34,6 @@
#include <projectexplorer/runconfiguration.h>
#include <utils/fileutils.h>
-#include <utils/qtcoverride.h>
namespace QmakeProjectManager {
class QmakeProFileNode;
@@ -65,8 +64,8 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration
public:
IosRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path);
- QWidget *createConfigurationWidget() QTC_OVERRIDE;
- Utils::OutputFormatter *createOutputFormatter() const QTC_OVERRIDE;
+ QWidget *createConfigurationWidget() Q_DECL_OVERRIDE;
+ Utils::OutputFormatter *createOutputFormatter() const Q_DECL_OVERRIDE;
IosDeployStep *deployStep() const;
QStringList commandLineArguments();
@@ -79,8 +78,8 @@ public:
IosDeviceType::Enum deviceType() const;
void setDeviceType(IosDeviceType::Enum deviceType);
- bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
- QVariantMap toMap() const QTC_OVERRIDE;
+ bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
+ QVariantMap toMap() const Q_DECL_OVERRIDE;
protected:
IosRunConfiguration(ProjectExplorer::Target *parent, IosRunConfiguration *source);
diff --git a/src/plugins/ios/iosruncontrol.h b/src/plugins/ios/iosruncontrol.h
index 1c742ccecaf1ad2a54e0c09347106d406cf0a849..4e2365c13213702dac00ee9c8e4e2362f2aeef12 100644
--- a/src/plugins/ios/iosruncontrol.h
+++ b/src/plugins/ios/iosruncontrol.h
@@ -30,7 +30,6 @@
#define IOSRUNCONTROL_H
#include <projectexplorer/runconfiguration.h>
-#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -47,10 +46,10 @@ public:
~IosRunControl();
- void start() QTC_OVERRIDE;
- StopResult stop() QTC_OVERRIDE;
- bool isRunning() const QTC_OVERRIDE;
- QString displayName() const QTC_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
+ StopResult stop() Q_DECL_OVERRIDE;
+ bool isRunning() const Q_DECL_OVERRIDE;
+ QString displayName() const Q_DECL_OVERRIDE;
private slots:
void handleRemoteProcessFinished(bool cleanEnd);
diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h
index ff3ba59b2c8f4616ecb24125119a551b9cf4ab2d..128c8422b12425ce488cd046f5c171b86315bf5a 100644
--- a/src/plugins/ios/iosrunfactories.h
+++ b/src/plugins/ios/iosrunfactories.h
@@ -31,7 +31,6 @@
#include <projectexplorer/runconfiguration.h>
#include <qmakeprojectmanager/qmakerunconfigurationfactory.h>
-#include <utils/qtcoverride.h>
namespace ProjectExplorer {
class RunControl;
@@ -50,27 +49,27 @@ class IosRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigura
public:
explicit IosRunConfigurationFactory(QObject *parent = 0);
- QString displayNameForId(Core::Id id) const QTC_OVERRIDE;
- QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const QTC_OVERRIDE;
+ QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const Q_DECL_OVERRIDE;
- bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const QTC_OVERRIDE;
+ bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const Q_DECL_OVERRIDE;
- bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
+ bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
bool canClone(ProjectExplorer::Target *parent,
- ProjectExplorer::RunConfiguration *source) const QTC_OVERRIDE;
+ ProjectExplorer::RunConfiguration *source) const Q_DECL_OVERRIDE;
ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent,
- ProjectExplorer::RunConfiguration *source) QTC_OVERRIDE;
+ ProjectExplorer::RunConfiguration *source) Q_DECL_OVERRIDE;
- bool canHandle(ProjectExplorer::Target *t) const QTC_OVERRIDE;
+ bool canHandle(ProjectExplorer::Target *t) const Q_DECL_OVERRIDE;
QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
const ProjectExplorer::Node *n
- ) QTC_OVERRIDE;
+ ) Q_DECL_OVERRIDE;
private:
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent,
- Core::Id id) QTC_OVERRIDE;
+ Core::Id id) Q_DECL_OVERRIDE;
ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
- const QVariantMap &map) QTC_OVERRIDE;
+ const QVariantMap &map) Q_DECL_OVERRIDE;
};
class IosRunControlFactory : public ProjectExplorer::IRunControlFactory
@@ -81,10 +80,10 @@ public:
explicit IosRunControlFactory(QObject *parent = 0);
bool canRun(ProjectExplorer::RunConfiguration *runConfiguration,
- ProjectExplorer::RunMode mode) const QTC_OVERRIDE;
+ ProjectExplorer::RunMode mode) const Q_DECL_OVERRIDE;
ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode,
- QString *errorMessage) QTC_OVERRIDE;
+ QString *errorMessage) Q_DECL_OVERRIDE;
private:
mutable QMap<Core::Id, QPointer<ProjectExplorer::RunControl> > m_activeRunControls;
};
diff --git a/src/plugins/ios/iossettingspage.h b/src/plugins/ios/iossettingspage.h
index edad802bc1695b7aa42e020599d6d08f2e000486..a90c097a53968a0e1ead2b71c287376952ffc17a 100644
--- a/src/plugins/ios/iossettingspage.h
+++ b/src/plugins/ios/iossettingspage.h
@@ -30,7 +30,6 @@
#define IOSSETTINGSPAGE_H
#include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
#include <QPointer>
@@ -46,9 +45,9 @@ class IosSettingsPage : public Core::IOptionsPage
public:
explicit IosSettingsPage(QObject *parent = 0);
- QWidget *widget() QTC_OVERRIDE;
- void apply() QTC_OVERRIDE;
- void finish() QTC_OVERRIDE;
+ QWidget *widget() Q_DECL_OVERRIDE;
+ void apply() Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
private:
QPointer<IosSettingsWidget> m_widget;
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index 29f2a0c1ed45630be1f7bc8e7f766fe3bec21139..6db8e805b07ef14cfc913c4a369dae957ac4fdac 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -31,7 +31,6 @@
#include <projectexplorer/devicesupport/idevice.h>
#include <utils/fileutils.h>
-#include <utils/qtcoverride.h>
#include <QSharedPointer>
@@ -46,20 +45,20 @@ class IosSimulator : public ProjectExplorer::IDevice
public:
typedef QSharedPointer<const IosSimulator> ConstPtr;
typedef QSharedPointer<IosSimulator> Ptr;
- ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE;
+ ProjectExplorer::IDevice::DeviceInfo deviceInformation() const Q_DECL_OVERRIDE;
- QString displayType() const QTC_OVERRIDE;
- ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE;
- QList<Core::Id> actionIds() const QTC_OVERRIDE;
- QString displayNameForActionId(Core::Id actionId) const QTC_OVERRIDE;
- void executeAction(Core::Id actionId, QWidget *parent = 0) QTC_OVERRIDE;
- ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const QTC_OVERRIDE;
- void fromMap(const QVariantMap &map) QTC_OVERRIDE;
- QVariantMap toMap() const QTC_OVERRIDE;
+ QString displayType() const Q_DECL_OVERRIDE;
+ ProjectExplorer::IDeviceWidget *createWidget() Q_DECL_OVERRIDE;
+ QList<Core::Id> actionIds() const Q_DECL_OVERRIDE;
+ QString displayNameForActionId(Core::Id actionId) const Q_DECL_OVERRIDE;
+ void executeAction(Core::Id actionId, QWidget *parent = 0) Q_DECL_OVERRIDE;
+ ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const Q_DECL_OVERRIDE;
+ void fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
+ QVariantMap toMap() const Q_DECL_OVERRIDE;
quint16 nextPort() const;
- bool canAutoDetectPorts() const QTC_OVERRIDE;
+ bool canAutoDetectPorts() const Q_DECL_OVERRIDE;
- ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE;
+ ProjectExplorer::IDevice::Ptr clone() const Q_DECL_OVERRIDE;
protected:
friend class IosSimulatorFactory;
diff --git a/src/plugins/ios/iossimulatorfactory.h b/src/plugins/ios/iossimulatorfactory.h
index aee1bface99c2383cc0df96ebc6a08d526ec0f60..1020bfa7088793f9936af892cf732533b1fc516b 100644
--- a/src/plugins/ios/iossimulatorfactory.h
+++ b/src/plugins/ios/iossimulatorfactory.h
@@ -30,7 +30,6 @@
#define IOSSIMULATORFACTORY_H
#include <projectexplorer/devicesupport/idevicefactory.h>
-#include <utils/qtcoverride.h>
namespace Ios {
namespace Internal {
@@ -41,13 +40,13 @@ class IosSimulatorFactory : public ProjectExplorer::IDeviceFactory
public:
IosSimulatorFactory();
- QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
- QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
+ QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
+ QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
- bool canCreate() const QTC_OVERRIDE;
- ProjectExplorer::IDevice::Ptr create(Core::Id id) const QTC_OVERRIDE;
- bool canRestore(const QVariantMap &map) const QTC_OVERRIDE;
- ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const QTC_OVERRIDE;
+ bool canCreate() const Q_DECL_OVERRIDE;
+ ProjectExplorer::IDevice::Ptr create(Core::Id id) const Q_DECL_OVERRIDE;
+ bool canRestore(const QVariantMap &map) const Q_DECL_OVERRIDE;
+ ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.h b/src/plugins/qmakeprojectmanager/profilecompletionassist.h
index 459552512ce28a59961a7473cfe1a31f8db3c84f..6c1ff3f76c7a76a3a279c051ae99cb066c9b5fef 100644
--- a/src/plugins/qmakeprojectmanager/profilecompletionassist.h
+++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.h
@@ -32,7 +32,6 @@
#include <texteditor/codeassist/completionassistprovider.h>
-#include <utils/qtcoverride.h>
#include <QStringList>
@@ -47,8 +46,8 @@ public:
void init();
~ProFileCompletionAssistProvider();
- bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
- TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
QStringList variables() const;
QStringList functions() const;
private:
diff --git a/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h b/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h
index 1061cd476238129b40ab4f1eabceab909434a3de..adfde1afe60e71188f835827e25867d333f3a12e 100644
--- a/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h
+++ b/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h
@@ -45,12 +45,12 @@ public:
virtual bool isVisible(const SelectionContext &m_selectionState) const = 0;
virtual bool isEnabled(const SelectionContext &m_selectionState) const = 0;
- ActionInterface::Type type() const QTC_OVERRIDE;
- QAction *action() const QTC_OVERRIDE;
+ ActionInterface::Type type() const Q_DECL_OVERRIDE;
+ QAction *action() const Q_DECL_OVERRIDE;
QMenu *menu() const;
SelectionContext selectionContext() const;
- virtual void currentContextChanged(const SelectionContext &selectionContext) QTC_OVERRIDE;
+ virtual void currentContextChanged(const SelectionContext &selectionContext) Q_DECL_OVERRIDE;
virtual void updateContext();
private:
diff --git a/src/plugins/qmldesigner/components/debugview/debugview.h b/src/plugins/qmldesigner/components/debugview/debugview.h
index f61be38424d4dbbbf978e845888882a8e9654d08..eda20bea7c85d0ab5bd8f6f26a7a93260451f6ad 100644
--- a/src/plugins/qmldesigner/components/debugview/debugview.h
+++ b/src/plugins/qmldesigner/components/debugview/debugview.h
@@ -48,50 +48,50 @@ public:
~DebugView();
// AbstractView
- void modelAttached(Model *model) QTC_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
- const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+ const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
- const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+ const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
- void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+ void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
- WidgetInfo widgetInfo() QTC_OVERRIDE;
- bool hasWidget() const QTC_OVERRIDE;
+ WidgetInfo widgetInfo() Q_DECL_OVERRIDE;
+ bool hasWidget() const Q_DECL_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
- void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+ void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
protected:
void log(const QString &title, const QString &message, bool highlight = false);
diff --git a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
index 646c077e9cdf22ea1dfb24dd96b49c424b9bb470..541eadb4dccbec9deacca4b648c0f9ca75159bce 100644
--- a/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
+++ b/src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
@@ -39,7 +39,7 @@ class QMLDESIGNERCORE_EXPORT AbstractCustomTool : public QmlDesigner::AbstractFo
public:
AbstractCustomTool();
- void selectedItemsChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
+ void selectedItemsChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
virtual QString name() const = 0;
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h
index eacef05229d466aa41efe623d1ccfef13e56d70b..612aefb340160dc5692bd25a2c4622d75aa8143d 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.h
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h
@@ -48,36 +48,36 @@ public:
DragTool(FormEditorView *editorView);
virtual ~DragTool();
- void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+ void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
- void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+ void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
- void dropEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
- void dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
- void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
- void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
+ void dropEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
+ void dragEnterEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
+ void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
+ void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
- void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
- void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+ void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
- void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
- void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+ void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
+ void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
void updateMoveManipulator();
void beginWithPoint(const QPointF &beginPoint);
- void clear() QTC_OVERRIDE;
+ void clear() Q_DECL_OVERRIDE;
- void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
void clearMoveDelay();
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
index fc0d9c9f78f596973241e2ba2d06f55dbdbd9790..106a641fa81276b698d9679c83607e22db9d147c 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
@@ -64,30 +64,30 @@ public:
~FormEditorView();
// AbstractView
- void modelAttached(Model *model) QTC_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
- void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
+ void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
- const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+ const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
- void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
+ void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE;
// FormEditorView
- WidgetInfo widgetInfo() QTC_OVERRIDE;
+ WidgetInfo widgetInfo() Q_DECL_OVERRIDE;
FormEditorWidget *formEditorWidget();
AbstractFormEditorTool *currentTool() const;
@@ -105,29 +105,29 @@ public:
void registerTool(AbstractCustomTool *tool);
- void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+ void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
double containerPadding() const;
double spacing() const;
void deActivateItemCreator();
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
- void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+ void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
protected:
void reset();
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.h b/src/plugins/qmldesigner/components/formeditor/movetool.h
index 9947037ea1d8e499ebebc28752bdb120ae2ed785..1cbe637b5b33223986cafd8758b2ecae0641a262 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.h
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.h
@@ -47,32 +47,32 @@ public:
MoveTool(FormEditorView* editorView);
~MoveTool();
- void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
- void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+ void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+ void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
- void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
- void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+ void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
+ void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
- void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
- void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+ void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
+ void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
void updateMoveManipulator();
void beginWithPoint(const QPointF &beginPoint);
- void clear() QTC_OVERRIDE;
+ void clear() Q_DECL_OVERRIDE;
- void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
protected:
static bool haveSameParent(const QList<FormEditorItem*> &itemList);
diff --git a/src/plugins/qmldesigner/components/formeditor/resizetool.h b/src/plugins/qmldesigner/components/formeditor/resizetool.h
index f6f067eb0c50333debf0ae3e7e5b92b487f4c87d..2cd98f7c2e5639dac0d6fd3b026b8a769bdabaa5 100644
--- a/src/plugins/qmldesigner/components/formeditor/resizetool.h
+++ b/src/plugins/qmldesigner/components/formeditor/resizetool.h
@@ -45,30 +45,30 @@ public:
ResizeTool(FormEditorView* editorView);
~ResizeTool();
- void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+ void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
- void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+ void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
- void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
- void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) QTC_OVERRIDE;
+ void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
+ void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE;
- void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
- void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+ void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
- void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void clear() QTC_OVERRIDE;
+ void clear() Q_DECL_OVERRIDE;
- void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
- void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
+ void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
+ void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
- void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+ void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
private:
diff --git a/src/plugins/qmldesigner/components/formeditor/selectiontool.h b/src/plugins/qmldesigner/components/formeditor/selectiontool.h
index 20c6632bef29f866cb430ebe39a2f449af5d8365..cc7f1cca91211ec72ad9126eeb0e47ba43da8789 100644
--- a/src/plugins/qmldesigner/components/formeditor/selectiontool.h
+++ b/src/plugins/qmldesigner/components/formeditor/selectiontool.h
@@ -51,35 +51,35 @@ public:
SelectionTool(FormEditorView* editorView);
~SelectionTool();
- void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
- void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+ void mousePressEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
+ void mouseDoubleClickEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
- void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) QTC_OVERRIDE;
+ void hoverMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE;
- void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
- void keyReleaseEvent(QKeyEvent *keyEvent) QTC_OVERRIDE;
+ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+ void keyReleaseEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE;
- void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
- void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) QTC_OVERRIDE;
+ void dragLeaveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
+ void dragMoveEvent(const QList<QGraphicsItem*> &itemList, QGraphicsSceneDragDropEvent * event) Q_DECL_OVERRIDE;
- void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void itemsAboutToRemoved(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
// QVariant itemChange(const QList<QGraphicsItem*> &itemList,
// QGraphicsItem::GraphicsItemChange change,
// const QVariant &value );
// void update();
- void clear() QTC_OVERRIDE;
+ void clear() Q_DECL_OVERRIDE;
- void selectedItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void selectedItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
+ void formEditorItemsChanged(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
- void instancesCompleted(const QList<FormEditorItem*> &itemList) QTC_OVERRIDE;
- void instancesParentChanged(const QList<FormEditorItem *> &itemList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
+ void instancesCompleted(const QList<FormEditorItem*> &itemList) Q_DECL_OVERRIDE;
+ void instancesParentChanged(const QList<FormEditorItem *> &itemList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
void selectUnderPoint(QGraphicsSceneMouseEvent *event);
diff --git a/src/plugins/qmldesigner/components/integration/componentview.h b/src/plugins/qmldesigner/components/integration/componentview.h
index bf1fba2a5c3869988f42bd0be242608ac32a52bb..ecc3e32bff1f30aeeb822180ed3400b48e275051 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.h
+++ b/src/plugins/qmldesigner/components/integration/componentview.h
@@ -56,60 +56,60 @@ public:
ComponentView(QObject *parent = 0);
- void modelAttached(Model *model) QTC_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
ComponentAction *action();
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void bindingPropertiesChanged(const QList<BindingProperty>& propertyList,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
- const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+ const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
- void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
+ void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
- void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
+ void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
void customNotification(const AbstractView *view, const QString &identifier,
- const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
+ const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
QStandardItemModel *standardItemModel() const;
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.h b/src/plugins/qmldesigner/components/integration/designdocumentview.h
index 96cfb1d7b9c206fdd0bcb1387aaa147783669298..c5cd7ffecfbf37906ad105e91e09d7b3ac9bf218 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentview.h
+++ b/src/plugins/qmldesigner/components/integration/designdocumentview.h
@@ -42,46 +42,46 @@ public:
DesignDocumentView(QObject *parent = 0);
~DesignDocumentView();
- virtual void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
- virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ virtual void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ virtual void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
+ virtual void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
virtual void nodeAboutToBeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
virtual void nodeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ virtual void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ virtual void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ virtual void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ virtual void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ virtual void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ virtual void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ virtual void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
virtual void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
- const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+ const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
- virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
- virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+ virtual void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
+ virtual void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
void rewriterBeginTransaction();
void rewriterEndTransaction();
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
ModelNode insertModel(const ModelNode &modelNode)
{ return m_modelMerger.insertModel(modelNode); }
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
index 7bd6a0111b4fda1bad0d488985ca892f85924ae9..d9bcc4cefaa8967ca2481e59757a8b3da05204a3 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
@@ -48,57 +48,57 @@ public:
ItemLibraryView(QObject* parent = 0);
~ItemLibraryView();
- bool hasWidget() const QTC_OVERRIDE;
- WidgetInfo widgetInfo() QTC_OVERRIDE;
+ bool hasWidget() const Q_DECL_OVERRIDE;
+ WidgetInfo widgetInfo() Q_DECL_OVERRIDE;
// AbstractView
- void modelAttached(Model *model) QTC_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
void variantPropertiesChanged(const QList<VariantProperty> &propertyList,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void bindingPropertiesChanged(const QList<BindingProperty> &propertyList,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
- void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
+ void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
- const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
- void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
-
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
-
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
-
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+ const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
+ void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
+
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
+
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
+
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
void setResourcePath(const QString &resourcePath);
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h
index 5918c557629eb765e1f3ec0641baa354b70eff6b..b27803ba80a9d3cb203d37dd4da1284edb88b860 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorview.h
+++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h
@@ -57,45 +57,45 @@ public:
WidgetInfo widgetInfo();
// AbstractView
- void modelAttached(Model *model) QTC_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
- void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
+ void variantPropertiesChanged(const QList<VariantProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
- void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
- void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+ void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
+ void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList ,
- const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
- void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
-
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
-
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
-
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+ const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
+ void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
+
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
+
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
+
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
private slots:
void changeSelection(const QItemSelection &selected, const QItemSelection &deselected);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
index e3021586deaa26c566adc2fac6093003992e107e..e9a6de54516c323bd6f54541cf57ce87208958af 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h
@@ -62,46 +62,46 @@ public:
WidgetInfo widgetInfo();
void selectedNodesChanged(const QList<ModelNode> &selectedNodeList,
- const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+ const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
- void modelAttached(Model *model) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
ModelState modelState() const;
- void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
- void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+ void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
void resetView();
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
-
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
protected:
void timerEvent(QTimerEvent *event);
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
index a7c1b0a481fc6326e6770bb93a786318303c573d..f92e2121446162614dd8fadcbcf06672706fa22d 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
@@ -55,53 +55,53 @@ public:
QmlModelStateGroup rootStateGroup() const;
// AbstractView
- void modelAttached(Model *model) QTC_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
void variantPropertiesChanged(const QList<VariantProperty>& propertyList,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
void nodeRemoved(const ModelNode &removedNode,
const NodeAbstractProperty &parentProperty,
- PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeAboutToBeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
// AbstractView
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
-
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
- void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) QTC_OVERRIDE;
- void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
-
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
-
- WidgetInfo widgetInfo() QTC_OVERRIDE;
-
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
+
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
+ void nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId) Q_DECL_OVERRIDE;
+ void bindingPropertiesChanged(const QList<BindingProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
+
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+
+ WidgetInfo widgetInfo() Q_DECL_OVERRIDE;
+
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty> &propertyList) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
public slots:
void synchonizeCurrentStateFromWidget();
diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp
index 6894e5df23f0aaef58e0c27f7c70941e95d03cd8..cb7fc0cd8e18ac607abdfb3a0faff4cef087eba8 100644
--- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp
+++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.cpp
@@ -49,7 +49,7 @@ public:
{ }
public /*slots*/:
- void actionTriggered(bool) QTC_OVERRIDE
+ void actionTriggered(bool) Q_DECL_OVERRIDE
{
DocumentManager::goIntoComponent(m_selectionContext.targetNode());
}
diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h
index e4d7db2c4242df2723c47ffb6c9db5db67d79c8a..a878c9baeeb74566a47171eb8135063c65845f69 100644
--- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h
+++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h
@@ -39,10 +39,10 @@ class EnterTabDesignerAction : public AbstractActionGroup
public:
EnterTabDesignerAction();
- QByteArray category() const QTC_OVERRIDE;
- QByteArray menuId() const QTC_OVERRIDE;
- int priority() const QTC_OVERRIDE;
- void updateContext() QTC_OVERRIDE;
+ QByteArray category() const Q_DECL_OVERRIDE;
+ QByteArray menuId() const Q_DECL_OVERRIDE;
+ int priority() const Q_DECL_OVERRIDE;
+ void updateContext() Q_DECL_OVERRIDE;
protected:
bool isVisible(const SelectionContext &selectionContext) const;
diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
index bc027c0f71d2e14bf32e86f69e89d6f54f5d2931..c3254419c6601fbe0994bfcae6739daf688e0f4f 100644
--- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
+++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
@@ -84,44 +84,44 @@ public:
explicit NodeInstanceView(QObject *parent = 0, NodeInstanceServerInterface::RunModus runModus = NodeInstanceServerInterface::NormalModus);
~NodeInstanceView();
- void modelAttached(Model *model) QTC_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
- void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
+ void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeAboutToBeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
- void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
- void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
- void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
- void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) QTC_OVERRIDE;
- void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) QTC_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
-
-
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
+ void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE;
+ void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
+ void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
+ void auxiliaryDataChanged(const ModelNode &node, const PropertyName &name, const QVariant &data) Q_DECL_OVERRIDE;
+ void customNotification(const AbstractView *view, const QString &identifier, const QList<ModelNode> &nodeList, const QList<QVariant> &data) Q_DECL_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
+
+
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
void currentStateChanged(const ModelNode &node);
diff --git a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
index a1ad1acad95c7623cb407f252783dbe9cc35e58a..50f5213b35f56750696e6c913720907dd6446fbc 100644
--- a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
+++ b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
@@ -33,7 +33,6 @@
#include <QtGlobal>
#include <QList>
-#include <utils/qtcoverride.h>
// Unnecessary since core isn't a dll any more.
diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h
index 770b2424645714522a9886f9330b7e6987728484..953b4a9f25834b7daa9c25f3f321f3965aea509e 100644
--- a/src/plugins/qmldesigner/designercore/include/rewriterview.h
+++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h
@@ -114,51 +114,51 @@ public:
RewriterView(DifferenceHandling differenceHandling, QObject *parent);
~RewriterView();
- void modelAttached(Model *model) QTC_OVERRIDE;
- void modelAboutToBeDetached(Model *model) QTC_OVERRIDE;
- void nodeCreated(const ModelNode &createdNode) QTC_OVERRIDE;
- void nodeAboutToBeRemoved(const ModelNode &removedNode) QTC_OVERRIDE;
- void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- void propertiesRemoved(const QList<AbstractProperty>& propertyList) QTC_OVERRIDE;
- void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ void modelAttached(Model *model) Q_DECL_OVERRIDE;
+ void modelAboutToBeDetached(Model *model) Q_DECL_OVERRIDE;
+ void nodeCreated(const ModelNode &createdNode) Q_DECL_OVERRIDE;
+ void nodeAboutToBeRemoved(const ModelNode &removedNode) Q_DECL_OVERRIDE;
+ void nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ void propertiesRemoved(const QList<AbstractProperty>& propertyList) Q_DECL_OVERRIDE;
+ void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty>& propertyList,PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeAboutToBeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
void nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
- AbstractView::PropertyChangeFlags propertyChange) QTC_OVERRIDE;
- void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) QTC_OVERRIDE;
- void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) QTC_OVERRIDE;
- void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) QTC_OVERRIDE;
+ AbstractView::PropertyChangeFlags propertyChange) Q_DECL_OVERRIDE;
+ void nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) Q_DECL_OVERRIDE;
+ void nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &movedNode, int oldIndex) Q_DECL_OVERRIDE;
+ void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) Q_DECL_OVERRIDE;
void customNotification(const AbstractView *view, const QString &identifier,
const QList<ModelNode> &nodeList,
- const QList<QVariant> &data) QTC_OVERRIDE;
- void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) QTC_OVERRIDE;
+ const QList<QVariant> &data) Q_DECL_OVERRIDE;
+ void scriptFunctionsChanged(const ModelNode &node, const QStringList &scriptFunctionList) Q_DECL_OVERRIDE;
- void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) QTC_OVERRIDE;
- void instancesCompleted(const QVector<ModelNode> &completedNodeList) QTC_OVERRIDE;
- void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) QTC_OVERRIDE;
- void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesChildrenChanged(const QVector<ModelNode> &nodeList) QTC_OVERRIDE;
- void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) QTC_OVERRIDE;
+ void instancePropertyChange(const QList<QPair<ModelNode, PropertyName> > &propertyList) Q_DECL_OVERRIDE;
+ void instancesCompleted(const QVector<ModelNode> &completedNodeList) Q_DECL_OVERRIDE;
+ void instanceInformationsChange(const QMultiHash<ModelNode, InformationName> &informationChangeHash) Q_DECL_OVERRIDE;
+ void instancesRenderImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesPreviewImageChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesChildrenChanged(const QVector<ModelNode> &nodeList) Q_DECL_OVERRIDE;
+ void instancesToken(const QString &tokenName, int tokenNumber, const QVector<ModelNode> &nodeVector) Q_DECL_OVERRIDE;
- void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) QTC_OVERRIDE;
+ void nodeSourceChanged(const ModelNode &modelNode, const QString &newNodeSource) Q_DECL_OVERRIDE;
- void rewriterBeginTransaction() QTC_OVERRIDE;
- void rewriterEndTransaction() QTC_OVERRIDE;
+ void rewriterBeginTransaction() Q_DECL_OVERRIDE;
+ void rewriterEndTransaction() Q_DECL_OVERRIDE;
- void currentStateChanged(const ModelNode &node) QTC_OVERRIDE;
+ void currentStateChanged(const ModelNode &node) Q_DECL_OVERRIDE;
- void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) QTC_OVERRIDE;
+ void importsChanged(const QList<Import> &addedImports, const QList<Import> &removedImports) Q_DECL_OVERRIDE;
- void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) QTC_OVERRIDE;
+ void fileUrlChanged(const QUrl &oldUrl, const QUrl &newUrl) Q_DECL_OVERRIDE;
- void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) QTC_OVERRIDE;
+ void selectedNodesChanged(const QList<ModelNode> &selectedNodeList, const QList<ModelNode> &lastSelectedNodeList) Q_DECL_OVERRIDE;
TextModifier *textModifier() const;
void setTextModifier(TextModifier *textModifier);
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp
index b7eedd591ec661b63e40f89d2e812ecf6daa1b40..f04f3b73fba7511584768ffc375f68572b0644bb 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.cpp
+++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp
@@ -42,7 +42,6 @@
#include <texteditor/completionsettings.h>
#include <utils/qtcassert.h>
-#include <utils/qtcoverride.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljs/parser/qmljsast_p.h>
@@ -135,7 +134,7 @@ public:
, order(order)
{}
- void operator()(const Value *base, const QString &name, const Value *value) QTC_OVERRIDE
+ void operator()(const Value *base, const QString &name, const Value *value) Q_DECL_OVERRIDE
{
Q_UNUSED(base)
QVariant data;
@@ -163,7 +162,7 @@ public:
, afterOn(afterOn)
{}
- void operator ()(const Value *base, const QString &name, const Value *) QTC_OVERRIDE
+ void operator ()(const Value *base, const QString &name, const Value *) Q_DECL_OVERRIDE
{
const CppComponentValue *qmlBase = value_cast<CppComponentValue>(base);
@@ -245,34 +244,34 @@ private:
(*_propertyProcessor)(_currentObject, name, value);
}
- bool processProperty(const QString &name, const Value *value, const PropertyInfo &) QTC_OVERRIDE
+ bool processProperty(const QString &name, const Value *value, const PropertyInfo &) Q_DECL_OVERRIDE
{
process(name, value);
return true;
}
- bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE
+ bool processEnumerator(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
if (! _globalCompletion)
process(name, value);
return true;
}
- bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE
+ bool processSignal(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
if (_globalCompletion)
process(name, value);
return true;
}
- bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE
+ bool processSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
if (_enumerateSlots)
process(name, value);
return true;
}
- bool processGeneratedSlot(const QString &name, const Value *value) QTC_OVERRIDE
+ bool processGeneratedSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
{
if (_enumerateGeneratedSlots || (_currentObject && _currentObject->className().endsWith(QLatin1String("Keys")))) {
// ### FIXME: add support for attached properties.
@@ -403,10 +402,10 @@ public:
, m_isVariadic(isVariadic)
{}
- void reset() QTC_OVERRIDE {}
- int size() const QTC_OVERRIDE { return 1; }
- QString text(int index) const QTC_OVERRIDE;
- int activeArgument(const QString &prefix) const QTC_OVERRIDE;
+ void reset() Q_DECL_OVERRIDE {}
+ int size() const Q_DECL_OVERRIDE { return 1; }
+ QString text(int index) const Q_DECL_OVERRIDE;
+ int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
private:
QString m_functionName;
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h
index 4fa5349af5790ed8868af09b154d412b2f415057..a932b7033b4b1673824afcefb5d564227fa1b074 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.h
+++ b/src/plugins/qmljseditor/qmljscompletionassist.h
@@ -39,7 +39,6 @@
#include <texteditor/snippets/snippetassistcollector.h>
#include <texteditor/codeassist/assistinterface.h>
-#include <utils/qtcoverride.h>
#include <QStringList>
#include <QScopedPointer>
@@ -56,9 +55,9 @@ class QmlJSCompletionAssistInterface;
class QmlJSAssistProposalItem : public TextEditor::AssistProposalItem
{
public:
- bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
+ bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
void applyContextualContent(TextEditor::BaseTextEditorWidget *editorWidget,
- int basePosition) const QTC_OVERRIDE;
+ int basePosition) const Q_DECL_OVERRIDE;
};
@@ -70,9 +69,9 @@ public:
loadContent(items);
}
- void filter(const QString &prefix) QTC_OVERRIDE;
- void sort(const QString &prefix) QTC_OVERRIDE;
- bool keepPerfectMatch(TextEditor::AssistReason reason) const QTC_OVERRIDE;
+ void filter(const QString &prefix) Q_DECL_OVERRIDE;
+ void sort(const QString &prefix) Q_DECL_OVERRIDE;
+ bool keepPerfectMatch(TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
};
@@ -81,12 +80,12 @@ class QmlJSCompletionAssistProvider : public TextEditor::CompletionAssistProvide
Q_OBJECT
public:
- bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
- TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
- int activationCharSequenceLength() const QTC_OVERRIDE;
- bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
- bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;
+ int activationCharSequenceLength() const Q_DECL_OVERRIDE;
+ bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE;
+ bool isContinuationChar(const QChar &c) const Q_DECL_OVERRIDE;
};
@@ -96,7 +95,7 @@ public:
QmlJSCompletionAssistProcessor();
~QmlJSCompletionAssistProcessor();
- TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) QTC_OVERRIDE;
+ TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
private:
TextEditor::IAssistProposal *createContentProposal() const;
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.h b/src/plugins/qmljseditor/qmljsquickfixassist.h
index 60965b5168696c6671201e80849c6a4353a07e64..23078ce355a271fba6c1d7387c65b48edb50068e 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.h
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.h
@@ -38,7 +38,6 @@
#include <texteditor/codeassist/quickfixassistprovider.h>
#include <texteditor/codeassist/quickfixassistprocessor.h>
-#include <utils/qtcoverride.h>
namespace QmlJSEditor {
namespace Internal {
@@ -64,7 +63,7 @@ public:
QmlJSQuickFixProcessor(const TextEditor::IAssistProvider *provider);
~QmlJSQuickFixProcessor();
- const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
+ const TextEditor::IAssistProvider *provider() const Q_DECL_OVERRIDE;
private:
const TextEditor::IAssistProvider *m_provider;
@@ -77,11 +76,11 @@ public:
QmlJSQuickFixAssistProvider();
~QmlJSQuickFixAssistProvider();
- bool isAsynchronous() const QTC_OVERRIDE;
- bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
- TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+ bool isAsynchronous() const Q_DECL_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
- QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
+ QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE;
};
} // Internal
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h
index 64a41ee04281b1cb94f86fc8c0a1dac930af84f4..7caa988a645e4c74b00d51c6b2abee2e1fce064a 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.h
+++ b/src/plugins/qmljstools/qmljsmodelmanager.h
@@ -37,7 +37,6 @@
#include <qmljs/qmljsconstants.h>
#include <cplusplus/CppDocument.h>
-#include <utils/qtcoverride.h>
#include <QFuture>
#include <QFutureSynchronizer>
@@ -61,11 +60,11 @@ public:
void delayedInitialization();
protected:
- QHash<QString, QmlJS::Dialect> languageForSuffix() const QTC_OVERRIDE;
- void writeMessageInternal(const QString &msg) const QTC_OVERRIDE;
- WorkingCopy workingCopyInternal() const QTC_OVERRIDE;
- void addTaskInternal(QFuture<void> result, const QString &msg, const char *taskId) const QTC_OVERRIDE;
- ProjectInfo defaultProjectInfoForProject(ProjectExplorer::Project *project) const QTC_OVERRIDE;
+ QHash<QString, QmlJS::Dialect> languageForSuffix() const Q_DECL_OVERRIDE;
+ void writeMessageInternal(const QString &msg) const Q_DECL_OVERRIDE;
+ WorkingCopy workingCopyInternal() const Q_DECL_OVERRIDE;
+ void addTaskInternal(QFuture<void> result, const QString &msg, const char *taskId) const Q_DECL_OVERRIDE;
+ ProjectInfo defaultProjectInfoForProject(ProjectExplorer::Project *project) const Q_DECL_OVERRIDE;
private slots:
void updateDefaultProjectInfo();
private:
diff --git a/src/plugins/texteditor/circularclipboardassist.cpp b/src/plugins/texteditor/circularclipboardassist.cpp
index 91dad8f8a1707b79216b17616726aa4486626327..711215dd346ee80f12e9fbd51375a87afe2e4ed8 100644
--- a/src/plugins/texteditor/circularclipboardassist.cpp
+++ b/src/plugins/texteditor/circularclipboardassist.cpp
@@ -39,7 +39,6 @@
#include <coreplugin/coreconstants.h>
-#include <utils/qtcoverride.h>
#include <QApplication>
#include <QClipboard>
@@ -63,7 +62,7 @@ public:
setText(text);
}
- void apply(BaseTextEditorWidget *editorWidget, int /*basePosition*/) const QTC_OVERRIDE
+ void apply(BaseTextEditorWidget *editorWidget, int /*basePosition*/) const Q_DECL_OVERRIDE
{
//Move to last in circular clipboard
@@ -87,7 +86,7 @@ private:
class ClipboardAssistProcessor: public IAssistProcessor
{
public:
- IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE
+ IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE
{
if (!interface)
return 0;
diff --git a/src/plugins/texteditor/circularclipboardassist.h b/src/plugins/texteditor/circularclipboardassist.h
index 9a997e663bef76eb7f9d6b771af4c5fac3773ae0..9c375e90b4c3faf7f825d235f8f3846aaa4b69e9 100644
--- a/src/plugins/texteditor/circularclipboardassist.h
+++ b/src/plugins/texteditor/circularclipboardassist.h
@@ -32,7 +32,6 @@
#include "codeassist/iassistprovider.h"
-#include <utils/qtcoverride.h>
namespace TextEditor {
namespace Internal {
@@ -41,8 +40,8 @@ class ClipboardAssistProvider: public IAssistProvider
{
public:
bool isAsynchronous() const;
- bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
- IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
+ IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
};
} // namespace Internal
diff --git a/src/plugins/texteditor/codeassist/assistinterface.h b/src/plugins/texteditor/codeassist/assistinterface.h
index cdc200925eb99a920529546d12ee96e519e40338..68dc0a672652bda87b30456d0d734cf528cb73bb 100644
--- a/src/plugins/texteditor/codeassist/assistinterface.h
+++ b/src/plugins/texteditor/codeassist/assistinterface.h
@@ -34,7 +34,6 @@
#include <texteditor/texteditor_global.h>
-#include <utils/qtcoverride.h>
#include <QString>
diff --git a/src/plugins/texteditor/codeassist/assistproposalitem.h b/src/plugins/texteditor/codeassist/assistproposalitem.h
index 2de055157bfa30ec23339d94268ffc877b2062f5..3e9d9820998bc133b7e688f47e440318b5b088e9 100644
--- a/src/plugins/texteditor/codeassist/assistproposalitem.h
+++ b/src/plugins/texteditor/codeassist/assistproposalitem.h
@@ -32,7 +32,6 @@
#include <texteditor/texteditor_global.h>
-#include <utils/qtcoverride.h>
#include <QIcon>
#include <QString>
diff --git a/src/plugins/texteditor/codeassist/completionassistprovider.h b/src/plugins/texteditor/codeassist/completionassistprovider.h
index 7df0b5aba59f1edc00ec2c2e3138f8c4114aa9be..2c514c9448c959d2b72f643781214057077e717a 100644
--- a/src/plugins/texteditor/codeassist/completionassistprovider.h
+++ b/src/plugins/texteditor/codeassist/completionassistprovider.h
@@ -32,7 +32,6 @@
#include "iassistprovider.h"
-#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -44,7 +43,7 @@ public:
CompletionAssistProvider();
~CompletionAssistProvider();
- bool isAsynchronous() const QTC_OVERRIDE;
+ bool isAsynchronous() const Q_DECL_OVERRIDE;
virtual int activationCharSequenceLength() const;
virtual bool isActivationCharSequence(const QString &sequence) const;
virtual bool isContinuationChar(const QChar &c) const;
diff --git a/src/plugins/texteditor/codeassist/functionhintproposal.h b/src/plugins/texteditor/codeassist/functionhintproposal.h
index 1089b71f51b6d4111836ce2801dd614d83215b71..b83f753a7369348530adb53a66f5a59d4939418d 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposal.h
+++ b/src/plugins/texteditor/codeassist/functionhintproposal.h
@@ -32,7 +32,6 @@
#include "iassistproposal.h"
-#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -44,12 +43,12 @@ public:
FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model);
~FunctionHintProposal();
- bool isFragile() const QTC_OVERRIDE;
- int basePosition() const QTC_OVERRIDE;
- bool isCorrective() const QTC_OVERRIDE;
- void makeCorrection(BaseTextEditorWidget *editorWidget) QTC_OVERRIDE;
- IAssistProposalModel *model() const QTC_OVERRIDE;
- IAssistProposalWidget *createWidget() const QTC_OVERRIDE;
+ bool isFragile() const Q_DECL_OVERRIDE;
+ int basePosition() const Q_DECL_OVERRIDE;
+ bool isCorrective() const Q_DECL_OVERRIDE;
+ void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
+ IAssistProposalModel *model() const Q_DECL_OVERRIDE;
+ IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE;
private:
int m_basePosition;
diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
index de8b1b1120e52dc8cf6eeb3d35833ea5924c2a33..d4122752e2b6f54e6d600e6b940a54c822f3c90b 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
+++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h
@@ -32,7 +32,6 @@
#include "iassistproposalwidget.h"
-#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -46,20 +45,20 @@ public:
FunctionHintProposalWidget();
~FunctionHintProposalWidget();
- void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE;
- void setReason(AssistReason reason) QTC_OVERRIDE;
- void setKind(AssistKind kind) QTC_OVERRIDE;
- void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE;
- void setModel(IAssistProposalModel *model) QTC_OVERRIDE;
- void setDisplayRect(const QRect &rect) QTC_OVERRIDE;
- void setIsSynchronized(bool isSync) QTC_OVERRIDE;
+ void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE;
+ void setReason(AssistReason reason) Q_DECL_OVERRIDE;
+ void setKind(AssistKind kind) Q_DECL_OVERRIDE;
+ void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE;
+ void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE;
+ void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE;
+ void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE;
- void showProposal(const QString &prefix) QTC_OVERRIDE;
- void updateProposal(const QString &prefix) QTC_OVERRIDE;
- void closeProposal() QTC_OVERRIDE;
+ void showProposal(const QString &prefix) Q_DECL_OVERRIDE;
+ void updateProposal(const QString &prefix) Q_DECL_OVERRIDE;
+ void closeProposal() Q_DECL_OVERRIDE;
protected:
- bool eventFilter(QObject *o, QEvent *e) QTC_OVERRIDE;
+ bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
private slots:
void nextPage();
diff --git a/src/plugins/texteditor/codeassist/genericproposal.h b/src/plugins/texteditor/codeassist/genericproposal.h
index 8cc35d33c364b07dbb8604cf5bdff2312c610cf3..bc7bd557d6490c399db97005fd5827170b65e113 100644
--- a/src/plugins/texteditor/codeassist/genericproposal.h
+++ b/src/plugins/texteditor/codeassist/genericproposal.h
@@ -32,7 +32,6 @@
#include "iassistproposal.h"
-#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -46,12 +45,12 @@ public:
GenericProposal(int cursorPos, const QList<AssistProposalItem *> &items);
~GenericProposal();
- bool isFragile() const QTC_OVERRIDE;
- int basePosition() const QTC_OVERRIDE;
- bool isCorrective() const QTC_OVERRIDE;
- void makeCorrection(BaseTextEditorWidget *editorWidget) QTC_OVERRIDE;
- IAssistProposalModel *model() const QTC_OVERRIDE;
- IAssistProposalWidget *createWidget() const QTC_OVERRIDE;
+ bool isFragile() const Q_DECL_OVERRIDE;
+ int basePosition() const Q_DECL_OVERRIDE;
+ bool isCorrective() const Q_DECL_OVERRIDE;
+ void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
+ IAssistProposalModel *model() const Q_DECL_OVERRIDE;
+ IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE;
protected:
void moveBasePosition(int length);
diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.h b/src/plugins/texteditor/codeassist/genericproposalmodel.h
index b8dbfe3f0753addbcde1cd092742472357d39679..e8d553cab13b7bab4fa7d8ef3e92b4c82773b0da 100644
--- a/src/plugins/texteditor/codeassist/genericproposalmodel.h
+++ b/src/plugins/texteditor/codeassist/genericproposalmodel.h
@@ -35,7 +35,6 @@
#include <texteditor/texteditor_global.h>
-#include <utils/qtcoverride.h>
#include <QHash>
#include <QIcon>
@@ -52,9 +51,9 @@ public:
GenericProposalModel();
~GenericProposalModel();
- void reset() QTC_OVERRIDE;
- int size() const QTC_OVERRIDE;
- QString text(int index) const QTC_OVERRIDE;
+ void reset() Q_DECL_OVERRIDE;
+ int size() const Q_DECL_OVERRIDE;
+ QString text(int index) const Q_DECL_OVERRIDE;
virtual QIcon icon(int index) const;
virtual QString detail(int index) const;
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.h b/src/plugins/texteditor/codeassist/genericproposalwidget.h
index caf0133d55e234d0cd0910ff2d8aac3e37e318db..fdcd6a5dba30335937a9bbe3a3dfe2e3a2300196 100644
--- a/src/plugins/texteditor/codeassist/genericproposalwidget.h
+++ b/src/plugins/texteditor/codeassist/genericproposalwidget.h
@@ -34,7 +34,6 @@
#include <texteditor/texteditor_global.h>
-#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -50,17 +49,17 @@ public:
GenericProposalWidget();
~GenericProposalWidget();
- void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE;
- void setReason(AssistReason reason) QTC_OVERRIDE;
- void setKind(AssistKind kind) QTC_OVERRIDE;
- void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE;
- void setModel(IAssistProposalModel *model) QTC_OVERRIDE;
- void setDisplayRect(const QRect &rect) QTC_OVERRIDE;
- void setIsSynchronized(bool isSync) QTC_OVERRIDE;
-
- void showProposal(const QString &prefix) QTC_OVERRIDE;
- void updateProposal(const QString &prefix) QTC_OVERRIDE;
- void closeProposal() QTC_OVERRIDE;
+ void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE;
+ void setReason(AssistReason reason) Q_DECL_OVERRIDE;
+ void setKind(AssistKind kind) Q_DECL_OVERRIDE;
+ void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE;
+ void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE;
+ void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE;
+ void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE;
+
+ void showProposal(const QString &prefix) Q_DECL_OVERRIDE;
+ void updateProposal(const QString &prefix) Q_DECL_OVERRIDE;
+ void closeProposal() Q_DECL_OVERRIDE;
private:
bool updateAndCheck(const QString &prefix);
diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.h b/src/plugins/texteditor/codeassist/keywordscompletionassist.h
index 6803d02c2ae0b5c0e918157e27fefda263d7379c..243be1fdb8e3960e454535fcceebea8fd47fbbb6 100644
--- a/src/plugins/texteditor/codeassist/keywordscompletionassist.h
+++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.h
@@ -34,7 +34,6 @@
#include "assistproposalitem.h"
#include "ifunctionhintproposalmodel.h"
-#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -62,8 +61,8 @@ public:
KeywordsAssistProposalItem(bool isFunction);
~KeywordsAssistProposalItem();
- bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
- void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const QTC_OVERRIDE;
+ bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
+ void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE;
private:
bool m_isFunction;
};
@@ -74,10 +73,10 @@ public:
KeywordsFunctionHintModel(const QStringList &functionSymbols);
~KeywordsFunctionHintModel();
- void reset() QTC_OVERRIDE;
- int size() const QTC_OVERRIDE;
- QString text(int index) const QTC_OVERRIDE;
- int activeArgument(const QString &prefix) const QTC_OVERRIDE;
+ void reset() Q_DECL_OVERRIDE;
+ int size() const Q_DECL_OVERRIDE;
+ QString text(int index) const Q_DECL_OVERRIDE;
+ int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
private:
QStringList m_functionSymbols;
@@ -89,7 +88,7 @@ public:
KeywordsCompletionAssistProcessor(Keywords keywords);
~KeywordsCompletionAssistProcessor();
- IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE;
+ IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE;
QChar startOfCommentChar() const;
private:
diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.h b/src/plugins/texteditor/codeassist/quickfixassistprocessor.h
index 04994d6885f28a4ab1369d13c030b258aca59d40..97430b0eb54b231e24c6203b90efea931cc629fe 100644
--- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.h
+++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.h
@@ -32,7 +32,6 @@
#include "iassistprocessor.h"
-#include <utils/qtcoverride.h>
namespace TextEditor {
@@ -44,7 +43,7 @@ public:
virtual const IAssistProvider *provider() const = 0;
- IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE;
+ IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE;
};
} // TextEditor
diff --git a/src/tools/iostool/iosdevicemanager.cpp b/src/tools/iostool/iosdevicemanager.cpp
index f26d2f7e624aaf741063896e1a2e7a000b98c667..6915902887e3e17c138fcd126da9c9d8ca5dc868 100644
--- a/src/tools/iostool/iosdevicemanager.cpp
+++ b/src/tools/iostool/iosdevicemanager.cpp
@@ -266,8 +266,8 @@ public:
bool startService(const QString &service, ServiceSocket &fd);
void stopService(ServiceSocket fd);
void startDeviceLookup(int timeout);
- bool connectToPort(quint16 port, ServiceSocket *fd) QTC_OVERRIDE;
- int qmljsDebugPort() const QTC_OVERRIDE;
+ bool connectToPort(quint16 port, ServiceSocket *fd) Q_DECL_OVERRIDE;
+ int qmljsDebugPort() const Q_DECL_OVERRIDE;
void addError(const QString &msg);
bool writeAll(ServiceSocket fd, const char *cmd, qptrdiff len = -1);
bool sendGdbCommand(ServiceSocket fd, const char *cmd, qptrdiff len = -1);
@@ -339,7 +339,7 @@ public:
void deviceCallbackReturned();
bool installApp();
bool runApp();
- int qmljsDebugPort() const QTC_OVERRIDE;
+ int qmljsDebugPort() const Q_DECL_OVERRIDE;
am_res_t appTransferCallback(CFDictionaryRef dict);
am_res_t appInstallCallback(CFDictionaryRef dict);
void reportProgress2(int progress, const QString &status);
diff --git a/src/tools/iostool/iosdevicemanager.h b/src/tools/iostool/iosdevicemanager.h
index cd41a03a940601cd13431d8b90c2268a5cc87362..238ede1cfe893d67a39cdaf214ff61c0866864c2 100644
--- a/src/tools/iostool/iosdevicemanager.h
+++ b/src/tools/iostool/iosdevicemanager.h
@@ -43,9 +43,9 @@
#include <qglobal.h>
#ifdef Q_DECL_OVERRIDE
-#define QTC_OVERRIDE Q_DECL_OVERRIDE
+#define Q_DECL_OVERRIDE Q_DECL_OVERRIDE
#else
-#define QTC_OVERRIDE
+#define Q_DECL_OVERRIDE
#endif
namespace Ios {
diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp
index 7889702aef87fac0830da542e23271f90132daa7..e98857223f3e6e243c14356d4f4c9697b5437307 100644
--- a/src/tools/iostool/main.cpp
+++ b/src/tools/iostool/main.cpp
@@ -125,7 +125,7 @@ class SingleRelayServer: public RelayServer
public:
SingleRelayServer(IosTool *parent, int serverFileDescriptor);
protected:
- void newRelayConnection() QTC_OVERRIDE;
+ void newRelayConnection() Q_DECL_OVERRIDE;
private:
int m_serverFileDescriptor;
};
@@ -136,7 +136,7 @@ public:
GenericRelayServer(IosTool *parent, int remotePort,
Ios::DeviceSession *deviceSession);
protected:
- void newRelayConnection() QTC_OVERRIDE;
+ void newRelayConnection() Q_DECL_OVERRIDE;
private:
int m_remotePort;
Ios::DeviceSession *m_deviceSession;