Rename kde libraries to tde

109 files changed, 131 insertions, 131 deletions

diff --git a/libkdepim/CMakeLists.txt b/libkdepim/CMakeLists.txt
index b27f6a199..e5acc9dc9 100644
--- 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}
 )
diff --git a/libkdepim/Makefile.am b/libkdepim/Makefile.am
index f2a4f11c8..772cf2ab1 100644
--- 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
-libkdepim_la_SOURCES = \
+lib_LTLIBRARIES   = libtdepim.la
+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
-libkdepim_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
+libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -lkdecore
+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
diff --git a/libkdepim/about/CMakeLists.txt b/libkdepim/about/CMakeLists.txt
index 8fa99df96..97a53d764 100644
--- 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 )
diff --git a/libkdepim/about/Makefile.am b/libkdepim/about/Makefile.am
index 5e614d710..a141dfbe4 100644
--- 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 \
diff --git a/libkdepim/addresseediffalgo.cpp b/libkdepim/addresseediffalgo.cpp
index 361ec631f..d36b7ac94 100644
--- 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>
 
diff --git a/libkdepim/addresseediffalgo.h b/libkdepim/addresseediffalgo.h
index dbfac9a55..f3c6632a7 100644
--- 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 {
 
diff --git a/libkdepim/addresseeemailselection.cpp b/libkdepim/addresseeemailselection.cpp
index d0862fa27..dde8f7dd4 100644
--- 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>
 
diff --git a/libkdepim/addresseeemailselection.h b/libkdepim/addresseeemailselection.h
index 58acd8cb3..4ecb946e3 100644
--- 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>
 
diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp
index 2a4613763..50d19e07b 100644
--- 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>
diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h
index 4cc893e4c..c4b92ad30 100644
--- 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>
diff --git a/libkdepim/addresseeselector.cpp b/libkdepim/addresseeselector.cpp
index 3b81327fa..792d57625 100644
--- 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>
 
diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h
index 00949d74a..cabf0cf71 100644
--- 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>
 
diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index 786beb1ca..4d297ebbf 100644
--- 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>
 
diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h
index 022d1efef..f415358f5 100644
--- 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>
 
diff --git a/libkdepim/addressesdialog.cpp b/libkdepim/addressesdialog.cpp
index 8efadd400..27f601833 100644
--- 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>
diff --git a/libkdepim/addressesdialog.h b/libkdepim/addressesdialog.h
index 5b5f604dc..cdb1eaf94 100644
--- 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>
diff --git a/libkdepim/calendardiffalgo.cpp b/libkdepim/calendardiffalgo.cpp
index a0ddfb19b..587d0dc0c 100644
--- 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>
 
diff --git a/libkdepim/calendardiffalgo.h b/libkdepim/calendardiffalgo.h
index 47e5efd4c..9ccd6c8c0 100644
--- 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>
 
diff --git a/libkdepim/categoryeditdialog.cpp b/libkdepim/categoryeditdialog.cpp
index 4b25faab6..72e1de8ae 100644
--- 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>
diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h
index d4d4e3d47..a9d15c5fd 100644
--- 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>
diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 4eb072b12..36996614e 100644
--- 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>
diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h
index b9d880665..a530c7012 100644
--- 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>
diff --git a/libkdepim/cfgc/Makefile.am b/libkdepim/cfgc/Makefile.am
index a9643ffb3..d6e77392f 100644
--- 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
diff --git a/libkdepim/cfgc/autoexample.cpp b/libkdepim/cfgc/autoexample.cpp
index 69d1e739e..45617e6f6 100644
--- 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>
diff --git a/libkdepim/cfgc/example.cfg b/libkdepim/cfgc/example.cfg
index 1cc4feff3..18c7b8b15 100644
--- 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">
diff --git a/libkdepim/cfgc/example.cpp b/libkdepim/cfgc/example.cpp
index f2838f2cb..4f818e900 100644
--- 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 )
 {
diff --git a/libkdepim/cfgc/exampleprefs_base.kcfgc b/libkdepim/cfgc/exampleprefs_base.kcfgc
index 9ee413c76..36e5ed4e6 100644
--- 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
diff --git a/libkdepim/clicklineedit.cpp b/libkdepim/clicklineedit.cpp
index 98748e44a..28e66a0ba 100644
--- 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> 
 
diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h
index a0df8410d..3b9ffca45 100644
--- 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
diff --git a/libkdepim/collectingprocess.cpp b/libkdepim/collectingprocess.cpp
index 2bd0be8f6..58cdcb5ee 100644
--- 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
diff --git a/libkdepim/collectingprocess.h b/libkdepim/collectingprocess.h
index 1f27bd9ac..5c5036633 100644
--- 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
diff --git a/libkdepim/designerfields.cpp b/libkdepim/designerfields.cpp
index 100b00a25..1a07655f7 100644
--- 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>
diff --git a/libkdepim/designerfields.h b/libkdepim/designerfields.h
index cc72647fb..57e2203a9 100644
--- 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>
diff --git a/libkdepim/diffalgo.cpp b/libkdepim/diffalgo.cpp
index 21c476861..b2cfc40eb 100644
--- 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;
 
diff --git a/libkdepim/diffalgo.h b/libkdepim/diffalgo.h
index 927ba14f3..eaa9459db 100644
--- 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>
 
diff --git a/libkdepim/distributionlist.h b/libkdepim/distributionlist.h
index 0faaeeec6..99391fca3 100644
--- 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
diff --git a/libkdepim/embeddedurlpage.cpp b/libkdepim/embeddedurlpage.cpp
index c840e3a04..3971bf367 100644
--- 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:
diff --git a/libkdepim/embeddedurlpage.h b/libkdepim/embeddedurlpage.h
index dcae4fb59..e3eb6d00b 100644
--- 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>
 
diff --git a/libkdepim/groupwarejob.cpp b/libkdepim/groupwarejob.cpp
index 595c7a6a3..bd413e12b 100644
--- 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>
 
diff --git a/libkdepim/groupwarejob.h b/libkdepim/groupwarejob.h
index 8b9cc4124..bf5a33f6e 100644
--- 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>
 
diff --git a/libkdepim/htmldiffalgodisplay.cpp b/libkdepim/htmldiffalgodisplay.cpp
index 41fe99a3f..726854e4e 100644
--- 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;
 
diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h
index 4495e2003..dafb013df 100644
--- 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>
 
diff --git a/libkdepim/infoextension.cpp b/libkdepim/infoextension.cpp
index 55cb35683..25f7e8ba7 100644
--- 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>
 
diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h
index 392178f5a..0f2c4889a 100644
--- 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>
 
diff --git a/libkdepim/interfaces/AddressBookServiceIface.h b/libkdepim/interfaces/AddressBookServiceIface.h
index bff304322..ff0deb1d3 100644
--- 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>
 
diff --git a/libkdepim/interfaces/MailTransportServiceIface.h b/libkdepim/interfaces/MailTransportServiceIface.h
index 99228d25a..3b594979d 100644
--- 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>
 
diff --git a/libkdepim/kabcresourcecached.cpp b/libkdepim/kabcresourcecached.cpp
index d46156f6d..eece76351 100644
--- 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
diff --git a/libkdepim/kabcresourcecached.h b/libkdepim/kabcresourcecached.h
index 644819011..be71bb730 100644
--- 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
diff --git a/libkdepim/kabcresourcenull.h b/libkdepim/kabcresourcenull.h
index e44bf682f..7d77b89b7 100644
--- 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>
 
diff --git a/libkdepim/kcmdesignerfields.cpp b/libkdepim/kcmdesignerfields.cpp
index dbe2faca2..870d89ce2 100644
--- 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>
diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h
index e978f9546..e14f24f6b 100644
--- 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>
diff --git a/libkdepim/kconfigpropagator.cpp b/libkdepim/kconfigpropagator.cpp
index aea940892..d22805db9 100644
--- 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>
 
diff --git a/libkdepim/kconfigpropagator.h b/libkdepim/kconfigpropagator.h
index 1bad22506..2a100024d 100644
--- 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>
 
diff --git a/libkdepim/kconfigwizard.cpp b/libkdepim/kconfigwizard.cpp
index 6db0f9992..bceacd656 100644
--- 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>
 
diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h
index 31cb63ed8..84da3386a 100644
--- 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>
 
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index e7989c7af..44c4e696a 100644
--- 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>
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index 500fc0296..d047b3432 100644
--- 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>
diff --git a/libkdepim/kdatepickerpopup.cpp b/libkdepim/kdatepickerpopup.cpp
index 8e3f36953..998c44e4a 100644
--- 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>
 
diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h
index 98138dfed..8a65cf5bd 100644
--- 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>
 
diff --git a/libkdepim/kdepim.widgets b/libkdepim/kdepim.widgets
index a2d69e654..02d1de282 100644
--- 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)
diff --git a/libkdepim/kdepimmacros.h b/libkdepim/kdepimmacros.h
index 8c5c5141e..b341ee7ba 100644
--- 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
 
