From fdbf2c5b8d787a8c413a5ca0dc44e1597ac69d73 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sun, 8 Dec 2019 12:41:11 +0000
Subject: [PATCH] QDBusConnectionCallbackEvent cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 src/dbus/qdbusintegrator.cpp |  4 ++--
 src/dbus/qdbusintegrator_p.h | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index e9bae87a4..c5e6fa63f 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -252,7 +252,7 @@ static dbus_bool_t qDBusAddWatch(DBusWatch *watch, void *data)
         ev->subtype = QDBusConnectionCallbackEvent::AddWatch;
         ev->watch = watch;
         ev->fd = fd;
-        ev->extra = flags;
+        ev->flags = flags;
         d->postEventToThread(AddWatchAction, d, ev);
         return true;
     }
@@ -1106,7 +1106,7 @@ void QDBusConnectionPrivate::customEvent(QEvent *e)
         break;
 
     case QDBusConnectionCallbackEvent::AddWatch:
-        qDBusRealAddWatch(this, ev->watch, ev->extra, ev->fd);
+        qDBusRealAddWatch(this, ev->watch, ev->flags, ev->fd);
         break;
 
     case QDBusConnectionCallbackEvent::ToggleWatch:
diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h
index 9ff36cc6b..292e40b8e 100644
--- a/src/dbus/qdbusintegrator_p.h
+++ b/src/dbus/qdbusintegrator_p.h
@@ -124,24 +124,24 @@ private:
 class QDBusConnectionCallbackEvent : public QEvent
 {
 public:
-    QDBusConnectionCallbackEvent()
-        : QEvent(User), subtype(Subtype(0))
-    { }
-
-    DBusWatch *watch;
-    union {
-        int timerId;
-        int fd;
-    };
-    int extra;
-
     enum Subtype {
         AddTimeout = 0,
         KillTimer,
         AddWatch,
         //RemoveWatch,
         ToggleWatch
-    } subtype;
+    };
+
+    QDBusConnectionCallbackEvent()
+        : QEvent(User), subtype(Subtype::AddTimeout)
+    { }
+
+    DBusWatch *watch;
+    int timerId;
+    int fd;
+    int flags;
+
+    Subtype subtype;
 };
 
 QT_END_NAMESPACE
-- 
2.11.0