dbus/dbus qdbus.h,1.2,1.3

[Thiago J. Macieira]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv23055/dbus

Modified Files:
	qdbus.h 
Log Message:
	* 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.


Index: qdbus.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/qdbus.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qdbus.h	6 Mar 2006 14:29:39 -0000	1.2
+++ qdbus.h	28 Mar 2006 18:56:08 -0000	1.3
@@ -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