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/qdbusobject.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/qdbusobject.cpp')
| -rw-r--r-- | libqmenumodel/src/qdbusobject.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libqmenumodel/src/qdbusobject.cpp b/libqmenumodel/src/qdbusobject.cpp index 63be580..4520323 100644 --- a/libqmenumodel/src/qdbusobject.cpp +++ b/libqmenumodel/src/qdbusobject.cpp @@ -17,6 +17,11 @@ * Renato Araujo Oliveira Filho <renato@canonical.com> */ +extern "C" { +#include <glib-object.h> +#include <gio/gio.h> +} + #include "qdbusobject.h" #include <QDebug> @@ -171,7 +176,7 @@ void QDBusObject::disconnect() } } -void QDBusObject::onServiceAppeared(GDBusConnection *connection, const gchar *, const gchar *, gpointer data) +void QDBusObject::onServiceAppeared(GDBusConnection *connection, const char *, const char *, void *data) { QDBusObject *self = reinterpret_cast<QDBusObject*>(data); @@ -179,7 +184,7 @@ void QDBusObject::onServiceAppeared(GDBusConnection *connection, const gchar *, self->serviceAppear(connection); } -void QDBusObject::onServiceVanished(GDBusConnection *connection, const gchar *, gpointer data) +void QDBusObject::onServiceVanished(GDBusConnection *connection, const char *, void *data) { QDBusObject *self = reinterpret_cast<QDBusObject*>(data); |