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

1 files changed, 8 insertions, 8 deletions

diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
index 87da6020..085bac9e 100644
--- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp
@@ -59,9 +59,9 @@ public:
 		bs = 0;
 		connection = 0;
 		
-		username = TQString::null;
-		password = TQString::null;
-		server = TQString::null;
+		username = TQString();
+		password = TQString();
+		server = TQString();
 		haveLocalAddr = false;
 		doBinding = true;
 
@@ -80,7 +80,7 @@ public:
 	bool doAuth; //send the initial login sequences to get the cookie
 	bool haveLocalAddr;
 	TQHostAddress localAddr;
-	Q_UINT16 localPort;
+	TQ_UINT16 localPort;
 	bool doBinding;
 
 	Connector *conn;
@@ -104,8 +104,8 @@ public:
 	int noop_time;
 };
 
-ClientStream::ClientStream(Connector *conn, TQObject *parent)
-:Stream(parent)
+ClientStream::ClientStream(Connector *conn, TQObject *tqparent)
+:Stream(tqparent)
 {
 	//qDebug("CLIENTSTREAM::ClientStream");
 
@@ -205,7 +205,7 @@ void ClientStream::setNoopTime(int mills)
 	d->noopTimer.start( d->noop_time );
 }
 
-void ClientStream::setLocalAddr(const TQHostAddress &addr, Q_UINT16 port)
+void ClientStream::setLocalAddr(const TQHostAddress &addr, TQ_UINT16 port)
 {
 	d->haveLocalAddr = true;
 	d->localAddr = addr;
@@ -266,7 +266,7 @@ void ClientStream::write( Transfer *request )
 void cs_dump( const TQByteArray &bytes )
 {
 #if 0
-	qDebug( "contains: %i bytes ", bytes.count() );
+	qDebug( "tqcontains: %i bytes ", bytes.count() );
 	uint count = 0;
 	while ( count < bytes.count() )
 	{