diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-21 17:14:49 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-25 08:27:51 +0000 |
commit | 11d34cc67d6db1c0acb9db2f4b105d0cd538fb65 (patch) | |
tree | deec1ae61ca7eea4f71265402d209cb04f9874b1 /src | |
parent | 84bb134397f9a48b1b5bd57d24e5c0410290e2ce (diff) |
Replace Q_DECL_FINAL with final
Change-Id: I4268b15226b9b597a4a2486a094701db17aa1440
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/compiler/qv4isel_moth_p.h | 4 | ||||
-rw-r--r-- | src/qml/compiler/qv4ssa.cpp | 4 | ||||
-rw-r--r-- | src/qml/jit/qv4isel_masm_p.h | 6 | ||||
-rw-r--r-- | src/qml/jit/qv4regalloc.cpp | 4 | ||||
-rw-r--r-- | src/qml/qml/qqmlbinding.cpp | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/qml/compiler/qv4isel_moth_p.h b/src/qml/compiler/qv4isel_moth_p.h index 27e4e45449..db49177783 100644 --- a/src/qml/compiler/qv4isel_moth_p.h +++ b/src/qml/compiler/qv4isel_moth_p.h @@ -216,9 +216,9 @@ class Q_QML_EXPORT ISelFactory: public EvalISelFactory public: ISelFactory() : EvalISelFactory(QStringLiteral("moth")) {} virtual ~ISelFactory() {} - EvalInstructionSelection *create(QQmlEnginePrivate *qmlEngine, QV4::ExecutableAllocator *execAllocator, IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator) override Q_DECL_FINAL + EvalInstructionSelection *create(QQmlEnginePrivate *qmlEngine, QV4::ExecutableAllocator *execAllocator, IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator) override final { return new InstructionSelection(qmlEngine, execAllocator, module, jsGenerator, this); } - bool jitCompileRegexps() const override Q_DECL_FINAL + bool jitCompileRegexps() const override final { return false; } QQmlRefPointer<QV4::CompiledData::CompilationUnit> createUnitForLoading() override; diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp index ab859c407e..cf79168c6c 100644 --- a/src/qml/compiler/qv4ssa.cpp +++ b/src/qml/compiler/qv4ssa.cpp @@ -2068,7 +2068,7 @@ public: } protected: - void visitTemp(Temp *e) override Q_DECL_FINAL + void visitTemp(Temp *e) override final { _collectedTemps.append(e); } @@ -5108,7 +5108,7 @@ private: return checker.seenSideEffects(); } - void visitTemp(Temp *) override Q_DECL_FINAL {} + void visitTemp(Temp *) override final {} }; void mergeBasicBlocks(IR::Function *function, DefUses *du, DominatorTree *dt) diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h index 8af029f5db..869f857c41 100644 --- a/src/qml/jit/qv4isel_masm_p.h +++ b/src/qml/jit/qv4isel_masm_p.h @@ -302,11 +302,11 @@ class Q_QML_EXPORT ISelFactory: public EvalISelFactory public: ISelFactory() : EvalISelFactory(QStringLiteral("jit")) {} virtual ~ISelFactory() {} - EvalInstructionSelection *create(QQmlEnginePrivate *qmlEngine, QV4::ExecutableAllocator *execAllocator, IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator) override Q_DECL_FINAL + EvalInstructionSelection *create(QQmlEnginePrivate *qmlEngine, QV4::ExecutableAllocator *execAllocator, IR::Module *module, QV4::Compiler::JSUnitGenerator *jsGenerator) override final { return new InstructionSelection<JITAssembler>(qmlEngine, execAllocator, module, jsGenerator, this); } - bool jitCompileRegexps() const override Q_DECL_FINAL + bool jitCompileRegexps() const override final { return true; } - QQmlRefPointer<CompiledData::CompilationUnit> createUnitForLoading() override Q_DECL_FINAL; + QQmlRefPointer<CompiledData::CompilationUnit> createUnitForLoading() override final; }; } // end of namespace JIT diff --git a/src/qml/jit/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp index 5363f1f18b..cd2d53ab40 100644 --- a/src/qml/jit/qv4regalloc.cpp +++ b/src/qml/jit/qv4regalloc.cpp @@ -87,7 +87,7 @@ public: {} protected: - void addStmtNr(Stmt *s) override Q_DECL_FINAL + void addStmtNr(Stmt *s) override final { addJustifiedNr(intervals->positionForStatement(s)); } @@ -115,7 +115,7 @@ public: } protected: - void visitTemp(Temp *e) override Q_DECL_FINAL + void visitTemp(Temp *e) override final { switch (e->kind) { case Temp::PhysicalRegister: { diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp index 0a241a92e8..43ab74138c 100644 --- a/src/qml/qml/qqmlbinding.cpp +++ b/src/qml/qml/qqmlbinding.cpp @@ -180,7 +180,7 @@ class QQmlBindingBinding: public QQmlBinding { protected: void doUpdate(const DeleteWatcher &, - QQmlPropertyData::WriteFlags flags, QV4::Scope &) override Q_DECL_FINAL + QQmlPropertyData::WriteFlags flags, QV4::Scope &) override final { Q_ASSERT(!m_targetIndex.hasValueTypeIndex()); QQmlPropertyData *pd = nullptr; @@ -238,7 +238,7 @@ class GenericBinding: public QQmlNonbindingBinding protected: // Returns true if successful, false if an error description was set on expression Q_ALWAYS_INLINE bool write(const QV4::Value &result, bool isUndefined, - QQmlPropertyData::WriteFlags flags) override Q_DECL_FINAL + QQmlPropertyData::WriteFlags flags) override final { Q_ASSERT(targetObject()); @@ -307,7 +307,7 @@ public: } void doUpdate(const DeleteWatcher &watcher, - QQmlPropertyData::WriteFlags flags, QV4::Scope &) override Q_DECL_FINAL + QQmlPropertyData::WriteFlags flags, QV4::Scope &) override final { if (watcher.wasDeleted()) return; @@ -622,7 +622,7 @@ public: protected: Q_ALWAYS_INLINE bool write(const QV4::Value &result, bool isUndefined, - QQmlPropertyData::WriteFlags flags) override Q_DECL_FINAL + QQmlPropertyData::WriteFlags flags) override final { QQmlPropertyData *pd; QQmlPropertyData vtpd; |