Additional k => tde renaming and fixes

CMakeLists.txt

@@ -112,7 +112,7 @@ option( BUILD_KNOTES "Build knotes" ${BUILD_ALL} )
 option( BUILD_KODE "Build kode" ${BUILD_ALL} )
 option( BUILD_TDERESOURCES "Build tderesources" ${BUILD_ALL} )
 option( BUILD_WIZARDS "Build wizards" ${BUILD_ALL} )
-option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
+option( BUILD_TDEABC "Build tdeabc" ${BUILD_ALL} )
 option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
 option( BUILD_KMAILCVT "Build kmailcvt" ${BUILD_ALL} )
 option( BUILD_KARM "Build karm" ${BUILD_ALL} )
@@ -184,7 +184,7 @@ tde_conditional_add_subdirectory( BUILD_KNOTES knotes )
 tde_conditional_add_subdirectory( BUILD_KODE kode )
 tde_conditional_add_subdirectory( BUILD_TDERESOURCES tderesources )
 tde_conditional_add_subdirectory( BUILD_WIZARDS wizards )
-tde_conditional_add_subdirectory( BUILD_KABC kabc )
+tde_conditional_add_subdirectory( BUILD_TDEABC tdeabc )
 tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )
 tde_conditional_add_subdirectory( BUILD_KMAILCVT kmailcvt )
 tde_conditional_add_subdirectory( BUILD_KARM karm )

Makefile.am.in

@@ -38,7 +38,7 @@ COMPILE_BEFORE_kitchensync = libtdepim
 COMPILE_BEFORE_akregator = libtdepim
 COMPILE_BEFORE_knotes = libtdepim
 COMPILE_BEFORE_konsolekalendar = libtdepim
-COMPILE_BEFORE_kabc = libtdepim
+COMPILE_BEFORE_tdeabc = libtdepim
 
 AUTOMAKE_OPTIONS = foreign 1.6.1
 DISTCLEANFILES = inst-apps

README

@@ -48,7 +48,7 @@ There is also quite an amount of infrastructure in this package:
 * libkcal: C++ api for the iCalendar and vCalendar formats
 * libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
 * libkpimexchange: connecting to Exchange2000 servers
-* tdeabc/frontend: A GUI frontend for libkabc, not intended for end users.
+* tdeabc/frontend: A GUI frontend for libtdeabc, not intended for end users.
 * kgantt: lib to display and manage Gantt diagrams used by the project view
           plugin of KOrganizer
 * kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of

README.Kolab

@@ -76,7 +76,7 @@ General Notes:
 ==============
 Autocompletion: Works in both KMail and KOrganizer. The order of resources used for completion
 is as follows:
-  1. All available addressbook resources as seen in "tdecmshell tderesources", section "kabc"
+  1. All available addressbook resources as seen in "tdecmshell tderesources", section "tdeabc"
   2. LDAP
 
 Nothing special, AFAIK

akregator/src/Makefile.am

@@ -20,9 +20,9 @@ bin_PROGRAMS = akregator
 
 # the application source, library search path, and link libraries
 akregator_SOURCES = main.cpp mainwindow.cpp
-akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la
-#akregator_LDADD = $(LIB_KPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
+akregator_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la
+#akregator_LDADD = $(LIB_TDEPARTS) libakregatorprivate.la $(top_builddir)/libtdepim/libtdepim.la
 
 # this is where the desktop file will go
 xdg_apps_DATA = akregator.desktop
@@ -145,8 +145,8 @@ libakregatorpart_la_SOURCES = \
 	kspeechsink.skel \
 	kspeech.stub
 
-libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_KUTILS) -avoid-version -no-undefined $(all_libraries)
-libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
+libakregatorpart_la_LDFLAGS = $(KDE_RPATH) $(KDE_PLUGIN) $(LIB_TDEUTILS) -avoid-version -no-undefined $(all_libraries)
+libakregatorpart_la_LIBADD = libakregatorprivate.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
 
 # this is where the desktop file will go
 partdesktopdir = $(kde_servicesdir)

akregator/src/librss/Makefile.am

@@ -16,7 +16,7 @@ librsslocal_la_METASOURCES = AUTO
 check_PROGRAMS = testlibrss
 testlibrss_SOURCES = testlibrss.cpp
 testlibrss_LDFLAGS = $(all_libraries)
-testlibrss_LDADD =  librsslocal.la $(LIB_KIO)
+testlibrss_LDADD =  librsslocal.la $(LIB_TDEIO)
 
 DOXYGEN_REFERENCES = tdeui
 include $(top_srcdir)/admin/Doxyfile.am

akregator/src/librss/loader.h

@@ -114,8 +114,8 @@ namespace RSS
 			/**
 			 * @return The error code for the last process of retrieving data.
 			 * The returned numbers correspond directly to the error codes
-			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
-			 * defined by KIO</a>.
+			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/TDEIO.html#Error">as
+			 * defined by TDEIO</a>.
 			 */
 			virtual int errorCode() const;
 

certmanager/Makefile.am

@@ -17,8 +17,8 @@ kleopatra_SOURCES = \
 
 METASOURCES = AUTO
 
-kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kleopatra_LDADD   = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC)
+kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kleopatra_LDADD   = conf/libconf.la lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC)
 
 rcdir = $(kde_datadir)/kleopatra
 rc_DATA = kleopatraui.rc

certmanager/aboutdata.cpp

@@ -58,7 +58,7 @@ static const about_data authors[] = {
 
 static const about_data credits[] = {
   { "David Faure",
-    I18N_NOOP("Backend configuration framework, KIO integration"),
+    I18N_NOOP("Backend configuration framework, TDEIO integration"),
     "faure@kde.org", 0 },
   { "Michel Boyer de la Giroday",
     I18N_NOOP("Key-state dependant colors and fonts in the key list"),

certmanager/certificatewizardimpl.cpp

@@ -498,7 +498,7 @@ void CertificateWizardImpl::accept()
 }
 
 /**
-   This slot is invoked by the KIO job used in newCertificate
+   This slot is invoked by the TDEIO job used in newCertificate
    to save/upload the certificate, when finished (success or error).
 */
 void CertificateWizardImpl::slotUploadResult( TDEIO::Job* job )

certmanager/kwatchgnupg/Makefile.am

@@ -13,8 +13,8 @@ kwatchgnupg_SOURCES = \
 
 METASOURCES = AUTO
 
-kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kwatchgnupg_LDADD   = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC)
+kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+kwatchgnupg_LDADD   = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_TDEUTILS) $(LIB_TDEABC)
 
 rcdir = $(kde_datadir)/kwatchgnupg
 rc_DATA = kwatchgnupgui.rc

certmanager/lib/Makefile.am

