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

17 files changed, 22 insertions, 22 deletions

diff --git a/tderesources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt
index 68c829a7b..a5617229a 100644
--- a/tderesources/groupwise/CMakeLists.txt
+++ b/tderesources/groupwise/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_subdirectory( soap )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tderesources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am
index 4b7eb408e..486e89774 100644
--- a/tderesources/groupwise/Makefile.am
+++ b/tderesources/groupwise/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = soap kioslave
+SUBDIRS = soap tdeioslave
 
 INCLUDES = -I$(top_srcdir) $(all_includes)
 
diff --git a/tderesources/groupwise/kabc_resourcegroupwise.cpp b/tderesources/groupwise/kabc_resourcegroupwise.cpp
index b3930bfbe..cf5c4e95d 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise.cpp
+++ b/tderesources/groupwise/kabc_resourcegroupwise.cpp
@@ -23,7 +23,7 @@
 
 #include <kabc/addressee.h>
 #include <kabc/vcardconverter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/tderesources/groupwise/kabc_resourcegroupwise.h b/tderesources/groupwise/kabc_resourcegroupwise.h
index 658ddd76b..0c7533eef 100644
--- a/tderesources/groupwise/kabc_resourcegroupwise.h
+++ b/tderesources/groupwise/kabc_resourcegroupwise.h
@@ -27,7 +27,7 @@
 
 #include <libtdepim/progressmanager.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class TDEConfig;
 
diff --git a/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc b/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc
index 3130cde1e..357cdc956 100644
--- a/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc
+++ b/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=tderesources_kcal_groupwise.kcfg
 ClassName=GroupwisePrefsBase
 NameSpace=KCal
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h
index 088e624a6..f4417079c 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.h
+++ b/tderesources/groupwise/kcal_resourcegroupwise.h
@@ -28,8 +28,8 @@
 #include <libkcal/resourcecached.h>
 
 #include <kabc/locknull.h>
-#include <kio/job.h>
-#include <kconfig.h>
+#include <tdeio/job.h>
+#include <tdeconfig.h>
 #include <tdepimmacros.h>
 
 class ngwt__Settings;
diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index 9112fdeab..cedcde6aa 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -30,9 +30,9 @@
 #include <kabc/addressee.h>
 #include <kabc/addresseelist.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kprotocolmanager.h>
 #include <ktempfile.h>
 #include <kdebug.h>
diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h
index 95218be06..e1c25c0f3 100644
--- a/tderesources/groupwise/soap/groupwiseserver.h
+++ b/tderesources/groupwise/soap/groupwiseserver.h
@@ -21,8 +21,8 @@
 #ifndef GROUPWISESERVER_H
 #define GROUPWISESERVER_H
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <tqapplication.h>
 #include <tqmap.h>
 #include <tqobject.h>
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 90ccf83d6..809c29b8b 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -181,12 +181,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin
 		d->dcc = new DCOPClient();
 		d->dcc->attach();
 	}
-	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+	if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 	{
-		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 	}
 
-	d->dcc->call("kio_uiserver", "UIServer",
+	d->dcc->call("tdeio_uiserver", "UIServer",
 			"messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
 
 	if( returnType == "int" )
diff --git a/tderesources/groupwise/soap/ksslsocket.h b/tderesources/groupwise/soap/ksslsocket.h
index c19b440a1..425459483 100644
--- a/tderesources/groupwise/soap/ksslsocket.h
+++ b/tderesources/groupwise/soap/ksslsocket.h
@@ -21,7 +21,7 @@
 
 #include <tqvariant.h>
 #include <kextsock.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class KSSLSocketPrivate;
 
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index 415021a78..e68da9ee1 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -3,7 +3,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <ktempfile.h>
 
diff --git a/tderesources/groupwise/kioslave/CMakeLists.txt b/tderesources/groupwise/tdeioslave/CMakeLists.txt
index 23476fe0e..23476fe0e 100644
--- a/tderesources/groupwise/kioslave/CMakeLists.txt
+++ b/tderesources/groupwise/tdeioslave/CMakeLists.txt
diff --git a/tderesources/groupwise/kioslave/Makefile.am b/tderesources/groupwise/tdeioslave/Makefile.am
index 2b2eaa074..e6da52837 100644
--- a/tderesources/groupwise/kioslave/Makefile.am
+++ b/tderesources/groupwise/tdeioslave/Makefile.am
@@ -16,4 +16,4 @@ kio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
 kio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kio_groupwise.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_groupwise.pot
diff --git a/tderesources/groupwise/kioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index c3addd3b0..bfa02156a 100644
--- a/tderesources/groupwise/kioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -34,7 +34,7 @@
 #include <kabc/vcardconverter.h>
 
 #include <kinstance.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ktempfile.h>
diff --git a/tderesources/groupwise/kioslave/groupwise.h b/tderesources/groupwise/tdeioslave/groupwise.h
index c5f109d30..e95ed260a 100644
--- a/tderesources/groupwise/kioslave/groupwise.h
+++ b/tderesources/groupwise/tdeioslave/groupwise.h
@@ -20,7 +20,7 @@
 #ifndef GROUPWISE_H
 #define GROUPWISE_H
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 #include <tqobject.h>
 
diff --git a/tderesources/groupwise/kioslave/groupwise.protocol b/tderesources/groupwise/tdeioslave/groupwise.protocol
index ec22851aa..a7c26b6e3 100644
--- a/tderesources/groupwise/kioslave/groupwise.protocol
+++ b/tderesources/groupwise/tdeioslave/groupwise.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-DocPath=kioslave/groupwise.html
+DocPath=tdeioslave/groupwise.html
 exec=kio_groupwise
 input=none
 output=filesystem
diff --git a/tderesources/groupwise/kioslave/groupwises.protocol b/tderesources/groupwise/tdeioslave/groupwises.protocol
index b2b2c7b9b..2666f1fd7 100644
--- a/tderesources/groupwise/kioslave/groupwises.protocol
+++ b/tderesources/groupwise/tdeioslave/groupwises.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-DocPath=kioslave/groupwise.html
+DocPath=tdeioslave/groupwise.html
 exec=kio_groupwise
 input=none
 output=filesystem