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

diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
index c88e22b4..de78465f 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp
@@ -23,8 +23,8 @@
 
 #include "conferencetask.h"
 
-ConferenceTask::ConferenceTask( Task* parent )
- : EventTask( parent )
+ConferenceTask::ConferenceTask( Task* tqparent )
+ : EventTask( tqparent )
 {
 	// register all the events that this task monitors
 	registerEvent( GroupWise::ConferenceClosed );
@@ -53,10 +53,10 @@ ConferenceTask::~ConferenceTask()
 
 void ConferenceTask::dumpConferenceEvent( ConferenceEvent & evt )
 {
-	client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).arg
-			( evt.guid ).arg( evt.user.ascii() ).arg( evt.timeStamp.time().hour() ).arg
-			( evt.timeStamp.time().minute() ).arg( evt.timeStamp.time().second() ) ); 
- 	client()->debug( TQString( "                  flags: %1" ).arg( evt.flags, 8 ) );
+	client()->debug( TQString( "Conference Event - guid: %1 user: %2 timestamp: %3:%4:%5" ).tqarg
+			( evt.guid ).tqarg( evt.user.ascii() ).tqarg( evt.timeStamp.time().hour() ).tqarg
+			( evt.timeStamp.time().minute() ).tqarg( evt.timeStamp.time().second() ) ); 
+ 	client()->debug( TQString( "                  flags: %1" ).tqarg( evt.flags, 8 ) );
 }
 
 bool ConferenceTask::take( Transfer * transfer )
@@ -103,7 +103,7 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceiveMessage" );
-				client()->debug( TQString( "message: %1" ).arg( event.message ) );
+				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit message( event );
 				break;
@@ -119,7 +119,7 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ConferenceInvite" );
-				client()->debug( TQString( "message: %1" ).arg( event.message ) );
+				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit invited( event );
 				break;
@@ -139,14 +139,14 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceiveAutoReply" );
-				client()->debug( TQString( "message: %1" ).arg( event.message.ascii() ) );
+				client()->debug( TQString( "message: %1" ).tqarg( event.message.ascii() ) );
 				emit autoReply( event );
 				break;
 			case GroupWise::ReceivedBroadcast:
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceivedBroadCast" );
-				client()->debug( TQString( "message: %1" ).arg( event.message ) );
+				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
 				if ( !queueWhileAwaitingData( event ) )
 					emit broadcast( event );
 				break;
@@ -154,11 +154,11 @@ bool ConferenceTask::take( Transfer * transfer )
 				Q_ASSERT( incomingEvent->hasMessage() );
 				event.message = incomingEvent->message();
 				client()->debug( "ReceivedSystemBroadCast" );
-				client()->debug( TQString( "message: %1" ).arg( event.message ) );
+				client()->debug( TQString( "message: %1" ).tqarg( event.message ) );
 				emit systemBroadcast( event );
 				break;
 			default:
-				client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).arg( incomingEvent->eventType() ).arg( event.guid.ascii() ) );
+				client()->debug( TQString( "WARNING: didn't handle registered event %1, on conference %2" ).tqarg( incomingEvent->eventType() ).tqarg( event.guid.ascii() ) );
 		}
 		dumpConferenceEvent( event );
 
@@ -181,7 +181,7 @@ void ConferenceTask::slotReceiveUserDetails( const GroupWise::ContactDetails & d
 		// if the details relate to event, try again to handle it
 		if ( details.dn == (*current).user )
 		{
-			client()->debug( TQString( " - got details for event involving %1" ).arg( (*current).user ) );
+			client()->debug( TQString( " - got details for event involving %1" ).tqarg( (*current).user ) );
 			switch ( (*current).type )
 			{
 				case GroupWise::ConferenceJoined:
@@ -220,7 +220,7 @@ bool ConferenceTask::queueWhileAwaitingData( const ConferenceEvent & event )
 	}
 	else
 	{
-		client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).arg( event.user ) );
+		client()->debug( TQString( "ConferenceTask::queueWhileAwaitingData() - queueing event involving %1" ).tqarg( event.user ) );
 		client()->userDetailsManager()->requestDetails( event.user );
 		m_pendingEvents.append( event );
 		return true;