dbus/dbus qdbus.h,1.1,1.2

[Thiago J. Macieira]

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

Modified Files:
	qdbus.h 
Log Message:
2006-03-06  Thiago Macieira  <thiago.macieira at trolltech.com>

	* qt/*: 
	* dbus/qdbus.h: Sync with KDE Subversion revision 516237. This
	represents the first feature-complete version of the Qt4
	bindings since I took ove maintainership.



Index: qdbus.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/qdbus.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qdbus.h	23 Sep 2005 16:24:36 -0000	1.1
+++ qdbus.h	6 Mar 2006 14:29:39 -0000	1.2
@@ -26,17 +26,29 @@
 #include <QtCore/qglobal.h>
 
 #ifndef DBUS_COMPILATION
-# define QDBUS_EXPORT Q_DECL_IMPORT
+# include <dbus/qdbusabstractadaptor.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
-# define QDBUS_EXPORT Q_DECL_EXPORT
+# include <qt/qdbusabstractadaptor.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
 
 #endif