summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
commit64df902cf71a8ee258fb85f6be26248f399aa01f (patch)
treedba58f705042c22cea26b678d5b0e4e9a34bf202
parentde53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff)
downloadtdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz
tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--CMakeLists.txt8
-rw-r--r--MAINTAINERS4
-rw-r--r--Mainpage.dox2
-rw-r--r--Makefile.am.in4
-rw-r--r--NewsLog.txt2
-rw-r--r--README4
-rw-r--r--README.Kolab2
-rw-r--r--akregator/src/CMakeLists.txt2
-rw-r--r--akregator/src/akregator_part.cpp8
-rw-r--r--akregator/src/akregator_view.cpp6
-rw-r--r--akregator/src/akregatorconfig.kcfgc2
-rw-r--r--akregator/src/articlefilter.cpp2
-rw-r--r--akregator/src/articleviewer.cpp4
-rw-r--r--akregator/src/configdialog.h2
-rw-r--r--akregator/src/librss/image.cpp2
-rw-r--r--akregator/src/librss/loader.cpp2
-rw-r--r--akregator/src/librss/loader.h2
-rw-r--r--akregator/src/mainwindow.cpp4
-rw-r--r--akregator/src/mainwindow.h2
-rw-r--r--akregator/src/mk4storage/CMakeLists.txt2
-rw-r--r--akregator/src/pageviewer.cpp2
-rw-r--r--akregator/src/viewer.cpp2
-rw-r--r--certmanager/certificatewizardimpl.cpp4
-rw-r--r--certmanager/certmanager.cpp6
-rw-r--r--certmanager/conf/appearanceconfigwidget.cpp2
-rw-r--r--certmanager/conf/configuredialog.cpp2
-rw-r--r--certmanager/conf/dirservconfigpage.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp4
-rw-r--r--certmanager/lib/CMakeLists.txt2
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusbackend.cpp2
-rw-r--r--certmanager/lib/cryptplugfactory.cpp2
-rw-r--r--certmanager/lib/cryptplugwrapper.cpp2
-rw-r--r--certmanager/lib/kleo/CMakeLists.txt2
-rw-r--r--certmanager/lib/kleo/Makefile.am2
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.cpp2
-rw-r--r--certmanager/lib/kleo/dn.cpp2
-rw-r--r--certmanager/lib/kleo/keyfiltermanager.cpp4
-rw-r--r--certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp (renamed from certmanager/lib/kleo/kconfigbasedkeyfilter.cpp)6
-rw-r--r--certmanager/lib/kleo/tdeconfigbasedkeyfilter.h (renamed from certmanager/lib/kleo/kconfigbasedkeyfilter.h)2
-rw-r--r--certmanager/lib/ui/dnattributeorderconfigwidget.cpp2
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp2
-rw-r--r--certmanager/lib/ui/messagebox.cpp2
-rw-r--r--certmanager/storedtransferjob.h2
-rw-r--r--config.h.cmake2
-rw-r--r--dependency-graph.dot6
-rw-r--r--kaddressbook/addresseditwidget.cpp2
-rw-r--r--kaddressbook/addresseeconfig.h2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp2
-rw-r--r--kaddressbook/common/filter.cpp2
-rw-r--r--kaddressbook/common/filter.h2
-rw-r--r--kaddressbook/common/kabprefs.cpp2
-rw-r--r--kaddressbook/common/kabprefs_base.kcfgc2
-rw-r--r--kaddressbook/common/locationmap.cpp2
-rw-r--r--kaddressbook/emaileditwidget.cpp2
-rw-r--r--kaddressbook/extensionmanager.cpp2
-rw-r--r--kaddressbook/features/distributionlistwidget.cpp2
-rw-r--r--kaddressbook/imagewidget.cpp4
-rw-r--r--kaddressbook/imeditwidget.cpp2
-rw-r--r--kaddressbook/interfaces/configurewidget.h2
-rw-r--r--kaddressbook/kaddressbookview.cpp2
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp2
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp2
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp2
-rw-r--r--kaddressbook/keywidget.cpp4
-rw-r--r--kaddressbook/ldapsearchdialog.cpp2
-rw-r--r--kaddressbook/nameeditdialog.cpp2
-rw-r--r--kaddressbook/phoneeditwidget.cpp2
-rw-r--r--kaddressbook/printing/detailledstyle.cpp2
-rw-r--r--kaddressbook/soundwidget.cpp2
-rw-r--r--kaddressbook/thumbnailcreator/Makefile.am2
-rw-r--r--kaddressbook/thumbnailcreator/ldifvcardcreator.cpp2
-rw-r--r--kaddressbook/thumbnailcreator/ldifvcardcreator.h2
-rw-r--r--kaddressbook/viewconfigurefilterpage.cpp2
-rw-r--r--kaddressbook/viewconfigurewidget.cpp2
-rw-r--r--kaddressbook/viewmanager.cpp2
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp2
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp2
-rw-r--r--kaddressbook/views/contactlistview.cpp2
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp2
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp2
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp2
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp4
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp2
-rw-r--r--kaddressbook/xxport/eudora_xxport.cpp4
-rw-r--r--kaddressbook/xxport/kde2_xxport.cpp8
-rw-r--r--kaddressbook/xxport/ldif_xxport.cpp4
-rw-r--r--kaddressbook/xxport/opera_xxport.cpp4
-rw-r--r--kaddressbook/xxport/pab_xxport.cpp4
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp4
-rw-r--r--kalarm/CMakeLists.txt2
-rw-r--r--kalarm/Makefile.am4
-rw-r--r--kalarm/alarmcalendar.cpp8
-rw-r--r--kalarm/birthdaydlg.cpp2
-rw-r--r--kalarm/daemon.cpp2
-rw-r--r--kalarm/editdlg.cpp10
-rw-r--r--kalarm/functions.cpp4
-rw-r--r--kalarm/kalarmapp.cpp4
-rw-r--r--kalarm/kalarmd/adcalendar.cpp4
-rw-r--r--kalarm/kalarmd/adconfigdata.cpp2
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp4
-rw-r--r--kalarm/kamail.cpp4
-rw-r--r--kalarm/lib/messagebox.cpp2
-rw-r--r--kalarm/mainwindow.cpp2
-rw-r--r--kalarm/messagewin.cpp4
-rw-r--r--kalarm/pictdefileradio.cpp (renamed from kalarm/pickfileradio.cpp)4
-rw-r--r--kalarm/pictdefileradio.h (renamed from kalarm/pickfileradio.h)4
-rw-r--r--kalarm/preferences.cpp2
-rw-r--r--kalarm/sounddlg.cpp2
-rw-r--r--kalarm/soundpicker.cpp2
-rw-r--r--kalarm/traywindow.cpp2
-rw-r--r--kandy/src/kandy.cpp6
-rw-r--r--kandy/src/kandyprefs.kcfgc2
-rw-r--r--kandy/src/kandyview.cpp2
-rw-r--r--kandy/src/mobilegui.cpp2
-rw-r--r--kandy/src/mobilemain.cpp2
-rw-r--r--karm/karm_part.cpp2
-rw-r--r--karm/karmstorage.cpp2
-rw-r--r--karm/mainwindow.cpp2
-rw-r--r--karm/preferences.cpp2
-rw-r--r--karm/taskview.cpp4
-rw-r--r--kfile-plugins/ics/Makefile.am24
-rw-r--r--kfile-plugins/palm-databases/Makefile.am22
-rw-r--r--kfile-plugins/rfc822/Makefile.am22
-rw-r--r--kfile-plugins/vcf/Makefile.am22
-rw-r--r--kitchensync/src/configguievo2.cpp2
-rw-r--r--kitchensync/src/configguisunbird.cpp2
-rw-r--r--kmail/ChangeLog2
-rw-r--r--kmail/Makefile.am2
-rw-r--r--kmail/accountdialog.cpp4
-rw-r--r--kmail/accountmanager.cpp2
-rw-r--r--kmail/accountwizard.cpp2
-rw-r--r--kmail/acljobs.cpp2
-rw-r--r--kmail/acljobs.h2
-rw-r--r--kmail/actionscheduler.cpp2
-rw-r--r--kmail/annotationjobs.cpp2
-rw-r--r--kmail/annotationjobs.h2
-rw-r--r--kmail/antispamconfig.cpp2
-rw-r--r--kmail/antispamwizard.h2
-rw-r--r--kmail/archivefolderdialog.cpp2
-rw-r--r--kmail/cachedimapjob.cpp4
-rw-r--r--kmail/cachedimapjob.h4
-rw-r--r--kmail/configure.in.in2
-rw-r--r--kmail/configuredialog.cpp2
-rw-r--r--kmail/csshelper.cpp2
-rw-r--r--kmail/editorwatcher.cpp2
-rw-r--r--kmail/favoritefolderview.cpp2
-rw-r--r--kmail/filterimporterexporter.cpp4
-rw-r--r--kmail/filterlogdlg.cpp2
-rw-r--r--kmail/folderdiaquotatab_p.cpp2
-rw-r--r--kmail/folderjob.cpp2
-rw-r--r--kmail/folderstorage.cpp2
-rw-r--r--kmail/foldertreebase.cpp2
-rw-r--r--kmail/headeritem.cpp2
-rw-r--r--kmail/headerstrategy.cpp2
-rw-r--r--kmail/htmlstatusbar.cpp2
-rw-r--r--kmail/identitydialog.cpp4
-rw-r--r--kmail/imapaccountbase.cpp8
-rw-r--r--kmail/imapaccountbase.h4
-rw-r--r--kmail/imapjob.cpp2
-rw-r--r--kmail/imapjob.h4
-rw-r--r--kmail/kmaccount.cpp2
-rw-r--r--kmail/kmacctcachedimap.cpp8
-rw-r--r--kmail/kmacctimap.cpp4
-rw-r--r--kmail/kmacctlocal.cpp2
-rw-r--r--kmail/kmacctmaildir.cpp2
-rw-r--r--kmail/kmail.upd4
-rw-r--r--kmail/kmailicalifaceimpl.cpp2
-rw-r--r--kmail/kmcommands.cpp8
-rw-r--r--kmail/kmcommands.h2
-rw-r--r--kmail/kmcomposewin.cpp8
-rw-r--r--kmail/kmcomposewin.h2
-rw-r--r--kmail/kmedit.cpp2
-rw-r--r--kmail/kmfawidgets.cpp2
-rw-r--r--kmail/kmfilter.cpp2
-rw-r--r--kmail/kmfilteraction.cpp2
-rw-r--r--kmail/kmfilterdlg.cpp2
-rw-r--r--kmail/kmfiltermgr.cpp2
-rw-r--r--kmail/kmfolder.cpp2
-rw-r--r--kmail/kmfoldercachedimap.cpp6
-rw-r--r--kmail/kmfolderdia.cpp2
-rw-r--r--kmail/kmfolderimap.cpp4
-rw-r--r--kmail/kmfolderimap.h4
-rw-r--r--kmail/kmfoldermaildir.cpp2
-rw-r--r--kmail/kmfoldermaildir.h2
-rw-r--r--kmail/kmfoldermbox.cpp2
-rw-r--r--kmail/kmfoldermgr.cpp2
-rw-r--r--kmail/kmfoldersearch.cpp2
-rw-r--r--kmail/kmfoldertree.cpp2
-rw-r--r--kmail/kmheaders.cpp2
-rw-r--r--kmail/kmkernel.cpp6
-rw-r--r--kmail/kmkernel.h2
-rw-r--r--kmail/kmlineeditspell.cpp2
-rw-r--r--kmail/kmmainwidget.cpp2
-rw-r--r--kmail/kmmainwin.cpp2
-rw-r--r--kmail/kmmessage.cpp2
-rw-r--r--kmail/kmmimeparttree.cpp2
-rw-r--r--kmail/kmmimeparttree.h2
-rw-r--r--kmail/kmmsgpart.h2
-rw-r--r--kmail/kmmsgpartdlg.h2
-rw-r--r--kmail/kmpopfiltercnfrmdlg.cpp2
-rw-r--r--kmail/kmreaderwin.cpp4
-rw-r--r--kmail/kmsearchpattern.cpp2
-rw-r--r--kmail/kmsender.cpp6
-rw-r--r--kmail/kmsender_p.h2
-rw-r--r--kmail/kmservertest.cpp8
-rw-r--r--kmail/kmtransport.cpp2
-rw-r--r--kmail/listjob.cpp6
-rw-r--r--kmail/mailinglist-magic.cpp2
-rw-r--r--kmail/networkaccount.cpp4
-rw-r--r--kmail/objecttreeparser.cpp2
-rw-r--r--kmail/partNode.h2
-rw-r--r--kmail/popaccount.cpp6
-rw-r--r--kmail/quotajobs.cpp2
-rw-r--r--kmail/quotajobs.h2
-rw-r--r--kmail/renamejob.cpp6
-rw-r--r--kmail/searchjob.cpp8
-rw-r--r--kmail/searchwindow.cpp2
-rw-r--r--kmail/sieveconfig.cpp2
-rw-r--r--kmail/sievejob.cpp4
-rw-r--r--kmail/sievejob.h2
-rw-r--r--kmail/snippetwidget.cpp2
-rw-r--r--kmail/transportmanager.cpp2
-rw-r--r--kmail/util.h2
-rw-r--r--kmail/xfaceconfigurator.cpp4
-rw-r--r--kmailcvt/CMakeLists.txt2
-rw-r--r--kmailcvt/filter_evolution.cxx2
-rw-r--r--kmailcvt/filter_evolution_v2.cxx4
-rw-r--r--kmailcvt/filter_kmail_maildir.cxx4
-rw-r--r--kmailcvt/filter_lnotes.cxx4
-rw-r--r--kmailcvt/filter_lnotes.hxx2
-rw-r--r--kmailcvt/filter_mailapp.cxx2
-rw-r--r--kmailcvt/filter_mbox.cxx2
-rw-r--r--kmailcvt/filter_oe.cxx2
-rw-r--r--kmailcvt/filter_opera.cxx4
-rw-r--r--kmailcvt/filter_outlook.cxx2
-rw-r--r--kmailcvt/filter_plain.cxx2
-rw-r--r--kmailcvt/filter_pmail.cxx4
-rw-r--r--kmailcvt/filter_sylpheed.cxx4
-rw-r--r--kmailcvt/filter_thebat.cxx4
-rw-r--r--kmailcvt/filter_thunderbird.cxx4
-rw-r--r--kmobile/DESIGN6
-rw-r--r--kmobile/Makefile.am2
-rw-r--r--kmobile/TODO4
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.cpp4
-rw-r--r--kmobile/devices/skeleton/skeleton.cpp2
-rw-r--r--kmobile/kmobile.cpp6
-rw-r--r--kmobile/kmobileclient.cpp4
-rw-r--r--kmobile/kmobiledevice.cpp4
-rw-r--r--kmobile/kmobiledevice.h8
-rw-r--r--kmobile/kmobileiface.h2
-rw-r--r--kmobile/kmobileitem.cpp2
-rw-r--r--kmobile/kmobileview.cpp10
-rw-r--r--kmobile/kmobileview.h2
-rw-r--r--kmobile/tdeioslave/Makefile.am (renamed from kmobile/kioslave/Makefile.am)4
-rw-r--r--kmobile/tdeioslave/cellphone.protocol (renamed from kmobile/kioslave/cellphone.protocol)2
-rw-r--r--kmobile/tdeioslave/kio_mobile.cpp (renamed from kmobile/kioslave/kio_mobile.cpp)0
-rw-r--r--kmobile/tdeioslave/kio_mobile.h (renamed from kmobile/kioslave/kio_mobile.h)2
-rw-r--r--kmobile/tdeioslave/mimetypes/Makefile.am (renamed from kmobile/kioslave/mimetypes/Makefile.am)0
-rw-r--r--kmobile/tdeioslave/mimetypes/mobile_addressbook.desktop (renamed from kmobile/kioslave/mimetypes/mobile_addressbook.desktop)0
-rw-r--r--kmobile/tdeioslave/mimetypes/mobile_calendar.desktop (renamed from kmobile/kioslave/mimetypes/mobile_calendar.desktop)0
-rw-r--r--kmobile/tdeioslave/mimetypes/mobile_device.desktop (renamed from kmobile/kioslave/mimetypes/mobile_device.desktop)0
-rw-r--r--kmobile/tdeioslave/mimetypes/mobile_notes.desktop (renamed from kmobile/kioslave/mimetypes/mobile_notes.desktop)0
-rw-r--r--kmobile/tdeioslave/mobile.protocol (renamed from kmobile/kioslave/mobile.protocol)2
-rw-r--r--kmobile/tdeioslave/organizer.protocol (renamed from kmobile/kioslave/organizer.protocol)2
-rw-r--r--kmobile/tdeioslave/pda.protocol (renamed from kmobile/kioslave/pda.protocol)2
-rw-r--r--kmobile/tdeioslave/phonecamera.protocol (renamed from kmobile/kioslave/phonecamera.protocol)2
-rw-r--r--knode/articlewidget.cpp2
-rw-r--r--knode/knapplication.cpp2
-rw-r--r--knode/knarticlewindow.cpp2
-rw-r--r--knode/kncomposer.cpp2
-rw-r--r--knode/knconfig.h2
-rw-r--r--knode/knconfigwidgets.cpp2
-rw-r--r--knode/knconvert.cpp2
-rw-r--r--knode/knewsservice.protocol2
-rw-r--r--knode/knglobals.cpp2
-rw-r--r--knode/knglobals.h2
-rw-r--r--knode/knjobdata.cpp2
-rw-r--r--knode/knmainwidget.cpp2
-rw-r--r--knode/knnetaccess.cpp4
-rw-r--r--knode/knserverinfo.cpp2
-rw-r--r--knode/utilities.cpp4
-rw-r--r--knotes/TODO2
-rw-r--r--knotes/knote.cpp4
-rw-r--r--knotes/knote.h2
-rw-r--r--knotes/knoteconfigdlg.cpp2
-rw-r--r--knotes/knoteconfigdlg.h2
-rw-r--r--knotes/knoteslegacy.cpp2
-rw-r--r--kode/kodemain.cpp18
-rw-r--r--kode/kwsdl/converter.cpp2
-rw-r--r--kode/kwsdl/kung/binaryinputfield.cpp4
-rw-r--r--kode/kwsdl/kung/transport.h2
-rw-r--r--kode/kwsdl/schema/fileprovider.cpp2
-rw-r--r--kode/kwsdl/tests/google/transport.h2
-rw-r--r--kode/kxml_compiler/creator.cpp2
-rw-r--r--kode/kxml_compiler/creator.h2
-rw-r--r--kode/kxml_compiler/kxml_compiler.cpp2
-rw-r--r--kode/kxml_compiler/parser.cpp2
-rw-r--r--kode/kxml_compiler/parser.h2
-rw-r--r--konsolekalendar/konsolekalendarvariables.cpp2
-rw-r--r--konsolekalendar/main.cpp2
-rw-r--r--konsolekalendar/stdcalendar.cpp2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp2
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp2
-rw-r--r--kontact/src/kontactconfig.desktop2
-rw-r--r--kontact/src/mainwindow.cpp4
-rw-r--r--kontact/src/prefs.kcfgc2
-rw-r--r--kontact/src/profiledialog.cpp2
-rw-r--r--kontact/src/profilemanager.cpp4
-rw-r--r--korganizer/Makefile.am2
-rw-r--r--korganizer/actionmanager.cpp8
-rw-r--r--korganizer/archivedialog.cpp2
-rw-r--r--korganizer/calendarview.cpp6
-rw-r--r--korganizer/calendarview.h2
-rw-r--r--korganizer/docprefs.cpp2
-rw-r--r--korganizer/eventarchiver.cpp2
-rw-r--r--korganizer/exportwebdialog.cpp8
-rw-r--r--korganizer/freebusymanager.cpp10
-rw-r--r--korganizer/koagendaview.cpp2
-rw-r--r--korganizer/koapp.cpp2
-rw-r--r--korganizer/kocore.cpp2
-rw-r--r--korganizer/koeditorattachments.cpp6
-rw-r--r--korganizer/koeditorgeneral.cpp2
-rw-r--r--korganizer/koeditorgeneralevent.cpp2
-rw-r--r--korganizer/koeditorgeneraltodo.cpp2
-rw-r--r--korganizer/koeventviewer.h2
-rw-r--r--korganizer/koglobals.cpp2
-rw-r--r--korganizer/kogroupware.h2
-rw-r--r--korganizer/koincidenceeditor.cpp2
-rw-r--r--korganizer/komonthview.cpp2
-rw-r--r--korganizer/koprefs.cpp2
-rw-r--r--korganizer/koprefs_base.kcfgc2
-rw-r--r--korganizer/korgac/alarmdialog.cpp2
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp2
-rw-r--r--korganizer/korgac/testalarmdlg.cpp2
-rw-r--r--korganizer/korganizer.cpp4
-rw-r--r--korganizer/korganizer_part.cpp2
-rw-r--r--korganizer/koviewmanager.cpp2
-rw-r--r--korganizer/plugins/datenums/configdialog.cpp2
-rw-r--r--korganizer/plugins/datenums/datenums.cpp2
-rw-r--r--korganizer/plugins/exchange/exchange.cpp2
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.cpp2
-rw-r--r--korganizer/plugins/hebrew/configdialog.cpp2
-rw-r--r--korganizer/plugins/hebrew/hebrew.cpp2
-rw-r--r--korganizer/plugins/printing/journal/journalprint.cpp2
-rw-r--r--korganizer/plugins/printing/list/listprint.cpp2
-rw-r--r--korganizer/plugins/printing/whatsnext/whatsnextprint.cpp2
-rw-r--r--korganizer/plugins/printing/year/yearprint.cpp2
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp2
-rw-r--r--korganizer/plugins/projectview/projectview.cpp2
-rw-r--r--korganizer/plugins/timespanview/kotimespanview.cpp4
-rw-r--r--korganizer/plugins/timespanview/timespanview.cpp2
-rw-r--r--korganizer/previewdialog.cpp4
-rw-r--r--korganizer/printing/CMakeLists.txt2
-rw-r--r--korganizer/printing/Makefile.am2
-rw-r--r--korganizer/printing/calprintdefaultplugins.cpp4
-rw-r--r--korganizer/printing/calprintpluginbase.cpp2
-rw-r--r--korganizer/printing/calprintweetdeconfig_base.ui (renamed from korganizer/printing/calprintweekconfig_base.ui)0
-rw-r--r--korganizer/resourceview.cpp2
-rw-r--r--korganizer/stdcalendar.cpp2
-rw-r--r--korganizer/urihandler.cpp4
-rw-r--r--korn/CMakeLists.txt4
-rw-r--r--korn/Makefile.am2
-rw-r--r--korn/accountmanager.cpp2
-rw-r--r--korn/boxcontainer.cpp2
-rw-r--r--korn/boxcontaineritem.cpp2
-rw-r--r--korn/dcop_proto.cpp2
-rw-r--r--korn/dcopdrop.cpp2
-rw-r--r--korn/dockeditem.cpp2
-rw-r--r--korn/imap_proto.h2
-rw-r--r--korn/keditlistboxman.cpp2
-rw-r--r--korn/kio.cpp6
-rw-r--r--korn/kio_count.cpp10
-rw-r--r--korn/kio_count.h2
-rw-r--r--korn/kio_delete.cpp6
-rw-r--r--korn/kio_proto.cpp2
-rw-r--r--korn/kio_proto.h2
-rw-r--r--korn/kio_read.cpp6
-rw-r--r--korn/kio_single_subject.cpp8
-rw-r--r--korn/kio_subjects.cpp4
-rw-r--r--korn/kmail_proto.cpp2
-rw-r--r--korn/kornaccountcfgimpl.cpp2
-rw-r--r--korn/kornboxcfgimpl.cpp4
-rw-r--r--korn/korncfgimpl.cpp2
-rw-r--r--korn/kornshell.cpp2
-rw-r--r--korn/maildrop.cpp2
-rw-r--r--korn/password.cpp2
-rw-r--r--korn/polldrop.cpp2
-rw-r--r--korn/systemtray.cpp2
-rw-r--r--korn/tdeconf_update/CMakeLists.txt (renamed from korn/kconf_update/CMakeLists.txt)2
-rw-r--r--korn/tdeconf_update/Makefile.am (renamed from korn/kconf_update/Makefile.am)6
-rw-r--r--korn/tdeconf_update/korn-3-4-config_change.cpp (renamed from korn/kconf_update/korn-3-4-config_change.cpp)0
-rw-r--r--korn/tdeconf_update/korn-3-4-config_change.upd (renamed from korn/kconf_update/korn-3-4-config_change.upd)0
-rw-r--r--korn/tdeconf_update/korn-3-5-metadata-update.pl (renamed from korn/kconf_update/korn-3-5-metadata-update.pl)0
-rw-r--r--korn/tdeconf_update/korn-3-5-ssl-update.pl (renamed from korn/kconf_update/korn-3-5-ssl-update.pl)0
-rw-r--r--korn/tdeconf_update/korn-3-5-update.upd (renamed from korn/kconf_update/korn-3-5-update.upd)0
-rw-r--r--ktnef/gui/attachpropertydialog.cpp2
-rw-r--r--ktnef/gui/ktnefmain.cpp2
-rw-r--r--ktnef/lib/CMakeLists.txt2
-rw-r--r--libemailfunctions/networkstatus.cpp2
-rw-r--r--libkcal/attachmenthandler.cpp4
-rw-r--r--libkcal/convertqtopia.cpp2
-rw-r--r--libkcal/freebusyurlstore.cpp2
-rw-r--r--libkcal/htmlexportsettings.kcfgc2
-rw-r--r--libkcal/resourcecached.h2
-rw-r--r--libkcal/resourcecalendar.cpp2
-rw-r--r--libkcal/resourcecalendar.h2
-rw-r--r--libkcal/resourcelocaldir.cpp2
-rwxr-xr-xlibkcal/tests/runtestcase.pl4
-rw-r--r--libkcal/tests/testresource.cpp4
-rw-r--r--libkpgp/Makefile.am2
-rw-r--r--libkpgp/kpgp.cpp4
-rw-r--r--libkpgp/kpgpui.cpp4
-rw-r--r--libkpimexchange/configure.in.in2
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp10
-rw-r--r--libkpimexchange/core/exchangeaccount.h2
-rw-r--r--libkpimexchange/core/exchangeclient.cpp4
-rw-r--r--libkpimexchange/core/exchangedelete.cpp16
-rw-r--r--libkpimexchange/core/exchangedelete.h2
-rw-r--r--libkpimexchange/core/exchangedownload.cpp14
-rw-r--r--libkpimexchange/core/exchangedownload.h2
-rw-r--r--libkpimexchange/core/exchangemonitor.cpp12
-rw-r--r--libkpimexchange/core/exchangemonitor.h2
-rw-r--r--libkpimexchange/core/exchangeprogress.cpp2
-rw-r--r--libkpimexchange/core/exchangeupload.cpp12
-rw-r--r--libkpimexchange/core/exchangeupload.h2
-rw-r--r--libkpimidentities/identity.cpp4
-rw-r--r--libkpimidentities/identitymanager.cpp4
-rw-r--r--libtdepim/CMakeLists.txt4
-rw-r--r--libtdepim/Makefile.am4
-rw-r--r--libtdepim/addresseeview.cpp4
-rw-r--r--libtdepim/cfgc/README2
-rw-r--r--libtdepim/cfgc/autoexample.cpp2
-rw-r--r--libtdepim/cfgc/example.cpp2
-rw-r--r--libtdepim/cfgc/exampleprefs_base.kcfgc2
-rw-r--r--libtdepim/completionordereditor.h2
-rw-r--r--libtdepim/csshelper.cpp2
-rw-r--r--libtdepim/groupwarejob.cpp2
-rw-r--r--libtdepim/groupwarejob.h2
-rw-r--r--libtdepim/kaccount.cpp2
-rw-r--r--libtdepim/kcmdesignerfields.cpp4
-rw-r--r--libtdepim/kfoldertree.cpp2
-rw-r--r--libtdepim/kimportdialog.cpp2
-rw-r--r--libtdepim/komposer/core/core.cpp2
-rw-r--r--libtdepim/komposer/core/komposerconfig.desktop2
-rw-r--r--libtdepim/komposer/core/settings.kcfgc2
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp2
-rw-r--r--libtdepim/kpimprefs.cpp2
-rw-r--r--libtdepim/kpimprefs.h2
-rw-r--r--libtdepim/kprefsdialog.cpp2
-rw-r--r--libtdepim/kprefsdialog.h4
-rw-r--r--libtdepim/kresourceprefs.h2
-rw-r--r--libtdepim/ldapclient.cpp2
-rw-r--r--libtdepim/ldapclient.h4
-rw-r--r--libtdepim/ldapsearchdialog.cpp2
-rw-r--r--libtdepim/recentaddresses.cpp2
-rw-r--r--libtdepim/tdeconfigpropagator.cpp (renamed from libtdepim/kconfigpropagator.cpp)6
-rw-r--r--libtdepim/tdeconfigpropagator.h (renamed from libtdepim/kconfigpropagator.h)0
-rw-r--r--libtdepim/tdeconfigwizard.cpp (renamed from libtdepim/kconfigwizard.cpp)6
-rw-r--r--libtdepim/tdeconfigwizard.h (renamed from libtdepim/kconfigwizard.h)2
-rw-r--r--libtdepim/tdefileio.cpp (renamed from libtdepim/kfileio.cpp)2
-rw-r--r--libtdepim/tdefileio.h (renamed from libtdepim/kfileio.h)6
-rw-r--r--libtdepim/tdepartsdesignerplugin/CMakeLists.txt2
-rw-r--r--libtdepim/tests/myconfig.kcfgc2
-rw-r--r--libtdepim/tests/testdistrlist.cpp4
-rw-r--r--libtdepim/tests/testwizard.cpp2
-rw-r--r--plugins/kmail/bodypartformatter/text_calendar.cpp6
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp4
-rw-r--r--tdefile-plugins/CMakeLists.txt (renamed from kfile-plugins/CMakeLists.txt)0
-rw-r--r--tdefile-plugins/Makefile.am (renamed from kfile-plugins/Makefile.am)0
-rw-r--r--tdefile-plugins/RETURNED_ITEMS (renamed from kfile-plugins/RETURNED_ITEMS)0
-rw-r--r--tdefile-plugins/ics/CMakeLists.txt (renamed from kfile-plugins/ics/CMakeLists.txt)8
-rw-r--r--tdefile-plugins/ics/Makefile.am24
-rw-r--r--tdefile-plugins/ics/tdefile_ics.cpp (renamed from kfile-plugins/ics/kfile_ics.cpp)6
-rw-r--r--tdefile-plugins/ics/tdefile_ics.desktop (renamed from kfile-plugins/ics/kfile_ics.desktop)2
-rw-r--r--tdefile-plugins/ics/tdefile_ics.h (renamed from kfile-plugins/ics/kfile_ics.h)2
-rw-r--r--tdefile-plugins/palm-databases/Makefile.am22
-rw-r--r--tdefile-plugins/palm-databases/tdefile_palm.cpp (renamed from kfile-plugins/palm-databases/kfile_palm.cpp)6
-rw-r--r--tdefile-plugins/palm-databases/tdefile_palm.desktop (renamed from kfile-plugins/palm-databases/kfile_palm.desktop)2
-rw-r--r--tdefile-plugins/palm-databases/tdefile_palm.h (renamed from kfile-plugins/palm-databases/kfile_palm.h)2
-rw-r--r--tdefile-plugins/rfc822/Makefile.am22
-rw-r--r--tdefile-plugins/rfc822/RETURNED_ITEMS (renamed from kfile-plugins/rfc822/RETURNED_ITEMS)0
-rw-r--r--tdefile-plugins/rfc822/tdefile_rfc822.cpp (renamed from kfile-plugins/rfc822/kfile_rfc822.cpp)6
-rw-r--r--tdefile-plugins/rfc822/tdefile_rfc822.desktop (renamed from kfile-plugins/rfc822/kfile_rfc822.desktop)2
-rw-r--r--tdefile-plugins/rfc822/tdefile_rfc822.h (renamed from kfile-plugins/rfc822/kfile_rfc822.h)2
-rw-r--r--tdefile-plugins/vcf/CMakeLists.txt (renamed from kfile-plugins/vcf/CMakeLists.txt)8
-rw-r--r--tdefile-plugins/vcf/Makefile.am22
-rw-r--r--tdefile-plugins/vcf/tdefile_vcf.cpp (renamed from kfile-plugins/vcf/kfile_vcf.cpp)6
-rw-r--r--tdefile-plugins/vcf/tdefile_vcf.desktop (renamed from kfile-plugins/vcf/kfile_vcf.desktop)2
-rw-r--r--tdefile-plugins/vcf/tdefile_vcf.h (renamed from kfile-plugins/vcf/kfile_vcf.h)2
-rw-r--r--tdeioslaves/CMakeLists.txt (renamed from kioslaves/CMakeLists.txt)2
-rw-r--r--tdeioslaves/ConfigureChecks.cmake (renamed from kioslaves/ConfigureChecks.cmake)0
-rw-r--r--tdeioslaves/Mainpage.dox (renamed from kioslaves/Mainpage.dox)0
-rw-r--r--tdeioslaves/Makefile.am (renamed from kioslaves/Makefile.am)2
-rw-r--r--tdeioslaves/configure.in.bot (renamed from kioslaves/configure.in.bot)0
-rw-r--r--tdeioslaves/configure.in.in (renamed from kioslaves/configure.in.in)0
-rw-r--r--tdeioslaves/imap4/CMakeLists.txt (renamed from kioslaves/imap4/CMakeLists.txt)2
-rw-r--r--tdeioslaves/imap4/Makefile.am (renamed from kioslaves/imap4/Makefile.am)2
-rw-r--r--tdeioslaves/imap4/PATCHING (renamed from kioslaves/imap4/PATCHING)0
-rw-r--r--tdeioslaves/imap4/README (renamed from kioslaves/imap4/README)2
-rw-r--r--tdeioslaves/imap4/configure.in.in (renamed from kioslaves/imap4/configure.in.in)0
-rw-r--r--tdeioslaves/imap4/imap4.cc (renamed from kioslaves/imap4/imap4.cc)6
-rw-r--r--tdeioslaves/imap4/imap4.h (renamed from kioslaves/imap4/imap4.h)2
-rw-r--r--tdeioslaves/imap4/imap4.protocol (renamed from kioslaves/imap4/imap4.protocol)2
-rw-r--r--tdeioslaves/imap4/imapcommand.cc (renamed from kioslaves/imap4/imapcommand.cc)6
-rw-r--r--tdeioslaves/imap4/imapcommand.h (renamed from kioslaves/imap4/imapcommand.h)0
-rw-r--r--tdeioslaves/imap4/imapinfo.cc (renamed from kioslaves/imap4/imapinfo.cc)0
-rw-r--r--tdeioslaves/imap4/imapinfo.h (renamed from kioslaves/imap4/imapinfo.h)0
-rw-r--r--tdeioslaves/imap4/imaplist.cc (renamed from kioslaves/imap4/imaplist.cc)0
-rw-r--r--tdeioslaves/imap4/imaplist.h (renamed from kioslaves/imap4/imaplist.h)0
-rw-r--r--tdeioslaves/imap4/imapparser.cc (renamed from kioslaves/imap4/imapparser.cc)0
-rw-r--r--tdeioslaves/imap4/imapparser.h (renamed from kioslaves/imap4/imapparser.h)4
-rw-r--r--tdeioslaves/imap4/imaps.protocol (renamed from kioslaves/imap4/imaps.protocol)2
-rw-r--r--tdeioslaves/imap4/mailaddress.cc (renamed from kioslaves/imap4/mailaddress.cc)0
-rw-r--r--tdeioslaves/imap4/mailaddress.h (renamed from kioslaves/imap4/mailaddress.h)0
-rw-r--r--tdeioslaves/imap4/mailheader.cc (renamed from kioslaves/imap4/mailheader.cc)0
-rw-r--r--tdeioslaves/imap4/mailheader.h (renamed from kioslaves/imap4/mailheader.h)0
-rw-r--r--tdeioslaves/imap4/mimehdrline.cc (renamed from kioslaves/imap4/mimehdrline.cc)0
-rw-r--r--tdeioslaves/imap4/mimehdrline.h (renamed from kioslaves/imap4/mimehdrline.h)0
-rw-r--r--tdeioslaves/imap4/mimeheader.cc (renamed from kioslaves/imap4/mimeheader.cc)0
-rw-r--r--tdeioslaves/imap4/mimeheader.h (renamed from kioslaves/imap4/mimeheader.h)0
-rw-r--r--tdeioslaves/imap4/mimeio.cc (renamed from kioslaves/imap4/mimeio.cc)0
-rw-r--r--tdeioslaves/imap4/mimeio.h (renamed from kioslaves/imap4/mimeio.h)0
-rw-r--r--tdeioslaves/imap4/rfcdecoder.cc (renamed from kioslaves/imap4/rfcdecoder.cc)0
-rw-r--r--tdeioslaves/imap4/rfcdecoder.h (renamed from kioslaves/imap4/rfcdecoder.h)0
-rw-r--r--tdeioslaves/imap4/selectinfo.h (renamed from kioslaves/imap4/selectinfo.h)0
-rw-r--r--tdeioslaves/mbox/AUTHORS (renamed from kioslaves/mbox/AUTHORS)0
-rw-r--r--tdeioslaves/mbox/CMakeLists.txt (renamed from kioslaves/mbox/CMakeLists.txt)2
-rw-r--r--tdeioslaves/mbox/Makefile.am (renamed from kioslaves/mbox/Makefile.am)0
-rw-r--r--tdeioslaves/mbox/README (renamed from kioslaves/mbox/README)2
-rw-r--r--tdeioslaves/mbox/mbox.cc (renamed from kioslaves/mbox/mbox.cc)4
-rw-r--r--tdeioslaves/mbox/mbox.h (renamed from kioslaves/mbox/mbox.h)4
-rw-r--r--tdeioslaves/mbox/mbox.protocol (renamed from kioslaves/mbox/mbox.protocol)0
-rw-r--r--tdeioslaves/mbox/mboxfile.cc (renamed from kioslaves/mbox/mboxfile.cc)2
-rw-r--r--tdeioslaves/mbox/mboxfile.h (renamed from kioslaves/mbox/mboxfile.h)2
-rw-r--r--tdeioslaves/mbox/readmbox.cc (renamed from kioslaves/mbox/readmbox.cc)4
-rw-r--r--tdeioslaves/mbox/readmbox.h (renamed from kioslaves/mbox/readmbox.h)2
-rw-r--r--tdeioslaves/mbox/stat.cc (renamed from kioslaves/mbox/stat.cc)4
-rw-r--r--tdeioslaves/mbox/stat.h (renamed from kioslaves/mbox/stat.h)4
-rw-r--r--tdeioslaves/mbox/urlinfo.cc (renamed from kioslaves/mbox/urlinfo.cc)2
-rw-r--r--tdeioslaves/mbox/urlinfo.h (renamed from kioslaves/mbox/urlinfo.h)2
-rw-r--r--tdeioslaves/opengroupware/Makefile.am (renamed from kioslaves/opengroupware/Makefile.am)0
-rw-r--r--tdeioslaves/opengroupware/opengroupware.cpp (renamed from kioslaves/opengroupware/opengroupware.cpp)4
-rw-r--r--tdeioslaves/opengroupware/opengroupware.h (renamed from kioslaves/opengroupware/opengroupware.h)2
-rw-r--r--tdeioslaves/opengroupware/opengroupware.protocol (renamed from kioslaves/opengroupware/opengroupware.protocol)2
-rw-r--r--tdeioslaves/opengroupware/opengroupwares.protocol (renamed from kioslaves/opengroupware/opengroupwares.protocol)2
-rw-r--r--tdeioslaves/opengroupware/webdavhandler.cpp (renamed from kioslaves/opengroupware/webdavhandler.cpp)2
-rw-r--r--tdeioslaves/opengroupware/webdavhandler.h (renamed from kioslaves/opengroupware/webdavhandler.h)0
-rw-r--r--tdeioslaves/sieve/CMakeLists.txt (renamed from kioslaves/sieve/CMakeLists.txt)2
-rw-r--r--tdeioslaves/sieve/Makefile.am (renamed from kioslaves/sieve/Makefile.am)2
-rw-r--r--tdeioslaves/sieve/configure.in.in (renamed from kioslaves/sieve/configure.in.in)0
-rw-r--r--tdeioslaves/sieve/draft-daboo-sieve-include.txt (renamed from kioslaves/sieve/draft-daboo-sieve-include.txt)0
-rw-r--r--tdeioslaves/sieve/draft-daboo-sieve-spamtest.txt (renamed from kioslaves/sieve/draft-daboo-sieve-spamtest.txt)0
-rw-r--r--tdeioslaves/sieve/draft-degener-sieve-body-00.txt (renamed from kioslaves/sieve/draft-degener-sieve-body-00.txt)0
-rw-r--r--tdeioslaves/sieve/draft-degener-sieve-copy.txt (renamed from kioslaves/sieve/draft-degener-sieve-copy.txt)0
-rw-r--r--tdeioslaves/sieve/draft-degener-sieve-editheader.txt (renamed from kioslaves/sieve/draft-degener-sieve-editheader.txt)0
-rw-r--r--tdeioslaves/sieve/draft-degener-sieve-multiscript.txt (renamed from kioslaves/sieve/draft-degener-sieve-multiscript.txt)0
-rw-r--r--tdeioslaves/sieve/draft-homme-sieve-variables.txt (renamed from kioslaves/sieve/draft-homme-sieve-variables.txt)0
-rw-r--r--tdeioslaves/sieve/draft-martin-managesieve-04.txt (renamed from kioslaves/sieve/draft-martin-managesieve-04.txt)0
-rw-r--r--tdeioslaves/sieve/draft-martin-sieve-notify-01.txt (renamed from kioslaves/sieve/draft-martin-sieve-notify-01.txt)0
-rw-r--r--tdeioslaves/sieve/draft-melnikov-sieve-imapflags.txt (renamed from kioslaves/sieve/draft-melnikov-sieve-imapflags.txt)0
-rw-r--r--tdeioslaves/sieve/draft-murchison-sieve-regex-06.txt (renamed from kioslaves/sieve/draft-murchison-sieve-regex-06.txt)0
-rw-r--r--tdeioslaves/sieve/draft-murchison-sieve-subaddress-05.txt (renamed from kioslaves/sieve/draft-murchison-sieve-subaddress-05.txt)0
-rw-r--r--tdeioslaves/sieve/draft-showalter-sieve-vacation-04.txt (renamed from kioslaves/sieve/draft-showalter-sieve-vacation-04.txt)0
-rw-r--r--tdeioslaves/sieve/rfc3028.txt (renamed from kioslaves/sieve/rfc3028.txt)0
-rw-r--r--tdeioslaves/sieve/rfc3431.txt (renamed from kioslaves/sieve/rfc3431.txt)0
-rw-r--r--tdeioslaves/sieve/sieve.cpp (renamed from kioslaves/sieve/sieve.cpp)0
-rw-r--r--tdeioslaves/sieve/sieve.h (renamed from kioslaves/sieve/sieve.h)4
-rw-r--r--tdeioslaves/sieve/sieve.protocol (renamed from kioslaves/sieve/sieve.protocol)0
-rw-r--r--tderesources/birthdays/resourcekabc.cpp2
-rw-r--r--tderesources/birthdays/resourcekabc.h2
-rw-r--r--tderesources/blogging/API_Blog.h2
-rw-r--r--tderesources/blogging/xmlrpcjob.cpp4
-rw-r--r--tderesources/blogging/xmlrpcjob.h4
-rw-r--r--tderesources/caldav/prefsskel.kcfgc2
-rw-r--r--tderesources/caldav/resource.h2
-rw-r--r--tderesources/carddav/prefsskel.kcfgc2
-rw-r--r--tderesources/carddav/resource.h2
-rw-r--r--tderesources/egroupware/kabc_egroupwareprefs.kcfgc2
-rw-r--r--tderesources/egroupware/kabc_resourcexmlrpc.cpp2
-rw-r--r--tderesources/egroupware/kcal_egroupwareprefs.kcfgc2
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.h2
-rw-r--r--tderesources/egroupware/knotes_egroupwareprefs.kcfgc2
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.h2
-rw-r--r--tderesources/egroupware/xmlrpciface.cpp2
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplan.h2
-rw-r--r--tderesources/featureplan/prefs.kcfgc2
-rw-r--r--tderesources/groupdav/groupdavaddressbookadaptor.cpp2
-rw-r--r--tderesources/groupdav/groupdavglobals.cpp4
-rw-r--r--tderesources/groupware/kabc_resourcegroupware.cpp2
-rw-r--r--tderesources/groupware/kabc_resourcegroupware.h2
-rw-r--r--tderesources/groupware/kcal_groupwareprefsbase.kcfgc2
-rw-r--r--tderesources/groupware/kcal_resourcegroupware.h6
-rw-r--r--tderesources/groupware/kcal_resourcegroupwareconfig.h2
-rw-r--r--tderesources/groupwise/CMakeLists.txt2
-rw-r--r--tderesources/groupwise/Makefile.am2
-rw-r--r--tderesources/groupwise/kabc_resourcegroupwise.cpp2
-rw-r--r--tderesources/groupwise/kabc_resourcegroupwise.h2
-rw-r--r--tderesources/groupwise/kcal_groupwiseprefsbase.kcfgc2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.h4
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.cpp6
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.h4
-rw-r--r--tderesources/groupwise/soap/ksslsocket.cpp6
-rw-r--r--tderesources/groupwise/soap/ksslsocket.h2
-rw-r--r--tderesources/groupwise/soap/soapdebug.cpp2
-rw-r--r--tderesources/groupwise/tdeioslave/CMakeLists.txt (renamed from tderesources/groupwise/kioslave/CMakeLists.txt)0
-rw-r--r--tderesources/groupwise/tdeioslave/Makefile.am (renamed from tderesources/groupwise/kioslave/Makefile.am)2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.cpp (renamed from tderesources/groupwise/kioslave/groupwise.cpp)2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.h (renamed from tderesources/groupwise/kioslave/groupwise.h)2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.protocol (renamed from tderesources/groupwise/kioslave/groupwise.protocol)2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwises.protocol (renamed from tderesources/groupwise/kioslave/groupwises.protocol)2
-rw-r--r--tderesources/kolab/CMakeLists.txt4
-rw-r--r--tderesources/kolab/Makefile.am2
-rw-r--r--tderesources/kolab/kabc/contact.cpp2
-rw-r--r--tderesources/kolab/kabc/resourcekolab.cpp8
-rw-r--r--tderesources/kolab/kcal/incidence.cpp2
-rw-r--r--tderesources/kolab/kcal/resourcekolab.cpp8
-rw-r--r--tderesources/lib/addressbookadaptor.cpp2
-rw-r--r--tderesources/lib/calendaradaptor.cpp2
-rw-r--r--tderesources/lib/davaddressbookadaptor.cpp4
-rw-r--r--tderesources/lib/davcalendaradaptor.cpp2
-rw-r--r--tderesources/lib/folderlister.cpp4
-rw-r--r--tderesources/lib/groupwaredataadaptor.cpp2
-rw-r--r--tderesources/lib/groupwaredownloadjob.cpp2
-rw-r--r--tderesources/lib/groupwareresourcejob.h2
-rw-r--r--tderesources/lib/groupwareuploadjob.cpp2
-rw-r--r--tderesources/lib/groupwareuploadjob.h2
-rw-r--r--tderesources/lib/kcal_cachesettingsdlg.h2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.cpp2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.h2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebaseconfig.h2
-rw-r--r--tderesources/newexchange/exchangeaddressbookadaptor.cpp2
-rw-r--r--tderesources/newexchange/exchangecalendaradaptor.cpp2
-rw-r--r--tderesources/newexchange/exchangeglobals.cpp4
-rw-r--r--tderesources/remote/resourceremote.cpp2
-rw-r--r--tderesources/remote/resourceremote.h2
-rw-r--r--tderesources/scalix/CMakeLists.txt2
-rw-r--r--tderesources/scalix/Makefile.am2
-rw-r--r--tderesources/scalix/kabc/resourcescalix.cpp8
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp8
-rw-r--r--tderesources/scalix/scalixadmin/jobs.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/jobs.h2
-rw-r--r--tderesources/scalix/scalixadmin/passwordpage.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/settings.cpp4
-rw-r--r--tderesources/scalix/scalixadmin/settings.h4
-rw-r--r--tderesources/scalix/tdeioslave/CMakeLists.txt (renamed from tderesources/scalix/kioslave/CMakeLists.txt)0
-rw-r--r--tderesources/scalix/tdeioslave/Makefile.am (renamed from tderesources/scalix/kioslave/Makefile.am)2
-rw-r--r--tderesources/scalix/tdeioslave/scalix.cpp (renamed from tderesources/scalix/kioslave/scalix.cpp)2
-rw-r--r--tderesources/scalix/tdeioslave/scalix.h (renamed from tderesources/scalix/kioslave/scalix.h)4
-rw-r--r--tderesources/scalix/tdeioslave/scalix.protocol (renamed from tderesources/scalix/kioslave/scalix.protocol)2
-rw-r--r--tderesources/scalix/tdeioslave/scalixs.protocol (renamed from tderesources/scalix/kioslave/scalixs.protocol)2
-rw-r--r--tderesources/slox/kabcresourceslox.cpp4
-rw-r--r--tderesources/slox/kabcsloxprefs.kcfgc2
-rw-r--r--tderesources/slox/kcalresourceslox.cpp4
-rw-r--r--tderesources/slox/kcalresourceslox.h2
-rw-r--r--tderesources/slox/kcalsloxprefs.kcfgc2
-rw-r--r--tderesources/slox/sloxaccounts.cpp6
-rw-r--r--tderesources/slox/sloxfoldermanager.cpp4
-rw-r--r--tderesources/slox/webdavhandler.cpp2
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime.h4
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp2
-rw-r--r--tderesources/tvanytime/kcal_tvanytimeprefsbase.kcfgc2
-rw-r--r--wizards/egroupwareconfig.kcfgc2
-rw-r--r--wizards/egroupwarewizard.h2
-rw-r--r--wizards/exchangewizard.h2
-rw-r--r--wizards/groupwiseconfig.kcfgc2
-rw-r--r--wizards/groupwisewizard.h2
-rw-r--r--wizards/kmailchanges.h4
-rw-r--r--wizards/kolabconfig.kcfgc2
-rw-r--r--wizards/kolabkmailchanges.cpp2
-rw-r--r--wizards/kolabkmailchanges.h2
-rw-r--r--wizards/kolabwizard.h2
-rw-r--r--wizards/scalixconfig.kcfgc2
-rw-r--r--wizards/scalixkmailchanges.cpp2
-rw-r--r--wizards/scalixkmailchanges.h2
-rw-r--r--wizards/scalixwizard.h2
-rw-r--r--wizards/servertype.h2
-rw-r--r--wizards/sloxconfig.kcfgc2
-rw-r--r--wizards/sloxwizard.h2
685 files changed, 986 insertions, 986 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 259b7320..5a6e8d87 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 a4ee9665..3a2dc538 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 eaf9f1f2..f3311b22 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 dd70a20c..77bd7367 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 cc5cdc4c..9b36e32f 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)
diff --git a/README b/README
index 9139a476..2837f0b9 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ What it is
* kontact: Integrated PIM application
* karm: Time tracker.
* kitchensync: Synchronization framework, still under heavy development.
-* kfile-plugins: vCard KFIleItem plugin.
+* tdefile-plugins: vCard KFIleItem plugin.
* knotes: yellow notes application
* konsolecalendar: Command line tool for accessing calendar files.
* korn: mail checker
@@ -53,7 +53,7 @@ There is also quite an amount of infrastructure in this package:
plugin of KOrganizer
* kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of
KOrganizer (yes, we should decide for one of the Gantt libs)
-* kioslaves/sieve: Sieve kioslave
+* tdeioslaves/sieve: Sieve tdeioslave
* ktnef: handling of tnef data
The following subdirectories have been moved to kdenonbeta/tdepim:
diff --git a/README.Kolab b/README.Kolab
index 8253c447..85181185 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 621880eb..b1bb367d 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 3ea4e798..3ff787ea 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 3066760a..d9f39710 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 5602bc56..66183471 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 27ecd64e..1bb5646a 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 dfd48ffe..68af3860 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 db2161cb..3fd7c8f2 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 4dff9822..383d76b9 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 12036ec9..ea0134e6 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 a0c9f29d..0d5ec596 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 f6e5ec18..293d60ad 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 bb3ca733..6f0374b6 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 99ff7a2a..c229d6ec 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 d80cccfb..19523722 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 299cedd1..74f2ca2a 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 364c5cd0..f153674b 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 7c86e8b2..9c1fe389 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 96c0bfff..3c2c7c04 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 fde9df9d..83879de8 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 40ab0998..769b9532 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 200175b2..1cb31ef4 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 9bcd0b39..6dbca982 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 79c729f3..74dc46ea 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 da875e30..53ad316d 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 a5015a54..50db2ab7 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 f997e930..eb2ccafe 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 63d238e7..aab4ce21 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 ad9054d1..b81d43bf 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 f67343ca..0397e168 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 3249cc73..847127ea 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 1276f9fd..1aa2b170 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 4ed6ab37..05c6d04d 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 Klarlvdalens 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 487b3791..3d65e7a2 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 Klarlvdalens Datakonsult AB
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 4cfcfb20..67f1929e 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 adb25749..b785137d 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 96b710c3..571ceccd 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 7fab7706..276d5db4 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 89b739ae..9a020efb 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 5cd9d0cf..9e9953d4 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 4e4b6e61..5d17f4ef 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 a0dcd45a..c267dce1 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 e4cd5a3a..c1173b37 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 1872ecea..e312fbcd 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 e8518b8e..68df1036 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 8a45fc14..1f9e2410 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 75e0d84d..bc54ae65 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 e1f23e66..11fd2c11 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 3d94d3b7..a04a88a9 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 aa17b625..dea1170e 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 c49deee6..f48b5e96 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 1d64fde3..9ba87d46 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 2f40f5de..9f727120 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 d1d23c8c..e8df353d 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 15ea63ba..98668618 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 6bbc45be..ce58d272 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 18cb1a90..d63247a4 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 0f33eca6..12ff1104 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 b3fd9af2..8f0ca7bc 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 6537bebe..b9bdd1f6 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 8f70f0f8..1bba99ff 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 ff787e12..6d3ef0b9 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 a8062651..949c1783 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 f4558258..f7beaf20 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 d0d4c789..2f8ba9c8 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 7460ad80..4627ebd5 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 2de6c7b4..04f78831 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 9602f2d3..3dd0d7d6 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 415430d9..f2153f82 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 edafa411..bfb02760 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 347bd423..b1e6233e 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 987feb17..2551be98 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 c4552232..25c66ac4 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 30e1ca67..f69ce0c1 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 adf3de0e..60bae788 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 d951655b..4c39c13b 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 f3d47bfc..673a0ec7 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 40c209dc..4a363e76 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 402665ab..c443cce3 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 f5abefde..6d8fd80e 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 f0c13e61..67c3684d 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 800f11fa..f1547481 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 911e92de..c4db37a9 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 34a6809f..8e219fca 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 b93cc671..cd7295a4 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 a8e0e8bd..defbcce7 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 1e64b046..26d2eb70 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 0727507f..76b040da 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 707865f8..1c37f974 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 62c445ad..daf4406d 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 4723c342..e637f22f 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 29f498fc..5fa0d495 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 db2e4e3d..e499f481 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 0253e320..3f728bdb 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 75bb4d2d..4b2ff902 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 e0c50d3c..cc9c0248 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 721ee5ea..4e78ef08 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 765678c6..08706246 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 0315b8f4..7c17edd0 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 15b56d94..80911c29 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 f30ca7f6..ad6e0c25 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 24669fbe..2e057eaf 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 1f386f30..d93a3b68 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 00f31893..1ae3a6a8 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 58e8232c..8bcad17e 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 f7c29d0c..eeae6f2d 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 c615f6fc..55a2574b 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 99336c92..fbf5deaa 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 00cfea89..a4217be0 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 318b3eaa..43210ba8 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 b8426f22..36a71043 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 bda5831b..0eb16c1e 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 7e692092..dc9b3344 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 1dd13625..005243ce 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 eb63da48..bcabad37 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 1a2378e5..00000000
--- 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 fa60fd22..00000000
--- 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 f8fa6f94..00000000
--- 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 087600d7..00000000
--- 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 c313ce3a..4d5c2edc 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 99e86f3c..6a3b9aa6 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 1873a13d..2f263c27 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 6fcc46de..5f8cc6e4 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 8937fb48..73c3e3f0 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 a2bb384f..eeed8f66 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 89861527..68ba83b9 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 2aa55b0c..4b5f54f6 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 b4bfd0df..dd988343 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 6f8e43b0..738d6285 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 6aa4d932..c2fd8267 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 8b50a025..2e7529f2 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 9a1c8347..2563e4ee 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 ed9e4a3b..031a995a 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 4f58f56c..49c9b1c3 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 143c18c5..7b1fd517 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 592ba392..bdf64541 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 694a8359..55bf6b17 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 7b24e228..61e131b2 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 61bdbdd1..e5bfb7bf 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 06368967..da78a64d 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 8b629f83..24a32bb0 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 3f6208d6..1aee8fa9 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 911f85a4..25fb7d5c 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 1faf61a1..103d961e 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 852082a9..657d1a9b 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 00368e6d..7be5c26a 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 b2f82ad9..e51eaecf 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 3dbb2b9f..26f5957c 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 4bd06811..afa581a1 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 d2c35b42..fb382e15 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 f180d61d..0e4e3c14 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 e97a260e..f464f087 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 ec08ea5f..f1bf03f0 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 2fee6acf..52a11083 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 2f7a0401..c8e00e14 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 64f13d76..f89b7870 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 473b0b99..de22e7f6 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 a70091e7..70a5f0ca 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 813d180c..0e941b42 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 5a203c2d..226d99a5 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 150393ba..3300b258 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 fbafbc1b..b747be68 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 023c887d..95d6108b 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 3bb20988..dab733cc 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 d635b647..fe145b82 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 840d3434..eb108b06 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 8301a12c..6f03e87d 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 0183cf88..f5fa9f9a 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 e9e9f379..2898990d 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 06dbb56e..1fce0df5 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 fd00a3cc..b5010cc3 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 1f5d9ad5..ac2915e7 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 5c4af405..88338a05 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 4ce92cb1..ab66c95f 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 3f7208a9..ad13ac2e 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 07a52c5c..ead0a943 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 490b13a6..5f454c59 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 c6fa7be2..6f291f41 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 fc199031..b4bdb3c5 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 13799680..1579db0c 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 2c3d10a5..44d2a153 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 fa34f5b9..038ddbe1 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 9d259f56..9a7cd477 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 2ed379c9..6910ad6e 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 354fe768..1761a762 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 9d2b5070..5d80d659 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 acf0b0c0..7916c1be 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 14ccaba0..8681ff9e 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 8e14e984..ee785801 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 aabc14bc..5b4f8cf9 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 74cbe62e..48456824 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 a5634b09..606c515f 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 9d69f87c..b49b5a30 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 78588eb1..0132be01 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 5cbbacda..fa9faafb 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 0568035b..2405a3e5 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 0d94c149..1ab6381e 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 d6a2f8ad..bf9a819c 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 f87fd2a3..d07dcf34 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 8548670a..d2326394 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 2092376f..2432031b 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 79efe49c..d8ee1e10 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 e199e3d0..1f927084 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 62581bf9..93693dd7 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 6ea48bf0..7051542b 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 b764c9df..20328dde 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 0d6c6e75..e20b1f13 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 b08d7f91..f8272cac 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 3e453b50..1749fe0e 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 5e2a43d3..7b1b80e3 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 6e3040bd..f7af79c2 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 15bf5f07..849cba8b 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 8e185f3a..61ebc7a6 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 3e823a7a..96f0a608 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 84e31614..fb1d3a90 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 4997386e..b7ba16f1 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 ced8f771..158d9abb 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 30b01cba..aa4aac28 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 5a279b92..e35b2e0e 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 26b2ce6b..9a566690 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 900b134b..017385d4 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 d6095319..34192f6a 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 594313ae..9305e644 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 4bd3c423..8d987d0d 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 709fa6ce..430ae83e 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 90e05aff..51df3235 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 1ecc6c79..78bfec07 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 a87ee39a..22c7a615 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 65e2eae4..784c0b10 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 a5a9f407..63d2848b 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 04abea3d..b29d1338 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 699e3adb..d79c8f4b 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 2174c681..af03a099 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 52cd9858..499caedb 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 ea739dac..d92e7efd 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 287a3d9a..90ea509e 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 69f90bd9..91fab181 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 457393bb..33b60b83 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 95a014a6..1f33996e 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 3a7c77b0..564681cd 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 2453b3ba..3e2663b5 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 9c95efe8..2eef7c53 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 d1e03132..3c970ab1 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 111a26e5..ffd568ea 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 60974b26..bac1a9ae 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 dec9924a..e7e97854 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 0080b57a..f90c9adf 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 39e2a53e..4672349f 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 6f9d2420..df5288ec 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 5f37df78..c47e2547 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 e8cff4fa..e8cff4fa 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 f534514f..05a30a22 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 5105c51b..5105c51b 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 cf56e024..cf56e024 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 09d133ab..09d133ab 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 2f59d2de..2f59d2de 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 7878c13d..7878c13d 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 7b8385f8..e87d7154 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 b211a74f..3b83e002 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 cbab2e03..8113b5bf 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 7a0b341f..296ebccb 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 b66b1a6f..ae4ab2cb 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 d6bf44c9..b607da53 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 bf05ec11..a45cf773 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 fa92c045..6a31f805 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 17ee8a52..c8605049 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 9e80e1b8..8a1c3fbc 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 ba95e9a3..619833d7 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 6adc5e95..28a177fe 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 bfed08e1..48a25716 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 2b535ac8..a2bde078 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 b79b3199..0d626983 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 f2728f8d..30edb5ed 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 b81ccfa9..59cc0455 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 307c72ff..6af554ce 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 31d36369..2274d2ef 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 202f563d..70e3eb6a 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 a90d891b..dd3940c8 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 880a85a4..cc12dcdc 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 f35ad9e9..6b01b7b8 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 5d7118ca..a72859a1 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 6c59f13e..fc8c71b4 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 4f513757..288b9ac5 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 253b6bd2..f5d90478 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 4512edbe..95ea292e 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 71c4fa9d..46355525 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 d12d4eee..945f7261 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 0b5b49fa..a0873e26 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 3d4983f9..b297cc78 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 2103f928..33ab410c 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 bb4b2425..4f3fe3ed 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 9a123581..9881aff5 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 6efd6f74..ce5d65e2 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 122b8525..e5541e00 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 decdbb12..2904215f 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 c353f28f..3c735df7 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 72141a6f..eb8906d2 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 89e572bf..a67c0a59 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 203055d5..818f3c05 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 6e0efd0f..95895966 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 52bb8b6e..f0f7d746 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 193958b8..a15d1118 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 d880f153..43f18f22 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 de5902b0..27dac829 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 0c094d50..532e692c 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 d3642b6a..e914fe07 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 31e6e433..03eb7af7 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 89e241be..e959ad86 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 295f4615..3b0a568c 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 a8667126..59daa828 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 68fd6b4d..e4c906fa 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 6609b183..76985d1a 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 77f8f80b..3ef70ea7 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 3df3046e..469eddaf 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 8981255f..1ac91835 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 d4afada2..739dc905 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 c5868f14..0cece663 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 ee0c38a0..5d479e88 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 c156b7a5..a1828671 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 eed2cd2c..49e2ec3a 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 0096b149..ace67c18 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 24cf5730..74e90888 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 fb8b4bc5..0ab854a9 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 dc54a526..67c0654b 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 54822c83..22667c46 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 9f9b816e..91fb0d4d 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 a5f5a60f..b3fd073b 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 a9372b04..ce253dfc 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 ea3f5e7e..74ad2855 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 fb52f4b6..a741d7f2 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 ead4f7e8..a8f6acc3 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 c5f26759..8d59a50b 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 fbf4cf95..e85f630e 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 d5d8dddb..051fe446 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 f3f6493d..8f21106a 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 f2ec01f2..89014c46 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 184e142c..22a6e3ec 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 9a308fcf..e69d61ad 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 6b8746db..3fbf8410 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 9ef6068b..468095a9 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 ca3c4c49..e84ae08b 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 fe01324a..91e4670e 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 b580c2fe..668fad5a 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 c65691d3..06518853 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 edf1fc93..5ff71e66 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 9607de8e..e15939a1 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 4f58eed0..57622716 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 f22e1b17..bf039d2d 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 b65efde6..5847d0c2 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 da7d5f48..f7e35eff 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 4c43444f..8445edf4 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 bd910677..d43cd8e6 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 dd42e163..2753475f 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 67ff0485..bb4fce14 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 10170ca7..45fd37be 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 e6701554..8ed37660 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 50b533bf..f754e52d 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 0be844ab..0be844ab 100644
--- a/korganizer/printing/calprintweekconfig_base.ui
+++ b/korganizer/printing/calprintweetdeconfig_base.ui
diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp
index a325add5..c9291571 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 0d274869..a7fcd544 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 6e4819a8..09edb36c 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 12d4e373..f3dd942b 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 39cc8ae5..91bde672 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 477bab2a..a31dd4c1 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 5e17c947..d881b6c8 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 3fea65f3..50daf1d0 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 41ab8c9d..d4a8bd3b 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 cdeccd6b..660bc849 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 fac1cc47..474ffb28 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 3310da1b..f34f32a8 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 83b40203..440b2c83 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 63a9dc68..f2ff37fa 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 bea6bf19..1531a9b9 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 9b44e1ca..e575864e 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 17eec2f5..a73b0dd4 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 c6d2184d..e63a7166 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 e97b0112..510e97d3 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 0e77e1a7..f98669d8 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 45ca047f..0c20b1ab 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 3fda7e4c..f40a86f6 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 8f740c80..7be0555d 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 a68ccefb..df6a0e50 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 fc699c10..f7904b59 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 b944087f..1d3ba736 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 2e0cc091..5d075b65 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 20b6dfe9..2224c74e 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 50f31e8d..f9318319 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 bc4422ca..54d4eb62 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 e7ca45f7..a0bd191d 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 88c06088..22d4b6a8 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 74991a93..214f0c81 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 7eff3ad3..7eff3ad3 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 530304fa..530304fa 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 95723c4e..95723c4e 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 b44ce10f..b44ce10f 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 d954d782..d954d782 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 564e3b71..222c3f1b 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 837f01c3..8324b5de 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 068fffff..8694d25f 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 b07c2973..eb99bcff 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 20035bc5..9b492676 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 a546de19..2467e83d 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 62cf26e6..a4a42b5c 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 62c52615..db2360aa 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 5f56e390..94c00ae4 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 36a0932b..76f12ed1 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 5202563b..c8455483 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 47b19d7c..5ca0518e 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 4cad27cc..ce825479 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 fbd42da6..31f8d9b1 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 e8b89f72..d17105bb 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 18060ec6..33aa8995 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 164225d1..f468cb92 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 139073a4..a9f0c80c 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 7b67a552..dc7d7daa 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 0d8bfcdf..e55b2243 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 eadcc2be..c316a25a 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 b23e9527..094b3b5c 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 151657e5..03b06690 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 75b5f100..4fafacf9 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 33d13560..931d53bf 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 531a2417..df52fdab 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 15b4fa99..3ba96a39 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 bee71b57..2b6e0286 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 e553b40c..f134868f 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 e592c00f..85753b2c 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 c467599a..9b4c9df6 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 f6bc5def..d9d62615 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 84f57a93..2c79e018 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 24942c72..7b690c8b 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 559f0171..ef754e81 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 720ea212..05dcdf35 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 595d195b..8f5d08e8 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 28c09378..d3f06879 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 36e5ed4e..6cc9a923 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 a755d173..e13ce313 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 3c0ba38d..d2180e1a 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 22c9b7aa..bbe443fc 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 2fc2069b..17561b36 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 f8fd61cf..86cf4cfc 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 bb870b11..72613f15 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 5cad2365..58961ddc 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 e07ef00a..df1181ed 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 945c2231..a2f5fd00 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 5ceb1258..ab5239b0 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 fc98478a..a4c88100 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 105650eb..426e4c01 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 9ae04cfa..02e39736 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 051b0f2f..dd180c97 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 57769250..230962cb 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 6774d96d..3e331b18 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 968d86a9..1954f19c 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 9f1a6fd8..32202b3d 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 50293729..789b4605 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 fe67137b..586e9011 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 bbd7d29a..eb4660a3 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 a231f963..f6f48240 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 92f9565f..92f9565f 100644
--- a/libtdepim/kconfigpropagator.h
+++ b/libtdepim/tdeconfigpropagator.h
diff --git a/libtdepim/kconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp
index c2baafcc..026c8599 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 a06849ec..7eaaeda9 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 fa963e16..ad899351 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 15db0933..e9045131 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 01bba1d8..043d4526 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 35e26c99..451a9ec1 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 895dc537..75c4d557 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 1e404165..9858a092 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 1cb2a8f5..551f6117 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 ce6d38a3..853f6cd4 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 3f9c0f47..3f9c0f47 100644
--- a/kfile-plugins/CMakeLists.txt
+++ b/tdefile-plugins/CMakeLists.txt
diff --git a/kfile-plugins/Makefile.am b/tdefile-plugins/Makefile.am
index 7ebdda70..7ebdda70 100644
--- a/kfile-plugins/Makefile.am
+++ b/tdefile-plugins/Makefile.am
diff --git a/kfile-plugins/RETURNED_ITEMS b/tdefile-plugins/RETURNED_ITEMS
index 9985e36d..9985e36d 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 b4d2fca8..66c10071 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 00000000..96a1a7f7
--- /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 0d85344e..11a5384f 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 a085d707..41d745aa 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 27682034..9f4a897e 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 00000000..552a2a4f
--- /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 c3865076..3d4e20e9 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 5669357d..716944e1 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 ef91a3f0..d566d5fc 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 00000000..f7cf8969
--- /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 be8c9b7e..be8c9b7e 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 6d248884..261f0835 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 7717f348..d030e1e5 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 2fcfaa18..e43948a9 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 114c6da7..4cf771d2 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 00000000..61b306d5
--- /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 c8c853f7..e8746c56 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 88ba00d1..730d731a 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 0a66e880..19866d8b 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 56a5fcba..567a1434 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 9cbd46c0..9cbd46c0 100644
--- a/kioslaves/ConfigureChecks.cmake
+++ b/tdeioslaves/ConfigureChecks.cmake
diff --git a/kioslaves/Mainpage.dox b/tdeioslaves/Mainpage.dox
index 24e1ca68..24e1ca68 100644
--- a/kioslaves/Mainpage.dox
+++ b/tdeioslaves/Mainpage.dox
diff --git a/kioslaves/Makefile.am b/tdeioslaves/Makefile.am
index 8258295e..89bd2cf6 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 fdad4b63..fdad4b63 100644
--- a/kioslaves/configure.in.bot
+++ b/tdeioslaves/configure.in.bot
diff --git a/kioslaves/configure.in.in b/tdeioslaves/configure.in.in
index 47b98682..47b98682 100644
--- a/kioslaves/configure.in.in
+++ b/tdeioslaves/configure.in.in
diff --git a/kioslaves/imap4/CMakeLists.txt b/tdeioslaves/imap4/CMakeLists.txt
index adb628c3..7cf5cace 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 d7198727..553b0c32 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 39bcdce9..39bcdce9 100644
--- a/kioslaves/imap4/PATCHING
+++ b/tdeioslaves/imap4/PATCHING
diff --git a/kioslaves/imap4/README b/tdeioslaves/imap4/README
index bc05146a..af8af8f0 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 680e26e0..680e26e0 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 6654bb3d..0069b22d 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 164cf855..a6b16089 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 1ab92042..946d5692 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 4b9faadf..a3239d09 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 9e283442..9e283442 100644
--- a/kioslaves/imap4/imapcommand.h
+++ b/tdeioslaves/imap4/imapcommand.h
diff --git a/kioslaves/imap4/imapinfo.cc b/tdeioslaves/imap4/imapinfo.cc
index 4d1fc805..4d1fc805 100644
--- a/kioslaves/imap4/imapinfo.cc
+++ b/tdeioslaves/imap4/imapinfo.cc
diff --git a/kioslaves/imap4/imapinfo.h b/tdeioslaves/imap4/imapinfo.h
index 73505449..73505449 100644
--- a/kioslaves/imap4/imapinfo.h
+++ b/tdeioslaves/imap4/imapinfo.h
diff --git a/kioslaves/imap4/imaplist.cc b/tdeioslaves/imap4/imaplist.cc
index 92918d8c..92918d8c 100644
--- a/kioslaves/imap4/imaplist.cc
+++ b/tdeioslaves/imap4/imaplist.cc
diff --git a/kioslaves/imap4/imaplist.h b/tdeioslaves/imap4/imaplist.h
index 9aa01f78..9aa01f78 100644
--- a/kioslaves/imap4/imaplist.h
+++ b/tdeioslaves/imap4/imaplist.h
diff --git a/kioslaves/imap4/imapparser.cc b/tdeioslaves/imap4/imapparser.cc
index 8cb06e31..8cb06e31 100644
--- a/kioslaves/imap4/imapparser.cc
+++ b/tdeioslaves/imap4/imapparser.cc
diff --git a/kioslaves/imap4/imapparser.h b/tdeioslaves/imap4/imapparser.h
index 7c498b09..623fc8f8 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 8d3ebac8..00f94485 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 0ddd2ff0..0ddd2ff0 100644
--- a/kioslaves/imap4/mailaddress.cc
+++ b/tdeioslaves/imap4/mailaddress.cc
diff --git a/kioslaves/imap4/mailaddress.h b/tdeioslaves/imap4/mailaddress.h
index 644034b2..644034b2 100644
--- a/kioslaves/imap4/mailaddress.h
+++ b/tdeioslaves/imap4/mailaddress.h
diff --git a/kioslaves/imap4/mailheader.cc b/tdeioslaves/imap4/mailheader.cc
index c520b909..c520b909 100644
--- a/kioslaves/imap4/mailheader.cc
+++ b/tdeioslaves/imap4/mailheader.cc
diff --git a/kioslaves/imap4/mailheader.h b/tdeioslaves/imap4/mailheader.h
index 633d61b7..633d61b7 100644
--- a/kioslaves/imap4/mailheader.h
+++ b/tdeioslaves/imap4/mailheader.h
diff --git a/kioslaves/imap4/mimehdrline.cc b/tdeioslaves/imap4/mimehdrline.cc
index 9646ed26..9646ed26 100644
--- a/kioslaves/imap4/mimehdrline.cc
+++ b/tdeioslaves/imap4/mimehdrline.cc
diff --git a/kioslaves/imap4/mimehdrline.h b/tdeioslaves/imap4/mimehdrline.h
index e31c1864..e31c1864 100644
--- a/kioslaves/imap4/mimehdrline.h
+++ b/tdeioslaves/imap4/mimehdrline.h
diff --git a/kioslaves/imap4/mimeheader.cc b/tdeioslaves/imap4/mimeheader.cc
index 72e3827b..72e3827b 100644
--- a/kioslaves/imap4/mimeheader.cc
+++ b/tdeioslaves/imap4/mimeheader.cc
diff --git a/kioslaves/imap4/mimeheader.h b/tdeioslaves/imap4/mimeheader.h
index bc2fd2bc..bc2fd2bc 100644
--- a/kioslaves/imap4/mimeheader.h
+++ b/tdeioslaves/imap4/mimeheader.h
diff --git a/kioslaves/imap4/mimeio.cc b/tdeioslaves/imap4/mimeio.cc
index 757c11a4..757c11a4 100644
--- a/kioslaves/imap4/mimeio.cc
+++ b/tdeioslaves/imap4/mimeio.cc
diff --git a/kioslaves/imap4/mimeio.h b/tdeioslaves/imap4/mimeio.h
index 37a96998..37a96998 100644
--- a/kioslaves/imap4/mimeio.h
+++ b/tdeioslaves/imap4/mimeio.h
diff --git a/kioslaves/imap4/rfcdecoder.cc b/tdeioslaves/imap4/rfcdecoder.cc
index 08b641b7..08b641b7 100644
--- a/kioslaves/imap4/rfcdecoder.cc
+++ b/tdeioslaves/imap4/rfcdecoder.cc
diff --git a/kioslaves/imap4/rfcdecoder.h b/tdeioslaves/imap4/rfcdecoder.h
index 2095b2ed..2095b2ed 100644
--- a/kioslaves/imap4/rfcdecoder.h
+++ b/tdeioslaves/imap4/rfcdecoder.h
diff --git a/kioslaves/imap4/selectinfo.h b/tdeioslaves/imap4/selectinfo.h
index bf75a85b..bf75a85b 100644
--- a/kioslaves/imap4/selectinfo.h
+++ b/tdeioslaves/imap4/selectinfo.h
diff --git a/kioslaves/mbox/AUTHORS b/tdeioslaves/mbox/AUTHORS
index 333010f6..333010f6 100644
--- a/kioslaves/mbox/AUTHORS
+++ b/tdeioslaves/mbox/AUTHORS
diff --git a/kioslaves/mbox/CMakeLists.txt b/tdeioslaves/mbox/CMakeLists.txt
index b823d8b9..95ecdf49 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 0fc50524..0fc50524 100644
--- a/kioslaves/mbox/Makefile.am
+++ b/tdeioslaves/mbox/Makefile.am
diff --git a/kioslaves/mbox/README b/tdeioslaves/mbox/README
index f0441661..7adae537 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 0c4fca81..477ef350 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 159c4213..d6ef29ae 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 8b6b412a..8b6b412a 100644
--- a/kioslaves/mbox/mbox.protocol
+++ b/tdeioslaves/mbox/mbox.protocol
diff --git a/kioslaves/mbox/mboxfile.cc b/tdeioslaves/mbox/mboxfile.cc
index 271b7101..7297457e 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 b8a98973..1defafc9 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 3125fd74..942f369e 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 046767be..0b887276 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 c5d9a3bd..99267ca7 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 8ce593cc..4e2c1f02 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 d59c77ac..4b359e40 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 96882d1d..5de7804f 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 007d74c3..007d74c3 100644
--- a/kioslaves/opengroupware/Makefile.am
+++ b/tdeioslaves/opengroupware/Makefile.am
diff --git a/kioslaves/opengroupware/opengroupware.cpp b/tdeioslaves/opengroupware/opengroupware.cpp
index b4c19b71..ab6b3304 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 da104c8c..151187db 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 89c0b9ea..b51f33a0 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 595057b2..17eab5f3 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 2f98d915..9c89174a 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 a86332a3..a86332a3 100644
--- a/kioslaves/opengroupware/webdavhandler.h
+++ b/tdeioslaves/opengroupware/webdavhandler.h
diff --git a/kioslaves/sieve/CMakeLists.txt b/tdeioslaves/sieve/CMakeLists.txt
index f0297bac..2ac71cc3 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 fffffea7..f4d0639c 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 ffc1b4b7..ffc1b4b7 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 83a08dfb..83a08dfb 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 8f22e560..8f22e560 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 7b1ee844..7b1ee844 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 8c23855c..8c23855c 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 6e9674f9..6e9674f9 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 53a83822..53a83822 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 cccaa59c..cccaa59c 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 82684ad5..82684ad5 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 6eb1cac3..6eb1cac3 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 71cfbb3c..71cfbb3c 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 b3e922ee..b3e922ee 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 95cea85a..95cea85a 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 bd2d3359..bd2d3359 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 b861e2e1..b861e2e1 100644
--- a/kioslaves/sieve/rfc3028.txt
+++ b/tdeioslaves/sieve/rfc3028.txt
diff --git a/kioslaves/sieve/rfc3431.txt b/tdeioslaves/sieve/rfc3431.txt
index 3f11c325..3f11c325 100644
--- a/kioslaves/sieve/rfc3431.txt
+++ b/tdeioslaves/sieve/rfc3431.txt
diff --git a/kioslaves/sieve/sieve.cpp b/tdeioslaves/sieve/sieve.cpp
index 9d373c2a..9d373c2a 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/tdeioslaves/sieve/sieve.cpp
diff --git a/kioslaves/sieve/sieve.h b/tdeioslaves/sieve/sieve.h
index 2168da72..d25b1d57 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 484d48da..484d48da 100644
--- a/kioslaves/sieve/sieve.protocol
+++ b/tdeioslaves/sieve/sieve.protocol
diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp
index f3b191e1..a36517eb 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 169a0294..008b87e5 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 9425bd5e..5ad5b478 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 f2e51630..cb377e7e 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 1efe79e1..4cf9a5db 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 b6b3aae0..4406dc79 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 ea04ef48..ee580532 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 12ca40ce..5eb6ae28 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 cf5090e5..8f783ab2 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 599001bb..10adb19b 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 84e78382..39e3aac1 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 6c9f6d4d..4eb0e394 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 5253baba..9be4662f 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 6c3fbdff..70adfc55 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 df8a4dd3..3550aed4 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 d43613e6..7af9814a 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 2808aef7..08bf1f39 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 0866d4e3..1b4ac494 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 f8f30f65..9704e5bd 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 5088bca9..793c1b96 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 3c9d9792..44cee563 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 53c1d007..1c5feb84 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 7e243ddc..e174cad4 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 d3c809db..d757ad73 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 dd6a93af..7bfa34d4 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 68c829a7..a5617229 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 4b7eb408..486e8977 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 b3930bfb..cf5c4e95 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 658ddd76..0c7533ee 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 3130cde1..357cdc95 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 088e624a..f4417079 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 9112fdea..cedcde6a 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 95218be0..e1c25c0f 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 90ccf83d..809c29b8 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 c19b440a..42545948 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 415021a7..e68da9ee 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 23476fe0..23476fe0 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 2b2eaa07..e6da5283 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 c3addd3b..bfa02156 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 c5f109d3..e95ed260 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 ec22851a..a7c26b6e 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 b2b2c7b9..2666f1fd 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 01acd397..d8d19443 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 0f144e05..3b883843 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 ff8f869b..dac619fe 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 ce7c18c4..51c3a4b4 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 ddc31491..b5603b19 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 44c13fd2..50f8b5b8 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 8cc28f67..230ac350 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 f2e255f0..ffbccefc 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 5b4a0a52..bf4a0347 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 5d6be2da..5263c2a1 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 6cb341ac..c12d3ae6 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 85dacdaa..4a89bd02 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 9104da84..63c7e988 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 f2818f2c..d32caaae 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 cf46571f..e896c0da 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 b3a0ff75..13ba3ed5 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 1a6b369a..51263e26 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 bd459331..56ffae7d 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 f6b46dbf..8a1033fb 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 ab4f841a..7639b562 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 7e8ae8bb..1abaacd4 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 89c9b742..a6777fb2 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 f2d90cd6..dc74650c 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 ed05f840..78b65065 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 2c3fd5fa..04099ff9 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 ca7fc523..0be4fd95 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 1a58c7ec..ca323048 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 42aef92d..13ee99ec 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 a757c81f..672a7bfb 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 49b0a8fe..e7dd9445 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 0c73fb50..832db070 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 6dd8ab10..9bdc1377 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 279491c5..277a0631 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 29028f3b..490b98a7 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 7ba76f67..7ba76f67 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 5607fb9d..1e66f709 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 1b4cc7b8..40084669 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 dc034b7b..f4dbdead 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 a527d77d..91a213e8 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 fd13db6a..19defac5 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 e7ab6eca..04ce9555 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 11e2f2c2..51bd1ac1 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 1311ebc5..a877622e 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 6735b993..8b2b68d2 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 3b352a21..e971d32d 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 aa648d1b..1831d79a 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 a60cd788..72842055 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 32d3c416..65caebf2 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 1c8bd9c9..65e9ac11 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 f9ec2a49..dbce86fe 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 6693e414..3b5a05c6 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 47927939..5869e009 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 2a920467..431c61d3 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 f453356d..ffa35d02 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 09231e2e..8034a0ec 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 073de386..7960a39b 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 f238b362..3fc412a1 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 4c265d26..c2177b86 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 0adfc46b..6227383f 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 74d07691..c4c9ad89 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 eec25233..99fd0c0d 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 f4893ca0..82be4432 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 4926678e..89ea65d5 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 91ae7b30..e3f23aa1 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 6ff44b05..273f6c4a 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 c7d8e7ea..700de0e8 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 be275788..5ca5414c 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 f43525d1..d9b24c60 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;