dbus/qt/examples Makefile.am,1.4,1.5 chat.h,1.1,1.2

[Thiago J. Macieira]

Update of /cvs/dbus/dbus/qt/examples
In directory kemper:/tmp/cvs-serv13305/qt/examples

Modified Files:
	Makefile.am chat.h 
Log Message:
	* qt/tools/dbuscpp2xml.cpp: Compile on Windows.
	* qt/tools/dbusidl2cpp.cpp: Add missing newline.

	* qt/examples/Makefile.am:
	* qt/examples/chat.h: Use UI-generated files with the ui_*.h
	form.

	* qt/src/qdbusmarshall.cpp: Allow sending of QString() and
	QByteArray() (nulls) over the bus.
	* qt/src/qdbusabstractinterface.cpp: Use the correct variable,
	the one that has the signature suffix stripped.
	* qt/src/qdbusreply.h: Make some methods const.


Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/qt/examples/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	5 Jun 2006 18:13:07 -0000	1.4
+++ Makefile.am	11 Jun 2006 12:16:30 -0000	1.5
@@ -5,9 +5,9 @@
 chat_LDADD = $(LDADD) $(DBUS_QT_GUI_LIBS)
 dist_chat_SOURCES = chat.cpp chat.h chatadaptor.cpp
 nodist_chat_SOURCES = chatinterface.cpp
-chat.o: chatmainwindow.h chatsetnickname.h chatinterface.h chatadaptor.h chat.moc chatadaptor.moc
-chatmainwindow.h: chatmainwindow.ui
-chatsetnickname.h: chatsetnickname.ui
+chat.o: ui_chatmainwindow.h ui_chatsetnickname.h chatinterface.h chatadaptor.h chat.moc chatadaptor.moc
+ui_chatmainwindow.h: chatmainwindow.ui
+ui_chatsetnickname.h: chatsetnickname.ui
 chatinterface.cpp chatinterface.h: com.trolltech.ChatInterface.xml
 	../tools/dbusidl2cpp -m -p chatinterface $?
 	$(QT_MOC) -o chatinterface.moc chatinterface.h
@@ -37,6 +37,6 @@
 
 %.moc: %.h
 	$(QT_MOC) $< > $@
-%.h: %.ui
+ui_%.h: %.ui
 	$(QT_UIC) -o $@ $?
 

Index: chat.h
===================================================================
RCS file: /cvs/dbus/dbus/qt/examples/chat.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- chat.h	28 Mar 2006 19:16:35 -0000	1.1
+++ chat.h	11 Jun 2006 12:16:30 -0000	1.2
@@ -24,8 +24,8 @@
 
 #include <QtCore/QStringList>
 #include <dbus/qdbus.h>
-#include "chatmainwindow.h"
-#include "chatsetnickname.h"
+#include "ui_chatmainwindow.h"
+#include "ui_chatsetnickname.h"
 
 class ChatMainWindow: public QMainWindow, Ui::ChatMainWindow
 {