17 files changed, 18 insertions, 18 deletions
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 27b716654..8f32abcbb 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -190,7 +190,7 @@ tde_restore( KDE3_DCOPIDL_EXECUTABLE )
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   LINK
-    emailfunctions-static kmime-shared kpgp-shared kdepim-shared kpimidentities-shared
+    emailfunctions-static kmime-shared kpgp-shared tdepim-shared kpimidentities-shared
     mimelib-shared ksieve-shared khtml-shared ${INDEX_LIBRARY}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kmail/ChangeLog b/kmail/ChangeLog
index d3e1a7e5e..c055ab4cf 100644
--- a/kmail/ChangeLog
+++ b/kmail/ChangeLog
@@ -343,7 +343,7 @@ please visit http://webcvs.kde.org
 	* Pop: Fixed problems in pop authentication code.
 
 	* Pop: Enabled POP3 LAST command which was committed to
-	kdesupport some time ago.
+	tdesupport some time ago.
 
 1998-11-15  Alex Zepeda  <[email protected]>
 
diff --git a/kmail/Makefile.am b/kmail/Makefile.am
index d6165c9bc..58a42297e 100644
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@@ -49,7 +49,7 @@ linkdir = $(kde_datadir)/kmail/plugins/bodypartformatter
 link_DATA = application_octetstream.desktop
 
 bin_PROGRAMS = kmail
-kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdepim -lkdepim
+kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdepim -ltdepim
 kmail_LDADD   = libkmailprivate.la
 
 libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
@@ -243,5 +243,5 @@ messages: rc.cpp
 kde_kcfg_DATA = kmail.kcfg replyphrases.kcfg custommimeheader.kcfg \
 		templatesconfiguration_kfg.kcfg customtemplates_kfg.kcfg
 
-DOXYGEN_REFERENCES = kdeui
+DOXYGEN_REFERENCES = tdeui
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 513f9483b..843e7aa69 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -33,7 +33,7 @@
 #define __KMAIL_ABOUTDATA_H__
 
 #include <kaboutdata.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 namespace KMail {
 
diff --git a/kmail/accountmanager.h b/kmail/accountmanager.h
index f8a8079f7..a9ba747dd 100644
--- a/kmail/accountmanager.h
+++ b/kmail/accountmanager.h
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include "kmaccount.h"
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 class TQString;
 class TQStringList;
diff --git a/kmail/app_octetstream.cpp b/kmail/app_octetstream.cpp
index 9a5db05b4..526fbb543 100644
--- a/kmail/app_octetstream.cpp
+++ b/kmail/app_octetstream.cpp
@@ -32,7 +32,7 @@
 
 #include "interfaces/bodypartformatter.h"
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 namespace {
 
diff --git a/kmail/callback.h b/kmail/callback.h
index a7e9af792..a3fccc4ed 100644
--- a/kmail/callback.h
+++ b/kmail/callback.h
@@ -38,7 +38,7 @@
 class KMMessage;
 class KMReaderWin;
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 
 #include <libkcal/attendee.h> // only for an enum, we are not linking
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 455f8579f..e095b1756 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -18,7 +18,7 @@
 #include <klistview.h>
 #include <kcmodule.h>
 #include <klocale.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 class TQPushButton;
 class TQLabel;
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 8e8cbe9f4..f32c014ae 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -50,7 +50,7 @@ using KMail::FolderRequester;
 #include "templatesconfiguration_kfg.h"
 #include "simplestringlisteditor.h"
 
-// other kdepim headers:
+// other tdepim headers:
 // libtdepim
 #include <libkpimidentities/identity.h>
 #include <libtdepim/addresseelineedit.h>
diff --git a/kmail/kmail_part.h b/kmail/kmail_part.h
index ff80c19bd..647beb8b8 100644
--- a/kmail/kmail_part.h
+++ b/kmail/kmail_part.h
@@ -35,7 +35,7 @@
 #include <kparts/part.h>
 
 #include <tqwidget.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 class KInstance;
 class KAboutData;
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 4bc86ec05..b3de87f75 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -13,7 +13,7 @@
 #include <kio/job.h>
 #include "kmmsgbase.h" // for KMMsgtqStatus
 #include <mimelib/string.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 #include <kservice.h>
 #include <ktempfile.h>
 
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index f953f0290..58932c17f 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -21,7 +21,7 @@
 #include "foldertreebase.h"
 
 #include <klocale.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 #include <tqguardedptr.h>
 #include <tqwidget.h>
diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h
index d94451237..05dac4a19 100644
--- a/kmail/kmkernel.h
+++ b/kmail/kmkernel.h
@@ -12,7 +12,7 @@
 #include <kconfig.h>
 #include <kdeversion.h>
 #include <kimproxy.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 #include "kmailIface.h"
 #include "kmmsgbase.h"
diff --git a/kmail/kmstartup.h b/kmail/kmstartup.h
index 45c63be99..456a39a4a 100644
--- a/kmail/kmstartup.h
+++ b/kmail/kmstartup.h
@@ -18,7 +18,7 @@
 #ifndef KMSTARTUP
 #define KMSTARTUP
 
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
 
 extern "C" {
 
diff --git a/kmail/snippetdlg.h b/kmail/snippetdlg.h
index 6aa62d0fa..bc845a90f 100644
--- a/kmail/snippetdlg.h
+++ b/kmail/snippetdlg.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** Form interface generated from reading ui file '/Users/till/Documents/Code/kde/enterprise/kdepim/kmail/snippetdlg.ui'
+** Form interface generated from reading ui file '/Users/till/Documents/Code/kde/enterprise/tdepim/kmail/snippetdlg.ui'
 **
 ** Created: Tue Sep 25 16:03:02 2007
 **      by: The User Interface Compiler ($Id: qt/main.cpp   3.3.8   edited Jan 11 14:47 $)
diff --git a/kmail/treebase.cpp b/kmail/treebase.cpp
index 19aff3155..d3e8a045b 100644
--- a/kmail/treebase.cpp
+++ b/kmail/treebase.cpp
@@ -1,6 +1,6 @@
 /*
     Copyright (c) 2008 Pradeepto K. Bhattacharya <[email protected]>
-      ( adapted from kdepim/kmail/kmfolderseldlg.cpp and simplefoldertree.h  )
+      ( adapted from tdepim/kmail/kmfolderseldlg.cpp and simplefoldertree.h  )
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/kmail/treebase.h b/kmail/treebase.h
index f786377b7..b89461e2d 100644
--- a/kmail/treebase.h
+++ b/kmail/treebase.h
@@ -1,6 +1,6 @@
 /*
     Copyright (c) 2008 Pradeepto K. Bhattacharya <[email protected]>
-      ( adapted from kdepim/kmail/kmfolderseldlg.cpp and simplefoldertree.h  )
+      ( adapted from tdepim/kmail/kmfolderseldlg.cpp and simplefoldertree.h  )
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by