25 files changed, 66 insertions, 67 deletions
diff --git a/tdeioslave/imap4/CMakeLists.txt b/tdeioslave/imap4/CMakeLists.txt
index 6316fe32..b62d61dc 100644
--- a/tdeioslave/imap4/CMakeLists.txt
+++ b/tdeioslave/imap4/CMakeLists.txt
@@ -38,9 +38,9 @@ tde_create_translated_desktop(
 
 tde_add_kpart( tdeio_imap4
   SOURCES
-    imapcommand.cc imaplist.cc mailaddress.cc mimeheader.cc
-    rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc
-    mailheader.cc mimehdrline.cc  mimeio.cc
-  LINK emailfunctions-static kmime-shared tdeio-shared ${SASL_LIBRARY}
+    imapcommand.cpp imaplist.cpp mailaddress.cpp mimeheader.cpp
+    rfcdecoder.cpp imap4.cpp imapinfo.cpp imapparser.cpp
+    mailheader.cpp mimehdrline.cpp  mimeio.cpp
+  LINK kmime-shared tdecore-shared tdeio-shared ${SASL_LIBRARY}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/imap4/Makefile.am b/tdeioslave/imap4/Makefile.am
index f52af2c6..34497bf6 100644
--- a/tdeioslave/imap4/Makefile.am
+++ b/tdeioslave/imap4/Makefile.am
@@ -7,9 +7,9 @@ INCLUDES= -I$(top_srcdir)/libkmime \
 
 kde_module_LTLIBRARIES = tdeio_imap4.la
 
-tdeio_imap4_la_SOURCES = 	imapcommand.cc imaplist.cc mailaddress.cc \
-  mimeheader.cc rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc mailheader.cc \
-  mimehdrline.cc  mimeio.cc
+tdeio_imap4_la_SOURCES = 	imapcommand.cpp imaplist.cpp mailaddress.cpp \
+  mimeheader.cpp rfcdecoder.cpp imap4.cpp imapinfo.cpp imapparser.cpp mailheader.cpp \
+  mimehdrline.cpp  mimeio.cpp
 tdeio_imap4_la_LIBADD  = $(LIB_TDEIO) $(SASL2_LIBS) ../../libkmime/libkmime.la \
   ../../libemailfunctions/libemailfunctions.la
 tdeio_imap4_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
@@ -21,6 +21,6 @@ kdelnk_DATA = imap4.protocol imaps.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/tdeio_imap4.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_imap4.pot
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/tdeioslave/imap4/imap4.cc b/tdeioslave/imap4/imap4.cpp
index 7dea2c5d..0e325ff9 100644
--- a/tdeioslave/imap4/imap4.cc
+++ b/tdeioslave/imap4/imap4.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imap4.cc  - IMAP4rev1 KIOSlave
+ *   imap4.cpp  - IMAP4rev1 KIOSlave
  *   Copyright (C) 2001-2002  Michael Haeckel <haeckel@kde.org>
  *   Copyright (C) 1999  John Corey <jcorey@fruity.ath.cx>
  *
@@ -92,7 +92,7 @@ extern "C" {
 #include <kmimetype.h>
 #include <kmdcodec.h>
 
-#include "tdepimmacros.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")))
     {
diff --git a/tdeioslave/imap4/imap4.h b/tdeioslave/imap4/imap4.h
index d264cce9..e57300e4 100644
--- a/tdeioslave/imap4/imap4.h
+++ b/tdeioslave/imap4/imap4.h
@@ -156,7 +156,7 @@ protected:
     outputLine (_str.latin1 (), _str.length());
   }
   void doListEntry (const KURL & _url, int stretch, imapCache * cache = NULL,
-    bool withFlags = FALSE, bool withSubject = FALSE);
+    bool withFlags = false, bool withSubject = false);
 
   /** 
    * Send a list entry (folder) to the application 
@@ -184,7 +184,7 @@ private:
   // This method behaves like the above method but takes an already encoded url,
   // so you don't have to call KURL::url() for every mail.
   void doListEntry (const TQString & encodedUrl, int stretch, imapCache * cache = NULL,
-    bool withFlags = FALSE, bool withSubject = FALSE);
+    bool withFlags = false, bool withSubject = false);
 
   TQString myHost, myUser, myPass, myAuth, myTLS;
   int myPort;
diff --git a/tdeioslave/imap4/imapcommand.cc b/tdeioslave/imap4/imapcommand.cpp
index e3e68fa8..9e2badc7 100644
--- a/tdeioslave/imap4/imapcommand.cc
+++ b/tdeioslave/imap4/imapcommand.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imapcommand.cc  - IMAP4rev1 command handler
+ *   imapcommand.cpp  - IMAP4rev1 command handler
  *   Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -49,7 +49,7 @@
 #include <tdeprotocolmanager.h>
 #include <ksock.h>
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeio/connection.h>
 #include <tdeio/slaveinterface.h>
 #include <tdeio/passdlg.h>
diff --git a/tdeioslave/imap4/imapinfo.cc b/tdeioslave/imap4/imapinfo.cpp
index 3e21ee77..453808e7 100644
--- a/tdeioslave/imap4/imapinfo.cc
+++ b/tdeioslave/imap4/imapinfo.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imapinfo.cc  - IMAP4rev1 SELECT / EXAMINE handler
+ *   imapinfo.cpp  - IMAP4rev1 SELECT / EXAMINE handler
  *   Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/tdeioslave/imap4/imaplist.cc b/tdeioslave/imap4/imaplist.cpp
index f9113bda..51062c47 100644
--- a/tdeioslave/imap4/imaplist.cc
+++ b/tdeioslave/imap4/imaplist.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imapinfo.cc  - IMAP4rev1 EXAMINE / SELECT handler
+ *   imapinfo.cpp  - IMAP4rev1 EXAMINE / SELECT handler
  *   Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/tdeioslave/imap4/imapparser.cc b/tdeioslave/imap4/imapparser.cpp
index eb154cc5..bdb733f3 100644
--- a/tdeioslave/imap4/imapparser.cc
+++ b/tdeioslave/imap4/imapparser.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   imapparser.cc  - IMAP4rev1 Parser
+ *   imapparser.cpp  - IMAP4rev1 Parser
  *   Copyright (C) 2001-2002 Michael Haeckel <haeckel@kde.org>
  *   Copyright (C) 2000 s.carstens@gmx.de
  *
@@ -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;
 }
 
diff --git a/tdeioslave/imap4/imapparser.h b/tdeioslave/imap4/imapparser.h
index 623fc8f8..24e4747a 100644
--- a/tdeioslave/imap4/imapparser.h
+++ b/tdeioslave/imap4/imapparser.h
@@ -382,7 +382,7 @@ public:
 
   /** parse one word (maybe quoted) upto next space " ) ] } */
   static TQCString parseOneWordC (parseString & inWords,
-    bool stopAtBracket = FALSE, int *len = 0);
+    bool stopAtBracket = false, int *len = 0);
 
   /** parse one number using parseOneWord */
   static bool parseOneNumber (parseString & inWords, ulong & num);
diff --git a/tdeioslave/imap4/mailaddress.cc b/tdeioslave/imap4/mailaddress.cpp
index 38a1a330..8bb5831e 100644
--- a/tdeioslave/imap4/mailaddress.cc
+++ b/tdeioslave/imap4/mailaddress.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   mailaddress.cc  - mail address parser
+ *   mailaddress.cpp  - mail address parser
  *   Copyright (C) 2000 Sven Carstens <s.carstens@gmx.de>
  *
  *   This program is free software; you can redistribute it and/or modify
diff --git a/tdeioslave/imap4/mailheader.cc b/tdeioslave/imap4/mailheader.cpp
index c520b909..28eec1f0 100644
--- a/tdeioslave/imap4/mailheader.cc
+++ b/tdeioslave/imap4/mailheader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          mailheader.cc  -  description
+                          mailheader.cpp  -  description
                              -------------------
     begin                : Tue Oct 24 2000
     copyright            : (C) 2000 by Sven Carstens
diff --git a/tdeioslave/imap4/mimehdrline.cc b/tdeioslave/imap4/mimehdrline.cpp
index 9646ed26..591d3386 100644
--- a/tdeioslave/imap4/mimehdrline.cc
+++ b/tdeioslave/imap4/mimehdrline.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          mimehdrline.cc  -  description
+                          mimehdrline.cpp  -  description
                              -------------------
     begin                : Wed Oct 11 2000
     copyright            : (C) 2000 by Sven Carstens
diff --git a/tdeioslave/imap4/mimeheader.cc b/tdeioslave/imap4/mimeheader.cpp
index d0916ba5..c273e6e6 100644
--- a/tdeioslave/imap4/mimeheader.cc
+++ b/tdeioslave/imap4/mimeheader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          mimeheader.cc  -  description
+                          mimeheader.cpp  -  description
                              -------------------
     begin                : Fri Oct 20 2000
     copyright            : (C) 2000 by Sven Carstens
@@ -24,7 +24,7 @@
 
 // #include <iostream.h>
 #include <tdeglobal.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <kmimemagic.h>
@@ -730,7 +730,7 @@ mimeHeader::magicSetType (bool aAutoDecode)
   TQByteArray body;
   KMimeMagicResult *result;
 
-  KMimeMagic::self ()->setFollowLinks (TRUE); // is it necessary ?
+  KMimeMagic::self ()->setFollowLinks (true); // is it necessary ?
 
   if (aAutoDecode)
     body = bodyDecodedBinary ();
diff --git a/tdeioslave/imap4/mimeio.cc b/tdeioslave/imap4/mimeio.cpp
index 757c11a4..a3315c26 100644
--- a/tdeioslave/imap4/mimeio.cc
+++ b/tdeioslave/imap4/mimeio.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          mimeio.cc  -  description
+                          mimeio.cpp  -  description
                              -------------------
     begin                : Wed Oct 25 2000
     copyright            : (C) 2000 by Sven Carstens
diff --git a/tdeioslave/imap4/rfcdecoder.cc b/tdeioslave/imap4/rfcdecoder.cpp
index 41a50ec1..a82ebcd2 100644
--- a/tdeioslave/imap4/rfcdecoder.cc
+++ b/tdeioslave/imap4/rfcdecoder.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *   rfcdecoder.cc  - handler for various rfc/mime encodings
+ *   rfcdecoder.cpp  - handler for various rfc/mime encodings
  *   Copyright (C) 2000 s.carstens@gmx.de
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -360,14 +360,14 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset,
     }
     beg = pos + 2;
     end = beg;