diff --git a/libkdepim/kdepimprotocols.h b/libkdepim/kdepimprotocols.h
index 462fafda8..e269fcabd 100644
--- 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>
 
diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h
index eb297b739..d54db75d4 100644
--- 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>
diff --git a/libkdepim/kimportdialog.cpp b/libkdepim/kimportdialog.cpp
index 64b49c4db..da6c98fad 100644
--- 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>
diff --git a/libkdepim/kimportdialog.h b/libkdepim/kimportdialog.h
index 59185825d..abcbb3181 100644
--- 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>
diff --git a/libkdepim/kincidencechooser.cpp b/libkdepim/kincidencechooser.cpp
index 082e43590..fee89bbb6 100644
--- 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>
 
diff --git a/libkdepim/kincidencechooser.h b/libkdepim/kincidencechooser.h
index 95fb25487..0d8107f05 100644
--- 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>
 
diff --git a/libkdepim/kmailcompletion.cpp b/libkdepim/kmailcompletion.cpp
index 7e71ec78c..d7fcc8ce4 100644
--- 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>
 
diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h
index 868e1b2b8..9251c2797 100644
--- 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>
 
diff --git a/libkdepim/komposer/core/Makefile.am b/libkdepim/komposer/core/Makefile.am
index 6a7bcd984..b494e7151 100644
--- 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
diff --git a/libkdepim/komposer/core/tests/Makefile.am b/libkdepim/komposer/core/tests/Makefile.am
index 187387f35..f26c9ee7c 100644
--- 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
 
