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

10 files changed, 10 insertions, 10 deletions

diff --git a/kamera/CMakeLists.txt b/kamera/CMakeLists.txt
index 700fe6a9..56e7c70d 100644
--- a/kamera/CMakeLists.txt
+++ b/kamera/CMakeLists.txt
@@ -11,6 +11,6 @@
 
 include( ConfigureChecks.cmake )
 
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 add_subdirectory( kcontrol )
 add_subdirectory( pics )
diff --git a/kamera/Makefile.am b/kamera/Makefile.am
index f012f4a1..e7776502 100644
--- a/kamera/Makefile.am
+++ b/kamera/Makefile.am
@@ -1 +1 @@
-SUBDIRS = kcontrol kioslave pics
+SUBDIRS = kcontrol tdeioslave pics
diff --git a/kamera/kcontrol/CMakeLists.txt b/kamera/kcontrol/CMakeLists.txt
index c4a395ab..c901d4b4 100644
--- a/kamera/kcontrol/CMakeLists.txt
+++ b/kamera/kcontrol/CMakeLists.txt
@@ -31,6 +31,6 @@ install( FILES kamera.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_kamera SHARED AUTOMOC
   SOURCES kamera.cpp kameradevice.cpp kameraconfigdialog.cpp
-  LINK kio-shared ${GPHOTO2_LIBRARIES}
+  LINK tdeio-shared ${GPHOTO2_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kamera/kcontrol/kamera.desktop b/kamera/kcontrol/kamera.desktop
index ac9f737e..d06c4be9 100644
--- a/kamera/kcontrol/kamera.desktop
+++ b/kamera/kcontrol/kamera.desktop
@@ -188,6 +188,6 @@ Type=Application
 X-TDE-Library=kamera
 X-TDE-ModuleType=Library
 Icon=camera
-Exec=kcmshell kamera
+Exec=tdecmshell kamera
 DocPath=kamera/index.html
 Categories=Qt;TDE;Settings;X-TDE-settings-hardware;
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index 20d090fa..e6f26449 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -32,7 +32,7 @@
 #include <tqgrid.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
diff --git a/kamera/kioslave/CMakeLists.txt b/kamera/tdeioslave/CMakeLists.txt
index d480f90e..33ca815e 100644
--- a/kamera/kioslave/CMakeLists.txt
+++ b/kamera/tdeioslave/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES camera.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( kio_kamera AUTOMOC
   SOURCES kamera.cpp
-  LINK kio-shared ${GPHOTO2_LIBRARIES}
+  LINK tdeio-shared ${GPHOTO2_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kamera/kioslave/Makefile.am b/kamera/tdeioslave/Makefile.am
index bfb0d198..80877fa7 100644
--- a/kamera/kioslave/Makefile.am
+++ b/kamera/tdeioslave/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
-# Makefile for tdebase/kioslave/kamera
+# Makefile for tdebase/tdeioslave/kamera
 
 INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(all_includes) $(GPHOTO2_INCS)
 
diff --git a/kamera/kioslave/camera.protocol b/kamera/tdeioslave/camera.protocol
index 947d02b9..947d02b9 100644
--- a/kamera/kioslave/camera.protocol
+++ b/kamera/tdeioslave/camera.protocol
diff --git a/kamera/kioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
index 9806a132..45d11970 100644
--- a/kamera/kioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -35,11 +35,11 @@
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
-#include <kio/slaveconfig.h>
+#include <tdeio/slaveconfig.h>
 
 #include <config.h>
 
diff --git a/kamera/kioslave/kamera.h b/kamera/tdeioslave/kamera.h
index f569f4ac..1e015d0f 100644
--- a/kamera/kioslave/kamera.h
+++ b/kamera/tdeioslave/kamera.h
@@ -24,7 +24,7 @@
 #define __kamera_h__
 
 #include <config.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <gphoto2.h>
 
 class KSimpleConfig;