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

6 files changed, 32 insertions, 32 deletions

diff --git a/tdednssd/ioslave/CMakeLists.txt b/tdednssd/ioslave/CMakeLists.txt
index 6a37a49a..6f15a6b0 100644
--- a/tdednssd/ioslave/CMakeLists.txt
+++ b/tdednssd/ioslave/CMakeLists.txt
@@ -39,6 +39,6 @@ install( FILES
 
 tde_add_kpart( kio_zeroconf AUTOMOC
   SOURCES dnssd.cpp
-  LINK tdednssd-shared kio-shared
+  LINK tdednssd-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdednssd/ioslave/CONFIG_FORMAT b/tdednssd/ioslave/CONFIG_FORMAT
index 43e34001..35e25ea6 100644
--- a/tdednssd/ioslave/CONFIG_FORMAT
+++ b/tdednssd/ioslave/CONFIG_FORMAT
@@ -37,7 +37,7 @@ UserEntry=u
 PasswordEntry=p
 
 
-Resolved URL will be ssh://user:password@machine:port/ . ssh is helper protocol so ktelnetservice will be launched for
+Resolved URL will be ssh://user:password@machine:port/ . ssh is helper protocol so tdetelnetservice will be launched for
 this URL.
 
 
diff --git a/tdednssd/ioslave/Makefile.am b/tdednssd/ioslave/Makefile.am
index 3454d0f1..266dfeb4 100644
--- a/tdednssd/ioslave/Makefile.am
+++ b/tdednssd/ioslave/Makefile.am
@@ -16,6 +16,6 @@ remote_DATA = zeroconf.desktop
 remotedir = $(kde_datadir)/remoteview
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_zeroconf.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_zeroconf.pot
 
 METASOURCES = AUTO
diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp
index ba510be0..c045d41c 100644
--- a/tdednssd/ioslave/dnssd.cpp
+++ b/tdednssd/ioslave/dnssd.cpp
@@ -31,7 +31,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kinstance.h>
diff --git a/tdednssd/ioslave/dnssd.h b/tdednssd/ioslave/dnssd.h
index f06b0427..be9b95be 100644
--- a/tdednssd/ioslave/dnssd.h
+++ b/tdednssd/ioslave/dnssd.h
@@ -26,8 +26,8 @@
 #include <tqobject.h>
 
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
 #include <dnssd/servicebrowser.h>
 #include <dnssd/remoteservice.h>
 #include <tqstringlist.h>
diff --git a/tdednssd/ioslave/zeroconf.protocol b/tdednssd/ioslave/zeroconf.protocol
index 5343b282..2d4a9800 100644
--- a/tdednssd/ioslave/zeroconf.protocol
+++ b/tdednssd/ioslave/zeroconf.protocol
@@ -12,52 +12,52 @@ deleting=false
 linking=false
 moving=false
 Icon=network_local
-Description=A kioslave for ZeroConf
-Description[be]=Модуль kioslave для ZeroConf
+Description=A tdeioslave for ZeroConf
+Description[be]=Модуль tdeioslave для ZeroConf
 Description[bn]=জিরো-কন্ফ এর জন্য একটি কে-আই-ও স্লেভ
 Description[br]=Ur c'hioslave evit ZeroConf
-Description[bs]=kioslave za ZeroConf
-Description[ca]=Un kioslave per ZeroConf
+Description[bs]=tdeioslave za ZeroConf
+Description[ca]=Un tdeioslave per ZeroConf
 Description[cs]=Pomocný protokol pro Zeroconf
-Description[da]=En kioslave for Zeroconf
+Description[da]=En tdeioslave for Zeroconf
 Description[de]=Ein Ein-/Ausgabemodul für ZeroConf
-Description[el]=Ένα kioslave για το ZeroConf
-Description[es]=Un «kioslave» para ZeroConf
+Description[el]=Ένα tdeioslave για το ZeroConf
+Description[es]=Un «tdeioslave» para ZeroConf
 Description[et]=ZeroConfi I/O-moodul
-Description[eu]= kioslave bat ZeroConf-erako
-Description[fa]=یک kioslave برای ZeroConf
+Description[eu]= tdeioslave bat ZeroConf-erako
+Description[fa]=یک tdeioslave برای ZeroConf
 Description[fi]=Siirräntätyöskentelijä ZeroConfille
 Description[fr]=Un module d'entrée / sortie pour ZeroConf
 Description[gl]=Un kioslabe para ZeroConf
-Description[he]=kioslave בשביל ZeroConf
+Description[he]=tdeioslave בשביל ZeroConf
 Description[hu]=KDE-protokoll a Zeroconf használatához
-Description[is]=kioslave fyrir ZeroConf
-Description[it]=Un kioslave per Zeroconf
-Description[ja]=ZeroConf の kioslave
-Description[ka]= kioslave ZeroConfსთვის
-Description[kk]=ZeroConf-тың kioslave-і
-Description[km]=kioslave មួយ​សម្រាប់ ZeroConf
+Description[is]=tdeioslave fyrir ZeroConf
+Description[it]=Un tdeioslave per Zeroconf
+Description[ja]=ZeroConf の tdeioslave
+Description[ka]= tdeioslave ZeroConfსთვის
+Description[kk]=ZeroConf-тың tdeioslave-і
+Description[km]=tdeioslave មួយ​សម្រាប់ ZeroConf
 Description[lt]=Antrinė KDE programa skirta ZeroConf
-Description[nb]=En kioslave for ZeroConf
+Description[nb]=En tdeioslave for ZeroConf
 Description[nds]=In-/Utgaavmoduul för ZeroConf
 Description[ne]=जेरोकन्फका लागि कियोस्लाभ
-Description[nl]=Een kioslave voor ZeroConf
+Description[nl]=Een tdeioslave voor ZeroConf
 Description[nn]=Ein kio-slave for ZeroConf
 Description[pl]=Wtyczka protokołu ZeroConf
-Description[pt]=Um 'kioslave' para o ZeroConf
+Description[pt]=Um 'tdeioslave' para o ZeroConf
 Description[pt_BR]=Um IO-Slave para o ZeroConf
 Description[ro]=Un dispozitiv de I/E pentru ZeroConf
 Description[ru]=Kioslave для ZeroConf
-Description[sk]=kioslave pre ZeroConf
+Description[sk]=tdeioslave pre ZeroConf
 Description[sl]=Kioslave za ZeroConf
-Description[sr]=kioslave за ZeroConf
-Description[sr@Latn]=kioslave za ZeroConf
+Description[sr]=tdeioslave за ZeroConf
+Description[sr@Latn]=tdeioslave za ZeroConf
 Description[sv]=En I/O-slav för Zeroconf
-Description[tr]=Zeroconf kioslave'i
+Description[tr]=Zeroconf tdeioslave'i
 Description[uk]=Kioslave для ZeroConf
-Description[zh_CN]=ZeroConf 的 kioslave
-Description[zh_HK]=用於 ZeroConf 的 kioslave
-Description[zh_TW]=ZeroConf 的 kioslave
+Description[zh_CN]=ZeroConf 的 tdeioslave
+Description[zh_HK]=用於 ZeroConf 的 tdeioslave
+Description[zh_TW]=ZeroConf 的 tdeioslave
 maxInstances=4
 Class=:local