Rename kde libraries to tde

13 years ago · 38188136cc
parent c60dbcd2d1
commit 38188136cc
483 changed files with 662 additions and 662 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -88,7 +88,7 @@ option( BUILD_INDEXLIB "Build indexlib" ${BUILD_ALL} )
 option( BUILD_LIBKMIME "Build libkmime" ${BUILD_ALL} )
 option( BUILD_KTNEF "Build ktnef" ${BUILD_ALL} )
 option( BUILD_LIBKCAL "Build libkcal" ${BUILD_ALL} )
-option( BUILD_LIBKDEPIM "Build libkdepim" ${BUILD_ALL} )
+option( BUILD_LIBKDEPIM "Build libtdepim" ${BUILD_ALL} )
 option( BUILD_LIBKPIMIDENTITIES "Build libkpimidentities" ${BUILD_ALL} )
 option( BUILD_LIBKDENETWORK "Build libkdenetwork" ${BUILD_ALL} )
 option( BUILD_CERTMANAGER "Build certmanager" ${BUILD_ALL} )
@ -159,7 +159,7 @@ tde_conditional_add_subdirectory( BUILD_LIBKMIME libkmime )
 tde_conditional_add_subdirectory( BUILD_KTNEF ktnef )
 tde_conditional_add_subdirectory( BUILD_LIBKCAL libkcal )
 tde_conditional_add_subdirectory( BUILD_LIBKDEPIM pixmaps )
-tde_conditional_add_subdirectory( BUILD_LIBKDEPIM libkdepim )
+tde_conditional_add_subdirectory( BUILD_LIBKDEPIM libtdepim )
 tde_conditional_add_subdirectory( BUILD_LIBKPIMIDENTITIES libkpimidentities )
 tde_conditional_add_subdirectory( BUILD_LIBKDENETWORK libkdenetwork )
 tde_conditional_add_subdirectory( BUILD_CERTMANAGER certmanager )
--- a/2
+++ b/2
@ -36,7 +36,7 @@ libkdenetwork    Marc Mutz <mutz@kde.org>
                 Ingo Klöcker <ingo.kloecker@epost.de> (kpgp)
                 Carsten Burghardt <burghardt@kde.org> (kfoldertree, ksubscription, kaccount)
                 Karl-Heinz Zimmer <khz@kde.org> (cryptplugwrapper*)
-libkdepim        Cornelius Schumacher <schumacher@kde.org>
+libtdepim        Cornelius Schumacher <schumacher@kde.org>
                 Tobias Koenig <tokoe@kde.org> (addresseeview, kvcarddrag)
                 Zack Rusin <zack@kde.org> (addressesdialog, komposer)
                 Don Sanders <sanders@kde.org> (maillistdrag)
--- a/Mainpage.dox
+++ b/Mainpage.dox
@ -67,8 +67,8 @@
        *   <i>A library of calendaring classes.</i>
        * - <a href="libkdenetwork/html/index.html"><b>libkdenetwork</b></a>
        *   <i>A library of networkworking classes.</i>
-        * - <a href="libkdepim/html/index.html"><b>libkdepim</b></a>
+        * - <a href="libtdepim/html/index.html"><b>libtdepim</b></a>
-        *   (<a href="libkdepim/html/classes.html">classes</a>)\n
+        *   (<a href="libtdepim/html/classes.html">classes</a>)\n
        *   <i>A library of widgets and other goodies for pim.</i>
        * - <a href="libkholidays/html/index.html"><b>libkholidays</b></a>
        *   (<a href="libkholidays/html/classes.html">classes</a>)\n
--- a/Makefile.am.in
+++ b/Makefile.am.in
@ -11,34 +11,34 @@
 COMPILE_AFTER_libkmime = libemailfunctions
 COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
 COMPILE_AFTER_libkholidays = korganizer kontact
-COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libkdepim karm knotes kresources kfile-plugins
+COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes kresources kfile-plugins
 COMPILE_AFTER_mimelib = korn kmail
 COMPILE_AFTER_libkdenetwork = kmail knode
 COMPILE_AFTER_libksieve = kmail
 #
 # Applications and their downward dependencies (ie. the libs they use)
 #
-COMPILE_BEFORE_libkpimidentities = libkdepim certmanager
+COMPILE_BEFORE_libkpimidentities = libtdepim certmanager
 COMPILE_BEFORE_certmanager = libkdenetwork libkpgp
-COMPILE_BEFORE_korganizer = libkdepim libkpimidentities libkpimexchange kgantt
+COMPILE_BEFORE_korganizer = libtdepim libkpimidentities libkpimexchange kgantt
-COMPILE_BEFORE_kaddressbook = libkdepim certmanager akregator
+COMPILE_BEFORE_kaddressbook = libtdepim certmanager akregator
-COMPILE_BEFORE_kandy = libkdepim
+COMPILE_BEFORE_kandy = libtdepim
-COMPILE_BEFORE_kmail= libkdepim libkpimidentities certmanager libkpgp libkmime
+COMPILE_BEFORE_kmail= libtdepim libkpimidentities certmanager libkpgp libkmime
-COMPILE_BEFORE_knode= libkdepim libkpgp libkmime
+COMPILE_BEFORE_knode= libtdepim libkpgp libkmime
-COMPILE_BEFORE_karm = libkdepim kresources
+COMPILE_BEFORE_karm = libtdepim kresources
-COMPILE_BEFORE_plugins = kmail libkdepim libkcal
+COMPILE_BEFORE_plugins = kmail libtdepim libkcal
 COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm
-COMPILE_BEFORE_kioslaves = libkmime libkdepim
+COMPILE_BEFORE_kioslaves = libkmime libtdepim
-COMPILE_BEFORE_libkpimexchange = libkdepim
+COMPILE_BEFORE_libkpimexchange = libtdepim
-COMPILE_BEFORE_kalarm = libkdepim libkmime
+COMPILE_BEFORE_kalarm = libtdepim libkmime
 COMPILE_BEFORE_kresources = libkpimexchange knotes kaddressbook kode
-COMPILE_BEFORE_wizards = libkdepim kresources korganizer kaddressbook kmail
+COMPILE_BEFORE_wizards = libtdepim kresources korganizer kaddressbook kmail
 COMPILE_BEFORE_korn = libkdenetwork
-COMPILE_BEFORE_kitchensync = libkdepim
+COMPILE_BEFORE_kitchensync = libtdepim
-COMPILE_BEFORE_akregator = libkdepim
+COMPILE_BEFORE_akregator = libtdepim
-COMPILE_BEFORE_knotes = libkdepim
+COMPILE_BEFORE_knotes = libtdepim
-COMPILE_BEFORE_konsolekalendar = libkdepim
+COMPILE_BEFORE_konsolekalendar = libtdepim
-COMPILE_BEFORE_kabc = libkdepim
+COMPILE_BEFORE_kabc = libtdepim
 AUTOMAKE_OPTIONS = foreign 1.6.1
 DISTCLEANFILES = inst-apps
--- a/4
+++ b/4
@ -41,9 +41,9 @@ What it is
 There is also quite an amount of infrastructure in this package:
 * calendarsystem: library for handling of non-gregorian calendar systems
-* libkdepim: Common code for different kdepim apps
+* libtdepim: Common code for different kdepim apps
 * libkdenetwork: Common code for apps previously being in the kdenetwork CVS
-                 module (KMail, KNode). This will be merged with libkdepim.
+                 module (KMail, KNode). This will be merged with libtdepim.
 * mimelib: MIME messages library
 * libkcal: C++ api for the iCalendar and vCalendar formats
 * libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
--- a/akregator/src/CMakeLists.txt
+++ b/akregator/src/CMakeLists.txt
@ -12,7 +12,7 @@
 tde_import( libkmime)
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 add_subdirectory( librss )
 add_subdirectory( about )
@ -24,7 +24,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/akregator/src/Makefile.am
+++ b/akregator/src/Makefile.am
@ -22,7 +22,7 @@ bin_PROGRAMS = akregator
 akregator_SOURCES = main.cpp mainwindow.cpp
 akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
-#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libkdepim/libkdepim.la
+#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
 # this is where the desktop file will go
 xdg_apps_DATA = akregator.desktop
@ -77,7 +77,7 @@ libakregatorprivate_la_SOURCES = akregatorconfig.kcfgc \
                                utils.cpp
 libakregatorprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined 
-libakregatorprivate_la_LIBADD =	$(top_builddir)/libkdepim/libkdepim.la \
+libakregatorprivate_la_LIBADD =	$(top_builddir)/libtdepim/libtdepim.la \
 	$(top_builddir)/akregator/src/librss/librsslocal.la $(LIB_KHTML)
 #########################################################################
@ -146,7 +146,7 @@ libakregatorpart_la_SOURCES = \
 	kspeech.stub
 libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
-libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libkdepim -lkdepim
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -lkdepim
 # this is where the desktop file will go
 partdesktopdir = $(kde_servicesdir)
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@ -39,7 +39,7 @@
 #include <kshell.h>
 #include <kmessagebox.h>
 #include <kio/netaccess.h>
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include "aboutdata.h"
 #include "akregator_run.h"
@ -368,9 +368,9 @@ void ArticleViewer::displayAboutPage()
 {
    TQString location = locate("data", "akregator/about/main.html");
    TQString content = KPIM::kFileToString(location);
-    content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
+    content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
    if ( kapp->reverseLayout() )
-        content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
+        content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
    else
        content = content.tqarg( "" );
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@ -31,7 +31,7 @@
 #include <kparts/browserextension.h>
 #include <kparts/part.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include "frame.h"
--- a/akregator/src/librss/CMakeLists.txt
+++ b/akregator/src/librss/CMakeLists.txt
@ -11,7 +11,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/akregator/src/mk4storage/CMakeLists.txt
+++ b/akregator/src/mk4storage/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/akregator/src
  ${CMAKE_SOURCE_DIR}/akregator/src/mk4storage/metakit/include
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <kstaticdeleter.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include "feedlist.h"
 #include "feed.h"
--- a/certmanager/CMakeLists.txt
+++ b/certmanager/CMakeLists.txt
@ -25,7 +25,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/lib
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkdenetwork
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/certmanager/conf/CMakeLists.txt
+++ b/certmanager/conf/CMakeLists.txt
@ -17,7 +17,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/certmanager/lib
  ${CMAKE_SOURCE_DIR}/certmanager/lib/ui
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/certmanager/kwatchgnupg/CMakeLists.txt
+++ b/certmanager/kwatchgnupg/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/certmanager/lib
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/certmanager/lib/CMakeLists.txt
+++ b/certmanager/lib/CMakeLists.txt
@ -18,7 +18,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkdenetwork
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/certmanager/lib/backends/chiasmus/CMakeLists.txt
+++ b/certmanager/lib/backends/chiasmus/CMakeLists.txt
@ -17,7 +17,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/certmanager/lib
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkdenetwork
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/certmanager/lib/backends/qgpgme/CMakeLists.txt
+++ b/certmanager/lib/backends/qgpgme/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/certmanager/lib
  ${CMAKE_SOURCE_DIR}/libkdenetwork
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${GPGME_INCLUDE_DIRS}
--- a/certmanager/lib/kleo/CMakeLists.txt
+++ b/certmanager/lib/kleo/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/certmanager/lib
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkdenetwork
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/certmanager/lib/ui/CMakeLists.txt
+++ b/certmanager/lib/ui/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/certmanager/lib
  ${CMAKE_SOURCE_DIR}/libkdenetwork
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkpgp
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/config.h.cmake
+++ b/config.h.cmake
@ -11,7 +11,7 @@
 #cmakedefine SIZEOF_UNSIGNED_LONG @SIZEOF_UNSIGNED_LONG@
 #cmakedefine SIZEOF_UINT64_T @SIZEOF_UINT64_T@
-// libkdepim, kmail
+// libtdepim, kmail
 #cmakedefine KDEPIM_NEW_DISTRLISTS 1
 // libkdemanager, certmanager
--- a/configure.in.mid
+++ b/configure.in.mid
@ -1,3 +1,3 @@
-all_includes="-I\$(top_srcdir)/libkdepim $all_includes"
+all_includes="-I\$(top_srcdir)/libtdepim $all_includes"
--- a/dependency-graph.dot
+++ b/dependency-graph.dot
@ -32,28 +32,28 @@ digraph "inter-dependency graph for kdepim" {
        "libkcal" -> "korganizer";
        "libkcal" -> "kpilot";
        "libkcal" -> "kresources";
-        "libkcal" -> "libkdepim";
+        "libkcal" -> "libtdepim";
        "libkcal" -> "libkpimexchange";
        "libkcal" -> "plugins";
        "libkdenetwork" -> "certmanager";
        "libkdenetwork" -> "kmail";
        "libkdenetwork" -> "knode";
        "libkdenetwork" -> "korn";
-        "libkdepim" -> "akregator";
+        "libtdepim" -> "akregator";
-        "libkdepim" -> "kaddressbook";
+        "libtdepim" -> "kaddressbook";
-        "libkdepim" -> "kalarm";
+        "libtdepim" -> "kalarm";
-        "libkdepim" -> "kandy";
+        "libtdepim" -> "kandy";
-        "libkdepim" -> "karm";
+        "libtdepim" -> "karm";
-        "libkdepim" -> "kioslaves";
+        "libtdepim" -> "kioslaves";
-        "libkdepim" -> "kitchensync";
+        "libtdepim" -> "kitchensync";
-        "libkdepim" -> "kmail";
+        "libtdepim" -> "kmail";
-        "libkdepim" -> "knode";
+        "libtdepim" -> "knode";
-        "libkdepim" -> "knotes";
+        "libtdepim" -> "knotes";
-        "libkdepim" -> "korganizer";
+        "libtdepim" -> "korganizer";
-        "libkdepim" -> "libkpimexchange";
+        "libtdepim" -> "libkpimexchange";
-        "libkdepim" -> "libkpimidentities";
+        "libtdepim" -> "libkpimidentities";
-        "libkdepim" -> "plugins";
+        "libtdepim" -> "plugins";
-        "libkdepim" -> "wizards";
+        "libtdepim" -> "wizards";
        "libkholidays" -> "kontact";
        "libkholidays" -> "korganizer";
        "libkmime" -> "kalarm";
--- a/kabc/kabcdistlistupdater/CMakeLists.txt
+++ b/kabc/kabcdistlistupdater/CMakeLists.txt
@ -12,7 +12,7 @@
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 include_directories(
  ${CMAKE_SOURCE_DIR}
--- a/kabc/kabcdistlistupdater/Makefile.am
+++ b/kabc/kabcdistlistupdater/Makefile.am
@ -5,7 +5,7 @@ METASOURCES = AUTO
 bin_PROGRAMS = kabcdistlistupdater
 kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la
+kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la
 kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
 autostart_DATA = kabcdistlistupdater.desktop
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@ -28,7 +28,7 @@
 #include <kstandarddirs.h>
 #include <kabc/stdaddressbook.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 static const KCmdLineOptions options[] =
 {
--- 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}
 )
--- 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 \
+libkaddressbook_la_COMPILE_FIRST = $(top_srcdir)/libtdepim/categoryselectdialog.h \
-                                   $(top_srcdir)/libkdepim/categoryeditdialog.h \
+                                   $(top_srcdir)/libtdepim/categoryeditdialog.h \
                                   $(top_builddir)/kaddressbook/common/kabprefs_base.h
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@ -49,11 +49,11 @@
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
-#include <libkdepim/categoryeditdialog.h>
+#include <libtdepim/categoryeditdialog.h>
-#include <libkdepim/categoryselectdialog.h>
+#include <libtdepim/categoryselectdialog.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
-#include <libkdepim/resourceabc.h>
+#include <libtdepim/resourceabc.h>
 #include "addresseditwidget.h"
 #include "advancedcustomfields.h"
--- 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"
--- 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"
--- 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}
 )
--- 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
--- 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
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@ -23,8 +23,8 @@
 #include "distributionlisteditor.h"
 #include "distributionlisteditor_p.h"
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #include <libemailfunctions/email.h>
 #include <kabc/addressbook.h>
--- 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 <libtdepim/addresseelineedit.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #include <tqpushbutton.h>
 #include <tqstring.h>
--- 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>
--- 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>
--- 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>
--- 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}
--- 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}
 )
--- 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
--- 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 <libtdepim/distributionlist.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 #include <kabc/vcardconverter.h>
--- 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"
--- 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
 {
--- 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>
--- 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}
 )
--- 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>
--- 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 <libtdepim/addresseeview.h>
-#include <libkdepim/categoryeditdialog.h>
+#include <libtdepim/categoryeditdialog.h>
-#include <libkdepim/categoryselectdialog.h>
+#include <libtdepim/categoryselectdialog.h>
-#include <libkdepim/resourceabc.h>
+#include <libtdepim/resourceabc.h>
 #include "distributionlisteditor.h"
 #include "addresseeutil.h"
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@ -27,8 +27,8 @@
 #include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <libkdepim/statusbarprogresswidget.h>
+#include <libtdepim/statusbarprogresswidget.h>
-#include <libkdepim/progressdialog.h>
+#include <libtdepim/progressdialog.h>
 #include "kabcore.h"
--- 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;
--- 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}
 )
--- 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) \
--- 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;
--- 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
 {
--- 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;
--- 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())
--- 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}
 )
--- 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 {
--- 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>
--- 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}
 )
--- 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}
--- 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)
--- 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" // ??
--- a/kalarm/CMakeLists.txt
+++ b/kalarm/CMakeLists.txt
@ -11,7 +11,7 @@
 tde_import( libkmime )
 tde_import( ktnef )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( libkdenetwork )
 tde_import( certmanager )
 tde_import( libkcal )
@ -29,7 +29,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/libkmime
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/certmanager/lib
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/kalarm/Makefile.am
+++ b/kalarm/Makefile.am
@ -29,7 +29,7 @@ kalarm_LDADD = $(top_builddir)/kalarm/lib/libkalarm.la \
 	$(top_builddir)/libkcal/libkcal.la \
 	$(top_builddir)/libkmime/libkmime.la \
 	$(top_builddir)/kalarm/kalarmd/libkalarmd.la \
-	$(top_builddir)/libkdepim/libkdepim.la \
+	$(top_builddir)/libtdepim/libtdepim.la \
 	$(top_builddir)/libkpimidentities/libkpimidentities.la \
 	-lkabc -lkutils $(LIB_KDEUI) $(ARTSLIB) $(LIBXTST)
 noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@ -54,8 +54,8 @@
 #include <kabc/addresseedialog.h>
 #include <kdebug.h>
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 #include <libkcal/icaldrag.h>
 #include "alarmcalendar.h"
--- a/kalarm/kalarmd/CMakeLists.txt
+++ b/kalarm/kalarmd/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}
 )
--- a/kalarm/lib/CMakeLists.txt
+++ b/kalarm/lib/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/kalarm
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kalarm/lib/Makefile.am
+++ b/kalarm/lib/Makefile.am
@ -18,5 +18,5 @@ noinst_HEADERS = \
 	timeperiod.h shellprocess.h slider.h spinbox.h spinbox2.h \
 	synchtimer.h spinbox2private.h
-DOXYGEN_REFERENCES=kdecore kdeui libkdepim
+DOXYGEN_REFERENCES=kdecore kdeui libtdepim
 include $(top_srcdir)/admin/Doxyfile.am
