Commit 48f19e92 authored by Thomas Hartmann's avatar Thomas Hartmann

Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE

This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.

Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
Reviewed-by: default avatarFawzi Mohamed <fawzi.mohamed@digia.com>
parent 652c53bf
......@@ -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
{
......
......@@ -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);
......
......@@ -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,
......
......@@ -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;
......
......@@ -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);
}
......
......@@ -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();
......
This diff is collapsed.
......@@ -34,7 +34,6 @@
#include "qmljsdialect.h"
#include <languageutils/componentversion.h>
#include <utils/qtcoverride.h>
#include <QObject>
#include <QString>
......
This diff is collapsed.
......@@ -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);
......
......@@ -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;
......
......@@ -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;
}
......
/****************************************************************************
**
** 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
......@@ -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 \
......
......@@ -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();
......
......@@ -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;
......
......@@ -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();
......
......@@ -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);
......
......@@ -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();
......
......@@ -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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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();
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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)