Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG

Change-Id: I3cdc7338354da40ab20bdaeb9d5745264ea27228
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

2 files changed, 6 insertions, 3 deletions

diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h
index d9a894b637..ba28938b60 100644
--- a/src/dbus/qdbusconnection.h
+++ b/src/dbus/qdbusconnection.h
@@ -73,10 +73,9 @@ class QDBusConnectionPrivate;
 class Q_DBUS_EXPORT QDBusConnection
 {
     Q_GADGET
-    Q_ENUMS(BusType UnregisterMode)
-    Q_FLAGS(RegisterOptions)
 public:
     enum BusType { SessionBus, SystemBus, ActivationBus };
+    Q_ENUM(BusType)
     enum RegisterOption {
         ExportAdaptors = 0x01,
 
@@ -106,11 +105,13 @@ public:
         // Reserved = 0xff000000
     };
     Q_DECLARE_FLAGS(RegisterOptions, RegisterOption)
+    Q_FLAG(RegisterOptions)
 
     enum UnregisterMode {
         UnregisterNode,
         UnregisterTree
     };
+    Q_ENUM(UnregisterMode)
 
     enum VirtualObjectRegisterOption {
         SingleNode = 0x0,
diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h
index 7b694a1f96..37f35dbe81 100644
--- a/src/dbus/qdbusconnectioninterface.h
+++ b/src/dbus/qdbusconnectioninterface.h
@@ -61,7 +61,6 @@ class QByteArray;
 class Q_DBUS_EXPORT QDBusConnectionInterface: public QDBusAbstractInterface
 {
     Q_OBJECT
-    Q_ENUMS(ServiceQueueOptions ServiceReplacementOptions RegisterServiceReply)
     friend class QDBusConnectionPrivate;
     static inline const char *staticInterfaceName();
 
@@ -76,15 +75,18 @@ public:
         QueueService,
         ReplaceExistingService
     };
+    Q_ENUM(ServiceQueueOptions)
     enum ServiceReplacementOptions {
         DontAllowReplacement,
         AllowReplacement
     };
+    Q_ENUM(ServiceReplacementOptions)
     enum RegisterServiceReply {
         ServiceNotRegistered = 0,
         ServiceRegistered,
         ServiceQueued
     };
+    Q_ENUM(RegisterServiceReply)
 
 public Q_SLOTS:
     QDBusReply<QStringList> registeredServiceNames() const;