Additional k => tde renaming and fixes

32 files changed, 64 insertions, 64 deletions

diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 75b32fc2a..d3c1d7a78 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -141,7 +141,7 @@ set( ${target}_SRCS
   kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp
   kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp tdelistboxdialog.cpp
   kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp
-  tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
+  kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
   kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp
   filterimporterexporter.cpp kmsearchpatternedit.cpp encodingdetector.cpp encodingdetector_ja.cpp
   kmfilteraction.cpp kmsearchpattern.cpp kmfolderimap.cpp kmfolderseldlg.cpp kmfilter.cpp
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index f96fdc40e..4c74b1b7d 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \
         ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
         ../certmanager/lib/libkleopatra.la $(INDEXLIB) \
         ../libkcal/libkcal.la \
-        $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_TDEABC)
+        $(LIB_TDEHTML) $(LIB_TDESPELL) $(LIB_TDEABC)
 
 kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
 libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
@@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
                 csshelper.cpp tdelistboxdialog.cpp \
                 actionscheduler.cpp messageproperty.cpp \
                 kmmsgpart.cpp kmmsginfo.cpp \
-                accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \
+                accountmanager.cpp kmacctfolder.cpp kmdict.cpp \
                 kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
                 kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
                 kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \
@@ -176,11 +176,11 @@ check_PROGRAMS = dcoptest recipienteditortest
 METASOURCES = AUTO
 
 dcoptest_SOURCES = dcoptest.cpp kmailIface.skel kmailIface.stub mailcomposerIface.skel mailcomposerIface.stub
-dcoptest_LDADD = $(LIB_KIO)
+dcoptest_LDADD = $(LIB_TDEIO)
 dcoptest_LDFLAGS = $(all_libraries)
 
 recipienteditortest_SOURCES = recipientseditortest.cpp
-recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_TDEABC)
+recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_TDEIO) $(LIB_TDEABC)
 recipienteditortest_LDFLAGS = $(all_libraries)
 
 kmailIface_DCOPIDLNG = true
diff --git a/kmail/folderdiaacltab.h b/kmail/folderdiaacltab.h
index 6ae09fec9..bc619c4eb 100644
--- a/kmail/folderdiaacltab.h
+++ b/kmail/folderdiaacltab.h
@@ -99,7 +99,7 @@ public:
   static bool supports( KMFolder* refFolder );
 
 private slots:
-  // Network (KIO) slots
+  // Network (TDEIO) slots
   void slotConnectionResult( int, const TQString& );
   void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
   void slotMultiSetACLResult(TDEIO::Job *);
diff --git a/kmail/folderdiaquotatab.h b/kmail/folderdiaquotatab.h
index dd36cf97a..6b260035e 100644
--- a/kmail/folderdiaquotatab.h
+++ b/kmail/folderdiaquotatab.h
@@ -68,7 +68,7 @@ private:
   void initializeWithValuesFromFolder( KMFolder* folder );
   void showQuotaWidget();
 private slots:
