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/qdbusactiongroup.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'libqmenumodel/src/qdbusactiongroup.h') diff --git a/libqmenumodel/src/qdbusactiongroup.h b/libqmenumodel/src/qdbusactiongroup.h index 518f78c..24c124e 100644 --- a/libqmenumodel/src/qdbusactiongroup.h +++ b/libqmenumodel/src/qdbusactiongroup.h @@ -27,6 +27,10 @@ class QStateAction; +typedef struct _GVariant GVariant; +typedef struct _GActionGroup GActionGroup; +typedef struct _GDBusActionGroup GDBusActionGroup; + class QDBusActionGroup : public QObject, public QDBusObject { Q_OBJECT @@ -77,9 +81,9 @@ private: void clear(); // glib slots - static void onActionAdded(GDBusActionGroup *ag, gchar *name, gpointer data); - static void onActionRemoved(GDBusActionGroup *ag, gchar *name, gpointer data); - static void onActionStateChanged(GDBusActionGroup *ag, gchar *name, GVariant *value, gpointer data); + static void onActionAdded(GDBusActionGroup *ag, char *name, void *data); + static void onActionRemoved(GDBusActionGroup *ag, char *name, void *data); + static void onActionStateChanged(GDBusActionGroup *ag, char *name, GVariant *value, void *data); }; #endif -- cgit v1.2.3