diff options
| author | Thiago Macieira <thiago@kde.org> | 2006-03-28 18:56:08 +0000 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2006-03-28 18:56:08 +0000 |
| commit | d42c8663e8fd441838a238bfb845a7c80c37b253 (patch) | |
| tree | ac29c8e23bc1e48690cac1fc8416a1b34628e832 /dbus | |
| parent | 36e1d8bfc79614617f364306bb168f46e0d4761c (diff) | |
* qt/*:
* dbus/qdbus.h: Sync with KDE Subversion revision
523647. Hopefully, this will be the last of the
source-incompatible changes. Documentation has been improved;
support for QList<basic-types> has been added; QDBusObject is
gone; QDBus(Abstract)Interface is now a QObject with
auto-generated meta-object; QDBusIntrospection is marked
private, since QMetaObject can be used now; lots of bugfixes.
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/qdbus.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/dbus/qdbus.h b/dbus/qdbus.h index 5d5c1f7a..60f2f1e3 100644 --- a/dbus/qdbus.h +++ b/dbus/qdbus.h @@ -25,29 +25,27 @@ #include <QtCore/qglobal.h> -#ifndef DBUS_COMPILATION +#if !defined(DBUS_COMPILATION) # include <dbus/qdbusabstractadaptor.h> +# include <dbus/qdbusabstractinterface.h> +# include <dbus/qdbusbus.h> # include <dbus/qdbusconnection.h> # include <dbus/qdbuserror.h> # include <dbus/qdbusinterface.h> -# include <dbus/qdbusintrospection.h> # include <dbus/qdbusmessage.h> -# include <dbus/qdbusobject.h> # include <dbus/qdbusreply.h> # include <dbus/qdbusserver.h> -# include <dbus/qdbustype.h> # include <dbus/qdbusutil.h> #else # include <qt/qdbusabstractadaptor.h> +# include <qt/qdbusabstractinterface.h> +# include <qt/qdbusbus.h> # include <qt/qdbusconnection.h> # include <qt/qdbuserror.h> # include <qt/qdbusinterface.h> -# include <qt/qdbusintrospection.h> # include <qt/qdbusmessage.h> -# include <qt/qdbusobject.h> # include <qt/qdbusreply.h> # include <qt/qdbusserver.h> -# include <qt/qdbustype.h> # include <qt/qdbusutil.h> #endif |