diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 17:50:45 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 16:06:29 +0200 |
| commit | 2ae3f70a40bfc8e9368357ab6c2536ce86a087d8 (patch) | |
| tree | 08fce30f05824c21b39d506fc1cdfd2afb7d1014 /src/corelib/kernel | |
| parent | c7f277483aa56e2b33b9ffb42ffe2a28a0e2f4c6 (diff) | |
QAbstractEventDispatcher: purge deprecated API
Since 5.0, registerTimer() without a timer type; and filterEvent(void *)
Change-Id: Id50c2daaf7b144ec403351d0fc50111272b34521
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index 4ef9c068df..1268b2e04e 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -81,12 +81,6 @@ public: virtual void registerSocketNotifier(QSocketNotifier *notifier) = 0; virtual void unregisterSocketNotifier(QSocketNotifier *notifier) = 0; -#if QT_DEPRECATED_SINCE(5,0) - QT_DEPRECATED inline int registerTimer(int interval, QObject *object) - { return registerTimer(interval, Qt::CoarseTimer, object); } - QT_DEPRECATED inline void registerTimer(int timerId, int interval, QObject *object) - { registerTimer(timerId, interval, Qt::CoarseTimer, object); } -#endif // ### Qt6: change interval range to qint64 (or use QDeadlineTimer) int registerTimer(int interval, Qt::TimerType timerType, QObject *object); virtual void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) = 0; @@ -115,10 +109,6 @@ public: #else bool filterNativeEvent(const QByteArray &eventType, void *message, long *result); #endif -#if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED bool filterEvent(void *message) - { return filterNativeEvent("", message, nullptr); } -#endif Q_SIGNALS: void aboutToBlock(); |