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, 5 insertions, 5 deletions

diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index c8998495..8d9c55e8 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -30,8 +30,8 @@
 #include "buffer.h"
 #include "oscartypes.h"
 
-ChatServiceTask::ChatServiceTask( Task* parent, Oscar::WORD exchange, const TQString& room )
-	: Task( parent ), m_encoding( "us-ascii" )
+ChatServiceTask::ChatServiceTask( Task* tqparent, Oscar::WORD exchange, const TQString& room )
+	: Task( tqparent ), m_encoding( "us-ascii" )
 {
     m_exchange = exchange;
     m_room = room;
@@ -56,7 +56,7 @@ void ChatServiceTask::onGo()
 {
     if ( !m_message )
     {
-        setSuccess( true, TQString::null );
+        setSuccess( true, TQString() );
         return;
     }
 
@@ -158,7 +158,7 @@ bool ChatServiceTask::take( Transfer* t )
         break;
     };
 
-    setSuccess( 0, TQString::null );
+    setSuccess( 0, TQString() );
     setTransfer( 0 );
     return true;
 }
@@ -341,7 +341,7 @@ void ChatServiceTask::parseChatMessage()
     Oscar::Message omessage;
     omessage.setReceiver( client()->userId() );
     omessage.setSender( sender );
-    omessage.setTimestamp( TQDateTime::currentDateTime() );
+    omessage.setTimestamp( TQDateTime::tqcurrentDateTime() );
     omessage.setText( Oscar::Message::UTF8, msgText );
     omessage.setType( 0x03 );
     omessage.setExchange( m_exchange );