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

13 files changed, 19 insertions, 19 deletions

diff --git a/lanbrowsing/kcmlisa/kcmkiolan.desktop b/lanbrowsing/kcmlisa/kcmkiolan.desktop
index 06fba0d7..78279de8 100644
--- a/lanbrowsing/kcmlisa/kcmkiolan.desktop
+++ b/lanbrowsing/kcmlisa/kcmkiolan.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=samba
-Exec=kcmshell kcmkiolan
+Exec=tdecmshell kcmkiolan
 
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser
@@ -9,7 +9,7 @@ X-TDE-FactoryName=kiolan
 
 Name=LAN KIO Slave
 Name[ar]=الشبكة المحلية KIO Slave
-Name[be]=Модуль kioslave для мясцовай сетцы
+Name[be]=Модуль tdeioslave для мясцовай сетцы
 Name[bn]=ল্যান কে-আই-ও স্লেভ
 Name[br]=Sklav LAN evit KIO
 Name[bs]=LAN KIO slave
diff --git a/lanbrowsing/kcmlisa/kcmkiolan.h b/lanbrowsing/kcmlisa/kcmkiolan.h
index 53e88ed3..86dd0fa4 100644
--- a/lanbrowsing/kcmlisa/kcmkiolan.h
+++ b/lanbrowsing/kcmlisa/kcmkiolan.h
@@ -23,7 +23,7 @@
 
 #include "portsettingsbar.h"
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TQCheckBox;
 class TQLineEdit;
diff --git a/lanbrowsing/kcmlisa/kcmlisa.desktop b/lanbrowsing/kcmlisa/kcmlisa.desktop
index 161a8f9f..ffd92dd0 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.desktop
+++ b/lanbrowsing/kcmlisa/kcmlisa.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=samba
-Exec=kcmshell kcmlisa
+Exec=tdecmshell kcmlisa
 
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser
diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h
index 6e0370ee..1f83942e 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.h
+++ b/lanbrowsing/kcmlisa/kcmlisa.h
@@ -21,7 +21,7 @@
 #ifndef KCMLISA_H
 #define KCMLISA_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdecmodule.h>
 
 class TQPushButton;
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.desktop b/lanbrowsing/kcmlisa/kcmreslisa.desktop
index f83db9f9..04098538 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.desktop
+++ b/lanbrowsing/kcmlisa/kcmreslisa.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Icon=samba
-Exec=kcmshell kcmreslisa
+Exec=tdecmshell kcmreslisa
 
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.h b/lanbrowsing/kcmlisa/kcmreslisa.h
index 522b504e..69f226db 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.h
+++ b/lanbrowsing/kcmlisa/kcmreslisa.h
@@ -22,7 +22,7 @@
 #define KCMRESLISA_H
 
 #include <tdecmodule.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class TQSpinBox;
diff --git a/lanbrowsing/kio_lan/CMakeLists.txt b/lanbrowsing/kio_lan/CMakeLists.txt
index d3a117f3..d2fb242f 100644
--- a/lanbrowsing/kio_lan/CMakeLists.txt
+++ b/lanbrowsing/kio_lan/CMakeLists.txt
@@ -43,6 +43,6 @@ install( FILES
 
 tde_add_kpart( kio_lan
   SOURCES kio_lan.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/lanbrowsing/kio_lan/Makefile.am b/lanbrowsing/kio_lan/Makefile.am
index c7a22ed6..90eaec15 100644
--- a/lanbrowsing/kio_lan/Makefile.am
+++ b/lanbrowsing/kio_lan/Makefile.am
@@ -1,4 +1,4 @@
-## Makefile.am of tdebase/kioslave/man
+## Makefile.am of tdebase/tdeioslave/man
 
 INCLUDES= $(all_includes)
 
@@ -27,5 +27,5 @@ konq_sidebartreedir = $(kde_datadir)/konqsidebartng/virtual_folders/services
 METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_lan.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_lan.pot
 
diff --git a/lanbrowsing/kio_lan/README b/lanbrowsing/kio_lan/README
index 08b6278a..224cae5b 100644
--- a/lanbrowsing/kio_lan/README
+++ b/lanbrowsing/kio_lan/README
@@ -8,9 +8,9 @@ use the automake/configure stuff.
 On some systems (e.g. Solaris) you will have to add some libraries, like
 -lnsl, I think.
 
-Copy this directory e.g. under tdebase/kioslave and enter it in
-tdebase/kioslave/Makefile.am in the SUBDIR line. The rerun make in
-tdebase/kioslave.
+Copy this directory e.g. under tdebase/tdeioslave and enter it in
+tdebase/tdeioslave/Makefile.am in the SUBDIR line. The rerun make in
+tdebase/tdeioslave.
 
 Alexander Neundorf
 <neundorf@kde.org>
diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp
index 9490f7b4..4e7040ac 100644
--- a/lanbrowsing/kio_lan/kio_lan.cpp
+++ b/lanbrowsing/kio_lan/kio_lan.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kinstance.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kprocess.h>
 
diff --git a/lanbrowsing/kio_lan/kio_lan.h b/lanbrowsing/kio_lan/kio_lan.h
index 40dd14ba..6b9887dc 100644
--- a/lanbrowsing/kio_lan/kio_lan.h
+++ b/lanbrowsing/kio_lan/kio_lan.h
@@ -20,9 +20,9 @@
 #ifndef KIO_XLAN_H
 #define KIO_XLAN_H
 
-#include <kio/slavebase.h>
-#include <kio/tcpslavebase.h>
-#include <kio/global.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/tcpslavebase.h>
+#include <tdeio/global.h>
 
 #include <tqvaluevector.h>
 #include <tqcstring.h>
diff --git a/lanbrowsing/kio_lan/lan.protocol b/lanbrowsing/kio_lan/lan.protocol
index ba72a216..59c72062 100644
--- a/lanbrowsing/kio_lan/lan.protocol
+++ b/lanbrowsing/kio_lan/lan.protocol
@@ -10,6 +10,6 @@ makedir=false
 deleting=false
 linking=false
 moving=false
-DocPath=kioslave/lan.html
+DocPath=tdeioslave/lan.html
 Icon=network_local
 Class=:local
diff --git a/lanbrowsing/kio_lan/rlan.protocol b/lanbrowsing/kio_lan/rlan.protocol
index de2c0ad4..79fe3c3c 100644
--- a/lanbrowsing/kio_lan/rlan.protocol
+++ b/lanbrowsing/kio_lan/rlan.protocol
@@ -10,6 +10,6 @@ makedir=false
 deleting=false
 linking=false
 moving=false
-DocPath=kioslave/rlan.html
+DocPath=tdeioslave/rlan.html
 Icon=network_local
 Class=:local