diff --git a/configure.ac b/configure.ac index 965eb33..bcc83a2 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,6 @@ AC_INIT([libdbus-c++], 0.5.0, [shackan@gmail.com]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER([config.h]) -AX_CONFIG_PRIVATE_HEADER(include/dbus-c++/dbus-c++-config.h, dbus-c++,HAVE_DBUSPP_CONFIG_H) AC_CANONICAL_HOST @@ -83,17 +82,17 @@ AC_SUBST(dbus_LIBS) DBUS_API_STABLE_VERSION=1.0.0 PKG_CHECK_EXISTS([dbus-1 < $DBUS_API_STABLE_VERSION], - [AX_DEFINE_PRIVATE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])] + [AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])] ) DBUS_THREADS_INIT_DEFAULT_VERSION=0.93 PKG_CHECK_EXISTS([dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION], - [AX_DEFINE_PRIVATE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])] + [AC_DEFINE(DBUS_HAS_THREADS_INIT_DEFAULT, , [dbus_threads_init_default (needs DBus >= 0.93)])] ) DBUS_RECURSIVE_MUTEX_VERSION=0.95 PKG_CHECK_EXISTS([dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION], - [AX_DEFINE_PRIVATE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])] + [AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])] ) diff --git a/examples/echo/echo-client.cpp b/examples/echo/echo-client.cpp index 0a42b36..093595f 100644 --- a/examples/echo/echo-client.cpp +++ b/examples/echo/echo-client.cpp @@ -64,11 +64,7 @@ int main() signal(SIGTERM, niam); signal(SIGINT, niam); -#ifdef DBUS_HAS_THREADS_INIT_DEFAULT DBus::_init_threading(); -#else - cerr << "Thread support is not enabled! your D-Bus version is too old" << endl; -#endif DBus::default_dispatcher = &dispatcher; diff --git a/examples/ecore/dbus_ecore.cpp b/examples/ecore/dbus_ecore.cpp index 569285d..f0686dc 100644 --- a/examples/ecore/dbus_ecore.cpp +++ b/examples/ecore/dbus_ecore.cpp @@ -6,12 +6,15 @@ #include #include +#include using namespace std; static const char* DBUS_SERVER_NAME = "org.freedesktop.DBus"; static const char* DBUS_SERVER_PATH = "/org/freedesktop/DBus"; +typedef vector Names; + DBusBrowser::DBusBrowser( ::DBus::Connection& conn ) : ::DBus::ObjectProxy(conn, DBUS_SERVER_PATH, DBUS_SERVER_NAME) { diff --git a/examples/ecore/dbus_ecore.h b/examples/ecore/dbus_ecore.h index 295068c..d00d6ea 100644 --- a/examples/ecore/dbus_ecore.h +++ b/examples/ecore/dbus_ecore.h @@ -8,7 +8,7 @@ #include "dbus_ecore-glue.h" class DBusBrowser -: public org::freedesktop::DBus, +: public org::freedesktop::DBus_proxy, public DBus::IntrospectableProxy, public DBus::ObjectProxy { diff --git a/examples/glib/dbus-browser.cpp b/examples/glib/dbus-browser.cpp index 5e27fc4..77a3a22 100644 --- a/examples/glib/dbus-browser.cpp +++ b/examples/glib/dbus-browser.cpp @@ -1,14 +1,13 @@ -#ifdef HAVE_CONFIG_H -#include -#endif - #include "dbus-browser.h" #include #include +#include using namespace std; +typedef vector Names; + static const char *DBUS_SERVER_NAME = "org.freedesktop.DBus"; static const char *DBUS_SERVER_PATH = "/org/freedesktop/DBus"; diff --git a/examples/glib/dbus-browser.h b/examples/glib/dbus-browser.h index 4e95980..9bbefbf 100644 --- a/examples/glib/dbus-browser.h +++ b/examples/glib/dbus-browser.h @@ -19,7 +19,7 @@ public: }; class DBusBrowser -: public org::freedesktop::DBus, +: public org::freedesktop::DBus_proxy, public DBus::IntrospectableProxy, public DBus::ObjectProxy, public Gtk::Window diff --git a/include/dbus-c++/connection.h b/include/dbus-c++/connection.h index 96993c9..5cf1ae0 100644 --- a/include/dbus-c++/connection.h +++ b/include/dbus-c++/connection.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_CONNECTION_H #define __DBUSXX_CONNECTION_H -#include "dbus-c++-config.h" - #include #include "api.h" diff --git a/include/dbus-c++/dbus.h b/include/dbus-c++/dbus.h index 2a74746..7dfc164 100644 --- a/include/dbus-c++/dbus.h +++ b/include/dbus-c++/dbus.h @@ -25,7 +25,6 @@ #ifndef __DBUSXX_DBUS_H #define __DBUSXX_DBUS_H -#include "dbus-c++-config.h" #include "types.h" #include "interface.h" #include "object.h" diff --git a/include/dbus-c++/debug.h b/include/dbus-c++/debug.h index 5079a7f..e66c79b 100644 --- a/include/dbus-c++/debug.h +++ b/include/dbus-c++/debug.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_DEBUG_H #define __DBUSXX_DEBUG_H -#include "dbus-c++-config.h" - #include "api.h" namespace DBus { diff --git a/include/dbus-c++/dispatcher.h b/include/dbus-c++/dispatcher.h index 5a19773..2287215 100644 --- a/include/dbus-c++/dispatcher.h +++ b/include/dbus-c++/dispatcher.h @@ -25,7 +25,6 @@ #ifndef __DBUSXX_DISPATCHER_H #define __DBUSXX_DISPATCHER_H -#include "dbus-c++-config.h" #include "api.h" #include "connection.h" #include "eventloop.h" @@ -222,16 +221,15 @@ protected: Internal *_int; }; -#ifndef DBUS_HAS_RECURSIVE_MUTEX typedef Mutex *(*MutexNewFn)(); +typedef void (*MutexUnlockFn)(Mutex *mx); + +#ifndef DBUS_HAS_RECURSIVE_MUTEX typedef bool (*MutexFreeFn)(Mutex *mx); typedef bool (*MutexLockFn)(Mutex *mx); -typedef void (*MutexUnlockFn)(Mutex *mx); #else -typedef Mutex *(*MutexNewFn)(); typedef void (*MutexFreeFn)(Mutex *mx); typedef void (*MutexLockFn)(Mutex *mx); -typedef void (*MutexUnlockFn)(Mutex *mx); #endif//DBUS_HAS_RECURSIVE_MUTEX typedef CondVar *(*CondVarNewFn)(); @@ -241,9 +239,7 @@ typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout); typedef void (*CondVarWakeOneFn)(CondVar *cv); typedef void (*CondVarWakeAllFn)(CondVar *cv); -#ifdef DBUS_HAS_THREADS_INIT_DEFAULT void DXXAPI _init_threading(); -#endif//DBUS_HAS_THREADS_INIT_DEFAULT void DXXAPI _init_threading( MutexNewFn, MutexFreeFn, MutexLockFn, MutexUnlockFn, diff --git a/include/dbus-c++/ecore-integration.h b/include/dbus-c++/ecore-integration.h index 8e7b5ba..25f461f 100644 --- a/include/dbus-c++/ecore-integration.h +++ b/include/dbus-c++/ecore-integration.h @@ -25,7 +25,6 @@ #ifndef __DBUSXX_ECORE_INTEGRATION_H #define __DBUSXX_ECORE_INTEGRATION_H -#include "dbus-c++-config.h" #include #include "api.h" diff --git a/include/dbus-c++/error.h b/include/dbus-c++/error.h index 8caeca7..7dec7bf 100644 --- a/include/dbus-c++/error.h +++ b/include/dbus-c++/error.h @@ -25,7 +25,6 @@ #ifndef __DBUSXX_ERROR_H #define __DBUSXX_ERROR_H -#include "dbus-c++-config.h" #include "api.h" #include "util.h" diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h index 645471a..1bae382 100644 --- a/include/dbus-c++/eventloop-integration.h +++ b/include/dbus-c++/eventloop-integration.h @@ -25,7 +25,6 @@ #ifndef __DBUSXX_EVENTLOOP_INTEGRATION_H #define __DBUSXX_EVENTLOOP_INTEGRATION_H -#include "dbus-c++-config.h" #include "api.h" #include "dispatcher.h" #include "util.h" diff --git a/include/dbus-c++/eventloop.h b/include/dbus-c++/eventloop.h index edaed42..f7d0f6d 100644 --- a/include/dbus-c++/eventloop.h +++ b/include/dbus-c++/eventloop.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_EVENTLOOP_H #define __DBUSXX_EVENTLOOP_H -#include "dbus-c++-config.h" - #include #include diff --git a/include/dbus-c++/glib-integration.h b/include/dbus-c++/glib-integration.h index 034beb0..7a0dbf0 100644 --- a/include/dbus-c++/glib-integration.h +++ b/include/dbus-c++/glib-integration.h @@ -25,7 +25,6 @@ #ifndef __DBUSXX_GLIB_INTEGRATION_H #define __DBUSXX_GLIB_INTEGRATION_H -#include "dbus-c++-config.h" #include #include "api.h" diff --git a/include/dbus-c++/interface.h b/include/dbus-c++/interface.h index fa9179f..1eccfbc 100644 --- a/include/dbus-c++/interface.h +++ b/include/dbus-c++/interface.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_INTERFACE_H #define __DBUSXX_INTERFACE_H -#include "dbus-c++-config.h" - #include #include #include "api.h" diff --git a/include/dbus-c++/introspection.h b/include/dbus-c++/introspection.h index b52dca7..5f0d1e4 100644 --- a/include/dbus-c++/introspection.h +++ b/include/dbus-c++/introspection.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_INTROSPECTION_H #define __DBUSXX_INTROSPECTION_H -#include "dbus-c++-config.h" - #include "api.h" #include "interface.h" diff --git a/include/dbus-c++/message.h b/include/dbus-c++/message.h index 6f6ae4c..ba326b7 100644 --- a/include/dbus-c++/message.h +++ b/include/dbus-c++/message.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_MESSAGE_H #define __DBUSXX_MESSAGE_H -#include "dbus-c++-config.h" - #include #include diff --git a/include/dbus-c++/object.h b/include/dbus-c++/object.h index 2075142..851488e 100644 --- a/include/dbus-c++/object.h +++ b/include/dbus-c++/object.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_OBJECT_H #define __DBUSXX_OBJECT_H -#include "dbus-c++-config.h" - #include #include diff --git a/include/dbus-c++/pendingcall.h b/include/dbus-c++/pendingcall.h index f5e77f1..bfe5545 100644 --- a/include/dbus-c++/pendingcall.h +++ b/include/dbus-c++/pendingcall.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_PENDING_CALL_H #define __DBUSXX_PENDING_CALL_H -#include "dbus-c++-config.h" - #include "api.h" #include "util.h" #include "message.h" diff --git a/include/dbus-c++/property.h b/include/dbus-c++/property.h index a608b93..992b95d 100644 --- a/include/dbus-c++/property.h +++ b/include/dbus-c++/property.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_PROPERTY_H #define __DBUSXX_PROPERTY_H -#include "dbus-c++-config.h" - #include "api.h" #include "types.h" #include "interface.h" diff --git a/include/dbus-c++/refptr_impl.h b/include/dbus-c++/refptr_impl.h index a0f71ed..fc10cef 100644 --- a/include/dbus-c++/refptr_impl.h +++ b/include/dbus-c++/refptr_impl.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_REFPTR_IMPL_H #define __DBUSXX_REFPTR_IMPL_H -#include "dbus-c++-config.h" - #include "api.h" #include "util.h" diff --git a/include/dbus-c++/server.h b/include/dbus-c++/server.h index 1918cd4..30879bf 100644 --- a/include/dbus-c++/server.h +++ b/include/dbus-c++/server.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_SERVER_H #define __DBUSXX_SERVER_H -#include "dbus-c++-config.h" - #include #include "api.h" diff --git a/include/dbus-c++/types.h b/include/dbus-c++/types.h index d2a62e6..c795891 100644 --- a/include/dbus-c++/types.h +++ b/include/dbus-c++/types.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_TYPES_H #define __DBUSXX_TYPES_H -#include "dbus-c++-config.h" - #include #include #include diff --git a/include/dbus-c++/util.h b/include/dbus-c++/util.h index 9133adb..225e1ca 100644 --- a/include/dbus-c++/util.h +++ b/include/dbus-c++/util.h @@ -25,8 +25,6 @@ #ifndef __DBUSXX_UTIL_H #define __DBUSXX_UTIL_H -#include "dbus-c++-config.h" - #include "api.h" #include "debug.h" diff --git a/src/Makefile.am b/src/Makefile.am index 74ac218..fc7f7ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,11 +16,8 @@ ECORE_H = $(HEADER_DIR)/ecore-integration.h ECORE_CPP = ecore-integration.cpp endif -CONFIG_H = $(top_builddir)/include/dbus-c++/dbus-c++-config.h - HEADER_DIR = $(top_srcdir)/include/dbus-c++ HEADER_FILES = \ - $(CONFIG_H) \ $(HEADER_DIR)/dbus.h \ $(HEADER_DIR)/types.h \ $(HEADER_DIR)/connection.h \ diff --git a/src/connection.cpp b/src/connection.cpp index 4620594..674bb51 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -25,9 +25,6 @@ #include #endif -#include - - #include #include diff --git a/src/connection_p.h b/src/connection_p.h index 65d6c71..408bd9e 100644 --- a/src/connection_p.h +++ b/src/connection_p.h @@ -28,7 +28,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/debug.cpp b/src/debug.cpp index 95d8083..4f97dae 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include diff --git a/src/dispatcher.cpp b/src/dispatcher.cpp index 0e1619a..c4ba299 100644 --- a/src/dispatcher.cpp +++ b/src/dispatcher.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include @@ -181,12 +180,14 @@ void Dispatcher::dispatch_pending() _mutex_p.unlock(); } -#ifdef DBUS_HAS_THREADS_INIT_DEFAULT void DBus::_init_threading() { +#ifdef DBUS_HAS_THREADS_INIT_DEFAULT dbus_threads_init_default(); -} +#else + debug_log("Thread support is not enabled! Your D-Bus version is too old!"); #endif//DBUS_HAS_THREADS_INIT_DEFAULT +} void DBus::_init_threading( MutexNewFn m1, diff --git a/src/dispatcher_p.h b/src/dispatcher_p.h index 5f25782..33c0cac 100644 --- a/src/dispatcher_p.h +++ b/src/dispatcher_p.h @@ -28,7 +28,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include diff --git a/src/ecore-integration.cpp b/src/ecore-integration.cpp index 7c846eb..282cdd0 100644 --- a/src/ecore-integration.cpp +++ b/src/ecore-integration.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include diff --git a/src/error.cpp b/src/error.cpp index dc17d00..840365b 100644 --- a/src/error.cpp +++ b/src/error.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/eventloop-integration.cpp b/src/eventloop-integration.cpp index 5cdc79a..5249b5f 100644 --- a/src/eventloop-integration.cpp +++ b/src/eventloop-integration.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/eventloop.cpp b/src/eventloop.cpp index 7d96777..7fac42c 100644 --- a/src/eventloop.cpp +++ b/src/eventloop.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/glib-integration.cpp b/src/glib-integration.cpp index c82c77a..e1f8d05 100644 --- a/src/glib-integration.cpp +++ b/src/glib-integration.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include // for DBUS_WATCH_* diff --git a/src/interface.cpp b/src/interface.cpp index f1cd68f..c1dfedd 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/internalerror.h b/src/internalerror.h index 9636c6b..36fe20c 100644 --- a/src/internalerror.h +++ b/src/internalerror.h @@ -28,7 +28,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include diff --git a/src/introspection.cpp b/src/introspection.cpp index eb17218..11fa883 100644 --- a/src/introspection.cpp +++ b/src/introspection.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/message.cpp b/src/message.cpp index bf48405..aa920b3 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include diff --git a/src/message_p.h b/src/message_p.h index 830e63d..18fdb8e 100644 --- a/src/message_p.h +++ b/src/message_p.h @@ -28,7 +28,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/object.cpp b/src/object.cpp index 9148cb2..0dd1bb1 100644 --- a/src/object.cpp +++ b/src/object.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/pendingcall.cpp b/src/pendingcall.cpp index dd14dbd..3757d8f 100644 --- a/src/pendingcall.cpp +++ b/src/pendingcall.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include diff --git a/src/pendingcall_p.h b/src/pendingcall_p.h index dea4cbf..0141c36 100644 --- a/src/pendingcall_p.h +++ b/src/pendingcall_p.h @@ -28,7 +28,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/property.cpp b/src/property.cpp index 69ba352..15a2f5b 100644 --- a/src/property.cpp +++ b/src/property.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/server.cpp b/src/server.cpp index 2493b74..0c652e5 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/server_p.h b/src/server_p.h index b510712..826132d 100644 --- a/src/server_p.h +++ b/src/server_p.h @@ -28,7 +28,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include diff --git a/src/types.cpp b/src/types.cpp index f902b61..117cca3 100644 --- a/src/types.cpp +++ b/src/types.cpp @@ -24,7 +24,6 @@ #ifdef HAVE_CONFIG_H #include #endif -#include #include #include