-    valid = TRUE;
+    valid = true;
     // parse charset name
     for (i = 2, pos += 2;
          i < maxLen && (*pos != '?' && (ispunct (*pos) || isalnum (*pos)));
          i++)
       pos++;
     if (*pos != '?' || i < 4 || i >= maxLen)
-      valid = FALSE;
+      valid = false;
     else
     {
       charset = TQCString (beg, i - 1);  // -2 + 1 for the zero
@@ -385,7 +385,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset,
       if (pos[2] != '?'
           || (encoding != 'Q' && encoding != 'B' && encoding != 'q'
               && encoding != 'b'))
-        valid = FALSE;
+        valid = false;
       pos += 3;
       i += 3;
 //    kdDebug(7116) << "rfcDecoder::decodeRFC2047String - charset " << charset << " - language " << language << " - '" << pos << "'" << endl;
@@ -401,7 +401,7 @@ rfcDecoder::decodeRFC2047String (const TQString & _str, TQString & charset,
       }
       end = pos + 2;            //end now points to the first char after the encoded string
       if (i >= maxLen || !*pos)
-        valid = FALSE;
+        valid = false;
     }
     if (valid)
     {
diff --git a/tdeioslave/mbox/CMakeLists.txt b/tdeioslave/mbox/CMakeLists.txt
index 70da626f..27e51538 100644
--- a/tdeioslave/mbox/CMakeLists.txt
+++ b/tdeioslave/mbox/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 
 tde_add_kpart( tdeio_mbox
   SOURCES
-    mbox.cc mboxfile.cc readmbox.cc stat.cc urlinfo.cc
+    mbox.cpp mboxfile.cpp readmbox.cpp stat.cpp urlinfo.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/mbox/Makefile.am b/tdeioslave/mbox/Makefile.am
index b95ae1b5..b890ebf3 100644
--- a/tdeioslave/mbox/Makefile.am
+++ b/tdeioslave/mbox/Makefile.am
@@ -7,11 +7,11 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = tdeio_mbox.la
 
 tdeio_mbox_la_SOURCES = \
-	mbox.cc \
-	mboxfile.cc \
-	readmbox.cc \
-	stat.cc \
-	urlinfo.cc
+	mbox.cpp \
+	mboxfile.cpp \
+	readmbox.cpp \
+	stat.cpp \
+	urlinfo.cpp
 tdeio_mbox_la_LIBADD  = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
 tdeio_mbox_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
 
diff --git a/tdeioslave/mbox/mbox.cc b/tdeioslave/mbox/mbox.cpp
index 5742baff..6acf70e6 100644
--- a/tdeioslave/mbox/mbox.cc
+++ b/tdeioslave/mbox/mbox.cpp
@@ -27,18 +27,18 @@
 
 #include <kdebug.h>
 #include <tdelocale.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdeglobal.h>
 #include <kurl.h>
 #include <tdeio/global.h>
 
 #include <stdlib.h>
 
-#include "tdepimmacros.h"
+#include <tdemacros.h>
 
 #include "mbox.h"
 
-extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); }
+extern "C" { TDE_EXPORT int kdemain(int argc, char* argv[]); }
 
 int kdemain( int argc, char * argv[] )
 {
diff --git a/tdeioslave/mbox/mboxfile.cc b/tdeioslave/mbox/mboxfile.cpp
index 7297457e..7297457e 100644
--- a/tdeioslave/mbox/mboxfile.cc
+++ b/tdeioslave/mbox/mboxfile.cpp
diff --git a/tdeioslave/mbox/readmbox.cc b/tdeioslave/mbox/readmbox.cpp
index 942f369e..942f369e 100644
--- a/tdeioslave/mbox/readmbox.cc
+++ b/tdeioslave/mbox/readmbox.cpp
diff --git a/tdeioslave/mbox/stat.cc b/tdeioslave/mbox/stat.cpp
index 99267ca7..99267ca7 100644
--- a/tdeioslave/mbox/stat.cc
+++ b/tdeioslave/mbox/stat.cpp
diff --git a/tdeioslave/mbox/urlinfo.cc b/tdeioslave/mbox/urlinfo.cpp
index 4b359e40..4b359e40 100644
--- a/tdeioslave/mbox/urlinfo.cc
+++ b/tdeioslave/mbox/urlinfo.cpp
diff --git a/tdeioslave/opengroupware/opengroupware.cpp b/tdeioslave/opengroupware/opengroupware.cpp
index 304ff225..c8c388fc 100644
--- a/tdeioslave/opengroupware/opengroupware.cpp
+++ b/tdeioslave/opengroupware/opengroupware.cpp
@@ -36,7 +36,7 @@
 
 #include <tdeabc/vcardconverter.h>
 
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <kdebug.h>
 #include <tdelocale.h>
 #include <tdetempfile.h>
@@ -45,7 +45,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 namespace TDEABC {
 
@@ -64,7 +64,7 @@ class ResourceMemory : public ResourceCached
 
 
 extern "C" {
-KDE_EXPORT int kdemain( int argc, char **argv );
+TDE_EXPORT int kdemain( int argc, char **argv );
 }
 
 int kdemain( int argc, char **argv )
@@ -194,8 +194,8 @@ void OpenGroupware::getCalendar( const KURL &_url )
 
   // FIXME do progress handling
   mListEventsJob = TDEIO::davPropFind( url, props, "0", false );
-  connect( mListEventsJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) );
+  connect( mListEventsJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotGetCalendarListingResult( TDEIO::Job * ) ) );
 }
 
 void OpenGroupware::getAddressbook( const KURL &url )
