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

CMakeLists.txt

@@ -97,7 +97,7 @@ option( BUILD_LIBKPGP "Build libkpgp" ${BUILD_ALL} )
 option( BUILD_MIMELIB "Build mimelib" ${BUILD_ALL} )
 option( BUILD_LIBKSIEVE "Build libksieve" ${BUILD_ALL} )
 option( BUILD_LIBKPIMEXCHANGE "Build libkpimexchange" ${BUILD_ALL} )
-option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} )
+option( BUILD_KIOSLAVES "Build tdeioslaves" ${BUILD_ALL} )
 option( BUILD_KMAIL "Build kmail" ${BUILD_ALL} )
 option( BUILD_AKREGATOR "Build akregator" ${BUILD_ALL} )
 option( BUILD_KALARM "Build kalarm" ${BUILD_ALL} )
@@ -115,7 +115,7 @@ option( BUILD_KABC "Build kabc" ${BUILD_ALL} )
 option( BUILD_KONSOLEKALENDAR "Build konsolekalendar" ${BUILD_ALL} )
 option( BUILD_KMAILCVT "Build kmailcvt" ${BUILD_ALL} )
 option( BUILD_KARM "Build karm" ${BUILD_ALL} )
-option( BUILD_KFILE_PLUGINS "Build kfile-plugins" ${BUILD_ALL} )
+option( BUILD_KFILE_PLUGINS "Build tdefile-plugins" ${BUILD_ALL} )
 option( BUILD_KANDY "Build kandy" ${BUILD_ALL} )
 option( BUILD_KNODE "Build knode" ${BUILD_ALL} )
 option( BUILD_KMOBILE "Build kmobile" ${BUILD_ALL} )
@@ -168,7 +168,7 @@ tde_conditional_add_subdirectory( BUILD_LIBKPGP libkpgp )
 tde_conditional_add_subdirectory( BUILD_MIMELIB mimelib )
 tde_conditional_add_subdirectory( BUILD_LIBKSIEVE libksieve )
 tde_conditional_add_subdirectory( BUILD_LIBKPIMEXCHANGE libkpimexchange )
-tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslaves )
+tde_conditional_add_subdirectory( BUILD_KIOSLAVES tdeioslaves )
 tde_conditional_add_subdirectory( BUILD_KMAIL kmail )
 tde_conditional_add_subdirectory( BUILD_AKREGATOR akregator )
 tde_conditional_add_subdirectory( BUILD_KALARM kalarm )
@@ -187,7 +187,7 @@ tde_conditional_add_subdirectory( BUILD_KABC kabc )
 tde_conditional_add_subdirectory( BUILD_KONSOLEKALENDAR konsolekalendar )
 tde_conditional_add_subdirectory( BUILD_KMAILCVT kmailcvt )
 tde_conditional_add_subdirectory( BUILD_KARM karm )
-tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS kfile-plugins )
+tde_conditional_add_subdirectory( BUILD_KFILE_PLUGINS tdefile-plugins )
 tde_conditional_add_subdirectory( BUILD_KANDY kandy )
 tde_conditional_add_subdirectory( BUILD_KNODE knode )
 tde_conditional_add_subdirectory( BUILD_KMOBILE kmobile )

MAINTAINERS

@@ -7,9 +7,9 @@ kandy            Cornelius Schumacher <schumacher@kde.org>
 karm             Mark Bucciarelli <mark@hubcapconsulting.com>
 kdgantt          Kalle Dalheimer <kalle@klaralvdalens-datakonsult.se>
                  Lutz Rogowski <lutz@klaralvdalens-datakonsult.se>
-kfile-plugins    ?
+tdefile-plugins    ?
 kgantt           ? Jochen Hanff <jochen@ifb.bv.tu-berlin.de>
-kioslaves        ? Marc Mutz <mutz@kde.org>
+tdeioslaves        ? Marc Mutz <mutz@kde.org>
 kitchensync      Cornelius Schumacher <schumacher@kde.org>
                  Holger Freyther <freyther@kde.org>
 kmail            Ingo Kloecker <kloecker@kde.org>

Mainpage.dox

@@ -29,7 +29,7 @@
         * - <a href="karm/html/index.html"><b>karm</b></a>
         *   (<a href="karm/html/classes.html">classes</a>)\n
         *   <i>A time tracker.</i>
-        * - <a href="kfile-plugins/html/index.html"><b>kfile-plugins</b></a>
+        * - <a href="tdefile-plugins/html/index.html"><b>tdefile-plugins</b></a>
         *   <i></i>
         * - <a href="kgantt/html/index.html"><b>kgantt</b></a>
         *   (<a href="kgantt/html/classes.html">classes</a>)\n

Makefile.am.in

@@ -11,7 +11,7 @@
 COMPILE_AFTER_libkmime = libemailfunctions
 COMPILE_AFTER_libemailfunctions = libkcal libkpimidentities kmail korganizer
 COMPILE_AFTER_libkholidays = korganizer kontact
-COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources kfile-plugins
+COMPILE_AFTER_libkcal = kalarm kitchensync konsolekalendar korganizer libkpimexchange libtdepim karm knotes tderesources tdefile-plugins
 COMPILE_AFTER_mimelib = korn kmail
 COMPILE_AFTER_libtdenetwork = kmail knode
 COMPILE_AFTER_libksieve = kmail
@@ -28,7 +28,7 @@ COMPILE_BEFORE_knode= libtdepim libkpgp libkmime
 COMPILE_BEFORE_karm = libtdepim tderesources
 COMPILE_BEFORE_plugins = kmail libtdepim libkcal
 COMPILE_BEFORE_kontact = kaddressbook knotes korganizer akregator karm
-COMPILE_BEFORE_kioslaves = libkmime libtdepim
+COMPILE_BEFORE_tdeioslaves = libkmime libtdepim
 COMPILE_BEFORE_libkpimexchange = libtdepim
 COMPILE_BEFORE_kalarm = libtdepim libkmime
 COMPILE_BEFORE_tderesources = libkpimexchange knotes kaddressbook kode

NewsLog.txt

@@ -1475,7 +1475,7 @@ Problems addressed
 -------------------
 
 * Prevent crash after changing the layout and replying then. (778728)