diff --git a/libkdepim/komposer/plugins/default/Makefile.am b/libkdepim/komposer/plugins/default/Makefile.am
index 2c93eb098..7ae32dc08 100644
--- 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)
diff --git a/libkdepim/kpartsdesignerplugin/CMakeLists.txt b/libkdepim/kpartsdesignerplugin/CMakeLists.txt
index 623f93a5b..55c75251c 100644
--- 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}
 )
diff --git a/libkdepim/kpimprefs.cpp b/libkdepim/kpimprefs.cpp
index 730ed8f52..478ed7047 100644
--- 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>
 
diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h
index cd1202aba..7f0f1f0e2 100644
--- 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>
 
diff --git a/libkdepim/kpixmapregionselectordialog.cpp b/libkdepim/kpixmapregionselectordialog.cpp
index 4766a4521..b715e000b 100644
--- 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
 
diff --git a/libkdepim/kpixmapregionselectordialog.h b/libkdepim/kpixmapregionselectordialog.h
index 7cc08e32a..712ed8c90 100644
--- 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>
 
diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp
index ee4c0a20e..90952e74f 100644
--- 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.
  */
diff --git a/libkdepim/kpixmapregionselectorwidget.h b/libkdepim/kpixmapregionselectorwidget.h
index b06c4df95..353267f1f 100644
--- 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.
  *
diff --git a/libkdepim/kprefsdialog.cpp b/libkdepim/kprefsdialog.cpp
index ca8489110..466691083 100644
--- 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>
diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h
index 9aa011593..5e5dfcb85 100644
--- 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>
diff --git a/libkdepim/kresourceprefs.cpp b/libkdepim/kresourceprefs.cpp
index 2a79cf837..c343f806d 100644
--- 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>
 
diff --git a/libkdepim/kresourceprefs.h b/libkdepim/kresourceprefs.h
index 2cc2ae832..2941f6292 100644
--- 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>
 
