13 files changed, 14 insertions, 14 deletions
diff --git a/kresources/scalix/kabc/CMakeLists.txt b/kresources/scalix/kabc/CMakeLists.txt
index 3663fc04d..c900f92b2 100644
--- 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}
 )
diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp
index f9a02d448..762d4b9fe 100644
--- 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"
diff --git a/kresources/scalix/kabc/resourcescalix.h b/kresources/scalix/kabc/resourcescalix.h
index b7dd6d5ea..9693b5259 100644
--- 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"
diff --git a/kresources/scalix/kcal/CMakeLists.txt b/kresources/scalix/kcal/CMakeLists.txt
index 26b0d79b4..40d56921a 100644
--- 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}
 )
diff --git a/kresources/scalix/kcal/Makefile.am b/kresources/scalix/kcal/Makefile.am
index 060c5c00c..c124e48dd 100644
--- 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
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 2848a353a..645c5b88e 100644
--- 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>
diff --git a/kresources/scalix/kioslave/CMakeLists.txt b/kresources/scalix/kioslave/CMakeLists.txt
index 43011df78..f210891ff 100644
--- 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}
 )
diff --git a/kresources/scalix/kioslave/Makefile.am b/kresources/scalix/kioslave/Makefile.am
index 8396c4985..5607fb9d7 100644
--- 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
diff --git a/kresources/scalix/knotes/CMakeLists.txt b/kresources/scalix/knotes/CMakeLists.txt
index a363b738f..516690e05 100644
--- 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}
 )
diff --git a/kresources/scalix/knotes/Makefile.am b/kresources/scalix/knotes/Makefile.am
index 42a1c2302..f04c03940 100644
--- 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
diff --git a/kresources/scalix/shared/CMakeLists.txt b/kresources/scalix/shared/CMakeLists.txt
index 6f116d2f3..28ede16e0 100644
--- 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}
 )
diff --git a/kresources/scalix/shared/Makefile.am b/kresources/scalix/shared/Makefile.am
index 4aaa9304e..18bcbc0d5 100644
--- 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
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 337899035..5a23623bc 100644
--- 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>