1 files changed, 20 insertions, 33 deletions

diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp
index eb8e4883b..25eb34d8e 100644
--- a/tdecore/network/kclientsocketbase.cpp
+++ b/tdecore/network/kclientsocketbase.cpp
@@ -1,4 +1,4 @@
-/*  -*- C++ -*-
+/*
  *  Copyright (C) 2003,2005 Thiago Macieira <thiago.macieira@kdemail.net>
  *
  *
@@ -48,16 +48,8 @@ public:
 };
 
 KClientSocketBase::KClientSocketBase(TQObject *parent, const char *name)  :
-#ifdef USE_QT4
-#else // USE_QT4
-    TQObject(parent, name),
-#endif // USE_QT4
-    d(new KClientSocketBasePrivate)
-{
-#ifdef USE_QT4
-  setParent(parent);
-  setObjectName(name);
-#endif // USE_QT4
+    TQObject(parent, name), d(new KClientSocketBasePrivate)
+{
   d->state = Idle;
   d->enableRead = true;
   d->enableWrite = false;
@@ -152,10 +144,10 @@ bool KClientSocketBase::lookup()
 
       // don't restart the lookups if they had succeeded and
       // the input values weren't changed
-      TQObject::connect(&d->peerResolver, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(lookupFinishedSlot()));
-      TQObject::connect(&d->localResolver, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(lookupFinishedSlot()));
+      TQObject::connect(&d->peerResolver, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(lookupFinishedSlot()));
+      TQObject::connect(&d->localResolver, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(lookupFinishedSlot()));
 
       if (d->localResolver.status() <= 0)
 	d->localResolver.start();
@@ -172,7 +164,7 @@ bool KClientSocketBase::lookup()
 	  if (blocking())
 	    lookupFinishedSlot();
 	  else
-	    TQTimer::singleShot(0, this, TQT_SLOT(lookupFinishedSlot()));
+	    TQTimer::singleShot(0, this, TQ_SLOT(lookupFinishedSlot()));
 	}
       else
 	{
@@ -286,12 +278,7 @@ void KClientSocketBase::close()
 }
 
 // This function is unlike all the others because it is const
-#ifdef USE_QT3
 TQ_LONG KClientSocketBase::bytesAvailable() const
-#endif
-#ifdef USE_QT4
-qint64 KClientSocketBase::bytesAvailable() const
-#endif
 {
   return socketDevice()->bytesAvailable();
 }
@@ -311,10 +298,10 @@ TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
+TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen);
+  TQ_LONG retval = socketDevice()->readBlock(data, maxlen);
   if (retval == -1)
     {
       copyError();
@@ -323,10 +310,10 @@ TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, TDESocketAddress& from)
+TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, TDESocketAddress& from)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from);
+  TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from);
   if (retval == -1)
     {
       copyError();
@@ -359,10 +346,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, TDESocketAddre
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
+TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->tqwriteBlock(data, len);
+  TQ_LONG retval = socketDevice()->writeBlock(data, len);
   if (retval == -1)
     {
       copyError();
@@ -371,10 +358,10 @@ TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG l
   return retval;
 }
 
-TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const TDESocketAddress& to)
+TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const TDESocketAddress& to)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to);
+  TQ_LONG retval = socketDevice()->writeBlock(data, len, to);
   if (retval == -1)
     {
       copyError();
@@ -440,8 +427,8 @@ void KClientSocketBase::lookupFinishedSlot()
   if (d->peerResolver.isRunning() || d->localResolver.isRunning() || state() != HostLookup)
     return;
 
-  TQObject::disconnect(&d->peerResolver, 0L, this, TQT_SLOT(lookupFinishedSlot()));
-  TQObject::disconnect(&d->localResolver, 0L, this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::disconnect(&d->peerResolver, 0L, this, TQ_SLOT(lookupFinishedSlot()));
+  TQObject::disconnect(&d->localResolver, 0L, this, TQ_SLOT(lookupFinishedSlot()));
   if (d->peerResolver.status() < 0 || d->localResolver.status() < 0)
     {
       setState(Idle);		// backtrack
@@ -466,7 +453,7 @@ void KClientSocketBase::stateChanging(SocketState newState)
       if (n)
 	{
 	  n->setEnabled(d->enableRead);
-	  TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity()));
+	  TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity()));
 	}
       else
 	return;
@@ -475,7 +462,7 @@ void KClientSocketBase::stateChanging(SocketState newState)
       if (n)
 	{
 	  n->setEnabled(d->enableWrite);
-	  TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity()));
+	  TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity()));
 	}
       else
 	return;