Rename a number of libraries and executables to avoid conflicts with KDE4

6 files changed, 8 insertions, 8 deletions

diff --git a/kontact/plugins/summary/CMakeLists.txt b/kontact/plugins/summary/CMakeLists.txt
index 9c5228fcf..d7fad7afc 100644
--- a/kontact/plugins/summary/CMakeLists.txt
+++ b/kontact/plugins/summary/CMakeLists.txt
@@ -36,7 +36,7 @@ install( FILES kontactsummary_part.rc DESTINATION ${DATA_INSTALL_DIR}/kontactsum
 tde_add_kpart( libkontact_summaryplugin AUTOMOC
   SOURCES
     summaryview_plugin.cpp summaryview_part.cpp dropwidget.cpp
-  LINK kpinterfaces-shared tdepim-shared kpimidentities-shared kutils-shared
+  LINK kpinterfaces-shared tdepim-shared kpimidentities-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -45,6 +45,6 @@ tde_add_kpart( libkontact_summaryplugin AUTOMOC
 
 tde_add_kpart( kcm_kontactsummary AUTOMOC
   SOURCES kcmkontactsummary.cpp
-  LINK tdeui-shared kutils-shared
+  LINK tdeui-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kontact/plugins/summary/Makefile.am b/kontact/plugins/summary/Makefile.am
index 0886be496..32fcdfc9a 100644
--- a/kontact/plugins/summary/Makefile.am
+++ b/kontact/plugins/summary/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/certmanager/lib \
 
 kde_module_LTLIBRARIES = libkontact_summaryplugin.la kcm_kontactsummary.la
 libkontact_summaryplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_summaryplugin_la_LIBADD = -lkutils \
+libkontact_summaryplugin_la_LIBADD = -ltdeutils \
   $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
   $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkpimidentities/libkpimidentities.la
 
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index b1da7d0fc..de5902b06 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -43,8 +43,8 @@
 #include <klocale.h>
 #include <kcmultidialog.h>
 
-#include <kparts/componentfactory.h>
-#include <kparts/event.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/event.h>
 
 #include <libkpimidentities/identity.h>
 #include <libkpimidentities/identitymanager.h>
diff --git a/kontact/plugins/summary/summaryview_part.h b/kontact/plugins/summary/summaryview_part.h
index 5b57d45cd..9de42432e 100644
--- a/kontact/plugins/summary/summaryview_part.h
+++ b/kontact/plugins/summary/summaryview_part.h
@@ -27,7 +27,7 @@
 #include <tqdatetime.h>
 #include <tqmap.h>
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include "core.h"
 #include "dropwidget.h"
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 8f4b7065d..a7bb89960 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -23,7 +23,7 @@
 
 #include <dcopref.h>
 #include <kgenericfactory.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kaboutdata.h>
 #include <kaction.h>
 
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index 450980dc1..336f43dbd 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -24,7 +24,7 @@
 #include "plugin.h"
 
 #include <klocale.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <tqmap.h>