diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-10 09:41:24 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-10 09:41:24 +0200 |
| commit | 92ee9e3197ebbfef98ec044d9d45622a880136f3 (patch) | |
| tree | 671a091f4b650654cc29ea0ab12a1c676cdc2e57 /libqmenumodel/src/qdbusactiongroup.h | |
| parent | bced31c677a5bb6399aad890d8e09c741bfc82a6 (diff) | |
| download | qmenumodel-92ee9e3197ebbfef98ec044d9d45622a880136f3.tar.gz qmenumodel-92ee9e3197ebbfef98ec044d9d45622a880136f3.tar.bz2 qmenumodel-92ee9e3197ebbfef98ec044d9d45622a880136f3.zip | |
Revert to using g* types, and forward-declare them.
This is more future-proof.
Diffstat (limited to 'libqmenumodel/src/qdbusactiongroup.h')
| -rw-r--r-- | libqmenumodel/src/qdbusactiongroup.h | 8 |
1 files changed, 5 insertions, 3 deletions
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 |