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

8 files changed, 15 insertions, 15 deletions

diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt
index 62055d0c0..cea61845c 100644
--- a/korganizer/CMakeLists.txt
+++ b/korganizer/CMakeLists.txt
@@ -205,7 +205,7 @@ tde_add_library( korganizer SHARED AUTOMOC
     kdgantt-static
     korganizer_eventviewer-shared korganizer_calendar-shared korg_stdprinting-shared
     kholidays-shared kpimidentities-shared
-    kutils-shared knewstuff-shared
+    tdeutils-shared knewstuff-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index 98312ec7d..a86671261 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
 
 bin_PROGRAMS = korganizer
 
-korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 korganizer_LDADD   = libkorganizer.la
 korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
 korganizer_COMPILE_FIRST = koprefs_base.h
@@ -36,12 +36,12 @@ libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
 
 check_PROGRAMS = korgplugins timezone
 
-korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 korgplugins_LDADD   = libkorganizer.la $(LIB_KSYCOCA)
 korgplugins_SOURCES = korgplugins.cpp
 korgplugins_COMPILE_FIRST = koprefs_base.h
 
-timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 timezone_LDADD   = libkorganizer.la $(LIB_KSYCOCA)
 timezone_SOURCES = timezone.cpp
 timezone_COMPILE_FIRST = koprefs_base.h
@@ -63,7 +63,7 @@ libkorganizer_la_LIBADD  = \
 	$(top_builddir)/libkholidays/libkholidays.la \
 	$(top_builddir)/libkmime/libkmime.la \
 	$(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \
-	-ltdeprint -lkabc -lkutils
+	-ltdeprint -lkabc -ltdeutils
 
 libkorganizer_la_COMPILE_FIRST = \
 	kogroupwareprefspage.ui \
diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h
index 35e426d88..0e7230482 100644
--- a/korganizer/interfaces/korganizer/part.h
+++ b/korganizer/interfaces/korganizer/part.h
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 
 #include <klibloader.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <korganizer/mainwindow.h>
 
diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am
index d5ac531a1..817cc95ff 100644
--- a/korganizer/korgac/Makefile.am
+++ b/korganizer/korgac/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
 
 bin_PROGRAMS = korgac
 
-korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 korgac_LDADD   = $(LIB_TDEUI) \
                  $(top_builddir)/korganizer/libkorganizer_eventviewer.la
 korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
 
 check_PROGRAMS = testalarmdlg
 
-testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 testalarmdlg_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la \
                      $(top_builddir)/korganizer/libkorganizer_eventviewer.la
 testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp
diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h
index b4c2e9b28..4c15fb39e 100644
--- a/korganizer/korganizer.h
+++ b/korganizer/korganizer.h
@@ -35,7 +35,7 @@
 
 #include <korganizer/mainwindow.h>
 #include <korganizer/part.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 class KTempFile;
 class KRecentFilesAction;
diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp
index 6886358f7..184e142cf 100644
--- a/korganizer/korganizer_part.cpp
+++ b/korganizer/korganizer_part.cpp
@@ -51,9 +51,9 @@
 #include <kprocess.h>
 #include <ktempfile.h>
 #include <kstatusbar.h>
-#include <kparts/genericfactory.h>
-#include <kparts/partmanager.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/partmanager.h>
+#include <tdeparts/statusbarextension.h>
 
 #include <sidebarextension.h>
 #include <infoextension.h>
diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h
index 1596c4d85..416e39b90 100644
--- a/korganizer/korganizer_part.h
+++ b/korganizer/korganizer_part.h
@@ -26,7 +26,7 @@
 #define KORGANIZER_PART_H
 
 #include <kurl.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 
 #include <korganizer/mainwindow.h>
 
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index 11787630e..a325add5f 100644
--- a/korganizer/resourceview.cpp
+++ b/korganizer/resourceview.cpp
@@ -37,8 +37,8 @@
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kresources/resource.h>
-#include <kresources/configdialog.h>
+#include <tderesources/resource.h>
+#include <tderesources/configdialog.h>
 #include <libkcal/calendarresources.h>
 #include <kconfig.h>