diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-11 10:54:49 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-11 10:54:49 +0200 |
| commit | 6504ccc25f02b73649c53e22194ebf2d2319e4e5 (patch) | |
| tree | 58b25e63a33cc204a30bbc4987b2ea3610023c95 /libqmenumodel/src/qdbusobject.h | |
| parent | a3c6400a93152d5cf4dc63f9c90955f6245ceacd (diff) | |
| parent | 24faac7a03ce0769ed155bfc71be31f750c86dfb (diff) | |
| download | qmenumodel-6504ccc25f02b73649c53e22194ebf2d2319e4e5.tar.gz qmenumodel-6504ccc25f02b73649c53e22194ebf2d2319e4e5.tar.bz2 qmenumodel-6504ccc25f02b73649c53e22194ebf2d2319e4e5.zip | |
Merge the latest changes from trunk.
Diffstat (limited to 'libqmenumodel/src/qdbusobject.h')
| -rw-r--r-- | libqmenumodel/src/qdbusobject.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libqmenumodel/src/qdbusobject.h b/libqmenumodel/src/qdbusobject.h index ef2b42f..324d3fd 100644 --- a/libqmenumodel/src/qdbusobject.h +++ b/libqmenumodel/src/qdbusobject.h @@ -20,14 +20,15 @@ #ifndef QDBUSOBJECT_H #define QDBUSOBJECT_H -extern "C" { -#include <gio/gio.h> -} - #include <QString> #include "dbus-enums.h" +typedef unsigned int guint; +typedef char gchar; +typedef void* gpointer; +typedef struct _GDBusConnection GDBusConnection; + class QDBusObject { public: |