dbus/qt Makefile.am, 1.10, 1.11 qdbus.h, 1.1, NONE qdbusconnection.cpp, 1.1, 1.2 qdbusconnection.h, 1.1, 1.2 qdbusconnection_p.h, 1.2, 1.3 qdbuserror.h, 1.1, 1.2 qdbusmacros.h, 1.1, NONE qdbusmessage.h, 1.1, 1.2 qdbusserver.h, 1.1, 1.2 qdbusvariant.h, 1.1, 1.2

[Harald Fernengel]

Update of /cvs/dbus/dbus/qt
In directory gabe:/tmp/cvs-serv19117/qt

Modified Files:
	Makefile.am qdbusconnection.cpp qdbusconnection.h 
	qdbusconnection_p.h qdbuserror.h qdbusmessage.h qdbusserver.h 
	qdbusvariant.h 
Removed Files:
	qdbus.h qdbusmacros.h 
Log Message:
adding an autotest and "dbus-ify" the build process and include scheme


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/qt/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.am	23 Sep 2005 13:08:26 -0000	1.10
+++ Makefile.am	23 Sep 2005 16:24:36 -0000	1.11
@@ -1,5 +1,5 @@
 if HAVE_QT
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS)
+INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_QT_CFLAGS) -DDBUS_COMPILATION
 
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 
@@ -7,11 +7,9 @@
 
 dbusinclude_HEADERS=	\
 	qdbuserror.h \
-	qdbusmacros.h \
 	qdbusmessage.h \
 	qdbusserver.h \
-	qdbus.h \
-	qdbusmarshall.h \
+	qdbusconnection.h \
 	qdbusvariant.h
 
 libdbus_qt_1_la_SOURCES = 			\
@@ -23,11 +21,10 @@
 	$(top_srcdir)/qt/qdbusserver.cpp        \
 	$(top_srcdir)/qt/qdbusconnection.h      \
 	$(top_srcdir)/qt/qdbuserror.h           \
-	$(top_srcdir)/qt/qdbusmacros.h          \
 	$(top_srcdir)/qt/qdbusmessage.h         \
 	$(top_srcdir)/qt/qdbusserver.h          \
 	$(top_srcdir)/qt/qdbusconnection_p.h    \
-	$(top_srcdir)/qt/qdbus.h                \
+	$(top_srcdir)/dbus/qdbus.h              \
 	$(top_srcdir)/qt/qdbusmarshall.h        \
 	$(top_srcdir)/qt/qdbusmessage_p.h       \
 	$(top_srcdir)/qt/qdbusvariant.h

--- qdbus.h DELETED ---

Index: qdbusconnection.cpp
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusconnection.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qdbusconnection.cpp	23 Sep 2005 13:08:26 -0000	1.1
+++ qdbusconnection.cpp	23 Sep 2005 16:24:36 -0000	1.2
@@ -24,8 +24,6 @@
 #include <QtCore/qcoreapplication.h>
 
 #include "qdbusconnection.h"
-#include "qdbuserror.h"
-#include "qdbusmessage.h"
 #include "qdbusconnection_p.h"
 
 QT_STATIC_CONST_IMPL char *QDBusConnection::default_connection_name = "qt_dbus_default_connection";

Index: qdbusconnection.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusconnection.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qdbusconnection.h	23 Sep 2005 13:08:26 -0000	1.1
+++ qdbusconnection.h	23 Sep 2005 16:24:36 -0000	1.2
@@ -23,7 +23,7 @@
 #ifndef QDBUSCONNECTION_H
 #define QDBUSCONNECTION_H
 
-#include "qdbusmacros.h"
+#include "dbus/qdbus.h"
 #include <QtCore/qstring.h>
 
 class QDBusConnectionPrivate;

Index: qdbusconnection_p.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusconnection_p.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qdbusconnection_p.h	23 Sep 2005 13:28:23 -0000	1.2
+++ qdbusconnection_p.h	23 Sep 2005 16:24:36 -0000	1.3
@@ -35,6 +35,8 @@
 #ifndef QDBUSCONNECTION_P_H
 #define QDBUSCONNECTION_P_H
 
+#include "qdbuserror.h"
+
 #include <QtCore/qatomic.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qobject.h>
@@ -43,8 +45,6 @@
 
 #include <dbus/dbus.h>
 
-#include "qdbuserror.h"
-
 class QDBusMessage;
 class QSocketNotifier;
 class QTimerEvent;

Index: qdbuserror.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbuserror.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qdbuserror.h	23 Sep 2005 13:08:26 -0000	1.1
+++ qdbuserror.h	23 Sep 2005 16:24:36 -0000	1.2
@@ -23,7 +23,7 @@
 #ifndef QDBUSERROR_H
 #define QDBUSERROR_H
 
-#include "qdbusmacros.h"
+#include "dbus/qdbus.h"
 #include <QtCore/qstring.h>
 
 struct DBusError;

--- qdbusmacros.h DELETED ---

Index: qdbusmessage.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusmessage.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qdbusmessage.h	23 Sep 2005 13:08:26 -0000	1.1
+++ qdbusmessage.h	23 Sep 2005 16:24:36 -0000	1.2
@@ -23,7 +23,8 @@
 #ifndef QDBUSMESSAGE_H
 #define QDBUSMESSAGE_H
 
-#include "qdbusmacros.h"
+#include "dbus/qdbus.h"
+
 #include <QtCore/qlist.h>
 #include <QtCore/qvariant.h>
 

Index: qdbusserver.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusserver.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qdbusserver.h	23 Sep 2005 13:08:26 -0000	1.1
+++ qdbusserver.h	23 Sep 2005 16:24:36 -0000	1.2
@@ -23,7 +23,7 @@
 #ifndef QDBUSSERVER_H
 #define QDBUSSERVER_H
 
-#include "qdbusmacros.h"
+#include "dbus/qdbus.h"
 #include <QtCore/qobject.h>
 #include <QtCore/qstring.h>
 

Index: qdbusvariant.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/qdbusvariant.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qdbusvariant.h	23 Sep 2005 13:08:26 -0000	1.1
+++ qdbusvariant.h	23 Sep 2005 16:24:36 -0000	1.2
@@ -23,7 +23,7 @@
 #ifndef QDBUSVARIANT_H
 #define QDBUSVARIANT_H
 
-#include "qdbusmacros.h"
+#include "dbus/qdbus.h"
 
 #include <QtCore/qmetatype.h>
 #include <QtCore/qstring.h>