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

14 files changed, 14 insertions, 14 deletions

diff --git a/kcontrol/info/cdinfo.desktop b/kcontrol/info/cdinfo.desktop
index bb8f80779..1b71d65d0 100644
--- a/kcontrol/info/cdinfo.desktop
+++ b/kcontrol/info/cdinfo.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell cdinfo
+Exec=tdecmshell cdinfo
 Icon=kcmdevices
 Type=Application
 DocPath=kinfocenter/cdinfo/index.html
diff --git a/kcontrol/info/devices.desktop b/kcontrol/info/devices.desktop
index 5a738437b..2b7ad8f4a 100644
--- a/kcontrol/info/devices.desktop
+++ b/kcontrol/info/devices.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell devices
+Exec=tdecmshell devices
 Icon=kcmdevices
 Type=Application
 DocPath=kinfocenter/devices/index.html
diff --git a/kcontrol/info/dma.desktop b/kcontrol/info/dma.desktop
index 5421ff4d9..cd67d6be3 100644
--- a/kcontrol/info/dma.desktop
+++ b/kcontrol/info/dma.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell dma
+Exec=tdecmshell dma
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/dma/index.html
diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp
index 22efcd6d3..c2b7b953a 100644
--- a/kcontrol/info/info_netbsd.cpp
+++ b/kcontrol/info/info_netbsd.cpp
@@ -43,7 +43,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <kio/global.h> /* for TDEIO::convertSize() */
+#include <tdeio/global.h> /* for TDEIO::convertSize() */
 
 typedef struct
   {
diff --git a/kcontrol/info/interrupts.desktop b/kcontrol/info/interrupts.desktop
index 60588d0bf..84471002c 100644
--- a/kcontrol/info/interrupts.desktop
+++ b/kcontrol/info/interrupts.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell interrupts
+Exec=tdecmshell interrupts
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/interrupts/index.html
diff --git a/kcontrol/info/ioports.desktop b/kcontrol/info/ioports.desktop
index 2a6cfcffa..a3f670ad7 100644
--- a/kcontrol/info/ioports.desktop
+++ b/kcontrol/info/ioports.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell ioports
+Exec=tdecmshell ioports
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/ioports/index.html
diff --git a/kcontrol/info/memory.desktop b/kcontrol/info/memory.desktop
index 66f148fa1..1ff56664e 100644
--- a/kcontrol/info/memory.desktop
+++ b/kcontrol/info/memory.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell memory
+Exec=tdecmshell memory
 Icon=kcmmemory
 Type=Application
 DocPath=kinfocenter/memory/index.html
diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop
index 6aec4f804..c7cdf29a9 100644
--- a/kcontrol/info/opengl.desktop
+++ b/kcontrol/info/opengl.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 NoDisplay=true
-Exec=kcmshell opengl
+Exec=tdecmshell opengl
 Icon=kcmopengl
 Type=Application
 DocPath=kinfocenter/opengl/index.html
diff --git a/kcontrol/info/partitions.desktop b/kcontrol/info/partitions.desktop
index 18659d77d..02e591db0 100644
--- a/kcontrol/info/partitions.desktop
+++ b/kcontrol/info/partitions.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell partitions
+Exec=tdecmshell partitions
 Icon=kcmpartitions
 Type=Application
 DocPath=kinfocenter/partitions/index.html
diff --git a/kcontrol/info/pci.desktop b/kcontrol/info/pci.desktop
index 3a9898592..9e2d3e635 100644
--- a/kcontrol/info/pci.desktop
+++ b/kcontrol/info/pci.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell pci
+Exec=tdecmshell pci
 Icon=kcmpci
 Type=Application
 DocPath=kinfocenter/pci/index.html
diff --git a/kcontrol/info/processor.desktop b/kcontrol/info/processor.desktop
index 9d8e2aa95..35cd337c7 100644
--- a/kcontrol/info/processor.desktop
+++ b/kcontrol/info/processor.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell processor
+Exec=tdecmshell processor
 Icon=kcmprocessor
 Type=Application
 DocPath=kinfocenter/processor/index.html
diff --git a/kcontrol/info/scsi.desktop b/kcontrol/info/scsi.desktop
index e8302f043..e2b6691c8 100644
--- a/kcontrol/info/scsi.desktop
+++ b/kcontrol/info/scsi.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell scsi
+Exec=tdecmshell scsi
 Icon=kcmscsi
 Type=Application
 DocPath=kinfocenter/scsi/index.html
diff --git a/kcontrol/info/sound.desktop b/kcontrol/info/sound.desktop
index c095c337b..0c90238fe 100644
--- a/kcontrol/info/sound.desktop
+++ b/kcontrol/info/sound.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell sound
+Exec=tdecmshell sound
 Icon=kcmsound
 Type=Application
 DocPath=kinfocenter/sound/index.html
diff --git a/kcontrol/info/xserver.desktop b/kcontrol/info/xserver.desktop
index 7e8e4c2ec..b253c2b53 100644
--- a/kcontrol/info/xserver.desktop
+++ b/kcontrol/info/xserver.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell xserver
+Exec=tdecmshell xserver
 Icon=kcmx
 Type=Application
 DocPath=kinfocenter/xserver/index.html