diff options
Diffstat (limited to 'src/corelib/kernel/qtimer.h')
| -rw-r--r-- | src/corelib/kernel/qtimer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index 44ae04f38d..d41573264f 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -63,7 +63,7 @@ class Q_CORE_EXPORT QTimer : public QObject Q_PROPERTY(Qt::TimerType timerType READ timerType WRITE setTimerType) Q_PROPERTY(bool active READ isActive) public: - explicit QTimer(QObject *parent = Q_NULLPTR); + explicit QTimer(QObject *parent = nullptr); ~QTimer(); inline bool isActive() const { return id >= 0; } @@ -197,7 +197,7 @@ public: #endif protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: Q_DISABLE_COPY(QTimer) |