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

22 files changed, 25 insertions, 25 deletions

diff --git a/kview/config/CMakeLists.txt b/kview/config/CMakeLists.txt
index 53b97f03..d2649a1c 100644
--- a/kview/config/CMakeLists.txt
+++ b/kview/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kviewgeneralconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kviewgeneralconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES kview.setdlg DESTINATION ${DATA_INSTALL_DIR}/kview )
 
 
diff --git a/kview/config/Makefile.am b/kview/config/Makefile.am
index 5d09eee8..0c97cb33 100644
--- a/kview/config/Makefile.am
+++ b/kview/config/Makefile.am
@@ -12,7 +12,7 @@ kcm_kviewgeneralconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewgeneralconfig_la_LIBADD = $(LIB_TDEUI)
 
 kcm_kviewgeneralconfig_DATA = kviewgeneralconfig.desktop
-kcm_kviewgeneralconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewgeneralconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kviewappdatadir = $(kde_datadir)/kview
 kviewappdata_DATA = kview.setdlg
diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp
index f36da30c..2316c920 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tqwhatsthis.h>
 
diff --git a/kview/config/plugins/CMakeLists.txt b/kview/config/plugins/CMakeLists.txt
index f7c4672a..1b1fbec4 100644
--- a/kview/config/plugins/CMakeLists.txt
+++ b/kview/config/plugins/CMakeLists.txt
@@ -22,7 +22,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kviewpluginsconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kviewpluginsconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewpluginsconfig (module) ###########
diff --git a/kview/config/plugins/Makefile.am b/kview/config/plugins/Makefile.am
index d2169a9d..239504dd 100644
--- a/kview/config/plugins/Makefile.am
+++ b/kview/config/plugins/Makefile.am
@@ -11,7 +11,7 @@ kcm_kviewpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewpluginsconfig_la_LIBADD = $(LIB_KUTILS)
 
 kcm_kviewpluginsconfig_DATA = kviewpluginsconfig.desktop
-kcm_kviewpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewpluginsconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kcm_kviewpluginsconfig.pot
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 9aa38524..21b851c3 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -32,7 +32,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kimageio.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <twinmodule.h>
 #include <kmenubar.h>
diff --git a/kview/kviewcanvas/config/CMakeLists.txt b/kview/kviewcanvas/config/CMakeLists.txt
index 99fbb78f..fc094083 100644
--- a/kview/kviewcanvas/config/CMakeLists.txt
+++ b/kview/kviewcanvas/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     kviewcanvasconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewcanvasconfig (module) ############
diff --git a/kview/kviewcanvas/config/Makefile.am b/kview/kviewcanvas/config/Makefile.am
index 25d77983..1439251e 100644
--- a/kview/kviewcanvas/config/Makefile.am
+++ b/kview/kviewcanvas/config/Makefile.am
@@ -8,7 +8,7 @@ kcm_kviewcanvasconfig_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-
 kcm_kviewcanvasconfig_la_LIBADD  = $(LIB_TDEUI)
 
 kcm_kviewcanvasconfig_DATA = kviewcanvasconfig.desktop
-kcm_kviewcanvasconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewcanvasconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 METASOURCES = AUTO
 
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index 4411d752..32260a45 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <ksettings/dispatcher.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #define KIMAGECANVAS_WIPESIZE 5
 
diff --git a/kview/kviewviewer/config/CMakeLists.txt b/kview/kviewviewer/config/CMakeLists.txt
index d3640df6..10b5b05f 100644
--- a/kview/kviewviewer/config/CMakeLists.txt
+++ b/kview/kviewviewer/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     kviewviewerpluginsconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewviewerpluginsconfig (module) #####
diff --git a/kview/kviewviewer/config/Makefile.am b/kview/kviewviewer/config/Makefile.am
index fe65e613..dfa55d4c 100644
--- a/kview/kviewviewer/config/Makefile.am
+++ b/kview/kviewviewer/config/Makefile.am
@@ -11,7 +11,7 @@ kcm_kviewviewerpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_KUTILS)
 
 kcm_kviewviewerpluginsconfig_DATA = kviewviewerpluginsconfig.desktop
-kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kcm_kviewviewerpluginsconfig.pot
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 3e3c7085..4e318342 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -37,9 +37,9 @@
 #include <kpushbutton.h>
 #include <kpassivepopup.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kxmlguifactory.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/plugin.h>
diff --git a/kview/modules/browser/kmyfileitemlist.cpp b/kview/modules/browser/kmyfileitemlist.cpp
index 28c3cb08..24d70527 100644
--- a/kview/modules/browser/kmyfileitemlist.cpp
+++ b/kview/modules/browser/kmyfileitemlist.cpp
@@ -18,7 +18,7 @@
 // $Id$
 
 #include "kmyfileitemlist.h"
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 KMyFileItemList::KMyFileItemList() {}
 KMyFileItemList::KMyFileItemList( const TQPtrList<KFileItem> & l ) : TQPtrList<KFileItem>( l ) {}
diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h
index 985ec564..a26b90c1 100644
--- a/kview/modules/browser/kviewbrowser.h
+++ b/kview/modules/browser/kviewbrowser.h
@@ -21,7 +21,7 @@
 #define __kviewbrowser_h
 
 #include <tdeparts/plugin.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 namespace KImageViewer { class Viewer; }
 
diff --git a/kview/modules/presenter/CMakeLists.txt b/kview/modules/presenter/CMakeLists.txt
index a34cc893..aa21d851 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 tdeparts-shared
+  LINK tdeio-shared tdeparts-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kview/modules/presenter/config/CMakeLists.txt b/kview/modules/presenter/config/CMakeLists.txt
index b8dfc56a..e359bee9 100644
--- a/kview/modules/presenter/config/CMakeLists.txt
+++ b/kview/modules/presenter/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     kviewpresenterconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewpresenterconfig (module) #########
diff --git a/kview/modules/presenter/config/Makefile.am b/kview/modules/presenter/config/Makefile.am
index 8c212e7f..88d3d479 100644
--- a/kview/modules/presenter/config/Makefile.am
+++ b/kview/modules/presenter/config/Makefile.am
@@ -9,7 +9,7 @@ kcm_kviewpresenterconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewpresenterconfig_la_LIBADD = $(LIB_KUTILS)
 
 kcm_kviewpresenterconfig_DATA = kviewpresenterconfig.desktop
-kcm_kviewpresenterconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewpresenterconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 METASOURCES = AUTO
 
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index 7ed447c2..c3682d5f 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgenericfactory.h>
 
 typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFactory;
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index 05d3b90f..8878eab6 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -256,9 +256,9 @@
     <include location="global" impldecl="in declaration">kdialog.h</include>
     <include location="global" impldecl="in implementation">kdebug.h</include>
     <include location="global" impldecl="in implementation">kimageviewer/viewer.h</include>
-    <include location="global" impldecl="in implementation">kio/netaccess.h</include>
+    <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
     <include location="global" impldecl="in implementation">kurl.h</include>
-    <include location="global" impldecl="in implementation">kfiledialog.h</include>
+    <include location="global" impldecl="in implementation">tdefiledialog.h</include>
     <include location="global" impldecl="in implementation">tqstring.h</include>
     <include location="global" impldecl="in implementation">kmessagebox.h</include>
     <include location="local" impldecl="in implementation">imagelistitem.h</include>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index 534b305c..b7aef984 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -39,11 +39,11 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimageio.h>
 #include <kimageviewer/viewer.h>
 #include <kimageviewer/canvas.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurldrag.h>
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index 1c79ee15..df9622b8 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent )
 	: KPreferencesModule( "kviewpresenter", parent, "KView Presenter Config Module" )
diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h
index 7faaaa32..e19abe36 100644
--- a/kview/photobook/photobook.h
+++ b/kview/photobook/photobook.h
@@ -40,7 +40,7 @@ Copyright (c) 2004 Charles Samuels <[email protected]>
 #define PHOTOBOOK_H
 
 #include <tqsplitter.h>
-#include <kfileiconview.h>
+#include <tdefileiconview.h>
 #include <kdirlister.h>
 
 #include <tdeparts/part.h>