Rename kde libraries to tde

38 files changed, 54 insertions, 54 deletions

diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt
index 550eebd65..ba095f2e3 100644
--- a/kaddressbook/CMakeLists.txt
+++ b/kaddressbook/CMakeLists.txt
@@ -14,7 +14,7 @@ tde_import( certmanager )
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 
 add_subdirectory( interfaces )
 add_subdirectory( printing )
@@ -36,7 +36,7 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/editors
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index 398b2d6a5..e091cbd11 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -43,14 +43,14 @@ libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \
 libkaddressbook_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la \
                             $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
-                            $(top_builddir)/libkdepim/libkdepim.la \
+                            $(top_builddir)/libtdepim/libtdepim.la \
                             $(top_builddir)/libkcal/libkcal.la \
                             -lkabc_file $(LIB_KABC) $(LIB_KHTML) \
                             $(top_builddir)/kaddressbook/common/libkabcommon.la \
                             $(top_builddir)/kaddressbook/editors/libkabim.la \
                             -lkdeprint
-libkaddressbook_la_COMPILE_FIRST = $(top_srcdir)/libkdepim/categoryselectdialog.h \
-                                   $(top_srcdir)/libkdepim/categoryeditdialog.h \
+libkaddressbook_la_COMPILE_FIRST = $(top_srcdir)/libtdepim/categoryselectdialog.h \
+                                   $(top_srcdir)/libtdepim/categoryeditdialog.h \
                                    $(top_builddir)/kaddressbook/common/kabprefs_base.h
 
 
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 6892f909b..6d2e2ea8b 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -49,11 +49,11 @@
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 
-#include <libkdepim/addresseelineedit.h>
-#include <libkdepim/categoryeditdialog.h>
-#include <libkdepim/categoryselectdialog.h>
-#include <libkdepim/kdateedit.h>
-#include <libkdepim/resourceabc.h>
+#include <libtdepim/addresseelineedit.h>
+#include <libtdepim/categoryeditdialog.h>
+#include <libtdepim/categoryselectdialog.h>
+#include <libtdepim/kdateedit.h>
+#include <libtdepim/resourceabc.h>
 
 #include "addresseditwidget.h"
 #include "advancedcustomfields.h"
diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp
index ee3c179f1..9ba590525 100644
--- a/kaddressbook/advancedcustomfields.cpp
+++ b/kaddressbook/advancedcustomfields.cpp
@@ -39,7 +39,7 @@
 #include <klineedit.h>
 #include <kstandarddirs.h>
 
-#include <libkdepim/designerfields.h>
+#include <libtdepim/designerfields.h>
 
 #include "customfieldswidget.h"
 
diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h
index ea184f9b8..ce7cef3b4 100644
--- a/kaddressbook/advancedcustomfields.h
+++ b/kaddressbook/advancedcustomfields.h
@@ -32,7 +32,7 @@
 #include <tqpair.h>
 #include <tqstringlist.h>
 
-#include <libkdepim/designerfields.h>
+#include <libtdepim/designerfields.h>
 
 #include "contacteditorwidget.h"
 
diff --git a/kaddressbook/common/CMakeLists.txt b/kaddressbook/common/CMakeLists.txt
index 69d212c59..7bf0625a6 100644
--- a/kaddressbook/common/CMakeLists.txt
+++ b/kaddressbook/common/CMakeLists.txt
@@ -12,7 +12,7 @@
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kaddressbook/common/Makefile.am b/kaddressbook/common/Makefile.am
index 63a0951d8..0b626741c 100644
--- a/kaddressbook/common/Makefile.am
+++ b/kaddressbook/common/Makefile.am
@@ -8,5 +8,5 @@ noinst_LTLIBRARIES = libkabcommon.la
 libkabcommon_la_SOURCES = kabprefs.cpp kabprefs_base.kcfgc locationmap.cpp filter.cpp
 libkabcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkabcommon_la_LIBADD = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
-                         $(top_builddir)/libkdepim/libkdepim.la
+                         $(top_builddir)/libtdepim/libtdepim.la
 noinst_HEADERS = filter.h kabprefs.h
