diff options
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/qdbusconnection.cpp | 7 | ||||
| -rw-r--r-- | qt/qdbusconnection.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/qt/qdbusconnection.cpp b/qt/qdbusconnection.cpp index 49acc247..f5e1bf37 100644 --- a/qt/qdbusconnection.cpp +++ b/qt/qdbusconnection.cpp @@ -307,10 +307,11 @@ QString QDBusConnection::baseService() const bool QDBusConnection::requestName(const QString &name, NameRequestMode mode) { - static const int DBusModes[] = { 0, DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT, + //FIXME: DBUS_NAME_FLAGS_* are bit fields not enumeration + static const int DBusModes[] = { 0, DBUS_NAME_FLAG_ALLOW_REPLACEMENT, DBUS_NAME_FLAG_REPLACE_EXISTING }; - Q_ASSERT(mode == 0 || mode == DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT || - mode == DBUS_NAME_FLAG_REPLACE_EXISTING); + Q_ASSERT(mode == 0 || mode == AllowReplace || + mode == ReplaceExisting ); DBusError error; dbus_error_init (&error); diff --git a/qt/qdbusconnection.h b/qt/qdbusconnection.h index eccc7d19..bbab0ec6 100644 --- a/qt/qdbusconnection.h +++ b/qt/qdbusconnection.h @@ -46,7 +46,7 @@ public: bool isConnected() const; QDBusError lastError() const; - enum NameRequestMode { NoReplace = 0, ProhibitReplace = 1, ReplaceExisting = 2 }; + enum NameRequestMode { NoReplace = 0, AllowReplace = 1, ReplaceExisting = 2 }; bool requestName(const QString &name, NameRequestMode mode = NoReplace); QString baseService() const; |