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

diff --git a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
index da8025b7..d779564a 100644
--- a/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/eventprotocol.cpp
@@ -25,8 +25,8 @@
 
 using namespace GroupWise;
 
-EventProtocol::EventProtocol(TQObject *parent, const char *name)
- : InputProtocolBase(parent, name)
+EventProtocol::EventProtocol(TQObject *tqparent, const char *name)
+ : InputProtocolBase(tqparent, name)
 {
 }
 
@@ -42,7 +42,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	inBuf.open( IO_ReadOnly); 
 	m_din.setDevice( &inBuf );
 	m_din.setByteOrder( TQDataStream::LittleEndian );
-	Q_UINT32 type;
+	TQ_UINT32 type;
 
 	if ( !okToProceed() )
 	{
@@ -51,12 +51,12 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	}
 	// read the event type
 	m_din >> type;
-	m_bytes += sizeof( Q_UINT32 );
+	m_bytes += sizeof( TQ_UINT32 );
 	
-	debug( TQString( "EventProtocol::parse() Reading event of type %1" ).arg( type ) );
+	debug( TQString( "EventProtocol::parse() Reading event of type %1" ).tqarg( type ) );
 	if ( type > Stop )
 	{
-		debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).arg( type ) );
+		debug( TQString ( "EventProtocol::parse() - found unexpected event type %1 - assuming out of sync" ).tqarg( type ) );
 		m_state = OutOfSync;
 		return 0;
 	}
@@ -71,14 +71,14 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	
 	// now create an event object
 	//HACK: lowercased DN
-	EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::currentDateTime() );
+	EventTransfer * tentative = new EventTransfer( type, source.lower(), TQDateTime::tqcurrentDateTime() );
 
 	// add any additional data depending on the type of event
 	// Note: if there are any errors in the way the data is read below, we will soon be OutOfSync
 	TQString statusText;
 	TQString guid;
-	Q_UINT16 status;
-	Q_UINT32 flags;
+	TQ_UINT16 status;
+	TQ_UINT32 flags;
 	TQString message;
 	
 	switch ( type )
@@ -90,15 +90,15 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 				return 0;
 			}
 			m_din >> status;
-			m_bytes += sizeof( Q_UINT16 );
+			m_bytes += sizeof( TQ_UINT16 );
 			if ( !readString( statusText ) )
 			{
 				m_din.unsetDevice();
 				return 0;
 			}
-			debug( TQString( "got status: %1").arg( status ) );
-			tentative->setStatus( status );
-			debug( TQString( "tentative status: %1").arg( tentative->status() ) );
+			debug( TQString( "got status: %1").tqarg( status ) );
+			tentative->settqStatus( status );
+			debug( TQString( "tentative status: %1").tqarg( tentative->status() ) );
 			tentative->setStatusText( statusText );
 			break;
 		case ConferenceJoined:		// 106 - GUID + FLAGS
@@ -116,7 +116,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 			}
 			tentative->setFlags( flags );
 			break;
-		case UndeliverableStatus:	//102 - GUID
+		case UndeliverabletqStatus:	//102 - GUID
 		case ConferenceClosed:		//105
 		case ConferenceInviteNotify://118
 		case ConferenceReject:		//119
@@ -191,7 +191,7 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 			tentative->setMessage( message );
 			break;
 		default:
-			debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).arg( type ) );
+			debug( TQString( "EventProtocol::parse() - found unexpected event type %1" ).tqarg( type ) );
 			break;
 	}
 	// if we got this far, the parse succeeded, return the Transfer
@@ -202,12 +202,12 @@ Transfer * EventProtocol::parse( const TQByteArray & wire, uint& bytes )
 	return tentative;
 }
 
-bool EventProtocol::readFlags( Q_UINT32 &flags)
+bool EventProtocol::readFlags( TQ_UINT32 &flags)
 {
 	if ( okToProceed() )
 	{
 		m_din >> flags;
-		m_bytes += sizeof( Q_UINT32 );
+		m_bytes += sizeof( TQ_UINT32 );
 		return true;
 	}
 	return false;