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/qdbusobject.h | |
| 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/qdbusobject.h')
| -rw-r--r-- | libqmenumodel/src/qdbusobject.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libqmenumodel/src/qdbusobject.h b/libqmenumodel/src/qdbusobject.h index 1c5c08d..324d3fd 100644 --- a/libqmenumodel/src/qdbusobject.h +++ b/libqmenumodel/src/qdbusobject.h @@ -24,6 +24,9 @@ #include "dbus-enums.h" +typedef unsigned int guint; +typedef char gchar; +typedef void* gpointer; typedef struct _GDBusConnection GDBusConnection; class QDBusObject @@ -57,7 +60,7 @@ protected: virtual void statusChanged(DBusEnums::ConnectionStatus status) = 0; private: - quint32 m_watchId; + guint m_watchId; DBusEnums::BusType m_busType; QString m_busName; QString m_objectPath; @@ -66,8 +69,8 @@ private: void setStatus(DBusEnums::ConnectionStatus status); // glib slots - static void onServiceAppeared(GDBusConnection *connection, const char *name, const char *name_owner, void *data); - static void onServiceVanished(GDBusConnection *connection, const char *name, void *data); + static void onServiceAppeared(GDBusConnection *connection, const gchar *name, const gchar *name_owner, gpointer data); + static void onServiceVanished(GDBusConnection *connection, const gchar *name, gpointer data); }; #endif |