-* kolab/issue2442 kolab/issue2442 (kioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
+* kolab/issue2442 kolab/issue2442 (tdeioslave crashs after closing kontact, if the vacation reminder is activated. (779694)
 * "Enterprise headers" makes impossible to select text in first paragraph of body. [ kde-bug#151150 ] (779994)
 * kolab/issue1700 kleopatra crashes after ldap search. (780211)
 * kolab/issue2168 Email attachment overlay view, header style "enterprise" : Should be made foldable (780250)

README

@@ -32,7 +32,7 @@ What it is
 * kontact: Integrated PIM application
 * karm: Time tracker.
 * kitchensync: Synchronization framework, still under heavy development.
-* kfile-plugins: vCard KFIleItem plugin.
+* tdefile-plugins: vCard KFIleItem plugin.
 * knotes: yellow notes application
 * konsolecalendar: Command line tool for accessing calendar files.
 * korn: mail checker
@@ -53,7 +53,7 @@ There is also quite an amount of infrastructure in this package:
           plugin of KOrganizer
 * kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of
            KOrganizer (yes, we should decide for one of the Gantt libs)
-* kioslaves/sieve: Sieve kioslave
+* tdeioslaves/sieve: Sieve tdeioslave
 * ktnef: handling of tnef data
 
 The following subdirectories have been moved to kdenonbeta/tdepim:

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 "kcmshell tderesources", section "kabc"
+  1. All available addressbook resources as seen in "tdecmshell tderesources", section "kabc"
   2. LDAP
 
 Nothing special, AFAIK

akregator/src/CMakeLists.txt

@@ -83,7 +83,7 @@ tde_add_library( akregatorprivate SHARED AUTOMOC
     tagset.cpp trayicon.cpp treenode.cpp treenodevisitor.cpp
     utils.cpp
   VERSION 0.0.0
-  LINK rsslocal-static kio-shared
+  LINK rsslocal-static tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

akregator/src/akregator_part.cpp

@@ -28,9 +28,9 @@
 #include <kactionclasses.h>
 #include <kactioncollection.h>
 #include <kapplication.h>
-#include <kconfig.h>
-#include <kconfigdialog.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdeconfigdialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <tdehtmldefaults.h>
 #include <kinstance.h>
@@ -44,7 +44,7 @@
 #include <kstdaction.h>
 #include <ktempfile.h>
 #include <ktrader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdeparts/browserinterface.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/partmanager.h>

akregator/src/akregator_view.cpp

@@ -62,11 +62,11 @@
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>

akregator/src/akregatorconfig.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=akregator.kcfg
 ClassName=Settings
 NameSpace=Akregator

akregator/src/articlefilter.cpp

@@ -29,7 +29,7 @@
 #include "shared.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kurl.h>
 

akregator/src/articleviewer.cpp

@@ -38,8 +38,8 @@
 #include <kstandarddirs.h>
 #include <kshell.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
-#include <libtdepim/kfileio.h>
+#include <tdeio/netaccess.h>
+#include <libtdepim/tdefileio.h>
 
 #include "aboutdata.h"
 #include "akregator_run.h"

akregator/src/configdialog.h

@@ -25,7 +25,7 @@
 #ifndef AKREGATOR_CONFIGDIALOG_H
 #define AKREGATOR_CONFIGDIALOG_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 namespace Akregator {
 

akregator/src/librss/image.cpp

@@ -11,7 +11,7 @@
 #include "image.h"
 #include "tools_p.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 #include <tqbuffer.h>

akregator/src/librss/loader.cpp

@@ -12,7 +12,7 @@
 #include "document.h"
 #include "feeddetector.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kprocess.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>

akregator/src/librss/loader.h

@@ -114,7 +114,7 @@ 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/kio/KIO.html#Error">as
+			 * <a href="http://developer.kde.org/documentation/library/cvs-api/classref/tdeio/KIO.html#Error">as
 			 * defined by KIO</a>.
 			 */
 			virtual int errorCode() const;

akregator/src/mainwindow.cpp

@@ -32,10 +32,10 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <kkeydialog.h>
 #include <klibloader.h>

akregator/src/mainwindow.h

@@ -33,7 +33,7 @@
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/browserinterface.h>
 #include <tdeparts/browserextension.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class KActionCollection;
 class KToggleAction;

akregator/src/mk4storage/CMakeLists.txt

@@ -39,6 +39,6 @@ tde_add_kpart( libakregator_mk4storage_plugin AUTOMOC
     storagefactorymk4impl.cpp
   LINK
     rsslocal-static metakitlocal-static
-    akregatorprivate-shared kio-shared
+    akregatorprivate-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

akregator/src/pageviewer.cpp

@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <tdehtml_settings.h>
 #include <tdehtmlview.h>

akregator/src/viewer.cpp

@@ -25,7 +25,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <klocale.h>

certmanager/certificatewizardimpl.cpp

@@ -60,8 +60,8 @@
 #include <kurlrequester.h>
 #include <kdcopservicestarter.h>
 #include <dcopclient.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 // TQt
 #include <tqlineedit.h>

certmanager/certmanager.cpp

@@ -71,7 +71,7 @@
 #include <gpgmepp/key.h>
 
 // KDE
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kprocess.h>
 #include <kaction.h>
 #include <kapplication.h>
@@ -85,8 +85,8 @@
 #include <kdialogbase.h>
 #include <kkeydialog.h>
 #include <ktempfile.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 #include <kstdaccel.h>
 
 // TQt

certmanager/conf/appearanceconfigwidget.cpp

@@ -41,7 +41,7 @@
 #include <kleo/keyfiltermanager.h>
 
 #include <klistview.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kdebug.h>

certmanager/conf/configuredialog.cpp

@@ -35,7 +35,7 @@
 
 #include <twin.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )

certmanager/conf/dirservconfigpage.cpp

@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kdialog.h>
 

certmanager/kwatchgnupg/kwatchgnupgconfig.cpp

@@ -34,7 +34,7 @@
 
 #include <klocale.h>
 #include <kurlrequester.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <tqframe.h>

certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp

@@ -44,8 +44,8 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kprocio.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 

certmanager/lib/CMakeLists.txt

@@ -47,6 +47,6 @@ tde_add_library( kleopatra SHARED AUTOMOC
   LINK
     kleopatra_backend_qgpgme-static
     kleopatra_backend_chiasmus-static
-    qgpgme-shared kio-shared
+    qgpgme-shared tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )

certmanager/lib/backends/chiasmus/chiasmusbackend.cpp

@@ -43,7 +43,7 @@
 #include "kleo/cryptoconfig.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kshell.h>
 #include <kdebug.h>
 

certmanager/lib/cryptplugfactory.cpp

@@ -37,7 +37,7 @@
 #include "cryptplugfactory.h"
 #include "cryptplugwrapperlist.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>

certmanager/lib/cryptplugwrapper.cpp

@@ -64,7 +64,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // other
 #include <memory>

certmanager/lib/kleo/CMakeLists.txt

@@ -43,6 +43,6 @@ tde_add_library( kleopatra_core STATIC_PIC AUTOMOC
   SOURCES
     cryptobackend.cpp cryptobackendfactory.cpp
     enum.cpp dn.cpp job.cpp multideletejob.cpp
-    hierarchicalkeylistjob.cpp kconfigbasedkeyfilter.cpp
+    hierarchicalkeylistjob.cpp tdeconfigbasedkeyfilter.cpp
     keyfiltermanager.cpp
 )

certmanager/lib/kleo/Makefile.am

@@ -14,7 +14,7 @@ libkleopatra_core_la_SOURCES = \
 	multideletejob.cpp \
 	hierarchicalkeylistjob.cpp \
 	\
-	kconfigbasedkeyfilter.cpp \
+	tdeconfigbasedkeyfilter.cpp \
 	keyfiltermanager.cpp
 
 kleodir = $(includedir)/kleo

certmanager/lib/kleo/cryptobackendfactory.cpp

@@ -46,7 +46,7 @@
 #include <backends/chiasmus/chiasmusbackend.h>
 #include <ui/backendconfigwidget.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>

certmanager/lib/kleo/dn.cpp

@@ -40,7 +40,7 @@
 #include "ui/dnattributeorderconfigwidget.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 #include <tqstringlist.h>

certmanager/lib/kleo/keyfiltermanager.cpp

@@ -35,11 +35,11 @@
 #endif
 
 #include "keyfiltermanager.h"
-#include "kconfigbasedkeyfilter.h"
+#include "tdeconfigbasedkeyfilter.h"
 
 #include "cryptobackendfactory.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqapplication.h>
 #include <tqregexp.h>

certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp

@@ -1,5 +1,5 @@
 /*
-    kconfigbasedkeyfilter.cpp
+    tdeconfigbasedkeyfilter.cpp
 
     This file is part of libkleopatra, the KDE keymanagement library
     Copyright (c) 2004 Klarälvdalens Datakonsult AB
@@ -34,9 +34,9 @@
 #include <config.h>
 #endif
 
-#include "kconfigbasedkeyfilter.h"
+#include "tdeconfigbasedkeyfilter.h"
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klocale.h>
 
 static const struct {

certmanager/lib/kleo/tdeconfigbasedkeyfilter.h

@@ -1,5 +1,5 @@
 /*
-    kconfigbasedkeyfilter.h
+    tdeconfigbasedkeyfilter.h
 
     This file is part of libkleopatra, the KDE keymanagement library
     Copyright (c) 2004 Klarälvdalens Datakonsult AB

certmanager/lib/ui/dnattributeorderconfigwidget.cpp

@@ -42,7 +42,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <tqtoolbutton.h>

certmanager/lib/ui/keyselectiondialog.cpp

@@ -58,7 +58,7 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kactivelabel.h>

certmanager/lib/ui/messagebox.cpp

@@ -41,7 +41,7 @@
 #include <gpgmepp/signingresult.h>
 #include <gpgmepp/encryptionresult.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <ksavefile.h>

certmanager/storedtransferjob.h

@@ -20,7 +20,7 @@
 #ifndef STOREDTRANSFERJOB_H
 #define STOREDTRANSFERJOB_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 // To be moved to KIO?
 namespace TDEIOext {

config.h.cmake

@@ -21,7 +21,7 @@
 #cmakedefine MAX_CMD_LENGTH @MAX_CMD_LENGTH@
 #cmakedefine HAVE_C99_INITIALIZERS 1
 
-// kioslaves
+// tdeioslaves
 #cmakedefine HAVE_LIBSASL2 1
 
 // kmail

dependency-graph.dot

@@ -25,7 +25,7 @@ digraph "inter-dependency graph for tdepim" {
         "libemailfunctions" -> "libkpimidentities";
         "libkcal" -> "kalarm";
         "libkcal" -> "karm";
-        "libkcal" -> "kfile-plugins";
+        "libkcal" -> "tdefile-plugins";
         "libkcal" -> "kitchensync";
         "libkcal" -> "knotes";
         "libkcal" -> "konsolekalendar";
@@ -44,7 +44,7 @@ digraph "inter-dependency graph for tdepim" {
         "libtdepim" -> "kalarm";
         "libtdepim" -> "kandy";
         "libtdepim" -> "karm";
-        "libtdepim" -> "kioslaves";
+        "libtdepim" -> "tdeioslaves";
         "libtdepim" -> "kitchensync";
         "libtdepim" -> "kmail";
         "libtdepim" -> "knode";
@@ -57,7 +57,7 @@ digraph "inter-dependency graph for tdepim" {
         "libkholidays" -> "kontact";
         "libkholidays" -> "korganizer";
         "libkmime" -> "kalarm";
-        "libkmime" -> "kioslaves";
+        "libkmime" -> "tdeioslaves";
         "libkmime" -> "kmail";
         "libkmime" -> "knode";
         "libkpgp" -> "certmanager";

kaddressbook/addresseditwidget.cpp

@@ -41,7 +41,7 @@
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>

kaddressbook/addresseeconfig.h

@@ -25,7 +25,7 @@
 #define ADDRESSEECONFIG_H
 
 #include <kabc/addressee.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 using namespace KABC;
 

kaddressbook/addresseeeditorwidget.cpp

@@ -36,7 +36,7 @@
 #include <kabc/stdaddressbook.h>
 #include <kaccelmanager.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

kaddressbook/common/filter.cpp

@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "kabprefs.h"

kaddressbook/common/filter.h

@@ -29,7 +29,7 @@
 #include <tqvaluelist.h>
 
 #include <kabc/addressee.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 /**
   Filter for AddressBook related objects (Addressees)

kaddressbook/common/kabprefs.cpp

@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 

kaddressbook/common/kabprefs_base.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kaddressbook.kcfg
 ClassName=KABPrefsBase
 Singleton=false

kaddressbook/common/locationmap.cpp

@@ -22,7 +22,7 @@
 */
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kglobal.h>
 #include <klocale.h>

kaddressbook/emaileditwidget.cpp

@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>

kaddressbook/extensionmanager.cpp

@@ -22,7 +22,7 @@
 */
 
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ktrader.h>

kaddressbook/features/distributionlistwidget.cpp

@@ -31,7 +31,7 @@
 #include <tqradiobutton.h>
 
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kinputdialog.h>

kaddressbook/imagewidget.cpp

@@ -24,11 +24,11 @@
 #include <kabc/picture.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>

kaddressbook/imeditwidget.cpp

@@ -31,7 +31,7 @@
 #include <tqtooltip.h>
 
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>

kaddressbook/interfaces/configurewidget.h

@@ -26,7 +26,7 @@
 
 #include <tqwidget.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdepimmacros.h>
 
 namespace KABC {

kaddressbook/kaddressbookview.cpp

@@ -26,7 +26,7 @@
 
 #include <kabc/addressbook.h>
 #include <kabc/distributionlistdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kxmlguifactory.h>

kaddressbook/kcmconfigs/addresseewidget.cpp

@@ -32,7 +32,7 @@
 
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>

kaddressbook/kcmconfigs/kabconfigwidget.cpp

@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 #include <tqcombobox.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>

kaddressbook/kcmconfigs/ldapoptionswidget.cpp

@@ -31,7 +31,7 @@
 
 #include <kapplication.h>
 #include <kbuttonbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <klocale.h>
 

kaddressbook/keywidget.cpp

@@ -29,8 +29,8 @@
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>

kaddressbook/ldapsearchdialog.cpp

@@ -33,7 +33,7 @@
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>

kaddressbook/nameeditdialog.cpp

@@ -34,7 +34,7 @@
 #include <kaccelmanager.h>
 #include <kapplication.h>
 #include <kbuttonbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <kcombobox.h>

kaddressbook/phoneeditwidget.cpp

@@ -35,7 +35,7 @@
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>

kaddressbook/printing/detailledstyle.cpp

@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <tqcheckbox.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kfontcombo.h>

kaddressbook/soundwidget.cpp

@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <ktempfile.h>
 #include <kurlrequester.h>

kaddressbook/thumbnailcreator/Makefile.am

@@ -1,4 +1,4 @@
-# kioslave to generate thumbnails for vCard and LDIF-Files in Konqueror
+# tdeioslave to generate thumbnails for vCard and LDIF-Files in Konqueror
 INCLUDES = $(all_includes)
 
 kde_module_LTLIBRARIES = ldifvcardthumbnail.la

kaddressbook/thumbnailcreator/ldifvcardcreator.cpp

@@ -20,7 +20,7 @@
 /*
  *  - ldifvcardthumbnail -
  *
- *  kioslave which generates tumbnails for vCard and LDIF files.
+ *  tdeioslave which generates tumbnails for vCard and LDIF files.
  *  The thumbnails are used e.g. by Konqueror or in the file selection
  *  dialog.
  *

kaddressbook/thumbnailcreator/ldifvcardcreator.h

@@ -22,7 +22,7 @@
 #define VCARD_LDIFCREATOR_H
 
 #include <tqpixmap.h>
-#include <kio/thumbcreator.h>
+#include <tdeio/thumbcreator.h>
 #include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
 
 class KPixmapSplitter;

kaddressbook/viewconfigurefilterpage.cpp

@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqradiobutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <klocale.h>

kaddressbook/viewconfigurewidget.cpp

@@ -25,7 +25,7 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>

kaddressbook/viewmanager.cpp

@@ -29,7 +29,7 @@
 #include <kabc/addressbook.h>
 #include <kabc/vcardconverter.h>
 #include <kactionclasses.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kiconloader.h>

kaddressbook/views/configurecardviewdialog.cpp

@@ -36,7 +36,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kfontdialog.h>
 #include <kpushbutton.h>
 

kaddressbook/views/configuretableviewdialog.cpp

@@ -36,7 +36,7 @@
 #include <kurlrequester.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "configuretableviewdialog.h"
 

kaddressbook/views/contactlistview.cpp

@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include <kabc/addressbook.h>

kaddressbook/views/kaddressbookcardview.cpp

@@ -30,7 +30,7 @@
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 

kaddressbook/views/kaddressbookiconview.cpp

@@ -28,7 +28,7 @@
 
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>

kaddressbook/views/kaddressbooktableview.cpp

@@ -38,7 +38,7 @@
 
 #include <kabc/addressbook.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kglobal.h>

kaddressbook/xxport/csv_xxport.cpp

@@ -23,8 +23,8 @@
 
 #include <tqfile.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>

kaddressbook/xxport/csvimportdialog.cpp

@@ -35,7 +35,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kinputdialog.h>

kaddressbook/xxport/eudora_xxport.cpp

@@ -23,8 +23,8 @@
 
 #include <tqfile.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>

kaddressbook/xxport/kde2_xxport.cpp

@@ -24,8 +24,8 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
@@ -62,10 +62,10 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
   TDEProcess proc;
 
   if ( result == KMessageBox::Yes ) {
-    proc << "kab2kabc";
+    proc << "tdeab2tdeabc";
     proc << "--override";
   } else if ( result == KMessageBox::No )
-    proc << "kab2kabc";
+    proc << "tdeab2tdeabc";
   else {
     kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl;
     return KABC::AddresseeList();

kaddressbook/xxport/ldif_xxport.cpp

@@ -35,8 +35,8 @@
 
 #include <tqfile.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>

kaddressbook/xxport/opera_xxport.cpp

@@ -25,8 +25,8 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>

kaddressbook/xxport/pab_xxport.cpp

@@ -25,8 +25,8 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kprocess.h>

kaddressbook/xxport/vcard_xxport.cpp

@@ -30,8 +30,8 @@
 
 #include <kabc/vcardconverter.h>
 #include <kdialogbase.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>

kalarm/CMakeLists.txt

@@ -59,7 +59,7 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Applications RE
 tde_add_executable( kalarm AUTOMOC
   SOURCES
     birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp
-    emailidcombo.cpp find.cpp pickfileradio.cpp
+    emailidcombo.cpp find.cpp pictdefileradio.cpp
     calendarcompat.cpp eventlistviewbase.cpp alarmlistview.cpp
     kamail.cpp timeselector.cpp fontcolourbutton.cpp
     alarmtimewidget.cpp fontcolour.cpp soundpicker.cpp

kalarm/Makefile.am

@@ -20,7 +20,7 @@ kalarm_SOURCES = birthdaydlg.cpp main.cpp alarmevent.cpp editdlg.cpp \
 	eventlistviewbase.cpp alarmlistview.cpp kamail.cpp timeselector.cpp \
 	templatelistview.cpp templatepickdlg.cpp templatedlg.cpp \
 	templatemenuaction.cpp latecancel.cpp repetition.cpp alarmtext.cpp \
-	emailidcombo.cpp find.cpp pickfileradio.cpp calendarcompat.cpp
+	emailidcombo.cpp find.cpp pictdefileradio.cpp calendarcompat.cpp
 kalarm_LDFLAGS = $(all_libraries) $(KDE_RPATH) -L$(top_builddir)/libtdenetwork/qgpgme
 if include_ARTS
 ARTSLIB = -lartskde
@@ -37,7 +37,7 @@ noinst_HEADERS = alarmcalendar.h alarmevent.h alarmlistview.h alarmtext.h \
 	editdlg.h editdlgprivate.h emailidcombo.h eventlistviewbase.h find.h \
 	fontcolour.h fontcolourbutton.h functions.h kalarm.h kalarmapp.h \
 	kamail.h karecurrence.h latecancel.h mainwindow.h mainwindowbase.h \
-	messagewin.h pickfileradio.h prefdlg.h preferences.h recurrenceedit.h \
+	messagewin.h pictdefileradio.h prefdlg.h preferences.h recurrenceedit.h \
 	recurrenceeditprivate.h reminder.h repetition.h sounddlg.h \
 	soundpicker.h specialactions.h startdaytimer.h templatedlg.h \
 	templatelistview.h templatemenuaction.h templatepickdlg.h timeselector.h \

kalarm/alarmcalendar.cpp

@@ -31,12 +31,12 @@
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 #include <ktempfile.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 

kalarm/birthdaydlg.cpp

@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kaccel.h>
 #include <kabc/addressbook.h>

kalarm/daemon.cpp

@@ -24,7 +24,7 @@
 #include <tqiconset.h>
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>

kalarm/editdlg.cpp

@@ -39,11 +39,11 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>
 #include <kurlcompletion.h>
@@ -71,7 +71,7 @@
 #include "latecancel.h"
 #include "lineedit.h"
 #include "mainwindow.h"
-#include "pickfileradio.h"
+#include "pictdefileradio.h"
 #include "preferences.h"
 #include "radiobutton.h"
 #include "recurrenceedit.h"

kalarm/functions.cpp

@@ -38,14 +38,14 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 #include <kstdaccel.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdcopservicestarter.h>

kalarm/kalarmapp.cpp

@@ -32,12 +32,12 @@
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 #include <dcopclient.h>
 #include <kprocess.h>
 #include <ktempfile.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
 #include <kstdguiitem.h>
 #include <ktrader.h>
 #include <kstaticdeleter.h>

kalarm/kalarmd/adcalendar.cpp

@@ -24,8 +24,8 @@
 #include <tqfile.h>
 
 #include <ktempfile.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kdebug.h>
 
 #include "adcalendar.moc"

kalarm/kalarmd/adconfigdata.cpp

@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqstringlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 

kalarm/kalarmd/alarmdaemon.cpp

@@ -31,9 +31,9 @@
 #include <kapplication.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <libkcal/calendarlocal.h>

kalarm/kamail.cpp

@@ -37,8 +37,8 @@
 #include <kprocess.h>
 #include <klocale.h>
 #include <kaboutdata.h>
-#include <kfileitem.h>
-#include <kio/netaccess.h>
+#include <tdefileitem.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
 #include <kemailsettings.h>
 #include <kdebug.h>

kalarm/lib/messagebox.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "kalarm.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "messagebox.h"
 
 

kalarm/mainwindow.cpp

@@ -36,7 +36,7 @@
 #include <kurldrag.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kaboutdata.h>

kalarm/messagewin.cpp

@@ -39,7 +39,7 @@
 #include <kstdguiitem.h>
 #include <kaboutdata.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <ktextbrowser.h>
@@ -49,7 +49,7 @@
 #include <twin.h>
 #include <twinmodule.h>
 #include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <kpushbutton.h>
 #ifdef WITHOUT_ARTS

kalarm/pictdefileradio.cpp

@@ -1,5 +1,5 @@
 /*
- *  pickfileradio.cpp  -  radio button with an associated file picker
+ *  pictdefileradio.cpp  -  radio button with an associated file picker
  *  Program:  kalarm
  *  Copyright (C) 2005 by David Jarvie <software@astrojar.org.uk>
  *
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 
 #include "lineedit.h"
-#include "pickfileradio.moc"
+#include "pictdefileradio.moc"
 
 
 PickFileRadio::PickFileRadio(TQPushButton* button, LineEdit* edit, const TQString& text, TQButtonGroup* parent, const char* name)

kalarm/pictdefileradio.h

@@ -1,5 +1,5 @@
 /*
- *  pickfileradio.h  -  radio button with an associated file picker
+ *  pictdefileradio.h  -  radio button with an associated file picker
  *  Program:  kalarm
  *  Copyright (C) 2005 by David Jarvie <software@astrojar.org.uk>
  *
@@ -21,7 +21,7 @@
 #ifndef PICKFILERADIO_H
 #define PICKFILERADIO_H
 
-/** @file pickfileradio.h - radio button with an associated file picker */
+/** @file pictdefileradio.h - radio button with an associated file picker */
 
 #include "radiobutton.h"
 

kalarm/preferences.cpp

@@ -21,7 +21,7 @@
 #include "kalarm.h"
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
 #include <kglobalsettings.h>

kalarm/sounddlg.cpp

@@ -44,7 +44,7 @@
 #include <arts/kplayobject.h>
 #endif
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 
 #include "checkbox.h"

kalarm/soundpicker.cpp

@@ -30,7 +30,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #ifndef WITHOUT_ARTS

kalarm/traywindow.cpp

@@ -33,7 +33,7 @@
 #include <kstdaction.h>
 #include <kstdguiitem.h>
 #include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include "alarmcalendar.h"

kandy/src/kandy.cpp

@@ -34,9 +34,9 @@
 #include <kmenubar.h>
 #include <kkeydialog.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kurlrequesterdlg.h>
 #include <kdebug.h>

kandy/src/kandyprefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kandy.kcfg
 ClassName=KandyPrefs
 Singleton=true

kandy/src/kandyview.cpp

@@ -43,7 +43,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinputdialog.h>
 #include <kdialog.h>
 

kandy/src/mobilegui.cpp

@@ -35,7 +35,7 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kapplication.h>

kandy/src/mobilemain.cpp

@@ -28,7 +28,7 @@
 #include <kmenubar.h>
 #include <kkeydialog.h>
 #include <kaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>

karm/karm_part.cpp

@@ -11,7 +11,7 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 

karm/karmstorage.cpp

@@ -49,7 +49,7 @@
 #include <taskview.h>
 #include <timekard.h>
 #include <karmutility.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <vector>
 

karm/mainwindow.cpp

@@ -10,7 +10,7 @@
 #include <kaccel.h>
 #include <kaction.h>
 #include <kapplication.h>       // kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kkeydialog.h>

karm/preferences.cpp

@@ -6,7 +6,7 @@
 #include <tqlayout.h>
 
 #include <kapplication.h>       // kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kiconloader.h>

karm/taskview.cpp

@@ -11,9 +11,9 @@
 #include <tqxml.h>
 
 #include "kapplication.h"       // kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>            // i18n
 #include <kmessagebox.h>
 #include <kurlrequester.h>

kfile-plugins/ics/Makefile.am

@@ -1,24 +0,0 @@
-# Makefile.am for ics file meta info plugin
-
-# set the include path for X, tdepim, qt and KDE
-INCLUDES = \
-  -I$(top_srcdir) \
-  $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_ics.h
-
-kde_module_LTLIBRARIES = kfile_ics.la
-
-kfile_ics_la_SOURCES = kfile_ics.cpp
-kfile_ics_la_LDFLAGS =  $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
-kfile_ics_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(LIB_KSYCOCA)
-
-
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_ics.cpp -o $(podir)/kfile_ics.pot
-
-services_DATA = kfile_ics.desktop
-servicesdir = $(kde_servicesdir)

kfile-plugins/palm-databases/Makefile.am

@@ -1,22 +0,0 @@
-## Makefile.am for palm database meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(PISOCK_INCLUDE) $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_palm.h
-
-kde_module_LTLIBRARIES = kfile_palm.la
-
-kfile_palm_la_SOURCES = kfile_palm.cpp 
-kfile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
-kfile_palm_la_LIBADD = $(LIB_KSYCOCA) $(PISOCK_LIB)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_palm.cpp -o $(podir)/kfile_palm.pot
-
-services_DATA = kfile_palm.desktop
-servicesdir = $(kde_servicesdir)

kfile-plugins/rfc822/Makefile.am

@@ -1,22 +0,0 @@
-## Makefile.am for rfc822 file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_rfc822.h
-
-kde_module_LTLIBRARIES = kfile_rfc822.la
-
-kfile_rfc822_la_SOURCES = kfile_rfc822.cpp 
-kfile_rfc822_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_rfc822_la_LIBADD = $(LIB_KSYCOCA)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_rfc822.cpp -o $(podir)/kfile_rfc822.pot
-
-services_DATA = kfile_rfc822.desktop
-servicesdir = $(kde_servicesdir)

kfile-plugins/vcf/Makefile.am

@@ -1,22 +0,0 @@
-## Makefile.am for vcf file meta info plugin
-
-# set the include path for X, qt and KDE
-INCLUDES         = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS   = kfile_vcf.h
-
-kde_module_LTLIBRARIES = kfile_vcf.la
-
-kfile_vcf_la_SOURCES = kfile_vcf.cpp 
-kfile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
-kfile_vcf_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KABC)
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) kfile_vcf.cpp -o $(podir)/kfile_vcf.pot
-
-services_DATA = kfile_vcf.desktop
-servicesdir = $(kde_servicesdir)

kitchensync/src/configguievo2.cpp

@@ -28,7 +28,7 @@
 
 #include <kurlrequester.h>
 #include <kurl.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <kdialog.h>
 #include <klocale.h>
 

kitchensync/src/configguisunbird.cpp

@@ -38,7 +38,7 @@
 #include <kpushbutton.h>
 #include <kdialog.h>
 #include <klocale.h>
-#include <kfile.h>
+#include <tdefile.h>
 
 ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )

kmail/ChangeLog

@@ -557,7 +557,7 @@ Sun Sep  6 18:28:45 1998  Markus Wuebben  <markus@kde.org>
 	stored again.
 
 	* Composer: changed completion key from Ctrl-. to Ctrl-T
-	as kfile has.
+	as tdefile has.
 
 1998-06-18  Mario Weilguni   <mweilguni@kde.org>
 

kmail/Makefile.am

@@ -201,7 +201,7 @@ KDE_ICON = AUTO
 rcdir = $(kde_datadir)/kmail
 rc_DATA = kmcomposerui.rc kmmainwin.rc kmreadermainwin.rc eventsrc kmail_part.rc
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kmail.upd
 update_SCRIPTS = upgrade-transport.pl kmail-pgpidentity.pl \
                 upgrade-signature.pl kmail-upd-identities.pl \

kmail/accountdialog.cpp

@@ -36,7 +36,7 @@
 #include <tqtoolbutton.h>
 #include <tqgrid.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
@@ -365,7 +365,7 @@ void AccountDialog::makeLocalAccountPage()
   groupLayout->setSpacing( 6 );
   groupLayout->setMargin( 11 );
 
-  mLocal.lockProcmail = new TQRadioButton( i18n("Procmail loc&kfile:"), group);
+  mLocal.lockProcmail = new TQRadioButton( i18n("Procmail loc&tdefile:"), group);
   groupLayout->addWidget(mLocal.lockProcmail, 0, 0);
 
   mLocal.procmailLockFileName = new TQComboBox( true, group );

kmail/accountmanager.cpp

@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <tqregexp.h>

kmail/accountwizard.cpp

@@ -27,7 +27,7 @@
 *******************************************************************************/
 
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <klistbox.h>
 #include <klocale.h>

kmail/acljobs.cpp

@@ -29,7 +29,7 @@
  *  your version.
  */
 #include "acljobs.h"
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 
 using namespace KMail;

kmail/acljobs.h

@@ -32,7 +32,7 @@
 #ifndef KMACLJOBS_H
 #define KMACLJOBS_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqvaluevector.h>
 
 namespace KMail {

kmail/actionscheduler.cpp

@@ -47,7 +47,7 @@
 using KMail::AccountManager;
 
 #include <tqtimer.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 using namespace KMail;

kmail/annotationjobs.cpp

@@ -29,7 +29,7 @@
  *  your version.
  */
 #include "annotationjobs.h"
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 
 using namespace KMail;

kmail/annotationjobs.h

@@ -32,7 +32,7 @@
 #ifndef ANNOTATIONJOBS_H
 #define ANNOTATIONJOBS_H
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqvaluevector.h>
 
 namespace KMail {

kmail/antispamconfig.cpp

@@ -36,7 +36,7 @@
 #include <kasciistricmp.h>
 
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 using namespace KMail;
 

kmail/antispamwizard.h

@@ -31,7 +31,7 @@
 
 #include "simplefoldertree.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistbox.h>
 #include <kwizard.h>
 

kmail/archivefolderdialog.cpp

@@ -29,7 +29,7 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <tqlabel.h>
 #include <tqcheckbox.h>

kmail/cachedimapjob.cpp

@@ -47,8 +47,8 @@
 #include "scalix.h"
 #include "util.h"
 
-#include <kio/scheduler.h>
-#include <kio/job.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
 
 #include <klocale.h>
 #include <kdebug.h>

kmail/cachedimapjob.h

@@ -45,8 +45,8 @@
 #define CACHEDIMAPJOB_H
 
 #include "folderjob.h"
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 
 #include <tqptrlist.h>
 #include <tqvaluelist.h>

kmail/configure.in.in

@@ -19,7 +19,7 @@ AM_CONDITIONAL(add_indexlib, test no = "$missing_indexlib")
 
 ])
 
-dnl The following test is taken from tdelibs/kio/kio
+dnl The following test is taken from tdelibs/tdeio/tdeio
 dnl ------------------------------------------------------------------------
 dnl Try to find if we have Linux Inode based Dir Notification
 dnl ------------------------------------------------------------------------

kmail/configuredialog.cpp

@@ -96,7 +96,7 @@ using KMime::DateFormatter;
 #include <kstandarddirs.h>
 #include <twin.h>
 #include <knotifydialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kactivelabel.h>
 #include <kcmultidialog.h>
 #include <kcombobox.h>

kmail/csshelper.cpp

@@ -34,7 +34,7 @@
 
 #include "globalsettings.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcolor.h>
 #include <tqfont.h>

kmail/editorwatcher.cpp

@@ -31,7 +31,7 @@
 
 #include <cassert>
 
-// inotify stuff taken from tdelibs/kio/kio/kdirwatch.cpp
+// inotify stuff taken from tdelibs/tdeio/tdeio/kdirwatch.cpp
 #ifdef HAVE_SYS_INOTIFY
 #include <sys/ioctl.h>
 #include <sys/inotify.h>

kmail/favoritefolderview.cpp

@@ -40,7 +40,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqheader.h>
 #include <tqtimer.h>

kmail/filterimporterexporter.cpp

@@ -33,9 +33,9 @@
 #include "kmfilteraction.h"
 #include "util.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdialogbase.h>
 #include <klistview.h>
 #include <kpushbutton.h>

kmail/filterlogdlg.cpp

@@ -32,7 +32,7 @@
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 

kmail/folderdiaquotatab_p.cpp

@@ -41,7 +41,7 @@
 
 #include "kmkernel.h"
 #include "klocale.h"
-#include "kconfig.h"
+#include "tdeconfig.h"
 #include "kdebug.h"
 #include "kdialog.h"
 #include "globalsettings.h"

kmail/folderjob.cpp

@@ -38,7 +38,7 @@
 #include "folderstorage.h"
 
 #include <kdebug.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 namespace KMail {
 

kmail/folderstorage.cpp

@@ -49,7 +49,7 @@ using KMail::ListJob;
 #include "globalsettings.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqfile.h>

kmail/foldertreebase.cpp

@@ -31,7 +31,7 @@
 using KPIM::MailList;
 using KPIM::MailListDrag;
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 

kmail/headeritem.cpp

@@ -32,7 +32,7 @@
 #include <tqbitmap.h>
 #include <tqpainter.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "headeritem.h"
 #include "kmheaders.h"

kmail/headerstrategy.cpp

@@ -38,7 +38,7 @@
 #include "kmkernel.h"
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace KMail {
 

kmail/htmlstatusbar.cpp

@@ -43,7 +43,7 @@
 #endif
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqcolor.h>
 #include <tqstring.h>

kmail/identitydialog.cpp

@@ -63,8 +63,8 @@ using KMail::FolderRequester;
 // other KDE headers:
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
-#include <kfileitem.h>
+#include <tdeconfig.h>
+#include <tdefileitem.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kpushbutton.h>

kmail/imapaccountbase.cpp

@@ -52,14 +52,14 @@ using KPIM::ProgressManager;
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 using TDEIO::MetaData;
-#include <kio/passdlg.h>
+#include <tdeio/passdlg.h>
 using TDEIO::PasswordDialog;
-#include <kio/scheduler.h>
-#include <kio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
 #include <mimelib/bodypart.h>
 #include <mimelib/body.h>
 #include <mimelib/headers.h>

kmail/imapaccountbase.h

@@ -30,7 +30,7 @@
 
 #include <tqtimer.h>
 #include <tqguardedptr.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class AccountManager;
 class KMFolder;
@@ -103,7 +103,7 @@ namespace KMail {
     virtual void writeConfig( TDEConfig& config );
 
     /**
-     * The state of the kioslave connection
+     * The state of the tdeioslave connection
      */
     enum ConnectionState { Error = 0, Connected, Connecting };
 

kmail/imapjob.cpp

@@ -42,7 +42,7 @@ using KPIM::ProgressManager;
 #include "util.h"
 
 #include <tqstylesheet.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <mimelib/body.h>

kmail/imapjob.h

@@ -32,8 +32,8 @@
 #ifndef IMAPJOB_H
 #define IMAPJOB_H
 
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 
 #include "folderjob.h"
 

kmail/kmaccount.cpp

@@ -28,7 +28,7 @@ using KMail::FolderJob;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqeventloop.h>
 

kmail/kmacctcachedimap.cpp

@@ -45,13 +45,13 @@ using KMail::SieveConfig;
 using KMail::AccountManager;
 #include "progressmanager.h"
 
-#include <kio/passdlg.h>
-#include <kio/scheduler.h>
-#include <kio/slave.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqstylesheet.h>
 

kmail/kmacctimap.cpp

@@ -45,8 +45,8 @@ using KMail::ImapAccountBase;
 #include "progressmanager.h"
 using KPIM::ProgressItem;
 using KPIM::ProgressManager;
-#include <kio/scheduler.h>
-#include <kio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 

kmail/kmacctlocal.cpp

@@ -18,7 +18,7 @@ using KPIM::ProgressManager;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqfileinfo.h>
 #include <tqstylesheet.h>

kmail/kmacctmaildir.cpp

@@ -17,7 +17,7 @@ using KPIM::ProgressManager;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqstylesheet.h>
 

kmail/kmail.upd

@@ -76,7 +76,7 @@ Id=3.2-misc
 ########## W A R N I N G #### W A R N I N G #### W A R N I N G #######
 # collection of small adjustments. Since updates will be added to this
 # script during the pre-3.2 development, HEAD users should regularly
-# remove the "3.2-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc.
+# remove the "3.2-{misc,moves}-xx" keys from their kmailrc and tdeconf_updaterc.
 # For this to work, the script MUST be idempotent, ie. be robust
 # against being run multiple times.
 ######################################################################
@@ -124,7 +124,7 @@ Id=3.3-misc
 ########## W A R N I N G #### W A R N I N G #### W A R N I N G #######
 # collection of small adjustments. Since updates will be added to this
 # script during the pre-3.3 development, HEAD users should regularly
-# remove the "3.3-{misc,moves}-xx" keys from their kmailrc and kconf_updaterc.
+# remove the "3.3-{misc,moves}-xx" keys from their kmailrc and tdeconf_updaterc.
 # For this to work, the script MUST be idempotent, ie. be robust
 # against being run multiple times.
 ######################################################################

kmail/kmailicalifaceimpl.cpp

@@ -70,7 +70,7 @@ using KMail::AccountManager;
 #include <kinputdialog.h>
 #include <dcopclient.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <ktempfile.h>
 

kmail/kmcommands.cpp

@@ -61,7 +61,7 @@
 #include <libemailfunctions/email.h>
 #include <kdcopservicestarter.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/addresseelist.h>
 #include <kdirselectdialog.h>
@@ -76,8 +76,8 @@
 #include <tdeimproxy.h>
 #include <kuserprofile.h>
 // KIO headers
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 #include <libkpimidentities/identitymanager.h>
 
@@ -120,7 +120,7 @@ using KMail::RedirectDialog;
 #include "broadcaststatus.h"
 #include "globalsettings.h"
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include "kcalendariface_stub.h"
 
 #include "progressmanager.h"

kmail/kmcommands.h

@@ -10,7 +10,7 @@
 #include <tqvaluevector.h>
 #include <tqtimer.h>
 #include <tqfont.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include "kmmsgbase.h" // for KMMsgStatus
 #include <mimelib/string.h>
 #include <tdepimmacros.h>

kmail/kmcomposewin.cpp

@@ -58,7 +58,7 @@ using KRecentAddress::RecentAddresses;
 #include <libkpimidentities/identitymanager.h>
 #include <libkpimidentities/identitycombo.h>
 #include <libkpimidentities/identity.h>
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libemailfunctions/email.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/exportjob.h>
@@ -69,7 +69,7 @@ using KRecentAddress::RecentAddresses;
 #include <gpgmepp/context.h>
 #include <gpgmepp/key.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "klistboxdialog.h"
 
@@ -85,12 +85,12 @@ using KRecentAddress::RecentAddresses;
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <twin.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
 #include <kurldrag.h>
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <ktempfile.h>
 #include <klocale.h>
 #include <kapplication.h>

kmail/kmcomposewin.h

@@ -28,7 +28,7 @@
 #include <tqvaluevector.h>
 #include <tqsplitter.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kglobalsettings.h>
 #include <tdeversion.h>
 #include <keditcl.h>

kmail/kmedit.cpp

@@ -18,7 +18,7 @@
 #include <maillistdrag.h>
 using KPIM::MailListDrag;
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libemailfunctions/email.h>
 
 #include <kcursor.h>

kmail/kmfawidgets.cpp

@@ -13,7 +13,7 @@
 #include <klocale.h>
 #include <kaudioplayer.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstandarddirs.h>
 
 #include <tqlayout.h>

kmail/kmfilter.cpp

@@ -34,7 +34,7 @@ using KMail::FilterLog;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <assert.h>
 

kmail/kmfilteraction.cpp

@@ -21,7 +21,7 @@
 #include <libkpimidentities/identity.h>
 #include <libkpimidentities/identitymanager.h>
 #include <libkpimidentities/identitycombo.h>
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libtdepim/collectingprocess.h>
 using KPIM::CollectingProcess;
 #include <mimelib/message.h>

kmail/kmfilterdlg.cpp

@@ -26,7 +26,7 @@ using KMail::FilterImporterExporter;
 #include <kiconloader.h>
 #include <kapplication.h>
 #include <twin.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kicondialog.h>
 #include <kkeybutton.h>
 #include <klistview.h>

kmail/kmfiltermgr.cpp

@@ -23,7 +23,7 @@ using KMail::MessageProperty;
 // other KDE headers
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 // other TQt headers
 #include <tqregexp.h>

kmail/kmfolder.cpp

@@ -715,7 +715,7 @@ TQString KMFolder::idString() const
   if (!relativePath.isEmpty())
     relativePath = relativePath.right( relativePath.length() - 1 ) + "/";
   TQString escapedName = name();
-  /* Escape [ and ] as they are disallowed for kconfig sections and that is
+  /* Escape [ and ] as they are disallowed for tdeconfig sections and that is
      what the idString is primarily used for. */
   escapedName.replace( "[", "%(" );
   escapedName.replace( "]", "%)" );

kmail/kmfoldercachedimap.cpp

@@ -66,9 +66,9 @@ using KMail::ListJob;
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kio/global.h>
-#include <kio/scheduler.h>
+#include <tdeconfig.h>
+#include <tdeio/global.h>
+#include <tdeio/scheduler.h>
 #include <tqbuffer.h>
 #include <tqbuttongroup.h>
 #include <tqcombobox.h>

kmail/kmfolderdia.cpp

@@ -55,7 +55,7 @@
 #include <knuminput.h>
 #include <kmessagebox.h>
 #include <kicondialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klistview.h>
 #include <kpushbutton.h>

kmail/kmfolderimap.cpp

@@ -52,8 +52,8 @@ using KMail::RenameJob;
 #include "acljobs.h"
 
 #include <kdebug.h>
-#include <kio/scheduler.h>
-#include <kconfig.h>
+#include <tdeio/scheduler.h>
+#include <tdeconfig.h>
 
 #include <tqbuffer.h>
 #include <tqtextcodec.h>

kmail/kmfolderimap.h

@@ -29,8 +29,8 @@
 #include "kmfoldermbox.h"
 #include "kmmsgbase.h"
 
-#include "kio/job.h"
-#include "kio/global.h"
+#include "tdeio/job.h"
+#include "tdeio/global.h"
 
 #include <kstandarddirs.h>
 

kmail/kmfoldermaildir.cpp

@@ -9,7 +9,7 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include "kmfoldermaildir.h"
 #include "kmfoldermgr.h"
 #include "kmfolder.h"

kmail/kmfoldermaildir.h

@@ -3,7 +3,7 @@
 
 #include "kmfolderindex.h"
 
-#include <kfileitem.h>
+#include <tdefileitem.h>
 
 #include <tqguardedptr.h>
 

kmail/kmfoldermbox.cpp

@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <ctype.h>
 #include <stdio.h>

kmail/kmfoldermgr.cpp

@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kapplication.h>
 

kmail/kmfoldersearch.cpp

@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <assert.h>
 #include <stdio.h>

kmail/kmfoldertree.cpp

@@ -34,7 +34,7 @@ using namespace KPIM;
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpopupmenu.h>
 #include <kdebug.h>
 

kmail/kmheaders.cpp

@@ -38,7 +38,7 @@ using namespace KPIM;
 #include <kiconloader.h>
 #include <kpopupmenu.h>
 #include <kimageio.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 

kmail/kmkernel.cpp

@@ -30,7 +30,7 @@ using KPIM::BroadcastStatus;
 #include "undostack.h"
 #include "accountmanager.h"
 using KMail::AccountManager;
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include "kmversion.h"
 #include "kmreaderwin.h"
 #include "kmmainwidget.h"
@@ -61,14 +61,14 @@ using KMail::FolderIface;
 #include <knotifyclient.h>
 #include <kstaticdeleter.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprogress.h>
 #include <kpassivepopup.h>
 #include <dcopclient.h>
 #include <ksystemtray.h>
 #include <kpgp.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdewallet.h>
 using KWallet::Wallet;
 #include "actionscheduler.h"

kmail/kmkernel.h

@@ -9,7 +9,7 @@
 #include <weaver.h>
 #include <weaverlogger.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <tdeimproxy.h>
 #include <tdepimmacros.h>

kmail/kmlineeditspell.cpp

@@ -14,7 +14,7 @@
 #include <libemailfunctions/email.h>
 
 #include <kabc/vcardconverter.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <kpopupmenu.h>
 #include <kurl.h>

kmail/kmmainwidget.cpp

@@ -34,7 +34,7 @@
 #include <knotifyclient.h>
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktip.h>
 #include <knotifydialog.h>
 #include <kstandarddirs.h>

kmail/kmmainwin.cpp

@@ -17,7 +17,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kstringhandler.h>
 #include <kdebug.h>

kmail/kmmessage.cpp

@@ -37,7 +37,7 @@ using KMail::HeaderStrategy;
 #include <kapplication.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdehtml_part.h>
 #include <kuser.h>
 #include <kidna.h>

kmail/kmmimeparttree.cpp

@@ -42,7 +42,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 

kmail/kmmimeparttree.h

@@ -36,7 +36,7 @@
 #define KMMIMEPARTTREE_H
 
 #include <klistview.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <tqstring.h>
 

kmail/kmmsgpart.h

@@ -224,7 +224,7 @@ public:
   /** Set to true if the headers should be loaded */
   void setLoadHeaders( bool load ) { mLoadHeaders = load; }
 
-  /** Returns true if the part itself (as returned by kioslave) should be loaded */
+  /** Returns true if the part itself (as returned by tdeioslave) should be loaded */
   bool loadPart() { return mLoadPart; }
 
   /** Set to true if the part itself should be loaded */

kmail/kmmsgpartdlg.h

@@ -21,7 +21,7 @@
 #define kmmsgpartdlg_h
 
 #include <kdialogbase.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class KMMessagePart;
 class TQPushButton;

kmail/kmpopfiltercnfrmdlg.cpp

@@ -20,7 +20,7 @@
 #include <tqtimer.h>
 
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 #include <assert.h>
 

kmail/kmreaderwin.cpp

@@ -14,7 +14,7 @@
 #include "kmversion.h"
 #include "kmmainwidget.h"
 #include "kmreadermainwin.h"
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include "kmfolderindex.h"
 #include "kmcommands.h"
 #include "kmmsgpartdlg.h"
@@ -97,7 +97,7 @@ using KMail::TeeHtmlWriter;
 #include <kstandarddirs.h>  // Sven's : for access and getpid
 #include <kcursor.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kglobalsettings.h>

kmail/kmsearchpattern.cpp

@@ -19,7 +19,7 @@ using KMail::FilterLog;
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kabc/stdaddressbook.h>
 

kmail/kmsender.cpp

@@ -10,14 +10,14 @@
 #include <kmime_header_parsing.h>
 using namespace KMime::Types;
 
-#include <kio/passdlg.h>
-#include <kio/scheduler.h>
+#include <tdeio/passdlg.h>
+#include <tdeio/scheduler.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <tdeversion.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <assert.h>
 #include <stdio.h>

kmail/kmsender_p.h

@@ -9,7 +9,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqobject.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <tdeversion.h>
 
 class TDEProcess;

kmail/kmservertest.cpp

@@ -39,10 +39,10 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kio/scheduler.h>
-#include <kio/slave.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 
 //-----------------------------------------------------------------------------
 KMServerTest::KMServerTest( const TQString & protocol, const TQString & host, int port )

kmail/kmtransport.cpp

@@ -33,7 +33,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>

kmail/listjob.cpp

@@ -39,9 +39,9 @@ using KPIM::ProgressManager;
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/scheduler.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 
 #include <tqstylesheet.h>

kmail/mailinglist-magic.cpp

@@ -7,7 +7,7 @@
 
 #include "kmmessage.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kdebug.h>
 

kmail/networkaccount.cpp

@@ -32,8 +32,8 @@
 #include "kmkernel.h"
 #include "globalsettings.h"
 
-#include <kconfig.h>
-#include <kio/global.h>
+#include <tdeconfig.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>

kmail/objecttreeparser.cpp

@@ -40,7 +40,7 @@
 #include "kmkernel.h"
 #include "kmreaderwin.h"
 #include "partNode.h"
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libemailfunctions/email.h>
 #include "partmetadata.h"
 #include "attachmentstrategy.h"

kmail/partNode.h

@@ -42,7 +42,7 @@
 #include <mimelib/body.h>
 #include <mimelib/utility.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 
 #include <map>

kmail/popaccount.cpp

@@ -42,9 +42,9 @@ using KPIM::BroadcastStatus;
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmainwindow.h>
-#include <kio/scheduler.h>
-#include <kio/passdlg.h>
-#include <kconfig.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/passdlg.h>
+#include <tdeconfig.h>
 using TDEIO::MetaData;
 
 #include <tqstylesheet.h>

kmail/quotajobs.cpp

@@ -29,7 +29,7 @@
  *  your version.
  */
 #include "quotajobs.h"
-#include <kio/scheduler.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 
 using namespace KMail;

kmail/quotajobs.h

@@ -34,7 +34,7 @@
 
 #include <tqvariant.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <tqvaluevector.h>
 

kmail/renamejob.cpp

@@ -41,9 +41,9 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/scheduler.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <config.h>
 

kmail/searchjob.cpp

@@ -40,9 +40,9 @@ using KPIM::ProgressManager;
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kio/scheduler.h>
-#include <kio/job.h>
-#include <kio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
@@ -98,7 +98,7 @@ void SearchJob::searchCompleteFolder()
       TQT_SLOT( slotSearchResult( TDEIO::Job * ) ) );
   }
   else
-  { // for the "/ folder" of an imap account, searching blocks the kioslave
+  { // for the "/ folder" of an imap account, searching blocks the tdeioslave
     slotSearchData( job, TQString() );
     slotSearchResult( job );
   }

kmail/searchwindow.cpp

@@ -39,7 +39,7 @@
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <twin.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 

kmail/sieveconfig.cpp

@@ -21,7 +21,7 @@
 #include <knuminput.h>
 #include <klocale.h>
 #include <kdialog.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>

kmail/sievejob.cpp

@@ -18,9 +18,9 @@
 
 #include "sievejob.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 using TDEIO::Job;
-// <kio/global.h>
+// <tdeio/global.h>
 using TDEIO::UDSAtomTypes;
 using TDEIO::UDSEntryList;
 using TDEIO::UDSEntry;

kmail/sievejob.h

@@ -22,7 +22,7 @@
 #include <tqcstring.h>
 
 #include <kurl.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 class TQTextDecoder;
 namespace TDEIO {

kmail/snippetwidget.cpp

@@ -21,7 +21,7 @@
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtooltip.h>
 #include <kpopupmenu.h>
 #include <tqregexp.h>

kmail/transportmanager.cpp

@@ -21,7 +21,7 @@
 #include "kmtransport.h"
 #include "kmkernel.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 namespace KMail {
 

kmail/util.h

@@ -43,7 +43,7 @@
 #include <tqobject.h>
 #include <tqcstring.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 

kmail/xfaceconfigurator.cpp

@@ -38,13 +38,13 @@
 
 #include <kactivelabel.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobalsettings.h>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 using namespace TDEIO;
 #include <kxface.h>
 using namespace KPIM;

kmailcvt/CMakeLists.txt

@@ -44,6 +44,6 @@ tde_add_executable( kmailcvt AUTOMOC
     filter_opera.cxx filter_thunderbird.cxx filter_kmail_maildir.cxx
     filter_sylpheed.cxx filter_thebat.cxx filter_lnotes.cxx
     filter_kmail_archive.cxx
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

kmailcvt/filter_evolution.cxx

@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 
 

kmailcvt/filter_evolution_v2.cxx

@@ -20,7 +20,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 
 
@@ -56,7 +56,7 @@ void FilterEvolution_v2::import(FilterInfo *info)
 
     //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
     KFileDialog *kfd;
-    kfd = new KFileDialog( evolDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( evolDir, "", 0, "tdefiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
     kfd->exec();
     mailDir = kfd->selectedFile();

kmailcvt/filter_kmail_maildir.cxx

@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 /** Default constructor. */
 FilterKMail_maildir::FilterKMail_maildir( void ) :
@@ -47,7 +47,7 @@ void FilterKMail_maildir::import( FilterInfo *info )
     TQString _homeDir = TQDir::homeDirPath();
 
     KFileDialog *kfd;
-    kfd = new KFileDialog( _homeDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( _homeDir, "", 0, "tdefiledialog", true );
     kfd->setMode( KFile::Directory | KFile::LocalOnly );
     kfd->exec();
     mailDir = kfd->selectedFile();

kmailcvt/filter_lnotes.cxx

@@ -3,7 +3,7 @@
                              -------------------
     begin                : Wed Feb 16, 2005
     copyright            : (C) 2005 by Robert Rockers
-    email                : kconfigure@rockerssoft.com
+    email                : tdeconfigure@rockerssoft.com
  ***************************************************************************/
 
 /***************************************************************************
@@ -18,7 +18,7 @@
 #include <config.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 #include <tqfileinfo.h>

kmailcvt/filter_lnotes.hxx

@@ -3,7 +3,7 @@
                              -------------------
     begin                : Wed Feb 16, 2005
     copyright            : (C) 2005 by Robert Rockers
-    email                : kconfigure@rockerssoft.com
+    email                : tdeconfigure@rockerssoft.com
  ***************************************************************************/
 
 /***************************************************************************

kmailcvt/filter_mailapp.cxx

@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 

kmailcvt/filter_mbox.cxx

@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 

kmailcvt/filter_oe.cxx

@@ -21,7 +21,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 

kmailcvt/filter_opera.cxx

@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 
@@ -50,7 +50,7 @@ void FilterOpera::import(FilterInfo *info)
 
     //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
     KFileDialog *kfd;
-    kfd = new KFileDialog( startdir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( startdir, "", 0, "tdefiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
     kfd->exec();
     TQString operaDir = kfd->selectedFile();

kmailcvt/filter_outlook.cxx

@@ -18,7 +18,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 #include <kdebug.h>
 

kmailcvt/filter_plain.cxx

@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <libgen.h>
 
 #include "filter_plain.hxx"

kmailcvt/filter_pmail.cxx

@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqregexp.h>
 #include <ktempfile.h>
 #include <kdebug.h>
@@ -46,7 +46,7 @@ void FilterPMail::import(FilterInfo *info)
     
     // Select directory from where I have to import files
     KFileDialog *kfd;
-    kfd = new KFileDialog( TQDir::homeDirPath(), "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( TQDir::homeDirPath(), "", 0, "tdefiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
     kfd->exec();
     chosenDir = kfd->selectedFile();

kmailcvt/filter_sylpheed.cxx

@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 
 /** Default constructor. */
@@ -46,7 +46,7 @@ void FilterSylpheed::import( FilterInfo *info )
     TQString _homeDir = TQDir::homeDirPath();
 
     KFileDialog *kfd;
-    kfd = new KFileDialog( _homeDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( _homeDir, "", 0, "tdefiledialog", true );
     kfd->setMode( KFile::Directory | KFile::LocalOnly );
     kfd->exec();
     mailDir = kfd->selectedFile();

kmailcvt/filter_thebat.cxx

@@ -23,7 +23,7 @@
 #include <tqvaluelist.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 
 #include <kmessagebox.h>
@@ -52,7 +52,7 @@ void FilterTheBat::import( FilterInfo *info )
     TQString _homeDir = TQDir::homeDirPath();
 
     KFileDialog *kfd;
-    kfd = new KFileDialog( _homeDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( _homeDir, "", 0, "tdefiledialog", true );
     kfd->setMode( KFile::Directory | KFile::LocalOnly );
     kfd->exec();
     mailDir = kfd->selectedFile();

kmailcvt/filter_thunderbird.cxx

@@ -19,7 +19,7 @@
 
 #include <config.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
 
 
@@ -55,7 +55,7 @@ void FilterThunderbird::import(FilterInfo *info)
     }
 
     KFileDialog *kfd;
-    kfd = new KFileDialog( thunderDir, "", 0, "kfiledialog", true );
+    kfd = new KFileDialog( thunderDir, "", 0, "tdefiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
     kfd->exec();
     mailDir  = kfd->selectedFile();

kmobile/DESIGN

@@ -63,7 +63,7 @@ makes accessing mobile devices completely transparent to the
 application.
 
 One sample program which uses the client library is the kmobile
-kioslave. In Konqueror you might access any mobile device directly
+tdeioslave. In Konqueror you might access any mobile device directly
 by giving "mobile:/" as the URL.
 
 
@@ -72,8 +72,8 @@ by giving "mobile:/" as the URL.
 
 HINTS FOR DRIVER DEVELOPERS:
 ----------------------------
-- KMobile device drivers are very similiar to kioslaves. Refer
-  at the kioslave documentation if needed.
+- KMobile device drivers are very similiar to tdeioslaves. Refer
+  at the tdeioslave documentation if needed.
 
 - derive your driver only from the KMobileDevice class (#include <kmobiledevice.h>)
   and reimplement the functions which you really need

kmobile/Makefile.am

@@ -1,6 +1,6 @@
 ## Makefile.am for kmobile
 
-SUBDIRS = . devices		# kioslave
+SUBDIRS = . devices		# tdeioslave
 
 bin_PROGRAMS = kmobile 
 

kmobile/TODO

@@ -1,9 +1,9 @@
 DONE:
 -----
-- devices:/ kioslave integration
+- devices:/ tdeioslave integration
 - show per-device icons in konqueror (same as in the kmobile view)
 - fix mimetypes and their location under /share/mimelnk
-- kioslaves: cellphone:/, organizer:/, pda:/, (camera:/ not activated)
+- tdeioslaves: cellphone:/, organizer:/, pda:/, (camera:/ not activated)
 - system tray plugin
 - serial/IRDA/(USB?) locking features (acording to standards - done, but untested !!)
 

kmobile/devices/gnokii/gnokii_mobile.cpp

@@ -26,10 +26,10 @@
 #include <tqdir.h>
 
 #include <klibloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <klocale.h>
 

kmobile/devices/skeleton/skeleton.cpp

@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <klocale.h>
 

kmobile/kmobile.cpp

@@ -29,10 +29,10 @@
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kedittoolbar.h>
 

kmobile/kmobileclient.cpp

@@ -72,8 +72,8 @@ bool KMobileClient::startKMobileApplication()
   arg << TQString("kmobile") << params;
   TQCString replyType;
   TQByteArray replyData;
-  bool ok = call("klauncher", "klauncher", "tdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData);
-  PRINT_DEBUG << TQString("DCOP-CALL to klauncher: %1\n").arg(ok?"ok.":"failed.");
+  bool ok = call("tdelauncher", "tdelauncher", "tdeinit_exec_wait(TQString,TQStringList)", data, replyType, replyData);
+  PRINT_DEBUG << TQString("DCOP-CALL to tdelauncher: %1\n").arg(ok?"ok.":"failed.");
   return ok;
 }
 

kmobile/kmobiledevice.cpp

@@ -34,9 +34,9 @@
 #include <kstandarddirs.h>
 #include "kmobiledevice.h"
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kdebug.h>
 #include <klocale.h>
 

kmobile/kmobiledevice.h

@@ -30,8 +30,8 @@
 #include <kabc/addressee.h>
 #include <kabc/addresseelist.h>
 
-#include <kio/global.h>
-#include <kio/authinfo.h>
+#include <tdeio/global.h>
+#include <tdeio/authinfo.h>
 
 #include <libkcal/event.h>
 
@@ -202,7 +202,7 @@ public:
      **********************
      * FILE STORAGE SUPPORT
      **********************
-     * mostly compatible to the kioslave base class <kio/slavebase.h>
+     * mostly compatible to the tdeioslave base class <tdeio/slavebase.h>
      */
 
     /**
@@ -435,7 +435,7 @@ signals:
 
     /**
      * Call this to show a message box from the slave (it will in fact be handled
-     * by kio_uiserver, so that the progress info dialog for the slave is hidden
+     * by tdeio_uiserver, so that the progress info dialog for the slave is hidden
      * while this message box is shown)
      * @param type type of message box: QuestionYesNo, WarningYesNo, WarningContinueCancel...
      * @param text Message string. May contain newlines.

kmobile/kmobileiface.h

@@ -46,7 +46,7 @@ k_dcop:
     virtual bool storeNote( TQString deviceName, int index, TQString note ) = 0;
 
     /*
-     * DCOP functions for the devices:/ kioslave
+     * DCOP functions for the devices:/ tdeioslave
      */
 k_dcop:
     virtual TQStringList kio_devices_deviceInfo(TQString deviceName) = 0;

kmobile/kmobileitem.cpp

@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kmobileitem.h"
 

kmobile/kmobileview.cpp

@@ -26,7 +26,7 @@
 #include <kabc/vcardconverter.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kmobileview.h"
 #include "kmobileitem.h"
@@ -392,17 +392,17 @@ bool KMobileView::storeNote( TQString deviceName, int index, TQString note )
 
 
 /*
- * DCOP Implementation for the devices:/ kioslave
+ * DCOP Implementation for the devices:/ tdeioslave
  */
 
 /*
  * returns the information for the given deviceName for usage in the
- * the devices kioslave. The TQStringList returned is comparable to the
- * format of /etc/fstab file. Please refer to the devices kioslave for
+ * the devices tdeioslave. The TQStringList returned is comparable to the
+ * format of /etc/fstab file. Please refer to the devices tdeioslave for
  * further information.
  * If deviceName is empty, this functions returns information for all
  * active mobile devices.
- * (function is only used by the devices kioslave - don't use elsewhere !)
+ * (function is only used by the devices tdeioslave - don't use elsewhere !)
  */
 TQStringList KMobileView::kio_devices_deviceInfo(TQString deviceName)
 {

kmobile/kmobileview.h

@@ -63,7 +63,7 @@ public:
     TQString readNote( TQString deviceName, int index );
     bool storeNote( TQString deviceName, int index, TQString note );
 
-    /* devices kioslave support: */
+    /* devices tdeioslave support: */
     TQStringList kio_devices_deviceInfo(TQString deviceName);
 
 public:

kmobile/tdeioslave/Makefile.am

@@ -11,8 +11,8 @@ kio_mobile_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN)
 kde_services_DATA = mobile.protocol cellphone.protocol \
 	organizer.protocol pda.protocol 
 # do not install the camera protocol now - we already have a 
-# camera kioslave !!
+# camera tdeioslave !!
 #	phonecamera.protocol
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_mobile.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_mobile.pot

kmobile/tdeioslave/cellphone.protocol

@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=mobile_phone

kmobile/tdeioslave/kio_mobile.h

@@ -22,7 +22,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <kmobiledevice.h>
 #include <kmobileclient.h>
 

kmobile/tdeioslave/mobile.protocol

@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=kaddressbook

kmobile/tdeioslave/organizer.protocol

@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=mobile_organizer

kmobile/tdeioslave/pda.protocol

@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=mobile_organizer

kmobile/tdeioslave/phonecamera.protocol

@@ -14,5 +14,5 @@ deleting=true
 # moving=true
 # mimetype=text/plain
 # determineMimetypeFromExtension=true
-DocPath=kioslave/mobile.html
+DocPath=tdeioslave/mobile.html
 Icon=mobile_camera

knode/articlewidget.cpp

@@ -50,7 +50,7 @@
 #include <libkpgp/kpgp.h>
 #include <libkpgp/kpgpblock.h>
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libtdepim/kxface.h>
 #include <libtdepim/linklocator.h>
 

knode/knapplication.cpp

@@ -17,7 +17,7 @@
 #include <twin.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "knode.h"
 #include "knapplication.h"

knode/knarticlewindow.cpp

@@ -16,7 +16,7 @@
 #include <twin.h>
 
 #include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaccel.h>
 #include <kaction.h>
 

knode/kncomposer.cpp

@@ -31,7 +31,7 @@ using KRecentAddress::RecentAddresses;
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kpopupmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kcombobox.h>

knode/knconfig.h

@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <tqpixmap.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kmime_util.h>
 

knode/knconfigwidgets.cpp

@@ -23,7 +23,7 @@
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kfontdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kuserprofile.h>
 #include <kopenwith.h>
 #include <kscoringeditor.h>

knode/knconvert.cpp

@@ -18,7 +18,7 @@
 #include <tqcheckbox.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kseparator.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>

knode/knewsservice.protocol

@@ -9,5 +9,5 @@ reading=false
 writing=false
 makedir=false
 deleting=false
-DocPath=kioslave/news.html
+DocPath=tdeioslave/news.html
 Icon=knode

knode/knglobals.cpp

@@ -17,7 +17,7 @@
 #include "knglobals.h"
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 
 #include "knconfigmanager.h"

knode/knglobals.h

@@ -17,7 +17,7 @@
 #ifndef KNGLOBALS_H
 #define KNGLOBALS_H
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "resource.h"
 
 #include <tdepimmacros.h>

knode/knjobdata.cpp

@@ -15,7 +15,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <libtdepim/progressmanager.h>
 

knode/knmainwidget.cpp

@@ -20,7 +20,7 @@
 #include <kinputdialog.h>
 #include <kaccel.h>
 #include <kxmlguiclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kedittoolbar.h>
 #include <kstdaction.h>

knode/knnetaccess.cpp

@@ -20,8 +20,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/passdlg.h>
+#include <tdeio/job.h>
+#include <tdeio/passdlg.h>
 #include <ksocks.h>
 #include <kapplication.h>
 

knode/knserverinfo.cpp

@@ -14,7 +14,7 @@
 
 
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdewallet.h>

knode/utilities.cpp

@@ -21,9 +21,9 @@
 #include <kmessagebox.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <ktempfile.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "knwidgets.h"
 #include "knglobals.h"

knotes/TODO

@@ -34,7 +34,7 @@ TODO:
    => use the static KNotesGlobalConfig object and copy the important stuff over
       Disadv: some keys and defaults must be defined in both config files
              (and thus, TDEConfig XT specs)
-   => how about one kconfig Xt spec and inheriting from the TDEConfigSkeleton or make the
+   => how about one tdeconfig Xt spec and inheriting from the TDEConfigSkeleton or make the
       TDEConfigSkeleton inherit something?
  * global config dialog: use "Defaults" in the side bar and add a page with two tabs,
    Display and Editor, respectively

knotes/knote.cpp

@@ -51,8 +51,8 @@
 #include <kinputdialog.h>
 #include <kmdcodec.h>
 #include <kglobalsettings.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 
 #include <libkcal/journal.h>
 

knotes/knote.h

@@ -27,7 +27,7 @@
 #include <tqpoint.h>
 #include <tqcolor.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kxmlguiclient.h>
 
 class TQLabel;

knotes/knoteconfigdlg.cpp

@@ -26,7 +26,7 @@
 #include <tqtabwidget.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kcolorbutton.h>

knotes/knoteconfigdlg.h

@@ -21,7 +21,7 @@
 #ifndef KNOTECONFIGDLG_H
 #define KNOTECONFIGDLG_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 class TQString;
 class KNoteConfig;

knotes/knoteslegacy.cpp

@@ -31,7 +31,7 @@
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <unistd.h>
 

kode/kodemain.cpp

@@ -29,7 +29,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
@@ -52,7 +52,7 @@ static const KCmdLineOptions options[] =
   { "create-class", I18N_NOOP("Create class"), 0 },
   { "d", 0, 0 },
   { "create-dialog", I18N_NOOP("Create dialog"), 0 },
-  { "create-kioslave", I18N_NOOP("Create kioslave"), 0 },
+  { "create-tdeioslave", I18N_NOOP("Create tdeioslave"), 0 },
   { "create-main", I18N_NOOP("Create main function template"), 0 },
   { "y", 0, 0 },
   { "codify", I18N_NOOP("Create generator code for given source"), 0 },
@@ -68,7 +68,7 @@ static const KCmdLineOptions options[] =
   { "warning", I18N_NOOP("Create warning about code generation"), 0 },
   { "qt-exception", I18N_NOOP("Add TQt exception to GPL"), 0 },
   { "singleton", I18N_NOOP("Create a singleton class"), 0 },
-  { "protocol", I18N_NOOP("kioslave protocol"), 0 },
+  { "protocol", I18N_NOOP("tdeioslave protocol"), 0 },
   { "+[filename]", I18N_NOOP("Source code file name"), 0 },
   KCmdLineLastOption
 };
@@ -325,7 +325,7 @@ int create( TDECmdLineArgs *args )
   KODE::Printer p;
   if ( args->isSet( "warning" ) ) p.setCreationWarning( true );
 
-  bool createKioslave = args->isSet( "create-kioslave" );
+  bool createKioslave = args->isSet( "create-tdeioslave" );
   bool createMain = args->isSet( "create-main" );
 
   TQString filename = args->getOption( "filename" );
@@ -353,7 +353,7 @@ int create( TDECmdLineArgs *args )
   if ( createKioslave ) {
     if ( !args->isSet( "protocol" ) ) {
       protocol = className.lower();
-      kdWarning() << "Warning: No protocol for kioslave given. Assuming '"
+      kdWarning() << "Warning: No protocol for tdeioslave given. Assuming '"
                   << protocol << "'" << endl;
     } else {
       protocol = args->getOption( "protocol" );
@@ -441,10 +441,10 @@ int create( TDECmdLineArgs *args )
     c.addBaseClass( KODE::Class( "KDialogBase" ) );
     c.addInclude( "kdialogbase.h" );
   } else if ( createKioslave ) {
-    c.setDocs( "This class implements a kioslave for ..." );
+    c.setDocs( "This class implements a tdeioslave for ..." );
   
     c.addBaseClass( KODE::Class( "SlaveBase", "KIO" ) );
-    c.addHeaderInclude( "kio/slavebase.h" );
+    c.addHeaderInclude( "tdeio/slavebase.h" );
     
     KODE::Function get( "get", "void" );
     get.addArgument( "const KURL &url" );
@@ -599,7 +599,7 @@ int create( TDECmdLineArgs *args )
     protocolFile.writeEntry( "input", "none" );
     protocolFile.writeEntry( "output", "filesystem" );
     protocolFile.writeEntry( "reading", "true" );
-    protocolFile.writeEntry( "DocPath", "kioslave/" + protocol + ".html" );
+    protocolFile.writeEntry( "DocPath", "tdeioslave/" + protocol + ".html" );
 
     protocolFile.sync();
   }
@@ -620,7 +620,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
   if ( args->isSet( "create-class" ) || args->isSet( "create-dialog" ) ||
-       args->isSet( "create-kioslave" ) || args->isSet( "create-main" ) ) {
+       args->isSet( "create-tdeioslave" ) || args->isSet( "create-main" ) ) {
     return create( args );
   } else if ( args->isSet( "codify" ) ) {
     return codify( args );

kode/kwsdl/converter.cpp

@@ -907,7 +907,7 @@ void Converter::createTransportClass()
   KODE::Class transport( "Transport" );
   transport.addBaseClass( mTQObject );
   transport.addHeaderInclude( "tqobject.h" );
-  transport.addHeaderInclude( "kio/job.h" );
+  transport.addHeaderInclude( "tdeio/job.h" );
 
   transport.addInclude( "kdebug.h" );
 

kode/kwsdl/kung/binaryinputfield.cpp

@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>
 #include <kmimemagic.h>

kode/kwsdl/kung/transport.h

@@ -21,7 +21,7 @@
 #define TRANSPORT_H
 
 #include <tqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class Transport : public TQObject
 {

kode/kwsdl/schema/fileprovider.cpp

@@ -25,7 +25,7 @@
 #include <tqeventloop.h>
 #include <tqfile.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <ktempfile.h>
 
 #include "fileprovider.h"

kode/kwsdl/tests/google/transport.h

@@ -25,7 +25,7 @@
 #define TRANSPORT_H
 
 #include <tqobject.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 class Transport : public TQObject
 {

kode/kxml_compiler/creator.cpp

@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 

kode/kxml_compiler/creator.h

@@ -34,7 +34,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 

kode/kxml_compiler/kxml_compiler.cpp

@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 

kode/kxml_compiler/parser.cpp

@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 

kode/kxml_compiler/parser.h

@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 

konsolekalendar/konsolekalendarvariables.cpp

@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <tqdatetime.h>

konsolekalendar/main.cpp

@@ -49,7 +49,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 

konsolekalendar/stdcalendar.cpp

@@ -26,7 +26,7 @@
 #include <libkcal/resourcecalendar.h>
 #include <libtdepim/kpimprefs.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurl.h>

kontact/plugins/kmail/kcmkmailsummary.cpp

@@ -29,7 +29,7 @@
 #include <kaboutdata.h>
 #include <kaccelmanager.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>

kontact/plugins/kmail/summarywidget.cpp

@@ -27,7 +27,7 @@
 
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>

kontact/plugins/korganizer/kcmkorgsummary.cpp

@@ -30,7 +30,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>

kontact/plugins/newsticker/kcmkontactknt.cpp

@@ -34,7 +34,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klistview.h>

kontact/plugins/newsticker/summarywidget.cpp

@@ -32,7 +32,7 @@
 #include <dcopclient.h>
 #include <kapplication.h>
 #include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>

kontact/plugins/specialdates/kcmsdsummary.cpp

@@ -32,7 +32,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kaccelmanager.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>

kontact/plugins/summary/kcmkontactsummary.cpp

@@ -23,7 +23,7 @@
 */
 
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>

kontact/plugins/summary/summaryview_part.cpp

@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdcopservicestarter.h>
 #include <kdebug.h>
 #include <kdialog.h>

kontact/src/kontactconfig.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell kontactconfig
+Exec=tdecmshell kontactconfig
 Icon=kontact
 Type=Service
 ServiceTypes=TDECModule

kontact/src/mainwindow.cpp

@@ -35,7 +35,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kguiitem.h>
@@ -62,7 +62,7 @@
 #include <krsqueezedtextlabel.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <kcursor.h>
 #include <krun.h>
 #include <kaboutdata.h>

kontact/src/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kontact.kcfg
 NameSpace=Kontact
 ClassName=Prefs

kontact/src/profiledialog.cpp

@@ -25,7 +25,7 @@
 #include "profiledialog.h"
 #include "profilemanager.h"
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>

kontact/src/profilemanager.cpp

@@ -24,10 +24,10 @@
 
 #include "profilemanager.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>

korganizer/Makefile.am

@@ -196,7 +196,7 @@ kde_services_DATA = korganizer_configmain.desktop \
                     webcal.protocol
 
 update_DATA = korganizer.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 DOXYGEN_REFERENCES=libkcal tdeui
 include $(top_srcdir)/admin/Doxyfile.am

korganizer/actionmanager.cpp

@@ -56,9 +56,9 @@
 
 #include <dcopclient.h>
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <kpopupmenu.h>
 #include <kstandarddirs.h>
@@ -1038,7 +1038,7 @@ bool ActionManager::saveURL()
 void ActionManager::exportHTML()
 {
   HTMLExportSettings settings( "KOrganizer" );
-  // Manually read in the config, because parametrized kconfigxt objects don't
+  // Manually read in the config, because parametrized tdeconfigxt objects don't
   // seem to load the config theirselves
   settings.readConfig();
 
@@ -1291,7 +1291,7 @@ void ActionManager::setDestinationPolicy()
 void ActionManager::configureDateTime()
 {
   TDEProcess *proc = new TDEProcess;
-  *proc << "kcmshell" << "language";
+  *proc << "tdecmshell" << "language";
 
   connect( proc,TQT_SIGNAL( processExited( TDEProcess * ) ),
           TQT_SLOT( configureDateTimeFinished( TDEProcess * ) ) );

korganizer/archivedialog.cpp

@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 #include <klineedit.h>
 #include <kactivelabel.h>

korganizer/calendarview.cpp

@@ -85,10 +85,10 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <krun.h>
 #include <kdirwatch.h>
 
@@ -1798,7 +1798,7 @@ void CalendarView::exportWeb()
 {
   // FIXME: Get rid of the settings object. When can I delete it???
   HTMLExportSettings *settings = new HTMLExportSettings( "KOrganizer" );
-  // Manually read in the config, because parametrized kconfigxt objects don't
+  // Manually read in the config, because parametrized tdeconfigxt objects don't
   // seem to load the config theirselves
   if ( settings ) settings->readConfig();
   ExportWebDialog *dlg = new ExportWebDialog( settings, this );

korganizer/calendarview.h

@@ -28,7 +28,7 @@
 #include <tqwidget.h>
 #include <tqptrlist.h>
 #include <tqmap.h>
-#include <kfile.h>
+#include <tdefile.h>
 #include <korganizer/koeventviewer.h>
 #include <libkcal/scheduler.h>
 #include <tdepimmacros.h>

korganizer/docprefs.cpp

@@ -33,7 +33,7 @@ KSimpleConfig *DocPrefs::mConfig = 0;
 DocPrefs::DocPrefs( const TQString &type )
 {
     if ( !mConfig ) {
-        mConfig = new KSimpleConfig( locateLocal( "data", "korganizer/docprefs." + type + ".kconfig" ) );
+        mConfig = new KSimpleConfig( locateLocal( "data", "korganizer/docprefs." + type + ".tdeconfig" ) );
     }
 }
 

korganizer/eventarchiver.cpp

@@ -27,7 +27,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kglobal.h>
 #include <libkcal/filestorage.h>
 #include <libkcal/calendarlocal.h>

korganizer/exportwebdialog.cpp

@@ -38,15 +38,15 @@
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klineedit.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "koglobals.h"
 #include <kurlrequester.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>
 #include <kmessagebox.h>

korganizer/freebusymanager.cpp

@@ -49,15 +49,15 @@
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
-#include <kio/scheduler.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/scheduler.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kabc/stdaddressbook.h>

korganizer/koagendaview.cpp

@@ -44,7 +44,7 @@
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kholidays.h>

korganizer/koapp.cpp

@@ -29,7 +29,7 @@
 
 #include <kglobal.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <twin.h>

korganizer/kocore.cpp

@@ -34,7 +34,7 @@
 
 #include <klibloader.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kxmlguifactory.h>
 #include <kstandarddirs.h>
 #include <klocale.h>

korganizer/koeditorattachments.cpp

@@ -28,7 +28,7 @@
 #include <libkcal/attachmenthandler.h>
 #include <libkcal/incidence.h>
 #include <libtdepim/kpimurlrequesterdlg.h>
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libtdepim/tdepimprotocols.h>
 #include <libtdepim/maillistdrag.h>
 #include <libtdepim/kvcarddrag.h>
@@ -42,10 +42,10 @@
 #include <kurldrag.h>
 #include <ktempfile.h>
 #include <ktempdir.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstdaction.h>
 #include <kactioncollection.h>
 #include <kpopupmenu.h>

korganizer/koeditorgeneral.cpp

@@ -45,7 +45,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>

korganizer/koeditorgeneralevent.cpp

@@ -40,7 +40,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <ktextedit.h>
 

korganizer/koeditorgeneraltodo.cpp

@@ -41,7 +41,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktextedit.h>
 
 #include <libkcal/incidenceformatter.h>

korganizer/koeventviewer.h

@@ -25,7 +25,7 @@
 #define KOEVENTVIEWER_H
 
 #include <tdepimmacros.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtextbrowser.h>
 
 namespace KCal {

korganizer/koglobals.cpp

@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <klocale.h>

korganizer/kogroupware.h

@@ -43,7 +43,7 @@
 #include <libkcal/icalformat.h>
 #include <libkcal/scheduler.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tqstring.h>
 

korganizer/koincidenceeditor.cpp

@@ -36,7 +36,7 @@
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kabc/addressee.h>
 
 #include <libtdepim/designerfields.h>

korganizer/komonthview.cpp

@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kwordwrap.h>
 

korganizer/koprefs.cpp

@@ -35,7 +35,7 @@
 
 #include <kglobalsettings.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>

korganizer/koprefs_base.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=korganizer.kcfg
 ClassName=KOPrefsBase
 Singleton=false

korganizer/korgac/alarmdialog.cpp

@@ -37,7 +37,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdcopservicestarter.h>
 #include <kiconloader.h>
 #include <klocale.h>

korganizer/korgac/alarmdockwindow.cpp

@@ -30,7 +30,7 @@
 #include <tdeversion.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>

korganizer/korgac/testalarmdlg.cpp

@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "alarmdialog.h"

korganizer/korganizer.cpp

@@ -59,12 +59,12 @@
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kstdaccel.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>
 #include <kprocess.h>

korganizer/korganizer_part.cpp

@@ -47,7 +47,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kprocess.h>
 #include <ktempfile.h>
 #include <kstatusbar.h>

korganizer/koviewmanager.cpp

@@ -28,7 +28,7 @@
 
 #include <libkcal/calendarresources.h>
 #include <kactioncollection.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "actionmanager.h"

korganizer/plugins/datenums/configdialog.cpp

@@ -27,7 +27,7 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 

korganizer/plugins/datenums/datenums.cpp

@@ -19,7 +19,7 @@
 
 #include "datenums.h"
 #include "koglobals.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "configdialog.h"

korganizer/plugins/exchange/exchange.cpp

@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <kurl.h>

korganizer/plugins/exchange/exchangeconfig.cpp

@@ -22,7 +22,7 @@
 #include <tqcombobox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>

korganizer/plugins/hebrew/configdialog.cpp

@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 

korganizer/plugins/hebrew/hebrew.cpp

@@ -18,7 +18,7 @@
 */
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 #include <kcalendarsystem.h>

korganizer/plugins/printing/journal/journalprint.cpp

@@ -30,7 +30,7 @@
 #include <libkcal/journal.h>
 #include <libkcal/calendar.h>
 #include <libtdepim/kdateedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqbuttongroup.h>

korganizer/plugins/printing/list/listprint.cpp

@@ -31,7 +31,7 @@
 #include <libkcal/todo.h>
 #include <libkcal/calendar.h>
 #include <libtdepim/kdateedit.h>
-#include <kconfig.h> 
+#include <tdeconfig.h> 
 #include <kdebug.h>
 
 #include <tqbuttongroup.h>

korganizer/plugins/printing/whatsnext/whatsnextprint.cpp

@@ -31,7 +31,7 @@
 #include <libkcal/todo.h>
 #include <libkcal/calendar.h>
 #include <libtdepim/kdateedit.h>
-#include <kconfig.h> 
+#include <tdeconfig.h> 
 #include <kdebug.h>
 
 #include <tqbuttongroup.h>

korganizer/plugins/printing/year/yearprint.cpp

@@ -29,7 +29,7 @@
 
 #include <libkcal/calendar.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
 #include <klocale.h>

korganizer/plugins/projectview/koprojectview.cpp

@@ -34,7 +34,7 @@
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <libkcal/vcaldrag.h>

korganizer/plugins/projectview/projectview.cpp

@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>

korganizer/plugins/timespanview/kotimespanview.cpp

@@ -24,9 +24,9 @@
 
 #include <tqlayout.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <libkcal/calendar.h>
 
 #include "timespanwidget.h"

korganizer/plugins/timespanview/timespanview.cpp

@@ -20,7 +20,7 @@
 #include <tqfile.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>

korganizer/previewdialog.cpp

@@ -37,9 +37,9 @@
 #include <libkcal/calendarlocal.h>
 
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>

korganizer/printing/CMakeLists.txt

@@ -46,7 +46,7 @@ tde_add_library( korg_stdprinting SHARED AUTOMOC
   SOURCES
     calprinter.cpp calprintpluginbase.cpp calprintdefaultplugins.cpp
     calprintdayconfig_base.ui calprintmonthconfig_base.ui
-    calprinttodoconfig_base.ui calprintweekconfig_base.ui
+    calprinttodoconfig_base.ui calprintweetdeconfig_base.ui
     calprintincidenceconfig_base.ui
   VERSION 1.0.0
   LINK kocorehelper-shared tdeprint-shared

korganizer/printing/Makefile.am

@@ -18,7 +18,7 @@ libkocorehelper_la_SOURCES = cellitem.cpp
 libkorg_stdprinting_la_SOURCES = calprinter.cpp calprintpluginbase.cpp \
         calprintdefaultplugins.cpp \
         calprintdayconfig_base.ui calprintmonthconfig_base.ui \
-        calprinttodoconfig_base.ui calprintweekconfig_base.ui \
+        calprinttodoconfig_base.ui calprintweetdeconfig_base.ui \
         calprintincidenceconfig_base.ui
 libkorg_stdprinting_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
                                  -no-undefined -version-info 1:0

korganizer/printing/calprintdefaultplugins.cpp

@@ -34,7 +34,7 @@
 #include <tqbuttongroup.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcalendarsystem.h>
 #include <knuminput.h>
 #include <kcombobox.h>
@@ -45,7 +45,7 @@
 
 #include "calprintincidenceconfig_base.h"
 #include "calprintdayconfig_base.h"
-#include "calprintweekconfig_base.h"
+#include "calprintweetdeconfig_base.h"
 #include "calprintmonthconfig_base.h"
 #include "calprinttodoconfig_base.h"
 

korganizer/printing/calprintpluginbase.cpp

@@ -29,7 +29,7 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcalendarsystem.h>
 #include <kwordwrap.h>
 

korganizer/resourceview.cpp

@@ -40,7 +40,7 @@
 #include <tderesources/resource.h>
 #include <tderesources/configdialog.h>
 #include <libkcal/calendarresources.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqhbox.h>
 #include <tqheader.h>

korganizer/stdcalendar.cpp

@@ -25,7 +25,7 @@
 #include <libtdepim/kpimprefs.h>
 
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurl.h>

korganizer/urihandler.cpp

@@ -38,14 +38,14 @@ using namespace KCal;
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <ktempfile.h>
 #include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqfile.h>
 

korn/CMakeLists.txt

@@ -13,7 +13,7 @@
 
 tde_import( libkmime )
 
-add_subdirectory( kconf_update )
+add_subdirectory( tdeconf_update )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -50,6 +50,6 @@ tde_add_executable( korn AUTOMOC
     sortedmailsubject.cpp korncfgimpl.cpp kornaccountcfgimpl.cpp kornboxcfgimpl.cpp
     kornaccountcfg.ui kornboxcfg.ui korncfg.ui password.cpp pop3_proto.cpp
     systemtray.cpp process_proto.cpp progress_dialog.ui qmail_proto.cpp label.cpp
-  LINK kmime-shared kio-shared
+  LINK kmime-shared tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

korn/Makefile.am

@@ -121,4 +121,4 @@ KDE_ICON = korn
 
 xdg_apps_DATA = KOrn.desktop
 
-SUBDIRS = kconf_update
+SUBDIRS = tdeconf_update

korn/accountmanager.cpp

@@ -27,7 +27,7 @@
 #include "subjectsdlg.h"
 
 #include <kaudioplayer.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqptrlist.h>

korn/boxcontainer.cpp

@@ -19,7 +19,7 @@
 #include "boxcontainer.h"
 #include "boxcontaineritem.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqptrlist.h>

korn/boxcontaineritem.cpp

@@ -24,7 +24,7 @@
 #include <kactioncollection.h>
 #include <kapplication.h>
 #include <kbugreport.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconeffect.h>

korn/dcop_proto.cpp

@@ -22,7 +22,7 @@
 #include "account_input.h"
 #include "dcopdrop.h"
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <klocale.h>
 
 #include <tqmap.h>

korn/dcopdrop.cpp

@@ -23,7 +23,7 @@
 #include "mailid.h"
 #include "mailsubject.h"
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kdebug.h>
 
 #include <tqdatetime.h>

korn/dockeditem.cpp

@@ -21,7 +21,7 @@
 #include "systemtray.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>

korn/imap_proto.h

@@ -54,7 +54,7 @@ public:
 	virtual bool connectionBased() const { return true; }
 	
 	/**
-	 * This gives the two names for a kioslave: imaps if ssl is selected, imap if not.
+	 * This gives the two names for a tdeioslave: imaps if ssl is selected, imap if not.
 	 *
 	 * @param ssl true if ssl is selected.
 	 * @return "imaps" if ssl is true, "imap" otherwise

korn/keditlistboxman.cpp

@@ -18,7 +18,7 @@
 
 #include "keditlistboxman.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqmap.h>

korn/kio.cpp

@@ -40,8 +40,8 @@
 //#include"dropdlg.h"
 #include "mailsubject.h"
 
-#include<kconfig.h>
-#include<kconfigbase.h>
+#include<tdeconfig.h>
+#include<tdeconfigbase.h>
 #include<kdebug.h>
 #include<klocale.h>
 #include<kprocess.h>
@@ -70,7 +70,7 @@
 
 /*
  * The 'process' maildrop is a lot different than the other protocols:
- * it haven't a kioslave and could not result in file list. To prevent
+ * it haven't a tdeioslave and could not result in file list. To prevent
  * trowing it away, that functionality is hacked in this file.
  */
 

korn/kio_count.cpp

@@ -25,10 +25,10 @@
 #include "sortedmailsubject.h"
 
 #include <kdebug.h>
-#include <kio/jobclasses.h>
-#include <kio/scheduler.h>
-#include <kio/slave.h>
-#include <kio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slave.h>
+#include <tdeio/global.h>
 #include <kurl.h>
 #include <tqvaluelist.h>
 
@@ -275,7 +275,7 @@ void KIO_Count::entries( TDEIO::Job* job, const TDEIO::UDSEntryList &list )
 			else if( (*it2).m_uds == TDEIO::UDS_URL )
 				fileinfo.name = (*it2).m_str;
 			else if( (*it2).m_uds == TDEIO::UDS_NAME )
-			{ //The file kioslave doesn't return UDS_URL.
+			{ //The file tdeioslave doesn't return UDS_URL.
 				kurl = *_kurl;
 				metadata = *_metadata;
 				_protocol->recheckKURL( kurl, metadata );

korn/kio_count.h

@@ -25,7 +25,7 @@
 
 #include "kio.h" //Alsewise, no access to KKioDrop::FileInfo (needed in template)
 
-#include <kio/global.h> //FIXME: without this, moc-compiler fails.
+#include <tdeio/global.h> //FIXME: without this, moc-compiler fails.
 
 class KIO_Protocol;
 class KIO_Single_Subject;

korn/kio_delete.cpp

@@ -26,9 +26,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/jobclasses.h>
-#include <kio/scheduler.h>
+#include <tdeio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/scheduler.h>
 
 #include <tqptrlist.h>
 

korn/kio_proto.cpp

@@ -19,7 +19,7 @@
 
 #include "kio_proto.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqmap.h>

korn/kio_proto.h

@@ -27,7 +27,7 @@
  */
 
 class TQString;
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <klocale.h>
 #include <tqstringlist.h>
 #include "protocol.h"

korn/kio_read.cpp

@@ -26,9 +26,9 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/jobclasses.h>
-#include <kio/scheduler.h>
+#include <tdeio/global.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/scheduler.h>
 
 #include <tqcstring.h>
 #include <tqstring.h>

korn/kio_single_subject.cpp

@@ -25,10 +25,10 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kio/global.h>
-#include <kio/scheduler.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <krfcdate.h>
 
 #include <tqregexp.h>

korn/kio_subjects.cpp

@@ -23,8 +23,8 @@
 #include "kio_proto.h"
 #include "mailsubject.h"
 
-#include <kio/global.h>
-#include <kio/scheduler.h>
+#include <tdeio/global.h>
+#include <tdeio/scheduler.h>
 #include <kdebug.h>
 
 #include <tqptrlist.h>

korn/kmail_proto.cpp

@@ -24,7 +24,7 @@
 #include "password.h"
 #include "protocols.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 

korn/kornaccountcfgimpl.cpp

@@ -24,7 +24,7 @@
 #include "protocol.h"
 #include "protocols.h"
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kurlrequester.h>

korn/kornboxcfgimpl.cpp

@@ -23,10 +23,10 @@ class TDEConfig;
 #include "kornaccountcfgimpl.h"
 #include "password.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kfontdialog.h>
 #include <klocale.h>
 #include <kicondialog.h>

korn/korncfgimpl.cpp

@@ -22,7 +22,7 @@
 #include "kornboxcfgimpl.h"
 #include "password.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>

korn/kornshell.cpp

@@ -25,7 +25,7 @@
 #include "password.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>

korn/maildrop.cpp

@@ -8,7 +8,7 @@
 #include<assert.h>
 #include<tqapplication.h>
 
-#include<kconfigbase.h>
+#include<tdeconfigbase.h>
 #include<kdebug.h>
 
 #include"utils.h"

korn/password.cpp

@@ -19,7 +19,7 @@
 
 #include "password.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdewallet.h>
 

korn/polldrop.cpp

@@ -6,7 +6,7 @@
 */
 
 
-#include<kconfigbase.h>
+#include<tdeconfigbase.h>
 
 #include"utils.h"
 #include"polldrop.h"

korn/systemtray.cpp

@@ -19,7 +19,7 @@
 #include "systemtray.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqmovie.h>

korn/tdeconf_update/CMakeLists.txt

@@ -34,5 +34,5 @@ install( PROGRAMS
 tde_add_executable( korn-3-4-config_change
   SOURCES korn-3-4-config_change.cpp
   LINK ${TQT_LIBRARIES}
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )

korn/tdeconf_update/Makefile.am

@@ -2,10 +2,10 @@ INCLUDES=$(all_includes)
 
 update_DATA = korn-3-4-config_change.upd korn-3-5-update.upd
 update_SCRIPTS = korn-3-5-ssl-update.pl korn-3-5-metadata-update.pl
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
-kconf_PROGRAMS = korn-3-4-config_change
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = korn-3-4-config_change
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 korn_3_4_config_change_SOURCES = korn-3-4-config_change.cpp
 korn_3_4_config_change_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

ktnef/gui/attachpropertydialog.cpp

@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqbuffer.h>
 #include <tqdatastream.h>
 #include <tqpicture.h>

ktnef/gui/ktnefmain.cpp

@@ -33,7 +33,7 @@
 #include <tqpixmap.h>
 #include <kstdaccel.h>
 #include <tqmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqdir.h>
 #include <kprocess.h>
 #include <kglobal.h>

ktnef/lib/CMakeLists.txt

@@ -30,6 +30,6 @@ tde_add_library( ktnef SHARED
     mapi.cpp ktnefpropertyset.cpp ktnefmessage.cpp
     ktnefwriter.cpp lzfu.cpp
   VERSION 1.0.0
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )

libemailfunctions/networkstatus.cpp

@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstaticdeleter.h>
 

libkcal/attachmenthandler.cpp

@@ -35,13 +35,13 @@
 #include "scheduler.h"
 
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
 #include <krun.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqfile.h>
 

libkcal/convertqtopia.cpp

@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <iostream>

libkcal/freebusyurlstore.cpp

@@ -22,7 +22,7 @@
 #include "freebusyurlstore.h"
 
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 using namespace KCal;

libkcal/htmlexportsettings.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=htmlexportsettings.kcfg
 ClassName=HTMLExportSettings
 Singleton=false

libkcal/resourcecached.h

@@ -27,7 +27,7 @@
 #include "incidence.h"
 #include "calendarlocal.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqptrlist.h>
 #include <tqstring.h>

libkcal/resourcecalendar.cpp

@@ -22,7 +22,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 

libkcal/resourcecalendar.h

@@ -29,7 +29,7 @@
 #include <tqdatetime.h>
 #include <tqptrlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "alarm.h"
 #include "todo.h"

libkcal/resourcelocaldir.cpp

@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include "vcaldrag.h"

libkcal/tests/runtestcase.pl

@@ -61,11 +61,11 @@ if ( system( $cmd ) != 0 ) {
   exit 1;
 }
 
-checkfile( $file, $outfile );
+chectdefile( $file, $outfile );
 
 exit 0;
 
-sub checkfile()
+sub chectdefile()
 {
   my $file = shift;
   my $outfile = shift;

libkcal/tests/testresource.cpp

@@ -24,8 +24,8 @@
 #include <kabc/stdaddressbook.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 #include <kinputdialog.h>

libkpgp/Makefile.am

@@ -20,7 +20,7 @@ libkpgp_la_LIBADD = $(LIB_TDEUI) $(LIB_POLL)
 
 METASOURCES = AUTO
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kpgp.upd
 update_SCRIPTS = kpgp-3.1-upgrade-address-data.pl
 

libkpgp/kpgp.cpp

@@ -37,8 +37,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 #include <kstaticdeleter.h>
 
 #include "kpgpbase.h"

libkpgp/kpgpui.cpp

@@ -38,8 +38,8 @@
 #include <kseparator.h>
 #include <kiconloader.h>
 #include <klistview.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
+#include <tdeconfigbase.h>
+#include <tdeconfig.h>
 #include <kprogress.h>
 #include <kapplication.h>
 #include <twin.h>

libkpimexchange/configure.in.in

@@ -6,7 +6,7 @@ kde_safe_cppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $all_includes"
 AC_LANG_CPLUSPLUS
 AC_TRY_COMPILE(
-[#include <kio/http.h>],
+[#include <tdeio/http.h>],
 [
   int method = (int) TDEIO::DAV_SUBSCRIBE;
 ],

libkpimexchange/core/exchangeaccount.cpp

@@ -31,16 +31,16 @@
 #include <kurl.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kcursor.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 
-#include <kio/authinfo.h>
-#include <kio/davjob.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/authinfo.h>
+#include <tdeio/davjob.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 #include "exchangeaccount.h"
 #include "utils.h"

libkpimexchange/core/exchangeaccount.h

@@ -28,7 +28,7 @@
 
 #include <tdepimmacros.h>
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace KPIM {
 	

libkpimexchange/core/exchangeclient.cpp

@@ -25,8 +25,8 @@
 #include <klocale.h>
 
 // These for test() method
-#include <kio/http.h>
-#include <kio/davjob.h>
+#include <tdeio/http.h>
+#include <tdeio/davjob.h>
 // #include "libtdepim/resources/resourcemanager.h"
 // #include "libtdepim/resources/calendar/resourcecalendar.h"
 

libkpimexchange/core/exchangedelete.cpp

@@ -24,14 +24,14 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <krfcdate.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-
-#include <kio/slave.h>
-#include <kio/scheduler.h>
-#include <kio/slavebase.h>
-#include <kio/davjob.h>
-#include <kio/http.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+
+#include <tdeio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/davjob.h>
+#include <tdeio/http.h>
 
 #include "exchangeclient.h"
 #include "exchangeprogress.h"

libkpimexchange/core/exchangedelete.h

@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tdepimmacros.h>
 
 #include <libkcal/calendar.h>

libkpimexchange/core/exchangedownload.cpp

@@ -25,7 +25,7 @@
 #include <tqregexp.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <klocale.h>
@@ -34,12 +34,12 @@
 #include <kdebug.h>
 #include <krfcdate.h>
 
-#include <kio/slave.h>
-#include <kio/scheduler.h>
-#include <kio/slavebase.h>
-#include <kio/davjob.h>
-#include <kio/http.h>
-#include <kio/job.h>
+#include <tdeio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/davjob.h>
+#include <tdeio/http.h>
+#include <tdeio/job.h>
 
 #include <libkcal/incidence.h>
 #include <libkcal/event.h>

libkpimexchange/core/exchangedownload.h

@@ -25,7 +25,7 @@
 #include <tqdatetime.h>
 #include <tqdom.h>
 #include <tqmap.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/icalformat.h>

libkpimexchange/core/exchangemonitor.cpp

@@ -29,12 +29,12 @@
 #include <krfcdate.h>
 #include <kextsock.h>
 
-#include <kio/job.h>
-#include <kio/slave.h>
-#include <kio/scheduler.h>
-#include <kio/slavebase.h>
-#include <kio/davjob.h>
-#include <kio/http.h>
+#include <tdeio/job.h>
+#include <tdeio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/davjob.h>
+#include <tdeio/http.h>
 
 #include <libkcal/event.h>
 #include <libkcal/icalformat.h>

libkpimexchange/core/exchangemonitor.h

@@ -26,7 +26,7 @@
 #include <tqhostaddress.h>
 
 #include <kurl.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>

libkpimexchange/core/exchangeprogress.cpp

@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>
 

libkpimexchange/core/exchangeupload.cpp

@@ -24,13 +24,13 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <krfcdate.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
-#include <kio/slave.h>
-#include <kio/scheduler.h>
-#include <kio/slavebase.h>
-#include <kio/davjob.h>
-#include <kio/http.h>
+#include <tdeio/slave.h>
+#include <tdeio/scheduler.h>
+#include <tdeio/slavebase.h>
+#include <tdeio/davjob.h>
+#include <tdeio/http.h>
 
 extern "C" {
   #include <libical/ical.h>

libkpimexchange/core/exchangeupload.h

@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include <tdepimmacros.h>
 

libkpimidentities/identity.cpp

@@ -8,13 +8,13 @@
 
 #include "identity.h"
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 #include <libtdepim/collectingprocess.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 
 #include <tqfileinfo.h>

libkpimidentities/identitymanager.cpp

@@ -45,7 +45,7 @@ static const char configKeyDefaultIdentity[] = "Default Identity";
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kuser.h>
 #include <dcopclient.h>
 
@@ -74,7 +74,7 @@ IdentityManager::IdentityManager( bool readonly, TQObject * parent, const char *
   readConfig(mConfig);
   if ( mIdentities.isEmpty() ) {
     kdDebug(5006) << "emailidentities is empty -> convert from kmailrc" << endl;
-    // No emailidentities file, or an empty one due to broken conversion (kconf_update bug in tdelibs <= 3.2.2)
+    // No emailidentities file, or an empty one due to broken conversion (tdeconf_update bug in tdelibs <= 3.2.2)
     // => convert it, i.e. read settings from kmailrc
     TDEConfig kmailConf( "kmailrc", true );
     readConfig( &kmailConf );

libtdepim/CMakeLists.txt

@@ -79,10 +79,10 @@ tde_add_library( tdepim SHARED AUTOMOC
     kimportdialog.cpp kvcarddrag.cpp sidebarextension.cpp
     infoextension.cpp addressesdialog.cpp addresspicker.ui
     addresseeview.cpp maillistdrag.cpp interfaces/MailTransportServiceIface.skel
-    interfaces/AddressBookServiceIface.skel kconfigpropagator.cpp kconfigwizard.cpp
+    interfaces/AddressBookServiceIface.skel tdeconfigpropagator.cpp tdeconfigwizard.cpp
     weaver.cpp weaverextensions.cpp weaverlogger.cpp pluginloaderbase.cpp
     addresseelineedit.cpp addresseelineedit.skel kdatepickerpopup.cpp
-    kfileio.cpp clicklineedit.cpp configmanager.cpp collectingprocess.cpp
+    tdefileio.cpp clicklineedit.cpp configmanager.cpp collectingprocess.cpp
     ldapclient.cpp overlaywidget.cpp progressmanager.cpp progressdialog.cpp
     statusbarprogresswidget.cpp ssllabel.cpp completionordereditor.cpp
     resourceabc.cpp diffalgo.cpp addresseediffalgo.cpp calendardiffalgo.cpp

libtdepim/Makefile.am

@@ -14,10 +14,10 @@ libtdepim_la_SOURCES = \
   addressesdialog.cpp addresspicker.ui addresseeview.cpp \
   maillistdrag.cpp MailTransportServiceIface.skel \
   AddressBookServiceIface.skel \
-  kconfigpropagator.cpp kconfigwizard.cpp \
+  tdeconfigpropagator.cpp tdeconfigwizard.cpp \
   weaver.cpp weaverextensions.cpp weaverlogger.cpp \
   pluginloaderbase.cpp addresseelineedit.cpp addresseelineedit.skel \
-  kdatepickerpopup.cpp kfileio.cpp \
+  kdatepickerpopup.cpp tdefileio.cpp \
   clicklineedit.cpp configmanager.cpp \
   collectingprocess.cpp ldapclient.cpp \
   overlaywidget.cpp progressmanager.cpp progressdialog.cpp \

libtdepim/addresseeview.cpp

@@ -30,11 +30,11 @@
 #include <kabc/resource.h>
 #include <kactionclasses.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <klocale.h>
 #include <kmdcodec.h>
 #include <kmessagebox.h>

libtdepim/cfgc/README

@@ -1,5 +1,5 @@
 This directory contains text and example code for automatic creation of
-configuration dialogs based on TDEConfigSkeleton, kconfig_compiler and
+configuration dialogs based on TDEConfigSkeleton, tdeconfig_compiler and
 KPrefsDialog.
 
 If you have questions or comments please contact Cornelius Schumacher

libtdepim/cfgc/autoexample.cpp

@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kautoconfigdialog.h>
 

libtdepim/cfgc/example.cpp

@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kcmdlineargs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <libtdepim/kprefsdialog.h>

libtdepim/cfgc/exampleprefs_base.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=exampleprefs_base.kcfg
 ClassName=ExamplePrefsBase
 Singleton=true

libtdepim/completionordereditor.h

@@ -32,7 +32,7 @@
 #define COMPLETIONORDEREDITOR_H
 
 #include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KPushButton;
 class KListView;

libtdepim/csshelper.cpp

@@ -31,7 +31,7 @@
 
 #include "csshelper.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <kglobal.h>

libtdepim/groupwarejob.cpp

@@ -21,7 +21,7 @@
 
 #include "groupwarejob.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 
 using namespace TDEIO;

libtdepim/groupwarejob.h

@@ -21,7 +21,7 @@
 #ifndef KIO_GROUPWAREJOB_H
 #define KIO_GROUPWAREJOB_H
 
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 namespace TDEIO {
 

libtdepim/kaccount.cpp

@@ -32,7 +32,7 @@
 
 #include "kaccount.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 KAccount::KAccount( const uint id, const TQString &name, const Type type )
   : mId( id ), mName( name ), mType( type )

libtdepim/kcmdesignerfields.cpp

@@ -44,10 +44,10 @@
 #include <kstandarddirs.h>
 #include <kactivelabel.h>
 #include <kdirwatch.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "kcmdesignerfields.h"
 

libtdepim/kfoldertree.cpp

@@ -2,7 +2,7 @@
 
 #include "kfoldertree.h"
 #include <klocale.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kstringhandler.h>

libtdepim/kimportdialog.cpp

@@ -46,7 +46,7 @@
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "kimportdialog.h"
 #include "kimportdialog.moc"

libtdepim/komposer/core/core.cpp

@@ -29,7 +29,7 @@
 #include <ksettings/dialog.h>
 #include <kplugininfo.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ktrader.h>
 #include <klibloader.h>
 #include <kstdaction.h>

libtdepim/komposer/core/komposerconfig.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell komposerconfig
+Exec=tdecmshell komposerconfig
 Icon=komposer
 Type=Application
 Terminal=false

libtdepim/komposer/core/settings.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=komposer.kcfg
 NameSpace=Komposer
 ClassName=Config

libtdepim/komposer/plugins/default/defaulteditor.cpp

@@ -29,7 +29,7 @@
 
 #include <kaction.h>
 #include <kcolordialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinstance.h>
 #include <klocale.h>
 #include <kstdaction.h>

libtdepim/kpimprefs.cpp

@@ -29,7 +29,7 @@
 
 #include <kstandarddirs.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 

libtdepim/kpimprefs.h

@@ -23,7 +23,7 @@
 
 #include <tqstringlist.h>
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <tdepimmacros.h>
 
 class TQString;

libtdepim/kprefsdialog.cpp

@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kfontdialog.h>
 #include <kmessagebox.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kurlrequester.h>
 #include "ktimeedit.h"
 #include "kdateedit.h"

libtdepim/kprefsdialog.h

@@ -30,8 +30,8 @@
 
 #include <kdialogbase.h>
 #include <tdecmodule.h>
-#include <kconfigskeleton.h>
-#include <kfile.h>
+#include <tdeconfigskeleton.h>
+#include <tdefile.h>
 #include <tdepimmacros.h>
 
 

libtdepim/kresourceprefs.h

@@ -22,7 +22,7 @@
 #ifndef KRESOURCEPREFS_H
 #define KRESOURCEPREFS_H
 
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <tdepimmacros.h>
 
 class TQString;

libtdepim/ldapclient.cpp

@@ -32,7 +32,7 @@
 #include <kabc/ldapurl.h>
 #include <kabc/ldif.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kmdcodec.h>

libtdepim/ldapclient.h

@@ -31,9 +31,9 @@
 #include <tqguardedptr.h>
 #include <tqtimer.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kabc/ldif.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tdepimmacros.h>
 

libtdepim/ldapsearchdialog.cpp

@@ -34,7 +34,7 @@
 #include <kabc/addresslineedit.h>
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>

libtdepim/recentaddresses.cpp

@@ -31,7 +31,7 @@
 #include "libemailfunctions/email.h"
 
 #include <kstaticdeleter.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include <kdebug.h>

libtdepim/tdeconfigpropagator.cpp

@@ -19,11 +19,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kconfigpropagator.h"
+#include "tdeconfigpropagator.h"
 
 #include <kdebug.h>
-#include <kconfig.h>
-#include <kconfigskeleton.h>
+#include <tdeconfig.h>
+#include <tdeconfigskeleton.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 #include <klocale.h>

libtdepim/tdeconfigwizard.cpp

@@ -19,11 +19,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kconfigwizard.h"
+#include "tdeconfigwizard.h"
 
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
 
@@ -194,4 +194,4 @@ void TDEConfigWizard::slotOk()
   }
 }
 
-#include "kconfigwizard.moc"
+#include "tdeconfigwizard.moc"

libtdepim/tdeconfigwizard.h

@@ -21,7 +21,7 @@
 #ifndef KCONFIGWIZARD_H
 #define KCONFIGWIZARD_H
 
-#include <kconfigpropagator.h>
+#include <tdeconfigpropagator.h>
 #include <tdepimmacros.h>
 #include <kdialogbase.h>
 

libtdepim/tdefileio.cpp

@@ -1,4 +1,4 @@
-// kfileio.cpp
+// tdefileio.cpp
 // Author: Stefan Taferner <taferner@kde.org>
 // License: GPL
 

libtdepim/tdefileio.h

@@ -5,8 +5,8 @@
  * Author: Stefan Taferner <taferner@kde.org>
  * This code is under GPL.
  */
-#ifndef kpim_kfileio_h
-#define kpim_kfileio_h
+#ifndef kpim_tdefileio_h
+#define kpim_tdefileio_h
 
 #include <tqcstring.h>
 #include <tqwidget.h>
@@ -102,4 +102,4 @@ bool checkAndCorrectPermissionsIfPossibleWithErrorHandling( TQWidget *parent,
    const bool wantItWritable );
 }
 
-#endif /*kpim_kfileio_h*/
+#endif /*kpim_tdefileio_h*/

libtdepim/tdepartsdesignerplugin/CMakeLists.txt

@@ -27,6 +27,6 @@ link_directories(
 
 tde_add_kpart( tdepartsdesignerplugin AUTOMOC
   SOURCES tdepartsdesignerplugin.cpp
-  LINK tdeparts-shared kio-shared
+  LINK tdeparts-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
 )

libtdepim/tests/myconfig.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=propagator_test.kcfg
 ClassName=MyConfig
 Singleton=true

libtdepim/tests/testdistrlist.cpp

@@ -26,8 +26,8 @@ using KPIM::DistributionList;
 #include <kabc/stdaddressbook.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 #include <kcmdlineargs.h>
 

libtdepim/tests/testwizard.cpp

@@ -21,7 +21,7 @@
 
 #include "myconfig.h"
 
-#include <kconfigwizard.h>
+#include <tdeconfigwizard.h>
 
 #include <kaboutdata.h>
 #include <kapplication.h>

plugins/kmail/bodypartformatter/text_calendar.cpp

@@ -38,7 +38,7 @@
 #include <interfaces/bodyparturlhandler.h>
 #include <tdehtmlparthtmlwriter.h>
 
-#include <libtdepim/kfileio.h>
+#include <libtdepim/tdefileio.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/calendarresources.h>
@@ -58,7 +58,7 @@
 #include <email.h>
 
 #include <kglobal.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kstringhandler.h>
@@ -74,7 +74,7 @@
 #include <kmimetype.h>
 #include <kpopupmenu.h>
 #include <krun.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include <tqurl.h>
 #include <tqdir.h>

plugins/kmail/bodypartformatter/text_vcard.cpp

@@ -37,11 +37,11 @@
 #include <klocale.h>
 #include <kstringhandler.h>
 #include <kglobalsettings.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 
 #include <libtdepim/addresseeview.h>

tdefile-plugins/ics/CMakeLists.txt

@@ -28,13 +28,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfile_ics.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_ics.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kfile_ics (module) ########################
+##### tdefile_ics (module) ########################
 
-tde_add_kpart( kfile_ics AUTOMOC
-  SOURCES kfile_ics.cpp
+tde_add_kpart( tdefile_ics AUTOMOC
+  SOURCES tdefile_ics.cpp
   LINK kcal-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdefile-plugins/ics/Makefile.am

@@ -0,0 +1,24 @@
+# Makefile.am for ics file meta info plugin
+
+# set the include path for X, tdepim, qt and KDE
+INCLUDES = \
+  -I$(top_srcdir) \
+  $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_ics.h
+
+kde_module_LTLIBRARIES = tdefile_ics.la
+
+tdefile_ics_la_SOURCES = tdefile_ics.cpp
+tdefile_ics_la_LDFLAGS =  $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_ics_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(LIB_KSYCOCA)
+
+
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_ics.cpp -o $(podir)/tdefile_ics.pot
+
+services_DATA = tdefile_ics.desktop
+servicesdir = $(kde_servicesdir)

tdefile-plugins/ics/tdefile_ics.cpp

@@ -24,14 +24,14 @@ t it will be useful,
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 
-#include "kfile_ics.h"
+#include "tdefile_ics.h"
 
 #include <kgenericfactory.h>
 
 using namespace KCal;
 
 typedef KGenericFactory<ICSPlugin> ICSFactory;
-K_EXPORT_COMPONENT_FACTORY(kfile_ics, ICSFactory( "kfile_ics" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_ics, ICSFactory( "tdefile_ics" ))
 
 ICSPlugin::ICSPlugin( TQObject *parent, const char *name, const TQStringList& args )
   : KFilePlugin( parent, name, args )
@@ -93,4 +93,4 @@ bool ICSPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
   return true;
 }
 
-#include "kfile_ics.moc"
+#include "tdefile_ics.moc"

tdefile-plugins/ics/tdefile_ics.desktop

@@ -50,7 +50,7 @@ Name[uk]=Інформація про ICS
 Name[zh_CN]=ICS 信息
 Name[zh_TW]=ICS 資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_ics
+X-TDE-Library=tdefile_ics
 MimeType=text/calendar
 PreferredGroups=ICSInfo
 PreferredItems=Events,Todos,Journals

tdefile-plugins/ics/tdefile_ics.h

@@ -20,7 +20,7 @@
 #ifndef KFILE_ICS_H
 #define KFILE_ICS_H
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 

tdefile-plugins/palm-databases/Makefile.am

@@ -0,0 +1,22 @@
+## Makefile.am for palm database meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(PISOCK_INCLUDE) $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_palm.h
+
+kde_module_LTLIBRARIES = tdefile_palm.la
+
+tdefile_palm_la_SOURCES = tdefile_palm.cpp 
+tdefile_palm_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_palm_la_LIBADD = $(LIB_KSYCOCA) $(PISOCK_LIB)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_palm.cpp -o $(podir)/tdefile_palm.pot
+
+services_DATA = tdefile_palm.desktop
+servicesdir = $(kde_servicesdir)

tdefile-plugins/palm-databases/tdefile_palm.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include "kfile_palm.h"
+#include "tdefile_palm.h"
 
 #include <klocale.h>
 #include <kgenericfactory.h>
@@ -31,7 +31,7 @@
 
 typedef KGenericFactory<KPalmPlugin> PalmFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_palm, PalmFactory( "kfile_palm" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_palm, PalmFactory( "tdefile_palm" ))
 
 KPalmPlugin::KPalmPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -118,4 +118,4 @@ bool KPalmPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
 //  Do the stuff with low-level functions. See lines 1119-1142 of pi-file.cc for writing, 244-273 for reading.
 }*/
 
-#include "kfile_palm.moc"
+#include "tdefile_palm.moc"

tdefile-plugins/palm-databases/tdefile_palm.desktop

@@ -53,7 +53,7 @@ Name[uk]=Інформація про базу даних PalmOS
 Name[zh_CN]=PalmOS 数据库信息
 Name[zh_TW]=PalmOS 資料庫資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_palm
+X-TDE-Library=tdefile_palm
 MimeType=application/vnd.palm
 PreferredGroups=General
 PreferredItems=Name,DBType,TypeID,CreatorID,NrRecords,Size

tdefile-plugins/palm-databases/tdefile_palm.h

@@ -22,7 +22,7 @@
 #ifndef __KFILE_PALM_H__
 #define __KFILE_PALM_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 

tdefile-plugins/rfc822/Makefile.am

@@ -0,0 +1,22 @@
+## Makefile.am for rfc822 file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_rfc822.h
+
+kde_module_LTLIBRARIES = tdefile_rfc822.la
+
+tdefile_rfc822_la_SOURCES = tdefile_rfc822.cpp 
+tdefile_rfc822_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+tdefile_rfc822_la_LIBADD = $(LIB_KSYCOCA)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_rfc822.cpp -o $(podir)/tdefile_rfc822.pot
+
+services_DATA = tdefile_rfc822.desktop
+servicesdir = $(kde_servicesdir)

tdefile-plugins/rfc822/tdefile_rfc822.cpp

@@ -18,7 +18,7 @@
  */
 
 #include <config.h>
-#include "kfile_rfc822.h"
+#include "tdefile_rfc822.h"
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -40,7 +40,7 @@ typedef unsigned short uint32_t;
 
 typedef KGenericFactory<KRfc822Plugin> Rfc822Factory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_rfc822, Rfc822Factory( "kfile_rfc822" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_rfc822, Rfc822Factory( "tdefile_rfc822" ))
 
 KRfc822Plugin::KRfc822Plugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -158,4 +158,4 @@ bool KRfc822Plugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
     return true;
 }
 
-#include "kfile_rfc822.moc"
+#include "tdefile_rfc822.moc"

tdefile-plugins/rfc822/tdefile_rfc822.desktop

@@ -56,7 +56,7 @@ Name[uk]=Інформація про повідомлення ел. пошти
 Name[zh_CN]=电子邮件信息
 Name[zh_TW]=電子郵件資訊
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_rfc822
+X-TDE-Library=tdefile_rfc822
 MimeType=message/rfc822
 PreferredGroups=Technical
 PreferredItems=From,To,Subject,Date,Content-Type

tdefile-plugins/rfc822/tdefile_rfc822.h

@@ -20,7 +20,7 @@
 #ifndef __KFILE_RFC822_H__
 #define __KFILE_RFC822_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 

tdefile-plugins/vcf/CMakeLists.txt

@@ -23,13 +23,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kfile_vcf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES tdefile_vcf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
-##### kfile_vcf (module) ########################
+##### tdefile_vcf (module) ########################
 
-tde_add_kpart( kfile_vcf AUTOMOC
-  SOURCES kfile_vcf.cpp
+tde_add_kpart( tdefile_vcf AUTOMOC
+  SOURCES tdefile_vcf.cpp
   LINK kabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdefile-plugins/vcf/Makefile.am

@@ -0,0 +1,22 @@
+## Makefile.am for vcf file meta info plugin
+
+# set the include path for X, qt and KDE
+INCLUDES         = $(all_includes)
+
+# these are the headers for your project
+noinst_HEADERS   = tdefile_vcf.h
+
+kde_module_LTLIBRARIES = tdefile_vcf.la
+
+tdefile_vcf_la_SOURCES = tdefile_vcf.cpp 
+tdefile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore
+tdefile_vcf_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KABC)
+
+# let automoc handle all of the meta source files (moc)
+METASOURCES = AUTO
+
+messages: rc.cpp
+	$(XGETTEXT) tdefile_vcf.cpp -o $(podir)/tdefile_vcf.pot
+
+services_DATA = tdefile_vcf.desktop
+servicesdir = $(kde_servicesdir)

tdefile-plugins/vcf/tdefile_vcf.cpp

@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <config.h>
-#include "kfile_vcf.h"
+#include "tdefile_vcf.h"
 
 #include <kprocess.h>
 #include <klocale.h>
@@ -31,7 +31,7 @@
 
 typedef KGenericFactory<KVcfPlugin> VcfFactory;
 
-K_EXPORT_COMPONENT_FACTORY(kfile_vcf, VcfFactory( "kfile_vcf" ))
+K_EXPORT_COMPONENT_FACTORY(tdefile_vcf, VcfFactory( "tdefile_vcf" ))
 
 KVcfPlugin::KVcfPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
@@ -100,4 +100,4 @@ bool KVcfPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ )
     return true;
 }
 
-#include "kfile_vcf.moc"
+#include "tdefile_vcf.moc"

tdefile-plugins/vcf/tdefile_vcf.desktop

@@ -59,7 +59,7 @@ Name[zh_CN]=vCard 信息
 Name[zh_TW]=vCard 資訊
 Name[zu]=Ulwazi lwe-vCard
 ServiceTypes=KFilePlugin
-X-TDE-Library=kfile_vcf
+X-TDE-Library=tdefile_vcf
 MimeType=text/x-vcard
 PreferredGroups=Technical
 PreferredItems=Name,Email,Telephone

tdefile-plugins/vcf/tdefile_vcf.h

@@ -20,7 +20,7 @@
 #ifndef __KFILE_VCF_H__
 #define __KFILE_VCF_H__
 
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 class TQStringList;
 

tdeioslaves/CMakeLists.txt

@@ -17,5 +17,5 @@ add_subdirectory( mbox )
 if( WITH_SASL )
   add_subdirectory( sieve )
 else( )
-  message( "*** sieve kioslave will not be built (because lack of sasl support)" )
+  message( "*** sieve tdeioslave will not be built (because lack of sasl support)" )
 endif( )

tdeioslaves/Makefile.am

@@ -6,6 +6,6 @@ endif
 
 SUBDIRS = imap4 mbox $(SIEVE_SUBDIR)
 
-DOXYGEN_REFERENCES = kioslaves/imap4 kioslaves/mbox
+DOXYGEN_REFERENCES = tdeioslaves/imap4 tdeioslaves/mbox
 include $(top_srcdir)/admin/Doxyfile.am