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

32 files changed, 39 insertions, 39 deletions

diff --git a/kview/CMakeLists.txt b/kview/CMakeLists.txt
index 1d34c3ef..c038f009 100644
--- a/kview/CMakeLists.txt
+++ b/kview/CMakeLists.txt
@@ -39,5 +39,5 @@ install( FILES kviewui.rc DESTINATION ${DATA_INSTALL_DIR}/kview )
 
 tde_add_tdeinit_executable( kview AUTOMOC
   SOURCES kview.cpp main.cpp
-  LINK kparts-shared kutils-shared
+  LINK tdeparts-shared tdeutils-shared
 )
diff --git a/kview/config/plugins/CMakeLists.txt b/kview/config/plugins/CMakeLists.txt
index ea2652f5..f7c4672a 100644
--- a/kview/config/plugins/CMakeLists.txt
+++ b/kview/config/plugins/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES kviewpluginsconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kc
 
 tde_add_kpart( kcm_kviewpluginsconfig AUTOMOC
   SOURCES kviewpluginsconfig.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/kimageviewer/CMakeLists.txt b/kview/kimageviewer/CMakeLists.txt
index acf28e9b..e910c560 100644
--- a/kview/kimageviewer/CMakeLists.txt
+++ b/kview/kimageviewer/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES
 tde_add_library( kimageviewer SHARED AUTOMOC
   SOURCES canvas.cpp viewer.cpp
   VERSION 0.0.0
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h
index 8920b82c..790a102c 100644
--- a/kview/kimageviewer/viewer.h
+++ b/kview/kimageviewer/viewer.h
@@ -21,7 +21,7 @@
 #ifndef KIMAGEVIEWER_VIEWER_H
 #define KIMAGEVIEWER_VIEWER_H
 
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <kdemacros.h>
 namespace KParts
 {
diff --git a/kview/kview.cpp b/kview/kview.cpp
index ee2cf3b5..9aa38524 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -25,9 +25,9 @@
 #include <kurl.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
-#include <kparts/plugin.h>
-#include <kparts/part.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/plugin.h>
+#include <tdeparts/part.h>
 #include <kapplication.h>
 #include <kaction.h>
 #include <kstdaction.h>
diff --git a/kview/kview.h b/kview/kview.h
index aed0a54f..dd5bacd7 100644
--- a/kview/kview.h
+++ b/kview/kview.h
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KParts {
 	class ReadWritePart;
diff --git a/kview/kviewcanvas/CMakeLists.txt b/kview/kviewcanvas/CMakeLists.txt
index 019496e3..3b8f4704 100644
--- a/kview/kviewcanvas/CMakeLists.txt
+++ b/kview/kviewcanvas/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES kviewcanvas.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( libkviewcanvas AUTOMOC
   SOURCES kimageholder.cpp kimagecanvas.cpp
-  LINK kimageviewer-shared kutils-shared
+  LINK kimageviewer-shared tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/kviewcanvas/test/Makefile.am b/kview/kviewcanvas/test/Makefile.am
index d00efc03..277bfd48 100644
--- a/kview/kviewcanvas/test/Makefile.am
+++ b/kview/kviewcanvas/test/Makefile.am
@@ -5,5 +5,5 @@ METASOURCES = AUTO
 check_PROGRAMS = test
 
 test_SOURCES = main.cpp test.cpp
-test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test_LDADD   = $(LIB_KPARTS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la
diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp
index 3d24cbce..01ac6e43 100644
--- a/kview/kviewcanvas/test/test.cpp
+++ b/kview/kviewcanvas/test/test.cpp
@@ -9,7 +9,7 @@
 #include <kurl.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 
 #include <tqimage.h>
 
diff --git a/kview/kviewcanvas/test/test.h b/kview/kviewcanvas/test/test.h
index 6fe7737b..7a3f80ed 100644
--- a/kview/kviewcanvas/test/test.h
+++ b/kview/kviewcanvas/test/test.h
@@ -6,7 +6,7 @@
 #endif 
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
  
 namespace KImageViewer { class Canvas; };
 
diff --git a/kview/kviewviewer/CMakeLists.txt b/kview/kviewviewer/CMakeLists.txt
index aea04495..78829f61 100644
--- a/kview/kviewviewer/CMakeLists.txt
+++ b/kview/kviewviewer/CMakeLists.txt
@@ -35,6 +35,6 @@ tde_add_kpart( libkviewviewer AUTOMOC
   SOURCES
     printimagesettings.ui imagesettings.cpp
     kviewkonqextension.cpp kviewviewer.cpp
-  LINK kimageviewer-shared kutils-shared tdeprint-shared
+  LINK kimageviewer-shared tdeutils-shared tdeprint-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/kviewviewer/config/CMakeLists.txt b/kview/kviewviewer/config/CMakeLists.txt
index 34a7e4a6..d3640df6 100644
--- a/kview/kviewviewer/config/CMakeLists.txt
+++ b/kview/kviewviewer/config/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES
 
 tde_add_kpart( kcm_kviewviewerpluginsconfig AUTOMOC
   SOURCES kviewviewerpluginsconfig.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h
index f49f577d..e46e78f6 100644
--- a/kview/kviewviewer/kviewkonqextension.h
+++ b/kview/kviewviewer/kviewkonqextension.h
@@ -20,7 +20,7 @@
 #ifndef __kviewkonqextension_h__
 #define __kviewkonqextension_h__
 
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 
 namespace KImageViewer { class Canvas; }
 class KViewViewer;
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 7db68102..3e3c7085 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -40,9 +40,9 @@
 #include <kio/job.h>
 #include <kxmlguifactory.h>
 #include <kfiledialog.h>
-#include <kparts/genericfactory.h>
-#include <kparts/componentfactory.h>
-#include <kparts/plugin.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/componentfactory.h>
+#include <tdeparts/plugin.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kapplication.h>
@@ -595,7 +595,7 @@ void KViewViewer::slotData( TDEIO::Job *, const TQByteArray & data )
 
 	//show partial image XXX: is this really the way to do it?
 	//No. :) It takes forever like this.
-	//OK. So I really have to look at khtml...
+	//OK. So I really have to look at tdehtml...
 	//later...
 	//m_pCanvas->setImage( TQImage( m_pBuffer->buffer() ) );
 }
diff --git a/kview/kviewviewer/test/Makefile.am b/kview/kviewviewer/test/Makefile.am
index 65c3527f..197e9cea 100644
--- a/kview/kviewviewer/test/Makefile.am
+++ b/kview/kviewviewer/test/Makefile.am
@@ -5,5 +5,5 @@ METASOURCES = AUTO
 check_PROGRAMS = test
 
 test_SOURCES = main.cpp test.cpp
-test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test_LDADD   = $(LIB_KPARTS)
diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp
index 2bc20372..dfcdc918 100644
--- a/kview/kviewviewer/test/test.cpp
+++ b/kview/kviewviewer/test/test.cpp
@@ -8,7 +8,7 @@
 #include <kurl.h>
 #include <klibloader.h>
 #include <kmessagebox.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kapplication.h>
 
 #include <tqimage.h>
diff --git a/kview/kviewviewer/test/test.h b/kview/kviewviewer/test/test.h
index ab5d700b..b3a24c91 100644
--- a/kview/kviewviewer/test/test.h
+++ b/kview/kviewviewer/test/test.h
@@ -6,7 +6,7 @@
 #endif 
 
 #include <kapplication.h>
-#include <kparts/mainwindow.h>
+#include <tdeparts/mainwindow.h>
 
 namespace KParts { class ReadWritePart; }
  
diff --git a/kview/modules/browser/CMakeLists.txt b/kview/modules/browser/CMakeLists.txt
index 92be6333..efa48578 100644
--- a/kview/modules/browser/CMakeLists.txt
+++ b/kview/modules/browser/CMakeLists.txt
@@ -33,6 +33,6 @@ install( FILES
 tde_add_kpart( kview_browserplugin AUTOMOC
   SOURCES
     kmyfileitemlist.cpp kviewbrowser.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp
index 936061eb..ea12d237 100644
--- a/kview/modules/browser/kviewbrowser.cpp
+++ b/kview/modules/browser/kviewbrowser.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kimageviewer/viewer.h>
 #include <kimageviewer/canvas.h>
-#include <kparts/browserextension.h>
+#include <tdeparts/browserextension.h>
 #include <kapplication.h>
 #include <kimageio.h>
 
diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h
index 74646b87..985ec564 100644
--- a/kview/modules/browser/kviewbrowser.h
+++ b/kview/modules/browser/kviewbrowser.h
@@ -20,7 +20,7 @@
 #ifndef __kviewbrowser_h
 #define __kviewbrowser_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kfileitem.h>
 
 namespace KImageViewer { class Viewer; }
diff --git a/kview/modules/effects/CMakeLists.txt b/kview/modules/effects/CMakeLists.txt
index 1ae9d4b6..b871c6ad 100644
--- a/kview/modules/effects/CMakeLists.txt
+++ b/kview/modules/effects/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES
 
 tde_add_kpart( kview_effectsplugin AUTOMOC
   SOURCES kvieweffects.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/modules/effects/kvieweffects.h b/kview/modules/effects/kvieweffects.h
index 711df909..461b9c0f 100644
--- a/kview/modules/effects/kvieweffects.h
+++ b/kview/modules/effects/kvieweffects.h
@@ -5,7 +5,7 @@
 #ifndef KVIEWEFFECTS_H
 #define KVIEWEFFECTS_H
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <tqcolor.h>
 
 namespace KImageViewer { class Viewer; }
diff --git a/kview/modules/presenter/CMakeLists.txt b/kview/modules/presenter/CMakeLists.txt
index df85ed6c..a34cc893 100644
--- a/kview/modules/presenter/CMakeLists.txt
+++ b/kview/modules/presenter/CMakeLists.txt
@@ -36,6 +36,6 @@ install( FILES
 tde_add_kpart( kview_presenterplugin AUTOMOC
   SOURCES
     imagelistitem.cpp imagelistdialog.ui kviewpresenter.cpp
-  LINK kio-shared kparts-shared
+  LINK kio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/modules/presenter/config/CMakeLists.txt b/kview/modules/presenter/config/CMakeLists.txt
index 28bb691f..b8dfc56a 100644
--- a/kview/modules/presenter/config/CMakeLists.txt
+++ b/kview/modules/presenter/config/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES
 
 tde_add_kpart( kcm_kviewpresenterconfig AUTOMOC
   SOURCES kviewpresenterconfig.cpp
-  LINK kutils-shared
+  LINK tdeutils-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h
index fa2cb9c4..2fff82c1 100644
--- a/kview/modules/presenter/kviewpresenter.h
+++ b/kview/modules/presenter/kviewpresenter.h
@@ -21,7 +21,7 @@
 #ifndef __kviewpresenter_h
 #define __kviewpresenter_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <kurl.h>
 
 #include <tqsortedlist.h>
diff --git a/kview/modules/scale/kview_scale.h b/kview/modules/scale/kview_scale.h
index 659a2270..6834cda5 100644
--- a/kview/modules/scale/kview_scale.h
+++ b/kview/modules/scale/kview_scale.h
@@ -21,7 +21,7 @@
 #ifndef __kview_scale_h
 #define __kview_scale_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 namespace KImageViewer {
 	class Viewer;
diff --git a/kview/modules/scanner/CMakeLists.txt b/kview/modules/scanner/CMakeLists.txt
index aa2f0c8d..e4b4cb67 100644
--- a/kview/modules/scanner/CMakeLists.txt
+++ b/kview/modules/scanner/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES
 
 tde_add_kpart( kview_scannerplugin AUTOMOC
   SOURCES kviewscanner.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/modules/scanner/kviewscanner.h b/kview/modules/scanner/kviewscanner.h
index 5052c591..c34bc0d3 100644
--- a/kview/modules/scanner/kviewscanner.h
+++ b/kview/modules/scanner/kviewscanner.h
@@ -21,7 +21,7 @@
 #ifndef __kviewscanner_h
 #define __kviewscanner_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 #include <klibloader.h>
 
 class KURL;
diff --git a/kview/modules/template/kviewtemplate.h b/kview/modules/template/kviewtemplate.h
index e8ed567b..68084058 100644
--- a/kview/modules/template/kviewtemplate.h
+++ b/kview/modules/template/kviewtemplate.h
@@ -5,7 +5,7 @@
 #ifndef __kviewtemplate_h
 #define __kviewtemplate_h
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 namespace KImageViewer { class Viewer; }
 
diff --git a/kview/photobook/CMakeLists.txt b/kview/photobook/CMakeLists.txt
index b5d781d8..bb7f2913 100644
--- a/kview/photobook/CMakeLists.txt
+++ b/kview/photobook/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES photobookui.rc DESTINATION ${DATA_INSTALL_DIR}/photobook )
 
 tde_add_kpart( libphotobook AUTOMOC
   SOURCES photobook.cpp
-  LINK kparts-shared
+  LINK tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp
index a08f871a..f90d50dd 100644
--- a/kview/photobook/photobook.cpp
+++ b/kview/photobook/photobook.cpp
@@ -39,7 +39,7 @@ Copyright (c) 2004,2005 Charles Samuels <[email protected]>
 
 #include "photobook.h"
 
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kaction.h>
 #include <kstdaccel.h>
 #include <kstandarddirs.h>
diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h
index b7c8ee63..7faaaa32 100644
--- a/kview/photobook/photobook.h
+++ b/kview/photobook/photobook.h
@@ -43,9 +43,9 @@ Copyright (c) 2004 Charles Samuels <[email protected]>
 #include <kfileiconview.h>
 #include <kdirlister.h>
 
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdeparts/genericfactory.h>
 
 class Previews;
 class PhotoBookPart;