diff options
author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-09 18:37:30 +0200 |
---|---|---|
committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-09 18:37:30 +0200 |
commit | bced31c677a5bb6399aad890d8e09c741bfc82a6 (patch) | |
tree | 246d75793c7611ca3489a212f378705144eb4522 /libqmenumodel/src/qdbusactiongroup.cpp | |
parent | a03e7e775a9751f87efb8fd7acf226b5eb25f4e3 (diff) | |
download | qmenumodel-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.cpp')
-rw-r--r-- | libqmenumodel/src/qdbusactiongroup.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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 <glib.h> #include <gio/gio.h> } @@ -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<QDBusActionGroup*>(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<QDBusActionGroup*>(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<QDBusActionGroup*>(data); Q_EMIT self->actionStateChanged(name, Converter::toQVariant(value)); |