From 75d1d2a91376c3338510cf1e5fa10feaf8df5785 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 31 Aug 2020 13:39:48 +0200 Subject: Get rid of hasPendingEvents() and flush() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They are unused. Change-Id: I77383f2be45551401ed9c2f88285511134cc8b0d Reviewed-by: Tor Arne Vestbø --- src/corelib/kernel/qabstracteventdispatcher.cpp | 17 ----------------- src/corelib/kernel/qabstracteventdispatcher.h | 2 -- src/corelib/kernel/qcoreapplication.cpp | 4 ++-- src/corelib/kernel/qeventdispatcher_cf.mm | 23 +---------------------- src/corelib/kernel/qeventdispatcher_cf_p.h | 2 -- src/corelib/kernel/qeventdispatcher_glib.cpp | 10 ---------- src/corelib/kernel/qeventdispatcher_glib_p.h | 2 -- src/corelib/kernel/qeventdispatcher_unix.cpp | 9 --------- src/corelib/kernel/qeventdispatcher_unix_p.h | 2 -- src/corelib/kernel/qeventdispatcher_win.cpp | 9 --------- src/corelib/kernel/qeventdispatcher_win_p.h | 2 -- 11 files changed, 3 insertions(+), 79 deletions(-) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index 9f655a50d8..546d34b8b6 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -210,8 +210,6 @@ QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread) \b{Note:} This function does not process events continuously; it returns after all available events are processed. - - \sa hasPendingEvents() */ /*! @@ -223,14 +221,6 @@ QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread) events. For timers and system level events, the situation is unknown. */ -/*! \fn bool QAbstractEventDispatcher::hasPendingEvents() - \deprecated - - Returns \c true if there is an event waiting; otherwise returns false. This - function is an implementation detail for - QCoreApplication::hasPendingEvents() and must not be called directly. -*/ - /*! \fn void QAbstractEventDispatcher::registerSocketNotifier(QSocketNotifier *notifier) @@ -326,13 +316,6 @@ int QAbstractEventDispatcher::registerTimer(int interval, Qt::TimerType timerTyp return from processEvents() as soon as possible. */ -/*! \fn void QAbstractEventDispatcher::flush() - \deprecated - - Depending from the event dispatcher implementation does nothing or - calls QApplication::sendPostedEvents(). -*/ - // ### DOC: Are these called when the _application_ starts/stops or just // when the current _event loop_ starts/stops? /*! diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index e3bc94a762..2236a0295d 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -76,7 +76,6 @@ public: static QAbstractEventDispatcher *instance(QThread *thread = nullptr); virtual bool processEvents(QEventLoop::ProcessEventsFlags flags) = 0; - virtual bool hasPendingEvents() = 0; // ### Qt6: remove, mark final or make protected virtual void registerSocketNotifier(QSocketNotifier *notifier) = 0; virtual void unregisterSocketNotifier(QSocketNotifier *notifier) = 0; @@ -97,7 +96,6 @@ public: virtual void wakeUp() = 0; virtual void interrupt() = 0; - virtual void flush() = 0; // ### Qt6: remove, mark final or make protected virtual void startingUp(); virtual void closingDown(); diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 9892680109..f7775b949f 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1251,7 +1251,7 @@ bool QCoreApplication::closingDown() \threadsafe - \sa exec(), QTimer, QEventLoop::processEvents(), flush(), sendPostedEvents() + \sa exec(), QTimer, QEventLoop::processEvents(), sendPostedEvents() */ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags) { @@ -1641,7 +1641,7 @@ bool QCoreApplication::compressEvent(QEvent *event, QObject *receiver, QPostEven \note This method must be called from the thread in which its QObject parameter, \a receiver, lives. - \sa flush(), postEvent() + \sa postEvent() */ void QCoreApplication::sendPostedEvents(QObject *receiver, int event_type) { diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index b482269df2..3525de4029 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -259,8 +259,7 @@ QEventLoop *QEventDispatcherCoreFoundation::currentEventLoop() const function should wait only if there were no events ready, and _then_ process all newly queued/available events. - These notes apply to other function in this class as well, such as - hasPendingEvents(). + These notes apply to other function in this class as well. */ bool QEventDispatcherCoreFoundation::processEvents(QEventLoop::ProcessEventsFlags flags) { @@ -499,21 +498,6 @@ void QEventDispatcherCoreFoundation::handleRunLoopActivity(CFRunLoopActivity act } } -bool QEventDispatcherCoreFoundation::hasPendingEvents() -{ - // There doesn't seem to be any API on iOS to peek into the other sources - // to figure out if there are pending non-Qt events. As a workaround, we - // assume that if the run-loop is currently blocking and waiting for a - // source to signal then there are no system-events pending. If this - // function is called from the main thread then the second clause - // of the condition will always be true, as the run loop is - // never waiting in that case. The function would be more aptly named - // 'maybeHasPendingEvents' in our case. - - extern uint qGlobalPostedEventsCount(); - return qGlobalPostedEventsCount() || !CFRunLoopIsWaiting(m_runLoop); -} - void QEventDispatcherCoreFoundation::wakeUp() { if (m_processEvents.processedPostedEvents && !(m_processEvents.flags & QEventLoop::EventLoopExec)) { @@ -544,11 +528,6 @@ void QEventDispatcherCoreFoundation::interrupt() CFRunLoopStop(m_runLoop); } -void QEventDispatcherCoreFoundation::flush() -{ - // X11 only. -} - #pragma mark - Socket notifiers void QEventDispatcherCoreFoundation::registerSocketNotifier(QSocketNotifier *notifier) diff --git a/src/corelib/kernel/qeventdispatcher_cf_p.h b/src/corelib/kernel/qeventdispatcher_cf_p.h index a2cecd9a93..f57ea5a0c5 100644 --- a/src/corelib/kernel/qeventdispatcher_cf_p.h +++ b/src/corelib/kernel/qeventdispatcher_cf_p.h @@ -214,7 +214,6 @@ public: ~QEventDispatcherCoreFoundation(); bool processEvents(QEventLoop::ProcessEventsFlags flags) override; - bool hasPendingEvents() override; void registerSocketNotifier(QSocketNotifier *notifier) override; void unregisterSocketNotifier(QSocketNotifier *notifier) override; @@ -228,7 +227,6 @@ public: void wakeUp() override; void interrupt() override; - void flush() override; protected: QEventLoop *currentEventLoop() const; diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 92f3553247..96e02769ae 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -432,12 +432,6 @@ bool QEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags) return result; } -bool QEventDispatcherGlib::hasPendingEvents() -{ - Q_D(QEventDispatcherGlib); - return g_main_context_pending(d->mainContext); -} - void QEventDispatcherGlib::registerSocketNotifier(QSocketNotifier *notifier) { Q_ASSERT(notifier); @@ -592,10 +586,6 @@ void QEventDispatcherGlib::wakeUp() g_main_context_wakeup(d->mainContext); } -void QEventDispatcherGlib::flush() -{ -} - bool QEventDispatcherGlib::versionSupported() { #if !defined(GLIB_MAJOR_VERSION) || !defined(GLIB_MINOR_VERSION) || !defined(GLIB_MICRO_VERSION) diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h index 313825d0a7..fffd9ee68a 100644 --- a/src/corelib/kernel/qeventdispatcher_glib_p.h +++ b/src/corelib/kernel/qeventdispatcher_glib_p.h @@ -71,7 +71,6 @@ public: ~QEventDispatcherGlib(); bool processEvents(QEventLoop::ProcessEventsFlags flags) override; - bool hasPendingEvents() override; void registerSocketNotifier(QSocketNotifier *socketNotifier) final; void unregisterSocketNotifier(QSocketNotifier *socketNotifier) final; @@ -85,7 +84,6 @@ public: void wakeUp() final; void interrupt() final; - void flush() final; static bool versionSupported(); diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 44da02781e..b5130b6f1e 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -519,12 +519,6 @@ bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags) return (nevents > 0); } -bool QEventDispatcherUNIX::hasPendingEvents() -{ - extern uint qGlobalPostedEventsCount(); // from qapplication.cpp - return qGlobalPostedEventsCount(); -} - int QEventDispatcherUNIX::remainingTime(int timerId) { #ifndef QT_NO_DEBUG @@ -551,9 +545,6 @@ void QEventDispatcherUNIX::interrupt() wakeUp(); } -void QEventDispatcherUNIX::flush() -{ } - QT_END_NAMESPACE #include "moc_qeventdispatcher_unix_p.cpp" diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 5757cc764c..7ab4826718 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -106,7 +106,6 @@ public: ~QEventDispatcherUNIX(); bool processEvents(QEventLoop::ProcessEventsFlags flags) override; - bool hasPendingEvents() override; void registerSocketNotifier(QSocketNotifier *notifier) final; void unregisterSocketNotifier(QSocketNotifier *notifier) final; @@ -120,7 +119,6 @@ public: void wakeUp() override; void interrupt() final; - void flush() override; protected: QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObject *parent = nullptr); diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index b3ae226e58..623765c8de 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -612,12 +612,6 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags) return retVal; } -bool QEventDispatcherWin32::hasPendingEvents() -{ - MSG msg; - return qGlobalPostedEventsCount() || PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE); -} - void QEventDispatcherWin32::registerSocketNotifier(QSocketNotifier *notifier) { Q_ASSERT(notifier); @@ -970,9 +964,6 @@ void QEventDispatcherWin32::interrupt() wakeUp(); } -void QEventDispatcherWin32::flush() -{ } - void QEventDispatcherWin32::startingUp() { } diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h index 078329c43c..acad28530e 100644 --- a/src/corelib/kernel/qeventdispatcher_win_p.h +++ b/src/corelib/kernel/qeventdispatcher_win_p.h @@ -80,7 +80,6 @@ public: ~QEventDispatcherWin32(); bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) override; - bool hasPendingEvents() override; void registerSocketNotifier(QSocketNotifier *notifier) override; void unregisterSocketNotifier(QSocketNotifier *notifier) override; @@ -98,7 +97,6 @@ public: void wakeUp() override; void interrupt() override; - void flush() override; void startingUp() override; void closingDown() override; -- cgit v1.2.3