diff --git a/kaddressbook/common/kabprefs_base.kcfgc b/kaddressbook/common/kabprefs_base.kcfgc
index cca2c9337..75e0d84de 100644
--- a/kaddressbook/common/kabprefs_base.kcfgc
+++ b/kaddressbook/common/kabprefs_base.kcfgc
@@ -4,7 +4,7 @@ ClassName=KABPrefsBase
 Singleton=false
 Mutators=true
 Inherits=KPimPrefs
-IncludeFiles=libkdepim/kpimprefs.h
+IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 GlobalEnums=true
 ItemAccessors=true
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index b206e886d..9a06fb399 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -23,8 +23,8 @@
 #include "distributionlisteditor.h"
 #include "distributionlisteditor_p.h"
 
-#include <libkdepim/addresseelineedit.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/addresseelineedit.h>
+#include <libtdepim/distributionlist.h>
 #include <libemailfunctions/email.h>
 
 #include <kabc/addressbook.h>
diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h
index 8be9aadce..10a129fb0 100644
--- a/kaddressbook/distributionlisteditor_p.h
+++ b/kaddressbook/distributionlisteditor_p.h
@@ -23,8 +23,8 @@
 #ifndef KPIM_DISTRIBUTIONLISTEDITOR_P_H
 #define KPIM_DISTRIBUTIONLISTEDITOR_P_H
 
-#include <libkdepim/addresseelineedit.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/addresseelineedit.h>
+#include <libtdepim/distributionlist.h>
 
 #include <tqpushbutton.h>
 #include <tqstring.h>
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index 030f58197..ef0fe9bbc 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -2,7 +2,7 @@
 #include "imagewidget.h"
 #include <interfaces/core.h>
 
-#include <libkdepim/resourceabc.h>
+#include <libtdepim/resourceabc.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h
index e8a58146d..324f215a9 100644
--- a/kaddressbook/distributionlistentryview.h
+++ b/kaddressbook/distributionlistentryview.h
@@ -1,7 +1,7 @@
 #ifndef KAB_DISTRIBUTIONLISTENTRYVIEW_H
 #define KAB_DISTRIBUTIONLISTENTRYVIEW_H
 
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 
 #include <tqmap.h>
 #include <tqstring.h>
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index c721ae6f5..766f8871f 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -24,7 +24,7 @@
 #include "config.h"
 
 #ifdef KDEPIM_NEW_DISTRLISTS
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #endif
 
 #include <kabc/addressbook.h>
diff --git a/kaddressbook/editors/CMakeLists.txt b/kaddressbook/editors/CMakeLists.txt
index 89c67403b..3d7ce5ed3 100644
--- a/kaddressbook/editors/CMakeLists.txt
+++ b/kaddressbook/editors/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/libkdenetwork
   ${CMAKE_SOURCE_DIR}/kaddressbook/interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${CMAKE_SOURCE_DIR}/certmanager/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
diff --git a/kaddressbook/features/CMakeLists.txt b/kaddressbook/features/CMakeLists.txt
index 1be91122d..e2fcee1fe 100644
--- a/kaddressbook/features/CMakeLists.txt
+++ b/kaddressbook/features/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/kaddressbook
   ${CMAKE_SOURCE_DIR}/kaddressbook/interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am
index a2b5db399..e529cb684 100644
--- a/kaddressbook/features/Makefile.am
+++ b/kaddressbook/features/Makefile.am
@@ -11,7 +11,7 @@ endif
 kde_module_LTLIBRARIES = $(TARGET_DISTRIBUTIONLISTNG) libkaddrbk_distributionlist.la libkaddrbk_resourceselection.la
 
 XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
-         $(top_builddir)/libkdepim/libkdepim.la
+         $(top_builddir)/libtdepim/libtdepim.la
 
 
 if compile_newdistrlists
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 5a828ad1a..7e6034881 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -24,8 +24,8 @@
 #include "interfaces/core.h"
 #include "searchmanager.h"
 
-#include <libkdepim/distributionlist.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/distributionlist.h>
+#include <libtdepim/kvcarddrag.h>
 
 #include <kabc/vcardconverter.h>
 
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 9001311d7..86515599f 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -40,7 +40,7 @@
 
 #include <kabc/addresseedialog.h>
 #ifdef KDEPIM_NEW_DISTRLISTS
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 typedef KPIM::DistributionList DistributionList;
 #else
 #include <kabc/distributionlist.h>
