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.cpp | |
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.cpp')
-rw-r--r-- | libqmenumodel/src/qdbusactiongroup.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<QDBusActionGroup*>(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<QDBusActionGroup*>(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<QDBusActionGroup*>(data); Q_EMIT self->actionStateChanged(name, Converter::toQVariant(value)); |