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.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libqmenumodel/src/qdbusactiongroup.cpp') diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp index fc5b18e..354a08a 100644 --- a/libqmenumodel/src/qdbusactiongroup.cpp +++ b/libqmenumodel/src/qdbusactiongroup.cpp @@ -22,6 +22,7 @@ #include "converter.h" extern "C" { +#include #include } @@ -211,21 +212,21 @@ void QDBusActionGroup::updateActionState(const QString &name, const QVariant &st } /*! \internal */ -void QDBusActionGroup::onActionAdded(GDBusActionGroup *, gchar *name, gpointer data) +void QDBusActionGroup::onActionAdded(GDBusActionGroup *, char *name, void *data) { QDBusActionGroup *self = reinterpret_cast(data); Q_EMIT self->actionAppear(name); } /*! \internal */ -void QDBusActionGroup::onActionRemoved(GDBusActionGroup *, gchar *name, gpointer data) +void QDBusActionGroup::onActionRemoved(GDBusActionGroup *, char *name, void *data) { QDBusActionGroup *self = reinterpret_cast(data); Q_EMIT self->actionVanish(name); } /*! \internal */ -void QDBusActionGroup::onActionStateChanged(GDBusActionGroup *, gchar *name, GVariant *value, gpointer data) +void QDBusActionGroup::onActionStateChanged(GDBusActionGroup *, char *name, GVariant *value, void *data) { QDBusActionGroup *self = reinterpret_cast(data); Q_EMIT self->actionStateChanged(name, Converter::toQVariant(value)); -- 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/qdbusactiongroup.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libqmenumodel/src/qdbusactiongroup.cpp') diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp index 354a08a..0c1367a 100644 --- a/libqmenumodel/src/qdbusactiongroup.cpp +++ b/libqmenumodel/src/qdbusactiongroup.cpp @@ -212,21 +212,21 @@ void QDBusActionGroup::updateActionState(const QString &name, const QVariant &st } /*! \internal */ -void QDBusActionGroup::onActionAdded(GDBusActionGroup *, char *name, void *data) +void QDBusActionGroup::onActionAdded(GDBusActionGroup *, gchar *name, gpointer data) { QDBusActionGroup *self = reinterpret_cast(data); Q_EMIT self->actionAppear(name); } /*! \internal */ -void QDBusActionGroup::onActionRemoved(GDBusActionGroup *, char *name, void *data) +void QDBusActionGroup::onActionRemoved(GDBusActionGroup *, gchar *name, gpointer data) { QDBusActionGroup *self = reinterpret_cast(data); Q_EMIT self->actionVanish(name); } /*! \internal */ -void QDBusActionGroup::onActionStateChanged(GDBusActionGroup *, char *name, GVariant *value, void *data) +void QDBusActionGroup::onActionStateChanged(GDBusActionGroup *, gchar *name, GVariant *value, gpointer data) { QDBusActionGroup *self = reinterpret_cast(data); Q_EMIT self->actionStateChanged(name, Converter::toQVariant(value)); -- cgit v1.2.3