@@ -48,7 +48,7 @@ typedef KABC::DistributionList DistributionList;
 #endif
 #include <kabc/stdaddressbook.h>
 #include <kabc/vcardconverter.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 
 #include "core.h"
 
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 6578b6e1e..a7f0d36dd 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -41,7 +41,7 @@
 #include "core.h"
 
 #include "resourceselection.h"
-#include <libkdepim/resourceabc.h>
+#include <libtdepim/resourceabc.h>
 
 class AddressBookWrapper : public KABC::AddressBook
 {
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 5e1dc85f1..f0917eca7 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>
-#include <libkdepim/kpixmapregionselectordialog.h>
+#include <libtdepim/kpixmapregionselectordialog.h>
 
 #include <tqapplication.h>
 #include <tqdragobject.h>
diff --git a/kaddressbook/interfaces/CMakeLists.txt b/kaddressbook/interfaces/CMakeLists.txt
index 7def44605..a5950ffee 100644
--- a/kaddressbook/interfaces/CMakeLists.txt
+++ b/kaddressbook/interfaces/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index ac572004f..d94e2cee9 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -27,7 +27,7 @@
 #include <config.h> // for KDEPIM_NEW_DISTRLISTS
 
 #ifdef KDEPIM_NEW_DISTRLISTS
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #endif
 
 #include <tqobject.h>
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index fac69a0a3..0e5d10204 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -64,10 +64,10 @@
 #include <kstdguiitem.h>
 #include <kxmlguiclient.h>
 #include <ktoolbar.h>
-#include <libkdepim/addresseeview.h>
-#include <libkdepim/categoryeditdialog.h>
-#include <libkdepim/categoryselectdialog.h>
-#include <libkdepim/resourceabc.h>
+#include <libtdepim/addresseeview.h>
+#include <libtdepim/categoryeditdialog.h>
+#include <libtdepim/categoryselectdialog.h>
+#include <libtdepim/resourceabc.h>
 #include "distributionlisteditor.h"
 
 #include "addresseeutil.h"
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index ee9de2f56..ae6a4b841 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -27,8 +27,8 @@
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 
-#include <libkdepim/statusbarprogresswidget.h>
-#include <libkdepim/progressdialog.h>
+#include <libtdepim/statusbarprogresswidget.h>
+#include <libtdepim/progressdialog.h>
 
 #include "kabcore.h"
 
diff --git a/kaddressbook/kaddressbookservice.h b/kaddressbook/kaddressbookservice.h
index 4470ff024..209787d65 100644
--- a/kaddressbook/kaddressbookservice.h
+++ b/kaddressbook/kaddressbookservice.h
@@ -24,7 +24,7 @@
 #ifndef KADDRESSBOOKSERVICE_H
 #define KADDRESSBOOKSERVICE_H
 
-#include <libkdepim/interfaces/AddressBookServiceIface.h>
+#include <libtdepim/interfaces/AddressBookServiceIface.h>
 
 namespace KAB {
 class Core;
diff --git a/kaddressbook/kcmconfigs/CMakeLists.txt b/kaddressbook/kcmconfigs/CMakeLists.txt
index 60d8f320a..c273a9e3c 100644
--- a/kaddressbook/kcmconfigs/CMakeLists.txt
+++ b/kaddressbook/kcmconfigs/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/kaddressbook/common
   ${CMAKE_SOURCE_DIR}/kaddressbook/interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kaddressbook/kcmconfigs/Makefile.am b/kaddressbook/kcmconfigs/Makefile.am
index a465740c0..aad1b921c 100644
--- a/kaddressbook/kcmconfigs/Makefile.am
+++ b/kaddressbook/kcmconfigs/Makefile.am
@@ -12,7 +12,7 @@ kcm_kabconfig_la_LDFLAGS  = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
                             -avoid-version -no-undefined
 kcm_kabconfig_la_LIBADD = $(LIB_KIO) \
                           $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
-                          $(top_builddir)/libkdepim/libkdepim.la \
+                          $(top_builddir)/libtdepim/libtdepim.la \
                           $(top_builddir)/kaddressbook/common/libkabcommon.la
 kcm_kabconfig_la_COMPILE_FIRST = $(top_builddir)/kaddressbook/common/kabprefs_base.h
 
@@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \
                                ldapoptionswidget.cpp
 kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                -avoid-version -no-undefined
-kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la
+kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
 
 kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
 kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index 6a57861a1..7d483167c 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -26,7 +26,7 @@
 
 #include <kdialogbase.h>
 #include <kabc/ldapconfigwidget.h>
-#include <libkdepim/ldapclient.h>
+#include <libtdepim/ldapclient.h>
 
 class KLineEdit;
 class TQPushButton;
diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.h b/kaddressbook/kcmconfigs/kcmkabcustomfields.h
index 72874e1b1..5c8cad5e3 100644
--- a/kaddressbook/kcmconfigs/kcmkabcustomfields.h
+++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.h
@@ -23,7 +23,7 @@
 #ifndef KCMKABCUSTOMFIELDS_H
 #define KCMKABCUSTOMFIELDS_H
 
-#include <libkdepim/kcmdesignerfields.h>
+#include <libtdepim/kcmdesignerfields.h>
 
 class KCMKabCustomFields : public KPIM::KCMDesignerFields
 {
diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h
index 04757e51f..b08db3998 100644
--- a/kaddressbook/ldapsearchdialog.h
+++ b/kaddressbook/ldapsearchdialog.h
@@ -30,7 +30,7 @@
 #include <kdialogbase.h>
 
 #ifdef KDEPIM_NEW_DISTRLISTS
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #endif
 
 class KAddressBookTableView;
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index bf0f35e50..c6382ace8 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -121,7 +121,7 @@ int main( int argc, char *argv[] )
     return 0;
 
   KAddressBookApp app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
 
   bool ret = app.exec();
   while (KMainWindow::memberList->first())
diff --git a/kaddressbook/printing/CMakeLists.txt b/kaddressbook/printing/CMakeLists.txt
index 7e3d6d565..de8915cb2 100644
--- a/kaddressbook/printing/CMakeLists.txt
+++ b/kaddressbook/printing/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/kaddressbook
   ${CMAKE_SOURCE_DIR}/kaddressbook/common
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h
index d605ecf75..eeb84e018 100644
--- a/kaddressbook/searchmanager.h
+++ b/kaddressbook/searchmanager.h
@@ -29,7 +29,7 @@
 
 #include <kabc/stdaddressbook.h>
 #ifdef KDEPIM_NEW_DISTRLISTS
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #endif
 
 namespace KAB {
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index c21e4b2cf..416b54731 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqwidgetstack.h>
 
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 #include <kabc/addressbook.h>
 #include <kabc/vcardconverter.h>
 #include <kactionclasses.h>
diff --git a/kaddressbook/views/CMakeLists.txt b/kaddressbook/views/CMakeLists.txt
index a0cc54170..e97fc29e2 100644
--- a/kaddressbook/views/CMakeLists.txt
+++ b/kaddressbook/views/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kaddressbook
   ${CMAKE_SOURCE_DIR}/kaddressbook/interfaces
   ${CMAKE_SOURCE_DIR}/kaddressbook/common
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
diff --git a/kaddressbook/xxport/CMakeLists.txt b/kaddressbook/xxport/CMakeLists.txt
index 7deea0085..c6c095fbc 100644
--- a/kaddressbook/xxport/CMakeLists.txt
+++ b/kaddressbook/xxport/CMakeLists.txt
@@ -16,7 +16,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/kaddressbook
   ${CMAKE_SOURCE_DIR}/kaddressbook/interfaces
   ${CMAKE_SOURCE_DIR}/libkdenetwork
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${GNOKII_INCLUDE_DIRS}
diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am
index f88d91d19..04e2aeadc 100644
--- a/kaddressbook/xxport/Makefile.am
+++ b/kaddressbook/xxport/Makefile.am
@@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = libkaddrbk_csv_xxport.la libkaddrbk_vcard_xxport.la \
 AM_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
 
 XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
-         $(top_builddir)/libkdepim/libkdepim.la
+         $(top_builddir)/libtdepim/libtdepim.la
 
 libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
 libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KABC) $(LIB_KIO)
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 2d4da849b..e752b9057 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -37,7 +37,7 @@
 #include <ktempfile.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <libkdepim/addresseeview.h>
+#include <libtdepim/addresseeview.h>
 
 #include "config.h" // ??