1 files changed, 28 insertions, 28 deletions

diff --git a/kftpgrabber/src/engine/socket.cpp b/kftpgrabber/src/engine/socket.cpp
index 370de1b..afc5341 100644
--- a/kftpgrabber/src/engine/socket.cpp
+++ b/kftpgrabber/src/engine/socket.cpp
@@ -41,11 +41,11 @@
 
 #include "misc/config.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KFTPEngine {
 
-Socket::Socket(Thread *thread, const QString &protocol)
+Socket::Socket(Thread *thread, const TQString &protocol)
  : m_remoteEncoding(new KRemoteEncoding()),
    m_cmdData(0),
    m_thread(thread),
@@ -82,7 +82,7 @@ void Socket::initConfig()
   setConfig("keepalive.timeout", 60);
 }
 
-void Socket::emitError(ErrorCode code, const QString &param1)
+void Socket::emitError(ErrorCode code, const TQString &param1)
 {
   // Intercept connect and login errors and pass them on to the ConnectionRetry class (if enabled)
   if (getConfigInt("retry") && (code == ConnectFailed || code == LoginFailed)) {
@@ -93,7 +93,7 @@ void Socket::emitError(ErrorCode code, const QString &param1)
     return;
   }
   
-  QValueList<EventParameter> params;
+  TQValueList<EventParameter> params;
   params.append(EventParameter(code));
   params.append(EventParameter(param1));
   
@@ -101,9 +101,9 @@ void Socket::emitError(ErrorCode code, const QString &param1)
   m_thread->event(Event::EventError, params);
 }
 
