From: Ivailo Monev <xakepa10@laimg.moc>
Date: Tue, 31 Mar 2020 09:08:57 +0000 (+0000)
Subject: remove unused and internal QEventLoop::ProcessEventsFlag enums
X-Git-Tag: 4.12.0~3880
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fe4603dc8f3cf75891d1506853550dd0ef0ac5d8;p=kde%2FKatie.git

remove unused and internal QEventLoop::ProcessEventsFlag enums

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/core/kernel/qeventdispatcher_unix.cpp b/src/core/kernel/qeventdispatcher_unix.cpp
index 156653904..9357cabb6 100644
--- a/src/core/kernel/qeventdispatcher_unix.cpp
+++ b/src/core/kernel/qeventdispatcher_unix.cpp
@@ -808,10 +808,8 @@ bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags)
         // return the maximum time we can wait for an event.
         timeval *tm = Q_NULLPTR;
         timeval wait_tm = { 0l, 0l };
-        if (!(flags & QEventLoop::X11ExcludeTimers)) {
-            if (d->timerList.timerWait(wait_tm))
-                tm = &wait_tm;
-        }
+        if (d->timerList.timerWait(wait_tm))
+            tm = &wait_tm;
 
         if (!canWait) {
             if (!tm)
@@ -825,9 +823,8 @@ bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags)
         int nevents = d->doSelect(flags, tm);
 
         // activate timers
-        if (! (flags & QEventLoop::X11ExcludeTimers)) {
-            nevents += activateTimers();
-        }
+        nevents += activateTimers();
+
         return (nevents > 0);
     }
 
diff --git a/src/core/kernel/qeventloop.cpp b/src/core/kernel/qeventloop.cpp
index 5453cfba6..db8177bee 100644
--- a/src/core/kernel/qeventloop.cpp
+++ b/src/core/kernel/qeventloop.cpp
@@ -85,11 +85,6 @@ public:
     \value WaitForMoreEvents Wait for events if no pending events are
     available.
 
-    \omitvalue X11ExcludeTimers
-    \omitvalue ExcludeUserInput
-    \omitvalue WaitForMore
-    \omitvalue EventLoopExec
-
     \sa processEvents()
 */
 
@@ -187,7 +182,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)
 
     QT_TRY {
         while (!d->exit)
-            processEvents(flags | WaitForMoreEvents | EventLoopExec);
+            processEvents(flags | WaitForMoreEvents);
     } QT_CATCH (...) {
         qWarning("Qt has caught an exception thrown from an event handler. Throwing\n"
                  "exceptions from an event handler is not supported in Qt. You must\n"
diff --git a/src/core/kernel/qeventloop.h b/src/core/kernel/qeventloop.h
index c2b2e9c4a..16231b0d6 100644
--- a/src/core/kernel/qeventloop.h
+++ b/src/core/kernel/qeventloop.h
@@ -56,9 +56,7 @@ public:
         AllEvents = 0x00,
         ExcludeUserInputEvents = 0x01,
         ExcludeSocketNotifiers = 0x02,
-        WaitForMoreEvents = 0x04,
-        X11ExcludeTimers = 0x08,
-        EventLoopExec = 0x10
+        WaitForMoreEvents = 0x04
     };
     Q_DECLARE_FLAGS(ProcessEventsFlags, ProcessEventsFlag)
 
diff --git a/src/gui/kernel/qeventdispatcher_x11.cpp b/src/gui/kernel/qeventdispatcher_x11.cpp
index 68d1e54b0..4a2c44819 100644
--- a/src/gui/kernel/qeventdispatcher_x11.cpp
+++ b/src/gui/kernel/qeventdispatcher_x11.cpp
@@ -134,8 +134,7 @@ bool QEventDispatcherX11::processEvents(QEventLoop::ProcessEventsFlags flags)
 
  out:
     if (!d->interrupt) {
-        const uint exclude_all =
-            QEventLoop::ExcludeSocketNotifiers | QEventLoop::X11ExcludeTimers | QEventLoop::WaitForMoreEvents;
+        const uint exclude_all = QEventLoop::ExcludeSocketNotifiers | QEventLoop::WaitForMoreEvents;
         if (nevents > 0 && ((uint)flags & exclude_all) == exclude_all) {
             QApplication::sendPostedEvents();
             return nevents > 0;