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

10 files changed, 40 insertions, 40 deletions

diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
index 7d46fc34..35dde6b8 100644
--- a/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.cpp
@@ -1,5 +1,5 @@
 /*
-    Account mock object class
+    Account tqmock object class
 
     Copyright (c) 2005 by Duncan Mac-Vicar Prett  <duncan@kde.org>
 
@@ -15,9 +15,9 @@
     *************************************************************************
 */
 
-#include "kopeteaccount_mock.h"
+#include "kopeteaccount_tqmock.h"
 #include "kopetemetacontact.h"
-#include "kopeteaccount_mock.h"
+#include "kopeteaccount_tqmock.h"
 
 namespace Kopete
 {
@@ -26,7 +26,7 @@ namespace Test
 namespace Mock
 {
 
-Account::Account(Kopete::Protocol *parent, const TQString &accountID, const char *name) : Kopete::Account(parent, accountID, name)
+Account::Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name) : Kopete::Account(tqparent, accountID, name)
 {
 
 }
@@ -36,12 +36,12 @@ Account::~Account()
 
 }
 
-bool Account::createContact( const TQString &contactId, Kopete::MetaContact *parentContact )
+bool Account::createContact( const TQString &contactId, Kopete::MetaContact *tqparentContact )
 {
 	return true;
 }
 
-void Account::connect( const Kopete::OnlineStatus& initialStatus)
+void Account::connect( const Kopete::OnlineStatus& initialtqStatus)
 {
 	// do nothing
 }
diff --git a/kopete/libkopete/tests/mock/kopeteaccount_mock.h b/kopete/libkopete/tests/mock/kopeteaccount_mock.h
index ac5a7253..93b1acdf 100644
--- a/kopete/libkopete/tests/mock/kopeteaccount_mock.h
+++ b/kopete/libkopete/tests/mock/kopeteaccount_mock.h
@@ -1,5 +1,5 @@
 /*
-    Account mock object class
+    Account tqmock object class
 
     Copyright (c) 2005 by Duncan Mac-Vicar Prett  <duncan@kde.org>
 
@@ -15,8 +15,8 @@
     *************************************************************************
 */
 
-#ifndef _KOPETEACCOUNT_MOCK_H_
-#define _KOPETEACCOUNT_MOCK_H_
+#ifndef _KOPETEACCOUNT_TQMOCK_H_
+#define _KOPETEACCOUNT_TQMOCK_H_
 
 #include "kopeteaccount.h"
 
@@ -36,13 +36,13 @@ namespace Mock
 class Account : public Kopete::Account
 {
 public:
-	Account(Kopete::Protocol *parent, const TQString &accountID, const char *name=0L);
+	Account(Kopete::Protocol *tqparent, const TQString &accountID, const char *name=0L);
 	~Account();
 	// pure virtual functions implementation
-	virtual bool createContact( const TQString &contactId, MetaContact *parentContact );
-	virtual void connect( const Kopete::OnlineStatus& initialStatus = OnlineStatus() );
+	virtual bool createContact( const TQString &contactId, MetaContact *tqparentContact );
+	virtual void connect( const Kopete::OnlineStatus& initialtqStatus = OnlineStatus() );
 	virtual void disconnect();
-	virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString::null );
+	virtual void setOnlineStatus( const Kopete::OnlineStatus& status , const TQString &reason = TQString() );
 };
 
 } // end ns Kopete::Test::Mock
diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
index ea90bee0..04f38727 100644
--- a/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopetecontact_mock.cpp
@@ -1,5 +1,5 @@
 /*
-    Contact mock object class
+    Contact tqmock object class
 
     Copyright (c) 2005 by Duncan Mac-Vicar Prett  <duncan@kde.org>
 
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include "kopetecontact_mock.h"
+#include "kopetecontact_tqmock.h"
 
 namespace Kopete
 {
@@ -24,7 +24,7 @@ namespace Test
 namespace Mock
 {
 
-Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon) : Kopete::Contact( account, id, parent, icon)
+Contact::Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon) : Kopete::Contact( account, id, tqparent, icon)
 {
 
 }
diff --git a/kopete/libkopete/tests/mock/kopetecontact_mock.h b/kopete/libkopete/tests/mock/kopetecontact_mock.h
index faa78e3b..437887d9 100644
--- a/kopete/libkopete/tests/mock/kopetecontact_mock.h
+++ b/kopete/libkopete/tests/mock/kopetecontact_mock.h
@@ -1,5 +1,5 @@
 /*
-    Contact mock object class
+    Contact tqmock object class
 
     Copyright (c) 2005 by Duncan Mac-Vicar Prett  <duncan@kde.org>
 
@@ -15,8 +15,8 @@
     *************************************************************************
 */
 
-#ifndef _KOPETECONTACT_MOCK_H_
-#define _KOPETECONTACT_MOCK_H_
+#ifndef _KOPETECONTACT_TQMOCK_H_
+#define _KOPETECONTACT_TQMOCK_H_
 
 #include "kopetecontact.h"
 
@@ -35,7 +35,7 @@ namespace Mock
 class Contact : public Kopete::Contact
 {
 public:
-	Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *parent, const TQString &icon = TQString::null );
+	Contact( Kopete::Account *account, const TQString &id, Kopete::MetaContact *tqparent, const TQString &icon = TQString() );
 	~Contact();
 	virtual Kopete::ChatSession* manager( CanCreateFlags canCreate = CannotCreate );
 };
diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
index a3e543e3..66f325e3 100644
--- a/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopetemessage_mock.cpp
@@ -1,5 +1,5 @@
 /*
-    Message mock object class
+    Message tqmock object class
 
     Copyright (c) 2005 by Duncan Mac-Vicar Prett  <duncan@kde.org>
 
@@ -15,6 +15,6 @@
     *************************************************************************
 */
 
-#include "kopetemessage_mock.h"
+#include "kopetemessage_tqmock.h"
 
 
diff --git a/kopete/libkopete/tests/mock/kopetemessage_mock.h b/kopete/libkopete/tests/mock/kopetemessage_mock.h
index 13c92574..f8677ee6 100644
--- a/kopete/libkopete/tests/mock/kopetemessage_mock.h
+++ b/kopete/libkopete/tests/mock/kopetemessage_mock.h
@@ -1,5 +1,5 @@
 /*
-    Message mock object class
+    Message tqmock object class
 
     Copyright (c) 2005 by Duncan Mac-Vicar Prett  <duncan@kde.org>
 
@@ -15,8 +15,8 @@
     *************************************************************************
 */
 
-#ifndef _KOPETEMESSAGE_MOCK_H_
-#define _KOPETEMESSAGE_MOCK_H_
+#ifndef _KOPETEMESSAGE_TQMOCK_H_
+#define _KOPETEMESSAGE_TQMOCK_H_
 
 #include "kopetemessage.h"
 
diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
index 32f0fe1c..e9cc95a1 100644
--- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.cpp
@@ -15,6 +15,6 @@
     *************************************************************************
 */
 
-#include "kopetemetacontact_mock.h"
+#include "kopetemetacontact_tqmock.h"
 
 
diff --git a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
index f3311713..2fa6d8c6 100644
--- a/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
+++ b/kopete/libkopete/tests/mock/kopetemetacontact_mock.h
@@ -15,8 +15,8 @@
     *************************************************************************
 */
 
-#ifndef _KOPETEMETACONTACT_MOCK_H_
-#define _KOPETEMETACONTACT_MOCK_H_
+#ifndef _KOPETEMETACONTACT_TQMOCK_H_
+#define _KOPETEMETACONTACT_TQMOCK_H_
 
 #include "kopetemetacontact.h"
 
diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
index d9ae1d3a..03a65808 100644
--- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.cpp
@@ -1,5 +1,5 @@
 /*
-    Protocol mock object class
+    Protocol tqmock object class
 
     Copyright (c) 2005 by Duncan Mac-Vicar Prett  <duncan@kde.org>
 
@@ -15,7 +15,7 @@
     *************************************************************************
 */
 
-#include "kopeteprotocol_mock.h"
+#include "kopeteprotocol_tqmock.h"
 
 namespace Kopete
 {
@@ -24,7 +24,7 @@ namespace Test
 namespace Mock
 {
 
-Protocol::Protocol( KInstance *instance, TQObject *parent, const char *name ) : Kopete::Protocol(instance, parent, name)
+Protocol::Protocol( KInstance *instance, TQObject *tqparent, const char *name ) : Kopete::Protocol(instance, tqparent, name)
 {
 	
 }
@@ -34,16 +34,16 @@ Account* Protocol::createNewAccount( const TQString &accountId )
 	return 0L;
 }
 
-AddContactPage* Protocol::createAddContactWidget( TQWidget *parent, Kopete::Account *account )
+AddContactPage* Protocol::createAddContactWidget( TQWidget *tqparent, Kopete::Account *account )
 {
 	return 0L;
 }
 
-KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *parent )
+KopeteEditAccountWidget* Protocol::createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent )
 {
 	return 0L;
 }
 
-} // end ns mock
+} // end ns tqmock
 } // end ns test
 } // end ns kopete
diff --git a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
index d2502790..86b551d5 100644
--- a/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
+++ b/kopete/libkopete/tests/mock/kopeteprotocol_mock.h
@@ -1,5 +1,5 @@
 /*
-    Protocol mock object class
+    Protocol tqmock object class
 
     Copyright (c) 2005 by Duncan Mac-Vicar Prett  <duncan@kde.org>
 
@@ -15,8 +15,8 @@
     *************************************************************************
 */
 
-#ifndef _KOPETEPROTOCOL_MOCK_H_
-#define _KOPETEPROTOCOL_MOCK_H_
+#ifndef _KOPETEPROTOCOL_TQMOCK_H_
+#define _KOPETEPROTOCOL_TQMOCK_H_
 
 #include "kopeteprotocol.h"
 
@@ -37,11 +37,11 @@ namespace Mock
 class Protocol : public Kopete::Protocol
 {
 public:
-	Protocol( KInstance *instance, TQObject *parent, const char *name );
+	Protocol( KInstance *instance, TQObject *tqparent, const char *name );
 	// pure virtual functions implemented
 	virtual Account *createNewAccount( const TQString &accountId );
-	virtual AddContactPage *createAddContactWidget( TQWidget *parent, Kopete::Account *account );
-	virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *parent );
+	virtual AddContactPage *createAddContactWidget( TQWidget *tqparent, Kopete::Account *account );
+	virtual KopeteEditAccountWidget * createEditAccountWidget( Kopete::Account *account, TQWidget *tqparent );
 };
 
 } // end ns Kopete::Test::Mock