diff --git a/tdeioslave/opengroupware/opengroupware.h b/tdeioslave/opengroupware/opengroupware.h
index 151187db..597634c6 100644
--- a/tdeioslave/opengroupware/opengroupware.h
+++ b/tdeioslave/opengroupware/opengroupware.h
@@ -32,7 +32,7 @@ namespace TDEIO {
 
 class OpenGroupware : public TQObject, public TDEIO::SlaveBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
   public:
     OpenGroupware( const TQCString &protocol, const TQCString &pool,
diff --git a/tdeioslave/sieve/sieve.cpp b/tdeioslave/sieve/sieve.cpp
index b3633640..7bae1244 100644
--- a/tdeioslave/sieve/sieve.cpp
+++ b/tdeioslave/sieve/sieve.cpp
@@ -34,7 +34,7 @@ extern "C" {
 #include "sieve.h"
 
 #include <kdebug.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
 #include <tdelocale.h>
 #include <kurl.h>
 #include <kmdcodec.h>
@@ -49,7 +49,7 @@ using std::exit;
 #include <sys/stat.h>
 #include <cassert>
 
-#include <tdepimmacros.h>
+#include <tdemacros.h>
 
 static const int debugArea = 7122;
 
@@ -80,7 +80,7 @@ static const unsigned int SIEVE_DEFAULT_RECIEVE_BUFFER = 512;
 using namespace TDEIO;
 extern "C"
 {
-	KDE_EXPORT int kdemain(int argc, char **argv)
+	TDE_EXPORT int kdemain(int argc, char **argv)
 	{
 		TDEInstance instance("tdeio_sieve" );