From 5180f32c5abe01acd65cde68c2c16aedda4028ec Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 16 Nov 2014 13:09:01 +0100 Subject: Add Q_DECL_OVERRIDE in the src subdirectory Done automatically with clang-modernize on linux (But does not add Q_DECL_OVERRIDE to the function that are marked as inline because it a compilation error with MSVC2010) Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171 Reviewed-by: Thiago Macieira --- src/corelib/statemachine/qstatemachine.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib/statemachine/qstatemachine.h') diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 5f203d5ed4..3a4944a8db 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -136,7 +136,7 @@ public: QSet configuration() const; #ifndef QT_NO_STATEMACHINE_EVENTFILTER - bool eventFilter(QObject *watched, QEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; #endif public Q_SLOTS: @@ -159,8 +159,8 @@ Q_SIGNALS: protected: - void onEntry(QEvent *event); - void onExit(QEvent *event); + void onEntry(QEvent *event) Q_DECL_OVERRIDE; + void onExit(QEvent *event) Q_DECL_OVERRIDE; virtual void beginSelectTransitions(QEvent *event); virtual void endSelectTransitions(QEvent *event); @@ -168,7 +168,7 @@ protected: virtual void beginMicrostep(QEvent *event); virtual void endMicrostep(QEvent *event); - bool event(QEvent *e); + bool event(QEvent *e) Q_DECL_OVERRIDE; protected: QStateMachine(QStateMachinePrivate &dd, QObject *parent); -- cgit v1.2.3