TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 12 insertions, 11 deletions

diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
index fcd540fc..a40f337c 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
+++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
@@ -20,18 +20,19 @@
 #include "gwclientstream.h"
 #include "gwconnector.h"
 #include <qca.h>
-#include "qcatlshandler.h"
+#include "tqcatlshandler.h"
 #include "requestfactory.h"
 #include "request.h"
 #include "usertransfer.h"
 
 #include "coreprotocol.h"
 
-#define QT_FATAL_ASSERT 1
+#define TQT_FATAL_ASSERT 1
 
-class ClientStreamTest : public QApplication
+class ClientStreamTest : public TQApplication
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	ClientStreamTest(int argc, char ** argv);
 	
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
index 2dace60b..69cd1991 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tests/field_test.cpp
@@ -11,12 +11,12 @@ int main()
 {
 	buildFakeContactList();
 	// look for a field in the list
-/*	if ( fl.find( NM_A_FA_MESSAGE ) != fl.end() )
+/*	if ( fl.tqfind( NM_A_FA_MESSAGE ) != fl.end() )
 		printf( "Found a field, where there was supposed to be one :)\n" );
 	else
 		printf( "Didn't find a field, where there was supposed to be one :(\n" );
 	Field::FieldListIterator it;
-	if ( (it = fl.find( NM_A_SZ_OBJECT_ID ) ) != fl.end() )
+	if ( (it = fl.tqfind( NM_A_SZ_OBJECT_ID ) ) != fl.end() )
 		printf( "Found a field, where there was NOT supposed to be one :(\n" );
 	else
 		printf( "Didn't find a field, where there wasn't supposed to be one :)\n" );*/
@@ -26,19 +26,19 @@ int main()
 	
 	printf( "\nNow testing find routines.\n");
 	// find the field containing the contact list
-	Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.find( NM_A_FA_CONTACT_LIST ) ) );
+	Field::MultiField * clf = dynamic_cast< Field::MultiField * >( *(fl.tqfind( NM_A_FA_CONTACT_LIST ) ) );
 	if ( clf )
 	{
 		Field::FieldList cl = clf->fields();
 		// look for a folder in the list
-		Field::FieldListIterator it = cl.find( NM_A_FA_FOLDER );
+		Field::FieldListIterator it = cl.tqfind( NM_A_FA_FOLDER );
 		if ( it != cl.end() )
 			printf( "Found the first folder :)\n");
 		else
 			printf( "Didn't find the first folder, where did it go? :(\n");
 		
 		printf( "Looking for a second folder :)\n");
-		it = cl.find( ++it, NM_A_FA_FOLDER );
+		it = cl.tqfind( ++it, NM_A_FA_FOLDER );
 		if ( it == cl.end() )
 			printf( "Didn't find a second folder :)\n" );
 		else
@@ -62,15 +62,15 @@ void buildList()
 	//				sf - contactlist (empty field array)
 	//				sf - message body 
 	
-	Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) );
+	Field::SingleField* sf = new Field::SingleField( NM_A_FA_MESSAGE, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "Da steh ich nun, ich armer Tor! Und bin so klug als wie zuvor..." ) );
 	fl.append( sf );
-	sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "maeuschen" ) );
+	sf = new Field::SingleField( NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "maeuschen" ) );
 	fl.append( sf );
 	// nested list
 	Field::FieldList nl;
 	sf = new Field::SingleField( NM_A_SZ_STATUS, 0, NMFIELD_TYPE_UDWORD, 123 );
 	nl.append( sf );
-	sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::fromLatin1( "bla bla" ) );
+	sf = new Field::SingleField( NM_A_SZ_MESSAGE_BODY, 0, NMFIELD_TYPE_UTF8, TQString::tqfromLatin1( "bla bla" ) );
 	nl.append( sf );
 	Field::MultiField* mf = new Field::MultiField( NM_A_FA_PARTICIPANTS, NMFIELD_METHOD_VALID, 0, NMFIELD_TYPE_ARRAY );
 	mf->setFields( nl );