@@ -17,7 +17,7 @@ libkleopatra_la_LIBADD = \
 			ui/libkleopatra_ui.la \
 			\
 			$(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la \
-			$(LIB_KIO) $(LIB_TDEUI)
+			$(LIB_TDEIO) $(LIB_TDEUI)
 
 # Disabled for tdepim-3.3, see also kleo/cryptobackendfactory.cpp
 # backends/kpgp/libkleopatra_backend_kpgp.la

certmanager/lib/kleo/tdeconfigbasedkeyfilter.h

@@ -30,8 +30,8 @@
     your version.
 */
 
-#ifndef __KLEO_KCONFIGBASEDKEYFILTER_H__
-#define __KLEO_KCONFIGBASEDKEYFILTER_H__
+#ifndef __KLEO_TDECONFIGBASEDKEYFILTER_H__
+#define __KLEO_TDECONFIGBASEDKEYFILTER_H__
 
 #include "keyfilter.h"
 
@@ -101,4 +101,4 @@ namespace Kleo {
 
 }
 
-#endif // __KLEO_KCONFIGBASEDKEYFILTER_H__
+#endif // __KLEO_TDECONFIGBASEDKEYFILTER_H__

certmanager/storedtransferjob.cpp

@@ -21,7 +21,7 @@
 
 using namespace TDEIOext;
 
-#define KIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
+#define TDEIO_ARGS TQByteArray packedArgs; TQDataStream stream( packedArgs, IO_WriteOnly ); stream
 
 StoredTransferJob::StoredTransferJob(const KURL& url, int command,
                                      const TQByteArray &packedArgs,
@@ -79,7 +79,7 @@ void StoredTransferJob::slotDataReq( TDEIO::Job *, TQByteArray &data )
 StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showProgressInfo )
 {
     // Send decoded path and encoded query
-    KIO_ARGS << url;
+    TDEIO_ARGS << url;
     StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_GET, packedArgs, TQByteArray(), showProgressInfo );
     if (reload)
        job->addMetaData("cache", "reload");
@@ -89,7 +89,7 @@ StoredTransferJob *TDEIOext::storedGet( const KURL& url, bool reload, bool showP
 StoredTransferJob *TDEIOext::put( const TQByteArray& arr, const KURL& url, int permissions,
                                 bool overwrite, bool resume, bool showProgressInfo )
 {
-    KIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
+    TDEIO_ARGS << url << TQ_INT8( overwrite ? 1 : 0 ) << TQ_INT8( resume ? 1 : 0 ) << permissions;
     StoredTransferJob * job = new StoredTransferJob( url, TDEIO::CMD_PUT, packedArgs, TQByteArray(), showProgressInfo );
     job->setData( arr );
     return job;

certmanager/storedtransferjob.h

@@ -22,7 +22,7 @@
 
 #include <tdeio/job.h>
 
-// To be moved to KIO?
+// To be moved to TDEIO?
 namespace TDEIOext {
 
 /**

cvs.sh.diff

@@ -7,7 +7,7 @@ Index: admin/cvs.sh
  done
  for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
 -  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
-+  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",; s,"Content-Transfer-Encoding: ENCODING\\n","Content-Transfer-Encoding: 8bit\\n", ; s,"Language-Team: LANGUAGE <LL@li.org>\\n","Language-Team: LANGUAGE <tde-i18n-doc@kde.org>\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
++  sed -e 's,^"Content-Type: text/plain; charset=CHARSET\\n"$,"Content-Type: text/plain; charset=UTF-8\\n",; s,"Content-Transfer-Encoding: ENCODING\\n","Content-Transfer-Encoding: 8bit\\n", ; s,"Language-Team: LANGUAGE <LL@li.org>\\n","Language-Team: LANGUAGE <kde-i18n-doc@kde.org>\\n",' po/$i > po/$i.new && mv po/$i.new po/$i
    #msgmerge -q -o po/$i po/$i po/$i
    egrep -v '^#[^,]' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
    if test -f po.backup/$i && ! cmp -s temp.pot po.backup/$i; then

doc/kaddressbook/index.docbook

@@ -69,7 +69,7 @@
 <para>
 &kaddressbook; is the main address book application for &kde;; it
 enables you to manage your contacts efficiently and comfortably.
-Since it is based on the kabc library it supports resources,
+Since it is based on the tdeabc library it supports resources,
 which can be used to load and save your contacts to many different locations &mdash;
 not just the local file system, but also to LDAP servers and SQL databases.
 </para>
@@ -79,7 +79,7 @@ The user interface is similar to MS Outlook and it supports different views
 for to represent the contact data differently;
 it also provides an incremental search over all fields and a jump button
 bar to quickly access single entries.
-Since the underlying kabc library uses the vCard format (specified in RFC
+Since the underlying tdeabc library uses the vCard format (specified in RFC
 2426) as its default storage medium, &kaddressbook; mainly reflects the supported
 entry fields in its graphical user interface.
 </para>

kabc/Makefile.am

@@ -1,5 +0,0 @@
-if compile_newdistrlists
-KABCDISTLISTUPDATER=kabcdistlistupdater
-endif
-
-SUBDIRS = kabc2mutt $(KABCDISTLISTUPDATER)

kabc/README

@@ -1 +0,0 @@
-This directory contains test code for kabc.

kabc/frontend/Makefile.am

@@ -1,10 +0,0 @@
-INCLUDES = -I$(includedir)/tdeabc $(all_includes)
-
-METASOURCES = AUTO
-
-bin_PROGRAMS = kabcfrontend
-
-kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kabcfrontend_LDADD = -ltdeabc $(LIB_TDECORE)
-kabcfrontend_SOURCES = main.cpp mainWindow.ui
-

kabc/kabc2mutt/Makefile.am

@@ -1,13 +0,0 @@
-INCLUDES = -I$(includedir)/tdeabc $(all_includes)
-
-METASOURCES = AUTO
-
-bin_PROGRAMS = kabc2mutt
-
-kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kabc2mutt_LDADD = -ltdeabc $(LIB_TDECORE)
-kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/tdeabc2mutt.pot
-

kabc/kabcdistlistupdater/Makefile.am

@@ -1,12 +0,0 @@
-INCLUDES = -I$(includedir)/tdeabc -I$(top_srcdir) $(all_includes)
-
-METASOURCES = AUTO
-
-bin_PROGRAMS = kabcdistlistupdater
-
-kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kabcdistlistupdater_LDADD = $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
-kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp
-
-autostart_DATA = kabcdistlistupdater.desktop
-autostartdir = $(datadir)/autostart

kaddressbook/Makefile.am

@@ -17,14 +17,14 @@ INCLUDES= -I$(top_srcdir)/kaddressbook/interfaces \
 bin_PROGRAMS = kaddressbook
 
 kaddressbook_SOURCES = main.cpp kaddressbookmain.cpp
-kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kaddressbook_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kaddressbook_LDADD = libkaddressbook.la
 
 kde_module_LTLIBRARIES = libkaddressbookpart.la
 
 libkaddressbookpart_la_SOURCES = kaddressbook_part.cpp
 libkaddressbookpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lDCOP
+libkaddressbookpart_la_LIBADD = libkaddressbook.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -lDCOP
 
 lib_LTLIBRARIES = libkaddressbook.la
 libkaddressbook_la_SOURCES = addresseeconfig.cpp addresseeeditordialog.cpp \

kaddressbook/kabcore.cpp

@@ -272,10 +272,10 @@ TQStringList KABCore::selectedUIDs() const
 
 TDEABC::Resource *KABCore::requestResource( TQWidget *parent )
 {
-  TQPtrList<TDEABC::Resource> kabcResources = addressBook()->resources();
+  TQPtrList<TDEABC::Resource> tdeabcResources = addressBook()->resources();
 
   TQPtrList<KRES::Resource> kresResources;
-  TQPtrListIterator<TDEABC::Resource> resIt( kabcResources );
+  TQPtrListIterator<TDEABC::Resource> resIt( tdeabcResources );
   TDEABC::Resource *resource;
   while ( ( resource = resIt.current() ) != 0 ) {
     ++resIt;
@@ -320,7 +320,7 @@ TDEAboutData *KABCore::createAboutData()
   about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "tokoe@kde.org" );
   about->addAuthor( "Don Sanders", I18N_NOOP( "Original author" ) );
   about->addAuthor( "Cornelius Schumacher",
-                    I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export" ),
+                    I18N_NOOP( "Co-maintainer, libtdeabc port, CSV import/export" ),
                     "schumacher@kde.org" );
   about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign" ),
                     "mpilone@slac.com" );

kaddressbook/kcmconfigs/Makefile.am

@@ -10,7 +10,7 @@ kcm_kabconfig_la_SOURCES = kcmkabconfig.cpp kabconfigwidget.cpp \
                            extensionconfigdialog.cpp addresseewidget.cpp
 kcm_kabconfig_la_LDFLAGS  = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                             -avoid-version -no-undefined
-kcm_kabconfig_la_LIBADD = $(LIB_KIO) \
+kcm_kabconfig_la_LIBADD = $(LIB_TDEIO) \
                           $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
                           $(top_builddir)/libtdepim/libtdepim.la \
                           $(top_builddir)/kaddressbook/common/libkabcommon.la
@@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \
                                ldapoptionswidget.cpp
 kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                -avoid-version -no-undefined
-kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
+kcm_kabldapconfig_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la
 
 kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp
 kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \

kaddressbook/kcmconfigs/addresseewidget.cpp

@@ -169,7 +169,7 @@ AddresseeWidget::~AddresseeWidget()
 
 void AddresseeWidget::restoreSettings()
 {
-  TDEConfig config( "kabcrc" );
+  TDEConfig config( "tdeabcrc" );
   config.setGroup( "General" );
 
   mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
@@ -183,7 +183,7 @@ void AddresseeWidget::restoreSettings()
 
 void AddresseeWidget::saveSettings()
 {
-  TDEConfig config( "kabcrc" );
+  TDEConfig config( "tdeabcrc" );
   config.setGroup( "General" );
 
   config.writeEntry( "Prefixes", mPrefix->nameParts() );

kaddressbook/kcmconfigs/kabconfigwidget.cpp

@@ -174,7 +174,7 @@ void KABConfigWidget::restoreSettings()
   mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) );
   mLocationMapURL->lineEdit()->setCursorPosition( 0 );
 
-  TDEConfig config( "kabcrc", false, false );
+  TDEConfig config( "tdeabcrc", false, false );
   config.setGroup( "General" );
   mTradeAsFamilyName->setChecked( config.readBoolEntry( "TradeAsFamilyName", true ) );
   mLimitContactDisplay->setChecked( config.readBoolEntry( "LimitContactDisplay", true ) );
@@ -197,7 +197,7 @@ void KABConfigWidget::saveSettings()
 
   KABPrefs::instance()->writeConfig();
 
-  TDEConfig config( "kabcrc", false, false );
+  TDEConfig config( "tdeabcrc", false, false );
   config.setGroup( "General" );
   config.writeEntry( "TradeAsFamilyName", mTradeAsFamilyName->isChecked() );
   config.writeEntry( "LimitContactDisplay", mLimitContactDisplay->isChecked() );

kaddressbook/nameeditdialog.cpp

@@ -124,7 +124,7 @@ NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type,
   mFormattedNameEdit->setText( addr.formattedName() );
 
   // Prefix and suffix combos
-  TDEConfig config( "kabcrc" );
+  TDEConfig config( "tdeabcrc" );
   config.setGroup( "General" );
 
   TQStringList sTitle;

kaddressbook/views/Makefile.am

@@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \
                                  configurecardviewdialog.cpp \
                                  kaddressbookcardview.cpp
 libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
+libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
 
 libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp
 libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC)
+libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC)
 
 libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \
                                   contactlistview.cpp \
                                   kaddressbooktableview.cpp
 libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) $(LIB_KIO) $(LIB_KIMPROXY)
+libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(LIB_TDEABC) $(LIB_TDEIO) $(LIB_TDEIMPROXY)
 
 noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \
                  configuretableviewdialog.h contactlistview.h \

kaddressbook/xxport/Makefile.am

@@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \
          $(top_builddir)/libtdepim/libtdepim.la
 
 libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp
-libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
 
 libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
-libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) \
+libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO) \
                                     $(top_builddir)/kaddressbook/libkaddressbook.la \
                                     $(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la
 
 libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
-libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
 
 libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
-libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
 
 libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
-libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
 
 libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
-libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
 
 libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
 
 libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp
-libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
 
 libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp
-libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO)
+libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_TDEIO)
 
 noinst_HEADERS = csvimportdialog.h
 

kaddressbook/xxport/bookmark_xxport.cpp

@@ -64,7 +64,7 @@ bool BookmarkXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQ
   menu.location = fileName;
   menu.type = "xbel";
   menu.show = true;
-  KBookmarkMenu::setDynamicBookmarks( "kabc", menu );
+  KBookmarkMenu::setDynamicBookmarks( "tdeabc", menu );
 
   return true;
 }

kalarm/kalarmd/Makefile.am

@@ -2,13 +2,13 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kalarm $(all_includes)
 
 noinst_LTLIBRARIES = libkalarmd.la
 
-libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+libkalarmd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 libkalarmd_la_LIBADD  = $(LIB_TDECORE) $(top_builddir)/libkcal/libkcal.la
 libkalarmd_la_SOURCES =  alarmdaemoniface.stub alarmguiiface.stub
 
 bin_PROGRAMS = kalarmd
 
-kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kalarmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kalarmd_LDADD = $(LIB_TDEUI) $(top_builddir)/libkcal/libkcal.la libkalarmd.la
 kalarmd_SOURCES = alarmdaemon.cpp admain.cpp adapp.cpp \
         adcalendar.cpp adconfigdata.cpp clientinfo.cpp \

kandy/src/Makefile.am

@@ -2,7 +2,7 @@ bin_PROGRAMS = kandy kandy_client
 
 INCLUDES = -I$(top_srcdir) $(all_includes)
 
-kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kandy_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kandy_LDADD   = $(KANDY_LIBLOCKDEV) $(LIB_TDEFILE) -ltdeabc $(top_builddir)/libtdepim/libtdepim.la
 kandy_SOURCES =	main.cpp kandy.cpp \
                 cmdpropertiesdialog_base.ui cmdpropertiesdialog.cpp \
@@ -19,7 +19,7 @@ KDE_ICON = kandy
 noinst_HEADERS   = kandy.h kandyview.h modem.h atcommand.h \
                    commanditem.h mobilegui.h commandscheduler.h
 
-kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kandy_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kandy_client_LDADD   = $(LIB_TDECORE)
 kandy_client_SOURCES = kandy_client.cpp
 

karm/Makefile.am

@@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
              $(top_builddir)/libtdepim/libtdepim.la $(LIBXSS) -ltdeprint 
 karm_SOURCES = main.cpp
 karm_LDADD = libkarm_shared.la 
-karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
                  idletimedetector.h tdeaccelmenuwatch.h timekard.h \
 		 karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
@@ -56,7 +56,7 @@ kde_module_LTLIBRARIES = libkarmpart.la
 # the Part's source, library search path, and link libraries
 libkarmpart_la_SOURCES = karm_part.cpp 
 libkarmpart_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries)
-libkarmpart_la_LIBADD  = libkarm_shared.la $(LIB_KPARTS)
+libkarmpart_la_LIBADD  = libkarm_shared.la $(LIB_TDEPARTS)
 
 # this is where the desktop file will go 
 partdesktopdir   = $(kde_servicesdir)

karm/tdeaccelmenuwatch.h

@@ -2,8 +2,8 @@
 * tdeaccelmenuwatch.h -- Declaration of class TDEAccelMenuWatch.
 * Generated by newclass on Thu Jan  7 15:05:26 EST 1999.
 */
-#ifndef KARM_K_ACCEL_MENU_WATCH_H
-#define KARM_K_ACCEL_MENU_WATCH_H
+#ifndef KARM_TDE_ACCEL_MENU_WATCH_H
+#define KARM_TDE_ACCEL_MENU_WATCH_H
 
 #include <tqobject.h>
 #include <tqptrlist.h>

karm/test/Makefile.am

@@ -3,11 +3,11 @@ METASOURCES = AUTO
 check_PROGRAMS = runscripts locking
 
 runscripts_SOURCES = script.cpp runscripts.cpp
-runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 runscripts_LDADD = $(LIB_QT) $(LIB_TDECORE)
 
 locking_SOURCES = locking.cpp lockerthread.cpp
-locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)

kitchensync/src/Makefile.am

@@ -10,7 +10,7 @@ INCLUDES = -I$(top_srcdir)/kitchensync/src \
 bin_PROGRAMS = kitchensync
 
 kitchensync_SOURCES = main.cpp mainwindow.cpp
-kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kitchensync_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kitchensync_LDADD = libkitchensync.la
 
 xdg_apps_DATA = kitchensync.desktop
@@ -32,7 +32,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \
                             configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp \
                             configguisunbird.cpp
 libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
+libkitchensync_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
                            $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \
                            $(LIB_QT)
 
@@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la
 
 libkitchensyncpart_la_SOURCES = part.cpp
 libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
-libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
+libkitchensyncpart_la_LIBADD = $(LIB_TDEPARTS) libkitchensync.la $(LIB_QT) $(LIB_TDEIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI)
 
 # Resources
 kitchensyncdatadir = $(kde_datadir)/kitchensync

kitchensync/src/memberinfo.cpp

@@ -52,7 +52,7 @@ TQString MemberInfo::name() const
     nameMap.insert( "file-sync", i18n( "File" ) );
     nameMap.insert( "palm-sync", i18n( "Palm" ) );
     nameMap.insert( "tdepim-sync", i18n( "TDE PIM" ) );
-    nameMap.insert( "kio-sync", i18n( "Remote File" ) );
+    nameMap.insert( "tdeio-sync", i18n( "Remote File" ) );
     nameMap.insert( "irmc-sync", i18n( "Mobile Phone" ) );
     nameMap.insert( "evo2-sync", i18n( "Evolution" ) );
     nameMap.insert( "opie-sync", i18n( "Handheld" ) );
@@ -79,7 +79,7 @@ TQString MemberInfo::pluginIconName( const TQString &pluginName )
   if ( pluginName == "file-sync" ) return "folder";
   if ( pluginName == "palm-sync" ) return "pda_black";
   if ( pluginName == "tdepim-sync" ) return "kontact";
-  if ( pluginName == "kio-sync" ) return "network";
+  if ( pluginName == "tdeio-sync" ) return "network";
   if ( pluginName == "irmc-sync" ) return "mobile_phone";
   if ( pluginName == "evo2-sync" ) return "evolution";
   if ( pluginName == "opie-sync" ) return "pda_blue";

kmail/CMakeLists.txt

@@ -141,7 +141,7 @@ set( ${target}_SRCS
   kmcomposewin.cpp kmfolder.cpp kmmsgpartdlg.cpp kmreaderwin.cpp htmlstatusbar.cpp
   kmgroupware.cpp folderstorage.cpp listjob.cpp csshelper.cpp tdelistboxdialog.cpp
   kmmsginfo.cpp actionscheduler.cpp messageproperty.cpp accountmanager.cpp kmacctfolder.cpp
-  tdemdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
+  kmdict.cpp kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp kmfoldermgr.cpp
   kmfoldernode.cpp kmsender.cpp kmacctseldlg.cpp kmfiltermgr.cpp kmfilterdlg.cpp
   filterimporterexporter.cpp kmsearchpatternedit.cpp encodingdetector.cpp encodingdetector_ja.cpp
   kmfilteraction.cpp kmsearchpattern.cpp kmfolderimap.cpp kmfolderseldlg.cpp kmfilter.cpp

kmail/Makefile.am

@@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \
         ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \
         ../certmanager/lib/libkleopatra.la $(INDEXLIB) \
         ../libkcal/libkcal.la \
-        $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_TDEABC)
+        $(LIB_TDEHTML) $(LIB_TDESPELL) $(LIB_TDEABC)
 
 kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la
 libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
@@ -65,7 +65,7 @@ libkmailprivate_la_SOURCES = kmmessage.cpp kmmainwin.cpp configuredialog.cpp \
                 csshelper.cpp tdelistboxdialog.cpp \
                 actionscheduler.cpp messageproperty.cpp \
                 kmmsgpart.cpp kmmsginfo.cpp \
-                accountmanager.cpp kmacctfolder.cpp tdemdict.cpp \
+                accountmanager.cpp kmacctfolder.cpp kmdict.cpp \
                 kmsystemtray.cpp kmacctlocal.cpp kmfolderdir.cpp \
                 kmfoldermgr.cpp kmfoldernode.cpp kmsender.cpp \
                 kmacctseldlg.cpp kmfiltermgr.cpp kmsearchpatternedit.cpp \
@@ -176,11 +176,11 @@ check_PROGRAMS = dcoptest recipienteditortest
 METASOURCES = AUTO
 
 dcoptest_SOURCES = dcoptest.cpp kmailIface.skel kmailIface.stub mailcomposerIface.skel mailcomposerIface.stub
-dcoptest_LDADD = $(LIB_KIO)
+dcoptest_LDADD = $(LIB_TDEIO)
 dcoptest_LDFLAGS = $(all_libraries)
 
 recipienteditortest_SOURCES = recipientseditortest.cpp
-recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_TDEABC)
+recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_TDEIO) $(LIB_TDEABC)
 recipienteditortest_LDFLAGS = $(all_libraries)
 
 kmailIface_DCOPIDLNG = true

kmail/folderdiaacltab.h

@@ -99,7 +99,7 @@ public:
   static bool supports( KMFolder* refFolder );
 
 private slots:
-  // Network (KIO) slots
+  // Network (TDEIO) slots
   void slotConnectionResult( int, const TQString& );
   void slotReceivedACL( KMFolder*, TDEIO::Job*, const KMail::ACLList& );
   void slotMultiSetACLResult(TDEIO::Job *);

kmail/folderdiaquotatab.h

@@ -68,7 +68,7 @@ private:
   void initializeWithValuesFromFolder( KMFolder* folder );
   void showQuotaWidget();
 private slots:
-  // Network (KIO) slots
+  // Network (TDEIO) slots
   void slotConnectionResult( int, const TQString& );
   void slotReceivedQuotaInfo( KMFolder*, TDEIO::Job*, const KMail::QuotaInfo& );
 

kmail/headerstyle.cpp

@@ -276,14 +276,14 @@ namespace KMail {
 #if 0
     // Get Instant Messaging presence
     TQString presence;
-    TQString kabcUid;
+    TQString tdeabcUid;
     if ( strategy->showHeader( "status" ) )
     {
       TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
       TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
       ::KIMProxy *imProxy = KMKernel::self()->imProxy();
-      kabcUid = addresses[0].uid();
-      presence = imProxy->presenceString( kabcUid );
+      tdeabcUid = addresses[0].uid();
+      presence = imProxy->presenceString( tdeabcUid );
     }
 #endif
 
@@ -298,7 +298,7 @@ namespace KMail {
               "\">" + i18n("[vCard]") + "</a>" );
 #if 0
       if ( !presence.isEmpty() && strategy->showHeader( "status" ) )
-        headerStr.append("&nbsp;&nbsp;(<span name=\"presence-" + kabcUid + "\">" + presence + "</span>)" );
+        headerStr.append("&nbsp;&nbsp;(<span name=\"presence-" + tdeabcUid + "\">" + presence + "</span>)" );
 #endif
 
       if ( strategy->showHeader( "organization" )
@@ -473,10 +473,10 @@ namespace KMail {
     TQString userHTML;
     TQString presence;
 
-    // IM presence and kabc photo
+    // IM presence and tdeabc photo
 
     ::KIMProxy *imProxy = KMKernel::self()->imProxy();
-    TQString kabcUid;
+    TQString tdeabcUid;
     TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true );
     TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) );
 
@@ -485,16 +485,16 @@ namespace KMail {
     int photoHeight = 60;
     if( addresses.count() == 1 )
     {
-      // kabcUid is embedded in im: URIs to indicate which IM contact to message
-      kabcUid = addresses[0].uid();
+      // tdeabcUid is embedded in im: URIs to indicate which IM contact to message
+      tdeabcUid = addresses[0].uid();
 
       if ( imProxy->initialize() ) {
           // im status
-          presence = imProxy->presenceString( kabcUid );
+          presence = imProxy->presenceString( tdeabcUid );
           if ( !presence.isEmpty() )
           {
             TQString presenceIcon = TQString::fromLatin1( " <img src=\"%1\"/>" )
-                .arg( imgToDataUrl( imProxy->presenceIcon( kabcUid ).convertToImage() ) );
+                .arg( imgToDataUrl( imProxy->presenceIcon( tdeabcUid ).convertToImage() ) );
             presence += presenceIcon;
           }
       }
@@ -592,9 +592,9 @@ namespace KMail {
         userHTML = TQString( "<div class=\"senderpic\">"
             "<a href=\"im:%1\">%2<div class=\"senderstatus\">"
             "<span name=\"presence-%3\">%4</span></div></a>"
-            "</div>" ).arg( kabcUid )
+            "</div>" ).arg( tdeabcUid )
             .arg( userHTML )
-             .arg( kabcUid )
+             .arg( tdeabcUid )
             .arg( presence );
       }
     } else {
@@ -602,8 +602,8 @@ namespace KMail {
       if ( !presence.isEmpty() )
         userHTML = TQString( "<a href=\"im:%1\"><div class=\"senderstatus\">"
             "<span name=\"presence-%2\">%3</span></div></a>" )
-            .arg( kabcUid )
-            .arg( kabcUid )
+            .arg( tdeabcUid )
+            .arg( tdeabcUid )
             .arg( presence );
     }
 #if 0
@@ -766,7 +766,7 @@ namespace KMail {
                               : TQString("") )
 #if 0
                  + ( ( !presence.isEmpty() )
-                              ? "&nbsp;&nbsp;(<span name=\"presence-" + kabcUid + "\">" + presence + "</span>)"
+                              ? "&nbsp;&nbsp;(<span name=\"presence-" + tdeabcUid + "\">" + presence + "</span>)"
                               : TQString("") )
 #endif
                  + ( message->headerField("Organization").isEmpty()

kmail/imapaccountbase.cpp

@@ -373,7 +373,7 @@ namespace KMail {
     else
       stream << (int) 'U' << url;
 
-    // create the KIO-job
+    // create the TDEIO-job
     if ( makeConnection() != Connected )
       return;// ## doesn't handle Connecting
     TDEIO::SimpleJob *job = TDEIO::special(url, packedArgs, false);

kmail/imapaccountbase.h

@@ -240,7 +240,7 @@ namespace KMail {
     void setImapSeenStatus( KMFolder* folder, const TQString& path, bool seen );
 
     /**
-     * The KIO-Slave died
+     * The TDEIO-Slave died
      */
     void slaveDied() { mSlave = 0; killAllJobs(); }
 
@@ -430,9 +430,9 @@ namespace KMail {
   protected slots:
     virtual void slotCheckQueuedFolders();
 
-    /// Handle a message coming from the KIO scheduler saying that the slave is now connected
+    /// Handle a message coming from the TDEIO scheduler saying that the slave is now connected
     void slotSchedulerSlaveConnected(TDEIO::Slave *aSlave);
-    /// Handle an error coming from the KIO scheduler
+    /// Handle an error coming from the TDEIO scheduler
     void slotSchedulerSlaveError(TDEIO::Slave *aSlave, int, const TQString &errorMsg);
 
     /**
@@ -484,14 +484,14 @@ namespace KMail {
   protected:
 
   /**
-     * Handle an error coming from a KIO job or from a KIO slave (via the scheduler)
+     * Handle an error coming from a TDEIO job or from a TDEIO slave (via the scheduler)
      * and abort everything (in all cases) if abortSync is true [this is for slotSchedulerSlaveError].
      * Otherwise (abortSync==false), dimap will only abort in case of severe errors (connection broken),
      * but on "normal" errors (no permission to delete, etc.) it will ask the user.
      *
      * @param error the error code, usually job->error())
      * @param errorMsg the error message, usually job->errorText()
-     * @param job the kio job (can be 0). If set, removeJob will be called automatically.
+     * @param job the tdeio job (can be 0). If set, removeJob will be called automatically.
      * This is important! It means you should not call removeJob yourself in case of errors.
      * We can't let the caller do that, since it should only be done afterwards, and only if we didn't abort.
      *

kmail/imapjob.cpp

@@ -259,7 +259,7 @@ ImapJob::~ImapJob()
                 mit.current()->setTransferInProgress( false );
             }
           }
-          account->removeJob( mJob ); // remove the associated kio job
+          account->removeJob( mJob ); // remove the associated tdeio job
         }
         account->mJobList.remove( this ); // remove the folderjob
       }

kmail/keyresolver.cpp

@@ -586,7 +586,7 @@ struct Kleo::KeyResolver::Private {
 
   std::map<CryptoMessageFormat,FormatInfo> mFormatInfoMap;
 
-  // key=email address, value=crypto preferences for this contact (from kabc)
+  // key=email address, value=crypto preferences for this contact (from tdeabc)
   typedef std::map<TQString, ContactPreferences> ContactPreferencesMap;
   ContactPreferencesMap mContactPreferencesMap;
 };

kmail/kmacctimap.cpp

@@ -232,7 +232,7 @@ void KMAcctImap::ignoreJobsForFolder( KMFolder* folder )
 //-----------------------------------------------------------------------------
 void KMAcctImap::removeSlaveJobsForFolder( KMFolder* folder )
 {
-  // Make sure the folder is not referenced in any kio slave jobs
+  // Make sure the folder is not referenced in any tdeio slave jobs
   TQMap<TDEIO::Job*, jobData>::Iterator it = mapJobData.begin();
   while ( it != mapJobData.end() ) {
      TQMap<TDEIO::Job*, jobData>::Iterator i = it;

kmail/kmacctimap.h

@@ -106,7 +106,7 @@ protected:
   friend class ::AccountManager;
   KMAcctImap(AccountManager* owner, const TQString& accountName, uint id);
   /**
-   * Handle an error coming from a KIO job
+   * Handle an error coming from a TDEIO job
    * See ImapAccountBase::handleJobError for details.
    */
   virtual bool handleError( int error, const TQString &errorMsg, TDEIO::Job* job, const TQString& context, bool abortSync = false );

kmail/kmail_part.cpp

@@ -154,7 +154,7 @@ KMailPart::KMailPart(TQWidget *parentWidget, const char *widgetName,
 KMailPart::~KMailPart()
 {
   kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
-  // Running KIO jobs prevent kapp from exiting, so we need to kill them
+  // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
   // if they are only about checking mail (not important stuff like moving messages)
   kmkernel->abortMailCheck();
   kmkernel->acctMgr()->cancelMailCheck();

kmail/kmcommands.cpp

@@ -75,7 +75,7 @@
 #include <tdetempfile.h>
 #include <tdeimproxy.h>
 #include <kuserprofile.h>
-// KIO headers
+// TDEIO headers
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 
@@ -932,7 +932,7 @@ void KMSaveMsgCommand::slotMessageRetrievedForSaving(KMMessage *msg)
     mOffset = 0;
     TQByteArray data;
     int size;
-    // Unless it is great than 64 k send the whole message. kio buffers for us.
+    // Unless it is great than 64 k send the whole message. tdeio buffers for us.
     if( mData.size() > (unsigned int) MAX_CHUNK_SIZE )
       size = MAX_CHUNK_SIZE;
     else

kmail/kmcomposewin.cpp

@@ -2623,7 +2623,7 @@ void KMComposeWin::addrBookSelIntoOld()
       dlg.setSelectedBCC( lst );
   }
 
-  dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->kabcAddresses() );
+  dlg.setRecentAddresses( RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() );
 
   if (dlg.exec()==TQDialog::Rejected) return;
 

kmail/kmcomposewin.h

@@ -486,7 +486,7 @@ private slots:
   void slotIdentityChanged(uint);
 
   /**
-   * KIO slots for attachment insertion
+   * TDEIO slots for attachment insertion
    */
   void slotAttachFileData(TDEIO::Job *, const TQByteArray &);
   void slotAttachFileResult(TDEIO::Job *);

kmail/tdemdict.cpp → kmail/kmdict.cpp

@@ -5,7 +5,7 @@
 #include <config.h>
 #endif
 
-#include "tdemdict.h"
+#include "kmdict.h"
 #include "kmglobal.h"
 #include <kdebug.h>
 

kmail/kmfolderdia.h

@@ -60,7 +60,7 @@ namespace KMail {
  * This is the base class for tabs in the folder dialog.
  * It uses the API from ConfigModuleTab (basically: it's a widget that can load and save)
  * but it also adds support for delayed-saving:
- * when save() needs to use async jobs (e.g. KIO) for saving,
+ * when save() needs to use async jobs (e.g. TDEIO) for saving,
  * we need to delay the closing until after the jobs are finished,
  * and to cancel the saving on error.
  *
@@ -87,7 +87,7 @@ public:
   /// Called when clicking OK.
   /// If a module returns Delayed, the closing is cancelled for now,
   /// and the module can close the dialog later on (i.e. after an async
-  /// operation like a KIO job).
+  /// operation like a TDEIO job).
   virtual AccepStatus accept() {
     return save() ? Accepted : Canceled;
   }

kmail/kmmainwin.cpp

@@ -103,7 +103,7 @@ KMMainWin::~KMMainWin()
 
     if ( not_withdrawn == 0 ) {
       kdDebug(5006) << "Closing last KMMainWin: stopping mail check" << endl;
-      // Running KIO jobs prevent kapp from exiting, so we need to kill them
+      // Running TDEIO jobs prevent kapp from exiting, so we need to kill them
       // if they are only about checking mail (not important stuff like moving messages)
       kmkernel->abortMailCheck();
       kmkernel->acctMgr()->cancelMailCheck();

kmail/kmmsgdict.cpp

@@ -4,7 +4,7 @@
 #include "kmfolderindex.h"
 #include "kmfolder.h"
 #include "kmmsgdict.h"
-#include "tdemdict.h"
+#include "kmdict.h"
 #include "globalsettings.h"
 #include "folderstorage.h"
 

kmail/kmreaderwin.cpp

@@ -1671,7 +1671,7 @@ kdDebug(5006) << "KMReaderWin  -  composing unencrypted message" << endl;
 void KMReaderWin::updateHeader()
 {
   /*
-   * TODO: mess around with KHTML DOM some more and figure out how to
+   * TODO: mess around with TDEHTML DOM some more and figure out how to
    * replace the entire header div w/out flickering to hell and back
    *
    * DOM::NodeList divs(mViewer->document().documentElement().getElementsByTagName("div"));

kmail/networkaccount.h

@@ -107,7 +107,7 @@ namespace KMail {
     /** @return an URL for this account */
     virtual KURL getUrl() const;
 
-    /** @return the KIO slave for this account */
+    /** @return the TDEIO slave for this account */
     TDEIO::Slave * slave() const { return mSlave; }
 
     /** Kill all jobs that are currently in progress */

kmail/popaccount.h

@@ -102,12 +102,12 @@ protected:
   PopAccount(AccountManager* owner, const TQString& accountName, uint id);
 
   /**
-   * Start a KIO Job to get a list of messages on the pop server
+   * Start a TDEIO Job to get a list of messages on the pop server
    */
   void startJob();
 
   /**
-   * Connect up the standard signals/slots for the KIO Jobs
+   * Connect up the standard signals/slots for the TDEIO Jobs
    */
   void connectJob();
 
@@ -185,7 +185,7 @@ protected slots:
   void slotProcessPendingMsgs();
 
   /**
-   * If there are more messages to be downloaded then start a new kio job
+   * If there are more messages to be downloaded then start a new tdeio job
    * to get the message whose id is at the head of the queue
    */
   void slotGetNextMsg();
@@ -202,7 +202,7 @@ protected slots:
   void slotData( TDEIO::Job*, const TQByteArray &);
 
   /**
-   * Finished downloading the current kio job, either due to an error
+   * Finished downloading the current tdeio job, either due to an error
    * or because the job has been canceled or because the complete message
    * has been downloaded
    */
@@ -230,7 +230,7 @@ protected slots:
   void slotSlaveError(TDEIO::Slave *, int, const TQString &);
 
   /**
-   * If there are more headers to be downloaded then start a new kio job
+   * If there are more headers to be downloaded then start a new tdeio job
    * to get the next header
    */
   void slotGetNextHdr();

kmail/recipientspicker.cpp

@@ -579,7 +579,7 @@ void RecipientsPicker::insertRecentAddresses()
 
   TDEConfig config( "kmailrc" );
   TDEABC::Addressee::List recents =
-    TDERecentAddress::RecentAddresses::self( &config )->kabcAddresses();
+    TDERecentAddress::RecentAddresses::self( &config )->tdeabcAddresses();
 
   TDEABC::Addressee::List::ConstIterator it;
   for( it = recents.begin(); it != recents.end(); ++it ) {

kmail/redirectdialog.cpp

@@ -132,7 +132,7 @@ void RedirectDialog::slotAddrBook()
   }
 
   dlg.setRecentAddresses(
-      RecentAddresses::self( KMKernel::config() )->kabcAddresses() );
+      RecentAddresses::self( KMKernel::config() )->tdeabcAddresses() );
 
   // Make it impossible to specify Cc or Bcc addresses as we support
   // only the Redirect-To header!

kmail/tdelistboxdialog.h

@@ -1,5 +1,5 @@
-#ifndef KLISTBOXDIALOG_H
-#define KLISTBOXDIALOG_H
+#ifndef TDELISTBOXDIALOG_H
+#define TDELISTBOXDIALOG_H
 
 #include <kdialogbase.h>
 

kmail/tdelistviewindexedsearchline.h

@@ -1,5 +1,5 @@
-#ifndef LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
-#define LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
+#ifndef LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
+#define LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_
 
 /* This file is part of KMail
  * Copyright (C) 2005 Luís Pedro Coelho <luis@luispedro.org>
@@ -74,4 +74,4 @@ private:
 
 
 
-#endif /* LPC_KLISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */
+#endif /* LPC_TDELISTVIEWINDEXEDSEARCHLINE_H1107549660_INCLUDE_GUARD_ */

kmail/tests/Makefile.am

@@ -6,7 +6,7 @@ check_LTLIBRARIES = tdeunittest_storagelayermodule.la \
         tdeunittest_utilmodule.la \
         tdeunittest_mimelibmodule.la
 
-tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../tdemdict.cpp
+tdeunittest_storagelayermodule_la_SOURCES = storagelayermodule.cpp messagedicttests.cpp ../kmdict.cpp
 tdeunittest_storagelayermodule_la_LIBADD = -ltdeunittest
 tdeunittest_utilmodule_la_SOURCES = utiltests.cpp ../util.cpp
 tdeunittest_utilmodule_la_LIBADD = -ltdeunittest ../../mimelib/libmimelib.la

kmail/tests/messagedicttests.cpp

@@ -7,7 +7,7 @@
 #include <tdeunittest/runner.h>
 #include <tdeunittest/module.h>
 
-#include "tdemdict.h"
+#include "kmdict.h"
 
 #include "messagedicttests.h"
 

kmail/tests/mimelibtests.cpp

@@ -26,8 +26,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
-KUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
+TDEUNITTEST_MODULE( tdeunittest_mimelibmodule, "Mimelib Tests" );
+TDEUNITTEST_MODULE_REGISTER_TESTER( MimeLibTester );
 
 #include <mimelib/string.h>
 #include <mimelib/message.h>

kmail/tests/storagelayermodule.cpp

@@ -12,5 +12,5 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
-KUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );
+TDEUNITTEST_MODULE( tdeunittest_storagelayermodule, "KMail Storage Layer Tests" );
+TDEUNITTEST_MODULE_REGISTER_TESTER( MessageDictTester );

kmail/tests/utiltests.cpp

@@ -10,8 +10,8 @@
 
 using namespace KUnitTest;
 
-KUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
-KUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
+TDEUNITTEST_MODULE( tdeunittest_utilmodule, "KMail::Util Tests" );
+TDEUNITTEST_MODULE_REGISTER_TESTER( UtilTester );
 
 #include "util.h"
 #include <mimelib/string.h>

kmailcvt/Makefile.am

@@ -40,7 +40,7 @@ INCLUDES= $(all_includes)
 kmailcvt_METASOURCES = AUTO
 
 # the library search path. 
-kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kmailcvt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 KDE_ICON=AUTO
 

kmobile/Makefile.am

@@ -8,7 +8,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la
 
 INCLUDES         = $(all_includes)
 
-kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kmobile_LDADD   = $(LIB_TDEFILE) $(LIB_TDEABC) libkmobiledevice.la
 kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\
 			pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \
@@ -29,7 +29,7 @@ libkmobileclient_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
 libkmobileclient_la_LIBADD = $(LIB_TDECORE) -lDCOP
 
 EXTRA_PROGRAMS = testlibkmobile
-testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testlibkmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 testlibkmobile_LDADD = libkmobileclient.la
 testlibkmobile_SOURCES = testlibkmobile.cpp
 

kmobile/tdeioslave/Makefile.am

@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kmobile -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = tdeio_mobile.la
 
 tdeio_mobile_la_SOURCES = tdeio_mobile.cpp 
-tdeio_mobile_la_LIBADD = $(LIB_KIO) ../libkmobileclient.la
+tdeio_mobile_la_LIBADD = $(LIB_TDEIO) ../libkmobileclient.la
 tdeio_mobile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
 
 kde_services_DATA = mobile.protocol cellphone.protocol \

kmobile/tdeioslave/tdeio_mobile.cpp

@@ -37,8 +37,8 @@
 
 using namespace TDEIO;
 
-#define KIO_MOBILE_DEBUG_AREA 7126
-#define PRINT_DEBUG kdDebug(KIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: "
+#define TDEIO_MOBILE_DEBUG_AREA 7126
+#define PRINT_DEBUG kdDebug(TDEIO_MOBILE_DEBUG_AREA) << "tdeio_mobile: "
 
 extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
 

kmobile/tdeioslave/tdeio_mobile.h

@@ -16,8 +16,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KIO_MOBILE_H__
-#define __KIO_MOBILE_H__
+#ifndef __TDEIO_MOBILE_H__
+#define __TDEIO_MOBILE_H__
 
 #include <tqstring.h>
 #include <tqvaluelist.h>

knode/Makefile.am

@@ -11,13 +11,13 @@ lib_LTLIBRARIES = libknodecommon.la
 
 kde_module_LTLIBRARIES = kcm_knode.la libknodepart.la
 libknodepart_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
-libknodepart_la_LIBADD	= libknodecommon.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
+libknodepart_la_LIBADD	= libknodecommon.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -L$(top_builddir)/libtdepim -ltdepim
 
 SUBDIRS = pics filters
 
 bin_PROGRAMS = knode
 
-knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+knode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 knode_LDADD   = libknodecommon.la
 
 kcm_knode_la_SOURCES = knconfigpages.cpp
@@ -26,7 +26,7 @@ kcm_knode_la_LIBADD = libknodecommon.la $(LIB_TDECORE)
 knconfigpages.lo: smtpaccountwidget_base.h
 
 libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries)
-libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_TDEABC) $(LIB_TDEFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML)
+libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDESPELL) $(LIB_TDEABC) $(LIB_TDEFILE) $(LIB_TDEUTILS) $(LIBRESOLV) $(LIB_TDEHTML)
 libknodecommon_la_SOURCES =   knconfigmanager.cpp \
                   knconfig.cpp \
                   knconfigwidgets.cpp \

knode/kncomposer.cpp

@@ -1474,7 +1474,7 @@ void KNComposer::slotToBtnClicked()
       dlg.setSelectedTo( lst );
   }
 #endif
-  dlg.setRecentAddresses( RecentAddresses::self(knGlobals.config())->kabcAddresses() );
+  dlg.setRecentAddresses( RecentAddresses::self(knGlobals.config())->tdeabcAddresses() );
   if (dlg.exec()==TQDialog::Rejected) return;
 
   if(!to.isEmpty())

knotes/Makefile.am

@@ -27,15 +27,15 @@ libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp knotehostdlg.
 knotes_SOURCES  = main.cpp knotesapp.cpp KNotesAppIface.skel
 knotes_LDADD    = libknote.la libknoteseditor.la libknotesnetwork.la libknotesresources.la \
                   libknoteslegacy.la libknotesconfig.la libknotesprinting.la $(top_builddir)/libkcal/libkcal.la \
-                  $(top_builddir)/libtdepim/libtdepim.la $(LIB_KIO) -ltderesources -ltdeprint -ltdeutils
-knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+                  $(top_builddir)/libtdepim/libtdepim.la $(LIB_TDEIO) -ltderesources -ltdeprint -ltdeutils
+knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 knotes_COMPILE_FIRST = knoteconfig.h
 
 kde_module_LTLIBRARIES  = knotes_local.la
 knotes_local_la_SOURCES = resourcelocal_plugin.cpp
 knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN)
 knotes_local_la_LIBADD  = libknotesresources.la libknotesconfig.la libknotesprinting.la \
-                          $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltderesources
+                          $(top_builddir)/libkcal/libkcal.la -ltdeprint $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltderesources
 
 METASOURCES     = AUTO
 

kode/Makefile.am

@@ -14,7 +14,7 @@ libkode_la_LIBADD = -ltdecore
 
 bin_PROGRAMS = kode
 
-kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kode_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kode_LDADD   = libkode.la -ltdeabc
 kode_SOURCES = kodemain.cpp
 

kode/kodemain.cpp

@@ -443,7 +443,7 @@ int create( TDECmdLineArgs *args )
   } else if ( createKioslave ) {
     c.setDocs( "This class implements a tdeioslave for ..." );
   
-    c.addBaseClass( KODE::Class( "SlaveBase", "KIO" ) );
+    c.addBaseClass( KODE::Class( "SlaveBase", "TDEIO" ) );
     c.addHeaderInclude( "tdeio/slavebase.h" );
     
     KODE::Function get( "get", "void" );
@@ -573,7 +573,7 @@ int create( TDECmdLineArgs *args )
     KODE::AutoMakefile::Target t( "kde_module_LTLIBRARIES",
       "tdeio_" + protocol + ".la" );
     t.setSources( className.lower() + ".cpp" );
-    t.setLibAdd( "$(LIB_KIO)" );
+    t.setLibAdd( "$(LIB_TDEIO)" );
     t.setLdFlags( "$(all_libraries) -module $(KDE_PLUGIN)" );
   
     am.addTarget( t );

kode/kwsdl/Makefile.am

@@ -11,7 +11,7 @@ libwsdl_la_LIBADD =  -ltdecore schema/libschema.la
 
 bin_PROGRAMS = kwsdl_compiler
 
-kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kwsdl_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kwsdl_compiler_LDADD   = ../libkode.la libwsdl.la
 kwsdl_compiler_SOURCES =  compiler.cpp converter.cpp creator.cpp main.cpp  \
                           namemapper.cpp 

kode/kwsdl/converter.cpp

@@ -938,7 +938,7 @@ void Converter::createTransportClass()
   queryCode += "TDEIO::TransferJob* job = TDEIO::http_post( KURL( " + url.name() + " ), postData, false );";
   queryCode += "if ( !job ) {";
   queryCode.indent();
-  queryCode += "kdWarning() << \"Unable to create KIO job for \" << " + url.name() + " << endl;";
+  queryCode += "kdWarning() << \"Unable to create TDEIO job for \" << " + url.name() + " << endl;";
   queryCode += "return;";
   queryCode.unindent();
   queryCode += "}";

kode/kwsdl/kung/Makefile.am

@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir) -I.. -I$(top_srcdir)/kode -I$(top_srcdir)/kode/kwsdl -I$(top_srcdir)/libtdepim $(all_includes)
 
 bin_PROGRAMS = kung
-kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kung_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kung_SOURCES = binaryinputfield.cpp boolinputfield.cpp complexbaseinputfield.cpp dateinputfield.cpp dispatcher.cpp \
                doubleinputfield.cpp enuminputfield.cpp generalconversationmanager.cpp \
                inputdialog.cpp inputfield.cpp inputfieldfactory.cpp \

kode/kwsdl/kung/transport.cpp

@@ -38,7 +38,7 @@ void Transport::query( const TQString &xml )
   
   TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false );
   if ( !job ) {
-    kdWarning() << "Unable to create KIO job for " << mUrl << endl;
+    kdWarning() << "Unable to create TDEIO job for " << mUrl << endl;
     return;
   }
   

kode/kwsdl/schema/Makefile.am

@@ -8,7 +8,7 @@ libschema_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
 libschema_la_LIBADD = -lqt-mt -ltdecore -ltdeio
 
 #bin_PROGRAMS = schematest
-#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+#schematest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 #schematest_SOURCES = main.cpp
 #schematest_LDADD = libschema.la
 

kode/kwsdl/tests/google/Makefile.am

@@ -5,5 +5,5 @@ bin_PROGRAMS = googletest
 
 googletest_SOURCES = main.cc googlesearch.cc transport.cpp resultelementarray.cpp directorycategoryarray.cpp googlesearchresult.cpp directorycategory.cpp resultelement.cpp serializer.cpp googlesearchservice.cpp
 googletest_LDADD = -ltdecore -ltdeio
-googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+googletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 

kode/kwsdl/tests/google/transport.cpp

@@ -41,7 +41,7 @@ void Transport::query( const TQString &xml )
   
   TDEIO::TransferJob* job = TDEIO::http_post( KURL( mUrl ), postData, false );
   if ( !job ) {
-    kdWarning() << "Unable to create KIO job for " << mUrl << endl;
+    kdWarning() << "Unable to create TDEIO job for " << mUrl << endl;
     return;
   }
   

kode/kwsdl/wscl/Makefile.am

@@ -7,7 +7,7 @@ libwscl_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
 libwscl_la_LIBADD = -lqt-mt
 
 #bin_PROGRAMS = wscltest
-#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+#wscltest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 #wscltest_SOURCES = main.cpp
 #wscltest_LDADD = libwscl.la
 

kode/kxml_compiler/Makefile.am

@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/libtdepim $(all_includes)
 
 bin_PROGRAMS = kxml_compiler
 
-kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kxml_compiler_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kxml_compiler_LDADD   = ../libkode.la -ltdecore
 kxml_compiler_SOURCES = parser.cpp creator.cpp kxml_compiler.cpp
 

konsolekalendar/Makefile.am

@@ -13,7 +13,7 @@ konsolekalendar_SOURCES = konsolekalendarepoch.cpp konsolekalendardelete.cpp \
   konsolekalendaradd.cpp konsolekalendarexports.cpp konsolekalendar.cpp \
   stdcalendar.cpp main.cpp 
 konsolekalendar_LDADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtdepim/libtdepim.la
-konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+konsolekalendar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
 appsdir = $(kde_appsdir)/Utilities
 xdg_apps_DATA = konsolekalendar.desktop

kontact/Thoughts

@@ -257,7 +257,7 @@ z last used part on startup. Make sure its loading finishes and then
 z load the rest once the user can already interact with the last used
 z loaded part.
 
-g why do we always need the addressbook? Is libkabc not sufficient?
+g why do we always need the addressbook? Is libtdeabc not sufficient?
 
 Don: I guess my machine is too fast, starting parts is pretty quick here :-)
 