diff --git a/libkdepim/ksubscription.h b/libkdepim/ksubscription.h
index 6febedfaa..f3bd4eb5b 100644
--- 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>
 
diff --git a/libkdepim/ktimeedit.cpp b/libkdepim/ktimeedit.cpp
index aec230ea5..c968f235c 100644
--- 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>
diff --git a/libkdepim/ktimeedit.h b/libkdepim/ktimeedit.h
index b783fc543..1d4727e08 100644
--- 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>
diff --git a/libkdepim/kvcarddrag.cpp b/libkdepim/kvcarddrag.cpp
index 3a65b70c7..054a424e9 100644
--- 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>
 
diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h
index 8e84f13bd..bb7ff4a2f 100644
--- 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>
 
diff --git a/libkdepim/kxface.cpp b/libkdepim/kxface.cpp
index c8d11447f..210fefb5f 100644
--- 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.
diff --git a/libkdepim/kxface.h b/libkdepim/kxface.h
index 921c1f248..a27219e7a 100644
--- 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.
diff --git a/libkdepim/maillistdrag.cpp b/libkdepim/maillistdrag.cpp
index 059f730c4..a9e2e9fa0 100644
--- 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>
diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h
index 5d89cd529..ec2fe447e 100644
--- 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.
diff --git a/libkdepim/pluginloader.h b/libkdepim/pluginloader.h
index d73dc9faa..6d38bbd18 100644
--- 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>
 
diff --git a/libkdepim/pluginloaderbase.cpp b/libkdepim/pluginloaderbase.cpp
index 40a4beb2f..60a925efa 100644
--- 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>
 
diff --git a/libkdepim/pluginloaderbase.h b/libkdepim/pluginloaderbase.h
index 0c51eb403..88e654053 100644
--- 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>
 
diff --git a/libkdepim/resourceabc.cpp b/libkdepim/resourceabc.cpp
index 002f14987..dbcc98f87 100644
--- 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>
 
diff --git a/libkdepim/resourceabc.h b/libkdepim/resourceabc.h
index f1509e443..af7848419 100644
--- 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>
 
diff --git a/libkdepim/sendsmsdialog.cpp b/libkdepim/sendsmsdialog.cpp
index 03c5af568..218f9617d 100644
--- 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>
diff --git a/libkdepim/sendsmsdialog.h b/libkdepim/sendsmsdialog.h
index 4430fc1a8..af7a97e9b 100644
--- 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>
diff --git a/libkdepim/sidebarextension.cpp b/libkdepim/sidebarextension.cpp
index dc3413ebc..db49dc71f 100644
--- 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>
 
diff --git a/libkdepim/sidebarextension.h b/libkdepim/sidebarextension.h
index e5551ff69..02422ad0c 100644
--- 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>
 
diff --git a/libkdepim/tests/Makefile.am b/libkdepim/tests/Makefile.am
index 7775493cd..249d764eb 100644
--- 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
 
diff --git a/libkdepim/tests/myconfig.kcfgc b/libkdepim/tests/myconfig.kcfgc
index 33711be31..35e26c996 100644
--- 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
diff --git a/libkdepim/tests/testaddresseelineedit.cpp b/libkdepim/tests/testaddresseelineedit.cpp
index db95f754c..12eb3c6b1 100644
--- 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>
 
diff --git a/libkdepim/tests/testaddresseeselector.cpp b/libkdepim/tests/testaddresseeselector.cpp
index af6fdc063..6b910e4b9 100644
--- 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>
 
diff --git a/libkdepim/tests/testdateedit.cpp b/libkdepim/tests/testdateedit.cpp
index e0d1d732d..46fabcfe1 100644
--- 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>
 
diff --git a/libkdepim/tests/testdateedit.h b/libkdepim/tests/testdateedit.h
index 816e87e77..8693ffa00 100644
--- 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>
 
diff --git a/libkdepim/tests/testlinklocator.cpp b/libkdepim/tests/testlinklocator.cpp
index 39383d9d1..548f61a9b 100644
--- 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>
diff --git a/libkdepim/tests/testwizard.cpp b/libkdepim/tests/testwizard.cpp
index 8db1dd42d..d9c9d806c 100644
--- 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>