--- a/kalarm/lib/dateedit.h
+++ b/kalarm/lib/dateedit.h
@ -20,7 +20,7 @@
 #ifndef DATEEDIT_H
 #define DATEEDIT_H
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 /**
 *  @short Date edit widget with range limits.
--- a/kalarm/lib/lineedit.cpp
+++ b/kalarm/lib/lineedit.cpp
@ -26,8 +26,8 @@
 #include <kurldrag.h>
 #include <kurlcompletion.h>
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 #include <libkcal/icaldrag.h>
 #include "lineedit.moc"
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@ -43,7 +43,7 @@
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
 #include <libkmime/kmime_content.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icaldrag.h>
--- a/kandy/src/CMakeLists.txt
+++ b/kandy/src/CMakeLists.txt
@ -12,14 +12,14 @@
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kandy/src/Makefile.am
+++ b/kandy/src/Makefile.am
@ -3,7 +3,7 @@ bin_PROGRAMS = kandy kandy_client
 INCLUDES = -I$(top_srcdir) $(all_includes)
 kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-kandy_LDADD   = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libkdepim/libkdepim.la
+kandy_LDADD   = $(KANDY_LIBLOCKDEV) $(LIB_KFILE) -lkabc $(top_builddir)/libtdepim/libtdepim.la
 kandy_SOURCES =	main.cpp kandy.cpp \
                cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
                kandyview.cpp \
--- a/kandy/src/kandyprefs.kcfgc
+++ b/kandy/src/kandyprefs.kcfgc
@ -4,7 +4,7 @@ ClassName=KandyPrefs
 Singleton=true
 Mutators=true
 #Inherits=KPimPrefs
-#IncludeFiles=libkdepim/kpimprefs.h
+#IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 #GlobalEnums=true
 ItemAccessors=true
--- a/kandy/src/kandyprefsdialog.h
+++ b/kandy/src/kandyprefsdialog.h
@ -34,7 +34,7 @@
 #include <kdialogbase.h>
-#include <libkdepim/kprefsdialog.h>
+#include <libtdepim/kprefsdialog.h>
 /**
  Dialog to change the kandy configuration.
--- a/karm/CMakeLists.txt
+++ b/karm/CMakeLists.txt
@ -12,7 +12,7 @@
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( kresources )
 add_subdirectory( support )
@ -24,7 +24,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/libkcal
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/kresources/remote
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/karm/Makefile.am
+++ b/karm/Makefile.am
@ -7,7 +7,7 @@ SUBDIRS = support pics test
 METASOURCES = AUTO
-COMPILE_BEFORE_karm = libkdepim kresources
+COMPILE_BEFORE_karm = libtdepim kresources
 noinst_LTLIBRARIES = libkarm_shared.la
@ -20,7 +20,7 @@ libkarm_shared_la_SOURCES = kaccelmenuwatch.cpp desktoptracker.cpp \
 		karmdcopiface.skel taskviewwhatsthis.cpp
 libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
 	     $(top_builddir)/kresources/remote/libkcal_resourceremote.la \
-             $(top_builddir)/libkdepim/libkdepim.la $(LIBXSS) -lkdeprint 
+             $(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -lkdeprint 
 karm_SOURCES = main.cpp
 karm_LDADD = libkarm_shared.la 
 karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@ -37,7 +37,7 @@
 #include <kwinmodule.h>
 #include "printdialog.h"
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 PrintDialog::PrintDialog()
--- a/karm/printdialog.h
+++ b/karm/printdialog.h
@ -23,7 +23,7 @@
 #define KARM_PRINT_DIALOG_H
 #include <kdialogbase.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 class TQCheckBox;
 class KDateEdit;
--- a/kfile-plugins/ics/CMakeLists.txt
+++ b/kfile-plugins/ics/CMakeLists.txt
@ -16,7 +16,7 @@ tde_import( libkcal )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kgantt/kgantt/CMakeLists.txt
+++ b/kgantt/kgantt/CMakeLists.txt
@ -11,7 +11,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kioslaves/imap4/CMakeLists.txt
+++ b/kioslaves/imap4/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/libemailfunctions
  ${CMAKE_SOURCE_DIR}/libkmime
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kioslaves/mbox/CMakeLists.txt
+++ b/kioslaves/mbox/CMakeLists.txt
@ -11,7 +11,7 @@
 include_directories(
  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kioslaves/opengroupware/Makefile.am
+++ b/kioslaves/opengroupware/Makefile.am
@ -12,6 +12,6 @@ kde_module_LTLIBRARIES =  kio_opengroupware.la
 kio_opengroupware_la_SOURCES = opengroupware.cpp webdavhandler.cpp
 kio_opengroupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
-   $(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO)
+   $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
 kio_opengroupware_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
--- a/kioslaves/opengroupware/opengroupware.cpp
+++ b/kioslaves/opengroupware/opengroupware.cpp
@ -27,7 +27,7 @@
 #include <kio/davjob.h>
 #include <klocale.h>
-#include <libkdepim/kabcresourcecached.h>
+#include <libtdepim/kabcresourcecached.h>
 #include <libkcal/freebusy.h>
 #include <libkcal/icalformat.h>
--- a/kioslaves/opengroupware/webdavhandler.cpp
+++ b/kioslaves/opengroupware/webdavhandler.cpp
@ -24,7 +24,7 @@
 #include <limits.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <kdebug.h>
 #include <kconfig.h>
--- a/kioslaves/sieve/CMakeLists.txt
+++ b/kioslaves/sieve/CMakeLists.txt
@ -11,7 +11,7 @@
 include_directories(
  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kitchensync/src/CMakeLists.txt
+++ b/kitchensync/src/CMakeLists.txt
@ -12,7 +12,7 @@
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 add_subdirectory( about )
 add_subdirectory( pics )
@ -22,7 +22,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/..
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kitchensync/src/Makefile.am
+++ b/kitchensync/src/Makefile.am
@ -2,7 +2,7 @@ SUBDIRS = about pics
 INCLUDES = -I$(top_srcdir)/kitchensync/src \
           -I$(top_srcdir)/kitchensync \
-           -I$(top_srcdir)/libkdepim \
+           -I$(top_srcdir)/libtdepim \
           -I$(top_srcdir) \
            $(all_includes)
@ -33,7 +33,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
                            configguisunbird.cpp
 libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
 libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
-                           $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkcal/libkcal.la \
+                           $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
                           $(LIB_QT)
 # KPart
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@ -55,9 +55,9 @@ AboutPage::AboutPage( TQWidget *parent )
  TQString location = locate( "data", "kitchensync/about/main.html" );
  TQString content = readFile( location );
-  content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
+  content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
  if ( kapp->reverseLayout() )
-    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
+    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
  else
    content = content.tqarg( "" );
--- a/kitchensync/src/addresseediffalgo.cpp
+++ b/kitchensync/src/addresseediffalgo.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/kitchensync/src/addresseediffalgo.h
+++ b/kitchensync/src/addresseediffalgo.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
@ -23,7 +23,7 @@
 #define KSYNC_ADDRESSEEDIFFALGO_H
 #include <kabc/addressee.h>
-#include <libkdepim/diffalgo.h>
+#include <libtdepim/diffalgo.h>
 using namespace KPIM;
--- a/kitchensync/src/calendardiffalgo.cpp
+++ b/kitchensync/src/calendardiffalgo.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/kitchensync/src/calendardiffalgo.h
+++ b/kitchensync/src/calendardiffalgo.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
@ -24,7 +24,7 @@
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
-#include <libkdepim/diffalgo.h>
+#include <libtdepim/diffalgo.h>
 using namespace KPIM;
--- a/kitchensync/src/genericdiffalgo.cpp
+++ b/kitchensync/src/genericdiffalgo.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/kitchensync/src/genericdiffalgo.h
+++ b/kitchensync/src/genericdiffalgo.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
@ -22,7 +22,7 @@
 #ifndef KSYNC_GENERICDIFFALGO_H
 #define KSYNC_GENERICDIFFALGO_H
-#include <libkdepim/diffalgo.h>
+#include <libtdepim/diffalgo.h>
 using namespace KPIM;
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ b/kitchensync/src/htmldiffalgodisplay.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/kitchensync/src/htmldiffalgodisplay.h
+++ b/kitchensync/src/htmldiffalgodisplay.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
@ -23,7 +23,7 @@
 #define KSYNC_HTMLDIFFALGODISPLAY_H
 #include <ktextbrowser.h>
-#include <libkdepim/diffalgo.h>
+#include <libtdepim/diffalgo.h>
 using namespace KPIM;
--- a/kitchensync/src/singleconflictdialog.h
+++ b/kitchensync/src/singleconflictdialog.h
@ -22,7 +22,7 @@
 #define SINGLECONFLICTDIALOG_H
 #include "conflictdialog.h"
-#include <libkdepim/diffalgo.h>
+#include <libtdepim/diffalgo.h>
 using namespace KPIM;
--- a/kitchensync/src/xmldiffalgo.h
+++ b/kitchensync/src/xmldiffalgo.h
@ -24,7 +24,7 @@
 #include <tqdom.h>
-#include <libkdepim/diffalgo.h>
+#include <libtdepim/diffalgo.h>
 using namespace KPIM;
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@ -23,7 +23,7 @@ tde_import( ktnef )
 tde_import( libkcal )
 tde_import( libkmime )
 tde_import( libkpgp )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( mimelib )
 tde_import( libkpimidentities )
 tde_import( libksieve )
@ -44,7 +44,7 @@ include_directories(
  ${CMAKE_SOURCE_DIR}/libemailfunctions
  ${CMAKE_SOURCE_DIR}/mimelib
  ${CMAKE_SOURCE_DIR}/libkmime
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkpgp
  ${CMAKE_SOURCE_DIR}/libkdenetwork
  ${CMAKE_SOURCE_DIR}/certmanager/lib
--- a/kmail/Makefile.am
+++ b/kmail/Makefile.am
@ -6,7 +6,7 @@ SUBDIRS = interfaces . about pics profiles avscripts tests
 INCLUDES = -I$(top_srcdir)/libkmime \
        -I$(top_srcdir)/libkpgp \
        -I$(top_srcdir)/libkdenetwork \
-        -I$(top_srcdir)/libkdepim \
+        -I$(top_srcdir)/libtdepim \
        -I$(top_srcdir)/libkpimidentities \
        -I$(top_srcdir)/libemailfunctions \
        -I$(top_srcdir)/libksieve \
@ -25,9 +25,9 @@ INDEXLIB=../indexlib/libindex.la
 endif
 lib_LTLIBRARIES = libkmailprivate.la
-libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -L$(top_builddir)/libkdepim
+libkmailprivate_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined -L$(top_builddir)/libtdepim
 libkmailprivate_la_LIBADD = \
-        ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libkdepim/libkdepim.la \
+        ../libkmime/libkmime.la ../libkpgp/libkpgp.la ../libtdepim/libtdepim.la \
        ../libkpimidentities/libkpimidentities.la ../mimelib/libmimelib.la \
        ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
        ../certmanager/lib/libkleopatra.la $(INDEXLIB) \
@ -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)/libkdepim -lkdepim
+kmail_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdepim -lkdepim
 kmail_LDADD   = libkmailprivate.la
 libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
@ -180,7 +180,7 @@ dcoptest_LDADD = $(LIB_KIO)
 dcoptest_LDFLAGS = $(all_libraries)
 recipienteditortest_SOURCES = recipientseditortest.cpp
-recipienteditortest_LDADD = libkmailprivate.la ../libkdepim/libkdepim.la $(LIB_KIO) $(LIB_KABC)
+recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_KABC)
 recipienteditortest_LDFLAGS = $(all_libraries)
 kmailIface_DCOPIDLNG = true
--- a/kmail/bodypartformatterfactory.cpp
+++ b/kmail/bodypartformatterfactory.cpp
@ -38,8 +38,8 @@ using namespace KMail::BodyPartFormatterFactoryPrivate;
 #include "interfaces/bodypartformatter.h"
 #include "urlhandlermanager.h"
-// libkdepim
+// libtdepim
-#include <libkdepim/pluginloader.h>
+#include <libtdepim/pluginloader.h>
 // KDE
 #include <kdebug.h>
--- a/kmail/csshelper.h
+++ b/kmail/csshelper.h
@ -32,7 +32,7 @@
 #ifndef __KMAIL_CSSHELPER_H__
 #define __KMAIL_CSSHELPER_H__
-#include <libkdepim/csshelper.h>
+#include <libtdepim/csshelper.h>
 namespace KMail {
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@ -29,9 +29,9 @@
 #include <kabc/distributionlist.h>
 #ifdef KDEPIM_NEW_DISTRLISTS
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #endif
-#include <libkdepim/kaddrbook.h>
+#include <libtdepim/kaddrbook.h>
 #include <klistview.h>
 #include <klocale.h>
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@ -30,8 +30,8 @@
 #include "folderviewtooltip.h"
 #include "korghelper.h"
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
-#include <libkdepim/kaddrbook.h>
+#include <libtdepim/kaddrbook.h>
 #include <dcopclient.h>
 #include <kdebug.h>
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@ -42,7 +42,7 @@
 #include <addressesdialog.h>
 #include <kabc/addresseelist.h>
 #ifdef KDEPIM_NEW_DISTRLISTS
-#include <libkdepim/distributionlist.h> // libkdepim
+#include <libtdepim/distributionlist.h> // libtdepim
 #else
 #include <kabc/distributionlist.h>
 #endif
--- a/kmail/foldertreebase.cpp
+++ b/kmail/foldertreebase.cpp
@ -27,7 +27,7 @@
 #include "messagecopyhelper.h"
 #include "folderstorage.h"
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
 using KPIM::MailList;
 using KPIM::MailListDrag;
--- a/kmail/foldertreebase.h
+++ b/kmail/foldertreebase.h
@ -19,7 +19,7 @@
 #ifndef KMAIL_FOLDERTREEBASE_H
 #define KMAIL_FOLDERTREEBASE_H
-#include <libkdepim/kfoldertree.h>
+#include <libtdepim/kfoldertree.h>
 class KMFolder;
 class KMMainWidget;
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@ -43,7 +43,7 @@
 #include "globalsettings.h"
 #include <libemailfunctions/email.h>
-#include <libkdepim/kxface.h>
+#include <libtdepim/kxface.h>
 using namespace KPIM;
 #include <mimelib/string.h>
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@ -51,9 +51,9 @@ using KMail::FolderRequester;
 #include "simplestringlisteditor.h"
 // other kdepim headers:
-// libkdepim
+// libtdepim
 #include <libkpimidentities/identity.h>
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
 // libkleopatra:
 #include <ui/keyrequester.h>
 #include <kleo/cryptobackendfactory.h>
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@ -120,7 +120,7 @@ using KMail::RedirectDialog;
 #include "broadcaststatus.h"
 #include "globalsettings.h"
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include "kcalendariface_stub.h"
 #include "progressmanager.h"
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@ -58,7 +58,7 @@ using KRecentAddress::RecentAddresses;
 #include <libkpimidentities/identitymanager.h>
 #include <libkpimidentities/identitycombo.h>
 #include <libkpimidentities/identity.h>
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include <libemailfunctions/email.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/exportjob.h>
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@ -37,7 +37,7 @@
 #include "mailcomposerIface.h"
 #include "accountmanager.h"
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
 #include <mimelib/mediatyp.h>
 #include <kleo/enum.h>
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@ -18,7 +18,7 @@
 #include <maillistdrag.h>
 using KPIM::MailListDrag;
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include <libemailfunctions/email.h>
 #include <kcursor.h>
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@ -21,8 +21,8 @@
 #include <libkpimidentities/identity.h>
 #include <libkpimidentities/identitymanager.h>
 #include <libkpimidentities/identitycombo.h>
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
-#include <libkdepim/collectingprocess.h>
+#include <libtdepim/collectingprocess.h>
 using KPIM::CollectingProcess;
 #include <mimelib/message.h>
 #include "kmfawidgets.h"
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@ -9,7 +9,7 @@
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include "kmfoldermaildir.h"
 #include "kmfoldermgr.h"
 #include "kmfolder.h"
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@ -30,7 +30,7 @@ using KPIM::BroadcastStatus;
 #include "undostack.h"
 #include "accountmanager.h"
 using KMail::AccountManager;
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include "kmversion.h"
 #include "kmreaderwin.h"
 #include "kmmainwidget.h"
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@ -10,7 +10,7 @@
 #include "globalsettings.h"
 #include "stringutil.h"
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 #include <libemailfunctions/email.h>
 #include <kabc/vcardconverter.h>
--- a/kmail/kmlineeditspell.h
+++ b/kmail/kmlineeditspell.h
@ -5,7 +5,7 @@
 #ifndef __KMAIL_KMLINEEDITSPELL_H__
 #define __KMAIL_KMLINEEDITSPELL_H__
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
 class TQPopupMenu;
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@ -14,7 +14,7 @@
 #include "kmversion.h"
 #include "kmmainwidget.h"
 #include "kmreadermainwin.h"
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include "kmfolderindex.h"
 #include "kmcommands.h"
 #include "kmmsgpartdlg.h"
@ -1285,9 +1285,9 @@ void KMReaderWin::displaySplashPage( const TQString &info )
  TQString location = locate("data", "kmail/about/main.html");
  TQString content = KPIM::kFileToString(location);
-  content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
+  content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
  if ( kapp->reverseLayout() )
-    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
+    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
  else
    content = content.tqarg( "" );
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@ -244,7 +244,7 @@ void lockOrDie() {
 void insertLibraryCataloguesAndIcons() {
  static const char * const catalogues[] = {
-    "libkdepim",
+    "libtdepim",
    "libksieve",
    "libkleopatra",
    "libkmime"
--- a/kmail/mailserviceimpl.h
+++ b/kmail/mailserviceimpl.h
@ -49,7 +49,7 @@ namespace KMail {
                      const KURL::List& attachments );
    // FIXME KDE 4.0: Remove this.
-    // (cf. libkdepim/interfaces/MailTransportServiceIface.h)
+    // (cf. libtdepim/interfaces/MailTransportServiceIface.h)
    bool sendMessage( const TQString& to,
                      const TQString& cc, const TQString& bcc,
                      const TQString& subject, const TQString& body,
@ -61,7 +61,7 @@ namespace KMail {
                      const TQByteArray& attachment );
    // FIXME KDE 4.0: Remove this.
-    // (cf. libkdepim/interfaces/MailTransportServiceIface.h)
+    // (cf. libtdepim/interfaces/MailTransportServiceIface.h)
    bool sendMessage( const TQString& to,
                      const TQString& cc, const TQString& bcc,
                      const TQString& subject, const TQString& body,
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@ -40,7 +40,7 @@
 #include "kmkernel.h"
 #include "kmreaderwin.h"
 #include "partNode.h"
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include <libemailfunctions/email.h>
 #include "partmetadata.h"
 #include "attachmentstrategy.h"
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@ -23,8 +23,8 @@
 #include "globalsettings.h"
-#include <libkdepim/recentaddresses.h>
+#include <libtdepim/recentaddresses.h>
-#include <libkdepim/ldapsearchdialog.h>
+#include <libtdepim/ldapsearchdialog.h>
 #include <libemailfunctions/email.h>
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@ -37,7 +37,7 @@
 class TQComboBox;
 #ifdef KDEPIM_NEW_DISTRLISTS
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #else
 namespace KABC {
 class DistributionList;
--- a/kmobile/CMakeLists.txt
+++ b/kmobile/CMakeLists.txt
@ -18,7 +18,7 @@ add_subdirectory( devices )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kmobile/devices/skeleton/CMakeLists.txt
+++ b/kmobile/devices/skeleton/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../..
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/knode/CMakeLists.txt
+++ b/knode/CMakeLists.txt
@ -14,7 +14,7 @@
 tde_import( ktnef )
 tde_import( libkcal )
 tde_import( libkmime )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( libkpgp )
 add_subdirectory( pics )
@ -27,7 +27,7 @@ include_directories(
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/libemailfunctions
  ${CMAKE_SOURCE_DIR}/libkmime
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkpgp
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/knode/Makefile.am
+++ b/knode/Makefile.am
@ -1,7 +1,7 @@
 KDE_CXXFLAGS = $(USE_THREADS)
 INCLUDES=	-I$(top_srcdir)/libkmime \
-		-I$(top_srcdir)/libkdepim \
+		-I$(top_srcdir)/libtdepim \
 		-I$(top_srcdir)/libkpgp \
 		-I$(top_srcdir)/libemailfunctions \
 		-I$(top_srcdir) \
@ -11,7 +11,7 @@ lib_LTLIBRARIES = libknodecommon.la
 kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la
 libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
-libknodepart_la_LIBADD	= libknodecommon.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libkdepim -lkdepim
+libknodepart_la_LIBADD	= libknodecommon.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -lkdepim
 SUBDIRS = pics filters
@ -26,7 +26,7 @@ kcm_knode_la_LIBADD = libknodecommon.la $(LIB_KDECORE)
 knconfigpages.lo: smtpaccountwidget_base.h
 libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)
-libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_KHTML)
+libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_KFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_KHTML)
 libknodecommon_la_SOURCES =   knconfigmanager.cpp \
                  knconfig.cpp \
                  knconfigwidgets.cpp \
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@ -50,9 +50,9 @@
 #include <libkpgp/kpgp.h>
 #include <libkpgp/kpgpblock.h>
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
-#include <libkdepim/kxface.h>
+#include <libtdepim/kxface.h>
-#include <libkdepim/linklocator.h>
+#include <libtdepim/linklocator.h>
 #include "articlewidget.h"
 #include "csshelper.h"
--- a/knode/csshelper.h
+++ b/knode/csshelper.h
@ -14,7 +14,7 @@
 #ifndef KNODE_CSSHELPER_H
 #define KNODE_CSSHELPER_H
-#include <libkdepim/csshelper.h>
+#include <libtdepim/csshelper.h>
 namespace KNode {
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@ -448,7 +448,7 @@ TQFont KNConfig::Appearance::articleListFont() const
 TQColor KNConfig::Appearance::defaultColor(int i) const
 {
-  // defaults should match libkdepim/csshelper.cpp
+  // defaults should match libtdepim/csshelper.cpp
  switch(i) {
    case background:
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kio/job.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include "knarticle.h"
 #include "knglobals.h"
--- a/knode/knjobdata.h
+++ b/knode/knjobdata.h
@ -18,7 +18,7 @@
 #include <tqobject.h>
 #include <tqvaluelist.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 namespace KIO {
  class Job;
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@ -60,7 +60,7 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName,
  kdDebug(5003) << "KNodePart()..." << endl;
  kdDebug(5003) << "  InstanceName: " << kapp->instanceName() << endl;
-  KGlobal::locale()->insertCatalogue("libkdepim");
+  KGlobal::locale()->insertCatalogue("libtdepim");
  KGlobal::locale()->insertCatalogue("libkpgp");
  kapp->dcopClient()->suspend(); // Don't handle DCOP requests yet
  KGlobal::iconLoader()->addAppDir("knode");
--- a/knode/main.cpp
+++ b/knode/main.cpp
@ -37,7 +37,7 @@ int main(int argc, char* argv[])
    return 0;
  KNApplication app;
-  KGlobal::locale()->insertCatalogue("libkdepim");
+  KGlobal::locale()->insertCatalogue("libtdepim");
  KGlobal::locale()->insertCatalogue("libkpgp");
  return app.exec();
 }
--- a/knotes/CMakeLists.txt
+++ b/knotes/CMakeLists.txt
@ -14,7 +14,7 @@ project( knotes )
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 add_subdirectory( pics )
 add_subdirectory( icons )
@ -22,7 +22,7 @@ add_subdirectory( icons )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/knotes/Makefile.am
+++ b/knotes/Makefile.am
@ -27,7 +27,7 @@ libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.
 knotes_SOURCES  = main.cpp knotesapp.cpp KNotesAppIface.skel
 knotes_LDADD    = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
                  libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
-                  $(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO) -lkresources -lkdeprint -lkutils
+                  $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -lkresources -lkdeprint -lkutils
 knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 knotes_COMPILE_FIRST = knoteconfig.h
--- a/knotes/knotealarmdlg.cpp
+++ b/knotes/knotealarmdlg.cpp
@ -36,8 +36,8 @@
 #include <klocale.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
-#include <libkdepim/ktimeedit.h>
+#include <libtdepim/ktimeedit.h>
 #include <libkcal/journal.h>
 #include <libkcal/alarm.h>
--- a/kode/CMakeLists.txt
+++ b/kode/CMakeLists.txt
@ -12,7 +12,7 @@
 add_subdirectory( kxml_compiler )
 include_directories(
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kode/kwsdl/Makefile.am
+++ b/kode/kwsdl/Makefile.am
@ -1,6 +1,6 @@
 SUBDIRS = schema . wscl tests kung
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
 lib_LTLIBRARIES = libwsdl.la
--- a/kode/kwsdl/creator.cpp
+++ b/kode/kwsdl/creator.cpp
@ -64,7 +64,7 @@ void Creator::create( const KODE::Class::List &list )
  KODE::AutoMakefile makefile;
  makefile.addTarget( libTarget );
-  makefile.addEntry( "INCLUDES", "-I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)" );
+  makefile.addEntry( "INCLUDES", "-I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)" );
  makefile.addEntry( "METASOURCES", "AUTO" );
  printer.printAutoMakefile( makefile );
--- a/kode/kwsdl/kung/Makefile.am
+++ b/kode/kwsdl/kung/Makefile.am
@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libkdepim $(all_includes)
+INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes)
 bin_PROGRAMS = kung
 kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
--- a/kode/kwsdl/schema/Makefile.am
+++ b/kode/kwsdl/schema/Makefile.am
@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/libkdepim $(all_includes)
+INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/libtdepim $(all_includes)
 lib_LTLIBRARIES = libschema.la
--- a/kode/kwsdl/tests/google/Makefile.am
+++ b/kode/kwsdl/tests/google/Makefile.am
@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
 METASOURCES = AUTO
 bin_PROGRAMS = googletest
--- a/kode/kwsdl/wscl/Makefile.am
+++ b/kode/kwsdl/wscl/Makefile.am
@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/libkdepim $(all_includes)
+INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/libtdepim $(all_includes)
 lib_LTLIBRARIES = libwscl.la
--- a/kode/kxml_compiler/CMakeLists.txt
+++ b/kode/kxml_compiler/CMakeLists.txt
@ -11,7 +11,7 @@
 include_directories(
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kode/kxml_compiler/Makefile.am
+++ b/kode/kxml_compiler/Makefile.am
@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
 bin_PROGRAMS = kxml_compiler
--- a/konsolekalendar/CMakeLists.txt
+++ b/konsolekalendar/CMakeLists.txt
@ -12,7 +12,7 @@
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 add_subdirectory( pixmaps )
@ -20,7 +20,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}
 )
--- a/konsolekalendar/Makefile.am
+++ b/konsolekalendar/Makefile.am
@ -12,7 +12,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
  konsolekalendarchange.cpp konsolekalendarvariables.cpp \
  konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
  stdcalendar.cpp main.cpp 
-konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
+konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la
 konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 appsdir = $(kde_appsdir)/Utilities
--- a/konsolekalendar/konsolekalendar.cpp
+++ b/konsolekalendar/konsolekalendar.cpp
@ -48,7 +48,7 @@
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 #include <libkcal/htmlexport.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "konsolekalendar.h"
 #include "konsolekalendaradd.h"
--- a/konsolekalendar/konsolekalendaradd.cpp
+++ b/konsolekalendar/konsolekalendaradd.cpp
@ -43,7 +43,7 @@
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "konsolekalendaradd.h"
--- a/konsolekalendar/stdcalendar.cpp
+++ b/konsolekalendar/stdcalendar.cpp
@ -24,7 +24,7 @@
 #include "stdcalendar.h"
 #include <libkcal/resourcecalendar.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
--- a/kontact/CMakeLists.txt
+++ b/kontact/CMakeLists.txt
@ -13,7 +13,7 @@ tde_import( libkdenetwork )
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( certmanager )
 tde_import( libkpimidentities )
--- a/kontact/Thoughts
+++ b/kontact/Thoughts
@ -188,7 +188,7 @@ Don: If kontact is not running and is not the users preferred application
 Don: then a standalone version of X should be started, and an iface for
 Don: that standalone app returned.
 Don:
-Don: I think this library should be in libkdepim ad all the kdepim apps
+Don: I think this library should be in libtdepim ad all the kdepim apps
 Don: should be moved into kdepim, so their iface files all be in one
 Don: package. Or alternatively a new kdeinterfaces package be created
 Don: and used as a general repository for interface files.
--- a/kontact/interfaces/CMakeLists.txt
+++ b/kontact/interfaces/CMakeLists.txt
@ -12,7 +12,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/interfaces/Makefile.am
+++ b/kontact/interfaces/Makefile.am
@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkpinterfaces.la
 libkpinterfaces_la_SOURCES = core.cpp plugin.cpp summary.cpp uniqueapphandler.cpp
 libkpinterfaces_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
-libkpinterfaces_la_LIBADD = ../../libkdepim/libkdepim.la $(LIB_KPARTS)
+libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_KPARTS)
 kpincludedir = $(includedir)/kontact
 kpinclude_HEADERS = core.h plugin.h summary.h
--- a/kontact/plugins/akregator/CMakeLists.txt
+++ b/kontact/plugins/akregator/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/akregator/src
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/kaddressbook/CMakeLists.txt
+++ b/kontact/plugins/kaddressbook/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/kaddressbook/Makefile.am
+++ b/kontact/plugins/kaddressbook/Makefile.am
@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libkontact_kaddressbookplugin.la
 libkontact_kaddressbookplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkabc
-libkontact_kaddressbookplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkdepim/libkdepim.la
+libkontact_kaddressbookplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libtdepim/libtdepim.la
 libkontact_kaddressbookplugin_la_SOURCES = kaddressbook_plugin.cpp \
                                           kaddressbookiface.stub \
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@ -40,7 +40,7 @@
 #include <dcopclient.h>
 #include "kmailIface_stub.h"
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
 #include "core.h"
 #include "plugin.h"
--- a/kontact/plugins/karm/CMakeLists.txt
+++ b/kontact/plugins/karm/CMakeLists.txt
@ -12,7 +12,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/kmail/CMakeLists.txt
+++ b/kontact/plugins/kmail/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_BINARY_DIR}/kmail
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/kmail
  ${CMAKE_SOURCE_DIR}/certmanager/lib
  ${CMAKE_SOURCE_DIR}/libkdenetwork
--- a/kontact/plugins/kmail/Makefile.am
+++ b/kontact/plugins/kmail/Makefile.am
@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_builddir)/kmail \
-           -I$(top_srcdir)/libkdepim \
+           -I$(top_srcdir)/libtdepim \
           -I$(top_srcdir)/libkdenetwork \
           -I$(top_srcdir)/certmanager/lib \
           -I$(top_srcdir) $(all_includes)
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@ -39,7 +39,7 @@
 #include <libkcal/icaldrag.h>
 #include <libkcal/calendarlocal.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 #include <kmail/kmail_part.h>
 #include <kmail/kmkernel.h>
--- a/kontact/plugins/knode/CMakeLists.txt
+++ b/kontact/plugins/knode/CMakeLists.txt
@ -12,7 +12,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/knotes/CMakeLists.txt
+++ b/kontact/plugins/knotes/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/knotes/Makefile.am
+++ b/kontact/plugins/knotes/Makefile.am
@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libkontact_knotesplugin.la
 libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
-                                    $(LIB_KPARTS) $(top_builddir)/libkdepim/libkdepim.la \
+                                    $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \
                                    $(top_builddir)/libkcal/libkcal.la -lkresources -lkdeprint \
                                    $(top_builddir)/knotes/libknotesresources.la \
                                    $(top_builddir)/knotes/libknoteseditor.la \
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@ -27,8 +27,8 @@
 #include <kaction.h>
 #include <kmessagebox.h>
-#include <libkdepim/infoextension.h>
+#include <libtdepim/infoextension.h>
-#include <libkdepim/sidebarextension.h>
+#include <libtdepim/sidebarextension.h>
 #include "knotes/knoteprinter.h"
 #include "knotes/resourcemanager.h"
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@ -52,7 +52,7 @@
 #include <libkcal/calendarlocal.h>
 #include <libkcal/journal.h>
 #include <libkcal/icaldrag.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "knotes/knoteedit.h"
--- a/kontact/plugins/korganizer/CMakeLists.txt
+++ b/kontact/plugins/korganizer/CMakeLists.txt
@ -18,7 +18,7 @@ include_directories(
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/korganizer
  ${CMAKE_SOURCE_DIR}/korganizer/interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/korganizer/Makefile.am
+++ b/kontact/plugins/korganizer/Makefile.am
@ -1,6 +1,6 @@
 # top_srcdir/korganizer is a hack, to get korganizeriface.h
 INCLUDES = -I$(top_srcdir)/kontact/interfaces \
-  -I$(top_srcdir)/libkdepim \
+  -I$(top_srcdir)/libtdepim \
  -I$(top_srcdir)/korganizer \
  -I$(top_srcdir)/korganizer/interfaces \
  -I$(top_srcdir) $(all_includes)
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@ -40,9 +40,9 @@
 #include <dcopclient.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icaldrag.h>
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@ -38,7 +38,7 @@
 #include <libkcal/resourcecalendar.h>
 #include <libkcal/resourcelocal.h>
 #include <libkcal/incidenceformatter.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "korganizeriface_stub.h"
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@ -40,9 +40,9 @@
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icaldrag.h>
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "core.h"
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@ -38,7 +38,7 @@
 #include <libkcal/resourcelocal.h>
 #include <libkcal/todo.h>
 #include <libkcal/incidenceformatter.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "korganizeriface_stub.h"
--- a/kontact/plugins/kpilot/Makefile.am
+++ b/kontact/plugins/kpilot/Makefile.am
@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir)/kontact/interfaces \
-	-I$(top_srcdir)/libkdepim \
+	-I$(top_srcdir)/libtdepim \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/kpilot/lib \
 	-I$(top_srcdir)/kpilot/kpilot \
@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkontact_kpilotplugin.la
 libkontact_kpilotplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_kpilotplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
 	$(LIB_KPARTS) \
-	$(top_builddir)/libkdepim/libkdepim.la \
+	$(top_builddir)/libtdepim/libtdepim.la \
 	$(top_builddir)/kpilot/lib/libkpilot.la
 libkontact_kpilotplugin_la_SOURCES = kpilot_plugin.cpp summarywidget.cpp \
--- a/kontact/plugins/newsticker/CMakeLists.txt
+++ b/kontact/plugins/newsticker/CMakeLists.txt
@ -12,7 +12,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/newsticker/Makefile.am
+++ b/kontact/plugins/newsticker/Makefile.am
@ -1,11 +1,11 @@
 INCLUDES = -I$(top_srcdir)/kontact/interfaces \
-     -I$(top_srcdir)/libkdepim \
+     -I$(top_srcdir)/libtdepim \
     -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libkontact_newstickerplugin.la kcm_kontactknt.la
 libkontact_newstickerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEUI) \
-                                        $(top_builddir)/libkdepim/libkdepim.la ../../interfaces/libkpinterfaces.la
+                                        $(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la
 libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \
                                         summarywidget.cpp summarywidget.skel
--- a/kontact/plugins/specialdates/CMakeLists.txt
+++ b/kontact/plugins/specialdates/CMakeLists.txt
@ -15,7 +15,7 @@ tde_import( korganizer )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/kontact/plugins/specialdates/Makefile.am
+++ b/kontact/plugins/specialdates/Makefile.am
@ -1,12 +1,12 @@
 INCLUDES = -I$(top_srcdir)/kontact/interfaces \
-  -I$(top_srcdir)/libkdepim \
+  -I$(top_srcdir)/libtdepim \
  -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libkontact_specialdatesplugin.la kcm_sdsummary.la
 libkontact_specialdatesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_specialdatesplugin_la_LIBADD = \
        $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
-        $(top_builddir)/libkdepim/libkdepim.la \
+        $(top_builddir)/libtdepim/libtdepim.la \
        $(top_builddir)/libkholidays/libkholidays.la \
        $(top_builddir)/korganizer/libkorganizer_calendar.la \
        $(top_builddir)/kaddressbook/libkaddressbook.la
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@ -44,7 +44,7 @@
 #include <libkcal/event.h>
 #include <libkcal/resourcecalendar.h>
 #include <libkcal/resourcelocal.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "core.h"
 #include "plugin.h"
--- a/kontact/plugins/summary/CMakeLists.txt
+++ b/kontact/plugins/summary/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/certmanager/lib
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/summary/Makefile.am
+++ b/kontact/plugins/summary/Makefile.am
@ -1,12 +1,12 @@
 INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \
-  -I$(top_srcdir)/libkdepim \
+  -I$(top_srcdir)/libtdepim \
  -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la
 libkontact_summaryplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_summaryplugin_la_LIBADD = -lkutils \
  $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
-  $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la
+  $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la
 libkontact_summaryplugin_la_SOURCES = summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp
--- a/kontact/plugins/weather/CMakeLists.txt
+++ b/kontact/plugins/weather/CMakeLists.txt
@ -12,7 +12,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../../interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/plugins/weather/Makefile.am
+++ b/kontact/plugins/weather/Makefile.am
@ -1,8 +1,8 @@
-INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libkdepim -I$(top_srcdir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/libtdepim -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libkontact_weatherplugin.la
 libkontact_weatherplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_weatherplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) $(top_builddir)/libkdepim/libkdepim.la
+libkontact_weatherplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la
 libkontact_weatherplugin_la_SOURCES = weather_plugin.cpp summarywidget.cpp \
                                      summarywidget.skel
--- a/kontact/src/CMakeLists.txt
+++ b/kontact/src/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kontact/src/Makefile.am
+++ b/kontact/src/Makefile.am
@ -11,7 +11,7 @@ bin_PROGRAMS = kontact
 kontact_METASOURCES = AUTO
 kontact_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-kontact_LDADD = $(top_builddir)/libkdepim/libkdepim.la \
+kontact_LDADD = $(top_builddir)/libtdepim/libtdepim.la \
  $(top_builddir)/kontact/interfaces/libkpinterfaces.la libkontact.la \
  $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_KHTML)
 kontact_SOURCES = main.cpp mainwindow.cpp sidepanebase.cpp \
@ -23,7 +23,7 @@ kde_module_LTLIBRARIES = kcm_kontact.la
 kcm_kontact_la_SOURCES = kcmkontact.cpp
 kcm_kontact_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libkdepim/libkdepim.la
+kcm_kontact_la_LIBADD = libkontact.la $(top_builddir)/libtdepim/libtdepim.la
 kcm_kontact_la_COMPILE_FIRST = prefs.h
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@ -62,7 +62,7 @@
 #include <krsqueezedtextlabel.h>
 #include <khtml_part.h>
 #include <khtmlview.h>
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include <kcursor.h>
 #include <krun.h>
 #include <kaboutdata.h>
@ -290,9 +290,9 @@ void MainWindow::paintAboutScreen( const TQString& msg )
 {
  TQString location = locate( "data", "kontact/about/main.html" );
  TQString content = KPIM::kFileToString( location );
-  content = content.tqarg( locate( "data", "libkdepim/about/kde_infopage.css" ) );
+  content = content.tqarg( locate( "data", "libtdepim/about/kde_infopage.css" ) );
  if ( kapp->reverseLayout() )
-    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libkdepim/about/kde_infopage_rtl.css" ) );
+    content = content.tqarg( "@import \"%1\";" ).tqarg( locate( "data", "libtdepim/about/kde_infopage_rtl.css" ) );
  else
    content = content.tqarg( "" );
--- a/kontact/src/prefs.kcfgc
+++ b/kontact/src/prefs.kcfgc
@ -5,7 +5,7 @@ ClassName=Prefs
 Singleton=true
 Mutators=true
 #Inherits=KPimPrefs
-#IncludeFiles=libkdepim/kpimprefs.h
+#IncludeFiles=libtdepim/kpimprefs.h
 Visibility=KDE_EXPORT
 MemberVariables=public
 GlobalEnums=true
--- a/korganizer/CMakeLists.txt
+++ b/korganizer/CMakeLists.txt
@ -14,7 +14,7 @@ project( korganizer )
 include( ConfigureChecks.cmake )
 configure_file( ical2vcal.in ical2vcal @ONLY )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
@ -38,7 +38,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/libkholidays
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/certmanager/lib
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@ -24,12 +24,12 @@ kde_module_LTLIBRARIES = kcm_korganizer.la libkorganizerpart.la
 kcm_korganizer_la_SOURCES = koprefsdialog.cpp
 kcm_korganizer_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libkdepim/libkdepim.la \
+kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim.la \
  $(LIB_KDECORE)
 kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h 	kogroupwareprefspage.h
 libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkorganizerpart_la_LIBADD  = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libkdepim/ -lkdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
+libkorganizerpart_la_LIBADD  = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libtdepim/ -lkdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
 libkorganizerpart_la_SOURCES = korganizer_part.cpp
 libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
@ -53,7 +53,7 @@ libkorganizer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
 libkorganizer_la_LIBADD  = \
 	$(top_builddir)/libkcal/libkcal.la \
 	$(top_builddir)/libkpimidentities/libkpimidentities.la \
-	$(top_builddir)/libkdepim/libkdepim.la \
+	$(top_builddir)/libtdepim/libtdepim.la \
 	libkorganizer_eventviewer.la \
 	libkorganizer_calendar.la \
 	printing/libkocorehelper.la \
@ -67,7 +67,7 @@ libkorganizer_la_LIBADD  = \
 libkorganizer_la_COMPILE_FIRST = \
 	kogroupwareprefspage.ui \
-	$(top_srcdir)/libkdepim/categoryselectdialog.h
+	$(top_srcdir)/libtdepim/categoryselectdialog.h
 libkorganizer_la_SOURCES = komessagebox.cpp \
 	koagendaview.cpp koagenda.cpp koagendaitem.cpp \
 	datenavigator.cpp kdatenavigator.cpp datenavigatorcontainer.cpp \
@ -124,7 +124,7 @@ libkorganizer_eventviewer_la_SOURCES = koeventviewer.cpp urihandler.cpp \
 libkorganizer_calendar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
                                    -no-undefined -version-info 1:0
 libkorganizer_calendar_la_LIBADD  = $(LIB_KPARTS) \
-                                    $(top_builddir)/libkdepim/libkdepim.la \
+                                    $(top_builddir)/libtdepim/libtdepim.la \
                                    $(top_builddir)/libkcal/libkcal.la
 libkorganizer_calendar_la_SOURCES = stdcalendar.cpp
--- a/korganizer/archivedialog.cpp
+++ b/korganizer/archivedialog.cpp
@ -40,7 +40,7 @@
 #include <klineedit.h>
 #include <kactivelabel.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include "koprefs.h"
--- a/korganizer/exportwebdialog.cpp
+++ b/korganizer/exportwebdialog.cpp
@ -54,8 +54,8 @@
 #include <libkcal/calendar.h>
 #include <libkcal/htmlexportsettings.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include "koprefs.h"
 #include "kocore.h"
--- a/korganizer/exportwebdialog.h
+++ b/korganizer/exportwebdialog.h
@ -24,7 +24,7 @@
 #ifndef _EXPORTWEBDIALOG_H
 #define _EXPORTWEBDIALOG_H
-#include <libkdepim/kprefsdialog.h>
+#include <libtdepim/kprefsdialog.h>
 class HTMLExportSettings;
 class TQGroupBox;
--- a/korganizer/filtereditdialog.cpp
+++ b/korganizer/filtereditdialog.cpp
@ -38,7 +38,7 @@
 #include <knuminput.h>
 #include <libkcal/calfilter.h>
-#include <libkdepim/categoryselectdialog.h>
+#include <libtdepim/categoryselectdialog.h>
 #include "koprefs.h"
 #include "filteredit_base.h"
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@ -35,7 +35,7 @@
 #include <libkcal/icaldrag.h>
 #include <libkcal/vcaldrag.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 #include <libemailfunctions/email.h>
 #ifndef KORG_NOKABC
 #include <kabc/addressee.h>
--- a/korganizer/koattendeeeditor.cpp
+++ b/korganizer/koattendeeeditor.cpp
@ -26,8 +26,8 @@
 #ifndef KORG_NOKABC
 #include <kabc/addresseedialog.h>
-#include <libkdepim/addressesdialog.h>
+#include <libtdepim/addressesdialog.h>
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
 #endif
 #include <libkcal/incidence.h>
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@ -27,7 +27,7 @@
 #include <ksettings/dialog.h>
 #include <kwin.h>
-#include <libkdepim/categoryeditdialog.h>
+#include <libtdepim/categoryeditdialog.h>
 #include "calendarview.h"
 #include "koprefsdialog.h"
--- a/korganizer/koeditoralarms_base.ui
+++ b/korganizer/koeditoralarms_base.ui
@ -670,6 +670,6 @@
    <includehint>kurlrequester.h</includehint>
    <includehint>klineedit.h</includehint>
    <includehint>kpushbutton.h</includehint>
-    <includehint>libkdepim/addresseelineedit.h</includehint>
+    <includehint>libtdepim/addresseelineedit.h</includehint>
 </includehints>
 </UI>
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@ -27,12 +27,12 @@
 #include <libkcal/attachmenthandler.h>
 #include <libkcal/incidence.h>
-#include <libkdepim/kpimurlrequesterdlg.h>
+#include <libtdepim/kpimurlrequesterdlg.h>
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
-#include <libkdepim/kdepimprotocols.h>
+#include <libtdepim/kdepimprotocols.h>
-#include <libkdepim/maillistdrag.h>
+#include <libtdepim/maillistdrag.h>
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
-#include <libkdepim/kdepimprotocols.h>
+#include <libtdepim/kdepimprotocols.h>
 #include <klocale.h>
 #include <kdebug.h>
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@ -52,12 +52,12 @@
 #ifndef KORG_NOKABC
 #include <kabc/addresseedialog.h>
 #include <kabc/vcardconverter.h>
-#include <libkdepim/addressesdialog.h>
+#include <libtdepim/addressesdialog.h>
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #include <kabc/stdaddressbook.h>
 #endif
-#include <libkdepim/kvcarddrag.h>
+#include <libtdepim/kvcarddrag.h>
 #include <libemailfunctions/email.h>
 #include <libkcal/incidence.h>
--- a/korganizer/koeditorfreebusy.cpp
+++ b/korganizer/koeditorfreebusy.cpp
@ -38,9 +38,9 @@
 #ifndef KORG_NOKABC
 #include <kabc/addresseedialog.h>
 #include <kabc/vcardconverter.h>
-#include <libkdepim/addressesdialog.h>
+#include <libtdepim/addressesdialog.h>
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #include <kabc/stdaddressbook.h>
 #endif
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@ -56,8 +56,8 @@
 #include <libkcal/incidenceformatter.h>
 #include <libkcal/resourcecached.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
-#include <libkdepim/categoryselectdialog.h>
+#include <libtdepim/categoryselectdialog.h>
 #include "koprefs.h"
 #include "koglobals.h"
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@ -48,7 +48,7 @@
 #include <libkcal/incidenceformatter.h>
 #include "ktimeedit.h"
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include "koprefs.h"
 #include "koglobals.h"
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@ -47,7 +47,7 @@
 #include <libkcal/incidenceformatter.h>
 #include <libkcal/todo.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include "koprefs.h"
 #include "koglobals.h"
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@ -49,7 +49,7 @@
 #include <kcalendarsystem.h>
 #include <kmessagebox.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include <libkcal/todo.h>
 #include "koprefs.h"
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@ -39,8 +39,8 @@
 #include <kio/netaccess.h>
 #include <kabc/addressee.h>
-#include <libkdepim/designerfields.h>
+#include <libtdepim/designerfields.h>
-#include <libkdepim/embeddedurlpage.h>
+#include <libtdepim/embeddedurlpage.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/incidence.h>
--- a/korganizer/koprefs_base.kcfgc
+++ b/korganizer/koprefs_base.kcfgc
@ -4,7 +4,7 @@ ClassName=KOPrefsBase
 Singleton=false
 Mutators=true
 Inherits=KPimPrefs
-IncludeFiles=libkdepim/kpimprefs.h
+IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 GlobalEnums=true
 ItemAccessors=true
--- a/korganizer/koprefsdialog.h
+++ b/korganizer/koprefsdialog.h
@ -24,8 +24,8 @@
 #ifndef KOPREFSDIALOG_H
 #define KOPREFSDIALOG_H
-#include <libkdepim/kprefsdialog.h>
+#include <libtdepim/kprefsdialog.h>
-#include <libkdepim/kcmdesignerfields.h>
+#include <libtdepim/kcmdesignerfields.h>
 #include <tqdict.h>
--- a/korganizer/korgac/CMakeLists.txt
+++ b/korganizer/korgac/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/korganizer
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/korganizer/korganizer.cpp
+++ b/korganizer/korganizer.cpp
@ -47,8 +47,8 @@
 #include <korganizer/part.h>
-#include <libkdepim/statusbarprogresswidget.h>
+#include <libtdepim/statusbarprogresswidget.h>
-#include <libkdepim/progressdialog.h>
+#include <libtdepim/progressdialog.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendarresources.h>
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@ -72,7 +72,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName,
  KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->tqtopLevelWidget() )
 {
  KGlobal::locale()->insertCatalogue( "libkcal" );
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KGlobal::locale()->insertCatalogue( "kdgantt" );
  KOCore::self()->addXMLGUIClient( mTopLevelWidget, this );
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@ -44,8 +44,8 @@
 #include <libkcal/calfilter.h>
 #include <libkcal/incidenceformatter.h>
-#include <libkdepim/clicklineedit.h>
+#include <libtdepim/clicklineedit.h>
-#include <libkdepim/kdatepickerpopup.h>
+#include <libtdepim/kdatepickerpopup.h>
 #include <libemailfunctions/email.h>
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@ -48,7 +48,7 @@ int main ( int argc, char **argv )
  KOrganizerApp app;
  KGlobal::locale()->insertCatalogue( "libkcal" );
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KGlobal::locale()->insertCatalogue( "kdgantt" );
  if ( app.isRestored() ) {
--- a/korganizer/plugins/datenums/CMakeLists.txt
+++ b/korganizer/plugins/datenums/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/korganizer
  ${CMAKE_SOURCE_DIR}/korganizer/interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/korganizer/plugins/exchange/CMakeLists.txt
+++ b/korganizer/plugins/exchange/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/korganizer/interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkpimexchange/core
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/korganizer/plugins/printing/journal/CMakeLists.txt
+++ b/korganizer/plugins/printing/journal/CMakeLists.txt
@ -15,7 +15,7 @@ include_directories(
  ${CMAKE_SOURCE_DIR}/korganizer/interfaces
  ${CMAKE_SOURCE_DIR}/korganizer/interfaces/korganizer
  ${CMAKE_SOURCE_DIR}/korganizer/printing
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/korganizer/plugins/printing/journal/Makefile.am
+++ b/korganizer/plugins/printing/journal/Makefile.am
@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la
 libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui  journalprint.cpp
 libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
-libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libkdepim/ -lkdepim
+libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -lkdepim
 noinst_HEADERS = 
--- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
+++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui
@ -169,7 +169,7 @@
 <customwidgets>
    <customwidget>
        <class>KDateEdit</class>
-        <header location="local">libkdepim/kdateedit.h</header>
+        <header location="local">libtdepim/kdateedit.h</header>
        <sizehint>
            <width>-1</width>
            <height>-1</height>
--- a/korganizer/plugins/printing/journal/journalprint.cpp
+++ b/korganizer/plugins/printing/journal/journalprint.cpp
@ -29,7 +29,7 @@
 #include "calprintpluginbase.h"
 #include <libkcal/journal.h>
 #include <libkcal/calendar.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include <kconfig.h>
 #include <kdebug.h>
--- a/korganizer/plugins/printing/list/listprint.cpp
+++ b/korganizer/plugins/printing/list/listprint.cpp
@ -30,7 +30,7 @@
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
 #include <libkcal/calendar.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include <kconfig.h> 
 #include <kdebug.h>
--- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
+++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui
@ -144,7 +144,7 @@
 <customwidgets>
    <customwidget>
        <class>KDateEdit</class>
-        <header location="local">libkdepim/kdateedit.h</header>
+        <header location="local">libtdepim/kdateedit.h</header>
        <sizehint>
            <width>-1</width>
            <height>-1</height>
--- a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
+++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp
@ -30,7 +30,7 @@
 #include <libkcal/event.h>
 #include <libkcal/todo.h>
 #include <libkcal/calendar.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include <kconfig.h> 
 #include <kdebug.h>
--- a/korganizer/plugins/printing/year/CMakeLists.txt
+++ b/korganizer/plugins/printing/year/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/korganizer/interfaces
  ${CMAKE_SOURCE_DIR}/korganizer/printing
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/korganizer/printing/CMakeLists.txt
+++ b/korganizer/printing/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/korganizer/interfaces
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/korganizer/printing/Makefile.am
+++ b/korganizer/printing/Makefile.am
@ -23,7 +23,7 @@ libkorg_stdprinting_la_SOURCES = calprinter.cpp calprintpluginbase.cpp \
 libkorg_stdprinting_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                                 -no-undefined -version-info 1:0
 libkorg_stdprinting_la_LIBADD = $(LIB_KDEUI) libkocorehelper.la \
-                                $(top_builddir)/libkdepim/libkdepim.la \
+                                $(top_builddir)/libtdepim/libtdepim.la \
                                $(top_builddir)/libkcal/libkcal.la \
                                -lkdeprint 
--- a/korganizer/printing/calprintdayconfig_base.ui
+++ b/korganizer/printing/calprintdayconfig_base.ui
@ -251,7 +251,7 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>libkdepim/kdateedit.h</includehint>
+    <includehint>libtdepim/kdateedit.h</includehint>
-    <includehint>libkdepim/kdateedit.h</includehint>
+    <includehint>libtdepim/kdateedit.h</includehint>
 </includehints>
 </UI>
--- a/korganizer/printing/calprinttodoconfig_base.ui
+++ b/korganizer/printing/calprinttodoconfig_base.ui
@ -449,7 +449,7 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>libkdepim/kdateedit.h</includehint>
+    <includehint>libtdepim/kdateedit.h</includehint>
-    <includehint>libkdepim/kdateedit.h</includehint>
+    <includehint>libtdepim/kdateedit.h</includehint>
 </includehints>
 </UI>
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweekconfig_base.ui
@ -294,7 +294,7 @@
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>libkdepim/kdateedit.h</includehint>
+    <includehint>libtdepim/kdateedit.h</includehint>
-    <includehint>libkdepim/kdateedit.h</includehint>
+    <includehint>libtdepim/kdateedit.h</includehint>
 </includehints>
 </UI>
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@ -36,7 +36,7 @@
 #include <libkcal/calendar.h>
-#include <libkdepim/kdateedit.h>
+#include <libtdepim/kdateedit.h>
 #include "koglobals.h"
 #include "koprefs.h"
--- a/korganizer/stdcalendar.cpp
+++ b/korganizer/stdcalendar.cpp
@ -22,7 +22,7 @@
 #include "stdcalendar.h"
 #include <libkcal/resourcecalendar.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <kstaticdeleter.h>
 #include <kconfig.h>
--- a/korn/CMakeLists.txt
+++ b/korn/CMakeLists.txt
@ -19,7 +19,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/libkmime
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/CMakeLists.txt
+++ b/kresources/CMakeLists.txt
@ -14,7 +14,7 @@ project( kresources )
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( knotes )
 add_subdirectory( lib )
--- a/kresources/birthdays/CMakeLists.txt
+++ b/kresources/birthdays/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}/kaddressbook/common
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/kaddressbook/common
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/birthdays/resourcekabc.h
+++ b/kresources/birthdays/resourcekabc.h
@ -33,7 +33,7 @@
 #include "libkcal/resourcecalendar.h"
-#include "libkdepim/kdepimmacros.h"
+#include "libtdepim/kdepimmacros.h"
 namespace KIO {
 class FileCopyJob;
--- a/kresources/blogging/Makefile.am
+++ b/kresources/blogging/Makefile.am
@ -11,7 +11,7 @@ libkcal_blogging_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
  -version-info 1:0:0 -no-undefined
 libkcal_blogging_la_LIBADD = \
  ../lib/libkgroupwarebase.la \
-  $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la 
+  $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la 
 kcal_blogging_la_SOURCES = kcal_resourceblogging_plugin.cpp
--- a/kresources/caldav/CMakeLists.txt
+++ b/kresources/caldav/CMakeLists.txt
@ -14,7 +14,7 @@ include( ConfigureChecks.cmake )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${CALDAV_INCLUDE_DIRS}
--- a/kresources/caldav/Makefile.am
+++ b/kresources/caldav/Makefile.am
@ -14,7 +14,7 @@ libkcal_caldav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkcal_caldav_la_LIBADD = \
                              $(top_builddir)/libkcal/libkcal.la \
-                              $(top_builddir)/libkdepim/libkdepim.la \
+                              $(top_builddir)/libtdepim/libtdepim.la \
                              -lcaldav
 libkcal_caldav_la_COMPILE_FIRST = prefsskel.h
--- a/kresources/caldav/resource.h
+++ b/kresources/caldav/resource.h
@ -22,7 +22,7 @@
 #include <tqptrqueue.h>
 #include <libkcal/resourcecached.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <kabc/locknull.h>
--- a/kresources/carddav/CMakeLists.txt
+++ b/kresources/carddav/CMakeLists.txt
@ -14,7 +14,7 @@ include( ConfigureChecks.cmake )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${CARDDAV_INCLUDE_DIRS}
--- a/kresources/carddav/Makefile.am
+++ b/kresources/carddav/Makefile.am
@ -13,7 +13,7 @@ libkabc_carddav_la_SOURCES = resource.cpp \
 libkabc_carddav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkabc_carddav_la_LIBADD = \
-                              $(top_builddir)/libkdepim/libkdepim.la \
+                              $(top_builddir)/libtdepim/libtdepim.la \
                              $(top_builddir)/libkcal/libkcal.la \
                              -lkabc \
                              -lcarddav
--- a/kresources/carddav/resource.h
+++ b/kresources/carddav/resource.h
@ -21,7 +21,7 @@
 #include <tqptrqueue.h>
 #include <kabcresourcecached.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <kabc/locknull.h>
--- a/kresources/egroupware/CMakeLists.txt
+++ b/kresources/egroupware/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}/kaddressbook/common
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/kaddressbook/common
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/egroupware/Makefile.am
+++ b/kresources/egroupware/Makefile.am
@ -20,7 +20,7 @@ lib_LTLIBRARIES = libkabc_xmlrpc.la libkcal_xmlrpc.la libknotes_xmlrpc.la
 libkabc_xmlrpc_la_SOURCES = kabc_resourcexmlrpc.cpp kabc_resourcexmlrpcconfig.cpp  \
                            kabc_egroupwareprefs.kcfgc
 libkabc_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_xmlrpc_la_LIBADD = $(LIB_KIO) -lkabc $(top_builddir)/libkdepim/libkdepim.la \
+libkabc_xmlrpc_la_LIBADD = $(LIB_KIO) -lkabc $(top_builddir)/libtdepim/libtdepim.la \
                           $(top_builddir)/kaddressbook/common/libkabcommon.la \
                           libegwcommon.la
@ -28,7 +28,7 @@ libkcal_xmlrpc_la_SOURCES = kcal_resourcexmlrpc.cpp kcal_resourcexmlrpcconfig.cp
                            todostatemapper.cpp kcal_egroupwareprefs.kcfgc
 libkcal_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libkcal_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
-                           $(top_builddir)/libkdepim/libkdepim.la \
+                           $(top_builddir)/libtdepim/libtdepim.la \
                           libegwcommon.la
 libknotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpc.cpp knotes_resourcexmlrpcconfig.cpp \
@ -36,7 +36,7 @@ libknotes_xmlrpc_la_SOURCES = knotes_resourcexmlrpc.cpp knotes_resourcexmlrpccon
 libknotes_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -lkdeprint \
                             $(top_builddir)/knotes/libknotesresources.la \
-                             $(top_builddir)/libkdepim/libkdepim.la \
+                             $(top_builddir)/libtdepim/libtdepim.la \
                             libegwcommon.la
 kabcincludedir = $(includedir)/kabc
--- a/kresources/egroupware/kabc_egroupwareprefs.kcfgc
+++ b/kresources/egroupware/kabc_egroupwareprefs.kcfgc
@ -5,7 +5,7 @@ NameSpace=KABC
 Singleton=false
 Mutators=true
 Inherits=KResourcePrefs
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 GlobalEnums=true
 #ItemAccessors=true
 #SetUserTexts=true
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@ -29,7 +29,7 @@
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <libkcal/freebusyurlstore.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "kabc_egroupwareprefs.h"
 #include "kabc_resourcexmlrpc.h"
--- a/kresources/egroupware/kabc_resourcexmlrpc.h
+++ b/kresources/egroupware/kabc_resourcexmlrpc.h
@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include <kdepimmacros.h>
-#include "libkdepim/kabcresourcecached.h"
+#include "libtdepim/kabcresourcecached.h"
 class KConfig;
 class Synchronizer;
--- a/kresources/egroupware/kcal_egroupwareprefs.kcfgc
+++ b/kresources/egroupware/kcal_egroupwareprefs.kcfgc
@ -5,7 +5,7 @@ NameSpace=KCal
 Singleton=false
 Mutators=true
 Inherits=KResourcePrefs
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 GlobalEnums=true
 #ItemAccessors=true
 #SetUserTexts=true
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@ -35,7 +35,7 @@
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include "libkcal/vcaldrag.h"
 #include "libkcal/vcalformat.h"
--- a/kresources/egroupware/knotes_egroupwareprefs.kcfgc
+++ b/kresources/egroupware/knotes_egroupwareprefs.kcfgc
@ -5,7 +5,7 @@ NameSpace=KNotes
 Singleton=false
 Mutators=true
 Inherits=KResourcePrefs
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 GlobalEnums=true
 #ItemAccessors=true
 #SetUserTexts=true
--- a/kresources/exchange/CMakeLists.txt
+++ b/kresources/exchange/CMakeLists.txt
@ -14,7 +14,7 @@ tde_import( libkpimexchange )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkpimexchange/core
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/kresources/featureplan/CMakeLists.txt
+++ b/kresources/featureplan/CMakeLists.txt
@ -24,7 +24,7 @@ endif( )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/featureplan/Makefile.am
+++ b/kresources/featureplan/Makefile.am
@ -12,7 +12,7 @@ libkcal_resourcefeatureplan_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                                         -version-info 1:0:0 -no-undefined
 libkcal_resourcefeatureplan_la_LIBADD = libfeatureplancommon.la \
                                        $(top_builddir)/libkcal/libkcal.la \
-                                        $(top_builddir)/libkdepim/libkdepim.la
+                                        $(top_builddir)/libtdepim/libtdepim.la
 libkcal_resourcefeatureplan_la_COMPILE_FIRST = kde-features.h prefs.h
--- a/kresources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/kresources/featureplan/kcal_resourcefeatureplan.cpp
@ -39,7 +39,7 @@
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 using namespace KCal;
--- a/kresources/groupdav/CMakeLists.txt
+++ b/kresources/groupdav/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}/../lib
  ${CMAKE_CURRENT_SOURCE_DIR}/../lib
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/groupdav/Makefile.am
+++ b/kresources/groupdav/Makefile.am
@ -11,14 +11,14 @@ libkcal_groupdav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkcal_groupdav_la_LIBADD = \
  libkgroupdav.la ../lib/libkgroupwaredav.la \
-  $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la 
+  $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la 
 libkabc_groupdav_la_SOURCES = kabc_resourcegroupdav.cpp groupdavaddressbookadaptor.cpp 
 libkabc_groupdav_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkabc_groupdav_la_LIBADD = \
  libkgroupdav.la ../lib/libkgroupwaredav.la  \
-  $(top_builddir)/libkcal/libkcal.la  $(top_builddir)/libkdepim/libkdepim.la \
+  $(top_builddir)/libkcal/libkcal.la  $(top_builddir)/libtdepim/libtdepim.la \
  -lkabc
 kde_module_LTLIBRARIES = kcal_groupdav.la kabc_groupdav.la
--- a/kresources/groupware/Makefile.am
+++ b/kresources/groupware/Makefile.am
@ -9,7 +9,7 @@ libkcal_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkcal_groupware_la_LIBADD = \
                              $(top_builddir)/libkcal/libkcal.la \
-                              $(top_builddir)/libkdepim/libkdepim.la
+                              $(top_builddir)/libtdepim/libtdepim.la
 libkabc_groupware_la_SOURCES = kabc_resourcegroupware.cpp \
                               kabc_resourcegroupwareconfig.cpp \
@ -17,7 +17,7 @@ libkabc_groupware_la_SOURCES = kabc_resourcegroupware.cpp \
 libkabc_groupware_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkabc_groupware_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
-                              $(top_builddir)/libkdepim/libkdepim.la \
+                              $(top_builddir)/libtdepim/libtdepim.la \
                              -lkabc
 kde_module_LTLIBRARIES = kcal_groupware.la kabc_groupware.la
--- a/kresources/groupware/kabc_groupwareprefs.kcfgc
+++ b/kresources/groupware/kabc_groupwareprefs.kcfgc
@ -1,7 +1,7 @@
 ClassName=GroupwarePrefs
 File=kresources_kabc_groupware.kcfg
 GlobalEnums=true
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 Inherits=KResourcePrefs
 Mutators=true
 NameSpace=KABC
--- a/kresources/groupware/kabc_resourcegroupware.cpp
+++ b/kresources/groupware/kabc_resourcegroupware.cpp
@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <klocale.h>
-#include <libkdepim/groupwarejob.h>
+#include <libtdepim/groupwarejob.h>
 #include "kabc_groupwareprefs.h"
--- a/kresources/groupware/kabc_resourcegroupware.h
+++ b/kresources/groupware/kabc_resourcegroupware.h
@ -22,7 +22,7 @@
 #include <kabcresourcecached.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <kio/job.h>
--- a/kresources/groupware/kcal_groupwareprefsbase.kcfgc
+++ b/kresources/groupware/kcal_groupwareprefsbase.kcfgc
@ -5,7 +5,7 @@ NameSpace=KCal
 Singleton=false
 Mutators=true
 Inherits=KResourcePrefs
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 GlobalEnums=true
 #ItemAccessors=true
 #SetUserTexts=true
--- a/kresources/groupware/kcal_resourcegroupware.cpp
+++ b/kresources/groupware/kcal_resourcegroupware.cpp
@ -41,8 +41,8 @@
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
-#include <libkdepim/groupwarejob.h>
+#include <libtdepim/groupwarejob.h>
 using namespace KCal;
--- a/kresources/groupware/kcal_resourcegroupware.h
+++ b/kresources/groupware/kcal_resourcegroupware.h
@ -21,7 +21,7 @@
 #ifndef KCAL_RESOURCEGROUPWARE_H
 #define KCAL_RESOURCEGROUPWARE_H
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <libkcal/resourcecached.h>
--- a/kresources/groupwise/CMakeLists.txt
+++ b/kresources/groupwise/CMakeLists.txt
@ -16,7 +16,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}
 )
--- a/kresources/groupwise/Makefile.am
+++ b/kresources/groupwise/Makefile.am
@ -11,7 +11,7 @@ libkcal_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkcal_groupwise_la_LIBADD = soap/libgwsoap.la \
                              $(top_builddir)/libkcal/libkcal.la \
-                              $(top_builddir)/libkdepim/libkdepim.la
+                              $(top_builddir)/libtdepim/libtdepim.la
 libkabc_groupwise_la_SOURCES = kabc_resourcegroupwise.cpp \
                               kabc_resourcegroupwiseconfig.cpp \
@ -20,7 +20,7 @@ libkabc_groupwise_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkabc_groupwise_la_LIBADD = soap/libgwsoap.la \
                              $(top_builddir)/libkcal/libkcal.la \
-                              $(top_builddir)/libkdepim/libkdepim.la \
+                              $(top_builddir)/libtdepim/libtdepim.la \
                              -lkabc
--- a/kresources/groupwise/kabc_groupwiseprefs.kcfgc
+++ b/kresources/groupwise/kabc_groupwiseprefs.kcfgc
@ -1,7 +1,7 @@
 ClassName=GroupwisePrefs
 File=kresources_kabc_groupwise.kcfg
 GlobalEnums=true
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 Inherits=KResourcePrefs
 Mutators=true
 NameSpace=KABC
--- a/kresources/groupwise/kabc_resourcegroupwise.h
+++ b/kresources/groupwise/kabc_resourcegroupwise.h
@ -25,7 +25,7 @@
 #include <kabcresourcecached.h>
 #include <kdepimmacros.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <kio/job.h>
--- a/kresources/groupwise/kcal_groupwiseprefsbase.kcfgc
+++ b/kresources/groupwise/kcal_groupwiseprefsbase.kcfgc
@ -5,7 +5,7 @@ NameSpace=KCal
 Singleton=false
 Mutators=true
 Inherits=KResourcePrefs
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 GlobalEnums=true
 #ItemAccessors=true
 #SetUserTexts=true
--- a/kresources/groupwise/kcal_resourcegroupwise.cpp
+++ b/kresources/groupwise/kcal_resourcegroupwise.cpp
@ -43,7 +43,7 @@
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <kurl.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 using namespace KCal;
--- a/kresources/groupwise/kcal_resourcegroupwise.h
+++ b/kresources/groupwise/kcal_resourcegroupwise.h
@ -23,7 +23,7 @@
 #include <libemailfunctions/idmapper.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <libkcal/resourcecached.h>
--- a/kresources/groupwise/kioslave/CMakeLists.txt
+++ b/kresources/groupwise/kioslave/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../soap
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/groupwise/kioslave/Makefile.am
+++ b/kresources/groupwise/kioslave/Makefile.am
@ -1,5 +1,5 @@
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/kresources/groupwise/soap \
-  -I$(top_builddir)/libkdepim $(all_includes)
+  -I$(top_builddir)/libtdepim $(all_includes)
 noinst_HEADERS = groupwise.h
@ -12,7 +12,7 @@ kde_module_LTLIBRARIES =  kio_groupwise.la
 kio_groupwise_la_SOURCES = groupwise.cpp
 kio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
-  ../soap/libgwsoap.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO)
+  ../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
 kio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 messages: rc.cpp
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@ -23,7 +23,7 @@
 #include <tqregexp.h>
-#include <libkdepim/kabcresourcecached.h>
+#include <libtdepim/kabcresourcecached.h>
 #include <libkcal/freebusy.h>
 #include <libkcal/icalformat.h>
--- a/kresources/groupwise/soap/CMakeLists.txt
+++ b/kresources/groupwise/soap/CMakeLists.txt
@ -16,7 +16,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/..
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/groupwise/soap/Makefile.am
+++ b/kresources/groupwise/soap/Makefile.am
@ -8,7 +8,7 @@ check_PROGRAMS = soapdebug
 soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 soapdebug_LDADD   = libgwsoap.la -lkdecore \
                   $(top_builddir)/libkcal/libkcal.la \
-                   $(top_builddir)/libkdepim/libkdepim.la
+                   $(top_builddir)/libtdepim/libtdepim.la
 soapdebug_SOURCES = soapdebug.cpp
 lib_LTLIBRARIES = libgwsoap.la
@ -17,7 +17,7 @@ libgwsoap_la_SOURCES = contactconverter.cpp gwconverter.cpp incidenceconverter.c
                       groupwiseserver.cpp gwjobs.cpp ksslsocket.cpp \
                       soapC.cpp soapClient.cpp stdsoap2.cpp
 libgwsoap_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
-libgwsoap_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la
+libgwsoap_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la
 # the following rule does:
 # make a header file from the wsdl
--- a/kresources/groupwise/soap/groupwiseserver.cpp
+++ b/kresources/groupwise/soap/groupwiseserver.cpp
@ -25,7 +25,7 @@
 #include <libkcal/calendar.h>
 #include <libkcal/incidence.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <kabc/addressee.h>
 #include <kabc/addresseelist.h>
--- a/kresources/groupwise/soap/gwconverter.cpp
+++ b/kresources/groupwise/soap/gwconverter.cpp
@ -20,7 +20,7 @@
 #include "gwconverter.h"
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <kdebug.h>
--- a/kresources/groupwise/soap/incidenceconverter.cpp
+++ b/kresources/groupwise/soap/incidenceconverter.cpp
@ -20,7 +20,7 @@
 #include <klocale.h>
 #include <kmdcodec.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <libkcal/event.h>
 #include <libkcal/journal.h>
 #include <libkcal/recurrence.h>
--- a/kresources/kolab/kabc/CMakeLists.txt
+++ b/kresources/kolab/kabc/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../shared
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/kolab/kabc/contact.cpp
+++ b/kresources/kolab/kabc/contact.cpp
@ -36,7 +36,7 @@
 #include <kabc/addressee.h>
 #include <kabc/stdaddressbook.h>
 #include <libkcal/freebusyurlstore.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #include <kio/netaccess.h>
 #include <kdebug.h>
 #include <tqfile.h>
--- a/kresources/kolab/kabc/resourcekolab.h
+++ b/kresources/kolab/kabc/resourcekolab.h
@ -33,7 +33,7 @@
 #ifndef KABC_RESOURCEKOLAB_H
 #define KABC_RESOURCEKOLAB_H
-#include <libkdepim/resourceabc.h>
+#include <libtdepim/resourceabc.h>
 #include <dcopobject.h>
 #include "../shared/resourcekolabbase.h"
 #include "../shared/subresource.h"
--- a/kresources/kolab/kcal/CMakeLists.txt
+++ b/kresources/kolab/kcal/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/../shared
  ${CMAKE_CURRENT_SOURCE_DIR}/../kcal
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/kolab/kcal/Makefile.am
+++ b/kresources/kolab/kcal/Makefile.am
@ -1,7 +1,7 @@
 METASOURCES = AUTO
 INCLUDES = -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \
-        -I$(top_builddir)/libkdepim $(all_includes)
+        -I$(top_builddir)/libtdepim $(all_includes)
 # The kolab wizard links to this library too
 lib_LTLIBRARIES = libkcalkolab.la
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@ -41,7 +41,7 @@
 #include <kio/uiserver_stub.h>
 #include <kapplication.h>
 #include <dcopclient.h>
-#include <libkdepim/kincidencechooser.h>
+#include <libtdepim/kincidencechooser.h>
 #include <kabc/locknull.h>
 #include <kmainwindow.h>
 #include <klocale.h>
--- a/kresources/kolab/knotes/CMakeLists.txt
+++ b/kresources/kolab/knotes/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/../shared
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/knotes
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/kolab/knotes/Makefile.am
+++ b/kresources/kolab/knotes/Makefile.am
@ -1,7 +1,7 @@
 METASOURCES = AUTO
 INCLUDES = -I$(top_srcdir)/kresources/kolab/shared \
-	-I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libkdepim $(all_includes)
+	-I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libtdepim $(all_includes)
 # The kolab wizard links to this library too
 lib_LTLIBRARIES = libknoteskolab.la
--- a/kresources/kolab/shared/CMakeLists.txt
+++ b/kresources/kolab/shared/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/kresources/lib
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/kolab/shared/Makefile.am
+++ b/kresources/kolab/shared/Makefile.am
@ -9,7 +9,7 @@ libresourcekolabshared_la_SOURCES = \
        subresource.cpp \
 	kmailconnection.skel kmailicalIface.stub
 libresourcekolabshared_la_METASOURCES = AUTO
-libresourcekolabshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la ../../lib/libkgroupwarebase.la
+libresourcekolabshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la ../../lib/libkgroupwarebase.la
 libresourcekolabshared_la_LDFLAGS = -no-undefined
 kmailicalIface_DCOPIDLNG = true
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@ -35,7 +35,7 @@
 #include <kabc/addressee.h>
 #include <libkcal/journal.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <libemailfunctions/email.h>
 #include <kdebug.h>
 #include <tqfile.h>
--- a/kresources/lib/CMakeLists.txt
+++ b/kresources/lib/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/lib/Makefile.am
+++ b/kresources/lib/Makefile.am
@ -11,13 +11,13 @@ libkgroupwarebase_la_SOURCES = folderlister.cpp folderconfig.cpp folderlistview.
 	kcal_cachesettingsdlg.cpp
 libkgroupwarebase_la_LDFLAGS = $(all_libraries) -no-undefined
 libkgroupwarebase_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
-                      $(top_builddir)/libkdepim/libkdepim.la
+                      $(top_builddir)/libtdepim/libtdepim.la
 libkgroupwaredav_la_SOURCES = davcalendaradaptor.cpp davaddressbookadaptor.cpp webdavhandler.cpp \
  davgroupwareglobals.cpp
 libkgroupwaredav_la_LDFLAGS = $(all_libraries) -no-undefined
 libkgroupwaredav_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
-                      $(top_builddir)/libkdepim/libkdepim.la libkgroupwarebase.la
+                      $(top_builddir)/libtdepim/libtdepim.la libkgroupwarebase.la
 METASOURCES = AUTO
--- a/kresources/lib/addressbookadaptor.cpp
+++ b/kresources/lib/addressbookadaptor.cpp
@ -25,7 +25,7 @@
 #include <kabc/addressee.h>
 #include <kabc/vcardconverter.h>
-#include <libkdepim/kabcresourcecached.h>
+#include <libtdepim/kabcresourcecached.h>
 #include <kio/job.h>
--- a/kresources/lib/groupwaredownloadjob.cpp
+++ b/kresources/lib/groupwaredownloadjob.cpp
@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <kio/job.h>
 #include <libemailfunctions/idmapper.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 using namespace KPIM;
--- a/kresources/lib/groupwareuploadjob.cpp
+++ b/kresources/lib/groupwareuploadjob.cpp
@ -27,7 +27,7 @@
 #include "groupwaredataadaptor.h"
 #include <libemailfunctions/idmapper.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <kdebug.h>
 #include <kurl.h>
--- a/kresources/lib/kresources_groupwareprefs.kcfgc
+++ b/kresources/lib/kresources_groupwareprefs.kcfgc
@ -1,7 +1,7 @@
 ClassName=GroupwarePrefsBase
 File=kresources_groupwareprefs.kcfg
 GlobalEnums=false
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 Inherits=KResourcePrefs
 Mutators=true
 NameSpace=KPIM
--- a/kresources/newexchange/CMakeLists.txt
+++ b/kresources/newexchange/CMakeLists.txt
@ -14,7 +14,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}/../lib
  ${CMAKE_CURRENT_SOURCE_DIR}/../lib
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/newexchange/Makefile.am
+++ b/kresources/newexchange/Makefile.am
@ -11,7 +11,7 @@ libkcal_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkcal_newexchange_la_LIBADD = \
  libknewexchange.la ../lib/libkgroupwaredav.la \
-  $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la \
+  $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \
  -lkabc
 libkabc_newexchange_la_SOURCES = kabc_resourceexchange.cpp exchangeaddressbookadaptor.cpp
@ -19,7 +19,7 @@ libkabc_newexchange_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkabc_newexchange_la_LIBADD = \
  libknewexchange.la ../lib/libkgroupwaredav.la \
-  $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la \
+  $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la \
  -lkabc
 kde_module_LTLIBRARIES = kcal_newexchange.la kabc_newexchange.la
--- a/kresources/remote/CMakeLists.txt
+++ b/kresources/remote/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}
 )
--- a/kresources/remote/Makefile.am
+++ b/kresources/remote/Makefile.am
@ -4,7 +4,7 @@ lib_LTLIBRARIES   = libkcal_resourceremote.la
 libkcal_resourceremote_la_LDFLAGS = $(all_libraries) -no-undefined \
                                    -version-info 1:0:0
 libkcal_resourceremote_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
-                                    $(top_builddir)/libkdepim/libkdepim.la
+                                    $(top_builddir)/libtdepim/libtdepim.la
 libkcal_resourceremote_la_SOURCES = resourceremote.cpp resourceremoteconfig.cpp
 kde_module_LTLIBRARIES = kcal_remote.la
@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kcal_remote.la
 kcal_remote_la_SOURCES = resourceremote_plugin.cpp
 kcal_remote_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcal_remote_la_LIBADD  = libkcal_resourceremote.la \
-                         $(top_builddir)/libkdepim/libkdepim.la
+                         $(top_builddir)/libtdepim/libtdepim.la
 libkcalincludedir = $(includedir)/libkcal
 libkcalinclude_HEADERS = resourceremoteconfig.h resourceremote.h
--- a/kresources/remote/resourceremote.h
+++ b/kresources/remote/resourceremote.h
@ -30,7 +30,7 @@
 #include <kdirwatch.h>
 #include <kdepimmacros.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <libkcal/incidence.h>
 #include <libkcal/calendarlocal.h>
--- a/kresources/scalix/kabc/CMakeLists.txt
+++ b/kresources/scalix/kabc/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}
 )
--- a/kresources/scalix/kabc/contact.cpp
+++ b/kresources/scalix/kabc/contact.cpp
@ -20,7 +20,7 @@
 #include <tqdom.h>
-#include <libkdepim/distributionlist.h>
+#include <libtdepim/distributionlist.h>
 #include <kstaticdeleter.h>
 #include "contact.h"
--- a/kresources/scalix/kabc/resourcescalix.h
+++ b/kresources/scalix/kabc/resourcescalix.h
@ -34,7 +34,7 @@
 #ifndef KABC_RESOURCESCALIX_H
 #define KABC_RESOURCESCALIX_H
-#include <libkdepim/resourceabc.h>
+#include <libtdepim/resourceabc.h>
 #include <dcopobject.h>
 #include "../shared/resourcescalixbase.h"
 #include "../shared/subresource.h"
--- a/kresources/scalix/kcal/CMakeLists.txt
+++ b/kresources/scalix/kcal/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}
 )
--- a/kresources/scalix/kcal/Makefile.am
+++ b/kresources/scalix/kcal/Makefile.am
@ -1,7 +1,7 @@
 METASOURCES = AUTO
 INCLUDES = -I$(top_srcdir)/kresources/scalix/shared -I$(top_srcdir) \
-        -I$(top_builddir)/libkdepim $(all_includes)
+        -I$(top_builddir)/libtdepim $(all_includes)
 # The scalix wizard links to this library too
 lib_LTLIBRARIES = libkcalscalix.la
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@ -38,7 +38,7 @@
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <libkcal/icalformat.h>
-#include <libkdepim/kincidencechooser.h>
+#include <libtdepim/kincidencechooser.h>
 #include <kabc/locknull.h>
 #include <kmainwindow.h>
 #include <klocale.h>
--- a/kresources/scalix/kioslave/CMakeLists.txt
+++ b/kresources/scalix/kioslave/CMakeLists.txt
@ -11,7 +11,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/scalix/kioslave/Makefile.am
+++ b/kresources/scalix/kioslave/Makefile.am
@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir) -I$(top_builddir)/libkdepim $(all_includes)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir)/libtdepim $(all_includes)
 noinst_HEADERS = scalix.h
@ -10,7 +10,7 @@ kdelnk_DATA = scalix.protocol scalixs.protocol
 kde_module_LTLIBRARIES =  kio_scalix.la
 kio_scalix_la_SOURCES = scalix.cpp
-kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KIO)
+kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
 kio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 messages: rc.cpp
--- a/kresources/scalix/knotes/CMakeLists.txt
+++ b/kresources/scalix/knotes/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/knotes
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/scalix/knotes/Makefile.am
+++ b/kresources/scalix/knotes/Makefile.am
@ -1,7 +1,7 @@
 METASOURCES = AUTO
 INCLUDES = -I$(top_srcdir)/kresources/scalix/shared \
-	-I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libkdepim $(all_includes)
+	-I$(top_srcdir) -I$(top_srcdir)/knotes -I$(top_builddir)/libtdepim $(all_includes)
 # The scalix wizard links to this library too
 lib_LTLIBRARIES = libknotesscalix.la
--- a/kresources/scalix/shared/CMakeLists.txt
+++ b/kresources/scalix/shared/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/../../lib
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/kresources/scalix/shared/Makefile.am
+++ b/kresources/scalix/shared/Makefile.am
@ -9,7 +9,7 @@ libresourcescalixshared_la_SOURCES = \
  subresource.cpp \
 	kmailconnection.skel kmailicalIface.stub
 libresourcescalixshared_la_METASOURCES = AUTO
-libresourcescalixshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libkdepim/libkdepim.la ../../lib/libkgroupwaredav.la
+libresourcescalixshared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la ../../lib/libkgroupwaredav.la
 libresourcescalixshared_la_LDFLAGS = -no-undefined
 kmailicalIface_DCOPIDLNG = true
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@ -34,7 +34,7 @@
 #include <kabc/addressee.h>
 #include <libkcal/journal.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <kdebug.h>
 #include <tqfile.h>
--- a/kresources/slox/CMakeLists.txt
+++ b/kresources/slox/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}
 )
--- a/kresources/slox/Makefile.am
+++ b/kresources/slox/Makefile.am
@ -8,7 +8,7 @@ libkslox_la_SOURCES = sloxaccounts.cpp webdavhandler.cpp \
                      sloxfolderdialog.cpp sloxbase.cpp
 libkslox_la_LDFLAGS = $(all_libraries)
 libkslox_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
-                      $(top_builddir)/libkdepim/libkdepim.la
+                      $(top_builddir)/libtdepim/libtdepim.la
 libkcal_slox_la_SOURCES = kcalresourceslox.cpp kcalresourcesloxconfig.cpp \
                          kcalsloxprefs.kcfgc
--- a/kresources/slox/kabcresourceslox.cpp
+++ b/kresources/slox/kabcresourceslox.cpp
@ -28,8 +28,8 @@
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <kio/davjob.h>
 #include "webdavhandler.h"
--- a/kresources/slox/kabcresourceslox.h
+++ b/kresources/slox/kabcresourceslox.h
@ -23,7 +23,7 @@
 #include "sloxbase.h"
 #include "webdavhandler.h"
-#include <libkdepim/kabcresourcecached.h>
+#include <libtdepim/kabcresourcecached.h>
 #include <kdepimmacros.h>
 #include <kabc/addressee.h>
--- a/kresources/slox/kabcsloxprefs.kcfgc
+++ b/kresources/slox/kabcsloxprefs.kcfgc
@ -5,7 +5,7 @@ NameSpace=KABC
 Singleton=false
 Mutators=true
 Inherits=KResourcePrefs
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 GlobalEnums=true
 #ItemAccessors=true
 #SetUserTexts=true
--- a/kresources/slox/kcalresourceslox.cpp
+++ b/kresources/slox/kcalresourceslox.cpp
@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <libkcal/vcaldrag.h>
 #include <libkcal/vcalformat.h>
--- a/kresources/slox/kcalsloxprefs.kcfgc
+++ b/kresources/slox/kcalsloxprefs.kcfgc
@ -5,7 +5,7 @@ NameSpace=KCal
 Singleton=false
 Mutators=true
 Inherits=KResourcePrefs
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 GlobalEnums=true
 #ItemAccessors=true
 #SetUserTexts=true
--- a/kresources/slox/webdavhandler.cpp
+++ b/kresources/slox/webdavhandler.cpp
@ -34,7 +34,7 @@
 #include <libkcal/incidence.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <kdebug.h>
 #include <kconfig.h>
--- a/kresources/tvanytime/Makefile.am
+++ b/kresources/tvanytime/Makefile.am
@ -8,7 +8,7 @@ libkcal_tvanytime_la_SOURCES = kcal_resourcetvanytime.cpp \
 libkcal_tvanytime_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                               -version-info 1:0:0 -no-undefined
 libkcal_tvanytime_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
-                              $(top_builddir)/libkdepim/libkdepim.la
+                              $(top_builddir)/libtdepim/libtdepim.la
 kde_module_LTLIBRARIES = kcal_tvanytime.la
--- a/kresources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/kresources/tvanytime/kcal_resourcetvanytime.cpp
@ -28,7 +28,7 @@
 #include <libkcal/calendarlocal.h>
 #include <libkcal/confirmsavedialog.h>
-#include <libkdepim/kpimprefs.h>
+#include <libtdepim/kpimprefs.h>
 #include <tqapplication.h>
 #include <tqdom.h>
--- a/kresources/tvanytime/kcal_resourcetvanytime.h
+++ b/kresources/tvanytime/kcal_resourcetvanytime.h
@ -23,7 +23,7 @@
 #include <tqtimer.h>
-#include <libkdepim/progressmanager.h>
+#include <libtdepim/progressmanager.h>
 #include <libkcal/resourcecached.h>
--- a/kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc
+++ b/kresources/tvanytime/kcal_tvanytimeprefsbase.kcfgc
@ -5,7 +5,7 @@ NameSpace=KCal
 Singleton=false
 Mutators=true
 Inherits=KResourcePrefs
-IncludeFiles=libkdepim/kresourceprefs.h
+IncludeFiles=libtdepim/kresourceprefs.h
 GlobalEnums=true
 ItemAccessors=true
 SetUserTexts=true
--- a/ktnef/gui/CMakeLists.txt
+++ b/ktnef/gui/CMakeLists.txt
@ -14,7 +14,7 @@ add_subdirectory( pics )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/ktnef
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/ktnef/lib/CMakeLists.txt
+++ b/ktnef/lib/CMakeLists.txt
@ -12,7 +12,7 @@
 include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/ktnef
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/libemailfunctions/CMakeLists.txt
+++ b/libemailfunctions/CMakeLists.txt
@ -11,7 +11,7 @@
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/libkmime
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/libemailfunctions/Makefile.am
+++ b/libemailfunctions/Makefile.am
@ -14,6 +14,6 @@ emailfunctionsinclude_HEADERS = idmapper.h
 METASOURCES = AUTO
-# No messages target. Those files are part of libkdepim.pot.
+# No messages target. Those files are part of libtdepim.pot.
 include $(top_srcdir)/admin/Doxyfile.am
--- a/libemailfunctions/kasciistringtools.cpp
+++ b/libemailfunctions/kasciistringtools.cpp
@ -1,7 +1,7 @@
 /*  -*- c++ -*-
    kasciistringtools.cpp
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2005 Ingo Kloecker <kloecker@kde.org>
--- a/libemailfunctions/kasciistringtools.h
+++ b/libemailfunctions/kasciistringtools.h
@ -1,7 +1,7 @@
 /*  -*- c++ -*-
    kasciistringtools.h
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2005 Ingo Kloecker <kloecker@kde.org>
--- a/libemailfunctions/networkstatus.cpp
+++ b/libemailfunctions/networkstatus.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
--- a/libemailfunctions/networkstatus.h
+++ b/libemailfunctions/networkstatus.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
--- a/libemailfunctions/tests/testidmapper.cpp
+++ b/libemailfunctions/tests/testidmapper.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkcal/CMakeLists.txt
+++ b/libkcal/CMakeLists.txt
@ -23,7 +23,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/versit
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/ktnef
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/libkdenetwork/gpgmepp/CMakeLists.txt
+++ b/libkdenetwork/gpgmepp/CMakeLists.txt
@ -16,7 +16,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/libkdenetwork
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
  ${GPGME_INCLUDE_DIRS}
--- a/libkdenetwork/qgpgme/CMakeLists.txt
+++ b/libkdenetwork/qgpgme/CMakeLists.txt
@ -13,7 +13,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/libkdenetwork
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/libkdepim/CMakeLists.txt
+++ b/libkdepim/CMakeLists.txt
@ -9,7 +9,7 @@
 #
 #################################################
-project( libkdepim )
+project( libtdepim )
 include( ConfigureChecks.cmake )
@ -26,7 +26,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}
 )
--- a/libkdepim/Makefile.am
+++ b/libkdepim/Makefile.am
@ -2,8 +2,8 @@ SUBDIRS = cfgc interfaces tests icons pics kpartsdesignerplugin about
 INCLUDES = -I$(top_srcdir) $(all_includes)
-lib_LTLIBRARIES   = libkdepim.la
+lib_LTLIBRARIES   = libtdepim.la
-libkdepim_la_SOURCES = \
+libtdepim_la_SOURCES = \
  ktimeedit.cpp \
  alarmclient.cpp \
  kprefsdialog.cpp kpimprefs.cpp \
@ -42,18 +42,18 @@ MailTransportServiceIface_DIR = $(srcdir)/interfaces
 AddressBookServiceIface_DIR = $(srcdir)/interfaces
-libkdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -lkdecore
+libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -lkdecore
-libkdepim_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
+libtdepim_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
                       $(top_builddir)/libemailfunctions/libemailfunctions.la \
                       $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) -lqui
-#               $top_builddir)/libkdepim/resources/libkpimresources.la
+#               $top_builddir)/libtdepim/resources/libkpimresources.la
 include_HEADERS = kdepimmacros.h kpimprefs.h
 AM_CXXFLAGS = -DQT_PLUGIN
 kde_widget_LTLIBRARIES = kdepimwidgets.la
 kdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -lkdecore
-kdepimwidgets_la_LIBADD = $(LIB_KIO) libkdepim.la
+kdepimwidgets_la_LIBADD = $(LIB_KIO) libtdepim.la
 kdepimwidgets_la_SOURCES = kdepimwidgets.cpp 
 kdepimwidgets.cpp: $(srcdir)/kdepim.widgets
@ -66,6 +66,6 @@ kde_kcfg_DATA = pimemoticons.kcfg
 METASOURCES = AUTO
 messages: rc.cpp
-	$(XGETTEXT) ../libkpimidentities/*.cpp ../libemailfunctions/*.cpp *.cpp -o $(podir)/libkdepim.pot
+	$(XGETTEXT) ../libkpimidentities/*.cpp ../libemailfunctions/*.cpp *.cpp -o $(podir)/libtdepim.pot
 include $(top_srcdir)/admin/Doxyfile.am
--- a/libkdepim/about/CMakeLists.txt
+++ b/libkdepim/about/CMakeLists.txt
@ -16,4 +16,4 @@ install( FILES
    box-top-left.png bar-middle-right.png box-bottom-left.png box-top-middle.png
    bar-top-left.png box-bottom-middle.png box-top-right.png bar-top-middle.png
    box-bottom-right.png kde_infopage.css kde_infopage_rtl.css
-  DESTINATION ${DATA_INSTALL_DIR}/libkdepim/about )
+  DESTINATION ${DATA_INSTALL_DIR}/libtdepim/about )
--- a/libkdepim/about/Makefile.am
+++ b/libkdepim/about/Makefile.am
@ -1,5 +1,5 @@
-kdepim_infopage_datadir = $(kde_datadir)/libkdepim/about
+kdepim_infopage_datadir = $(kde_datadir)/libtdepim/about
 kdepim_infopage_data_DATA = \
 	bar-bottom-left.png    bar-top-right.png      bar-bottom-middle.png  bottom-left.png \
 	box-middle-left.png    top-left.png           bar-bottom-right.png   bottom-middle.png \
--- a/libkdepim/addresseediffalgo.cpp
+++ b/libkdepim/addresseediffalgo.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/addresseediffalgo.h
+++ b/libkdepim/addresseediffalgo.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
@ -23,7 +23,7 @@
 #define KPIM_ADDRESSEEDIFFALGO_H
 #include <kabc/addressee.h>
-#include <libkdepim/diffalgo.h>
+#include <libtdepim/diffalgo.h>
 namespace KPIM {
--- a/libkdepim/addresseeemailselection.cpp
+++ b/libkdepim/addresseeemailselection.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/addresseeemailselection.h
+++ b/libkdepim/addresseeemailselection.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/addresseelineedit.cpp
+++ b/libkdepim/addresseelineedit.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Helge Deller <deller@gmx.de>
                  2002 Lubos Lunak <llunak@suse.cz>
                  2001,2003 Carsten Pfeiffer <pfeiffer@kde.org>
--- a/libkdepim/addresseelineedit.h
+++ b/libkdepim/addresseelineedit.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Helge Deller <deller@gmx.de>
                  2002 Lubos Lunak <llunak@suse.cz>
                  2001,2003 Carsten Pfeiffer <pfeiffer@kde.org>
--- a/libkdepim/addresseeselector.cpp
+++ b/libkdepim/addresseeselector.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/addresseeselector.h
+++ b/libkdepim/addresseeselector.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/addresseeview.h
+++ b/libkdepim/addresseeview.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/addressesdialog.cpp
+++ b/libkdepim/addressesdialog.cpp
@ -1,6 +1,6 @@
 /*  -*- mode: C++; c-file-style: "gnu" -*-
 *
- *  This file is part of libkdepim.
+ *  This file is part of libtdepim.
 *
 *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
 *  Copyright (c) 2003 Aaron J. Seigo <aseigo@kde.org>
--- a/libkdepim/addressesdialog.h
+++ b/libkdepim/addressesdialog.h
@ -1,6 +1,6 @@
 /*  -*- mode: C++; c-file-style: "gnu" -*-
 *
- *  This file is part of libkdepim.
+ *  This file is part of libtdepim.
 *
 *  Copyright (c) 2003 Zack Rusin <zack@kde.org>
 *  Copyright (c) 2003 Aaron J. Seigo <aseigo@kde.org>
--- a/libkdepim/calendardiffalgo.cpp
+++ b/libkdepim/calendardiffalgo.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/calendardiffalgo.h
+++ b/libkdepim/calendardiffalgo.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/categoryeditdialog.cpp
+++ b/libkdepim/categoryeditdialog.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@kde.org>
    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
--- a/libkdepim/categoryeditdialog.h
+++ b/libkdepim/categoryeditdialog.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@kde.org>
    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@kde.org>
    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
--- a/libkdepim/categoryselectdialog.h
+++ b/libkdepim/categoryselectdialog.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2000, 2001, 2002 Cornelius Schumacher <schumacher@kde.org>
    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
--- a/libkdepim/cfgc/Makefile.am
+++ b/libkdepim/cfgc/Makefile.am
@ -1,14 +1,14 @@
-AM_CPPFLAGS = -I$(top_builddir)/libkdepim -I$(top_srcdir) $(all_includes)
+AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir) $(all_includes)
 check_PROGRAMS = example
 #autoexample
 example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-example_LDADD = ../libkdepim.la $(LIB_KDECORE)
+example_LDADD = ../libtdepim.la $(LIB_KDECORE)
 example_SOURCES = example.cpp exampleprefs_base.kcfgc
 #autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-#autoexample_LDADD = ../libkdepim.la $(LIB_KDECORE)
+#autoexample_LDADD = ../libtdepim.la $(LIB_KDECORE)
 #autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp
 METASOURCES = AUTO
--- a/libkdepim/cfgc/autoexample.cpp
+++ b/libkdepim/cfgc/autoexample.cpp
@ -22,7 +22,7 @@
 #include "general_base.h"
 #include "myoptions_base.h"
-#include <libkdepim/kprefsdialog.h>
+#include <libtdepim/kprefsdialog.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
--- a/libkdepim/cfgc/example.cfg
+++ b/libkdepim/cfgc/example.cfg
@ -3,7 +3,7 @@
 <cfg>
  <cfgfile name="examplerc"/>
  <class name="ExamplePrefsBase" file="exampleprefs_base" singleton="true">
-    <include file="libkdepim/kpimprefs.h" />
+    <include file="libtdepim/kpimprefs.h" />
  </class>
  <group name="General">
    <entry type="bool">
--- a/libkdepim/cfgc/example.cpp
+++ b/libkdepim/cfgc/example.cpp
@ -30,7 +30,7 @@
 #include <kconfig.h>
 #include <kstandarddirs.h>
-#include <libkdepim/kprefsdialog.h>
+#include <libtdepim/kprefsdialog.h>
 int main( int argc, char **argv )
 {
--- a/libkdepim/cfgc/exampleprefs_base.kcfgc
+++ b/libkdepim/cfgc/exampleprefs_base.kcfgc
@ -4,7 +4,7 @@ ClassName=ExamplePrefsBase
 Singleton=true
 Mutators=true
 Inherits=KPimPrefs
-IncludeFiles=libkdepim/kpimprefs.h
+IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 GlobalEnums=true
 ItemAccessors=true
--- a/libkdepim/clicklineedit.cpp
+++ b/libkdepim/clicklineedit.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Daniel Molkentin <molkentin@kde.org>
    based on code by Cornelius Schumacher <schumacher@kde.org> 
--- a/libkdepim/clicklineedit.h
+++ b/libkdepim/clicklineedit.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Daniel Molkentin <molkentin@kde.org> 
    This library is free software; you can redistribute it and/or
--- a/libkdepim/collectingprocess.cpp
+++ b/libkdepim/collectingprocess.cpp
@ -1,7 +1,7 @@
 /*
    collectingprocess.cpp
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Ingo Kloecker <kloecker@kde.org>
    This library is free software; you can redistribute it and/or
--- a/libkdepim/collectingprocess.h
+++ b/libkdepim/collectingprocess.h
@ -1,7 +1,7 @@
 /*  -*- mode: C++ -*-
    collectingprocess.h
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Ingo Kloecker <kloecker@kde.org>
    This library is free software; you can redistribute it and/or
--- a/libkdepim/designerfields.cpp
+++ b/libkdepim/designerfields.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/designerfields.h
+++ b/libkdepim/designerfields.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/diffalgo.cpp
+++ b/libkdepim/diffalgo.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
@ -19,7 +19,7 @@
    Boston, MA 02110-1301, USA.
 */
