Additional k => tde renaming and fixes

47 files changed, 90 insertions, 90 deletions

diff --git a/tderesources/birthdays/CMakeLists.txt b/tderesources/birthdays/CMakeLists.txt
index bdde602b0..7ac1be774 100644
--- a/tderesources/birthdays/CMakeLists.txt
+++ b/tderesources/birthdays/CMakeLists.txt
@@ -27,20 +27,20 @@ link_directories(
 ##### headers ###################################
 
 install( FILES
-    resourcekabc.h resourcekabcconfig.h
+    resourcetdeabc.h resourcetdeabcconfig.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/libkcal )
 
 
 ##### other data ################################
 
-install( FILES kabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
+install( FILES tdeabc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kcal )
 
 
-##### kcal_kabc (module) #######################
+##### kcal_tdeabc (module) #######################
 
-tde_add_kpart( kcal_kabc AUTOMOC
+tde_add_kpart( kcal_tdeabc AUTOMOC
   SOURCES
-    resourcekabc.cpp resourcekabcconfig.cpp
+    resourcetdeabc.cpp resourcetdeabcconfig.cpp
   LINK kabcommon-static tdepim-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tderesources/birthdays/Makefile.am b/tderesources/birthdays/Makefile.am
index c31fc0472..08d3504f8 100644
--- a/tderesources/birthdays/Makefile.am
+++ b/tderesources/birthdays/Makefile.am
@@ -3,22 +3,22 @@ INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
            -I$(top_srcdir)/kaddressbook/common \
              $(all_includes)
 
-kde_module_LTLIBRARIES = kcal_kabc.la
+kde_module_LTLIBRARIES = kcal_tdeabc.la
 
-kcal_tdeabc_la_SOURCES = resourcekabc.cpp resourcekabcconfig.cpp
+kcal_tdeabc_la_SOURCES = resourcetdeabc.cpp resourcetdeabcconfig.cpp
 kcal_tdeabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcal_tdeabc_la_LIBADD  = $(top_builddir)/libkcal/libkcal.la \
                        $(top_builddir)/kaddressbook/common/libkabcommon.la
 
 libkcalincludedir = $(includedir)/libkcal
-libkcalinclude_HEADERS = resourcekabc.h resourcekabcconfig.h
+libkcalinclude_HEADERS = resourcetdeabc.h resourcetdeabcconfig.h
 
 servicedir = $(kde_servicesdir)/tderesources/kcal
-service_DATA = kabc.desktop
+service_DATA = tdeabc.desktop
 
 METASOURCES = AUTO
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kres_birthday.pot
 
-resourcekabcconfig.lo: ../../kaddressbook/common/kabprefs_base.h
+resourcetdeabcconfig.lo: ../../kaddressbook/common/kabprefs_base.h
diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp
index 68ef63390..d36ebdddb 100644
--- a/tderesources/birthdays/resourcekabc.cpp
+++ b/tderesources/birthdays/resourcetdeabc.cpp
@@ -50,15 +50,15 @@
 
 #include <tderesources/configwidget.h>
 
-#include "resourcekabcconfig.h"
+#include "resourcetdeabcconfig.h"
 
-#include "resourcekabc.h"
+#include "resourcetdeabc.h"
 
 using namespace KCal;
 
 extern "C"
 {
-  void *init_kcal_kabc()
+  void *init_kcal_tdeabc()
   {
 	  TDEGlobal::locale()->insertCatalogue( "kres_birthday" );
     TDEGlobal::locale()->insertCatalogue( "libkcal" );
@@ -136,7 +136,7 @@ bool ResourceTDEABC::doLoad()
 
   mCalendar.close();
 
-  // import from kabc
+  // import from tdeabc
   TQString summary;
   TQStringList::ConstIterator strIt;
   const TQStringList::ConstIterator endStrIt = mCategories.end();
@@ -525,4 +525,4 @@ void ResourceTDEABC::setTimeZoneId( const TQString& tzid )
   mCalendar.setTimeZoneId( tzid );
 }
 
-#include "resourcekabc.moc"
+#include "resourcetdeabc.moc"
diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcetdeabc.h
index bea4b4637..5ba80ca1b 100644
--- a/tderesources/birthdays/resourcekabc.h
+++ b/tderesources/birthdays/resourcetdeabc.h
@@ -18,8 +18,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef KCAL_RESOURCEKABC_H
-#define KCAL_RESOURCEKABC_H
+#ifndef KCAL_RESOURCETDEABC_H
+#define KCAL_RESOURCETDEABC_H
 
 #include <tqptrlist.h>
 #include <tqstring.h>
diff --git a/tderesources/birthdays/resourcekabcconfig.cpp b/tderesources/birthdays/resourcetdeabcconfig.cpp
index 6bead14b5..0f9b3279b 100644
--- a/tderesources/birthdays/resourcekabcconfig.cpp
+++ b/tderesources/birthdays/resourcetdeabcconfig.cpp
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <tdelocale.h>
 
-#include "resourcekabc.h"
-#include "resourcekabcconfig.h"
+#include "resourcetdeabc.h"
+#include "resourcetdeabcconfig.h"
 
 using namespace KCal;
 
@@ -132,4 +132,4 @@ void ResourceTDEABCConfig::alarmClicked()
   mALabel->setDisabled(!mAlarm->isChecked());
 }
 
-#include "resourcekabcconfig.moc"
+#include "resourcetdeabcconfig.moc"
diff --git a/tderesources/birthdays/resourcekabcconfig.h b/tderesources/birthdays/resourcetdeabcconfig.h
index c62037c2a..80efd02b3 100644
--- a/tderesources/birthdays/resourcekabcconfig.h
+++ b/tderesources/birthdays/resourcetdeabcconfig.h
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KCAL_RESOURCEKABCCONFIG_H
-#define KCAL_RESOURCEKABCCONFIG_H
+#ifndef KCAL_RESOURCETDEABCCONFIG_H
+#define KCAL_RESOURCETDEABCCONFIG_H
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
diff --git a/tderesources/birthdays/kabc.desktop b/tderesources/birthdays/tdeabc.desktop
index 8fadcb2b9..d9aaa4201 100644
--- a/tderesources/birthdays/kabc.desktop
+++ b/tderesources/birthdays/tdeabc.desktop
@@ -54,7 +54,7 @@ Name[tr]=TDE Adres Defterinden Doğum Günleri
 Name[uk]=Дні народження з KAddressBook
 Name[zh_CN]=KAddressBook 中的生日
 Name[zh_TW]=自 KaddressBook 匯入生日
-X-TDE-Library=kcal_kabc
+X-TDE-Library=kcal_tdeabc
 Type=Service
 ServiceTypes=KResources/Plugin
 X-TDE-ResourceFamily=calendar
diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp
index cd9a0fa46..5f57f1f65 100644
--- a/tderesources/blogging/xmlrpcjob.cpp
+++ b/tderesources/blogging/xmlrpcjob.cpp
@@ -36,7 +36,7 @@
 #include <tdeio/davjob.h>
 
 
-#define KIO_ARGS TQByteArray packedArgs; \
+#define TDEIO_ARGS TQByteArray packedArgs; \
                  TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
 using namespace TDEIO;
diff --git a/tderesources/egroupware/Makefile.am b/tderesources/egroupware/Makefile.am
index 644b68a34..b1ead510b 100644
--- a/tderesources/egroupware/Makefile.am
+++ b/tderesources/egroupware/Makefile.am
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libtdeabc_xmlrpc.la libkcal_xmlrpc.la libknotes_xmlrpc.la
 libtdeabc_xmlrpc_la_SOURCES = tdeabc_resourcexmlrpc.cpp tdeabc_resourcexmlrpcconfig.cpp  \
                             tdeabc_egroupwareprefs.kcfgc
 libtdeabc_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libtdeabc_xmlrpc_la_LIBADD = $(LIB_KIO) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la \
+libtdeabc_xmlrpc_la_LIBADD = $(LIB_TDEIO) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la \
                            $(top_builddir)/kaddressbook/common/libkabcommon.la \
                            libegwcommon.la
 
@@ -39,8 +39,8 @@ libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la -ltdeprint \
                              $(top_builddir)/libtdepim/libtdepim.la \
                              libegwcommon.la
 
-kabcincludedir = $(includedir)/tdeabc
-kabcinclude_HEADERS = tdeabc_resourcexmlrpc.h kcal_resourcexmlrpc.h
+tdeabcincludedir = $(includedir)/tdeabc
+tdeabcinclude_HEADERS = tdeabc_resourcexmlrpc.h kcal_resourcexmlrpc.h
 
 kde_module_LTLIBRARIES = tdeabc_xmlrpc.la kcal_xmlrpc.la knotes_xmlrpc.la
 
diff --git a/tderesources/egroupware/synchronizer.h b/tderesources/egroupware/synchronizer.h
index e9183bd20..ed9fd1353 100644
--- a/tderesources/egroupware/synchronizer.h
+++ b/tderesources/egroupware/synchronizer.h
@@ -25,7 +25,7 @@
 #include <tqobject.h>
 
 /**
-  A small helper class which blocks an asynchronous operation (e.g. a KIO request)
+  A small helper class which blocks an asynchronous operation (e.g. a TDEIO request)
   so that it can be used in a synchronous environment.
 
   Example:
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
index d4d6e233b..719c35c0c 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef KABC_RESOURCEXMLRPC_H
-#define KABC_RESOURCEXMLRPC_H
+#ifndef TDEABC_RESOURCEXMLRPC_H
+#define TDEABC_RESOURCEXMLRPC_H
 
 #include <tqmap.h>
 #include <tdepimmacros.h>
diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp
index 06ad93e06..dbbabc685 100644
--- a/tderesources/egroupware/xmlrpciface.cpp
+++ b/tderesources/egroupware/xmlrpciface.cpp
@@ -71,7 +71,7 @@ void Query::call( const TQString &server, const TQString &method,
 
   TDEIO::TransferJob *job = TDEIO::http_post( KURL( server ), postData, false );
   if ( !job ) {
-    kdWarning() << "Unable to create KIO job for " << server << endl;
+    kdWarning() << "Unable to create TDEIO job for " << server << endl;
     return;
   }
   job->addMetaData( "UserAgent", userAgent );
diff --git a/tderesources/featureplan/Makefile.am b/tderesources/featureplan/Makefile.am
index f37d5c6ba..9e85cd054 100644
--- a/tderesources/featureplan/Makefile.am
+++ b/tderesources/featureplan/Makefile.am
@@ -28,12 +28,12 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop
 
 check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist
 
-dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 dumpfeaturelist_LDADD   = libfeatureplancommon.la $(LIB_TDECORE)
 dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
 dumpfeaturelist_COMPILE_FIRST = kde-features.h
 
-benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 benchmarkfeaturelist_LDADD   = libfeatureplancommon.la $(LIB_TDECORE)
 benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
 benchmarkfeaturelist_COMPILE_FIRST = kde-features.h
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h
index dba61bf8e..36b0456c8 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav.h
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h
@@ -19,8 +19,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCEGROUPDAV_H
-#define KABC_RESOURCEGROUPDAV_H
+#ifndef TDEABC_RESOURCEGROUPDAV_H
+#define TDEABC_RESOURCEGROUPDAV_H
 
 #include "tdeabc_resourcegroupwarebase.h"
 #include <tdepimmacros.h>
diff --git a/tderesources/groupware/tdeabc_resourcegroupware.h b/tderesources/groupware/tdeabc_resourcegroupware.h
index 06088f5de..59bbc9a48 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware.h
+++ b/tderesources/groupware/tdeabc_resourcegroupware.h
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCEGROUPWARE_H
-#define KABC_RESOURCEGROUPWARE_H
+#ifndef TDEABC_RESOURCEGROUPWARE_H
+#define TDEABC_RESOURCEGROUPWARE_H
 
 #include <tdeabcresourcecached.h>
 
diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
index a52b0fa0a..86825bbf3 100644
--- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCEGROUPWARECONFIG_H
-#define KABC_RESOURCEGROUPWARECONFIG_H
+#ifndef TDEABC_RESOURCEGROUPWARECONFIG_H
+#define TDEABC_RESOURCEGROUPWARECONFIG_H
 
 #include <tderesources/configwidget.h>
 
diff --git a/tderesources/groupwise/soap/Makefile.am b/tderesources/groupwise/soap/Makefile.am
index bd05c6de8..7ec469247 100644
--- a/tderesources/groupwise/soap/Makefile.am
+++ b/tderesources/groupwise/soap/Makefile.am
@@ -5,7 +5,7 @@ KDE_CXXFLAGS = -Wno-non-virtual-dtor
 
 check_PROGRAMS = soapdebug
 
-soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 soapdebug_LDADD   = libgwsoap.la -ltdecore \
                    $(top_builddir)/libkcal/libkcal.la \
                    $(top_builddir)/libtdepim/libtdepim.la
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index 8e0867bce..fb1d075ae 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCEGROUPWISE_H
-#define KABC_RESOURCEGROUPWISE_H
+#ifndef TDEABC_RESOURCEGROUPWISE_H
+#define TDEABC_RESOURCEGROUPWISE_H
 
 #include "soap/groupwiseserver.h"
 
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
index 410221962..df62753a5 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCEGROUPWISECONFIG_H
-#define KABC_RESOURCEGROUPWISECONFIG_H
+#ifndef TDEABC_RESOURCEGROUPWISECONFIG_H
+#define TDEABC_RESOURCEGROUPWISECONFIG_H
 
 #include "soap/groupwiseserver.h"
 
diff --git a/tderesources/groupwise/tdeioslave/Makefile.am b/tderesources/groupwise/tdeioslave/Makefile.am
index 8ae6220c0..5f5f012dc 100644
--- a/tderesources/groupwise/tdeioslave/Makefile.am
+++ b/tderesources/groupwise/tdeioslave/Makefile.am
@@ -12,7 +12,7 @@ kde_module_LTLIBRARIES =  tdeio_groupwise.la
 
 tdeio_groupwise_la_SOURCES = groupwise.cpp
 tdeio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
-  ../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
+  ../soap/libgwsoap.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO)
 tdeio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 messages: rc.cpp
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 5371ac119..869ddca8e 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -165,7 +165,7 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
   if ( !count )
     return true;
 
-  const int nbMessages = 200; // read 200 mails at a time (see kabc resource)
+  const int nbMessages = 200; // read 200 mails at a time (see tdeabc resource)
 
   const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
                            : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
diff --git a/tderesources/kolab/kcal/resourcekolab_plugin.cpp b/tderesources/kolab/kcal/resourcekolab_plugin.cpp
index eb56897ae..7b9e85d04 100644
--- a/tderesources/kolab/kcal/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/kcal/resourcekolab_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klar�lvdalens Datakonsult AB
         <[email protected]>
 
diff --git a/tderesources/kolab/knotes/resourcekolab_plugin.cpp b/tderesources/kolab/knotes/resourcekolab_plugin.cpp
index f589986cb..0cd126bd8 100644
--- a/tderesources/kolab/knotes/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/knotes/resourcekolab_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klar�lvdalens Datakonsult AB
         <[email protected]>
 
diff --git a/tderesources/kolab/shared/subresource.cpp b/tderesources/kolab/shared/subresource.cpp
index 7520d275a..cc51c6403 100644
--- a/tderesources/kolab/shared/subresource.cpp
+++ b/tderesources/kolab/shared/subresource.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
         <[email protected]>
 
diff --git a/tderesources/kolab/shared/subresource.h b/tderesources/kolab/shared/subresource.h
index 79104a747..4c79632d3 100644
--- a/tderesources/kolab/shared/subresource.h
+++ b/tderesources/kolab/shared/subresource.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
         <[email protected]>
 
diff --git a/tderesources/kolab/tdeabc/CMakeLists.txt b/tderesources/kolab/tdeabc/CMakeLists.txt
index f3a5596e6..9a77705ca 100644
--- a/tderesources/kolab/tdeabc/CMakeLists.txt
+++ b/tderesources/kolab/tdeabc/CMakeLists.txt
@@ -39,14 +39,14 @@ install(
 
 tde_add_kpart( tdeabc_kolab AUTOMOC
   SOURCES resourcekolab_plugin.cpp
-  LINK kabckolab-shared
+  LINK tdeabckolab-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### kabckolab (shared) ########################
+##### tdeabckolab (shared) ########################
 
-tde_add_library( kabckolab SHARED AUTOMOC
+tde_add_library( tdeabckolab SHARED AUTOMOC
   SOURCES resourcekolab.cpp contact.cpp
   VERSION 0.0.0
   LINK resourcekolabshared-static kgroupwarebase-shared
diff --git a/tderesources/kolab/tdeabc/Makefile.am b/tderesources/kolab/tdeabc/Makefile.am
index e750d5464..64df12be1 100644
--- a/tderesources/kolab/tdeabc/Makefile.am
+++ b/tderesources/kolab/tdeabc/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
 INCLUDES = -I$(top_srcdir)/tderesources/kolab/shared -I$(top_srcdir) $(all_includes)
 
 # The kolab wizard links to this library too
-lib_LTLIBRARIES = libkabckolab.la
+lib_LTLIBRARIES = libtdeabckolab.la
 
-libkabckolab_la_SOURCES = resourcekolab.cpp contact.cpp
-libkabckolab_la_LDFLAGS = $(all_libraries) -no-undefined
-libkabckolab_la_LIBADD =  \
+libtdeabckolab_la_SOURCES = resourcekolab.cpp contact.cpp
+libtdeabckolab_la_LDFLAGS = $(all_libraries) -no-undefined
+libtdeabckolab_la_LIBADD =  \
 	$(top_builddir)/tderesources/kolab/shared/libresourcekolabshared.la \
 	-ltderesources -ltdeabc
 
@@ -17,7 +17,7 @@ noinst_HEADERS = resourcekolab.h contact.h
 
 tdeabc_kolab_la_SOURCES = resourcekolab_plugin.cpp
 tdeabc_kolab_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-tdeabc_kolab_la_LIBADD = libkabckolab.la
+tdeabc_kolab_la_LIBADD = libtdeabckolab.la
 
 servicedir = $(kde_servicesdir)/tderesources/tdeabc
 service_DATA = kolab.desktop
diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp
index 337dbe5c1..13f679b98 100644
--- a/tderesources/kolab/tdeabc/contact.cpp
+++ b/tderesources/kolab/tdeabc/contact.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
         <[email protected]>
 
diff --git a/tderesources/kolab/tdeabc/contact.h b/tderesources/kolab/tdeabc/contact.h
index f13b0a7cb..bed71b440 100644
--- a/tderesources/kolab/tdeabc/contact.h
+++ b/tderesources/kolab/tdeabc/contact.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <[email protected]>
 
diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp
index f4391f76d..7476212e6 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <[email protected]>
 
diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index 52fa93d35..a19dfbaa0 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klarälvdalens Datakonsult AB
         <[email protected]>
 
@@ -162,7 +162,7 @@ protected:
                        TQ_UINT32 sernum, const KMailICalIface::StorageFormat format );
 
   TQString configFile() const {
-    return Kolab::ResourceKolabBase::configFile( "kabc" );
+    return Kolab::ResourceKolabBase::configFile( "tdeabc" );
   }
 
   void writeConfig();
diff --git a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
index a66cb9bdd..67f2408b1 100644
--- a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-    This file is part of libkabc and/or kaddressbook.
+    This file is part of libtdeabc and/or kaddressbook.
     Copyright (c) 2002 - 2004 Klar�lvdalens Datakonsult AB
         <[email protected]>
 
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index f24a7602c..7835d3d23 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
@@ -19,8 +19,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCEGROUPWARE_H
-#define KABC_RESOURCEGROUPWARE_H
+#ifndef TDEABC_RESOURCEGROUPWARE_H
+#define TDEABC_RESOURCEGROUPWARE_H
 
 #include <kurl.h>
 #include <tdeabcresourcecached.h>
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index c8f4646e6..7b8326239 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
@@ -19,8 +19,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCEGROUPWAREBASECONFIG_H
-#define KABC_RESOURCEGROUPWAREBASECONFIG_H
+#ifndef TDEABC_RESOURCEGROUPWAREBASECONFIG_H
+#define TDEABC_RESOURCEGROUPWAREBASECONFIG_H
 
 #include <tderesources/configwidget.h>
 #include <tdepimmacros.h>
diff --git a/tderesources/newexchange/Person.mapping b/tderesources/newexchange/Person.mapping
index ac0f0b3a1..e2b8c8f9b 100644
--- a/tderesources/newexchange/Person.mapping
+++ b/tderesources/newexchange/Person.mapping
@@ -2,7 +2,7 @@ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/e2k3/e2k3/_cdo_
 http://msdn.microsoft.com/library/default.asp?url=/library/en-us/e2k3/e2k3/_exch2k_urn_content-classes_person.asp
 
 /* KDE4: addressee does not have any creation or modification date :-(( */
-/* KDE4: read-only not supported by libkabc */
+/* KDE4: read-only not supported by libtdeabc */
 
 WebDAV property                              |  Addressee:: method
 ---------------------------------------------+----------------------    
diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp
index dae145677..5551516e4 100644
--- a/tderesources/newexchange/exchangeconvertercontact.cpp
+++ b/tderesources/newexchange/exchangeconvertercontact.cpp
@@ -226,7 +226,7 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
     addressee.insertCustom( "TDEPIM-Exchange-Resource", "href", tmpstr );
 
 /* KDE4: addressee does not have any creation or modification date :-(( */
-/* KDE4: read-only not supported by libkabc */
+/* KDE4: read-only not supported by libtdeabc */
 
   // Name: first, family, pre/postfixes, common name
   if ( WebdavHandler::extractString( node, "fileas", tmpstr ) ||
@@ -278,7 +278,7 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
   if ( WebdavHandler::extractString( node, "email3", tmpstr ) )
     addressee.insertEmail( tmpstr );
 
-  // No kabc field for personalHomePage
+  // No tdeabc field for personalHomePage
   if ( WebdavHandler::extractString( node, "businesshomepage", tmpstr ) )
     addressee.setUrl( tmpstr );
 
diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h
index 732ed981c..a5ae0e5ed 100644
--- a/tderesources/newexchange/tdeabc_resourceexchange.h
+++ b/tderesources/newexchange/tdeabc_resourceexchange.h
@@ -18,8 +18,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCEEXCHANGE_H
-#define KABC_RESOURCEEXCHANGE_H
+#ifndef TDEABC_RESOURCEEXCHANGE_H
+#define TDEABC_RESOURCEEXCHANGE_H
 
 #include <tdeabc_resourcegroupwarebase.h>
 
diff --git a/tderesources/scalix/README b/tderesources/scalix/README
index 34a00e9ad..d2519102c 100644
--- a/tderesources/scalix/README
+++ b/tderesources/scalix/README
@@ -3,7 +3,7 @@ groupware servers use a similar storage concept (storing pim items as
 email attachments on an IMAP server).
 
 However the Scalix Resource has several modifications, e.g. the XML storage
-type was removed and freebusy handling is done via a separated KIO slave.
+type was removed and freebusy handling is done via a separated TDEIO slave.
 
 If you have any problems, questions or suggestions contact me under
   Tobias Koenig <[email protected]>
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index 25963a29b..ff9158d10 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -154,7 +154,7 @@ bool ResourceScalix::loadSubResource( const TQString& subResource,
   if ( !count )
     return true;
 
-  const int nbMessages = 200; // read 200 mails at a time (see kabc resource)
+  const int nbMessages = 200; // read 200 mails at a time (see tdeabc resource)
 
   const TQString labelTxt = !strcmp(mimetype, "application/x-vnd.kolab.task") ? i18n( "Loading tasks..." )
                            : !strcmp(mimetype, "application/x-vnd.kolab.journal") ? i18n( "Loading journals..." )
diff --git a/tderesources/scalix/scalixadmin/Makefile.am b/tderesources/scalix/scalixadmin/Makefile.am
index 4d072ac47..0758ccfc2 100644
--- a/tderesources/scalix/scalixadmin/Makefile.am
+++ b/tderesources/scalix/scalixadmin/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin
 
 INCLUDES = $(all_includes)
 
-scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 scalixadmin_LDADD   = $(LIB_TDEABC)
 scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
                       otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \
diff --git a/tderesources/scalix/tdeabc/CMakeLists.txt b/tderesources/scalix/tdeabc/CMakeLists.txt
index bfdaa3478..5875d5ac7 100644
--- a/tderesources/scalix/tdeabc/CMakeLists.txt
+++ b/tderesources/scalix/tdeabc/CMakeLists.txt
@@ -38,14 +38,14 @@ install(
 
 tde_add_kpart( tdeabc_scalix AUTOMOC
   SOURCES resourcescalix_plugin.cpp
-  LINK kabcscalix-shared
+  LINK tdeabcscalix-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
 
-##### kabcscalix (shared) #######################
+##### tdeabcscalix (shared) #######################
 
-tde_add_library( kabcscalix SHARED AUTOMOC
+tde_add_library( tdeabcscalix SHARED AUTOMOC
   SOURCES resourcescalix.cpp contact.cpp
   VERSION 0.0.0
   LINK resourcescalixshared-static kgroupwarebase-shared
diff --git a/tderesources/scalix/tdeabc/Makefile.am b/tderesources/scalix/tdeabc/Makefile.am
index 88cf96d14..79577d8dd 100644
--- a/tderesources/scalix/tdeabc/Makefile.am
+++ b/tderesources/scalix/tdeabc/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
 INCLUDES = -I$(top_srcdir)/tderesources/scalix/shared -I$(top_srcdir) $(all_includes)
 
 # The scalix wizard links to this library too
-lib_LTLIBRARIES = libkabcscalix.la
+lib_LTLIBRARIES = libtdeabcscalix.la
 
-libkabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp
-libkabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined
-libkabcscalix_la_LIBADD =  \
+libtdeabcscalix_la_SOURCES = resourcescalix.cpp contact.cpp
+libtdeabcscalix_la_LDFLAGS = $(all_libraries) -no-undefined
+libtdeabcscalix_la_LIBADD =  \
 	$(top_builddir)/tderesources/scalix/shared/libresourcescalixshared.la \
 	-ltderesources -ltdeabc
 
@@ -17,7 +17,7 @@ noinst_HEADERS = resourcescalix.h
 
 tdeabc_scalix_la_SOURCES = resourcescalix_plugin.cpp
 tdeabc_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
-tdeabc_scalix_la_LIBADD = libkabcscalix.la
+tdeabc_scalix_la_LIBADD = libtdeabcscalix.la
 
 servicedir = $(kde_servicesdir)/tderesources/tdeabc
 service_DATA = scalix.desktop
diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h
index 0fa58cdff..f9d4c3092 100644
--- a/tderesources/scalix/tdeabc/resourcescalix.h
+++ b/tderesources/scalix/tdeabc/resourcescalix.h
@@ -157,7 +157,7 @@ protected:
                        TQ_UINT32 sernum, const KMailICalIface::StorageFormat format );
 
   TQString configFile() const {
-    return Scalix::ResourceScalixBase::configFile( "kabc" );
+    return Scalix::ResourceScalixBase::configFile( "tdeabc" );
   }
 
   // The list of subresources
diff --git a/tderesources/scalix/tdeioslave/Makefile.am b/tderesources/scalix/tdeioslave/Makefile.am
index 70c0951b9..7b306ea3a 100644
--- a/tderesources/scalix/tdeioslave/Makefile.am
+++ b/tderesources/scalix/tdeioslave/Makefile.am
@@ -10,7 +10,7 @@ kdelnk_DATA = scalix.protocol scalixs.protocol
 kde_module_LTLIBRARIES =  tdeio_scalix.la
 
 tdeio_scalix_la_SOURCES = scalix.cpp
-tdeio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO)
+tdeio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO)
 tdeio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 messages: rc.cpp
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 268b164bf..5ce8dca1d 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -157,7 +157,7 @@ void Scalix::publishFreeBusy( const KURL &url )
     const int newSize = readData(buffer);
     if ( newSize < 0 ) {
       // read error: network in unknown state so disconnect
-      error( TDEIO::ERR_COULD_NOT_READ, i18n("KIO data supply error.") );
+      error( TDEIO::ERR_COULD_NOT_READ, i18n("TDEIO data supply error.") );
       return;
     }
 
diff --git a/tderesources/slox/Makefile.am b/tderesources/slox/Makefile.am
index 6175de162..319041882 100644
--- a/tderesources/slox/Makefile.am
+++ b/tderesources/slox/Makefile.am
@@ -34,7 +34,7 @@ tdeabc_slox_la_LIBADD  = libtdeabc_slox.la
 
 EXTRA_PROGRAMS = testsloxaccounts
 
-testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 testsloxaccounts_LDADD = libkslox.la
 testsloxaccounts_SOURCES = testsloxaccounts.cpp
 
diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h
index af2686f65..35a71be22 100644
--- a/tderesources/slox/tdeabcresourceslox.h
+++ b/tderesources/slox/tdeabcresourceslox.h
@@ -17,8 +17,8 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
-#ifndef KABC_RESOURCESLOX_H
-#define KABC_RESOURCESLOX_H
+#ifndef TDEABC_RESOURCESLOX_H
+#define TDEABC_RESOURCESLOX_H
 
 #include "sloxbase.h"
 #include "webdavhandler.h"