diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2005-12-01 00:07:20 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2005-12-01 00:07:20 +0000 |
| commit | b99a1f364535194536eeff70751a9102b7e6ba33 (patch) | |
| tree | 85024ddeb6c15fe7ea3909b5807e3760e7e08432 | |
| parent | e5118f163d2f6eb70375e6394156b23eb1835d2d (diff) | |
* test/qt/Makefile.am: build from srcdirdbus-0.60
* 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-- | ChangeLog | 15 | ||||
| -rw-r--r-- | dbus/dbus-list.c | 2 | ||||
| -rw-r--r-- | qt/qdbusconnection.cpp | 7 | ||||
| -rw-r--r-- | qt/qdbusconnection.h | 2 | ||||
| -rw-r--r-- | test/qt/Makefile.am | 2 |
5 files changed, 19 insertions, 9 deletions
@@ -4,8 +4,19 @@ 2005-11-30 John (J5) Palmieri <johnp@redhat.com> - * dbus/dbus-list.c (_dbus_list_insert_after_link, _dbus_list_insert_after): - remove #ifdef DBUS_BUILD_TESTS since we use these methods in production code + * 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 + +2005-11-30 John (J5) Palmieri <johnp@redhat.com> + + * dbus/dbus-list.c (_dbus_list_insert_after_link, _dbus_list_insert_after, + link_after): remove #ifdef DBUS_BUILD_TESTS since we use these methods + in production code 2005-11-30 John (J5) Palmieri <johnp@redhat.com> diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c index 15911743..438ccb85 100644 --- a/dbus/dbus-list.c +++ b/dbus/dbus-list.c @@ -126,7 +126,6 @@ link_before (DBusList **list, } } -#ifdef DBUS_BUILD_TESTS static void link_after (DBusList **list, DBusList *after_this_link, @@ -146,7 +145,6 @@ link_after (DBusList **list, link->next->prev = link; } } -#endif /* DBUS_BUILD_TESTS */ /** @} */ 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; diff --git a/test/qt/Makefile.am b/test/qt/Makefile.am index c8be4c2e..4ada01d6 100644 --- a/test/qt/Makefile.am +++ b/test/qt/Makefile.am @@ -17,7 +17,7 @@ qdbusconnection_SOURCES= \ tst_qdbusconnection.cpp: tst_qdbusconnection.moc tst_qdbusconnection.moc: - $(QT_MOC) tst_qdbusconnection.cpp > tst_qdbusconnection.moc + $(QT_MOC) $(srcdir)/tst_qdbusconnection.cpp > tst_qdbusconnection.moc TEST_LIBS=$(DBUS_QTESTLIB_LIBS) $(top_builddir)/qt/libdbus-qt4-1.la |