1 files changed, 10 insertions, 10 deletions
diff --git a/tdeioslave/imap4/imap4.cpp b/tdeioslave/imap4/imap4.cpp
index 449711de..0e325ff9 100644
--- a/tdeioslave/imap4/imap4.cpp
+++ b/tdeioslave/imap4/imap4.cpp
@@ -92,7 +92,7 @@ extern "C" {
 #include <kmimetype.h>
 #include <kmdcodec.h>
 
-#include <kdemacros.h>
+#include <tdemacros.h>
 
 #define IMAP_PROTOCOL "imap"
 #define IMAP_SSL_PROTOCOL "imaps"
@@ -104,7 +104,7 @@ using namespace TDEIO;
 extern "C"
 {
   void sigalrm_handler (int);
-  KDE_EXPORT int kdemain (int argc, char **argv);
+  TDE_EXPORT int kdemain (int argc, char **argv);
 }
 
 int
@@ -689,7 +689,7 @@ bool IMAP4Protocol::parseRead(TQByteArray & buffer, ulong len, ulong relay)
       error (ERR_CONNECTION_BROKEN, myHost);
       setState(ISTATE_CONNECT);
       closeConnection();
-      return FALSE;
+      return false;
     }
     if (relay > buffer.size())
     {
@@ -714,7 +714,7 @@ bool IMAP4Protocol::parseRead(TQByteArray & buffer, ulong len, ulong relay)
 
 bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay)
 {
-  if (myHost.isEmpty()) return FALSE;
+  if (myHost.isEmpty()) return false;
 
   while (true) {
     ssize_t copyLen = 0;
@@ -747,7 +747,7 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay)
       readBufferLen -= copyLen;
       if (readBufferLen)
         memmove(readBuffer, &readBuffer[copyLen], readBufferLen);
-      if (buffer[buffer.size() - 1] == '\n') return TRUE;
+      if (buffer[buffer.size() - 1] == '\n') return true;
     }
     if (!isConnectionValid())
     {
@@ -755,14 +755,14 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay)
       error (ERR_CONNECTION_BROKEN, myHost);
       setState(ISTATE_CONNECT);
       closeConnection();
-      return FALSE;
+      return false;
     }
     if (!waitForResponse( responseTimeout() ))
     {
       error(ERR_SERVER_TIMEOUT, myHost);
       setState(ISTATE_CONNECT);
       closeConnection();
-      return FALSE;
+      return false;
     }
     readBufferLen = read(readBuffer, IMAP_BUFFER - 1);
     if (readBufferLen == 0)
@@ -771,7 +771,7 @@ bool IMAP4Protocol::parseReadLine (TQByteArray & buffer, ulong relay)
       error (ERR_CONNECTION_BROKEN, myHost);
       setState(ISTATE_CONNECT);
       closeConnection();
-      return FALSE;
+      return false;
     }
   }
 }
@@ -1238,7 +1238,7 @@ IMAP4Protocol::special (const TQByteArray & aData)
     KURL src;
     KURL dest;
     stream >> src >> dest;
-    copy(src, dest, 0, FALSE);
+    copy(src, dest, 0, false);
     break;
   }
   case 'c':
@@ -2068,7 +2068,7 @@ bool IMAP4Protocol::makeLogin ()
       return false;
     }
 
-    if (metaData("nologin") == "on") return TRUE;
+    if (metaData("nologin") == "on") return true;
 
     if (myTLS == "on" && !hasCapability(TQString("STARTTLS")))
     {