-#include <libkdepim/diffalgo.h>
+#include <libtdepim/diffalgo.h>
 using namespace KPIM;
--- a/libkdepim/diffalgo.h
+++ b/libkdepim/diffalgo.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/distributionlist.h
+++ b/libkdepim/distributionlist.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004-2005 David Faure <faure@kde.org>
    This library is free software; you can redistribute it and/or
--- a/libkdepim/embeddedurlpage.cpp
+++ b/libkdepim/embeddedurlpage.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
    Part of loadContents() copied from the kpartsdesignerplugin:
--- a/libkdepim/embeddedurlpage.h
+++ b/libkdepim/embeddedurlpage.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2005 Reinhold Kainhofer <reinhold@kainhofer.com>
--- a/libkdepim/groupwarejob.cpp
+++ b/libkdepim/groupwarejob.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/groupwarejob.h
+++ b/libkdepim/groupwarejob.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/htmldiffalgodisplay.cpp
+++ b/libkdepim/htmldiffalgodisplay.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
@ -21,7 +21,7 @@
 #include <kglobalsettings.h>
-#include <libkdepim/htmldiffalgodisplay.h>
+#include <libtdepim/htmldiffalgodisplay.h>
 using namespace KPIM;
--- a/libkdepim/htmldiffalgodisplay.h
+++ b/libkdepim/htmldiffalgodisplay.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/infoextension.cpp
+++ b/libkdepim/infoextension.cpp
@ -1,5 +1,5 @@
 /*
-  This file is part of libkdepim.
+  This file is part of libtdepim.
  Copyright (C) 2003 Sven Lüppken <sven@kde.org>
--- a/libkdepim/infoextension.h
+++ b/libkdepim/infoextension.h
@ -1,5 +1,5 @@
 /*
-   This file is part of libkdepim.
+   This file is part of libtdepim.
   Copyright (C) 2003 Sven Lüppken <sven@kde.org>
--- a/libkdepim/interfaces/AddressBookServiceIface.h
+++ b/libkdepim/interfaces/AddressBookServiceIface.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/interfaces/MailTransportServiceIface.h
+++ b/libkdepim/interfaces/MailTransportServiceIface.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Daniel Molkentin <molkentin@kde.org>
--- a/libkdepim/kabcresourcecached.cpp
+++ b/libkdepim/kabcresourcecached.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
--- a/libkdepim/kabcresourcecached.h
+++ b/libkdepim/kabcresourcecached.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
    This library is free software; you can redistribute it and/or
--- a/libkdepim/kabcresourcenull.h
+++ b/libkdepim/kabcresourcenull.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kcmdesignerfields.cpp
+++ b/libkdepim/kcmdesignerfields.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kcmdesignerfields.h
+++ b/libkdepim/kcmdesignerfields.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
    Copyright (c) 2004 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kconfigpropagator.cpp
+++ b/libkdepim/kconfigpropagator.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kconfigpropagator.h
+++ b/libkdepim/kconfigpropagator.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kconfigwizard.cpp
+++ b/libkdepim/kconfigwizard.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kconfigwizard.h
+++ b/libkdepim/kconfigwizard.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
    Copyright (c) 2002 David Jarvie <software@astrojar.org.uk>
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
    Copyright (c) 2002 David Jarvie <software@astrojar.org.uk>
--- a/libkdepim/kdatepickerpopup.cpp
+++ b/libkdepim/kdatepickerpopup.cpp
@ -1,5 +1,5 @@
 /*
-  This file is part of libkdepim.
+  This file is part of libtdepim.
  Copyright (c) 2004 Bram Schoenmakers <bramschoenmakers@kde.nl>
--- a/libkdepim/kdatepickerpopup.h
+++ b/libkdepim/kdatepickerpopup.h
@ -1,5 +1,5 @@
 /*
-  This file is part of libkdepim.
+  This file is part of libtdepim.
  Copyright (c) 2004 Bram Schoenmakers <bramschoenmakers@kde.nl>
--- a/libkdepim/kdepim.widgets
+++ b/libkdepim/kdepim.widgets
@ -6,24 +6,24 @@ Init=new KInstance("kdepimwidgets");
 [KPIM::AddresseeLineEdit]
 ToolTip=Addressee Line Edit (KDE-PIM)
 WhatsThis=A line edit which lets you select addressees from the addressbook
-IncludeFile=libkdepim/addresseelineedit.h
+IncludeFile=libtdepim/addresseelineedit.h
 Group=Input (KDE-PIM)
 [KPIM::ClickLineEdit]
 ToolTip=Click Line Edit (KDE-PIM)
 WhatsThis=A line edit that shows grayed-out default text when no text is set.
-IncludeFile=libkdepim/clicklineedit.h
+IncludeFile=libtdepim/clicklineedit.h
 Group=Input (KDE-PIM)
 [KDateEdit]
 ToolTip=Date Edit Combobox (KDE-PIM)
 WhatsThis=A widget to enter a date. It can also be selected from a date picker calendar.
-IncludeFile=libkdepim/kdateedit.h
+IncludeFile=libtdepim/kdateedit.h
 Group=Input (KDE-PIM)
 [KTimeEdit]
 ToolTip=Time Edit Combobox (KDE-PIM)
 WhatsThis=A widget to enter a time. It can also be selected from a drop-down list.
-IncludeFile=libkdepim/ktimeedit.h
+IncludeFile=libtdepim/ktimeedit.h
 ConstructorArgs=(parent, TQTime::currentTime(), name)
 Group=Input (KDE-PIM)
--- a/libkdepim/kdepimmacros.h
+++ b/libkdepim/kdepimmacros.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002-2003 KDE Team
--- a/libkdepim/kdepimprotocols.h
+++ b/libkdepim/kdepimprotocols.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2005 Rafal Rzepecki <divide@users.sourceforge.net>
--- a/libkdepim/kfoldertree.h
+++ b/libkdepim/kfoldertree.h
@ -1,6 +1,6 @@
 /* -*- mode: C++; c-file-style: "gnu" -*-
-   This file is part of libkdepim.
+   This file is part of libtdepim.
   Copyright (C) 2002 Carsten Burghardt <burghardt@kde.org>
   Copyright (C) 2002 Marc Mutz <mutz@kde.org>
--- a/libkdepim/kimportdialog.cpp
+++ b/libkdepim/kimportdialog.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/kimportdialog.h
+++ b/libkdepim/kimportdialog.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/kincidencechooser.cpp
+++ b/libkdepim/kincidencechooser.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
--- a/libkdepim/kincidencechooser.h
+++ b/libkdepim/kincidencechooser.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
--- a/libkdepim/kmailcompletion.cpp
+++ b/libkdepim/kmailcompletion.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2006 Christian Schaarschmidt <schaarsc@gmx.de>
--- a/libkdepim/kmailcompletion.h
+++ b/libkdepim/kmailcompletion.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2006 Christian Schaarschmidt <schaarsc@gmx.de>
--- a/libkdepim/komposer/core/Makefile.am
+++ b/libkdepim/komposer/core/Makefile.am
@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/libkdepim  $(all_includes)
+AM_CPPFLAGS = -I$(top_builddir)/libtdepim  $(all_includes)
 METASOURCES = AUTO
 lib_LTLIBRARIES = libkomposer.la
@ -6,13 +6,13 @@ lib_LTLIBRARIES = libkomposer.la
 libkomposer_la_SOURCES = plugin.cpp editor.cpp core.cpp attachment.cpp corewidget.cpp \
 	settings.kcfgc pluginmanager.cpp komposerIface.skel
 libkomposer_la_LDFLAGS = -no-undefined $(KDE_RPATH) -version-info 1:0:0 $(all_libraries)
-libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libkdepim/libkdepim.la -lkutils
+libkomposer_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la -lkutils
 #kde_module_LTLIBRARIES = kcm_komposer.la
 #kcm_komposer_la_SOURCES = prefsmodule.cpp
 #kcm_komposer_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
-#kcm_komposer_la_LIBADD = libkomposer.la $(top_builddir)/libkdepim/libkdepim.la $(LIB_KDECORE)
+#kcm_komposer_la_LIBADD = libkomposer.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KDECORE)
 kpincludedir = $(includedir)/komposer
 kpinclude_HEADERS = plugin.h editor.h core.h
--- a/libkdepim/komposer/core/tests/Makefile.am
+++ b/libkdepim/komposer/core/tests/Makefile.am
@ -1,4 +1,4 @@
-INCLUDES = -I$(top_builddir)/libkdepim/komposer/core $(all_includes)
+INCLUDES = -I$(top_builddir)/libtdepim/komposer/core $(all_includes)
 check_PROGRAMS = testfactory testmanager testkomposer
--- a/libkdepim/komposer/plugins/default/Makefile.am
+++ b/libkdepim/komposer/plugins/default/Makefile.am
@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/libkdepim/komposer/core $(all_includes)
+AM_CPPFLAGS = -I$(top_builddir)/libtdepim/komposer/core $(all_includes)
 kde_module_LTLIBRARIES = libkomposer_defaulteditor.la
 libkomposer_defaulteditor_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
--- a/libkdepim/kpartsdesignerplugin/CMakeLists.txt
+++ b/libkdepim/kpartsdesignerplugin/CMakeLists.txt
@ -13,7 +13,7 @@ add_definitions( -DQT_PLUGIN )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/libkdepim/kpimprefs.cpp
+++ b/libkdepim/kpimprefs.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kpimprefs.h
+++ b/libkdepim/kpimprefs.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
--- a/libkdepim/kpixmapregionselectordialog.cpp
+++ b/libkdepim/kpixmapregionselectordialog.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (C) 2004 Antonio Larrosa <larrosa@kde.org
--- a/libkdepim/kpixmapregionselectordialog.h
+++ b/libkdepim/kpixmapregionselectordialog.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (C) 2004 Antonio Larrosa <larrosa@kde.org
@ -23,7 +23,7 @@
 #define __KPIXMAPREGIONSELECTORDIALOG_H__
 #include <kdialogbase.h>
-#include <libkdepim/kpixmapregionselectorwidget.h>
+#include <libtdepim/kpixmapregionselectorwidget.h>
 #include <tqimage.h>
 #include <kdepimmacros.h>
--- a/libkdepim/kpixmapregionselectorwidget.cpp
+++ b/libkdepim/kpixmapregionselectorwidget.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (C) 2004 Antonio Larrosa <larrosa@kde.org
@ -20,7 +20,7 @@
 */
 /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libkdepim
+ * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim
 * This is because kdepim has to remain backwards compatible.  Any changes
 * to either file should be made to the other.
 */
--- a/libkdepim/kpixmapregionselectorwidget.h
+++ b/libkdepim/kpixmapregionselectorwidget.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (C) 2004 Antonio Larrosa <larrosa@kde.org
@ -37,7 +37,7 @@ namespace KPIM {
 * user with a friendly way to select a rectangular subregion of the pixmap.
 *
 * NOTE: There are two copies of this .h and the .cpp file, with subtle differences.
- * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libkdepim
+ * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim
 * This is because kdepim has to remain backwards compatible.  Any changes
 * to either file should be made to the other.
 *
--- a/libkdepim/kprefsdialog.cpp
+++ b/libkdepim/kprefsdialog.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2001,2003 Cornelius Schumacher <schumacher@kde.org>
    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
--- a/libkdepim/kprefsdialog.h
+++ b/libkdepim/kprefsdialog.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2001-2003 Cornelius Schumacher <schumacher@kde.org>
    Copyright (C) 2003-2004 Reinhold Kainhofer <reinhold@kainhofer.com>
--- a/libkdepim/kresourceprefs.cpp
+++ b/libkdepim/kresourceprefs.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/kresourceprefs.h
+++ b/libkdepim/kresourceprefs.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/ksubscription.h
+++ b/libkdepim/ksubscription.h
@ -1,5 +1,5 @@
 /*
-   This file is part of libkdepim.
+   This file is part of libtdepim.
   Copyright (C) 2002 Carsten Burghardt <burghardt@kde.org>
--- a/libkdepim/ktimeedit.cpp
+++ b/libkdepim/ktimeedit.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 1999 Preston Brown <pbrown@kde.org>
    Copyright (c) 1999 Ian Dawes <iadawes@globalserve.net>
--- a/libkdepim/ktimeedit.h
+++ b/libkdepim/ktimeedit.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 1999 Preston Brown <pbrown@kde.org>
    Copyright (c) 1999 Ian Dawes <iadawes@globalserve.net>
--- a/libkdepim/kvcarddrag.cpp
+++ b/libkdepim/kvcarddrag.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/kvcarddrag.h
+++ b/libkdepim/kvcarddrag.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/kxface.cpp
+++ b/libkdepim/kxface.cpp
@ -1,5 +1,5 @@
 /*
-  This file is part of libkdepim.
+  This file is part of libtdepim.
  Original compface:
  Copyright (c) James Ashton - Sydney University - June 1990.
--- a/libkdepim/kxface.h
+++ b/libkdepim/kxface.h
@ -1,5 +1,5 @@
 /*
-  This file is part of libkdepim.
+  This file is part of libtdepim.
  Original compface:
  Copyright (c) James Ashton - Sydney University - June 1990.
--- a/libkdepim/maillistdrag.cpp
+++ b/libkdepim/maillistdrag.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Don Sanders <sanders@kde.org>
    Copyright (c) 2005 George Staikos <staikos@kde.org>
--- a/libkdepim/maillistdrag.h
+++ b/libkdepim/maillistdrag.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Don Sanders <sanders@kde.org>
    Copyright (c) 2005 George Staikos <staikos@kde.org.
--- a/libkdepim/pluginloader.h
+++ b/libkdepim/pluginloader.h
@ -1,5 +1,5 @@
 /*  -*- c++ -*-
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org>
--- a/libkdepim/pluginloaderbase.cpp
+++ b/libkdepim/pluginloaderbase.cpp
@ -1,5 +1,5 @@
 /*  -*- c++ -*-
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org>
--- a/libkdepim/pluginloaderbase.h
+++ b/libkdepim/pluginloaderbase.h
@ -1,5 +1,5 @@
 /*  -*- c++ -*-
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2002,2004 Marc Mutz <mutz@kde.org>
--- a/libkdepim/resourceabc.cpp
+++ b/libkdepim/resourceabc.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk>
--- a/libkdepim/resourceabc.h
+++ b/libkdepim/resourceabc.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Bo Thorsen <bo@sonofthor.dk>
--- a/libkdepim/sendsmsdialog.cpp
+++ b/libkdepim/sendsmsdialog.cpp
@ -1,5 +1,5 @@
 /*
-   This file is part of libkdepim.
+   This file is part of libtdepim.
   Copyright (C) 2005 Con Hennessy <cp.hennessy@iname.com>
                      Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/sendsmsdialog.h
+++ b/libkdepim/sendsmsdialog.h
@ -1,5 +1,5 @@
 /*
-   This file is part of libkdepim.
+   This file is part of libtdepim.
   Copyright (C) 2005 Con Hennessy <cp.hennessy@iname.com>
                      Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/sidebarextension.cpp
+++ b/libkdepim/sidebarextension.cpp
@ -1,5 +1,5 @@
 /*
-   This file is part of libkdepim.
+   This file is part of libtdepim.
   Copyright (C) 2003 Daniel Molkentin <molkentin@kde.org>
--- a/libkdepim/sidebarextension.h
+++ b/libkdepim/sidebarextension.h
@ -1,5 +1,5 @@
 /*
-   This file is part of libkdepim.
+   This file is part of libtdepim.
   Copyright (C) 2003 Daniel Molkentin <molkentin@kde.org>
--- a/libkdepim/tests/Makefile.am
+++ b/libkdepim/tests/Makefile.am
@ -1,6 +1,6 @@
-AM_CPPFLAGS = -I$(top_builddir)/libkdepim -I$(top_srcdir)/libkdepim -I$(top_srcdir)/libemailfunctions $(all_includes)
+AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes)
 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-LDADD = ../libkdepim.la $(LIB_KDECORE)
+LDADD = ../libtdepim.la $(LIB_KDECORE)
 check_PROGRAMS = testwizard testaddresseelineedit \
                 testaddresseeselector \
@ -30,6 +30,6 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp
 METASOURCES = AUTO
 #example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
-#example_LDADD = ../libkdepim.la $(LIB_KDECORE)
+#example_LDADD = ../libtdepim.la $(LIB_KDECORE)
 #example_SOURCES = example.cpp exampleprefs_base.kcfgc
--- a/libkdepim/tests/myconfig.kcfgc
+++ b/libkdepim/tests/myconfig.kcfgc
@ -4,7 +4,7 @@ ClassName=MyConfig
 Singleton=true
 Mutators=true
 #Inherits=KPimPrefs
-#IncludeFiles=libkdepim/kpimprefs.h
+#IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 GlobalEnums=true
 ItemAccessors=true
--- a/libkdepim/tests/testaddresseelineedit.cpp
+++ b/libkdepim/tests/testaddresseelineedit.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Daniel Molkentin <danimo@klaralvdalens-datakonsult.se>
--- a/libkdepim/tests/testaddresseeselector.cpp
+++ b/libkdepim/tests/testaddresseeselector.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Daniel Molkentin <danimo@klaralvdalens-datakonsult.se>
--- a/libkdepim/tests/testdateedit.cpp
+++ b/libkdepim/tests/testdateedit.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/tests/testdateedit.h
+++ b/libkdepim/tests/testdateedit.h
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
--- a/libkdepim/tests/testlinklocator.cpp
+++ b/libkdepim/tests/testlinklocator.cpp
@ -16,7 +16,7 @@
   Boston, MA 02110-1301, USA.
 */
-// Test program for libkdepim/linklocator.*
+// Test program for libtdepim/linklocator.*
 #include <linklocator.h>
 #include <kcmdlineargs.h>
--- a/libkdepim/tests/testwizard.cpp
+++ b/libkdepim/tests/testwizard.cpp
@ -1,5 +1,5 @@
 /*
-    This file is part of libkdepim.
+    This file is part of libtdepim.
    Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
--- a/libkholidays/CMakeLists.txt
+++ b/libkholidays/CMakeLists.txt
@ -16,7 +16,7 @@ add_subdirectory( holidays )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/libkmime/CMakeLists.txt
+++ b/libkmime/CMakeLists.txt
@ -17,7 +17,7 @@ include( ConfigureChecks.cmake )
 include_directories(
  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/libkpgp/CMakeLists.txt
+++ b/libkpgp/CMakeLists.txt
@ -16,7 +16,7 @@ add_subdirectory( pics )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/libkpimexchange/core/CMakeLists.txt
+++ b/libkpimexchange/core/CMakeLists.txt
@ -16,7 +16,7 @@ tde_import( libkcal )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/libkpimexchange/core/Makefile.am
+++ b/libkpimexchange/core/Makefile.am
@ -9,7 +9,7 @@ INCLUDES = -I$(top_srcdir)/korganizer/interfaces -I$(top_srcdir) \
    -I$(top_builddir)/libkcal/libical/src/libical -I$(top_builddir)/libkcal/libical/src/libicalss \
    $(all_includes)
-#     -I$(top_builddir)/libkdepim/resources -I$(top_builddir)/libkdepim/resources/calendar
+#     -I$(top_builddir)/libtdepim/resources -I$(top_builddir)/libtdepim/resources/calendar
 noinst_LTLIBRARIES = libkpimexchangecore.la
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@ -27,8 +27,8 @@
 // These for test() method
 #include <kio/http.h>
 #include <kio/davjob.h>
-// #include "libkdepim/resources/resourcemanager.h"
+// #include "libtdepim/resources/resourcemanager.h"
-// #include "libkdepim/resources/calendar/resourcecalendar.h"
+// #include "libtdepim/resources/calendar/resourcecalendar.h"
 #include "exchangeclient.h"
--- a/libkpimidentities/CMakeLists.txt
+++ b/libkpimidentities/CMakeLists.txt
@ -16,13 +16,13 @@ tde_import( libkmime )
 tde_import( libkcal )
 tde_import( libkdenetwork )
 tde_import( certmanager )
-tde_import( libkdepim )
+tde_import( libtdepim )
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/certmanager/lib
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
--- a/libkpimidentities/Makefile.am
+++ b/libkpimidentities/Makefile.am
@ -5,7 +5,7 @@ libkpimidentities_la_SOURCES = \
    identitymanager.cpp identity.cpp identitymanager.skel \
    identitycombo.cpp
 libkpimidentities_la_LIBADD = ../certmanager/lib/libkleopatra.la \
-    ../libkdepim/libkdepim.la ../libemailfunctions/libemailfunctions.la
+    ../libtdepim/libtdepim.la ../libemailfunctions/libemailfunctions.la
 libkpimidentities_la_LDFLAGS = $(all_libraries) -no-undefined \
    -version-info 1:0:0
@ -15,4 +15,4 @@ METASOURCES = AUTO
 include $(top_srcdir)/admin/Doxyfile.am
-# No messages target. Those files are part of libkdepim.pot.
+# No messages target. Those files are part of libtdepim.pot.
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@ -8,8 +8,8 @@
 #include "identity.h"
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
-#include <libkdepim/collectingprocess.h>
+#include <libtdepim/collectingprocess.h>
 #include <kdebug.h>
 #include <klocale.h>
--- a/libkpimidentities/identitymanager.h
+++ b/libkpimidentities/identitymanager.h
@ -31,7 +31,7 @@
 #ifndef _KPIM_IDENTITYMANAGER_H_
 #define _KPIM_IDENTITYMANAGER_H_
-#include <libkdepim/configmanager.h>
+#include <libtdepim/configmanager.h>
 #include <tqvaluelist.h>
 #include <dcopobject.h>
--- a/libksieve/parser/CMakeLists.txt
+++ b/libksieve/parser/CMakeLists.txt
@ -12,7 +12,7 @@
 include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/libksieve
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/libksieve/shared/CMakeLists.txt
+++ b/libksieve/shared/CMakeLists.txt
@ -12,7 +12,7 @@
 include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}/libksieve
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${TDE_INCLUDE_DIR}
  ${TQT_INCLUDE_DIRS}
 )
--- a/mimelib/CMakeLists.txt
+++ b/mimelib/CMakeLists.txt
@ -43,7 +43,7 @@ tde_add_library( mimelib SHARED
    dwstring.cpp text.cpp token.cpp uuencode.cpp
    binhex.cpp
  VERSION 1.0.1
-  LINK ${TQT_LIBRARIES} ${TDE_LIB_DIR}/libkdefakes_pic.a
+  LINK ${TQT_LIBRARIES} ${TDE_LIB_DIR}/libtdefakes_pic.a
  DESTINATION ${LIB_INSTALL_DIR}
 )
--- a/plugins/kmail/bodypartformatter/CMakeLists.txt
+++ b/plugins/kmail/bodypartformatter/CMakeLists.txt
@ -14,7 +14,7 @@
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( libksieve )
 tde_import( mimelib )
@ -28,7 +28,7 @@ include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/mimelib
  ${CMAKE_SOURCE_DIR}/libkmime
  ${CMAKE_SOURCE_DIR}/libemailfunctions
--- a/plugins/kmail/bodypartformatter/Makefile.am
+++ b/plugins/kmail/bodypartformatter/Makefile.am
@ -2,12 +2,12 @@ KDE_OPTIONS = nofinal
 KDE_CXXFLAGS = $(USE_RTTI)
 INCLUDES = -I$(top_srcdir)/kmail \
-           -I$(top_srcdir)/libkdepim \
+           -I$(top_srcdir)/libtdepim \
           -I$(top_srcdir)/libkmime \
           -I$(top_srcdir)/mimelib \
           -I$(top_srcdir)/libemailfunctions \
           -I$(top_srcdir) \
-           -I$(top_builddir)/libkdepim \
+           -I$(top_builddir)/libtdepim \
           -I$(top_srcdir)/korganizer \
           $(all_includes)
@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = libkmail_bodypartformatter_text_vcard.la \
 libkmail_bodypartformatter_text_vcard_la_SOURCES = text_vcard.cpp
 libkmail_bodypartformatter_text_vcard_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
 libkmail_bodypartformatter_text_vcard_la_LIBADD  = $(LIB_QT) $(LIB_KABC) \
-                                                   ../../../libkdepim/libkdepim.la \
+                                                   ../../../libtdepim/libtdepim.la \
                                                   ../../../libkmime/libkmime.la \
                                                   ../../../libemailfunctions/libemailfunctions.la
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@ -20,7 +20,7 @@
 #include "attendeeselector.h"
 #include "ui_attendeeselector.h"
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
 #include <libemailfunctions/email.h>
 #include <klocale.h>
--- a/plugins/kmail/bodypartformatter/delegateselector.cpp
+++ b/plugins/kmail/bodypartformatter/delegateselector.cpp
@ -19,7 +19,7 @@
 #include "delegateselector.h"
-#include <libkdepim/addresseelineedit.h>
+#include <libtdepim/addresseelineedit.h>
 #include <klocale.h>
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@ -38,7 +38,7 @@
 #include <interfaces/bodyparturlhandler.h>
 #include <khtmlparthtmlwriter.h>
-#include <libkdepim/kfileio.h>
+#include <libtdepim/kfileio.h>
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendarresources.h>
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@ -44,8 +44,8 @@
 #include <kio/netaccess.h>
-#include <libkdepim/addresseeview.h>
+#include <libtdepim/addresseeview.h>
-#include <libkdepim/kaddrbook.h>
+#include <libtdepim/kaddrbook.h>
 #include "interfaces/bodypartformatter.h"
 #include "interfaces/bodypart.h"
--- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
+++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
@ -75,7 +75,7 @@
    </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">libkdepim/addresseelineedit.h</include>
+    <include location="global" impldecl="in declaration">libtdepim/addresseelineedit.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="0"/>
 <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
@ -83,6 +83,6 @@
    <includehint>kpushbutton.h</includehint>
    <includehint>kpushbutton.h</includehint>
    <includehint>klistbox.h</includehint>
-    <includehint>libkdepim/addresseelineedit.h</includehint>
+    <includehint>libtdepim/addresseelineedit.h</includehint>
 </includehints>
 </UI>
--- a/wizards/CMakeLists.txt
+++ b/wizards/CMakeLists.txt
@ -20,7 +20,7 @@
 tde_import( libkmime )
 tde_import( ktnef )
 tde_import( libkcal )
-tde_import( libkdepim )
+tde_import( libtdepim )
 tde_import( knotes )
 tde_import( kresources )
@ -35,7 +35,7 @@ include_directories(
  ${CMAKE_BINARY_DIR}
  ${CMAKE_SOURCE_DIR}
  ${CMAKE_SOURCE_DIR}/libkpimidentities
-  ${CMAKE_SOURCE_DIR}/libkdepim
+  ${CMAKE_SOURCE_DIR}/libtdepim
  ${CMAKE_SOURCE_DIR}/certmanager/lib
  ${CMAKE_SOURCE_DIR}/knotes
  ${CMAKE_SOURCE_DIR}/kresources/lib
--- a/wizards/Makefile.am
+++ b/wizards/Makefile.am
@ -32,7 +32,7 @@ libkolabwizard_la_LIBADD = $(top_builddir)/kresources/kolab/kcal/libkcalkolab.la
                           $(top_builddir)/kresources/kolab/kabc/libkabckolab.la \
                           $(top_builddir)/kresources/kolab/knotes/libknoteskolab.la \
                           $(top_builddir)/libkcal/libkcal.la \
-                           $(top_builddir)/libkdepim/libkdepim.la \
+                           $(top_builddir)/libtdepim/libtdepim.la \
                           $(top_builddir)/libkpimidentities/libkpimidentities.la
 libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \
@ -49,7 +49,7 @@ libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xm
                                $(top_builddir)/kresources/egroupware/libkcal_xmlrpc.la \
                                $(top_builddir)/kresources/egroupware/libknotes_xmlrpc.la \
                                $(top_builddir)/libkcal/libkcal.la \
-                                $(top_builddir)/libkdepim/libkdepim.la \
+                                $(top_builddir)/libtdepim/libtdepim.la \
                                $(LIB_KDEUI)
 egroupwarewizard_LDADD = libegroupwarewizard.la
@ -61,7 +61,7 @@ libsloxwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libsloxwizard_la_SOURCES = sloxwizard.cpp sloxconfig.kcfgc
 libsloxwizard_la_LIBADD = $(top_builddir)/kresources/slox/libkcal_slox.la \
                          $(top_builddir)/kresources/slox/libkabc_slox.la \
-                          $(top_builddir)/libkdepim/libkdepim.la
+                          $(top_builddir)/libtdepim/libtdepim.la
 sloxwizard_LDADD = libsloxwizard.la
 sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
@ -73,7 +73,7 @@ libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \
  kmailchanges.cpp
 libgroupwisewizard_la_LIBADD = $(top_builddir)/kresources/groupwise/libkcal_groupwise.la \
                          $(top_builddir)/kresources/groupwise/libkabc_groupwise.la \
-                          $(top_builddir)/libkdepim/libkdepim.la \
+                          $(top_builddir)/libtdepim/libtdepim.la \
                          $(top_builddir)/libkpimidentities/libkpimidentities.la
 libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_groupwiseprefs.h \
                                      $(top_builddir)/kresources/groupwise/kcal_groupwiseprefsbase.h
@ -88,7 +88,7 @@ libexchangewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libexchangewizard_la_SOURCES = exchangewizard.cpp
 libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_newexchange.la \
                              $(top_builddir)/kresources/newexchange/libkabc_newexchange.la \
-                              $(top_builddir)/libkdepim/libkdepim.la
+                              $(top_builddir)/libtdepim/libtdepim.la
 exchangewizard_LDADD = libexchangewizard.la
 exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
@ -99,7 +99,7 @@ libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix.la \
                           $(top_builddir)/kresources/scalix/kabc/libkabcscalix.la \
                           $(top_builddir)/libkcal/libkcal.la \
-                           $(top_builddir)/libkdepim/libkdepim.la \
+                           $(top_builddir)/libtdepim/libtdepim.la \
                           $(top_builddir)/libkpimidentities/libkpimidentities.la
 libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfgc \
--- a/wizards/egroupwareconfig.kcfgc
+++ b/wizards/egroupwareconfig.kcfgc
@ -4,7 +4,7 @@ ClassName=EGroupwareConfig
 Singleton=true
 Mutators=true
 #Inherits=KPimPrefs
-#IncludeFiles=libkdepim/kpimprefs.h
+#IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 GlobalEnums=true
 ItemAccessors=true
--- a/wizards/egroupwaremain.cpp
+++ b/wizards/egroupwaremain.cpp
@ -44,7 +44,7 @@ int main(int argc,char **argv)
  KApplication app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
--- a/wizards/exchangemain.cpp
+++ b/wizards/exchangemain.cpp
@ -44,7 +44,7 @@ int main(int argc,char **argv)
  KApplication app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
--- a/wizards/groupwiseconfig.kcfgc
+++ b/wizards/groupwiseconfig.kcfgc
@ -4,7 +4,7 @@ ClassName=GroupwiseConfig
 Singleton=true
 Mutators=true
 #Inherits=KPimPrefs
-#IncludeFiles=libkdepim/kpimprefs.h
+#IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 GlobalEnums=true
 ItemAccessors=true
--- a/wizards/groupwisemain.cpp
+++ b/wizards/groupwisemain.cpp
@ -45,7 +45,7 @@ int main(int argc,char **argv)
  KApplication app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
--- a/wizards/kolabconfig.kcfgc
+++ b/wizards/kolabconfig.kcfgc
@ -4,7 +4,7 @@ ClassName=KolabConfig
 Singleton=true
 Mutators=true
 #Inherits=KPimPrefs
-#IncludeFiles=libkdepim/kpimprefs.h
+#IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 GlobalEnums=true
 ItemAccessors=true
--- a/wizards/kolabmain.cpp
+++ b/wizards/kolabmain.cpp
@ -44,7 +44,7 @@ int main(int argc,char **argv)
  KApplication app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
--- a/wizards/main.cpp
+++ b/wizards/main.cpp
@ -23,7 +23,7 @@ int main( int argc, char **argv )
  KApplication app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
--- a/wizards/scalixmain.cpp
+++ b/wizards/scalixmain.cpp
@ -44,7 +44,7 @@ int main(int argc,char **argv)
  KApplication app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
--- a/wizards/sloxconfig.kcfgc
+++ b/wizards/sloxconfig.kcfgc
@ -4,7 +4,7 @@ ClassName=SloxConfig
 Singleton=true
 Mutators=true
 #Inherits=KPimPrefs
-#IncludeFiles=libkdepim/kpimprefs.h
+#IncludeFiles=libtdepim/kpimprefs.h
 MemberVariables=public
 GlobalEnums=true
 ItemAccessors=true
--- a/wizards/sloxmain.cpp
+++ b/wizards/sloxmain.cpp
@ -44,7 +44,7 @@ int main(int argc,char **argv)
  KApplication app;
-  KGlobal::locale()->insertCatalogue( "libkdepim" );
+  KGlobal::locale()->insertCatalogue( "libtdepim" );
  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
`@ -1,3 +1,3 @@`

	`all_includes="-I\$(top_srcdir)/libkdepim $all_includes"`	`all_includes="-I\$(top_srcdir)/libtdepim $all_includes"`
`@ -1,4 +1,4 @@`
	`INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/libkdepim $(all_includes)`	`INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/libtdepim $(all_includes)`

	`lib_LTLIBRARIES = libschema.la`	`lib_LTLIBRARIES = libschema.la`
`@ -1,4 +1,4 @@`
	`INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libkdepim $(all_includes)`	`INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)`

	`bin_PROGRAMS = kxml_compiler`	`bin_PROGRAMS = kxml_compiler`
`@ -1,4 +1,4 @@`
	`INCLUDES = -I$(top_builddir)/libkdepim/komposer/core $(all_includes)`	`INCLUDES = -I$(top_builddir)/libtdepim/komposer/core $(all_includes)`

	`check_PROGRAMS = testfactory testmanager testkomposer`	`check_PROGRAMS = testfactory testmanager testkomposer`