kontact/interfaces/Makefile.am

@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkpinterfaces.la
 
 libkpinterfaces_la_SOURCES = core.cpp plugin.cpp summary.cpp uniqueapphandler.cpp
 libkpinterfaces_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
-libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_KPARTS)
+libkpinterfaces_la_LIBADD = ../../libtdepim/libtdepim.la $(LIB_TDEPARTS)
 
 kpincludedir = $(includedir)/kontact
 kpinclude_HEADERS = core.h plugin.h summary.h

kontact/plugins/akregator/Makefile.am

@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/akregator/src -I$(
 
 kde_module_LTLIBRARIES = libkontact_akregator.la
 libkontact_akregator_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_akregator_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS)
+libkontact_akregator_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS)
 libkontact_akregator_la_SOURCES = akregator_plugin.cpp akregator_partiface.stub
 
 METASOURCES = AUTO

kontact/plugins/kmail/Makefile.am

@@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/kmail -I$(top_buil
 kde_module_LTLIBRARIES = libkontact_kmailplugin.la kcm_kmailsummary.la
 
 libkontact_kmailplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_kmailplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkcal/libkcal.la $(LIB_KPARTS)
+libkontact_kmailplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(top_builddir)/libkcal/libkcal.la $(LIB_TDEPARTS)
 
 libkontact_kmailplugin_la_SOURCES = kmail_plugin.cpp kmailIface.stub \
                                     summarywidget.cpp summarywidget.skel

kontact/plugins/knode/Makefile.am

@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir)/knode -I$(top_srcd
 
 kde_module_LTLIBRARIES = libkontact_knodeplugin.la
 libkontact_knodeplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_knodeplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS)
