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/qdbusactiongroup.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libqmenumodel/src/qdbusactiongroup.h') diff --git a/libqmenumodel/src/qdbusactiongroup.h b/libqmenumodel/src/qdbusactiongroup.h index 24c124e..beaca24 100644 --- a/libqmenumodel/src/qdbusactiongroup.h +++ b/libqmenumodel/src/qdbusactiongroup.h @@ -27,6 +27,8 @@ class QStateAction; +typedef char gchar; +typedef void* gpointer; typedef struct _GVariant GVariant; typedef struct _GActionGroup GActionGroup; typedef struct _GDBusActionGroup GDBusActionGroup; @@ -81,9 +83,9 @@ private: void clear(); // glib slots - 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); + 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); }; #endif -- cgit v1.2.3