summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusconnection.h
diff options
context:
space:
mode:
authorAlbert Astals Cid <albert.astals@canonical.com>2016-12-23 11:52:47 +0100
committerAlbert Astals Cid <albert.astals@canonical.com>2017-01-02 10:31:25 +0000
commit59ae55e12e075005ceae6e353ef1ee00817ec751 (patch)
tree83dcec3230d244aeb3b7b8aaf4a01147f6c4f887 /src/dbus/qdbusconnection.h
parent92f6a4588f6bfc78e9b8b536ec7895d048c3aa30 (diff)
Q_ENUMS -> Q_ENUM and Q_FLAGS -> Q_FLAG
Change-Id: I3cdc7338354da40ab20bdaeb9d5745264ea27228 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/dbus/qdbusconnection.h')
-rw-r--r--src/dbus/qdbusconnection.h5
1 files changed, 3 insertions, 2 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,