1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QAbstractEventDispatcher: purge deprecated API

Browse Source 
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>
This commit is contained in:
Edward Welbourne 2020-07-16 17:50:45 +02:00
parent c7f277483a
commit 2ae3f70a40
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/corelib/kernel/qabstracteventdispatcher.h
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
** This file is part of the QtCore module of the Qt Toolkit. ** 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 registerSocketNotifier(QSocketNotifier *notifier) = 0;
virtual void unregisterSocketNotifier(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) // ### Qt6: change interval range to qint64 (or use QDeadlineTimer)
int registerTimer(int interval, Qt::TimerType timerType, QObject *object); int registerTimer(int interval, Qt::TimerType timerType, QObject *object);
virtual void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) = 0; virtual void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) = 0;
@ -115,10 +109,6 @@ public:
#else #else
bool filterNativeEvent(const QByteArray &eventType, void *message, long *result); bool filterNativeEvent(const QByteArray &eventType, void *message, long *result);
#endif #endif
#if QT_DEPRECATED_SINCE(5, 0)
QT_DEPRECATED bool filterEvent(void *message)
{ return filterNativeEvent("", message, nullptr); }
#endif
Q_SIGNALS: Q_SIGNALS:
void aboutToBlock(); void aboutToBlock();