-  // Network (KIO) slots
+  // Network (TDEIO) slots
   void slotConnectionResult( int, const TQString& );
   void slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& );
 
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 9e654d68c..f7c2973e4 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -276,14 +276,14 @@ namespace KMail {
 #if 0
     // Get Instant Messaging presence
     TQString presence;
-    TQString kabcUid;
+    TQString tdeabcUid;
     if ( strategy->showHeader( "status" ) )
     {
       TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
       TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
       ::KIMProxy *imProxy = KMKernel::self()->imProxy();
-      kabcUid = addresses[0].uid();
-      presence = imProxy->presenceString( kabcUid );
+      tdeabcUid = addresses[0].uid();
+      presence = imProxy->presenceString( tdeabcUid );
     }
 #endif
 
@@ -298,7 +298,7 @@ namespace KMail {
               "\">" + i18n("[vCard]") + "</a>" );
 #if 0
       if ( !presence.isEmpty() && strategy->showHeader( "status" ) )
-        headerStr.append("&nbsp;&nbsp;(<span name=\"presence-" + kabcUid + "\">" + presence + "</span>)" );
+        headerStr.append("&nbsp;&nbsp;(<span name=\"presence-" + tdeabcUid + "\">" + presence + "</span>)" );
 #endif
 
       if ( strategy->showHeader( "organization" )
@@ -473,10 +473,10 @@ namespace KMail {
     TQString userHTML;
     TQString presence;
 
-    // IM presence and kabc photo
+    // IM presence and tdeabc photo
 
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
-    TQString kabcUid;
+    TQString tdeabcUid;
     TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
     TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
 
@@ -485,16 +485,16 @@ namespace KMail {
     int photoHeight = 60;
     if( addresses.count() == 1 )
     {
-      // kabcUid is embedded in im: URIs to indicate which IM contact to message
-      kabcUid = addresses[0].uid();
+      // tdeabcUid is embedded in im: URIs to indicate which IM contact to message
+      tdeabcUid = addresses[0].uid();
 
       if ( imProxy->initialize() ) {
           // im status
-          presence = imProxy->presenceString( kabcUid );
+          presence = imProxy->presenceString( tdeabcUid );
           if ( !presence.isEmpty() )
           {
             TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
-                .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
+                .arg( imgToDataUrl( imProxy->presenceIcon( tdeabcUid ).convertToImage() ) );
             presence += presenceIcon;
           }
       }
@@ -592,9 +592,9 @@ namespace KMail {
         userHTML = TQString( "<div class=\"senderpic\">"
             "<a href=\"im:%1\">%2<div class=\"senderstatus\">"
             "<span name=\"presence-%3\">%4</span></div></a>"
-            "</div>" ).arg( kabcUid )
+            "</div>" ).arg( tdeabcUid )
             .arg( userHTML )
-             .arg( kabcUid )
+             .arg( tdeabcUid )
             .arg( presence );
       }
     } else {
@@ -602,8 +602,8 @@ namespace KMail {
       if ( !presence.isEmpty() )
         userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">"
             "<span name=\"presence-%2\">%3</span></div></a>" )
-            .arg( kabcUid )
-            .arg( kabcUid )
+            .arg( tdeabcUid )
+            .arg( tdeabcUid )
             .arg( presence );
     }
 #if 0
@@ -766,7 +766,7 @@ namespace KMail {
                               : TQString("") )
 #if 0
                  + ( ( !presence.isEmpty() )
-                              ? "&nbsp;&nbsp;(<span name=\"presence-" + kabcUid + "\">" + presence + "</span>)"
+                              ? "&nbsp;&nbsp;(<span name=\"presence-" + tdeabcUid + "\">" + presence + "</span>)"
                               : TQString("") )
 #endif
                  + ( message->headerField("Organization").isEmpty()
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index e1568b118..1350da290 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -373,7 +373,7 @@ namespace KMail {
     else
       stream << (int) 'U' << url;
 
-    // create the KIO-job
+    // create the TDEIO-job
     if ( makeConnection() != Connected )
       return;// ## doesn't handle Connecting
     TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index f1bf03f0d..2d239d967 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -240,7 +240,7 @@ namespace KMail {
     void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen );
 
     /**
-     * The KIO-Slave died
+     * The TDEIO-Slave died
      */
     void slaveDied() { mSlave = 0; killAllJobs(); }
 
@@ -430,9 +430,9 @@ namespace KMail {
   protected slots:
     virtual void slotCheckQueuedFolders();
 
-    /// Handle a message coming from the KIO scheduler saying that the slave is now connected
+    /// Handle a message coming from the TDEIO scheduler saying that the slave is now connected
     void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave);
-    /// Handle an error coming from the KIO scheduler
+    /// Handle an error coming from the TDEIO scheduler
     void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg);
 
     /**
@@ -484,14 +484,14 @@ namespace KMail {
   protected:
 
   /**
-     * Handle an error coming from a KIO job or from a KIO slave (via the scheduler)
+     * Handle an error coming from a TDEIO job or from a TDEIO slave (via the scheduler)
      * and abort everything (in all cases) if abortSync is true [this is for slotSchedulerSlaveError].
      * Otherwise (abortSync==false), dimap will only abort in case of severe errors (connection broken),
      * but on "normal" errors (no permission to delete, etc.) it will ask the user.
      *
      * @param error the error code, usually job->error())
      * @param errorMsg the error message, usually job->errorText()
-     * @param job the kio job (can be 0). If set, removeJob will be called automatically.
+     * @param job the tdeio job (can be 0). If set, removeJob will be called automatically.
      * This is important! It means you should not call removeJob yourself in case of errors.
      * We can't let the caller do that, since it should only be done afterwards, and only if we didn't abort.
      *
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index c50663ed7..dc9a98f56 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -259,7 +259,7 @@ ImapJob::~ImapJob()
                 mit.current()->setTransferInProgress( false );
             }
           }
-          account->removeJob( mJob ); // remove the associated kio job
+          account->removeJob( mJob ); // remove the associated tdeio job
         }
         account->mJobList.remove( this ); // remove the folderjob
       }
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index 1aa6f8772..76d4ae8fa 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -586,7 +586,7 @@ struct Kleo::KeyResolver::Private {
 
   std::map<CryptoMessageFormat,FormatInfo> mFormatInfoMap;
 
-  // key=email address, value=crypto preferences for this contact (from kabc)
+  // key=email address, value=crypto preferences for this contact (from tdeabc)
   typedef std::map<TQString, ContactPreferences> ContactPreferencesMap;
   ContactPreferencesMap mContactPreferencesMap;
 };
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index d6b553324..8fd2bea0e 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -232,7 +232,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
 //-----------------------------------------------------------------------------
 void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
 {
-  // Make sure the folder is not referenced in any kio slave jobs
+  // Make sure the folder is not referenced in any tdeio slave jobs
   TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   while ( it != mapJobData.end() ) {
      TQMap<TDEIO::Job*, jobData>::Iterator i = it;
diff --git a/kmail/kmacctimap.h b/kmail/kmacctimap.h
index 99f07f168..3e10332a1 100644
--- a/kmail/kmacctimap.h
+++ b/kmail/kmacctimap.h
@@ -106,7 +106,7 @@ protected:
   friend class ::AccountManager;
   KMAcctImap(AccountManager* owner, const TQString& accountName, uint id);
   /**
-   * Handle an error coming from a KIO job
+   * Handle an error coming from a TDEIO job
    * See ImapAccountBase::handleJobError for details.
    */
   virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index 69ccfc9bd..23918a044 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -154,7 +154,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
 KMailPart::~KMailPart()
 {
   kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
-  // Running KIO jobs prevent kapp from exiting, so we need to kill them
+  // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
   // if they are only about checking mail (not important stuff like moving messages)
   kmkernel->abortMailCheck();
   kmkernel->acctMgr()->cancelMailCheck();
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index d4fead489..8b477924f 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -75,7 +75,7 @@
 #include <tdetempfile.h>
 #include <tdeimproxy.h>
 #include <kuserprofile.h>
-// KIO headers
+// TDEIO headers
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 
@@ -932,7 +932,7 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
     mOffset = 0;
     TQByteArray data;
     int size;
-    // Unless it is great than 64 k send the whole message. kio buffers for us.
+    // Unless it is great than 64 k send the whole message. tdeio buffers for us.
     if( mData.size() > (unsigned int) MAX_CHUNK_SIZE )
       size = MAX_CHUNK_SIZE;
     else
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 27a76c727..7863b01bd 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -2623,7 +2623,7 @@ void KMComposeWin::addrBookSelIntoOld()
       dlg.setSelectedBCC( lst );
   }
 
-  dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->kabcAddresses() );
+  dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() );
 
   if (dlg.exec()==TQDialog::Rejected) return;
 
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index 7e43749f0..123f112b3 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -486,7 +486,7 @@ private slots:
   void slotIdentityChanged(uint);
 
   /**
-   * KIO slots for attachment insertion
+   * TDEIO slots for attachment insertion
    */
   void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
   void slotAttachFileResult(TDEIO::Job *);
diff --git a/kmail/tdemdict.cpp b/kmail/kmdict.cpp
index a1c73e6d6..0ad9367be 100644
--- a/kmail/tdemdict.cpp
+++ b/kmail/kmdict.cpp
@@ -5,7 +5,7 @@
 #include <config.h>
 #endif
 
-#include "tdemdict.h"
+#include "kmdict.h"
 #include "kmglobal.h"
 #include <kdebug.h>
 
diff --git a/kmail/tdemdict.h b/kmail/kmdict.h
index 6cbbefd5a..6cbbefd5a 100644
--- a/kmail/tdemdict.h
+++ b/kmail/kmdict.h
diff --git a/kmail/kmfolderdia.h b/kmail/kmfolderdia.h
index 764ea8978..5f3ea9678 100644
--- a/kmail/kmfolderdia.h
+++ b/kmail/kmfolderdia.h
@@ -60,7 +60,7 @@ namespace KMail {
  * This is the base class for tabs in the folder dialog.
  * It uses the API from ConfigModuleTab (basically: it's a widget that can load and save)
  * but it also adds support for delayed-saving:
- * when save() needs to use async jobs (e.g. KIO) for saving,
+ * when save() needs to use async jobs (e.g. TDEIO) for saving,
  * we need to delay the closing until after the jobs are finished,
  * and to cancel the saving on error.
  *
@@ -87,7 +87,7 @@ public:
   /// Called when clicking OK.
   /// If a module returns Delayed, the closing is cancelled for now,
   /// and the module can close the dialog later on (i.e. after an async
-  /// operation like a KIO job).
+  /// operation like a TDEIO job).
   virtual AccepStatus accept() {
     return save() ? Accepted : Canceled;
   }
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 67965db5b..613864b94 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -103,7 +103,7 @@ KMMainWin::~KMMainWin()
 
     if ( not_withdrawn == 0 ) {
       kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
-      // Running KIO jobs prevent kapp from exiting, so we need to kill them
+      // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
       // if they are only about checking mail (not important stuff like moving messages)
       kmkernel->abortMailCheck();
       kmkernel->acctMgr()->cancelMailCheck();
diff --git a/kmail/kmmsgdict.cpp b/kmail/kmmsgdict.cpp
index fdf2e1b22..729a3663a 100644
--- a/kmail/kmmsgdict.cpp
+++ b/kmail/kmmsgdict.cpp
@@ -4,7 +4,7 @@
 #include "kmfolderindex.h"
 #include "kmfolder.h"
 #include "kmmsgdict.h"
-#include "tdemdict.h"
+#include "kmdict.h"
 #include "globalsettings.h"
 #include "folderstorage.h"
 
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 3aadb9631..32483b194 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -1671,7 +1671,7 @@ kdDebug(5006) << "KMReaderWin  -  composing unencrypted message" << endl;
 void KMReaderWin::updateHeader()
 {
   /*
-   * TODO: mess around with KHTML DOM some more and figure out how to
+   * TODO: mess around with TDEHTML DOM some more and figure out how to
    * replace the entire header div w/out flickering to hell and back
    *
    * DOM::NodeList divs(mViewer->document().documentElement().getElementsByTagName("div"));
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index dd62b0cdc..503a312da 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -107,7 +107,7 @@ namespace KMail {
     /** @return an URL for this account */
     virtual KURL getUrl() const;
 
-    /** @return the KIO slave for this account */
+    /** @return the TDEIO slave for this account */
     TDEIO::Slave * slave() const { return mSlave; }
 
     /** Kill all jobs that are currently in progress */
diff --git a/kmail/popaccount.h b/kmail/popaccount.h
index afa0acf27..f8cb0e92a 100644
--- a/kmail/popaccount.h
+++ b/kmail/popaccount.h
@@ -102,12 +102,12 @@ protected:
   PopAccount(AccountManager* owner, const TQString& accountName, uint id);
 
   /**
-   * Start a KIO Job to get a list of messages on the pop server
+   * Start a TDEIO Job to get a list of messages on the pop server
    */
   void startJob();
 
   /**
-   * Connect up the standard signals/slots for the KIO Jobs
+   * Connect up the standard signals/slots for the TDEIO Jobs
    */
   void connectJob();
 
@@ -185,7 +185,7 @@ protected slots:
   void slotProcessPendingMsgs();
 
   /**
-   * If there are more messages to be downloaded then start a new kio job
+   * If there are more messages to be downloaded then start a new tdeio job
    * to get the message whose id is at the head of the queue
    */
   void slotGetNextMsg();
@@ -202,7 +202,7 @@ protected slots:
   void slotData( TDEIO::Job*, const TQByteArray &);
 
   /**
-   * Finished downloading the current kio job, either due to an error
+   * Finished downloading the current tdeio job, either due to an error
    * or because the job has been canceled or because the complete message
    * has been downloaded
    */
@@ -230,7 +230,7 @@ protected slots:
   void slotSlaveError(TDEIO::Slave *, int, const TQString &);
 
   /**
-   * If there are more headers to be downloaded then start a new kio job
+   * If there are more headers to be downloaded then start a new tdeio job
    * to get the next header
    */
   void slotGetNextHdr();
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 26fe72135..04cc50e15 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -579,7 +579,7 @@ void RecipientsPicker::insertRecentAddresses()
 
   TDEConfig config( "kmailrc" );
   TDEABC::Addressee::List recents =
-    TDERecentAddress::RecentAddresses::self( &config )->kabcAddresses();
+    TDERecentAddress::RecentAddresses::self( &config )->tdeabcAddresses();
 
   TDEABC::Addressee::List::ConstIterator it;
   for( it = recents.begin(); it != recents.end(); ++it ) {
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index f29b79474..ca6d5a249 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -132,7 +132,7 @@ void RedirectDialog::slotAddrBook()
   }
 
   dlg.setRecentAddresses(
-      RecentAddresses::self( KMKernel::config() )->kabcAddresses() );
+      RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() );
 
   // Make it impossible to specify Cc or Bcc addresses as we support
   // only the Redirect-To header!
diff --git a/kmail/tdelistboxdialog.h b/kmail/tdelistboxdialog.h
index 30a672860..a9e949acc 100644
--- a/kmail/tdelistboxdialog.h
+++ b/kmail/tdelistboxdialog.h
@@ -1,5 +1,5 @@
-#ifndef KLISTBOXDIALOG_H
-#define KLISTBOXDIALOG_H
+#ifndef TDELISTBOXDIALOG_H
+#define TDELISTBOXDIALOG_H
 
 #include <kdialogbase.h>
 
diff --git a/kmail/tdelistviewindexedsearchline.h b/kmail/tdelistviewindexedsearchline.h
index 6f1098925..73d5d6f37 100644
--- a/kmail/tdelistviewindexedsearchline.h
+++ b/kmail/tdelistviewindexedsearchline.h
@@ -1,5 +1,5 @@
-#ifndef LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
-#define LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
+#ifndef LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
+#define LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
 
 /* This file is part of KMail
  * Copyright (C) 2005 Luís Pedro Coelho <luis@luispedro.org>
@@ -74,4 +74,4 @@ private:
 
 
 
-#endif /* LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */
+#endif /* LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */
diff --git a/kmail/tests/Makefile.am b/kmail/tests/Makefile.am
index c07ad6232..bd8a86b1e 100644
--- a/kmail/tests/Makefile.am
+++ b/kmail/tests/Makefile.am
@@ -6,7 +6,7 @@ check_LTLIBRARIES = tdeunittest_storagelayermodule.la \
         tdeunittest_utilmodule.la \
         tdeunittest_mimelibmodule.la
 
-tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp
+tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp
 tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest
 tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
 tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la
diff --git a/kmail/tests/messagedicttests.cpp b/kmail/tests/messagedicttests.cpp
index 4565f10c1..0771aa1ce 100644
--- a/kmail/tests/messagedicttests.cpp
+++ b/kmail/tests/messagedicttests.cpp
@@ -7,7 +7,7 @@
 #include <tdeunittest/runner.h>
 #include <tdeunittest/module.h>
 
-#include "tdemdict.h"
+#include "kmdict.h"
 
 #include "messagedicttests.h"
 
diff --git a/kmail/tests/mimelibtests.cpp b/kmail/tests/mimelibtests.cpp
index e11620937..84b3af161 100644
--- a/kmail/tests/mimelibtests.cpp
+++ b/kmail/tests/mimelibtests.cpp
@@ -26,8 +26,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
-KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
+TDEUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
+TDEUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
 
 #include <mimelib/string.h>
 #include <mimelib/message.h>
diff --git a/kmail/tests/storagelayermodule.cpp b/kmail/tests/storagelayermodule.cpp
index fcfb884e1..c8858e42d 100644
--- a/kmail/tests/storagelayermodule.cpp
+++ b/kmail/tests/storagelayermodule.cpp
@@ -12,5 +12,5 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
-KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );
+TDEUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
+TDEUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );
diff --git a/kmail/tests/utiltests.cpp b/kmail/tests/utiltests.cpp
index 936cc3ab4..31a431793 100644
--- a/kmail/tests/utiltests.cpp
+++ b/kmail/tests/utiltests.cpp
@@ -10,8 +10,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
-KUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
+TDEUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
+TDEUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
 
 #include "util.h"
 #include <mimelib/string.h>