diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-21 17:01:03 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-22 07:30:01 +0000 |
| commit | 8762ae7315e9c6c0b2d99cca574fdd089a6eeffd (patch) | |
| tree | 8ca53a36e107933ef5a0c23d219ea509d154d6d2 /src/corelib/kernel/qeventdispatcher_unix_p.h | |
| parent | 11604b536619c2e144ee6346cf3ae8d538f57bbf (diff) | |
Replace Q_DECL_FINAL with final
Remaining uses of Q_DECL_FINAL are in:
src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
(definition and documentation of Q_DECL_FINAL)
src/tools/moc/moc.cpp
tests/auto/tools/moc/
(supported for moc for Q_DECL_FINAL)
Change-Id: I0d28946c9c3f9d37d0b303db86079129014de1f3
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/kernel/qeventdispatcher_unix_p.h')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index aea5ba4f2e..0fd068b074 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QEventDispatcherUNIXPrivate; -struct Q_CORE_EXPORT QSocketNotifierSetUNIX Q_DECL_FINAL +struct Q_CORE_EXPORT QSocketNotifierSetUNIX final { inline QSocketNotifierSetUNIX() Q_DECL_NOTHROW; @@ -108,18 +108,18 @@ public: bool processEvents(QEventLoop::ProcessEventsFlags flags) override; bool hasPendingEvents() override; - void registerSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL; - void unregisterSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL; + void registerSocketNotifier(QSocketNotifier *notifier) final; + void unregisterSocketNotifier(QSocketNotifier *notifier) final; - void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) Q_DECL_FINAL; - bool unregisterTimer(int timerId) Q_DECL_FINAL; - bool unregisterTimers(QObject *object) Q_DECL_FINAL; - QList<TimerInfo> registeredTimers(QObject *object) const Q_DECL_FINAL; + void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) final; + bool unregisterTimer(int timerId) final; + bool unregisterTimers(QObject *object) final; + QList<TimerInfo> registeredTimers(QObject *object) const final; - int remainingTime(int timerId) Q_DECL_FINAL; + int remainingTime(int timerId) final; - void wakeUp() Q_DECL_FINAL; - void interrupt() Q_DECL_FINAL; + void wakeUp() final; + void interrupt() final; void flush() override; protected: |