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

10 files changed, 14 insertions, 14 deletions

diff --git a/kaddressbook/CMakeLists.txt b/kaddressbook/CMakeLists.txt
index 7b000d3a9..1cea8dd87 100644
--- a/kaddressbook/CMakeLists.txt
+++ b/kaddressbook/CMakeLists.txt
@@ -103,6 +103,6 @@ tde_add_library( kaddressbook SHARED AUTOMOC
   LINK
     kabcommon-static kabim-static printer-static
     kabinterfaces-shared
-    tdepim-shared kabc_file-shared tdeprint-shared kutils-shared
+    tdepim-shared kabc_file-shared tdeprint-shared tdeutils-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am
index 7978319bf..4b2d1befb 100644
--- a/kaddressbook/Makefile.am
+++ b/kaddressbook/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
 bin_PROGRAMS = kaddressbook
 
 kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kaddressbook_LDADD = libkaddressbook.la
 
 kde_module_LTLIBRARIES = libkaddressbookpart.la
diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am
index 6258a6a74..c4e8c247d 100644
--- a/kaddressbook/features/Makefile.am
+++ b/kaddressbook/features/Makefile.am
@@ -26,7 +26,7 @@ endif
 
 libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp
 libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -lkresources
+libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -ltderesources
 
 noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h
 
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 03e7f1f43..82d81de40 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -36,7 +36,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kresources/configdialog.h>
+#include <tderesources/configdialog.h>
 
 #include "core.h"
 
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 0b517bf00..f88be3c3c 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -52,13 +52,13 @@
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kimproxy.h>
+#include <tdeimproxy.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kprotocolinfo.h>
 #include <kpushbutton.h>
-#include <kresources/selectdialog.h>
+#include <tderesources/selectdialog.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <kstdguiitem.h>
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 88f55d311..cd1c15c7f 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kparts/genericfactory.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/statusbarextension.h>
 #include <kstatusbar.h>
 
 #include "kabcore.h"
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index 5ab27d3a1..1a161c114 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -23,9 +23,9 @@
 #ifndef KADDRESSBOOK_PART_H
 #define KADDRESSBOOK_PART_H
 
-#include <kparts/event.h>
-#include <kparts/factory.h>
-#include <kparts/part.h>
+#include <tdeparts/event.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
 
 #include "kaddressbookiface.h"
 
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 2616bf330..edafa4112 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -35,7 +35,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
 #include <ktempdir.h>
 #include <ktrader.h>
 #include <kurldrag.h>
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index fbd98f022..c4552232a 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -38,7 +38,7 @@
 #include <kurl.h>
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
-#include <kimproxy.h>
+#include <tdeimproxy.h>
 
 #include "kaddressbooktableview.h"
 
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 9432dafa2..d951655b0 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -48,7 +48,7 @@
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <kimproxy.h>
+#include <tdeimproxy.h>
 
 #include "configuretableviewdialog.h"
 #include "contactlistview.h"