-void Socket::emitEvent(Event::Type type, const QString &param1, const QString &param2)
+void Socket::emitEvent(Event::Type type, const TQString &param1, const TQString &param2)
 {
-  QValueList<EventParameter> params;
+  TQValueList<EventParameter> params;
   params.append(EventParameter(param1));
   params.append(EventParameter(param2));
   
@@ -113,7 +113,7 @@ void Socket::emitEvent(Event::Type type, const QString &param1, const QString &p
 
 void Socket::emitEvent(Event::Type type, DirectoryListing param1)
 {
-  QValueList<EventParameter> params;
+  TQValueList<EventParameter> params;
   params.append(EventParameter(param1));
   
   // Dispatch the event via socket thread
@@ -122,7 +122,7 @@ void Socket::emitEvent(Event::Type type, DirectoryListing param1)
 
 void Socket::emitEvent(Event::Type type, filesize_t param1)
 {
-  QValueList<EventParameter> params;
+  TQValueList<EventParameter> params;
   params.append(EventParameter(param1));
   
   // Dispatch the event via socket thread
@@ -131,14 +131,14 @@ void Socket::emitEvent(Event::Type type, filesize_t param1)
 
 void Socket::emitEvent(Event::Type type, void *param1)
 {
-  QValueList<EventParameter> params;
+  TQValueList<EventParameter> params;
   params.append(EventParameter(param1));
   
   // Dispatch the event via socket thread
   m_thread->event(type, params);
 }
 
-void Socket::changeEncoding(const QString &encoding)
+void Socket::changeEncoding(const TQString &encoding)
 {
   // Alter encoding and change socket config
   m_remoteEncoding->setEncoding(encoding.ascii());
@@ -158,7 +158,7 @@ void Socket::timeoutWait(bool start)
   if (start) {
     m_timeoutCounter.start();
   } else {
-    m_timeoutCounter = QTime();
+    m_timeoutCounter = TQTime();
   }
 }
     
@@ -219,8 +219,8 @@ void Socket::keepaliveCheck()
 Commands::Type Socket::getCurrentCommand()
 {
   if (m_commandChain.count() > 0) {
-    QPtrList<Commands::Base>::iterator chainEnd = m_commandChain.end();
-    for (QPtrList<Commands::Base>::iterator i = m_commandChain.begin(); i != chainEnd; i++) {
+    TQPtrList<Commands::Base>::iterator chainEnd = m_commandChain.end();
+    for (TQPtrList<Commands::Base>::iterator i = m_commandChain.begin(); i != chainEnd; i++) {
       if ((*i)->command() != Commands::CmdNone)
         return (*i)->command();
     }
@@ -332,7 +332,7 @@ void Socket::wakeup(WakeupEvent *event)
     Commands::Base *current = m_commandChain.current();
     
     if (current->isProcessing()) {
-      qDebug("WARNING: Attempted to wakeup a processing socket!");
+      tqDebug("WARNING: Attempted to wakeup a processing socket!");
       return;
     }
     
@@ -344,7 +344,7 @@ void Socket::wakeup(WakeupEvent *event)
       resetCommandClass(current->resetCode());
   } else if (m_cmdData) {
     if (m_cmdData->isProcessing()) {
-      qDebug("WARNING: Attempted to wakeup a processing socket!");
+      tqDebug("WARNING: Attempted to wakeup a processing socket!");
       return;
     }
     
@@ -410,9 +410,9 @@ public:
         }
         case WaitList: {
           // Now just extract what we need
-          QValueList<DirectoryEntry> list = socket()->getLastDirectoryListing().list();
-          QValueList<DirectoryEntry>::iterator listEnd = list.end();
-          for (QValueList<DirectoryEntry>::iterator i = list.begin(); i != listEnd; i++) {
+          TQValueList<DirectoryEntry> list = socket()->getLastDirectoryListing().list();
+          TQValueList<DirectoryEntry>::iterator listEnd = list.end();
+          for (TQValueList<DirectoryEntry>::iterator i = list.begin(); i != listEnd; i++) {
             if ((*i).filename() == path.fileName()) {
               socket()->m_lastStatResponse = *i;
               socket()->resetCommandClass();
@@ -434,9 +434,9 @@ void Socket::protoStat(const KURL &path)
   // Lookup the cache first and don't even try to list if cached
   DirectoryListing cached = Cache::self()->findCached(this, path.directory());
   if (cached.isValid()) {
-    QValueList<DirectoryEntry> list = cached.list();
-    QValueList<DirectoryEntry>::iterator listEnd = list.end();
-    for (QValueList<DirectoryEntry>::iterator i = list.begin(); i != listEnd; i++) {
+    TQValueList<DirectoryEntry> list = cached.list();
+    TQValueList<DirectoryEntry>::iterator listEnd = list.end();
+    for (TQValueList<DirectoryEntry>::iterator i = list.begin(); i != listEnd; i++) {
       if ((*i).filename() == path.fileName()) {
         m_lastStatResponse = *i;
         nextCommandAsync();
@@ -472,10 +472,10 @@ public:
     
     ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandScan, Socket, CmdNone)
     
-    QValueList<DirectoryEntry> currentList;
-    QValueList<DirectoryEntry>::const_iterator currentEntry;
+    TQValueList<DirectoryEntry> currentList;
+    TQValueList<DirectoryEntry>::const_iterator currentEntry;
     
-    QString currentDirectory;
+    TQString currentDirectory;
     DirectoryTree *currentTree;
     
     void cleanup()
@@ -593,8 +593,8 @@ public:
     
     ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandDelete, Socket, CmdDelete)
     
-    QValueList<DirectoryEntry> currentList;
-    QValueList<DirectoryEntry>::const_iterator currentEntry;
+    TQValueList<DirectoryEntry> currentList;
+    TQValueList<DirectoryEntry>::const_iterator currentEntry;
     
     KURL destinationPath;
     
@@ -737,8 +737,8 @@ public:
     
     ENGINE_STANDARD_COMMAND_CONSTRUCTOR(FtpCommandRecursiveChmod, Socket, CmdChmod)
     
-    QValueList<DirectoryEntry> currentList;
-    QValueList<DirectoryEntry>::const_iterator currentEntry;
+    TQValueList<DirectoryEntry> currentList;
+    TQValueList<DirectoryEntry>::const_iterator currentEntry;
     
     KURL destinationPath;
     int mode;