From bced31c677a5bb6399aad890d8e09c741bfc82a6 Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Tue, 9 Oct 2012 18:37:30 +0200 Subject: Avoid including C headers (glib/gio) in public headers; use "forward declarations" instead. --- libqmenumodel/src/qdbusobject.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'libqmenumodel/src/qdbusobject.h') diff --git a/libqmenumodel/src/qdbusobject.h b/libqmenumodel/src/qdbusobject.h index ef2b42f..1c5c08d 100644 --- a/libqmenumodel/src/qdbusobject.h +++ b/libqmenumodel/src/qdbusobject.h @@ -20,14 +20,12 @@ #ifndef QDBUSOBJECT_H #define QDBUSOBJECT_H -extern "C" { -#include -} - #include #include "dbus-enums.h" +typedef struct _GDBusConnection GDBusConnection; + class QDBusObject { public: @@ -59,7 +57,7 @@ protected: virtual void statusChanged(DBusEnums::ConnectionStatus status) = 0; private: - guint m_watchId; + quint32 m_watchId; DBusEnums::BusType m_busType; QString m_busName; QString m_objectPath; @@ -68,8 +66,8 @@ private: void setStatus(DBusEnums::ConnectionStatus status); // glib slots - static void onServiceAppeared(GDBusConnection *connection, const gchar *name, const gchar *name_owner, gpointer data); - static void onServiceVanished(GDBusConnection *connection, const gchar *name, gpointer data); + static void onServiceAppeared(GDBusConnection *connection, const char *name, const char *name_owner, void *data); + static void onServiceVanished(GDBusConnection *connection, const char *name, void *data); }; #endif -- cgit v1.2.3 From 92ee9e3197ebbfef98ec044d9d45622a880136f3 Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Wed, 10 Oct 2012 09:41:24 +0200 Subject: Revert to using g* types, and forward-declare them. This is more future-proof. --- libqmenumodel/src/qdbusobject.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libqmenumodel/src/qdbusobject.h') diff --git a/libqmenumodel/src/qdbusobject.h b/libqmenumodel/src/qdbusobject.h index 1c5c08d..324d3fd 100644 --- a/libqmenumodel/src/qdbusobject.h +++ b/libqmenumodel/src/qdbusobject.h @@ -24,6 +24,9 @@ #include "dbus-enums.h" +typedef unsigned int guint; +typedef char gchar; +typedef void* gpointer; typedef struct _GDBusConnection GDBusConnection; class QDBusObject @@ -57,7 +60,7 @@ protected: virtual void statusChanged(DBusEnums::ConnectionStatus status) = 0; private: - quint32 m_watchId; + guint m_watchId; DBusEnums::BusType m_busType; QString m_busName; QString m_objectPath; @@ -66,8 +69,8 @@ private: void setStatus(DBusEnums::ConnectionStatus status); // glib slots - static void onServiceAppeared(GDBusConnection *connection, const char *name, const char *name_owner, void *data); - static void onServiceVanished(GDBusConnection *connection, const char *name, void *data); + static void onServiceAppeared(GDBusConnection *connection, const gchar *name, const gchar *name_owner, gpointer data); + static void onServiceVanished(GDBusConnection *connection, const gchar *name, gpointer data); }; #endif -- cgit v1.2.3