+libkontact_knodeplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS)
 
 libkontact_knodeplugin_la_SOURCES = knode_plugin.cpp knodeiface.stub
 

kontact/plugins/knotes/Makefile.am

@@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces -I$(top_srcdir) $(all_includes)
 kde_module_LTLIBRARIES = libkontact_knotesplugin.la
 libkontact_knotesplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_knotesplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
-                                    $(LIB_KPARTS) $(top_builddir)/libtdepim/libtdepim.la \
+                                    $(LIB_TDEPARTS) $(top_builddir)/libtdepim/libtdepim.la \
                                     $(top_builddir)/libkcal/libkcal.la -ltderesources -ltdeprint \
                                     $(top_builddir)/knotes/libknotesresources.la \
                                     $(top_builddir)/knotes/libknoteseditor.la \

kontact/plugins/korganizer/Makefile.am

@@ -15,7 +15,7 @@ libcommon_la_SOURCES = korg_uniqueapp.cpp
 
 libkontact_korganizerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_korganizerplugin_la_LIBADD = libcommon.la \
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
     $(top_builddir)/korganizer/libkorganizer_calendar.la
 libkontact_korganizerplugin_la_SOURCES = korganizerplugin.cpp \
                                          kcalendariface.stub \
@@ -27,7 +27,7 @@ korganizeriface_DCOPIDLNG = true
 
 libkontact_todoplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_todoplugin_la_LIBADD = libcommon.la \
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
     $(top_builddir)/korganizer/libkorganizer_calendar.la \
     $(top_builddir)/korganizer/libkorganizer.la
 libkontact_todoplugin_la_SOURCES = todoplugin.cpp \
