aboutsummaryrefslogtreecommitdiff
path: root/libqmenumodel/src/qdbusobject.cpp
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-10 09:41:24 +0200
committerOlivier Tilloy <olivier.tilloy@canonical.com>2012-10-10 09:41:24 +0200
commit92ee9e3197ebbfef98ec044d9d45622a880136f3 (patch)
tree671a091f4b650654cc29ea0ab12a1c676cdc2e57 /libqmenumodel/src/qdbusobject.cpp
parentbced31c677a5bb6399aad890d8e09c741bfc82a6 (diff)
downloadqmenumodel-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/qdbusobject.cpp')
-rw-r--r--libqmenumodel/src/qdbusobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libqmenumodel/src/qdbusobject.cpp b/libqmenumodel/src/qdbusobject.cpp
index 4520323..929aec0 100644
--- a/libqmenumodel/src/qdbusobject.cpp
+++ b/libqmenumodel/src/qdbusobject.cpp
@@ -176,7 +176,7 @@ void QDBusObject::disconnect()
}
}
-void QDBusObject::onServiceAppeared(GDBusConnection *connection, const char *, const char *, void *data)
+void QDBusObject::onServiceAppeared(GDBusConnection *connection, const gchar *, const gchar *, gpointer data)
{
QDBusObject *self = reinterpret_cast<QDBusObject*>(data);
@@ -184,7 +184,7 @@ void QDBusObject::onServiceAppeared(GDBusConnection *connection, const char *, c
self->serviceAppear(connection);
}
-void QDBusObject::onServiceVanished(GDBusConnection *connection, const char *, void *data)
+void QDBusObject::onServiceVanished(GDBusConnection *connection, const gchar *, gpointer data)
{
QDBusObject *self = reinterpret_cast<QDBusObject*>(data);