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

diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp
index 1a88fbc3..c91f652d 100644
--- a/kopete/protocols/groupwise/libgroupwise/client.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/client.cpp
@@ -63,7 +63,7 @@ public:
 	UserDetailsManager * userDetailsMgr;
 	PrivacyManager * privacyMgr;
 	uint protocolVersion;
-	TQValueList<GroupWise::CustomStatus> customStatuses;
+	TQValueList<GroupWise::CustomtqStatus> customStatuses;
 	TQTimer * keepAliveTimer;
 };
 
@@ -103,7 +103,7 @@ void Client::connectToServer( ClientStream *s, const NovellDN &server, bool auth
 	//connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected()));
 	//connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken()));
 	connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int)));
-	//connect(d->stream, TQT_SIGNAL(sslCertificateReady(const QSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const QSSLCert &)));
+	//connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &)));
 	connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead()));
 	//connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished()));
 
@@ -151,8 +151,8 @@ void Client::start( const TQString &host, const uint port, const TQString &userI
 	connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ),
 			privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) );
 
-	connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), 
-			TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) );
+	connect( login, TQT_SIGNAL( gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ), 
+			TQT_SLOT( lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & ) ) );
 
 	connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) );
 
@@ -185,7 +185,7 @@ int Client::port()
 	return d->port;
 }
 
-TQValueList<GroupWise::CustomStatus> Client::customStatuses()
+TQValueList<GroupWise::CustomtqStatus> Client::customStatuses()
 {
 	return d->customStatuses;
 }
@@ -194,7 +194,7 @@ void Client::initialiseEventTasks()
 {
 	// The StatusTask handles incoming status changes
 	StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot?
-	connect( st, TQT_SIGNAL( gotStatus( const TQString &, Q_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, Q_UINT16, const TQString & ) ) );
+	connect( st, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
 	// The ConferenceTask handles incoming conference events, messages, joins, leaves, etc
 	ConferenceTask * ct = new ConferenceTask( d->root ); 
 	connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) );
@@ -216,9 +216,9 @@ void Client::initialiseEventTasks()
 	connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) );
 }
 
-void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply )
+void Client::settqStatus( GroupWise::tqStatus status, const TQString & reason, const TQString & autoReply )
 {
-	debug( TQString("Setting status to %1").arg( status ) );;
+	debug( TQString("Setting status to %1").tqarg( status ) );;
 	SetStatusTask * sst = new SetStatusTask( d->root );
 	sst->status( status, reason, autoReply );
 	connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) );
@@ -226,11 +226,11 @@ void Client::setStatus( GroupWise::Status status, const TQString & reason, const
 	// TODO: set status change in progress flag
 }
 
-void Client::requestStatus( const TQString & userDN )
+void Client::requesttqStatus( const TQString & userDN )
 {
 	GetStatusTask * gst = new GetStatusTask( d->root );
 	gst->userDN( userDN );
-	connect( gst, TQT_SIGNAL( gotStatus( const TQString &, Q_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, Q_UINT16, const TQString & ) ) );
+	connect( gst, TQT_SIGNAL( gottqStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) );
 	gst->go( true );
 }
 
@@ -306,7 +306,7 @@ void Client::sendInvitation( const GroupWise::ConferenceGuid & guid, const TQStr
 // SLOTS //
 void Client::streamError( int error )
 {
-	debug( TQString( "CLIENT ERROR (Error %1)" ).arg( error ) );
+	debug( TQString( "CLIENT ERROR (Error %1)" ).tqarg( error ) );
 }
 
 void Client::streamReadyRead()
@@ -326,7 +326,7 @@ void Client::lt_loginFinished()
 		debug( "Client::lt_loginFinished() LOGIN SUCCEEDED" );
 		// set our initial status
 		SetStatusTask * sst = new SetStatusTask( d->root );
-		sst->status( GroupWise::Available, TQString::null, TQString::null );
+		sst->status( GroupWise::Available, TQString(), TQString() );
 		sst->go( true );
 		emit loggedIn();
 		// fetch details for any privacy list items that aren't in our contact list.
@@ -348,7 +348,7 @@ void Client::sst_statusChanged()
 	const SetStatusTask * sst = (SetStatusTask *)sender();
 	if ( sst->success() )
 	{
-		emit ourStatusChanged( sst->requestedStatus(), sst->awayMessage(), sst->autoReply() );
+		emit ourStatusChanged( sst->requestedtqStatus(), sst->awayMessage(), sst->autoReply() );
 	}
 }
 
@@ -365,10 +365,10 @@ void Client::ct_messageReceived( const ConferenceEvent & messageEvent )
 	// we can drop these once the server reenables the sending of unformatted text
 	// redundant linebreak at the end of the message
 	TQRegExp rx(" </span> </span> </span><br>$");
-	transformedEvent.message.replace( rx, "</span></span></span>" );
+	transformedEvent.message.tqreplace( rx, "</span></span></span>" );
 	// missing linebreak after first line of an encrypted message
 	TQRegExp ry("-----BEGIN PGP MESSAGE----- </span> </span> </span>");
-	transformedEvent.message.replace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" );
+	transformedEvent.message.tqreplace( ry, "-----BEGIN PGP MESSAGE-----</span></span></span><br/>" );
 
 	emit messageReceived( transformedEvent );
 }
@@ -390,19 +390,19 @@ void Client::jct_joinConfCompleted()
 {
 	const JoinConferenceTask * jct = ( JoinConferenceTask * )sender();
 #ifdef LIBGW_DEBUG
-	debug( TQString( "Joined conference %1, participants are: " ).arg( jct->guid() ) );
+	debug( TQString( "Joined conference %1, participants are: " ).tqarg( jct->guid() ) );
 	TQStringList parts = jct->participants();
 	for ( TQStringList::Iterator it = parts.begin(); it != parts.end(); ++it )
-		debug( TQString( " - %1" ).arg(*it) );
+		debug( TQString( " - %1" ).tqarg(*it) );
 	debug( "invitees are: " );
 	TQStringList invitees = jct->invitees();
 	for ( TQStringList::Iterator it = invitees.begin(); it != invitees.end(); ++it )
-		debug( TQString( " - %1" ).arg(*it) );
+		debug( TQString( " - %1" ).tqarg(*it) );
 #endif
 	emit conferenceJoined( jct->guid(), jct->participants(), jct->invitees() );
 }
 
-void Client::lt_gotCustomStatus( const GroupWise::CustomStatus & custom )
+void Client::lt_gotCustomtqStatus( const GroupWise::CustomtqStatus & custom )
 {
 	d->customStatuses.append( custom );
 }
@@ -431,7 +431,7 @@ TQString Client::password()
 
 TQString Client::userAgent()
 {
-	return TQString::fromLatin1( "%1/%2 (%3)" ).arg( d->clientName, d->clientVersion, d->osname );
+	return TQString::tqfromLatin1( "%1/%2 (%3)" ).tqarg( d->clientName, d->clientVersion, d->osname );
 }
 
 TQCString Client::ipAddress()
@@ -457,7 +457,7 @@ void Client::send( Request * request )
 		return;
 	}
 // 	TQString out = request.toString();
-// 	debug(TQString("Client: outgoing: [\n%1]\n").arg(out));
+// 	debug(TQString("Client: outgoing: [\n%1]\n").tqarg(out));
 // 	xmlOutgoing(out);
 
 	d->stream->write( request );