@@ -37,7 +37,7 @@ libkontact_todoplugin_la_SOURCES = todoplugin.cpp \
 
 libkontact_journalplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_journalplugin_la_LIBADD = libcommon.la \
-    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_KPARTS) \
+    $(top_builddir)/kontact/interfaces/libkpinterfaces.la $(LIB_TDEPARTS) \
     $(top_builddir)/korganizer/libkorganizer_calendar.la
 libkontact_journalplugin_la_SOURCES = journalplugin.cpp kcalendariface.stub
 

kontact/plugins/kpilot/Makefile.am

@@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \
 kde_module_LTLIBRARIES = libkontact_kpilotplugin.la
 libkontact_kpilotplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 libkontact_kpilotplugin_la_LIBADD = $(top_builddir)/kontact/interfaces/libkpinterfaces.la \
-	$(LIB_KPARTS) \
+	$(LIB_TDEPARTS) \
 	$(top_builddir)/libtdepim/libtdepim.la \
 	$(top_builddir)/kpilot/lib/libkpilot.la
 

kontact/plugins/newsticker/Makefile.am

@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/kontact/interfaces \
 
 kde_module_LTLIBRARIES = libkontact_newstickerplugin.la kcm_kontactknt.la
 libkontact_newstickerplugin_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-libkontact_newstickerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEUI) \
+libkontact_newstickerplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEUI) \
                                         $(top_builddir)/libtdepim/libtdepim.la ../../interfaces/libkpinterfaces.la
 
 libkontact_newstickerplugin_la_SOURCES = newsticker_plugin.cpp \