1 files changed, 9 insertions, 10 deletions
diff --git a/tdeioslave/imap4/imapparser.cpp b/tdeioslave/imap4/imapparser.cpp
index d833b639..bdb733f3 100644
--- a/tdeioslave/imap4/imapparser.cpp
+++ b/tdeioslave/imap4/imapparser.cpp
@@ -56,8 +56,7 @@ extern "C" {
 #include <kmdcodec.h>
 #include <kurl.h>
 
-#include <kasciistricmp.h>
-#include <kasciistringtools.h>
+#include <tdeglobal.h>
 
 #ifdef HAVE_LIBSASL2
 static sasl_callback_t callbacks[] = {
@@ -541,7 +540,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
   if (rest[0] == '[')
   {
     rest.pos++;
-    TQCString option = parseOneWordC(rest, TRUE);
+    TQCString option = parseOneWordC(rest, true);
 
     switch (option[0])
     {
@@ -679,7 +678,7 @@ imapParser::parseResult (TQByteArray & result, parseString & rest,
 void imapParser::parseCapability (parseString & result)
 {
   TQCString temp( result.cstr() );
-  imapCapabilities = TQStringList::split ( ' ', KPIM::kAsciiToLower( temp.data() ) );
+  imapCapabilities = TQStringList::split ( ' ', kasciitolower( temp.data() ) );
 }
 
 void imapParser::parseFlags (parseString & result)
@@ -1347,7 +1346,7 @@ void imapParser::parseBody (parseString & inWords)
     TQCString label;
     inWords.pos++;
 
-    specifier = parseOneWordC (inWords, TRUE);
+    specifier = parseOneWordC (inWords, true);
 
     if (inWords[0] == '(')
     {
@@ -1835,7 +1834,7 @@ bool imapParser::parseRead (TQByteArray & buffer, ulong len, ulong relay)
   Q_UNUSED(relay);
   tqWarning
     ("imapParser::parseRead - virtual function not reimplemented - no data read");
-  return FALSE;
+  return false;
 }
 
 bool imapParser::parseReadLine (TQByteArray & buffer, ulong relay)
@@ -1844,7 +1843,7 @@ bool imapParser::parseReadLine (TQByteArray & buffer, ulong relay)
   Q_UNUSED(relay);
   tqWarning
     ("imapParser::parseReadLine - virtual function not reimplemented - no data read");
-  return FALSE;
+  return false;
 }
 
 void
@@ -1976,11 +1975,11 @@ TQCString imapParser::parseOneWordC (parseString & inWords, bool stopAtBracket,
   if (len > 0 && inWords[0] == '"')
   {
     unsigned int i = 1;
-    bool quote = FALSE;
+    bool quote = false;
     while (i < len && (inWords[i] != '"' || quote))
     {
       if (inWords[i] == '\\') quote = !quote;
-      else quote = FALSE;
+      else quote = false;
       i++;
     }
     if (i < len)
@@ -2050,7 +2049,7 @@ TQCString imapParser::parseOneWordC (parseString & inWords, bool stopAtBracket,
 bool imapParser::parseOneNumber (parseString & inWords, ulong & num)
 {
   bool valid;
-  num = parseOneWordC(inWords, TRUE).toULong(&valid);
+  num = parseOneWordC(inWords, true).toULong(&valid);
   return valid;
 }