diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
| commit | 64df902cf71a8ee258fb85f6be26248f399aa01f (patch) | |
| tree | dba58f705042c22cea26b678d5b0e4e9a34bf202 | |
| parent | de53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff) | |
| download | tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
685 files changed, 986 insertions, 986 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 259b73206..5a6e8d870 100644 --- a/CMakeLists.txt +++ b/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 ) diff --git a/MAINTAINERS b/MAINTAINERS index a4ee9665b..3a2dc538a 100644 --- a/MAINTAINERS +++ b/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> diff --git a/Mainpage.dox b/Mainpage.dox index eaf9f1f2c..f3311b22d 100644 --- a/Mainpage.dox +++ b/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 diff --git a/Makefile.am.in b/Makefile.am.in index dd70a20c3..77bd73675 100644 --- a/Makefile.am.in +++ b/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 diff --git a/NewsLog.txt b/NewsLog.txt index cc5cdc4c2..9b36e32f7 100644 --- a/NewsLog.txt +++ b/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) @@ -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: diff --git a/README.Kolab b/README.Kolab index 8253c4472..851811858 100644 --- a/README.Kolab +++ b/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 diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt index 621880ebd..b1bb367d0 100644 --- a/akregator/src/CMakeLists.txt +++ b/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} ) diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index 3ea4e7985..3ff787eaf 100644 --- a/akregator/src/akregator_part.cpp +++ b/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> diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 3066760a8..d9f397101 100644 --- a/akregator/src/akregator_view.cpp +++ b/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> diff --git a/akregator/src/akregatorconfig.kcfgc b/akregator/src/akregatorconfig.kcfgc index 5602bc561..661834712 100644 --- a/akregator/src/akregatorconfig.kcfgc +++ b/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 diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 27ecd64e8..1bb5646a5 100644 --- a/akregator/src/articlefilter.cpp +++ b/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> diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp index dfd48ffef..68af3860c 100644 --- a/akregator/src/articleviewer.cpp +++ b/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" diff --git a/akregator/src/configdialog.h b/akregator/src/configdialog.h index db2161cb8..3fd7c8f27 100644 --- a/akregator/src/configdialog.h +++ b/akregator/src/configdialog.h @@ -25,7 +25,7 @@ #ifndef AKREGATOR_CONFIGDIALOG_H #define AKREGATOR_CONFIGDIALOG_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> namespace Akregator { diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp index 4dff98227..383d76b94 100644 --- a/akregator/src/librss/image.cpp +++ b/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> diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp index 12036ec97..ea0134e62 100644 --- a/akregator/src/librss/loader.cpp +++ b/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> diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h index a0c9f29dc..0d5ec5964 100644 --- a/akregator/src/librss/loader.h +++ b/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; diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp index f6e5ec182..293d60ada 100644 --- a/akregator/src/mainwindow.cpp +++ b/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> diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h index bb3ca7337..6f0374b67 100644 --- a/akregator/src/mainwindow.h +++ b/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; diff --git a/akregator/src/mk4storage/CMakeLists.txt b/akregator/src/mk4storage/CMakeLists.txt index 99ff7a2ad..c229d6ecf 100644 --- a/akregator/src/mk4storage/CMakeLists.txt +++ b/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} ) diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index d80cccfb3..195237220 100644 --- a/akregator/src/pageviewer.cpp +++ b/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> diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 299cedd1a..74f2ca2a4 100644 --- a/akregator/src/viewer.cpp +++ b/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> diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index 364c5cd05..f153674b7 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/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> diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp index 7c86e8b24..9c1fe3891 100644 --- a/certmanager/certmanager.cpp +++ b/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 diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp index 96c0bfffc..3c2c7c04a 100644 --- a/certmanager/conf/appearanceconfigwidget.cpp +++ b/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> diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp index fde9df9db..83879de8e 100644 --- a/certmanager/conf/configuredialog.cpp +++ b/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 ) diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp index 40ab0998d..769b95323 100644 --- a/certmanager/conf/dirservconfigpage.cpp +++ b/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> diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp index 200175b2d..1cb31ef44 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp +++ b/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> diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index 9bcd0b390..6dbca9828 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/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> diff --git a/certmanager/lib/CMakeLists.txt b/certmanager/lib/CMakeLists.txt index 79c729f33..74dc46ea5 100644 --- a/certmanager/lib/CMakeLists.txt +++ b/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} ) diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index da875e303..53ad316d5 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/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> diff --git a/certmanager/lib/cryptplugfactory.cpp b/certmanager/lib/cryptplugfactory.cpp index a5015a54d..50db2ab74 100644 --- a/certmanager/lib/cryptplugfactory.cpp +++ b/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> diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index f997e9309..eb2ccafea 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/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> diff --git a/certmanager/lib/kleo/CMakeLists.txt b/certmanager/lib/kleo/CMakeLists.txt index 63d238e7d..aab4ce210 100644 --- a/certmanager/lib/kleo/CMakeLists.txt +++ b/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 ) diff --git a/certmanager/lib/kleo/Makefile.am b/certmanager/lib/kleo/Makefile.am index ad9054d15..b81d43bf8 100644 --- a/certmanager/lib/kleo/Makefile.am +++ b/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 diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index f67343ca8..0397e168d 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/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> diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index 3249cc73b..847127eab 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/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> diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp index 1276f9fd3..1aa2b170a 100644 --- a/certmanager/lib/kleo/keyfiltermanager.cpp +++ b/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> diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp index 4ed6ab37d..05c6d04d5 100644 --- a/certmanager/lib/kleo/kconfigbasedkeyfilter.cpp +++ b/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 { diff --git a/certmanager/lib/kleo/kconfigbasedkeyfilter.h b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.h index 487b3791a..3d65e7a2f 100644 --- a/certmanager/lib/kleo/kconfigbasedkeyfilter.h +++ b/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 diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 4cfcfb20a..67f1929e8 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/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> diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index adb257493..b785137d7 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/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> diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index 96b710c37..571ceccd4 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/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> diff --git a/certmanager/storedtransferjob.h b/certmanager/storedtransferjob.h index 7fab77069..276d5db45 100644 --- a/certmanager/storedtransferjob.h +++ b/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 { diff --git a/config.h.cmake b/config.h.cmake index 89b739aec..9a020efb2 100644 --- a/config.h.cmake +++ b/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 diff --git a/dependency-graph.dot b/dependency-graph.dot index 5cd9d0cfa..9e9953d4f 100644 --- a/dependency-graph.dot +++ b/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"; diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 4e4b6e61d..5d17f4ef9 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/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> diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h index a0dcd45af..c267dce17 100644 --- a/kaddressbook/addresseeconfig.h +++ b/kaddressbook/addresseeconfig.h @@ -25,7 +25,7 @@ #define ADDRESSEECONFIG_H #include <kabc/addressee.h> -#include <kconfig.h> +#include <tdeconfig.h> using namespace KABC; diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index e4cd5a3af..c1173b377 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/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> diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp index 1872ecea0..e312fbcdc 100644 --- a/kaddressbook/common/filter.cpp +++ b/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" diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h index e8518b8e8..68df1036f 100644 --- a/kaddressbook/common/filter.h +++ b/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) diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp index 8a45fc14d..1f9e2410a 100644 --- a/kaddressbook/common/kabprefs.cpp +++ b/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> diff --git a/kaddressbook/common/kabprefs_base.kcfgc b/kaddressbook/common/kabprefs_base.kcfgc index 75e0d84de..bc54ae65e 100644 --- a/kaddressbook/common/kabprefs_base.kcfgc +++ b/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 diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index e1f23e662..11fd2c110 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/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> diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 3d94d3b7e..a04a88a9c 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/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> diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index aa17b625b..dea1170ea 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/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> diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index c49deee6a..f48b5e966 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/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> diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 1d64fde3f..9ba87d46c 100644 --- a/kaddressbook/imagewidget.cpp +++ b/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> diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index 2f40f5de3..9f7271201 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/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> diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index d1d23c8c7..e8df353df 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -26,7 +26,7 @@ #include <tqwidget.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdepimmacros.h> namespace KABC { diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 15ea63bac..986686183 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/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> diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index 6bbc45bec..ce58d2720 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/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> diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 18cb1a908..d63247a48 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/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> diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 0f33eca6a..12ff11043 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/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> diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index b3fd9af25..8f0ca7bce 100644 --- a/kaddressbook/keywidget.cpp +++ b/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> diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 6537bebe9..b9bdd1f64 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/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> diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 8f70f0f82..1bba99ff9 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/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> diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index ff787e128..6d3ef0b96 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/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> diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index a80626519..949c1783c 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/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> diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index f4558258e..f7beaf202 100644 --- a/kaddressbook/soundwidget.cpp +++ b/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> diff --git a/kaddressbook/thumbnailcreator/Makefile.am b/kaddressbook/thumbnailcreator/Makefile.am index d0d4c7899..2f8ba9c84 100644 --- a/kaddressbook/thumbnailcreator/Makefile.am +++ b/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 diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 7460ad806..4627ebd52 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/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. * diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.h b/kaddressbook/thumbnailcreator/ldifvcardcreator.h index 2de6c7b41..04f788310 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.h +++ b/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; diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index 9602f2d31..3dd0d7d65 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/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> diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index 415430d92..f2153f828 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/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> diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index edafa4112..bfb02760f 100644 --- a/kaddressbook/viewmanager.cpp +++ b/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> diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 347bd4233..b1e6233ed 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/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> diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 987feb17d..2551be98e 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/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" diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index c4552232a..25c66ac45 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/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> diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 30e1ca672..f69ce0c1a 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/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> diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index adf3de0e2..60bae788c 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/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> diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index d951655b0..4c39c13ba 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/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> diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index f3d47bfc3..673a0ec73 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/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> diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 40c209dce..4a363e76f 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/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> diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp index 402665ab1..c443cce3b 100644 --- a/kaddressbook/xxport/eudora_xxport.cpp +++ b/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> diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index f5abefde3..6d8fd80e7 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/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(); diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index f0c13e610..67c3684d3 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/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> diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 800f11fa6..f1547481d 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/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> diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 911e92ded..c4db37a9e 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/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> diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 34a6809fa..8e219fca4 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/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> diff --git a/kalarm/CMakeLists.txt b/kalarm/CMakeLists.txt index b93cc6712..cd7295a47 100644 --- a/kalarm/CMakeLists.txt +++ b/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 diff --git a/kalarm/Makefile.am b/kalarm/Makefile.am index a8e0e8bd5..defbcce7f 100644 --- a/kalarm/Makefile.am +++ b/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 \ diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp index 1e64b046b..26d2eb700 100644 --- a/kalarm/alarmcalendar.cpp +++ b/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> diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index 0727507f2..76b040daf 100644 --- a/kalarm/birthdaydlg.cpp +++ b/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> diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp index 707865f87..1c37f9745 100644 --- a/kalarm/daemon.cpp +++ b/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> diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 62c445ad1..daf4406d3 100644 --- a/kalarm/editdlg.cpp +++ b/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" diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp index 4723c342a..e637f22f5 100644 --- a/kalarm/functions.cpp +++ b/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> diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp index 29f498fc9..5fa0d4959 100644 --- a/kalarm/kalarmapp.cpp +++ b/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> diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp index db2e4e3d7..e499f4814 100644 --- a/kalarm/kalarmd/adcalendar.cpp +++ b/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" diff --git a/kalarm/kalarmd/adconfigdata.cpp b/kalarm/kalarmd/adconfigdata.cpp index 0253e320a..3f728bdb1 100644 --- a/kalarm/kalarmd/adconfigdata.cpp +++ b/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> diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp index 75bb4d2df..4b2ff9022 100644 --- a/kalarm/kalarmd/alarmdaemon.cpp +++ b/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> diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp index e0c50d3cf..cc9c02487 100644 --- a/kalarm/kamail.cpp +++ b/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> diff --git a/kalarm/lib/messagebox.cpp b/kalarm/lib/messagebox.cpp index 721ee5ea0..4e78ef085 100644 --- a/kalarm/lib/messagebox.cpp +++ b/kalarm/lib/messagebox.cpp @@ -19,7 +19,7 @@ */ #include "kalarm.h" -#include <kconfig.h> +#include <tdeconfig.h> #include "messagebox.h" diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index 765678c60..08706246f 100644 --- a/kalarm/mainwindow.cpp +++ b/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> diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp index 0315b8f44..7c17edd02 100644 --- a/kalarm/messagewin.cpp +++ b/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 diff --git a/kalarm/pickfileradio.cpp b/kalarm/pictdefileradio.cpp index 15b56d942..80911c298 100644 --- a/kalarm/pickfileradio.cpp +++ b/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) diff --git a/kalarm/pickfileradio.h b/kalarm/pictdefileradio.h index f30ca7f63..ad6e0c25c 100644 --- a/kalarm/pickfileradio.h +++ b/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" diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp index 24669fbe5..2e057eaf7 100644 --- a/kalarm/preferences.cpp +++ b/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> diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index 1f386f30e..d93a3b680 100644 --- a/kalarm/sounddlg.cpp +++ b/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" diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp index 00f31893b..1ae3a6a81 100644 --- a/kalarm/soundpicker.cpp +++ b/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 diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 58e8232ce..8bcad17ed 100644 --- a/kalarm/traywindow.cpp +++ b/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" diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp index f7c29d0c4..eeae6f2da 100644 --- a/kandy/src/kandy.cpp +++ b/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> diff --git a/kandy/src/kandyprefs.kcfgc b/kandy/src/kandyprefs.kcfgc index c615f6fce..55a2574b9 100644 --- a/kandy/src/kandyprefs.kcfgc +++ b/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 diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index 99336c921..fbf5deaa2 100644 --- a/kandy/src/kandyview.cpp +++ b/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> diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 00cfea89c..a4217be07 100644 --- a/kandy/src/mobilegui.cpp +++ b/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> diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp index 318b3eaa6..43210ba8f 100644 --- a/kandy/src/mobilemain.cpp +++ b/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> diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index b8426f22b..36a71043e 100644 --- a/karm/karm_part.cpp +++ b/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> diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index bda5831bc..0eb16c1ec 100644 --- a/karm/karmstorage.cpp +++ b/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> diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 7e692092d..dc9b3344a 100644 --- a/karm/mainwindow.cpp +++ b/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> diff --git a/karm/preferences.cpp b/karm/preferences.cpp index 1dd13625c..005243ce4 100644 --- a/karm/preferences.cpp +++ b/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> diff --git a/karm/taskview.cpp b/karm/taskview.cpp index eb63da482..bcabad37f 100644 --- a/karm/taskview.cpp +++ b/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> diff --git a/kfile-plugins/ics/Makefile.am b/kfile-plugins/ics/Makefile.am deleted file mode 100644 index 1a2378e5c..000000000 --- a/kfile-plugins/ics/Makefile.am +++ /dev/null @@ -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) diff --git a/kfile-plugins/palm-databases/Makefile.am b/kfile-plugins/palm-databases/Makefile.am deleted file mode 100644 index fa60fd228..000000000 --- a/kfile-plugins/palm-databases/Makefile.am +++ /dev/null @@ -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) diff --git a/kfile-plugins/rfc822/Makefile.am b/kfile-plugins/rfc822/Makefile.am deleted file mode 100644 index f8fa6f941..000000000 --- a/kfile-plugins/rfc822/Makefile.am +++ /dev/null @@ -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) diff --git a/kfile-plugins/vcf/Makefile.am b/kfile-plugins/vcf/Makefile.am deleted file mode 100644 index 087600d7c..000000000 --- a/kfile-plugins/vcf/Makefile.am +++ /dev/null @@ -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) diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp index c313ce3ab..4d5c2edc9 100644 --- a/kitchensync/src/configguievo2.cpp +++ b/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> diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp index 99e86f3c7..6a3b9aa6a 100644 --- a/kitchensync/src/configguisunbird.cpp +++ b/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 ) diff --git a/kmail/ChangeLog b/kmail/ChangeLog index 1873a13df..2f263c27e 100644 --- a/kmail/ChangeLog +++ b/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> diff --git a/kmail/Makefile.am b/kmail/Makefile.am index 6fcc46de6..5f8cc6e4f 100644 --- a/kmail/Makefile.am +++ b/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 \ diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 8937fb480..73c3e3f09 100644 --- a/kmail/accountdialog.cpp +++ b/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 ); diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp index a2bb384ff..eeed8f66f 100644 --- a/kmail/accountmanager.cpp +++ b/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> diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp index 89861527b..68ba83b91 100644 --- a/kmail/accountwizard.cpp +++ b/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> diff --git a/kmail/acljobs.cpp b/kmail/acljobs.cpp index 2aa55b0c1..4b5f54f68 100644 --- a/kmail/acljobs.cpp +++ b/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; diff --git a/kmail/acljobs.h b/kmail/acljobs.h index b4bfd0dfb..dd9883436 100644 --- a/kmail/acljobs.h +++ b/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 { diff --git a/kmail/actionscheduler.cpp b/kmail/actionscheduler.cpp index 6f8e43b0d..738d62857 100644 --- a/kmail/actionscheduler.cpp +++ b/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; diff --git a/kmail/annotationjobs.cpp b/kmail/annotationjobs.cpp index 6aa4d932d..c2fd82678 100644 --- a/kmail/annotationjobs.cpp +++ b/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; diff --git a/kmail/annotationjobs.h b/kmail/annotationjobs.h index 8b50a025a..2e7529f25 100644 --- a/kmail/annotationjobs.h +++ b/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 { diff --git a/kmail/antispamconfig.cpp b/kmail/antispamconfig.cpp index 9a1c8347f..2563e4eee 100644 --- a/kmail/antispamconfig.cpp +++ b/kmail/antispamconfig.cpp @@ -36,7 +36,7 @@ #include <kasciistricmp.h> #include <kstaticdeleter.h> -#include <kconfig.h> +#include <tdeconfig.h> using namespace KMail; diff --git a/kmail/antispamwizard.h b/kmail/antispamwizard.h index ed9e4a3b4..031a995af 100644 --- a/kmail/antispamwizard.h +++ b/kmail/antispamwizard.h @@ -31,7 +31,7 @@ #include "simplefoldertree.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <klistbox.h> #include <kwizard.h> diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 4f58f56c3..49c9b1c3d 100644 --- a/kmail/archivefolderdialog.cpp +++ b/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> diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp index 143c18c5b..7b1fd5175 100644 --- a/kmail/cachedimapjob.cpp +++ b/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> diff --git a/kmail/cachedimapjob.h b/kmail/cachedimapjob.h index 592ba3928..bdf645417 100644 --- a/kmail/cachedimapjob.h +++ b/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> diff --git a/kmail/configure.in.in b/kmail/configure.in.in index 694a8359e..55bf6b17f 100644 --- a/kmail/configure.in.in +++ b/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 ------------------------------------------------------------------------ diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 7b24e228d..61e131b2f 100644 --- a/kmail/configuredialog.cpp +++ b/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> diff --git a/kmail/csshelper.cpp b/kmail/csshelper.cpp index 61bdbdd1b..e5bfb7bfe 100644 --- a/kmail/csshelper.cpp +++ b/kmail/csshelper.cpp @@ -34,7 +34,7 @@ #include "globalsettings.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqcolor.h> #include <tqfont.h> diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp index 06368967e..da78a64dd 100644 --- a/kmail/editorwatcher.cpp +++ b/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> diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp index 8b629f832..24a32bb00 100644 --- a/kmail/favoritefolderview.cpp +++ b/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> diff --git a/kmail/filterimporterexporter.cpp b/kmail/filterimporterexporter.cpp index 3f6208d6d..1aee8fa97 100644 --- a/kmail/filterimporterexporter.cpp +++ b/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> diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp index 911f85a4f..25fb7d5c8 100644 --- a/kmail/filterlogdlg.cpp +++ b/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> diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index 1faf61a1a..103d961e9 100644 --- a/kmail/folderdiaquotatab_p.cpp +++ b/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" diff --git a/kmail/folderjob.cpp b/kmail/folderjob.cpp index 852082a9b..657d1a9b9 100644 --- a/kmail/folderjob.cpp +++ b/kmail/folderjob.cpp @@ -38,7 +38,7 @@ #include "folderstorage.h" #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> namespace KMail { diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp index 00368e6d8..7be5c26a0 100644 --- a/kmail/folderstorage.cpp +++ b/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> diff --git a/kmail/foldertreebase.cpp b/kmail/foldertreebase.cpp index b2f82ad92..e51eaecf4 100644 --- a/kmail/foldertreebase.cpp +++ b/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> diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp index 3dbb2b9f0..26f5957cc 100644 --- a/kmail/headeritem.cpp +++ b/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" diff --git a/kmail/headerstrategy.cpp b/kmail/headerstrategy.cpp index 4bd068112..afa581a1b 100644 --- a/kmail/headerstrategy.cpp +++ b/kmail/headerstrategy.cpp @@ -38,7 +38,7 @@ #include "kmkernel.h" #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> namespace KMail { diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp index d2c35b42b..fb382e15d 100644 --- a/kmail/htmlstatusbar.cpp +++ b/kmail/htmlstatusbar.cpp @@ -43,7 +43,7 @@ #endif #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqcolor.h> #include <tqstring.h> diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp index f180d61da..0e4e3c141 100644 --- a/kmail/identitydialog.cpp +++ b/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> diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp index e97a260ed..f464f0872 100644 --- a/kmail/imapaccountbase.cpp +++ b/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> diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h index ec08ea5f4..f1bf03f0d 100644 --- a/kmail/imapaccountbase.h +++ b/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 }; diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp index 2fee6acf1..52a110837 100644 --- a/kmail/imapjob.cpp +++ b/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> diff --git a/kmail/imapjob.h b/kmail/imapjob.h index 2f7a04010..c8e00e14a 100644 --- a/kmail/imapjob.h +++ b/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" diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp index 64f13d76f..f89b7870d 100644 --- a/kmail/kmaccount.cpp +++ b/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> diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp index 473b0b99c..de22e7f69 100644 --- a/kmail/kmacctcachedimap.cpp +++ b/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> diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp index a70091e79..70a5f0caa 100644 --- a/kmail/kmacctimap.cpp +++ b/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> diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp index 813d180cb..0e941b42d 100644 --- a/kmail/kmacctlocal.cpp +++ b/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> diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp index 5a203c2d1..226d99a54 100644 --- a/kmail/kmacctmaildir.cpp +++ b/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> diff --git a/kmail/kmail.upd b/kmail/kmail.upd index 150393ba6..3300b2585 100644 --- a/kmail/kmail.upd +++ b/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. ###################################################################### diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp index fbafbc1b5..b747be68e 100644 --- a/kmail/kmailicalifaceimpl.cpp +++ b/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> diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 023c887da..95d6108b8 100644 --- a/kmail/kmcommands.cpp +++ b/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" diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h index 3bb209882..dab733cc8 100644 --- a/kmail/kmcommands.h +++ b/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> diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index d635b6477..fe145b827 100644 --- a/kmail/kmcomposewin.cpp +++ b/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> diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 840d34347..eb108b062 100644 --- a/kmail/kmcomposewin.h +++ b/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> diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 8301a12cb..6f03e87dc 100644 --- a/kmail/kmedit.cpp +++ b/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> diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index 0183cf884..f5fa9f9a5 100644 --- a/kmail/kmfawidgets.cpp +++ b/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> diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp index e9e9f3790..2898990d3 100644 --- a/kmail/kmfilter.cpp +++ b/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> diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index 06dbb56ef..1fce0df5e 100644 --- a/kmail/kmfilteraction.cpp +++ b/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> diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index fd00a3cce..b5010cc31 100644 --- a/kmail/kmfilterdlg.cpp +++ b/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> diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp index 1f5d9ad5c..ac2915e7a 100644 --- a/kmail/kmfiltermgr.cpp +++ b/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> diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp index 5c4af4050..88338a057 100644 --- a/kmail/kmfolder.cpp +++ b/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( "]", "%)" ); diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp index 4ce92cb1d..ab66c95fe 100644 --- a/kmail/kmfoldercachedimap.cpp +++ b/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> diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp index 3f7208a97..ad13ac2ee 100644 --- a/kmail/kmfolderdia.cpp +++ b/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> diff --git a/kmail/kmfolderimap.cpp b/kmail/kmfolderimap.cpp index 07a52c5c6..ead0a9437 100644 --- a/kmail/kmfolderimap.cpp +++ b/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> diff --git a/kmail/kmfolderimap.h b/kmail/kmfolderimap.h index 490b13a69..5f454c598 100644 --- a/kmail/kmfolderimap.h +++ b/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> diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp index c6fa7be24..6f291f41b 100644 --- a/kmail/kmfoldermaildir.cpp +++ b/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" diff --git a/kmail/kmfoldermaildir.h b/kmail/kmfoldermaildir.h index fc1990319..b4bdb3c58 100644 --- a/kmail/kmfoldermaildir.h +++ b/kmail/kmfoldermaildir.h @@ -3,7 +3,7 @@ #include "kmfolderindex.h" -#include <kfileitem.h> +#include <tdefileitem.h> #include <tqguardedptr.h> diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp index 137996803..1579db0ca 100644 --- a/kmail/kmfoldermbox.cpp +++ b/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> diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp index 2c3d10a5a..44d2a1530 100644 --- a/kmail/kmfoldermgr.cpp +++ b/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> diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp index fa34f5b99..038ddbe1a 100644 --- a/kmail/kmfoldersearch.cpp +++ b/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> diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index 9d259f562..9a7cd4771 100644 --- a/kmail/kmfoldertree.cpp +++ b/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> diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 2ed379c9f..6910ad6ef 100644 --- a/kmail/kmheaders.cpp +++ b/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> diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index 354fe7686..1761a7629 100644 --- a/kmail/kmkernel.cpp +++ b/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" diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 9d2b50708..5d80d659d 100644 --- a/kmail/kmkernel.h +++ b/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> diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index acf0b0c03..7916c1be7 100644 --- a/kmail/kmlineeditspell.cpp +++ b/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> diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 14ccaba02..8681ff9e2 100644 --- a/kmail/kmmainwidget.cpp +++ b/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> diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp index 8e14e984a..ee7858017 100644 --- a/kmail/kmmainwin.cpp +++ b/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> diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp index aabc14bcb..5b4f8cf96 100644 --- a/kmail/kmmessage.cpp +++ b/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> diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp index 74cbe62e5..484568249 100644 --- a/kmail/kmmimeparttree.cpp +++ b/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> diff --git a/kmail/kmmimeparttree.h b/kmail/kmmimeparttree.h index a5634b099..606c515f6 100644 --- a/kmail/kmmimeparttree.h +++ b/kmail/kmmimeparttree.h @@ -36,7 +36,7 @@ #define KMMIMEPARTTREE_H #include <klistview.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqstring.h> diff --git a/kmail/kmmsgpart.h b/kmail/kmmsgpart.h index 9d69f87c8..b49b5a30e 100644 --- a/kmail/kmmsgpart.h +++ b/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 */ diff --git a/kmail/kmmsgpartdlg.h b/kmail/kmmsgpartdlg.h index 78588eb10..0132be019 100644 --- a/kmail/kmmsgpartdlg.h +++ b/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; diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp index 5cbbacda4..fa9faafb0 100644 --- a/kmail/kmpopfiltercnfrmdlg.cpp +++ b/kmail/kmpopfiltercnfrmdlg.cpp @@ -20,7 +20,7 @@ #include <tqtimer.h> #include <klocale.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <assert.h> diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index 0568035b9..2405a3e56 100644 --- a/kmail/kmreaderwin.cpp +++ b/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> diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index 0d94c149f..1ab6381e4 100644 --- a/kmail/kmsearchpattern.cpp +++ b/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> diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp index d6a2f8add..bf9a819cc 100644 --- a/kmail/kmsender.cpp +++ b/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> diff --git a/kmail/kmsender_p.h b/kmail/kmsender_p.h index f87fd2a3a..d07dcf348 100644 --- a/kmail/kmsender_p.h +++ b/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; diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp index 8548670a4..d2326394a 100644 --- a/kmail/kmservertest.cpp +++ b/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 ) diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index 2092376fc..2432031b8 100644 --- a/kmail/kmtransport.cpp +++ b/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> diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp index 79efe49c6..d8ee1e102 100644 --- a/kmail/listjob.cpp +++ b/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> diff --git a/kmail/mailinglist-magic.cpp b/kmail/mailinglist-magic.cpp index e199e3d09..1f9270842 100644 --- a/kmail/mailinglist-magic.cpp +++ b/kmail/mailinglist-magic.cpp @@ -7,7 +7,7 @@ #include "kmmessage.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> #include <kdebug.h> diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp index 62581bf92..93693dd7d 100644 --- a/kmail/networkaccount.cpp +++ b/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> diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp index 6ea48bf06..7051542bb 100644 --- a/kmail/objecttreeparser.cpp +++ b/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" diff --git a/kmail/partNode.h b/kmail/partNode.h index b764c9dfe..20328ddea 100644 --- a/kmail/partNode.h +++ b/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> diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp index 0d6c6e757..e20b1f136 100644 --- a/kmail/popaccount.cpp +++ b/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> diff --git a/kmail/quotajobs.cpp b/kmail/quotajobs.cpp index b08d7f91d..f8272cac8 100644 --- a/kmail/quotajobs.cpp +++ b/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; diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h index 3e453b504..1749fe0ea 100644 --- a/kmail/quotajobs.h +++ b/kmail/quotajobs.h @@ -34,7 +34,7 @@ #include <tqvariant.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <tqvaluevector.h> diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp index 5e2a43d3f..7b1b80e34 100644 --- a/kmail/renamejob.cpp +++ b/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> diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp index 6e3040bd2..f7af79c2a 100644 --- a/kmail/searchjob.cpp +++ b/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 ); } diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 15bf5f076..849cba8b1 100644 --- a/kmail/searchwindow.cpp +++ b/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> diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp index 8e185f3a9..61ebc7a60 100644 --- a/kmail/sieveconfig.cpp +++ b/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> diff --git a/kmail/sievejob.cpp b/kmail/sievejob.cpp index 3e823a7a7..96f0a6086 100644 --- a/kmail/sievejob.cpp +++ b/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; diff --git a/kmail/sievejob.h b/kmail/sievejob.h index 84e316140..fb1d3a90d 100644 --- a/kmail/sievejob.h +++ b/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 { diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp index 4997386e7..b7ba16f1b 100644 --- a/kmail/snippetwidget.cpp +++ b/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> diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp index ced8f7710..158d9abb1 100644 --- a/kmail/transportmanager.cpp +++ b/kmail/transportmanager.cpp @@ -21,7 +21,7 @@ #include "kmtransport.h" #include "kmkernel.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> namespace KMail { diff --git a/kmail/util.h b/kmail/util.h index 30b01cbaf..aa4aac288 100644 --- a/kmail/util.h +++ b/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> diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index 5a279b92f..e35b2e0ec 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/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; diff --git a/kmailcvt/CMakeLists.txt b/kmailcvt/CMakeLists.txt index 26b2ce6b7..9a566690c 100644 --- a/kmailcvt/CMakeLists.txt +++ b/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} ) diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx index 900b134bd..017385d4f 100644 --- a/kmailcvt/filter_evolution.cxx +++ b/kmailcvt/filter_evolution.cxx @@ -22,7 +22,7 @@ #include <config.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ktempfile.h> diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx index d60953195..34192f6a5 100644 --- a/kmailcvt/filter_evolution_v2.cxx +++ b/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(); diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx index 594313ae9..9305e6448 100644 --- a/kmailcvt/filter_kmail_maildir.cxx +++ b/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(); diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx index 4bd3c423f..8d987d0db 100644 --- a/kmailcvt/filter_lnotes.cxx +++ b/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> diff --git a/kmailcvt/filter_lnotes.hxx b/kmailcvt/filter_lnotes.hxx index 709fa6ce2..430ae83e8 100644 --- a/kmailcvt/filter_lnotes.hxx +++ b/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 ***************************************************************************/ /*************************************************************************** diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx index 90e05aff8..51df32359 100644 --- a/kmailcvt/filter_mailapp.cxx +++ b/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> diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx index 1ecc6c79b..78bfec072 100644 --- a/kmailcvt/filter_mbox.cxx +++ b/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> diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx index a87ee39af..22c7a615a 100644 --- a/kmailcvt/filter_oe.cxx +++ b/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> diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx index 65e2eae4b..784c0b101 100644 --- a/kmailcvt/filter_opera.cxx +++ b/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(); diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx index a5a9f407c..63d2848b1 100644 --- a/kmailcvt/filter_outlook.cxx +++ b/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> diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx index 04abea3d3..b29d13389 100644 --- a/kmailcvt/filter_plain.cxx +++ b/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" diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx index 699e3adb3..d79c8f4b7 100644 --- a/kmailcvt/filter_pmail.cxx +++ b/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(); diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx index 2174c681f..af03a0990 100644 --- a/kmailcvt/filter_sylpheed.cxx +++ b/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(); diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx index 52cd98589..499caedba 100644 --- a/kmailcvt/filter_thebat.cxx +++ b/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(); diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx index ea739dac1..d92e7efdf 100644 --- a/kmailcvt/filter_thunderbird.cxx +++ b/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(); diff --git a/kmobile/DESIGN b/kmobile/DESIGN index 287a3d9a2..90ea509ec 100644 --- a/kmobile/DESIGN +++ b/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 diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am index 69f90bd9b..91fab1819 100644 --- a/kmobile/Makefile.am +++ b/kmobile/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for kmobile -SUBDIRS = . devices # kioslave +SUBDIRS = . devices # tdeioslave bin_PROGRAMS = kmobile diff --git a/kmobile/TODO b/kmobile/TODO index 457393bbc..33b60b836 100644 --- a/kmobile/TODO +++ b/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 !!) diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index 95a014a6c..1f33996e7 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/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> diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index 3a7c77b07..564681cd7 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/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> diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp index 2453b3bac..3e2663b5a 100644 --- a/kmobile/kmobile.cpp +++ b/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> diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp index 9c95efe8f..2eef7c53c 100644 --- a/kmobile/kmobileclient.cpp +++ b/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; } diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index d1e031324..3c970ab15 100644 --- a/kmobile/kmobiledevice.cpp +++ b/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> diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index 111a26e5d..ffd568ea9 100644 --- a/kmobile/kmobiledevice.h +++ b/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. diff --git a/kmobile/kmobileiface.h b/kmobile/kmobileiface.h index 60974b268..bac1a9ae6 100644 --- a/kmobile/kmobileiface.h +++ b/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; diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp index dec9924a4..e7e97854f 100644 --- a/kmobile/kmobileitem.cpp +++ b/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" diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 0080b57a0..f90c9adf2 100644 --- a/kmobile/kmobileview.cpp +++ b/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) { diff --git a/kmobile/kmobileview.h b/kmobile/kmobileview.h index 39e2a53e0..4672349fd 100644 --- a/kmobile/kmobileview.h +++ b/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: diff --git a/kmobile/kioslave/Makefile.am b/kmobile/tdeioslave/Makefile.am index 6f9d24201..df5288ec7 100644 --- a/kmobile/kioslave/Makefile.am +++ b/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 diff --git a/kmobile/kioslave/cellphone.protocol b/kmobile/tdeioslave/cellphone.protocol index 5f37df784..c47e25472 100644 --- a/kmobile/kioslave/cellphone.protocol +++ b/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 diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/tdeioslave/kio_mobile.cpp index e8cff4fa1..e8cff4fa1 100644 --- a/kmobile/kioslave/kio_mobile.cpp +++ b/kmobile/tdeioslave/kio_mobile.cpp diff --git a/kmobile/kioslave/kio_mobile.h b/kmobile/tdeioslave/kio_mobile.h index f534514f3..05a30a22f 100644 --- a/kmobile/kioslave/kio_mobile.h +++ b/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> diff --git a/kmobile/kioslave/mimetypes/Makefile.am b/kmobile/tdeioslave/mimetypes/Makefile.am index 5105c51bf..5105c51bf 100644 --- a/kmobile/kioslave/mimetypes/Makefile.am +++ b/kmobile/tdeioslave/mimetypes/Makefile.am diff --git a/kmobile/kioslave/mimetypes/mobile_addressbook.desktop b/kmobile/tdeioslave/mimetypes/mobile_addressbook.desktop index cf56e0247..cf56e0247 100644 --- a/kmobile/kioslave/mimetypes/mobile_addressbook.desktop +++ b/kmobile/tdeioslave/mimetypes/mobile_addressbook.desktop diff --git a/kmobile/kioslave/mimetypes/mobile_calendar.desktop b/kmobile/tdeioslave/mimetypes/mobile_calendar.desktop index 09d133ab5..09d133ab5 100644 --- a/kmobile/kioslave/mimetypes/mobile_calendar.desktop +++ b/kmobile/tdeioslave/mimetypes/mobile_calendar.desktop diff --git a/kmobile/kioslave/mimetypes/mobile_device.desktop b/kmobile/tdeioslave/mimetypes/mobile_device.desktop index 2f59d2dec..2f59d2dec 100644 --- a/kmobile/kioslave/mimetypes/mobile_device.desktop +++ b/kmobile/tdeioslave/mimetypes/mobile_device.desktop diff --git a/kmobile/kioslave/mimetypes/mobile_notes.desktop b/kmobile/tdeioslave/mimetypes/mobile_notes.desktop index 7878c13d9..7878c13d9 100644 --- a/kmobile/kioslave/mimetypes/mobile_notes.desktop +++ b/kmobile/tdeioslave/mimetypes/mobile_notes.desktop diff --git a/kmobile/kioslave/mobile.protocol b/kmobile/tdeioslave/mobile.protocol index 7b8385f86..e87d7154b 100644 --- a/kmobile/kioslave/mobile.protocol +++ b/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 diff --git a/kmobile/kioslave/organizer.protocol b/kmobile/tdeioslave/organizer.protocol index b211a74f9..3b83e002f 100644 --- a/kmobile/kioslave/organizer.protocol +++ b/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 diff --git a/kmobile/kioslave/pda.protocol b/kmobile/tdeioslave/pda.protocol index cbab2e03a..8113b5bfa 100644 --- a/kmobile/kioslave/pda.protocol +++ b/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 diff --git a/kmobile/kioslave/phonecamera.protocol b/kmobile/tdeioslave/phonecamera.protocol index 7a0b341f2..296ebccb5 100644 --- a/kmobile/kioslave/phonecamera.protocol +++ b/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 diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index b66b1a6f7..ae4ab2cbe 100644 --- a/knode/articlewidget.cpp +++ b/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> diff --git a/knode/knapplication.cpp b/knode/knapplication.cpp index d6bf44c9b..b607da538 100644 --- a/knode/knapplication.cpp +++ b/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" diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp index bf05ec11b..a45cf7735 100644 --- a/knode/knarticlewindow.cpp +++ b/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> diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index fa92c045e..6a31f805c 100644 --- a/knode/kncomposer.cpp +++ b/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> diff --git a/knode/knconfig.h b/knode/knconfig.h index 17ee8a525..c86050494 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tqpixmap.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmime_util.h> diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 9e80e1b83..8a1c3fbcb 100644 --- a/knode/knconfigwidgets.cpp +++ b/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> diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index ba95e9a30..619833d77 100644 --- a/knode/knconvert.cpp +++ b/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> diff --git a/knode/knewsservice.protocol b/knode/knewsservice.protocol index 6adc5e958..28a177fe4 100644 --- a/knode/knewsservice.protocol +++ b/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 diff --git a/knode/knglobals.cpp b/knode/knglobals.cpp index bfed08e1f..48a257168 100644 --- a/knode/knglobals.cpp +++ b/knode/knglobals.cpp @@ -17,7 +17,7 @@ #include "knglobals.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kstaticdeleter.h> #include "knconfigmanager.h" diff --git a/knode/knglobals.h b/knode/knglobals.h index 2b535ac8b..a2bde078f 100644 --- a/knode/knglobals.h +++ b/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> diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index b79b3199d..0d626983b 100644 --- a/knode/knjobdata.cpp +++ b/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> diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index f2728f8db..30edb5edb 100644 --- a/knode/knmainwidget.cpp +++ b/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> diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index b81ccfa9f..59cc0455d 100644 --- a/knode/knnetaccess.cpp +++ b/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> diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp index 307c72fff..6af554ceb 100644 --- a/knode/knserverinfo.cpp +++ b/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> diff --git a/knode/utilities.cpp b/knode/utilities.cpp index 31d36369c..2274d2eff 100644 --- a/knode/utilities.cpp +++ b/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" diff --git a/knotes/TODO b/knotes/TODO index 202f563d7..70e3eb6a5 100644 --- a/knotes/TODO +++ b/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 diff --git a/knotes/knote.cpp b/knotes/knote.cpp index a90d891b9..dd3940c80 100644 --- a/knotes/knote.cpp +++ b/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> diff --git a/knotes/knote.h b/knotes/knote.h index 880a85a4b..cc12dcdc2 100644 --- a/knotes/knote.h +++ b/knotes/knote.h @@ -27,7 +27,7 @@ #include <tqpoint.h> #include <tqcolor.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kxmlguiclient.h> class TQLabel; diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp index f35ad9e96..6b01b7b86 100644 --- a/knotes/knoteconfigdlg.cpp +++ b/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> diff --git a/knotes/knoteconfigdlg.h b/knotes/knoteconfigdlg.h index 5d7118ca7..a72859a1f 100644 --- a/knotes/knoteconfigdlg.h +++ b/knotes/knoteconfigdlg.h @@ -21,7 +21,7 @@ #ifndef KNOTECONFIGDLG_H #define KNOTECONFIGDLG_H -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> class TQString; class KNoteConfig; diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp index 6c59f13ea..fc8c71b4a 100644 --- a/knotes/knoteslegacy.cpp +++ b/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> diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index 4f513757e..288b9ac54 100644 --- a/kode/kodemain.cpp +++ b/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 ); diff --git a/kode/kwsdl/converter.cpp b/kode/kwsdl/converter.cpp index 253b6bd21..f5d904781 100644 --- a/kode/kwsdl/converter.cpp +++ b/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" ); diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp index 4512edbeb..95ea292e2 100644 --- a/kode/kwsdl/kung/binaryinputfield.cpp +++ b/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> diff --git a/kode/kwsdl/kung/transport.h b/kode/kwsdl/kung/transport.h index 71c4fa9de..463555256 100644 --- a/kode/kwsdl/kung/transport.h +++ b/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 { diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp index d12d4eee3..945f7261f 100644 --- a/kode/kwsdl/schema/fileprovider.cpp +++ b/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" diff --git a/kode/kwsdl/tests/google/transport.h b/kode/kwsdl/tests/google/transport.h index 0b5b49fa4..a0873e26c 100644 --- a/kode/kwsdl/tests/google/transport.h +++ b/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 { diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp index 3d4983f93..b297cc789 100644 --- a/kode/kxml_compiler/creator.cpp +++ b/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> diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h index 2103f928e..33ab410c5 100644 --- a/kode/kxml_compiler/creator.h +++ b/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> diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index bb4b24252..4f3fe3ed6 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/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> diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp index 9a123581b..9881aff5c 100644 --- a/kode/kxml_compiler/parser.cpp +++ b/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> diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h index 6efd6f746..ce5d65e26 100644 --- a/kode/kxml_compiler/parser.h +++ b/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> diff --git a/konsolekalendar/konsolekalendarvariables.cpp b/konsolekalendar/konsolekalendarvariables.cpp index 122b85252..e5541e00d 100644 --- a/konsolekalendar/konsolekalendarvariables.cpp +++ b/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> diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index decdbb12c..2904215f9 100644 --- a/konsolekalendar/main.cpp +++ b/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> diff --git a/konsolekalendar/stdcalendar.cpp b/konsolekalendar/stdcalendar.cpp index c353f28f8..3c735df73 100644 --- a/konsolekalendar/stdcalendar.cpp +++ b/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> diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index 72141a6f1..eb8906d26 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/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> diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 89e572bf8..a67c0a594 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/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> diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index 203055d5a..818f3c056 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/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> diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 6e0efd0fc..958959667 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/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> diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 52bb8b6e4..f0f7d7460 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/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> diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index 193958b89..a15d1118c 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/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> diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index d880f153b..43f18f22a 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/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> diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index de5902b06..27dac829f 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/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> diff --git a/kontact/src/kontactconfig.desktop b/kontact/src/kontactconfig.desktop index 0c094d502..532e692c8 100644 --- a/kontact/src/kontactconfig.desktop +++ b/kontact/src/kontactconfig.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kontactconfig +Exec=tdecmshell kontactconfig Icon=kontact Type=Service ServiceTypes=TDECModule diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp index d3642b6a5..e914fe07d 100644 --- a/kontact/src/mainwindow.cpp +++ b/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> diff --git a/kontact/src/prefs.kcfgc b/kontact/src/prefs.kcfgc index 31e6e4338..03eb7af75 100644 --- a/kontact/src/prefs.kcfgc +++ b/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 diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp index 89e241be9..e959ad865 100644 --- a/kontact/src/profiledialog.cpp +++ b/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> diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp index 295f4615d..3b0a568c6 100644 --- a/kontact/src/profilemanager.cpp +++ b/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> diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am index a86671261..59daa828e 100644 --- a/korganizer/Makefile.am +++ b/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 diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 68fd6b4d1..e4c906fad 100644 --- a/korganizer/actionmanager.cpp +++ b/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 * ) ) ); diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp index 6609b183a..76985d1ac 100644 --- a/korganizer/archivedialog.cpp +++ b/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> diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 77f8f80b3..3ef70ea7d 100644 --- a/korganizer/calendarview.cpp +++ b/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 ); diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 3df3046e8..469eddaf8 100644 --- a/korganizer/calendarview.h +++ b/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> diff --git a/korganizer/docprefs.cpp b/korganizer/docprefs.cpp index 8981255f2..1ac91835f 100644 --- a/korganizer/docprefs.cpp +++ b/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" ) ); } } diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index d4afada2f..739dc9050 100644 --- a/korganizer/eventarchiver.cpp +++ b/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> diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp index c5868f146..0cece6631 100644 --- a/korganizer/exportwebdialog.cpp +++ b/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> diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index ee0c38a05..5d479e889 100644 --- a/korganizer/freebusymanager.cpp +++ b/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> diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index c156b7a57..a1828671f 100644 --- a/korganizer/koagendaview.cpp +++ b/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> diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp index eed2cd2cf..49e2ec3aa 100644 --- a/korganizer/koapp.cpp +++ b/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> diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp index 0096b1496..ace67c185 100644 --- a/korganizer/kocore.cpp +++ b/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> diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 24cf57306..74e908889 100644 --- a/korganizer/koeditorattachments.cpp +++ b/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> diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index fb8b4bc57..0ab854a96 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/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> diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index dc54a5268..67c0654b4 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/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> diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 54822c83e..22667c46e 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/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> diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index 9f9b816e9..91fb0d4db 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -25,7 +25,7 @@ #define KOEVENTVIEWER_H #include <tdepimmacros.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqtextbrowser.h> namespace KCal { diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index a5f5a60f8..b3fd073b6 100644 --- a/korganizer/koglobals.cpp +++ b/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> diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h index a9372b044..ce253dfcf 100644 --- a/korganizer/kogroupware.h +++ b/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> diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index ea3f5e7ea..74ad2855c 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/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> diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index fb52f4b6a..a741d7f2b 100644 --- a/korganizer/komonthview.cpp +++ b/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> diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index ead4f7e8d..a8f6acc3e 100644 --- a/korganizer/koprefs.cpp +++ b/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> diff --git a/korganizer/koprefs_base.kcfgc b/korganizer/koprefs_base.kcfgc index c5f267599..8d59a50ba 100644 --- a/korganizer/koprefs_base.kcfgc +++ b/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 diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index fbf4cf95d..e85f630e9 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/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> diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index d5d8dddb9..051fe446e 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/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> diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index f3f6493dc..8f21106a3 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/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" diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp index f2ec01f2c..89014c46b 100644 --- a/korganizer/korganizer.cpp +++ b/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> diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 184e142cf..22a6e3ec3 100644 --- a/korganizer/korganizer_part.cpp +++ b/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> diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 9a308fcfd..e69d61adb 100644 --- a/korganizer/koviewmanager.cpp +++ b/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" diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp index 6b8746db5..3fbf84104 100644 --- a/korganizer/plugins/datenums/configdialog.cpp +++ b/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> diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp index 9ef6068b9..468095a9b 100644 --- a/korganizer/plugins/datenums/datenums.cpp +++ b/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" diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index ca3c4c497..e84ae08ba 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/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> diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index fe01324ac..91e4670e5 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/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> diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index b580c2feb..668fad5ab 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/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> diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index c65691d3e..065188537 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/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> diff --git a/korganizer/plugins/printing/journal/journalprint.cpp b/korganizer/plugins/printing/journal/journalprint.cpp index edf1fc939..5ff71e660 100644 --- a/korganizer/plugins/printing/journal/journalprint.cpp +++ b/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> diff --git a/korganizer/plugins/printing/list/listprint.cpp b/korganizer/plugins/printing/list/listprint.cpp index 9607de8e2..e15939a11 100644 --- a/korganizer/plugins/printing/list/listprint.cpp +++ b/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> diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp index 4f58eed0a..576227162 100644 --- a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp +++ b/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> diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp index f22e1b17a..bf039d2d5 100644 --- a/korganizer/plugins/printing/year/yearprint.cpp +++ b/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> diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index b65efde63..5847d0c25 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/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> diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index da7d5f486..f7e35effb 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/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> diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 4c43444fb..8445edf46 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/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" diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index bd910677b..d43cd8e60 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/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> diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp index dd42e1632..2753475f9 100644 --- a/korganizer/previewdialog.cpp +++ b/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> diff --git a/korganizer/printing/CMakeLists.txt b/korganizer/printing/CMakeLists.txt index 67ff04850..bb4fce149 100644 --- a/korganizer/printing/CMakeLists.txt +++ b/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 diff --git a/korganizer/printing/Makefile.am b/korganizer/printing/Makefile.am index 10170ca74..45fd37be2 100644 --- a/korganizer/printing/Makefile.am +++ b/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 diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index e67015545..8ed37660c 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/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" diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 50b533bf6..f754e52df 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/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> diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweetdeconfig_base.ui index 0be844abb..0be844abb 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweetdeconfig_base.ui diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index a325add5f..c92915715 100644 --- a/korganizer/resourceview.cpp +++ b/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> diff --git a/korganizer/stdcalendar.cpp b/korganizer/stdcalendar.cpp index 0d2748699..a7fcd5442 100644 --- a/korganizer/stdcalendar.cpp +++ b/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> diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp index 6e4819a8a..09edb36c3 100644 --- a/korganizer/urihandler.cpp +++ b/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> diff --git a/korn/CMakeLists.txt b/korn/CMakeLists.txt index 12d4e3730..f3dd942bf 100644 --- a/korn/CMakeLists.txt +++ b/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} ) diff --git a/korn/Makefile.am b/korn/Makefile.am index 39cc8ae5a..91bde6721 100644 --- a/korn/Makefile.am +++ b/korn/Makefile.am @@ -121,4 +121,4 @@ KDE_ICON = korn xdg_apps_DATA = KOrn.desktop -SUBDIRS = kconf_update +SUBDIRS = tdeconf_update diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp index 477bab2ae..a31dd4c10 100644 --- a/korn/accountmanager.cpp +++ b/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> diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp index 5e17c9479..d881b6c8f 100644 --- a/korn/boxcontainer.cpp +++ b/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> diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index 3fea65f3e..50daf1d0c 100644 --- a/korn/boxcontaineritem.cpp +++ b/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> diff --git a/korn/dcop_proto.cpp b/korn/dcop_proto.cpp index 41ab8c9d1..d4a8bd3b0 100644 --- a/korn/dcop_proto.cpp +++ b/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> diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp index cdeccd6b1..660bc8497 100644 --- a/korn/dcopdrop.cpp +++ b/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> diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp index fac1cc479..474ffb289 100644 --- a/korn/dockeditem.cpp +++ b/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> diff --git a/korn/imap_proto.h b/korn/imap_proto.h index 3310da1b8..f34f32a83 100644 --- a/korn/imap_proto.h +++ b/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 diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp index 83b402031..440b2c832 100644 --- a/korn/keditlistboxman.cpp +++ b/korn/keditlistboxman.cpp @@ -18,7 +18,7 @@ #include "keditlistboxman.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqmap.h> diff --git a/korn/kio.cpp b/korn/kio.cpp index 63a9dc683..f2ff37fa5 100644 --- a/korn/kio.cpp +++ b/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. */ diff --git a/korn/kio_count.cpp b/korn/kio_count.cpp index bea6bf196..1531a9b9e 100644 --- a/korn/kio_count.cpp +++ b/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 ); diff --git a/korn/kio_count.h b/korn/kio_count.h index 9b44e1ca9..e575864e4 100644 --- a/korn/kio_count.h +++ b/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; diff --git a/korn/kio_delete.cpp b/korn/kio_delete.cpp index 17eec2f53..a73b0dd40 100644 --- a/korn/kio_delete.cpp +++ b/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> diff --git a/korn/kio_proto.cpp b/korn/kio_proto.cpp index c6d2184df..e63a71666 100644 --- a/korn/kio_proto.cpp +++ b/korn/kio_proto.cpp @@ -19,7 +19,7 @@ #include "kio_proto.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqmap.h> diff --git a/korn/kio_proto.h b/korn/kio_proto.h index e97b01128..510e97d37 100644 --- a/korn/kio_proto.h +++ b/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" diff --git a/korn/kio_read.cpp b/korn/kio_read.cpp index 0e77e1a71..f98669d8d 100644 --- a/korn/kio_read.cpp +++ b/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> diff --git a/korn/kio_single_subject.cpp b/korn/kio_single_subject.cpp index 45ca047fc..0c20b1ab4 100644 --- a/korn/kio_single_subject.cpp +++ b/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> diff --git a/korn/kio_subjects.cpp b/korn/kio_subjects.cpp index 3fda7e4c8..f40a86f64 100644 --- a/korn/kio_subjects.cpp +++ b/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> diff --git a/korn/kmail_proto.cpp b/korn/kmail_proto.cpp index 8f740c80a..7be0555d4 100644 --- a/korn/kmail_proto.cpp +++ b/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> diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp index a68ccefb6..df6a0e504 100644 --- a/korn/kornaccountcfgimpl.cpp +++ b/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> diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp index fc699c10f..f7904b590 100644 --- a/korn/kornboxcfgimpl.cpp +++ b/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> diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp index b944087f1..1d3ba7360 100644 --- a/korn/korncfgimpl.cpp +++ b/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> diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index 2e0cc091d..5d075b65f 100644 --- a/korn/kornshell.cpp +++ b/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> diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp index 20b6dfe9d..2224c74e9 100644 --- a/korn/maildrop.cpp +++ b/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" diff --git a/korn/password.cpp b/korn/password.cpp index 50f31e8d9..f93183193 100644 --- a/korn/password.cpp +++ b/korn/password.cpp @@ -19,7 +19,7 @@ #include "password.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tdewallet.h> diff --git a/korn/polldrop.cpp b/korn/polldrop.cpp index bc4422caf..54d4eb628 100644 --- a/korn/polldrop.cpp +++ b/korn/polldrop.cpp @@ -6,7 +6,7 @@ */ -#include<kconfigbase.h> +#include<tdeconfigbase.h> #include"utils.h" #include"polldrop.h" diff --git a/korn/systemtray.cpp b/korn/systemtray.cpp index e7ca45f73..a0bd191d5 100644 --- a/korn/systemtray.cpp +++ b/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> diff --git a/korn/kconf_update/CMakeLists.txt b/korn/tdeconf_update/CMakeLists.txt index 88c06088c..22d4b6a85 100644 --- a/korn/kconf_update/CMakeLists.txt +++ b/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 ) diff --git a/korn/kconf_update/Makefile.am b/korn/tdeconf_update/Makefile.am index 74991a930..214f0c81b 100644 --- a/korn/kconf_update/Makefile.am +++ b/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 diff --git a/korn/kconf_update/korn-3-4-config_change.cpp b/korn/tdeconf_update/korn-3-4-config_change.cpp index 7eff3ad38..7eff3ad38 100644 --- a/korn/kconf_update/korn-3-4-config_change.cpp +++ b/korn/tdeconf_update/korn-3-4-config_change.cpp diff --git a/korn/kconf_update/korn-3-4-config_change.upd b/korn/tdeconf_update/korn-3-4-config_change.upd index 530304fad..530304fad 100644 --- a/korn/kconf_update/korn-3-4-config_change.upd +++ b/korn/tdeconf_update/korn-3-4-config_change.upd diff --git a/korn/kconf_update/korn-3-5-metadata-update.pl b/korn/tdeconf_update/korn-3-5-metadata-update.pl index 95723c4ee..95723c4ee 100644 --- a/korn/kconf_update/korn-3-5-metadata-update.pl +++ b/korn/tdeconf_update/korn-3-5-metadata-update.pl diff --git a/korn/kconf_update/korn-3-5-ssl-update.pl b/korn/tdeconf_update/korn-3-5-ssl-update.pl index b44ce10ff..b44ce10ff 100644 --- a/korn/kconf_update/korn-3-5-ssl-update.pl +++ b/korn/tdeconf_update/korn-3-5-ssl-update.pl diff --git a/korn/kconf_update/korn-3-5-update.upd b/korn/tdeconf_update/korn-3-5-update.upd index d954d7826..d954d7826 100644 --- a/korn/kconf_update/korn-3-5-update.upd +++ b/korn/tdeconf_update/korn-3-5-update.upd diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index 564e3b712..222c3f1b3 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/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> diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp index 837f01c3b..8324b5de4 100644 --- a/ktnef/gui/ktnefmain.cpp +++ b/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> diff --git a/ktnef/lib/CMakeLists.txt b/ktnef/lib/CMakeLists.txt index 068fffff4..8694d25f3 100644 --- a/ktnef/lib/CMakeLists.txt +++ b/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} ) diff --git a/libemailfunctions/networkstatus.cpp b/libemailfunctions/networkstatus.cpp index b07c29737..eb99bcff5 100644 --- a/libemailfunctions/networkstatus.cpp +++ b/libemailfunctions/networkstatus.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kstaticdeleter.h> diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp index 20035bc58..9b4926769 100644 --- a/libkcal/attachmenthandler.cpp +++ b/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> diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp index a546de191..2467e83d0 100644 --- a/libkcal/convertqtopia.cpp +++ b/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> diff --git a/libkcal/freebusyurlstore.cpp b/libkcal/freebusyurlstore.cpp index 62cf26e6e..a4a42b5ca 100644 --- a/libkcal/freebusyurlstore.cpp +++ b/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; diff --git a/libkcal/htmlexportsettings.kcfgc b/libkcal/htmlexportsettings.kcfgc index 62c526154..db2360aac 100644 --- a/libkcal/htmlexportsettings.kcfgc +++ b/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 diff --git a/libkcal/resourcecached.h b/libkcal/resourcecached.h index 5f56e3907..94c00ae49 100644 --- a/libkcal/resourcecached.h +++ b/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> diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp index 36a0932b0..76f12ed13 100644 --- a/libkcal/resourcecalendar.cpp +++ b/libkcal/resourcecalendar.cpp @@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index 5202563b6..c84554833 100644 --- a/libkcal/resourcecalendar.h +++ b/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" diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index 47b19d7c4..5ca0518ef 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/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" diff --git a/libkcal/tests/runtestcase.pl b/libkcal/tests/runtestcase.pl index 4cad27cc6..ce8254792 100755 --- a/libkcal/tests/runtestcase.pl +++ b/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; diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp index fbd42da68..31f8d9b10 100644 --- a/libkcal/tests/testresource.cpp +++ b/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> diff --git a/libkpgp/Makefile.am b/libkpgp/Makefile.am index e8b89f728..d17105bba 100644 --- a/libkpgp/Makefile.am +++ b/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 diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp index 18060ec6d..33aa89954 100644 --- a/libkpgp/kpgp.cpp +++ b/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" diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 164225d19..f468cb926 100644 --- a/libkpgp/kpgpui.cpp +++ b/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> diff --git a/libkpimexchange/configure.in.in b/libkpimexchange/configure.in.in index 139073a4c..a9f0c80c3 100644 --- a/libkpimexchange/configure.in.in +++ b/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; ], diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp index 7b67a5529..dc7d7daa9 100644 --- a/libkpimexchange/core/exchangeaccount.cpp +++ b/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" diff --git a/libkpimexchange/core/exchangeaccount.h b/libkpimexchange/core/exchangeaccount.h index 0d8bfcdf8..e55b22434 100644 --- a/libkpimexchange/core/exchangeaccount.h +++ b/libkpimexchange/core/exchangeaccount.h @@ -28,7 +28,7 @@ #include <tdepimmacros.h> #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> namespace KPIM { diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp index eadcc2bed..c316a25a4 100644 --- a/libkpimexchange/core/exchangeclient.cpp +++ b/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" diff --git a/libkpimexchange/core/exchangedelete.cpp b/libkpimexchange/core/exchangedelete.cpp index b23e9527e..094b3b5cc 100644 --- a/libkpimexchange/core/exchangedelete.cpp +++ b/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" diff --git a/libkpimexchange/core/exchangedelete.h b/libkpimexchange/core/exchangedelete.h index 151657e57..03b066903 100644 --- a/libkpimexchange/core/exchangedelete.h +++ b/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> diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index 75b5f100f..4fafacf9b 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/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> diff --git a/libkpimexchange/core/exchangedownload.h b/libkpimexchange/core/exchangedownload.h index 33d135603..931d53bfe 100644 --- a/libkpimexchange/core/exchangedownload.h +++ b/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> diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp index 531a2417e..df52fdabd 100644 --- a/libkpimexchange/core/exchangemonitor.cpp +++ b/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> diff --git a/libkpimexchange/core/exchangemonitor.h b/libkpimexchange/core/exchangemonitor.h index 15b4fa992..3ba96a39b 100644 --- a/libkpimexchange/core/exchangemonitor.h +++ b/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> diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp index bee71b572..2b6e0286f 100644 --- a/libkpimexchange/core/exchangeprogress.cpp +++ b/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> diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp index e553b40c3..f134868fd 100644 --- a/libkpimexchange/core/exchangeupload.cpp +++ b/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> diff --git a/libkpimexchange/core/exchangeupload.h b/libkpimexchange/core/exchangeupload.h index e592c00f4..85753b2ce 100644 --- a/libkpimexchange/core/exchangeupload.h +++ b/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> diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp index c467599a5..9b4c9df67 100644 --- a/libkpimidentities/identity.cpp +++ b/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> diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp index f6bc5def4..d9d626156 100644 --- a/libkpimidentities/identitymanager.cpp +++ b/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 ); diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt index 84f57a93f..2c79e018b 100644 --- a/libtdepim/CMakeLists.txt +++ b/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 diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am index 24942c728..7b690c8b2 100644 --- a/libtdepim/Makefile.am +++ b/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 \ diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index 559f01713..ef754e819 100644 --- a/libtdepim/addresseeview.cpp +++ b/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> diff --git a/libtdepim/cfgc/README b/libtdepim/cfgc/README index 720ea2126..05dcdf354 100644 --- a/libtdepim/cfgc/README +++ b/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 diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp index 595d195b8..8f5d08e8d 100644 --- a/libtdepim/cfgc/autoexample.cpp +++ b/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> diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp index 28c093784..d3f068799 100644 --- a/libtdepim/cfgc/example.cpp +++ b/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> diff --git a/libtdepim/cfgc/exampleprefs_base.kcfgc b/libtdepim/cfgc/exampleprefs_base.kcfgc index 36e5ed4e6..6cc9a9231 100644 --- a/libtdepim/cfgc/exampleprefs_base.kcfgc +++ b/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 diff --git a/libtdepim/completionordereditor.h b/libtdepim/completionordereditor.h index a755d1734..e13ce3130 100644 --- a/libtdepim/completionordereditor.h +++ b/libtdepim/completionordereditor.h @@ -32,7 +32,7 @@ #define COMPLETIONORDEREDITOR_H #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> class KPushButton; class KListView; diff --git a/libtdepim/csshelper.cpp b/libtdepim/csshelper.cpp index 3c0ba38d0..d2180e1a2 100644 --- a/libtdepim/csshelper.cpp +++ b/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> diff --git a/libtdepim/groupwarejob.cpp b/libtdepim/groupwarejob.cpp index 22c9b7aa4..bbe443fc0 100644 --- a/libtdepim/groupwarejob.cpp +++ b/libtdepim/groupwarejob.cpp @@ -21,7 +21,7 @@ #include "groupwarejob.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> using namespace TDEIO; diff --git a/libtdepim/groupwarejob.h b/libtdepim/groupwarejob.h index 2fc2069b0..17561b36f 100644 --- a/libtdepim/groupwarejob.h +++ b/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 { diff --git a/libtdepim/kaccount.cpp b/libtdepim/kaccount.cpp index f8fd61cf4..86cf4cfca 100644 --- a/libtdepim/kaccount.cpp +++ b/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 ) diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index bb870b11f..72613f158 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/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" diff --git a/libtdepim/kfoldertree.cpp b/libtdepim/kfoldertree.cpp index 5cad23656..58961ddc6 100644 --- a/libtdepim/kfoldertree.cpp +++ b/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> diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp index e07ef00ac..df1181ed1 100644 --- a/libtdepim/kimportdialog.cpp +++ b/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" diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp index 945c22311..a2f5fd003 100644 --- a/libtdepim/komposer/core/core.cpp +++ b/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> diff --git a/libtdepim/komposer/core/komposerconfig.desktop b/libtdepim/komposer/core/komposerconfig.desktop index 5ceb12582..ab5239b08 100644 --- a/libtdepim/komposer/core/komposerconfig.desktop +++ b/libtdepim/komposer/core/komposerconfig.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell komposerconfig +Exec=tdecmshell komposerconfig Icon=komposer Type=Application Terminal=false diff --git a/libtdepim/komposer/core/settings.kcfgc b/libtdepim/komposer/core/settings.kcfgc index fc98478a9..a4c881006 100644 --- a/libtdepim/komposer/core/settings.kcfgc +++ b/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 diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp index 105650eb0..426e4c01b 100644 --- a/libtdepim/komposer/plugins/default/defaulteditor.cpp +++ b/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> diff --git a/libtdepim/kpimprefs.cpp b/libtdepim/kpimprefs.cpp index 9ae04cfaf..02e397361 100644 --- a/libtdepim/kpimprefs.cpp +++ b/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> diff --git a/libtdepim/kpimprefs.h b/libtdepim/kpimprefs.h index 051b0f2fb..dd180c970 100644 --- a/libtdepim/kpimprefs.h +++ b/libtdepim/kpimprefs.h @@ -23,7 +23,7 @@ #include <tqstringlist.h> -#include <kconfigskeleton.h> +#include <tdeconfigskeleton.h> #include <tdepimmacros.h> class TQString; diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index 577692506..230962cb2 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/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" diff --git a/libtdepim/kprefsdialog.h b/libtdepim/kprefsdialog.h index 6774d96d7..3e331b180 100644 --- a/libtdepim/kprefsdialog.h +++ b/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> diff --git a/libtdepim/kresourceprefs.h b/libtdepim/kresourceprefs.h index 968d86a9e..1954f19c1 100644 --- a/libtdepim/kresourceprefs.h +++ b/libtdepim/kresourceprefs.h @@ -22,7 +22,7 @@ #ifndef KRESOURCEPREFS_H #define KRESOURCEPREFS_H -#include <kconfigskeleton.h> +#include <tdeconfigskeleton.h> #include <tdepimmacros.h> class TQString; diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index 9f1a6fd8e..32202b3da 100644 --- a/libtdepim/ldapclient.cpp +++ b/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> diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h index 502937299..789b46054 100644 --- a/libtdepim/ldapclient.h +++ b/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> diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index fe67137b1..586e9011d 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/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> diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index bbd7d29a9..eb4660a3b 100644 --- a/libtdepim/recentaddresses.cpp +++ b/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> diff --git a/libtdepim/kconfigpropagator.cpp b/libtdepim/tdeconfigpropagator.cpp index a231f9638..f6f482402 100644 --- a/libtdepim/kconfigpropagator.cpp +++ b/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> diff --git a/libtdepim/kconfigpropagator.h b/libtdepim/tdeconfigpropagator.h index 92f9565f2..92f9565f2 100644 --- a/libtdepim/kconfigpropagator.h +++ b/libtdepim/tdeconfigpropagator.h diff --git a/libtdepim/kconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp index c2baafcc7..026c85991 100644 --- a/libtdepim/kconfigwizard.cpp +++ b/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" diff --git a/libtdepim/kconfigwizard.h b/libtdepim/tdeconfigwizard.h index a06849ecc..7eaaeda95 100644 --- a/libtdepim/kconfigwizard.h +++ b/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> diff --git a/libtdepim/kfileio.cpp b/libtdepim/tdefileio.cpp index fa963e167..ad899351f 100644 --- a/libtdepim/kfileio.cpp +++ b/libtdepim/tdefileio.cpp @@ -1,4 +1,4 @@ -// kfileio.cpp +// tdefileio.cpp // Author: Stefan Taferner <taferner@kde.org> // License: GPL diff --git a/libtdepim/kfileio.h b/libtdepim/tdefileio.h index 15db09338..e90451315 100644 --- a/libtdepim/kfileio.h +++ b/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*/ diff --git a/libtdepim/tdepartsdesignerplugin/CMakeLists.txt b/libtdepim/tdepartsdesignerplugin/CMakeLists.txt index 01bba1d8c..043d4526a 100644 --- a/libtdepim/tdepartsdesignerplugin/CMakeLists.txt +++ b/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 ) diff --git a/libtdepim/tests/myconfig.kcfgc b/libtdepim/tests/myconfig.kcfgc index 35e26c996..451a9ec13 100644 --- a/libtdepim/tests/myconfig.kcfgc +++ b/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 diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp index 895dc5371..75c4d5574 100644 --- a/libtdepim/tests/testdistrlist.cpp +++ b/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> diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp index 1e404165e..9858a0920 100644 --- a/libtdepim/tests/testwizard.cpp +++ b/libtdepim/tests/testwizard.cpp @@ -21,7 +21,7 @@ #include "myconfig.h" -#include <kconfigwizard.h> +#include <tdeconfigwizard.h> #include <kaboutdata.h> #include <kapplication.h> diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 1cb2a8f59..551f61171 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/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> diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index ce6d38a36..853f6cd40 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/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> diff --git a/kfile-plugins/CMakeLists.txt b/tdefile-plugins/CMakeLists.txt index 3f9c0f476..3f9c0f476 100644 --- a/kfile-plugins/CMakeLists.txt +++ b/tdefile-plugins/CMakeLists.txt diff --git a/kfile-plugins/Makefile.am b/tdefile-plugins/Makefile.am index 7ebdda704..7ebdda704 100644 --- a/kfile-plugins/Makefile.am +++ b/tdefile-plugins/Makefile.am diff --git a/kfile-plugins/RETURNED_ITEMS b/tdefile-plugins/RETURNED_ITEMS index 9985e36db..9985e36db 100644 --- a/kfile-plugins/RETURNED_ITEMS +++ b/tdefile-plugins/RETURNED_ITEMS diff --git a/kfile-plugins/ics/CMakeLists.txt b/tdefile-plugins/ics/CMakeLists.txt index b4d2fca8f..66c100712 100644 --- a/kfile-plugins/ics/CMakeLists.txt +++ b/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} ) diff --git a/tdefile-plugins/ics/Makefile.am b/tdefile-plugins/ics/Makefile.am new file mode 100644 index 000000000..96a1a7f74 --- /dev/null +++ b/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) diff --git a/kfile-plugins/ics/kfile_ics.cpp b/tdefile-plugins/ics/tdefile_ics.cpp index 0d85344e7..11a5384fb 100644 --- a/kfile-plugins/ics/kfile_ics.cpp +++ b/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" diff --git a/kfile-plugins/ics/kfile_ics.desktop b/tdefile-plugins/ics/tdefile_ics.desktop index a085d707f..41d745aa4 100644 --- a/kfile-plugins/ics/kfile_ics.desktop +++ b/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 diff --git a/kfile-plugins/ics/kfile_ics.h b/tdefile-plugins/ics/tdefile_ics.h index 276820349..9f4a897eb 100644 --- a/kfile-plugins/ics/kfile_ics.h +++ b/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; diff --git a/tdefile-plugins/palm-databases/Makefile.am b/tdefile-plugins/palm-databases/Makefile.am new file mode 100644 index 000000000..552a2a4fe --- /dev/null +++ b/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) diff --git a/kfile-plugins/palm-databases/kfile_palm.cpp b/tdefile-plugins/palm-databases/tdefile_palm.cpp index c38650766..3d4e20e93 100644 --- a/kfile-plugins/palm-databases/kfile_palm.cpp +++ b/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" diff --git a/kfile-plugins/palm-databases/kfile_palm.desktop b/tdefile-plugins/palm-databases/tdefile_palm.desktop index 5669357d5..716944e1e 100644 --- a/kfile-plugins/palm-databases/kfile_palm.desktop +++ b/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 diff --git a/kfile-plugins/palm-databases/kfile_palm.h b/tdefile-plugins/palm-databases/tdefile_palm.h index ef91a3f0c..d566d5fcf 100644 --- a/kfile-plugins/palm-databases/kfile_palm.h +++ b/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; diff --git a/tdefile-plugins/rfc822/Makefile.am b/tdefile-plugins/rfc822/Makefile.am new file mode 100644 index 000000000..f7cf89695 --- /dev/null +++ b/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) diff --git a/kfile-plugins/rfc822/RETURNED_ITEMS b/tdefile-plugins/rfc822/RETURNED_ITEMS index be8c9b7e7..be8c9b7e7 100644 --- a/kfile-plugins/rfc822/RETURNED_ITEMS +++ b/tdefile-plugins/rfc822/RETURNED_ITEMS diff --git a/kfile-plugins/rfc822/kfile_rfc822.cpp b/tdefile-plugins/rfc822/tdefile_rfc822.cpp index 6d2488841..261f0835a 100644 --- a/kfile-plugins/rfc822/kfile_rfc822.cpp +++ b/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" diff --git a/kfile-plugins/rfc822/kfile_rfc822.desktop b/tdefile-plugins/rfc822/tdefile_rfc822.desktop index 7717f3482..d030e1e57 100644 --- a/kfile-plugins/rfc822/kfile_rfc822.desktop +++ b/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 diff --git a/kfile-plugins/rfc822/kfile_rfc822.h b/tdefile-plugins/rfc822/tdefile_rfc822.h index 2fcfaa18e..e43948a98 100644 --- a/kfile-plugins/rfc822/kfile_rfc822.h +++ b/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; diff --git a/kfile-plugins/vcf/CMakeLists.txt b/tdefile-plugins/vcf/CMakeLists.txt index 114c6da77..4cf771d26 100644 --- a/kfile-plugins/vcf/CMakeLists.txt +++ b/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} ) diff --git a/tdefile-plugins/vcf/Makefile.am b/tdefile-plugins/vcf/Makefile.am new file mode 100644 index 000000000..61b306d5f --- /dev/null +++ b/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) diff --git a/kfile-plugins/vcf/kfile_vcf.cpp b/tdefile-plugins/vcf/tdefile_vcf.cpp index c8c853f76..e8746c56a 100644 --- a/kfile-plugins/vcf/kfile_vcf.cpp +++ b/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" diff --git a/kfile-plugins/vcf/kfile_vcf.desktop b/tdefile-plugins/vcf/tdefile_vcf.desktop index 88ba00d15..730d731ab 100644 --- a/kfile-plugins/vcf/kfile_vcf.desktop +++ b/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 diff --git a/kfile-plugins/vcf/kfile_vcf.h b/tdefile-plugins/vcf/tdefile_vcf.h index 0a66e880e..19866d8b8 100644 --- a/kfile-plugins/vcf/kfile_vcf.h +++ b/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; diff --git a/kioslaves/CMakeLists.txt b/tdeioslaves/CMakeLists.txt index 56a5fcbac..567a1434b 100644 --- a/kioslaves/CMakeLists.txt +++ b/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( ) diff --git a/kioslaves/ConfigureChecks.cmake b/tdeioslaves/ConfigureChecks.cmake index 9cbd46c01..9cbd46c01 100644 --- a/kioslaves/ConfigureChecks.cmake +++ b/tdeioslaves/ConfigureChecks.cmake diff --git a/kioslaves/Mainpage.dox b/tdeioslaves/Mainpage.dox index 24e1ca685..24e1ca685 100644 --- a/kioslaves/Mainpage.dox +++ b/tdeioslaves/Mainpage.dox diff --git a/kioslaves/Makefile.am b/tdeioslaves/Makefile.am index 8258295ef..89bd2cf60 100644 --- a/kioslaves/Makefile.am +++ b/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 diff --git a/kioslaves/configure.in.bot b/tdeioslaves/configure.in.bot index fdad4b633..fdad4b633 100644 --- a/kioslaves/configure.in.bot +++ b/tdeioslaves/configure.in.bot diff --git a/kioslaves/configure.in.in b/tdeioslaves/configure.in.in index 47b98682b..47b98682b 100644 --- a/kioslaves/configure.in.in +++ b/tdeioslaves/configure.in.in diff --git a/kioslaves/imap4/CMakeLists.txt b/tdeioslaves/imap4/CMakeLists.txt index adb628c35..7cf5cace6 100644 --- a/kioslaves/imap4/CMakeLists.txt +++ b/tdeioslaves/imap4/CMakeLists.txt @@ -39,6 +39,6 @@ tde_add_kpart( kio_imap4 imapcommand.cc imaplist.cc mailaddress.cc mimeheader.cc rfcdecoder.cc imap4.cc imapinfo.cc imapparser.cc mailheader.cc mimehdrline.cc mimeio.cc - LINK emailfunctions-static kmime-shared kio-shared ${SASL_LIBRARY} + LINK emailfunctions-static kmime-shared tdeio-shared ${SASL_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslaves/imap4/Makefile.am b/tdeioslaves/imap4/Makefile.am index d71987279..553b0c326 100644 --- a/kioslaves/imap4/Makefile.am +++ b/tdeioslaves/imap4/Makefile.am @@ -21,6 +21,6 @@ kdelnk_DATA = imap4.protocol imaps.protocol kdelnkdir = $(kde_servicesdir) messages: - $(XGETTEXT) *.cc -o $(podir)/kio_imap4.pot + $(XGETTEXT) *.cc -o $(podir)/tdeio_imap4.pot include $(top_srcdir)/admin/Doxyfile.am diff --git a/kioslaves/imap4/PATCHING b/tdeioslaves/imap4/PATCHING index 39bcdce95..39bcdce95 100644 --- a/kioslaves/imap4/PATCHING +++ b/tdeioslaves/imap4/PATCHING diff --git a/kioslaves/imap4/README b/tdeioslaves/imap4/README index bc05146ac..af8af8f04 100644 --- a/kioslaves/imap4/README +++ b/tdeioslaves/imap4/README @@ -1,4 +1,4 @@ -This is s.carstens@gmx.de release of KDE 2.0 kioslave +This is s.carstens@gmx.de release of KDE 2.0 tdeioslave for the IMAP protocol. It supports LOGIN, AUTHENTICATE LOGIN, AUTHENTICATE ANONYMOUS and diff --git a/kioslaves/imap4/configure.in.in b/tdeioslaves/imap4/configure.in.in index 680e26e0a..680e26e0a 100644 --- a/kioslaves/imap4/configure.in.in +++ b/tdeioslaves/imap4/configure.in.in diff --git a/kioslaves/imap4/imap4.cc b/tdeioslaves/imap4/imap4.cc index 6654bb3dd..0069b22da 100644 --- a/kioslaves/imap4/imap4.cc +++ b/tdeioslaves/imap4/imap4.cc @@ -84,9 +84,9 @@ extern "C" { #include <kprotocolmanager.h> #include <kmessagebox.h> #include <kdebug.h> -#include <kio/connection.h> -#include <kio/slaveinterface.h> -#include <kio/passdlg.h> +#include <tdeio/connection.h> +#include <tdeio/slaveinterface.h> +#include <tdeio/passdlg.h> #include <klocale.h> #include <kmimetype.h> #include <kmdcodec.h> diff --git a/kioslaves/imap4/imap4.h b/tdeioslaves/imap4/imap4.h index 164cf8556..a6b160899 100644 --- a/kioslaves/imap4/imap4.h +++ b/tdeioslaves/imap4/imap4.h @@ -27,7 +27,7 @@ #include "imapparser.h" #include "mimeio.h" -#include <kio/tcpslavebase.h> +#include <tdeio/tcpslavebase.h> #include <tqbuffer.h> #define IMAP_BUFFER 8192 diff --git a/kioslaves/imap4/imap4.protocol b/tdeioslaves/imap4/imap4.protocol index 1ab920429..946d56929 100644 --- a/kioslaves/imap4/imap4.protocol +++ b/tdeioslaves/imap4/imap4.protocol @@ -26,4 +26,4 @@ source=true Capabilities=Subscription,ACL,Quota Icon=folder_inbox -DocPath=kioslave/imap.html +DocPath=tdeioslave/imap.html diff --git a/kioslaves/imap4/imapcommand.cc b/tdeioslaves/imap4/imapcommand.cc index 4b9faadf4..a3239d09d 100644 --- a/kioslaves/imap4/imapcommand.cc +++ b/tdeioslaves/imap4/imapcommand.cc @@ -50,9 +50,9 @@ #include <ksock.h> #include <kdebug.h> #include <kinstance.h> -#include <kio/connection.h> -#include <kio/slaveinterface.h> -#include <kio/passdlg.h> +#include <tdeio/connection.h> +#include <tdeio/slaveinterface.h> +#include <tdeio/passdlg.h> #include <klocale.h> */ imapCommand::imapCommand () diff --git a/kioslaves/imap4/imapcommand.h b/tdeioslaves/imap4/imapcommand.h index 9e2834424..9e2834424 100644 --- a/kioslaves/imap4/imapcommand.h +++ b/tdeioslaves/imap4/imapcommand.h diff --git a/kioslaves/imap4/imapinfo.cc b/tdeioslaves/imap4/imapinfo.cc index 4d1fc805c..4d1fc805c 100644 --- a/kioslaves/imap4/imapinfo.cc +++ b/tdeioslaves/imap4/imapinfo.cc diff --git a/kioslaves/imap4/imapinfo.h b/tdeioslaves/imap4/imapinfo.h index 735054496..735054496 100644 --- a/kioslaves/imap4/imapinfo.h +++ b/tdeioslaves/imap4/imapinfo.h diff --git a/kioslaves/imap4/imaplist.cc b/tdeioslaves/imap4/imaplist.cc index 92918d8c1..92918d8c1 100644 --- a/kioslaves/imap4/imaplist.cc +++ b/tdeioslaves/imap4/imaplist.cc diff --git a/kioslaves/imap4/imaplist.h b/tdeioslaves/imap4/imaplist.h index 9aa01f78d..9aa01f78d 100644 --- a/kioslaves/imap4/imaplist.h +++ b/tdeioslaves/imap4/imaplist.h diff --git a/kioslaves/imap4/imapparser.cc b/tdeioslaves/imap4/imapparser.cc index 8cb06e318..8cb06e318 100644 --- a/kioslaves/imap4/imapparser.cc +++ b/tdeioslaves/imap4/imapparser.cc diff --git a/kioslaves/imap4/imapparser.h b/tdeioslaves/imap4/imapparser.h index 7c498b09d..623fc8f85 100644 --- a/kioslaves/imap4/imapparser.h +++ b/tdeioslaves/imap4/imapparser.h @@ -29,8 +29,8 @@ #include <tqptrlist.h> #include <tqasciidict.h> -#include <kio/authinfo.h> -#include <kio/slavebase.h> +#include <tdeio/authinfo.h> +#include <tdeio/slavebase.h> #include "imaplist.h" #include "imapcommand.h" diff --git a/kioslaves/imap4/imaps.protocol b/tdeioslaves/imap4/imaps.protocol index 8d3ebac82..00f944855 100644 --- a/kioslaves/imap4/imaps.protocol +++ b/tdeioslaves/imap4/imaps.protocol @@ -27,4 +27,4 @@ source=true Capabilities=Subscription,ACL,Quota Icon=folder_inbox -DocPath=kioslave/imaps.html +DocPath=tdeioslave/imaps.html diff --git a/kioslaves/imap4/mailaddress.cc b/tdeioslaves/imap4/mailaddress.cc index 0ddd2ff04..0ddd2ff04 100644 --- a/kioslaves/imap4/mailaddress.cc +++ b/tdeioslaves/imap4/mailaddress.cc diff --git a/kioslaves/imap4/mailaddress.h b/tdeioslaves/imap4/mailaddress.h index 644034b24..644034b24 100644 --- a/kioslaves/imap4/mailaddress.h +++ b/tdeioslaves/imap4/mailaddress.h diff --git a/kioslaves/imap4/mailheader.cc b/tdeioslaves/imap4/mailheader.cc index c520b9094..c520b9094 100644 --- a/kioslaves/imap4/mailheader.cc +++ b/tdeioslaves/imap4/mailheader.cc diff --git a/kioslaves/imap4/mailheader.h b/tdeioslaves/imap4/mailheader.h index 633d61b78..633d61b78 100644 --- a/kioslaves/imap4/mailheader.h +++ b/tdeioslaves/imap4/mailheader.h diff --git a/kioslaves/imap4/mimehdrline.cc b/tdeioslaves/imap4/mimehdrline.cc index 9646ed26f..9646ed26f 100644 --- a/kioslaves/imap4/mimehdrline.cc +++ b/tdeioslaves/imap4/mimehdrline.cc diff --git a/kioslaves/imap4/mimehdrline.h b/tdeioslaves/imap4/mimehdrline.h index e31c18649..e31c18649 100644 --- a/kioslaves/imap4/mimehdrline.h +++ b/tdeioslaves/imap4/mimehdrline.h diff --git a/kioslaves/imap4/mimeheader.cc b/tdeioslaves/imap4/mimeheader.cc index 72e3827b3..72e3827b3 100644 --- a/kioslaves/imap4/mimeheader.cc +++ b/tdeioslaves/imap4/mimeheader.cc diff --git a/kioslaves/imap4/mimeheader.h b/tdeioslaves/imap4/mimeheader.h index bc2fd2bcd..bc2fd2bcd 100644 --- a/kioslaves/imap4/mimeheader.h +++ b/tdeioslaves/imap4/mimeheader.h diff --git a/kioslaves/imap4/mimeio.cc b/tdeioslaves/imap4/mimeio.cc index 757c11a47..757c11a47 100644 --- a/kioslaves/imap4/mimeio.cc +++ b/tdeioslaves/imap4/mimeio.cc diff --git a/kioslaves/imap4/mimeio.h b/tdeioslaves/imap4/mimeio.h index 37a96998f..37a96998f 100644 --- a/kioslaves/imap4/mimeio.h +++ b/tdeioslaves/imap4/mimeio.h diff --git a/kioslaves/imap4/rfcdecoder.cc b/tdeioslaves/imap4/rfcdecoder.cc index 08b641b7d..08b641b7d 100644 --- a/kioslaves/imap4/rfcdecoder.cc +++ b/tdeioslaves/imap4/rfcdecoder.cc diff --git a/kioslaves/imap4/rfcdecoder.h b/tdeioslaves/imap4/rfcdecoder.h index 2095b2ed2..2095b2ed2 100644 --- a/kioslaves/imap4/rfcdecoder.h +++ b/tdeioslaves/imap4/rfcdecoder.h diff --git a/kioslaves/imap4/selectinfo.h b/tdeioslaves/imap4/selectinfo.h index bf75a85b8..bf75a85b8 100644 --- a/kioslaves/imap4/selectinfo.h +++ b/tdeioslaves/imap4/selectinfo.h diff --git a/kioslaves/mbox/AUTHORS b/tdeioslaves/mbox/AUTHORS index 333010f6c..333010f6c 100644 --- a/kioslaves/mbox/AUTHORS +++ b/tdeioslaves/mbox/AUTHORS diff --git a/kioslaves/mbox/CMakeLists.txt b/tdeioslaves/mbox/CMakeLists.txt index b823d8b93..95ecdf490 100644 --- a/kioslaves/mbox/CMakeLists.txt +++ b/tdeioslaves/mbox/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES mbox.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( kio_mbox SOURCES mbox.cc mboxfile.cc readmbox.cc stat.cc urlinfo.cc - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslaves/mbox/Makefile.am b/tdeioslaves/mbox/Makefile.am index 0fc505249..0fc505249 100644 --- a/kioslaves/mbox/Makefile.am +++ b/tdeioslaves/mbox/Makefile.am diff --git a/kioslaves/mbox/README b/tdeioslaves/mbox/README index f0441661c..7adae5373 100644 --- a/kioslaves/mbox/README +++ b/tdeioslaves/mbox/README @@ -1,4 +1,4 @@ -This is a simple kioslave for accessing mbox-files with kio. +This is a simple tdeioslave for accessing mbox-files with kio. At the moment, it doesn't support locking or writing, it is just reading and listing messages. diff --git a/kioslaves/mbox/mbox.cc b/tdeioslaves/mbox/mbox.cc index 0c4fca815..477ef3502 100644 --- a/kioslaves/mbox/mbox.cc +++ b/tdeioslaves/mbox/mbox.cc @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or @@ -30,7 +30,7 @@ #include <kinstance.h> #include <kglobal.h> #include <kurl.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <stdlib.h> diff --git a/kioslaves/mbox/mbox.h b/tdeioslaves/mbox/mbox.h index 159c4213e..d6ef29aec 100644 --- a/kioslaves/mbox/mbox.h +++ b/tdeioslaves/mbox/mbox.h @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #ifndef MBOX_H #define MBOX_H -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> class TQCString; class KURL; diff --git a/kioslaves/mbox/mbox.protocol b/tdeioslaves/mbox/mbox.protocol index 8b6b412a8..8b6b412a8 100644 --- a/kioslaves/mbox/mbox.protocol +++ b/tdeioslaves/mbox/mbox.protocol diff --git a/kioslaves/mbox/mboxfile.cc b/tdeioslaves/mbox/mboxfile.cc index 271b71019..7297457ef 100644 --- a/kioslaves/mbox/mboxfile.cc +++ b/tdeioslaves/mbox/mboxfile.cc @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or diff --git a/kioslaves/mbox/mboxfile.h b/tdeioslaves/mbox/mboxfile.h index b8a98973e..1defafc9b 100644 --- a/kioslaves/mbox/mboxfile.h +++ b/tdeioslaves/mbox/mboxfile.h @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or diff --git a/kioslaves/mbox/readmbox.cc b/tdeioslaves/mbox/readmbox.cc index 3125fd747..942f369e5 100644 --- a/kioslaves/mbox/readmbox.cc +++ b/tdeioslaves/mbox/readmbox.cc @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #include "urlinfo.h" #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/kioslaves/mbox/readmbox.h b/tdeioslaves/mbox/readmbox.h index 046767be7..0b8872763 100644 --- a/kioslaves/mbox/readmbox.h +++ b/tdeioslaves/mbox/readmbox.h @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or diff --git a/kioslaves/mbox/stat.cc b/tdeioslaves/mbox/stat.cc index c5d9a3bdf..99267ca7d 100644 --- a/kioslaves/mbox/stat.cc +++ b/tdeioslaves/mbox/stat.cc @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or @@ -22,7 +22,7 @@ #include "urlinfo.h" #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <sys/stat.h> diff --git a/kioslaves/mbox/stat.h b/tdeioslaves/mbox/stat.h index 8ce593cc0..4e2c1f020 100644 --- a/kioslaves/mbox/stat.h +++ b/tdeioslaves/mbox/stat.h @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or @@ -19,7 +19,7 @@ #ifndef STAT_H #define STAT_H -#include <kio/global.h> +#include <tdeio/global.h> class ReadMBox; class UrlInfo; diff --git a/kioslaves/mbox/urlinfo.cc b/tdeioslaves/mbox/urlinfo.cc index d59c77ac8..4b359e403 100644 --- a/kioslaves/mbox/urlinfo.cc +++ b/tdeioslaves/mbox/urlinfo.cc @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or diff --git a/kioslaves/mbox/urlinfo.h b/tdeioslaves/mbox/urlinfo.h index 96882d1db..5de7804fd 100644 --- a/kioslaves/mbox/urlinfo.h +++ b/tdeioslaves/mbox/urlinfo.h @@ -1,5 +1,5 @@ /* - * This is a simple kioslave to handle mbox-files. + * This is a simple tdeioslave to handle mbox-files. * Copyright (C) 2004 Mart Kelder (mart.kde@hccnet.nl) * * This library is free software; you can redistribute it and/or diff --git a/kioslaves/opengroupware/Makefile.am b/tdeioslaves/opengroupware/Makefile.am index 007d74c36..007d74c36 100644 --- a/kioslaves/opengroupware/Makefile.am +++ b/tdeioslaves/opengroupware/Makefile.am diff --git a/kioslaves/opengroupware/opengroupware.cpp b/tdeioslaves/opengroupware/opengroupware.cpp index b4c19b711..ab6b33041 100644 --- a/kioslaves/opengroupware/opengroupware.cpp +++ b/tdeioslaves/opengroupware/opengroupware.cpp @@ -23,8 +23,8 @@ #include <kdebug.h> #include <kurl.h> -#include <kio/job.h> -#include <kio/davjob.h> +#include <tdeio/job.h> +#include <tdeio/davjob.h> #include <klocale.h> #include <libtdepim/kabcresourcecached.h> diff --git a/kioslaves/opengroupware/opengroupware.h b/tdeioslaves/opengroupware/opengroupware.h index da104c8cf..151187dbe 100644 --- a/kioslaves/opengroupware/opengroupware.h +++ b/tdeioslaves/opengroupware/opengroupware.h @@ -20,7 +20,7 @@ #ifndef GROUPWISE_H #define GROUPWISE_H -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <tqobject.h> diff --git a/kioslaves/opengroupware/opengroupware.protocol b/tdeioslaves/opengroupware/opengroupware.protocol index 89c0b9ea2..b51f33a06 100644 --- a/kioslaves/opengroupware/opengroupware.protocol +++ b/tdeioslaves/opengroupware/opengroupware.protocol @@ -1,5 +1,5 @@ [Protocol] -DocPath=kioslave/opengroupware.html +DocPath=tdeioslave/opengroupware.html exec=kio_opengroupware input=none output=filesystem diff --git a/kioslaves/opengroupware/opengroupwares.protocol b/tdeioslaves/opengroupware/opengroupwares.protocol index 595057b27..17eab5f39 100644 --- a/kioslaves/opengroupware/opengroupwares.protocol +++ b/tdeioslaves/opengroupware/opengroupwares.protocol @@ -1,5 +1,5 @@ [Protocol] -DocPath=kioslave/opengroupware.html +DocPath=tdeioslave/opengroupware.html exec=kio_opengroupware input=none output=filesystem diff --git a/kioslaves/opengroupware/webdavhandler.cpp b/tdeioslaves/opengroupware/webdavhandler.cpp index 2f98d915d..9c89174ae 100644 --- a/kioslaves/opengroupware/webdavhandler.cpp +++ b/tdeioslaves/opengroupware/webdavhandler.cpp @@ -27,7 +27,7 @@ #include <libtdepim/kpimprefs.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfile.h> diff --git a/kioslaves/opengroupware/webdavhandler.h b/tdeioslaves/opengroupware/webdavhandler.h index a86332a32..a86332a32 100644 --- a/kioslaves/opengroupware/webdavhandler.h +++ b/tdeioslaves/opengroupware/webdavhandler.h diff --git a/kioslaves/sieve/CMakeLists.txt b/tdeioslaves/sieve/CMakeLists.txt index f0297bace..2ac71cc35 100644 --- a/kioslaves/sieve/CMakeLists.txt +++ b/tdeioslaves/sieve/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES sieve.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( kio_sieve SOURCES sieve.cpp - LINK kio-shared ${SASL_LIBRARY} + LINK tdeio-shared ${SASL_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kioslaves/sieve/Makefile.am b/tdeioslaves/sieve/Makefile.am index fffffea7b..f4d0639c0 100644 --- a/kioslaves/sieve/Makefile.am +++ b/tdeioslaves/sieve/Makefile.am @@ -12,4 +12,4 @@ kdelnk_DATA = sieve.protocol kdelnkdir = $(kde_servicesdir) messages: - $(XGETTEXT) *.cpp -o $(podir)/kio_sieve.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_sieve.pot diff --git a/kioslaves/sieve/configure.in.in b/tdeioslaves/sieve/configure.in.in index ffc1b4b7e..ffc1b4b7e 100644 --- a/kioslaves/sieve/configure.in.in +++ b/tdeioslaves/sieve/configure.in.in diff --git a/kioslaves/sieve/draft-daboo-sieve-include.txt b/tdeioslaves/sieve/draft-daboo-sieve-include.txt index 83a08dfb8..83a08dfb8 100644 --- a/kioslaves/sieve/draft-daboo-sieve-include.txt +++ b/tdeioslaves/sieve/draft-daboo-sieve-include.txt diff --git a/kioslaves/sieve/draft-daboo-sieve-spamtest.txt b/tdeioslaves/sieve/draft-daboo-sieve-spamtest.txt index 8f22e5607..8f22e5607 100644 --- a/kioslaves/sieve/draft-daboo-sieve-spamtest.txt +++ b/tdeioslaves/sieve/draft-daboo-sieve-spamtest.txt diff --git a/kioslaves/sieve/draft-degener-sieve-body-00.txt b/tdeioslaves/sieve/draft-degener-sieve-body-00.txt index 7b1ee844e..7b1ee844e 100644 --- a/kioslaves/sieve/draft-degener-sieve-body-00.txt +++ b/tdeioslaves/sieve/draft-degener-sieve-body-00.txt diff --git a/kioslaves/sieve/draft-degener-sieve-copy.txt b/tdeioslaves/sieve/draft-degener-sieve-copy.txt index 8c23855c8..8c23855c8 100644 --- a/kioslaves/sieve/draft-degener-sieve-copy.txt +++ b/tdeioslaves/sieve/draft-degener-sieve-copy.txt diff --git a/kioslaves/sieve/draft-degener-sieve-editheader.txt b/tdeioslaves/sieve/draft-degener-sieve-editheader.txt index 6e9674f9d..6e9674f9d 100644 --- a/kioslaves/sieve/draft-degener-sieve-editheader.txt +++ b/tdeioslaves/sieve/draft-degener-sieve-editheader.txt diff --git a/kioslaves/sieve/draft-degener-sieve-multiscript.txt b/tdeioslaves/sieve/draft-degener-sieve-multiscript.txt index 53a838226..53a838226 100644 --- a/kioslaves/sieve/draft-degener-sieve-multiscript.txt +++ b/tdeioslaves/sieve/draft-degener-sieve-multiscript.txt diff --git a/kioslaves/sieve/draft-homme-sieve-variables.txt b/tdeioslaves/sieve/draft-homme-sieve-variables.txt index cccaa59c8..cccaa59c8 100644 --- a/kioslaves/sieve/draft-homme-sieve-variables.txt +++ b/tdeioslaves/sieve/draft-homme-sieve-variables.txt diff --git a/kioslaves/sieve/draft-martin-managesieve-04.txt b/tdeioslaves/sieve/draft-martin-managesieve-04.txt index 82684ad57..82684ad57 100644 --- a/kioslaves/sieve/draft-martin-managesieve-04.txt +++ b/tdeioslaves/sieve/draft-martin-managesieve-04.txt diff --git a/kioslaves/sieve/draft-martin-sieve-notify-01.txt b/tdeioslaves/sieve/draft-martin-sieve-notify-01.txt index 6eb1cac33..6eb1cac33 100644 --- a/kioslaves/sieve/draft-martin-sieve-notify-01.txt +++ b/tdeioslaves/sieve/draft-martin-sieve-notify-01.txt diff --git a/kioslaves/sieve/draft-melnikov-sieve-imapflags.txt b/tdeioslaves/sieve/draft-melnikov-sieve-imapflags.txt index 71cfbb3ce..71cfbb3ce 100644 --- a/kioslaves/sieve/draft-melnikov-sieve-imapflags.txt +++ b/tdeioslaves/sieve/draft-melnikov-sieve-imapflags.txt diff --git a/kioslaves/sieve/draft-murchison-sieve-regex-06.txt b/tdeioslaves/sieve/draft-murchison-sieve-regex-06.txt index b3e922ee8..b3e922ee8 100644 --- a/kioslaves/sieve/draft-murchison-sieve-regex-06.txt +++ b/tdeioslaves/sieve/draft-murchison-sieve-regex-06.txt diff --git a/kioslaves/sieve/draft-murchison-sieve-subaddress-05.txt b/tdeioslaves/sieve/draft-murchison-sieve-subaddress-05.txt index 95cea85a7..95cea85a7 100644 --- a/kioslaves/sieve/draft-murchison-sieve-subaddress-05.txt +++ b/tdeioslaves/sieve/draft-murchison-sieve-subaddress-05.txt diff --git a/kioslaves/sieve/draft-showalter-sieve-vacation-04.txt b/tdeioslaves/sieve/draft-showalter-sieve-vacation-04.txt index bd2d33593..bd2d33593 100644 --- a/kioslaves/sieve/draft-showalter-sieve-vacation-04.txt +++ b/tdeioslaves/sieve/draft-showalter-sieve-vacation-04.txt diff --git a/kioslaves/sieve/rfc3028.txt b/tdeioslaves/sieve/rfc3028.txt index b861e2e14..b861e2e14 100644 --- a/kioslaves/sieve/rfc3028.txt +++ b/tdeioslaves/sieve/rfc3028.txt diff --git a/kioslaves/sieve/rfc3431.txt b/tdeioslaves/sieve/rfc3431.txt index 3f11c3259..3f11c3259 100644 --- a/kioslaves/sieve/rfc3431.txt +++ b/tdeioslaves/sieve/rfc3431.txt diff --git a/kioslaves/sieve/sieve.cpp b/tdeioslaves/sieve/sieve.cpp index 9d373c2ad..9d373c2ad 100644 --- a/kioslaves/sieve/sieve.cpp +++ b/tdeioslaves/sieve/sieve.cpp diff --git a/kioslaves/sieve/sieve.h b/tdeioslaves/sieve/sieve.h index 2168da723..d25b1d571 100644 --- a/kioslaves/sieve/sieve.h +++ b/tdeioslaves/sieve/sieve.h @@ -16,8 +16,8 @@ #ifndef __sieve_h__ #define __sieve_h__ -#include <kio/tcpslavebase.h> -#include <kio/authinfo.h> +#include <tdeio/tcpslavebase.h> +#include <tdeio/authinfo.h> #include <tqstring.h> #include <tqcstring.h> diff --git a/kioslaves/sieve/sieve.protocol b/tdeioslaves/sieve/sieve.protocol index 484d48da0..484d48da0 100644 --- a/kioslaves/sieve/sieve.protocol +++ b/tdeioslaves/sieve/sieve.protocol diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp index f3b191e1d..a36517ebd 100644 --- a/tderesources/birthdays/resourcekabc.cpp +++ b/tderesources/birthdays/resourcekabc.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <kdebug.h> #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kstandarddirs.h> #include <kabc/stdaddressbook.h> diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcekabc.h index 169a02946..008b87e5d 100644 --- a/tderesources/birthdays/resourcekabc.h +++ b/tderesources/birthdays/resourcekabc.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqdatetime.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "libkcal/incidence.h" #include "libkcal/calendarlocal.h" diff --git a/tderesources/blogging/API_Blog.h b/tderesources/blogging/API_Blog.h index 9425bd5e6..5ad5b478b 100644 --- a/tderesources/blogging/API_Blog.h +++ b/tderesources/blogging/API_Blog.h @@ -10,7 +10,7 @@ #define API_BLOG_H #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <libkcal/journal.h> #include <tqobject.h> diff --git a/tderesources/blogging/xmlrpcjob.cpp b/tderesources/blogging/xmlrpcjob.cpp index f2e516308..cb377e7ed 100644 --- a/tderesources/blogging/xmlrpcjob.cpp +++ b/tderesources/blogging/xmlrpcjob.cpp @@ -31,9 +31,9 @@ #include <kdebug.h> #include <klocale.h> -#include <kio/http.h> +#include <tdeio/http.h> #include <kmdcodec.h> -#include <kio/davjob.h> +#include <tdeio/davjob.h> #define KIO_ARGS TQByteArray packedArgs; \ diff --git a/tderesources/blogging/xmlrpcjob.h b/tderesources/blogging/xmlrpcjob.h index 1efe79e1d..4cf9a5dbd 100644 --- a/tderesources/blogging/xmlrpcjob.h +++ b/tderesources/blogging/xmlrpcjob.h @@ -29,8 +29,8 @@ #include <tqvaluelist.h> #include <tqdom.h> -#include <kio/jobclasses.h> -#include <kio/global.h> +#include <tdeio/jobclasses.h> +#include <tdeio/global.h> namespace TDEIO { diff --git a/tderesources/caldav/prefsskel.kcfgc b/tderesources/caldav/prefsskel.kcfgc index b6b3aae0b..4406dc794 100644 --- a/tderesources/caldav/prefsskel.kcfgc +++ b/tderesources/caldav/prefsskel.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=prefsskel.kcfg ClassName=CalDavPrefsSkel NameSpace=KCal diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h index ea04ef483..ee5805327 100644 --- a/tderesources/caldav/resource.h +++ b/tderesources/caldav/resource.h @@ -27,7 +27,7 @@ #include <kabc/locknull.h> #include <tdepimmacros.h> -#include <kconfig.h> +#include <tdeconfig.h> namespace KCal { diff --git a/tderesources/carddav/prefsskel.kcfgc b/tderesources/carddav/prefsskel.kcfgc index 12ca40ce5..5eb6ae284 100644 --- a/tderesources/carddav/prefsskel.kcfgc +++ b/tderesources/carddav/prefsskel.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=prefsskel.kcfg ClassName=CardDavPrefsSkel NameSpace=KABC diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h index cf5090e57..8f783ab28 100644 --- a/tderesources/carddav/resource.h +++ b/tderesources/carddav/resource.h @@ -26,7 +26,7 @@ #include <kabc/locknull.h> #include <tdepimmacros.h> -#include <kconfig.h> +#include <tdeconfig.h> namespace KABC { diff --git a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc b/tderesources/egroupware/kabc_egroupwareprefs.kcfgc index 599001bbd..10adb19b2 100644 --- a/tderesources/egroupware/kabc_egroupwareprefs.kcfgc +++ b/tderesources/egroupware/kabc_egroupwareprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kabc_egroupware.kcfg ClassName=EGroupwarePrefs NameSpace=KABC diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.cpp b/tderesources/egroupware/kabc_resourcexmlrpc.cpp index 84e783827..39e3aac14 100644 --- a/tderesources/egroupware/kabc_resourcexmlrpc.cpp +++ b/tderesources/egroupware/kabc_resourcexmlrpc.cpp @@ -22,7 +22,7 @@ #include <kabc/addressee.h> #include <kabprefs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kmdcodec.h> diff --git a/tderesources/egroupware/kcal_egroupwareprefs.kcfgc b/tderesources/egroupware/kcal_egroupwareprefs.kcfgc index 6c9f6d4d3..4eb0e394a 100644 --- a/tderesources/egroupware/kcal_egroupwareprefs.kcfgc +++ b/tderesources/egroupware/kcal_egroupwareprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kcal_egroupware.kcfg ClassName=EGroupwarePrefs NameSpace=KCal diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h index 5253babaa..9be4662fb 100644 --- a/tderesources/egroupware/kcal_resourcexmlrpc.h +++ b/tderesources/egroupware/kcal_resourcexmlrpc.h @@ -26,7 +26,7 @@ #include <tqptrlist.h> #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> #include <tdepimmacros.h> diff --git a/tderesources/egroupware/knotes_egroupwareprefs.kcfgc b/tderesources/egroupware/knotes_egroupwareprefs.kcfgc index 6c3fbdffe..70adfc55d 100644 --- a/tderesources/egroupware/knotes_egroupwareprefs.kcfgc +++ b/tderesources/egroupware/knotes_egroupwareprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_knotes_egroupware.kcfg ClassName=EGroupwarePrefs NameSpace=KNotes diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.h b/tderesources/egroupware/knotes_resourcexmlrpc.h index df8a4dd36..3550aed48 100644 --- a/tderesources/egroupware/knotes_resourcexmlrpc.h +++ b/tderesources/egroupware/knotes_resourcexmlrpc.h @@ -25,7 +25,7 @@ #include <tqptrlist.h> #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurl.h> #include <tdepimmacros.h> diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index d43613e65..7af9814a1 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -11,7 +11,7 @@ #include <tqfile.h> #include <kdebug.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kmdcodec.h> diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h index 2808aef71..08bf1f39f 100644 --- a/tderesources/featureplan/kcal_resourcefeatureplan.h +++ b/tderesources/featureplan/kcal_resourcefeatureplan.h @@ -30,7 +30,7 @@ #include <kabc/locknull.h> #include <tdepimmacros.h> -#include <kconfig.h> +#include <tdeconfig.h> namespace KCal { diff --git a/tderesources/featureplan/prefs.kcfgc b/tderesources/featureplan/prefs.kcfgc index 0866d4e38..1b4ac4945 100644 --- a/tderesources/featureplan/prefs.kcfgc +++ b/tderesources/featureplan/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kcal_featureplan.kcfg ClassName=Prefs #NameSpace=KBB diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp index f8f30f659..9704e5bd8 100644 --- a/tderesources/groupdav/groupdavaddressbookadaptor.cpp +++ b/tderesources/groupdav/groupdavaddressbookadaptor.cpp @@ -30,7 +30,7 @@ #include <kabc/vcardconverter.h> #include <kabcresourcecached.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> using namespace KABC; diff --git a/tderesources/groupdav/groupdavglobals.cpp b/tderesources/groupdav/groupdavglobals.cpp index 5088bca96..793c1b965 100644 --- a/tderesources/groupdav/groupdavglobals.cpp +++ b/tderesources/groupdav/groupdavglobals.cpp @@ -34,8 +34,8 @@ #include <kabc/vcardconverter.h> #include <kdebug.h> -#include <kio/davjob.h> -#include <kio/job.h> +#include <tdeio/davjob.h> +#include <tdeio/job.h> TQString GroupDavGlobals::extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ ) { diff --git a/tderesources/groupware/kabc_resourcegroupware.cpp b/tderesources/groupware/kabc_resourcegroupware.cpp index 3c9d9792c..44cee5630 100644 --- a/tderesources/groupware/kabc_resourcegroupware.cpp +++ b/tderesources/groupware/kabc_resourcegroupware.cpp @@ -22,7 +22,7 @@ #include <kabc/addressee.h> #include <kabc/vcardconverter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/tderesources/groupware/kabc_resourcegroupware.h b/tderesources/groupware/kabc_resourcegroupware.h index 53c1d007a..1c5feb847 100644 --- a/tderesources/groupware/kabc_resourcegroupware.h +++ b/tderesources/groupware/kabc_resourcegroupware.h @@ -24,7 +24,7 @@ #include <libtdepim/progressmanager.h> -#include <kio/job.h> +#include <tdeio/job.h> class TDEConfig; diff --git a/tderesources/groupware/kcal_groupwareprefsbase.kcfgc b/tderesources/groupware/kcal_groupwareprefsbase.kcfgc index 7e243ddc0..e174cad41 100644 --- a/tderesources/groupware/kcal_groupwareprefsbase.kcfgc +++ b/tderesources/groupware/kcal_groupwareprefsbase.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kcal_groupware.kcfg ClassName=GroupwarePrefsBase NameSpace=KCal diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h index d3c809db7..d757ad730 100644 --- a/tderesources/groupware/kcal_resourcegroupware.h +++ b/tderesources/groupware/kcal_resourcegroupware.h @@ -26,8 +26,8 @@ #include <libkcal/resourcecached.h> #include <kabc/locknull.h> -#include <kio/job.h> -#include <kconfig.h> +#include <tdeio/job.h> +#include <tdeconfig.h> namespace KPIM { class GroupwarePrefsBase; @@ -36,7 +36,7 @@ class GroupwarePrefsBase; namespace KCal { /** - This class provides a resource for accessing a Groupware kioslave-based + This class provides a resource for accessing a Groupware tdeioslave-based calendar. */ class ResourceGroupware : public ResourceCached diff --git a/tderesources/groupware/kcal_resourcegroupwareconfig.h b/tderesources/groupware/kcal_resourcegroupwareconfig.h index dd6a93afa..7bfa34d44 100644 --- a/tderesources/groupware/kcal_resourcegroupwareconfig.h +++ b/tderesources/groupware/kcal_resourcegroupwareconfig.h @@ -34,7 +34,7 @@ class ResourceCachedReloadConfig; class ResourceCachedSaveConfig; /** - Configuration widget for groupware kioslave resource. + Configuration widget for groupware tdeioslave resource. @see KCalResourceGroupware */ diff --git a/tderesources/groupwise/CMakeLists.txt b/tderesources/groupwise/CMakeLists.txt index 68c829a7b..a5617229a 100644 --- a/tderesources/groupwise/CMakeLists.txt +++ b/tderesources/groupwise/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# add_subdirectory( soap ) -add_subdirectory( kioslave ) +add_subdirectory( tdeioslave ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} diff --git a/tderesources/groupwise/Makefile.am b/tderesources/groupwise/Makefile.am index 4b7eb408e..486e89774 100644 --- a/tderesources/groupwise/Makefile.am +++ b/tderesources/groupwise/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = soap kioslave +SUBDIRS = soap tdeioslave INCLUDES = -I$(top_srcdir) $(all_includes) diff --git a/tderesources/groupwise/kabc_resourcegroupwise.cpp b/tderesources/groupwise/kabc_resourcegroupwise.cpp index b3930bfbe..cf5c4e95d 100644 --- a/tderesources/groupwise/kabc_resourcegroupwise.cpp +++ b/tderesources/groupwise/kabc_resourcegroupwise.cpp @@ -23,7 +23,7 @@ #include <kabc/addressee.h> #include <kabc/vcardconverter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/tderesources/groupwise/kabc_resourcegroupwise.h b/tderesources/groupwise/kabc_resourcegroupwise.h index 658ddd76b..0c7533eef 100644 --- a/tderesources/groupwise/kabc_resourcegroupwise.h +++ b/tderesources/groupwise/kabc_resourcegroupwise.h @@ -27,7 +27,7 @@ #include <libtdepim/progressmanager.h> -#include <kio/job.h> +#include <tdeio/job.h> class TDEConfig; diff --git a/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc b/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc index 3130cde1e..357cdc956 100644 --- a/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc +++ b/tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kcal_groupwise.kcfg ClassName=GroupwisePrefsBase NameSpace=KCal diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h index 088e624a6..f4417079c 100644 --- a/tderesources/groupwise/kcal_resourcegroupwise.h +++ b/tderesources/groupwise/kcal_resourcegroupwise.h @@ -28,8 +28,8 @@ #include <libkcal/resourcecached.h> #include <kabc/locknull.h> -#include <kio/job.h> -#include <kconfig.h> +#include <tdeio/job.h> +#include <tdeconfig.h> #include <tdepimmacros.h> class ngwt__Settings; diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp index 9112fdeab..cedcde6aa 100644 --- a/tderesources/groupwise/soap/groupwiseserver.cpp +++ b/tderesources/groupwise/soap/groupwiseserver.cpp @@ -30,9 +30,9 @@ #include <kabc/addressee.h> #include <kabc/addresseelist.h> -#include <kio/job.h> -#include <kio/jobclasses.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> +#include <tdeio/netaccess.h> #include <kprotocolmanager.h> #include <ktempfile.h> #include <kdebug.h> diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h index 95218be06..e1c25c0f3 100644 --- a/tderesources/groupwise/soap/groupwiseserver.h +++ b/tderesources/groupwise/soap/groupwiseserver.h @@ -21,8 +21,8 @@ #ifndef GROUPWISESERVER_H #define GROUPWISESERVER_H -#include <kio/job.h> -#include <kio/jobclasses.h> +#include <tdeio/job.h> +#include <tdeio/jobclasses.h> #include <tqapplication.h> #include <tqmap.h> #include <tqobject.h> diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp index 90ccf83d6..809c29b8b 100644 --- a/tderesources/groupwise/soap/ksslsocket.cpp +++ b/tderesources/groupwise/soap/ksslsocket.cpp @@ -181,12 +181,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin d->dcc = new DCOPClient(); d->dcc->attach(); } - if (!d->dcc->isApplicationRegistered("kio_uiserver")) + if (!d->dcc->isApplicationRegistered("tdeio_uiserver")) { - TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList()); + TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList()); } - d->dcc->call("kio_uiserver", "UIServer", + d->dcc->call("tdeio_uiserver", "UIServer", "messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result); if( returnType == "int" ) diff --git a/tderesources/groupwise/soap/ksslsocket.h b/tderesources/groupwise/soap/ksslsocket.h index c19b440a1..425459483 100644 --- a/tderesources/groupwise/soap/ksslsocket.h +++ b/tderesources/groupwise/soap/ksslsocket.h @@ -21,7 +21,7 @@ #include <tqvariant.h> #include <kextsock.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> class KSSLSocketPrivate; diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp index 415021a78..e68da9ee1 100644 --- a/tderesources/groupwise/soap/soapdebug.cpp +++ b/tderesources/groupwise/soap/soapdebug.cpp @@ -3,7 +3,7 @@ #include <kaboutdata.h> #include <kapplication.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <ktempfile.h> diff --git a/tderesources/groupwise/kioslave/CMakeLists.txt b/tderesources/groupwise/tdeioslave/CMakeLists.txt index 23476fe0e..23476fe0e 100644 --- a/tderesources/groupwise/kioslave/CMakeLists.txt +++ b/tderesources/groupwise/tdeioslave/CMakeLists.txt diff --git a/tderesources/groupwise/kioslave/Makefile.am b/tderesources/groupwise/tdeioslave/Makefile.am index 2b2eaa074..e6da52837 100644 --- a/tderesources/groupwise/kioslave/Makefile.am +++ b/tderesources/groupwise/tdeioslave/Makefile.am @@ -16,4 +16,4 @@ kio_groupwise_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ kio_groupwise_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kio_groupwise.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_groupwise.pot diff --git a/tderesources/groupwise/kioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp index c3addd3b0..bfa02156a 100644 --- a/tderesources/groupwise/kioslave/groupwise.cpp +++ b/tderesources/groupwise/tdeioslave/groupwise.cpp @@ -34,7 +34,7 @@ #include <kabc/vcardconverter.h> #include <kinstance.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> diff --git a/tderesources/groupwise/kioslave/groupwise.h b/tderesources/groupwise/tdeioslave/groupwise.h index c5f109d30..e95ed260a 100644 --- a/tderesources/groupwise/kioslave/groupwise.h +++ b/tderesources/groupwise/tdeioslave/groupwise.h @@ -20,7 +20,7 @@ #ifndef GROUPWISE_H #define GROUPWISE_H -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <tqobject.h> diff --git a/tderesources/groupwise/kioslave/groupwise.protocol b/tderesources/groupwise/tdeioslave/groupwise.protocol index ec22851aa..a7c26b6e3 100644 --- a/tderesources/groupwise/kioslave/groupwise.protocol +++ b/tderesources/groupwise/tdeioslave/groupwise.protocol @@ -1,5 +1,5 @@ [Protocol] -DocPath=kioslave/groupwise.html +DocPath=tdeioslave/groupwise.html exec=kio_groupwise input=none output=filesystem diff --git a/tderesources/groupwise/kioslave/groupwises.protocol b/tderesources/groupwise/tdeioslave/groupwises.protocol index b2b2c7b9b..2666f1fd7 100644 --- a/tderesources/groupwise/kioslave/groupwises.protocol +++ b/tderesources/groupwise/tdeioslave/groupwises.protocol @@ -1,5 +1,5 @@ [Protocol] -DocPath=kioslave/groupwise.html +DocPath=tdeioslave/groupwise.html exec=kio_groupwise input=none output=filesystem diff --git a/tderesources/kolab/CMakeLists.txt b/tderesources/kolab/CMakeLists.txt index 01acd3972..d8d194432 100644 --- a/tderesources/kolab/CMakeLists.txt +++ b/tderesources/kolab/CMakeLists.txt @@ -14,5 +14,5 @@ add_subdirectory( kabc ) add_subdirectory( knotes ) add_subdirectory( kcal ) -install( FILES kolab-resource.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) -install( PROGRAMS upgrade-resourcetype.pl DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +install( FILES kolab-resource.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) +install( PROGRAMS upgrade-resourcetype.pl DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) diff --git a/tderesources/kolab/Makefile.am b/tderesources/kolab/Makefile.am index 0f144e05c..3b8838433 100644 --- a/tderesources/kolab/Makefile.am +++ b/tderesources/kolab/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = shared kabc knotes kcal -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = kolab-resource.upd update_SCRIPTS = upgrade-resourcetype.pl diff --git a/tderesources/kolab/kabc/contact.cpp b/tderesources/kolab/kabc/contact.cpp index ff8f869b7..dac619fea 100644 --- a/tderesources/kolab/kabc/contact.cpp +++ b/tderesources/kolab/kabc/contact.cpp @@ -37,7 +37,7 @@ #include <kabc/stdaddressbook.h> #include <libkcal/freebusyurlstore.h> #include <libtdepim/distributionlist.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kdebug.h> #include <tqfile.h> #include <float.h> diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp index ce7c18c42..51c3a4b42 100644 --- a/tderesources/kolab/kabc/resourcekolab.cpp +++ b/tderesources/kolab/kabc/resourcekolab.cpp @@ -38,8 +38,8 @@ #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> -#include <kio/observer.h> -#include <kio/uiserver_stub.h> +#include <tdeio/observer.h> +#include <tdeio/uiserver_stub.h> #include <kabc/vcardconverter.h> #include <kmainwindow.h> #include <kapplication.h> @@ -197,8 +197,8 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource ) // If it's too big the progressbar is jumpy. const int nbMessages = 200; - (void)Observer::self(); // ensure kio_uiserver is running - UIServer_stub uiserver( "kio_uiserver", "UIServer" ); + (void)Observer::self(); // ensure tdeio_uiserver is running + UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( count > 200 ) { progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); diff --git a/tderesources/kolab/kcal/incidence.cpp b/tderesources/kolab/kcal/incidence.cpp index ddc31491b..b5603b191 100644 --- a/tderesources/kolab/kcal/incidence.cpp +++ b/tderesources/kolab/kcal/incidence.cpp @@ -44,7 +44,7 @@ #include <kdebug.h> #include <kmdcodec.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> using namespace Kolab; diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp index 44c13fd2b..50f8b5b82 100644 --- a/tderesources/kolab/kcal/resourcekolab.cpp +++ b/tderesources/kolab/kcal/resourcekolab.cpp @@ -37,8 +37,8 @@ #include "task.h" #include "journal.h" -#include <kio/observer.h> -#include <kio/uiserver_stub.h> +#include <tdeio/observer.h> +#include <tdeio/uiserver_stub.h> #include <kapplication.h> #include <dcopclient.h> #include <libtdepim/kincidencechooser.h> @@ -172,8 +172,8 @@ bool ResourceKolab::loadSubResource( const TQString& subResource, : i18n( "Loading events..." ); const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit; if ( useProgress ) - (void)::Observer::self(); // ensure kio_uiserver is running - UIServer_stub uiserver( "kio_uiserver", "UIServer" ); + (void)::Observer::self(); // ensure tdeio_uiserver is running + UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( useProgress ) { progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp index 8cc28f67a..230ac3509 100644 --- a/tderesources/lib/addressbookadaptor.cpp +++ b/tderesources/lib/addressbookadaptor.cpp @@ -26,7 +26,7 @@ #include <kabc/addressee.h> #include <kabc/vcardconverter.h> #include <libtdepim/kabcresourcecached.h> -#include <kio/job.h> +#include <tdeio/job.h> using namespace KABC; diff --git a/tderesources/lib/calendaradaptor.cpp b/tderesources/lib/calendaradaptor.cpp index f2e255f0d..ffbccefc5 100644 --- a/tderesources/lib/calendaradaptor.cpp +++ b/tderesources/lib/calendaradaptor.cpp @@ -28,7 +28,7 @@ #include <libkcal/resourcecached.h> #include <libkcal/icalformat.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> diff --git a/tderesources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp index 5b4a0a521..bf4a03476 100644 --- a/tderesources/lib/davaddressbookadaptor.cpp +++ b/tderesources/lib/davaddressbookadaptor.cpp @@ -30,8 +30,8 @@ // #include <kabc/vcardconverter.h> // #include <kabcresourcecached.h> -#include <kio/davjob.h> -// #include <kio/job.h> +#include <tdeio/davjob.h> +// #include <tdeio/job.h> #include <kdebug.h> using namespace KABC; diff --git a/tderesources/lib/davcalendaradaptor.cpp b/tderesources/lib/davcalendaradaptor.cpp index 5d6be2da6..5263c2a18 100644 --- a/tderesources/lib/davcalendaradaptor.cpp +++ b/tderesources/lib/davcalendaradaptor.cpp @@ -22,7 +22,7 @@ #include "davcalendaradaptor.h" #include <kdebug.h> -#include <kio/davjob.h> +#include <tdeio/davjob.h> // #include <folderlister.h> // #include <tqdom.h> diff --git a/tderesources/lib/folderlister.cpp b/tderesources/lib/folderlister.cpp index 6cb341acd..c12d3ae69 100644 --- a/tderesources/lib/folderlister.cpp +++ b/tderesources/lib/folderlister.cpp @@ -25,10 +25,10 @@ #include "groupwaredataadaptor.h" #include "tderesources_groupwareprefs.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstringlist.h> using namespace KPIM; diff --git a/tderesources/lib/groupwaredataadaptor.cpp b/tderesources/lib/groupwaredataadaptor.cpp index 85dacdaa8..4a89bd02c 100644 --- a/tderesources/lib/groupwaredataadaptor.cpp +++ b/tderesources/lib/groupwaredataadaptor.cpp @@ -23,7 +23,7 @@ #include "groupwaredataadaptor.h" #include <kdebug.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <libemailfunctions/idmapper.h> using namespace KPIM; diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp index 9104da847..63c7e988d 100644 --- a/tderesources/lib/groupwaredownloadjob.cpp +++ b/tderesources/lib/groupwaredownloadjob.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <klocale.h> #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <libemailfunctions/idmapper.h> #include <libtdepim/progressmanager.h> diff --git a/tderesources/lib/groupwareresourcejob.h b/tderesources/lib/groupwareresourcejob.h index f2818f2cd..d32caaae1 100644 --- a/tderesources/lib/groupwareresourcejob.h +++ b/tderesources/lib/groupwareresourcejob.h @@ -32,7 +32,7 @@ namespace KPIM { class GroupwareDataAdaptor; /** - This class provides a resource for accessing a Groupware kioslave-based + This class provides a resource for accessing a Groupware tdeioslave-based calendar. */ class GroupwareJob : public TQObject diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp index cf46571fc..e896c0dab 100644 --- a/tderesources/lib/groupwareuploadjob.cpp +++ b/tderesources/lib/groupwareuploadjob.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <tqstringlist.h> #include <tqtimer.h> diff --git a/tderesources/lib/groupwareuploadjob.h b/tderesources/lib/groupwareuploadjob.h index b3a0ff756..13ba3ed54 100644 --- a/tderesources/lib/groupwareuploadjob.h +++ b/tderesources/lib/groupwareuploadjob.h @@ -41,7 +41,7 @@ class GroupwareDataAdaptor; class ProgressItem; /** - This class provides a resource for accessing a Groupware kioslave-based + This class provides a resource for accessing a Groupware tdeioslave-based calendar. */ class GroupwareUploadJob : public GroupwareJob diff --git a/tderesources/lib/kcal_cachesettingsdlg.h b/tderesources/lib/kcal_cachesettingsdlg.h index 1a6b369ab..51263e263 100644 --- a/tderesources/lib/kcal_cachesettingsdlg.h +++ b/tderesources/lib/kcal_cachesettingsdlg.h @@ -36,7 +36,7 @@ class ResourceCachedReloadConfig; class ResourceCachedSaveConfig; /** - Configuration widget for groupware kioslave resource. + Configuration widget for groupware tdeioslave resource. @see KCalOpenGroupware */ class KDE_EXPORT CacheSettingsDialog : public KDialogBase diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp index bd459331a..56ffae7d5 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.cpp +++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp @@ -31,7 +31,7 @@ #include "groupwareuploadjob.h" #include <libkcal/icalformat.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <tqapplication.h> diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h index f6b46dbf7..8a1033fb2 100644 --- a/tderesources/lib/kcal_resourcegroupwarebase.h +++ b/tderesources/lib/kcal_resourcegroupwarebase.h @@ -46,7 +46,7 @@ namespace KCal { class CalendarAdaptor; /** - This class provides a resource for accessing a Groupware kioslave-based + This class provides a resource for accessing a Groupware tdeioslave-based calendar. */ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h index ab4f841a2..7639b562f 100644 --- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.h +++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.h @@ -40,7 +40,7 @@ namespace KCal { class CacheSettingsDialog; /** - Configuration widget for groupware kioslave resource. + Configuration widget for groupware tdeioslave resource. @see KCalOpenGroupware */ diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.cpp b/tderesources/newexchange/exchangeaddressbookadaptor.cpp index 7e8ae8bb9..1abaacd4d 100644 --- a/tderesources/newexchange/exchangeaddressbookadaptor.cpp +++ b/tderesources/newexchange/exchangeaddressbookadaptor.cpp @@ -25,7 +25,7 @@ #include "exchangeglobals.h" #include <webdavhandler.h> #include <kdebug.h> -#include <kio/davjob.h> +#include <tdeio/davjob.h> using namespace KABC; diff --git a/tderesources/newexchange/exchangecalendaradaptor.cpp b/tderesources/newexchange/exchangecalendaradaptor.cpp index 89c9b742e..a6777fb27 100644 --- a/tderesources/newexchange/exchangecalendaradaptor.cpp +++ b/tderesources/newexchange/exchangecalendaradaptor.cpp @@ -26,7 +26,7 @@ #include <webdavhandler.h> #include <kdebug.h> #include <klocale.h> -#include <kio/davjob.h> +#include <tdeio/davjob.h> #include <libkcal/resourcecached.h> #include "davcalendaradaptor.h" diff --git a/tderesources/newexchange/exchangeglobals.cpp b/tderesources/newexchange/exchangeglobals.cpp index f2d90cd6d..dc74650c5 100644 --- a/tderesources/newexchange/exchangeglobals.cpp +++ b/tderesources/newexchange/exchangeglobals.cpp @@ -29,8 +29,8 @@ #include <libkcal/resourcecached.h> #include <libemailfunctions/idmapper.h> -#include <kio/job.h> -#include <kio/davjob.h> +#include <tdeio/job.h> +#include <tdeio/davjob.h> #include <kdebug.h> KPIM::FolderLister::ContentType ExchangeGlobals::getContentType( const TQDomElement &prop ) diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp index ed05f8405..78b650658 100644 --- a/tderesources/remote/resourceremote.cpp +++ b/tderesources/remote/resourceremote.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h index 2c3fd5fad..04099ff97 100644 --- a/tderesources/remote/resourceremote.h +++ b/tderesources/remote/resourceremote.h @@ -26,7 +26,7 @@ #include <tqdatetime.h> #include <kurl.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdirwatch.h> #include <tdepimmacros.h> diff --git a/tderesources/scalix/CMakeLists.txt b/tderesources/scalix/CMakeLists.txt index ca7fc5237..0be4fd954 100644 --- a/tderesources/scalix/CMakeLists.txt +++ b/tderesources/scalix/CMakeLists.txt @@ -12,6 +12,6 @@ add_subdirectory( shared ) add_subdirectory( kabc ) add_subdirectory( kcal ) -add_subdirectory( kioslave ) +add_subdirectory( tdeioslave ) add_subdirectory( knotes ) add_subdirectory( scalixadmin ) diff --git a/tderesources/scalix/Makefile.am b/tderesources/scalix/Makefile.am index 1a58c7ec9..ca3230486 100644 --- a/tderesources/scalix/Makefile.am +++ b/tderesources/scalix/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = shared kabc kcal kioslave knotes scalixadmin +SUBDIRS = shared kabc kcal tdeioslave knotes scalixadmin messages: rc.cpp $(XGETTEXT) shared/*.cpp kabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp index 42aef92d5..13ee99ec8 100644 --- a/tderesources/scalix/kabc/resourcescalix.cpp +++ b/tderesources/scalix/kabc/resourcescalix.cpp @@ -38,8 +38,8 @@ #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> -#include <kio/observer.h> -#include <kio/uiserver_stub.h> +#include <tdeio/observer.h> +#include <tdeio/uiserver_stub.h> #include <kmainwindow.h> #include <kapplication.h> #include <dcopclient.h> @@ -193,8 +193,8 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource, // If it's too big the progressbar is jumpy. const int nbMessages = 200; - (void)Observer::self(); // ensure kio_uiserver is running - UIServer_stub uiserver( "kio_uiserver", "UIServer" ); + (void)Observer::self(); // ensure tdeio_uiserver is running + UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( count > 200 ) { progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index a757c81fc..672a7bfbf 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -33,8 +33,8 @@ #include "resourcescalix.h" -#include <kio/observer.h> -#include <kio/uiserver_stub.h> +#include <tdeio/observer.h> +#include <tdeio/uiserver_stub.h> #include <kapplication.h> #include <dcopclient.h> #include <libkcal/icalformat.h> @@ -161,8 +161,8 @@ bool ResourceScalix::loadSubResource( const TQString& subResource, : i18n( "Loading events..." ); const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit; if ( useProgress ) - (void)::Observer::self(); // ensure kio_uiserver is running - UIServer_stub uiserver( "kio_uiserver", "UIServer" ); + (void)::Observer::self(); // ensure tdeio_uiserver is running + UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); int progressId = 0; if ( useProgress ) { progressId = uiserver.newJob( kapp->dcopClient()->appId(), true ); diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index 49b0a8fe5..e7dd94457 100644 --- a/tderesources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kio/scheduler.h> +#include <tdeio/scheduler.h> #include <klocale.h> #include "jobs.h" diff --git a/tderesources/scalix/scalixadmin/jobs.h b/tderesources/scalix/scalixadmin/jobs.h index 0c73fb507..832db0700 100644 --- a/tderesources/scalix/scalixadmin/jobs.h +++ b/tderesources/scalix/scalixadmin/jobs.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kio/job.h> +#include <tdeio/job.h> #ifndef JOBS_H #define JOBS_H diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 6dd8ab10e..9bdc13776 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -24,7 +24,7 @@ #include <tqlineedit.h> #include <tqpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kmessagebox.h> #include <kstringhandler.h> diff --git a/tderesources/scalix/scalixadmin/settings.cpp b/tderesources/scalix/scalixadmin/settings.cpp index 279491c5f..277a0631d 100644 --- a/tderesources/scalix/scalixadmin/settings.cpp +++ b/tderesources/scalix/scalixadmin/settings.cpp @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kconfig.h> -#include <kio/scheduler.h> +#include <tdeconfig.h> +#include <tdeio/scheduler.h> #include <kstringhandler.h> #include "settings.h" diff --git a/tderesources/scalix/scalixadmin/settings.h b/tderesources/scalix/scalixadmin/settings.h index 29028f3b8..490b98a7d 100644 --- a/tderesources/scalix/scalixadmin/settings.h +++ b/tderesources/scalix/scalixadmin/settings.h @@ -22,8 +22,8 @@ #define SETTINGS_H #include <kurl.h> -#include <kio/global.h> -#include <kio/slave.h> +#include <tdeio/global.h> +#include <tdeio/slave.h> class Settings { diff --git a/tderesources/scalix/kioslave/CMakeLists.txt b/tderesources/scalix/tdeioslave/CMakeLists.txt index 7ba76f672..7ba76f672 100644 --- a/tderesources/scalix/kioslave/CMakeLists.txt +++ b/tderesources/scalix/tdeioslave/CMakeLists.txt diff --git a/tderesources/scalix/kioslave/Makefile.am b/tderesources/scalix/tdeioslave/Makefile.am index 5607fb9d7..1e66f7091 100644 --- a/tderesources/scalix/kioslave/Makefile.am +++ b/tderesources/scalix/tdeioslave/Makefile.am @@ -14,4 +14,4 @@ kio_scalix_la_LIBADD = $(top_builddir)/libkcal/libkcal.la $(top_builddir)/libtde kio_scalix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kio_scalix.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_scalix.pot diff --git a/tderesources/scalix/kioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index 1b4cc7b8f..40084669d 100644 --- a/tderesources/scalix/kioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -25,7 +25,7 @@ #include <kcmdlineargs.h> #include <kdebug.h> #include <tdeversion.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <klocale.h> #include <tdepimmacros.h> diff --git a/tderesources/scalix/kioslave/scalix.h b/tderesources/scalix/tdeioslave/scalix.h index dc034b7b5..f4dbdeadd 100644 --- a/tderesources/scalix/kioslave/scalix.h +++ b/tderesources/scalix/tdeioslave/scalix.h @@ -21,8 +21,8 @@ #ifndef SCALIX_H #define SCALIX_H -#include <kio/job.h> -#include <kio/slavebase.h> +#include <tdeio/job.h> +#include <tdeio/slavebase.h> #include <tqobject.h> diff --git a/tderesources/scalix/kioslave/scalix.protocol b/tderesources/scalix/tdeioslave/scalix.protocol index a527d77dd..91a213e87 100644 --- a/tderesources/scalix/kioslave/scalix.protocol +++ b/tderesources/scalix/tdeioslave/scalix.protocol @@ -1,5 +1,5 @@ [Protocol] -DocPath=kioslave/scalix.html +DocPath=tdeioslave/scalix.html exec=kio_scalix input=none output=filesystem diff --git a/tderesources/scalix/kioslave/scalixs.protocol b/tderesources/scalix/tdeioslave/scalixs.protocol index fd13db6ad..19defac56 100644 --- a/tderesources/scalix/kioslave/scalixs.protocol +++ b/tderesources/scalix/tdeioslave/scalixs.protocol @@ -1,5 +1,5 @@ [Protocol] -DocPath=kioslave/scalix.html +DocPath=tdeioslave/scalix.html exec=kio_scalix input=none output=filesystem diff --git a/tderesources/slox/kabcresourceslox.cpp b/tderesources/slox/kabcresourceslox.cpp index e7ab6ecae..04ce9555e 100644 --- a/tderesources/slox/kabcresourceslox.cpp +++ b/tderesources/slox/kabcresourceslox.cpp @@ -22,7 +22,7 @@ #include <tqapplication.h> #include <kabc/picture.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kmdcodec.h> @@ -30,7 +30,7 @@ #include <kstringhandler.h> #include <libtdepim/kpimprefs.h> #include <libtdepim/progressmanager.h> -#include <kio/davjob.h> +#include <tdeio/davjob.h> #include "webdavhandler.h" #include "sloxaccounts.h" diff --git a/tderesources/slox/kabcsloxprefs.kcfgc b/tderesources/slox/kabcsloxprefs.kcfgc index 11e2f2c21..51bd1ac16 100644 --- a/tderesources/slox/kabcsloxprefs.kcfgc +++ b/tderesources/slox/kabcsloxprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kabc_slox.kcfg ClassName=SloxPrefs NameSpace=KABC diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp index 1311ebc52..a877622e9 100644 --- a/tderesources/slox/kcalresourceslox.cpp +++ b/tderesources/slox/kcalresourceslox.cpp @@ -30,8 +30,8 @@ #include <kdebug.h> #include <kurl.h> -#include <kio/job.h> -#include <kio/davjob.h> +#include <tdeio/job.h> +#include <tdeio/davjob.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h index 6735b9934..8b2b68d26 100644 --- a/tderesources/slox/kcalresourceslox.h +++ b/tderesources/slox/kcalresourceslox.h @@ -29,7 +29,7 @@ #include <tqdom.h> #include <kurl.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdirwatch.h> #include <tdepimmacros.h> diff --git a/tderesources/slox/kcalsloxprefs.kcfgc b/tderesources/slox/kcalsloxprefs.kcfgc index 3b352a214..e971d32d8 100644 --- a/tderesources/slox/kcalsloxprefs.kcfgc +++ b/tderesources/slox/kcalsloxprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kcal_slox.kcfg ClassName=SloxPrefs NameSpace=KCal diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp index aa648d1bc..1831d79ae 100644 --- a/tderesources/slox/sloxaccounts.cpp +++ b/tderesources/slox/sloxaccounts.cpp @@ -28,10 +28,10 @@ #include <kstaticdeleter.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kio/job.h> -#include <kio/davjob.h> +#include <tdeio/job.h> +#include <tdeio/davjob.h> #include <kstringhandler.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfile.h> #include <tqdom.h> diff --git a/tderesources/slox/sloxfoldermanager.cpp b/tderesources/slox/sloxfoldermanager.cpp index a60cd7885..728420555 100644 --- a/tderesources/slox/sloxfoldermanager.cpp +++ b/tderesources/slox/sloxfoldermanager.cpp @@ -22,8 +22,8 @@ #include <tqstring.h> #include <kdebug.h> -#include <kio/job.h> -#include <kio/davjob.h> +#include <tdeio/job.h> +#include <tdeio/davjob.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/tderesources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp index 32d3c4167..65caebf23 100644 --- a/tderesources/slox/webdavhandler.cpp +++ b/tderesources/slox/webdavhandler.cpp @@ -37,7 +37,7 @@ #include <libtdepim/kpimprefs.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfile.h> diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h index 1c8bd9c90..65e9ac115 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytime.h +++ b/tderesources/tvanytime/kcal_resourcetvanytime.h @@ -28,8 +28,8 @@ #include <libkcal/resourcecached.h> #include <kabc/locknull.h> -#include <kio/job.h> -#include <kconfig.h> +#include <tdeio/job.h> +#include <tdeconfig.h> #include <tdepimmacros.h> #include "service.h" diff --git a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp index f9ec2a499..dbce86fef 100644 --- a/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp +++ b/tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp @@ -25,7 +25,7 @@ #include <tqspinbox.h> #include <tqwhatsthis.h> -#include <kconfigskeleton.h> +#include <tdeconfigskeleton.h> #include <klocale.h> #include <kdebug.h> //#include <kdialogbase.h> diff --git a/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc b/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc index 6693e4148..3b5a05c6d 100644 --- a/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc +++ b/tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kcal_tvanytime.kcfg ClassName=TVAnytimePrefsBase NameSpace=KCal diff --git a/wizards/egroupwareconfig.kcfgc b/wizards/egroupwareconfig.kcfgc index 47927939c..5869e0093 100644 --- a/wizards/egroupwareconfig.kcfgc +++ b/wizards/egroupwareconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=egroupware.kcfg ClassName=EGroupwareConfig Singleton=true diff --git a/wizards/egroupwarewizard.h b/wizards/egroupwarewizard.h index 2a920467f..431c61d3c 100644 --- a/wizards/egroupwarewizard.h +++ b/wizards/egroupwarewizard.h @@ -21,7 +21,7 @@ #ifndef EGROUPWAREWIZARD_H #define EGROUPWAREWIZARD_H -#include <kconfigwizard.h> +#include <tdeconfigwizard.h> #include <tdepimmacros.h> class KLineEdit; diff --git a/wizards/exchangewizard.h b/wizards/exchangewizard.h index f453356da..ffa35d025 100644 --- a/wizards/exchangewizard.h +++ b/wizards/exchangewizard.h @@ -20,7 +20,7 @@ #ifndef EXCHANGEWIZARD_H #define EXCHANGEWIZARD_H -#include <kconfigwizard.h> +#include <tdeconfigwizard.h> #include <tdepimmacros.h> class KLineEdit; diff --git a/wizards/groupwiseconfig.kcfgc b/wizards/groupwiseconfig.kcfgc index 09231e2e7..8034a0ec6 100644 --- a/wizards/groupwiseconfig.kcfgc +++ b/wizards/groupwiseconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=groupwise.kcfg ClassName=GroupwiseConfig Singleton=true diff --git a/wizards/groupwisewizard.h b/wizards/groupwisewizard.h index 073de386a..7960a39be 100644 --- a/wizards/groupwisewizard.h +++ b/wizards/groupwisewizard.h @@ -20,7 +20,7 @@ #ifndef GROUPWISEWIZARD_H #define GROUPWISEWIZARD_H -#include <kconfigwizard.h> +#include <tdeconfigwizard.h> #include <tdepimmacros.h> class KLineEdit; diff --git a/wizards/kmailchanges.h b/wizards/kmailchanges.h index f238b3628..3fc412a1d 100644 --- a/wizards/kmailchanges.h +++ b/wizards/kmailchanges.h @@ -22,8 +22,8 @@ #ifndef KMAILCHANGES_H #define KMAILCHANGES_H -#include <kconfigpropagator.h> -#include <kconfig.h> +#include <tdeconfigpropagator.h> +#include <tdeconfig.h> namespace KWallet { class Wallet; diff --git a/wizards/kolabconfig.kcfgc b/wizards/kolabconfig.kcfgc index 4c265d26a..c2177b863 100644 --- a/wizards/kolabconfig.kcfgc +++ b/wizards/kolabconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kolab.kcfg ClassName=KolabConfig Singleton=true diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index 0adfc46b7..6227383fc 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -25,7 +25,7 @@ #include "kmailchanges.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> class KolabCustomWriter : public CreateDisconnectedImapAccount::CustomWriter diff --git a/wizards/kolabkmailchanges.h b/wizards/kolabkmailchanges.h index 74d07691b..c4c9ad89b 100644 --- a/wizards/kolabkmailchanges.h +++ b/wizards/kolabkmailchanges.h @@ -21,7 +21,7 @@ #ifndef KOLABKMAILCHANGES_H #define KOLABKMAILCHANGES_H -#include <kconfigpropagator.h> +#include <tdeconfigpropagator.h> void createKMailChanges( TDEConfigPropagator::Change::List& ); diff --git a/wizards/kolabwizard.h b/wizards/kolabwizard.h index eec252336..99fd0c0d2 100644 --- a/wizards/kolabwizard.h +++ b/wizards/kolabwizard.h @@ -22,7 +22,7 @@ #ifndef KOLABWIZARD_H #define KOLABWIZARD_H -#include <kconfigwizard.h> +#include <tdeconfigwizard.h> #include <tdepimmacros.h> class KLineEdit; diff --git a/wizards/scalixconfig.kcfgc b/wizards/scalixconfig.kcfgc index f4893ca07..82be44329 100644 --- a/wizards/scalixconfig.kcfgc +++ b/wizards/scalixconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=scalix.kcfg ClassName=ScalixConfig Singleton=true diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 4926678ed..89ea65d54 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -25,7 +25,7 @@ #include "kmailchanges.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> class ScalixCustomWriter : public CreateDisconnectedImapAccount::CustomWriter diff --git a/wizards/scalixkmailchanges.h b/wizards/scalixkmailchanges.h index 91ae7b303..e3f23aa14 100644 --- a/wizards/scalixkmailchanges.h +++ b/wizards/scalixkmailchanges.h @@ -21,7 +21,7 @@ #ifndef SCALIXKMAILCHANGES_H #define SCALIXKMAILCHANGES_H -#include <kconfigpropagator.h> +#include <tdeconfigpropagator.h> void createKMailChanges( TDEConfigPropagator::Change::List& ); diff --git a/wizards/scalixwizard.h b/wizards/scalixwizard.h index 6ff44b054..273f6c4a6 100644 --- a/wizards/scalixwizard.h +++ b/wizards/scalixwizard.h @@ -22,7 +22,7 @@ #ifndef SCALIXWIZARD_H #define SCALIXWIZARD_H -#include <kconfigwizard.h> +#include <tdeconfigwizard.h> #include <tdepimmacros.h> class KComboBox; diff --git a/wizards/servertype.h b/wizards/servertype.h index c7d8e7ea7..700de0e8f 100644 --- a/wizards/servertype.h +++ b/wizards/servertype.h @@ -22,7 +22,7 @@ #ifndef SERVERTYPE #define SERVERTYPE -#include <kconfigpropagator.h> +#include <tdeconfigpropagator.h> #include <klibloader.h> #include <tqobject.h> diff --git a/wizards/sloxconfig.kcfgc b/wizards/sloxconfig.kcfgc index be2757887..5ca5414cc 100644 --- a/wizards/sloxconfig.kcfgc +++ b/wizards/sloxconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=slox.kcfg ClassName=SloxConfig Singleton=true diff --git a/wizards/sloxwizard.h b/wizards/sloxwizard.h index f43525d1a..d9b24c60c 100644 --- a/wizards/sloxwizard.h +++ b/wizards/sloxwizard.h @@ -20,7 +20,7 @@ #ifndef SLOXWIZARD_H #define SLOXWIZARD_H -#include <kconfigwizard.h> +#include <tdeconfigwizard.h> #include <tdepimmacros.h> class KLineEdit; |