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/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp
index af7d8948..198009a3 100644
--- a/kopete/protocols/irc/libkirc/kirctransfer.cpp
+++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp
@@ -28,21 +28,21 @@ using namespace KIRC;
 
 Transfer::Transfer(	Engine *engine, TQString nick,// TQString nick_peer_adress
 			Type type,
-			TQObject *parent, const char *name )
-	: TQObject( parent, name ),
+			TQObject *tqparent, const char *name )
+	: TQObject( tqparent, name ),
 	  m_engine(engine), m_nick(nick),
 	  m_type(type), m_socket(0),
 	  m_initiated(false),
-	  m_file(0), m_fileName(TQString::null), m_fileSize(0), m_fileSizeCur(0), m_fileSizeAck(0),
+	  m_file(0), m_fileName(TQString()), m_fileSize(0), m_fileSizeCur(0), m_fileSizeAck(0),
 	  m_receivedBytes(0), m_receivedBytesLimit(0), m_sentBytes(0), m_sentBytesLimit(0)
 {
 }
 
 Transfer::Transfer(	Engine *engine, TQString nick,// TQString nick_peer_adress
 			Transfer::Type type,
-			TQString fileName, Q_UINT32 fileSize, // put this in a TQVariant ?
-			TQObject *parent, const char *name )
-	: TQObject( parent, name ),
+			TQString fileName, TQ_UINT32 fileSize, // put this in a TQVariant ?
+			TQObject *tqparent, const char *name )
+	: TQObject( tqparent, name ),
 	  m_engine(engine), m_nick(nick),
 	  m_type(type), m_socket(0),
 	  m_initiated(false),
@@ -52,11 +52,11 @@ Transfer::Transfer(	Engine *engine, TQString nick,// TQString nick_peer_adress
 }
 
 Transfer::Transfer(	Engine *engine, TQString nick,// TQString nick_peer_adress
-			TQHostAddress hostAdress, Q_UINT16 port, // put this in a TQVariant ?
+			TQHostAddress hostAdress, TQ_UINT16 port, // put this in a TQVariant ?
 			Transfer::Type type,
-			TQString fileName, Q_UINT32 fileSize, // put this in a TQVariant ?
-			TQObject *parent, const char *name )
-	: TQObject( parent, name ),
+			TQString fileName, TQ_UINT32 fileSize, // put this in a TQVariant ?
+			TQObject *tqparent, const char *name )
+	: TQObject( tqparent, name ),
 	  m_engine(engine), m_nick(nick),
 	  m_type(type), m_socket(0),
 	  m_initiated(false),
@@ -68,8 +68,8 @@ Transfer::Transfer(	Engine *engine, TQString nick,// TQString nick_peer_adress
 /*
 Transfer::Transfer(	Engine *engine, TQString nick,// TQString nick_peer_adress
 				Transfer::Type type, TQVariant properties,
-				TQObject *parent, const char *name )
-	: TQObject( parent, name ),
+				TQObject *tqparent, const char *name )
+	: TQObject( tqparent, name ),
 	  m_engine(engine), m_nick(nick),
 	  m_type(type), m_socket(properties[socket]),
 	  m_initiated(false),
@@ -94,11 +94,11 @@ Transfer::~Transfer()
 	// m_file is automatically closed on destroy.
 }
 
-Transfer::Status Transfer::status() const
+Transfer::tqStatus Transfer::status() const
 {
 	if(m_socket)
 	{
-//		return (Transfer::Status)m_socket->socketStatus();
+//		return (Transfer::tqStatus)m_socket->socketStatus();
 		return Connected;
 	}
 	return Error_NoSocket;
@@ -310,7 +310,7 @@ void Transfer::readyReadFileOutgoing()
 	kdDebug(14121) << k_funcinfo << "Available bytes:" << m_socket->bytesAvailable() << endl;
 
 	bool hadData = false;
-	Q_UINT32 fileSizeAck = 0;
+	TQ_UINT32 fileSizeAck = 0;
 
 //	if (m_socket->bytesAvailable() >= sizeof(fileSizeAck)) // BUGGY: bytesAvailable() that allways return 0 on unbuffered sockets.
 	{
@@ -334,7 +334,7 @@ void Transfer::writeFileOutgoing()
 		m_bufferLength = m_file.readBlock(m_buffer, sizeof(m_buffer));
 		if (m_bufferLength > 0)
 		{
-			Q_UINT32 read = m_socket->writeBlock(m_buffer, m_bufferLength); // should check written == read
+			TQ_UINT32 read = m_socket->writeBlock(m_buffer, m_bufferLength); // should check written == read
 
 //			if(read != m_buffer_length)
 //				buffer is not cleared still
@@ -348,7 +348,7 @@ void Transfer::writeFileOutgoing()
 	}
 }
 
-void Transfer::checkFileTransferEnd(Q_UINT32 fileSizeAck)
+void Transfer::checkFileTransferEnd(TQ_UINT32 fileSizeAck)
 {
 	kdDebug(14121) << k_funcinfo << "Acknowledged:" << fileSizeAck << endl;