diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2005-12-01 00:07:20 +0000 |
|---|---|---|
| committer | John Palmieri <johnp@remedyz.boston.redhat.com> | 2006-06-28 08:15:11 -0400 |
| commit | ff89deb85ec01c985da3f903c5440b85671e04ed (patch) | |
| tree | 1ac0f14085cea8b81505a1895a97943a711734b4 | |
| parent | 595ea5a45d9a5e7e84c0b72d3d3606817cbe1d13 (diff) | |
* test/qt/Makefile.am: build from srcdir
* qt/qtconnection.cpp (requestName): Changed PROHIBIT_REPLACE to ALLOW_REPLACE
Note - this code is wrong and needs to be fixed by the Qt binding
developers. The flags should be treated as bitfields and not enums.
* qt/qtconnection.h: Change ProhibitReplace to AllowReplace
* dbus/dbus-list.c (link_after): remove #ifdef DBUS_BUILD_TESTS
| -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 49acc24..f5e1bf3 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 eccc7d1..bbab0ec 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; |