aboutsummaryrefslogtreecommitdiff
path: root/libqmenumodel/src/qdbusactiongroup.h
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-09 18:37:30 +0200
committerOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-09 18:37:30 +0200
commitbced31c677a5bb6399aad890d8e09c741bfc82a6 (patch)
tree246d75793c7611ca3489a212f378705144eb4522 /libqmenumodel/src/qdbusactiongroup.h
parenta03e7e775a9751f87efb8fd7acf226b5eb25f4e3 (diff)
downloadqmenumodel-bced31c677a5bb6399aad890d8e09c741bfc82a6.tar.gz
qmenumodel-bced31c677a5bb6399aad890d8e09c741bfc82a6.tar.bz2
qmenumodel-bced31c677a5bb6399aad890d8e09c741bfc82a6.zip
Avoid including C headers (glib/gio) in public headers; use "forward declarations" instead.
Diffstat (limited to 'libqmenumodel/src/qdbusactiongroup.h')
-rw-r--r--libqmenumodel/src/qdbusactiongroup.h10
1 files changed, 7 insertions, 3 deletions
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