summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-14 17:18:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-14 17:18:40 -0600
commit38b7daf1afffa515cf4880847c0d985f3c6ee753 (patch)
tree3e5e8489a057008373c2ae2d1583d5a1865f7e3d
parentf4236c497b152468e23da7b8a64caf6988e61515 (diff)
downloadtdepim-38b7daf1.tar.gz
tdepim-38b7daf1.zip
Rename common header files for consistency with class renaming
-rw-r--r--akregator/src/aboutdata.h2
-rw-r--r--akregator/src/addfeeddialog.cpp2
-rw-r--r--akregator/src/akregator_options.h2
-rw-r--r--akregator/src/akregator_part.cpp4
-rw-r--r--akregator/src/akregator_view.cpp2
-rw-r--r--akregator/src/articlefilter.cpp2
-rw-r--r--akregator/src/articleviewer.cpp2
-rw-r--r--akregator/src/feediconmanager.cpp2
-rw-r--r--akregator/src/librss/testlibrss.cpp6
-rw-r--r--akregator/src/main.cpp2
-rw-r--r--akregator/src/mainwindow.cpp2
-rw-r--r--akregator/src/mainwindow.h2
-rw-r--r--akregator/src/nodelist.cpp2
-rw-r--r--akregator/src/pageviewer.cpp2
-rw-r--r--akregator/src/speechclient.cpp2
-rw-r--r--akregator/src/tabwidget.cpp2
-rw-r--r--akregator/src/tagaction.cpp2
-rw-r--r--akregator/src/tagnodelist.cpp2
-rw-r--r--akregator/src/trayicon.cpp2
-rw-r--r--akregator/src/viewer.cpp2
-rw-r--r--certmanager/aboutdata.h2
-rw-r--r--certmanager/certificatewizardimpl.cpp2
-rw-r--r--certmanager/certmanager.cpp2
-rw-r--r--certmanager/conf/configuredialog.cpp2
-rw-r--r--certmanager/customactions.cpp2
-rw-r--r--certmanager/kwatchgnupg/aboutdata.h2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp2
-rw-r--r--certmanager/kwatchgnupg/main.cpp2
-rw-r--r--certmanager/lib/cryptplugfactory.cpp2
-rw-r--r--certmanager/lib/cryptplugwrapper.cpp2
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.cpp2
-rw-r--r--certmanager/lib/kleo/dn.cpp2
-rw-r--r--certmanager/lib/tests/test_cryptoconfig.cpp6
-rw-r--r--certmanager/lib/tests/test_gnupgprocessbase.cpp6
-rw-r--r--certmanager/lib/tests/test_jobs.cpp6
-rw-r--r--certmanager/lib/tests/test_keygen.cpp6
-rw-r--r--certmanager/lib/tests/test_keylister.cpp6
-rw-r--r--certmanager/lib/tests/test_keyselectiondialog.cpp6
-rw-r--r--certmanager/lib/tests/test_verify.cpp6
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp2
-rw-r--r--certmanager/lib/ui/dnattributeorderconfigwidget.cpp2
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp2
-rw-r--r--certmanager/main.cpp4
-rw-r--r--kabc/frontend/main.cpp6
-rw-r--r--kabc/kabc2mutt/kabc2mutt.cpp2
-rw-r--r--kabc/kabc2mutt/main.cpp4
-rw-r--r--kabc/kabcdistlistupdater/kabcdistlistupdater.cpp6
-rw-r--r--kaddressbook/addresseditwidget.cpp2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp2
-rw-r--r--kaddressbook/common/locationmap.cpp2
-rw-r--r--kaddressbook/contacteditorwidgetmanager.cpp2
-rw-r--r--kaddressbook/distributionlisteditor.cpp2
-rw-r--r--kaddressbook/distributionlistpicker.cpp2
-rw-r--r--kaddressbook/filtereditdialog.cpp2
-rw-r--r--kaddressbook/interfaces/xxport.cpp2
-rw-r--r--kaddressbook/kabcore.cpp6
-rw-r--r--kaddressbook/kabtools.cpp2
-rw-r--r--kaddressbook/kaddressbook_options.h2
-rw-r--r--kaddressbook/kaddressbook_part.cpp2
-rw-r--r--kaddressbook/kaddressbootdemain.h2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabconfig.cpp2
-rw-r--r--kaddressbook/kcmconfigs/kcmkabldapconfig.cpp2
-rw-r--r--kaddressbook/kcmconfigs/ldapoptionswidget.cpp2
-rw-r--r--kaddressbook/keywidget.cpp2
-rw-r--r--kaddressbook/ldapsearchdialog.cpp2
-rw-r--r--kaddressbook/main.cpp4
-rw-r--r--kaddressbook/nameeditdialog.cpp2
-rw-r--r--kaddressbook/phoneeditwidget.cpp2
-rw-r--r--kaddressbook/printing/detailledstyle.cpp2
-rw-r--r--kaddressbook/printing/mikesstyle.cpp2
-rw-r--r--kaddressbook/printing/printingwizard.cpp2
-rw-r--r--kaddressbook/printing/printprogress.cpp2
-rw-r--r--kaddressbook/undocmds.cpp2
-rw-r--r--kaddressbook/viewconfigurewidget.cpp2
-rw-r--r--kaddressbook/views/contactlistview.cpp2
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp2
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp2
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp2
-rw-r--r--kaddressbook/xxportmanager.cpp2
-rw-r--r--kaddressbook/xxportselectdialog.cpp2
-rw-r--r--kalarm/alarmcalendar.cpp2
-rw-r--r--kalarm/calendarcompat.cpp4
-rw-r--r--kalarm/daemon.cpp2
-rw-r--r--kalarm/kalarmapp.cpp4
-rw-r--r--kalarm/kalarmd/adapp.cpp2
-rw-r--r--kalarm/kalarmd/admain.cpp4
-rw-r--r--kalarm/kalarmd/alarmdaemon.cpp2
-rw-r--r--kalarm/kamail.cpp2
-rw-r--r--kalarm/lib/shellprocess.cpp2
-rw-r--r--kalarm/main.cpp4
-rw-r--r--kalarm/mainwindow.cpp2
-rw-r--r--kalarm/messagewin.cpp2
-rw-r--r--kalarm/prefdlg.cpp4
-rw-r--r--kalarm/preferences.cpp2
-rw-r--r--kalarm/specialactions.cpp4
-rw-r--r--kalarm/traywindow.cpp4
-rw-r--r--kalarm/undo.cpp2
-rw-r--r--kandy/src/kandy.h2
-rw-r--r--kandy/src/kandy_client.cpp2
-rw-r--r--kandy/src/kandyprefsdialog.cpp2
-rw-r--r--kandy/src/main.cpp6
-rw-r--r--kandy/src/mobilegui.cpp2
-rw-r--r--kandy/src/mobilemain.h2
-rw-r--r--karm/karm_part.cpp2
-rw-r--r--karm/karmstorage.cpp2
-rw-r--r--karm/main.cpp6
-rw-r--r--karm/mainwindow.cpp2
-rw-r--r--karm/plannerparser.h2
-rw-r--r--karm/preferences.cpp2
-rw-r--r--karm/task.cpp2
-rw-r--r--karm/taskview.cpp2
-rw-r--r--karm/test/locking.cpp4
-rw-r--r--kitchensync/src/aboutpage.cpp4
-rw-r--r--kitchensync/src/groupitem.cpp2
-rw-r--r--kitchensync/src/main.cpp4
-rw-r--r--kitchensync/src/mainwidget.cpp2
-rw-r--r--kitchensync/src/part.cpp2
-rw-r--r--kmail/aboutdata.h2
-rw-r--r--kmail/accountdialog.cpp2
-rw-r--r--kmail/accountmanager.cpp2
-rw-r--r--kmail/antispamwizard.cpp2
-rw-r--r--kmail/configuredialog.cpp2
-rw-r--r--kmail/dcoptest.cpp4
-rw-r--r--kmail/folderIface.cpp2
-rw-r--r--kmail/htmlstatusbar.cpp2
-rw-r--r--kmail/imapaccountbase.cpp2
-rw-r--r--kmail/index.cpp2
-rw-r--r--kmail/kmaccount.cpp2
-rw-r--r--kmail/kmacctcachedimap.cpp2
-rw-r--r--kmail/kmacctlocal.cpp2
-rw-r--r--kmail/kmacctmaildir.cpp2
-rw-r--r--kmail/kmaddrbook.cpp2
-rw-r--r--kmail/kmail.kcfg2
-rw-r--r--kmail/kmail_options.h2
-rw-r--r--kmail/kmail_part.cpp2
-rw-r--r--kmail/kmcommands.cpp2
-rw-r--r--kmail/kmcomposewin.cpp2
-rw-r--r--kmail/kmedit.cpp2
-rw-r--r--kmail/kmfilterdlg.cpp2
-rw-r--r--kmail/kmfoldercachedimap.cpp2
-rw-r--r--kmail/kmfolderindex.cpp2
-rw-r--r--kmail/kmfoldermaildir.cpp2
-rw-r--r--kmail/kmfoldermgr.cpp2
-rw-r--r--kmail/kmfoldertree.cpp2
-rw-r--r--kmail/kmheaders.cpp2
-rw-r--r--kmail/kmkernel.cpp4
-rw-r--r--kmail/kmmainwidget.cpp2
-rw-r--r--kmail/kmmainwin.cpp2
-rw-r--r--kmail/kmmessage.cpp2
-rw-r--r--kmail/kmmsgpartdlg.cpp4
-rw-r--r--kmail/kmreadermainwin.cpp2
-rw-r--r--kmail/kmreaderwin.cpp2
-rw-r--r--kmail/kmsender.cpp2
-rw-r--r--kmail/kmservertest.cpp2
-rw-r--r--kmail/kmstartup.cpp4
-rw-r--r--kmail/kmsystemtray.cpp2
-rw-r--r--kmail/korghelper.cpp2
-rw-r--r--kmail/maildirjob.cpp2
-rw-r--r--kmail/mailsourceviewer.cpp2
-rw-r--r--kmail/managesievescriptsdialog.cpp2
-rw-r--r--kmail/mboxjob.cpp2
-rw-r--r--kmail/objecttreeparser.cpp4
-rw-r--r--kmail/recipientseditor.cpp2
-rw-r--r--kmail/recipientseditortest.cpp4
-rw-r--r--kmail/searchwindow.cpp2
-rw-r--r--kmail/secondarywindow.cpp2
-rw-r--r--kmail/transportmanager.cpp2
-rw-r--r--kmail/vacationdialog.cpp2
-rw-r--r--kmailcvt/kimportpage.cpp2
-rw-r--r--kmailcvt/kmailcvt.cpp2
-rw-r--r--kmailcvt/kmailcvt.h2
-rw-r--r--kmailcvt/main.cpp4
-rw-r--r--kmobile/kmobile.h2
-rw-r--r--kmobile/main.cpp4
-rw-r--r--kmobile/testlibkmobile.cpp2
-rw-r--r--knode/aboutdata.h2
-rw-r--r--knode/articlewidget.cpp2
-rw-r--r--knode/knapplication.cpp2
-rw-r--r--knode/knarticlefactory.cpp2
-rw-r--r--knode/kncleanup.cpp2
-rw-r--r--knode/kncomposer.cpp2
-rw-r--r--knode/knconfig.cpp2
-rw-r--r--knode/knconvert.cpp2
-rw-r--r--knode/knmainwidget.cpp4
-rw-r--r--knode/knnetaccess.cpp2
-rw-r--r--knode/knode.cpp2
-rw-r--r--knode/knode_options.h2
-rw-r--r--knode/knode_part.cpp2
-rw-r--r--knode/knsearchdialog.cpp2
-rw-r--r--knode/knsourceviewwindow.cpp2
-rw-r--r--knode/main.cpp4
-rw-r--r--knotes/knote.cpp2
-rw-r--r--knotes/knoteconfigdlg.cpp2
-rw-r--r--knotes/knotesapp.h2
-rw-r--r--knotes/knoteslegacy.cpp2
-rw-r--r--knotes/main.cpp4
-rw-r--r--kode/kodemain.cpp10
-rw-r--r--kode/kwsdl/kung/main.cpp6
-rw-r--r--kode/kwsdl/main.cpp6
-rw-r--r--kode/kwsdl/tests/google/main.cc6
-rw-r--r--kode/kxml_compiler/creator.cpp6
-rw-r--r--kode/kxml_compiler/creator.h6
-rw-r--r--kode/kxml_compiler/kxml_compiler.cpp6
-rw-r--r--kode/kxml_compiler/parser.cpp6
-rw-r--r--kode/kxml_compiler/parser.h6
-rw-r--r--konsolekalendar/konsolekalendar.h2
-rw-r--r--konsolekalendar/main.cpp4
-rw-r--r--kontact/interfaces/plugin.cpp2
-rw-r--r--kontact/interfaces/uniqueapphandler.cpp4
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp6
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp2
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.cpp4
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp4
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp2
-rw-r--r--kontact/plugins/knode/knode_plugin.cpp4
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp2
-rw-r--r--kontact/plugins/knotes/knotes_plugin.cpp2
-rw-r--r--kontact/plugins/knotes/knotetip.cpp2
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp2
-rw-r--r--kontact/plugins/korganizer/journalplugin.cpp2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp4
-rw-r--r--kontact/plugins/korganizer/korg_uniqueapp.cpp2
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp2
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp2
-rw-r--r--kontact/plugins/kpilot/kpilot_plugin.cpp2
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp2
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp4
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp2
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp4
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp2
-rw-r--r--kontact/plugins/specialdates/specialdates_plugin.cpp2
-rw-r--r--kontact/plugins/summary/kcmkontactsummary.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_part.cpp2
-rw-r--r--kontact/plugins/summary/summaryview_plugin.cpp2
-rw-r--r--kontact/plugins/test/test_part.cpp2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp2
-rw-r--r--kontact/plugins/weather/weather_plugin.cpp2
-rw-r--r--kontact/src/aboutdialog.cpp2
-rw-r--r--kontact/src/iconsidepane.cpp2
-rw-r--r--kontact/src/kcmkontact.cpp2
-rw-r--r--kontact/src/main.cpp4
-rw-r--r--kontact/src/mainwindow.cpp4
-rw-r--r--kontact/src/profilemanager.cpp2
-rw-r--r--korganizer/aboutdata.h2
-rw-r--r--korganizer/actionmanager.cpp2
-rw-r--r--korganizer/freebusymanager.cpp2
-rw-r--r--korganizer/koagendaview.cpp2
-rw-r--r--korganizer/koapp.cpp2
-rw-r--r--korganizer/komailclient.cpp2
-rw-r--r--korganizer/konewstuff.cpp2
-rw-r--r--korganizer/korgac/alarmdialog.cpp2
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp2
-rw-r--r--korganizer/korgac/koalarmclient.cpp2
-rw-r--r--korganizer/korgac/koalarmclient.h2
-rw-r--r--korganizer/korgac/korgacmain.cpp4
-rw-r--r--korganizer/korgac/testalarmdlg.cpp6
-rw-r--r--korganizer/korganizer_options.h2
-rw-r--r--korganizer/korgplugins.cpp6
-rw-r--r--korganizer/main.cpp4
-rw-r--r--korganizer/plugins/datenums/configdialog.cpp2
-rw-r--r--korganizer/plugins/exchange/exchange.cpp2
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.cpp2
-rw-r--r--korganizer/plugins/exchange/exchangedialog.cpp2
-rw-r--r--korganizer/plugins/hebrew/configdialog.cpp2
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp2
-rw-r--r--korganizer/plugins/projectview/projectview.cpp2
-rw-r--r--korganizer/plugins/timespanview/timespanview.cpp2
-rw-r--r--korganizer/timezone.cpp6
-rw-r--r--korganizer/urihandler.cpp2
-rw-r--r--korn/boxcontaineritem.cpp4
-rw-r--r--korn/dockeditem.cpp2
-rw-r--r--korn/hvitem.cpp2
-rw-r--r--korn/kornshell.cpp2
-rw-r--r--korn/main.cpp4
-rw-r--r--korn/systemtray.cpp2
-rw-r--r--ktnef/gui/ktnefmain.cpp2
-rw-r--r--ktnef/gui/ktnefview.cpp2
-rw-r--r--ktnef/gui/main.cpp6
-rw-r--r--libemailfunctions/tests/testemail.cpp4
-rw-r--r--libkcal/attachmenthandler.cpp2
-rw-r--r--libkcal/calformat.cpp2
-rw-r--r--libkcal/convertqtopia.cpp6
-rw-r--r--libkcal/incidenceformatter.cpp2
-rw-r--r--libkcal/tests/readandwrite.cpp6
-rw-r--r--libkcal/tests/testcalendar.cpp6
-rw-r--r--libkcal/tests/testcalselectdialog.cpp4
-rw-r--r--libkcal/tests/testfields.cpp6
-rw-r--r--libkcal/tests/testincidence.cpp6
-rw-r--r--libkcal/tests/testrecurprevious.cpp6
-rw-r--r--libkcal/tests/testrecurrence.cpp6
-rw-r--r--libkcal/tests/testrecurrencetype.cpp6
-rw-r--r--libkcal/tests/testrecurson.cpp6
-rw-r--r--libkcal/tests/testresource.cpp4
-rw-r--r--libkcal/tests/testvcalexport.cpp6
-rw-r--r--libkholidays/kholidays.cpp2
-rw-r--r--libkpgp/kpgpui.cpp2
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp2
-rw-r--r--libkpimexchange/core/exchangeclient.cpp2
-rw-r--r--libkpimexchange/core/exchangedownload.cpp2
-rw-r--r--libkpimexchange/core/exchangeprogress.cpp2
-rw-r--r--libkpimidentities/identitymanager.cpp2
-rw-r--r--libtdepim/addresseeview.cpp2
-rw-r--r--libtdepim/addressesdialog.cpp2
-rw-r--r--libtdepim/alarmclient.cpp2
-rw-r--r--libtdepim/cfgc/autoexample.cpp6
-rw-r--r--libtdepim/cfgc/example.cpp6
-rw-r--r--libtdepim/completionordereditor.cpp2
-rw-r--r--libtdepim/kaddrbook.cpp2
-rw-r--r--libtdepim/kcmdesignerfields.cpp2
-rw-r--r--libtdepim/kimportdialog.cpp2
-rw-r--r--libtdepim/komposer/core/core.cpp2
-rw-r--r--libtdepim/komposer/core/pluginmanager.cpp2
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp2
-rw-r--r--libtdepim/komposer/core/tests/main.cpp6
-rw-r--r--libtdepim/komposer/core/tests/testkomposer.cpp4
-rw-r--r--libtdepim/komposer/core/tests/testmanager.cpp4
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp2
-rw-r--r--libtdepim/komposer/test/test.cpp4
-rw-r--r--libtdepim/ksubscription.cpp2
-rw-r--r--libtdepim/ktimeedit.h2
-rw-r--r--libtdepim/ldapclient.cpp2
-rw-r--r--libtdepim/ldapsearchdialog.cpp2
-rw-r--r--libtdepim/maillistdrag.cpp2
-rw-r--r--libtdepim/tdeconfigwizard.cpp2
-rw-r--r--libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp2
-rw-r--r--libtdepim/tests/testaddresseelineedit.cpp6
-rw-r--r--libtdepim/tests/testaddresseeselector.cpp6
-rw-r--r--libtdepim/tests/testdateedit.cpp6
-rw-r--r--libtdepim/tests/testdistrlist.cpp4
-rw-r--r--libtdepim/tests/testkincidencechooser.cpp4
-rw-r--r--libtdepim/tests/testlinklocator.cpp4
-rw-r--r--libtdepim/tests/testwizard.cpp6
-rw-r--r--plugins/kmail/bodypartformatter/text_calendar.cpp2
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp2
-rw-r--r--plugins/kmail/bodypartformatter/text_xdiff.cpp2
-rw-r--r--tderesources/egroupware/synchronizer.cpp2
-rw-r--r--tderesources/exchange/resourceexchange.cpp2
-rw-r--r--tderesources/featureplan/benchmarkfeaturelist.cpp6
-rw-r--r--tderesources/featureplan/dumpfeaturelist.cpp6
-rw-r--r--tderesources/groupwise/soap/ksslsocket.cpp2
-rw-r--r--tderesources/groupwise/soap/soapdebug.cpp6
-rw-r--r--tderesources/kolab/kabc/resourcekolab.cpp2
-rw-r--r--tderesources/kolab/kcal/resourcekolab.cpp2
-rw-r--r--tderesources/kolab/shared/kmailconnection.cpp2
-rw-r--r--tderesources/scalix/kabc/resourcescalix.cpp2
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/main.cpp6
-rw-r--r--tderesources/scalix/shared/kmailconnection.cpp2
-rw-r--r--tderesources/scalix/tdeioslave/scalix.cpp4
-rw-r--r--tderesources/slox/testsloxaccounts.cpp6
-rw-r--r--wizards/egroupwaremain.cpp6
-rw-r--r--wizards/exchangemain.cpp6
-rw-r--r--wizards/groupwisemain.cpp6
-rw-r--r--wizards/kmailchanges.cpp2
-rw-r--r--wizards/kolabmain.cpp6
-rw-r--r--wizards/main.cpp6
-rw-r--r--wizards/scalixmain.cpp6
-rw-r--r--wizards/sloxmain.cpp6
360 files changed, 523 insertions, 523 deletions
diff --git a/akregator/src/aboutdata.h b/akregator/src/aboutdata.h
index 4ccc3a2d5..aa4611346 100644
--- a/akregator/src/aboutdata.h
+++ b/akregator/src/aboutdata.h
@@ -25,7 +25,7 @@
#ifndef ABOUTDATA_H
#define ABOUTDATA_H
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdepimmacros.h>
#define AKREGATOR_VERSION "1.2.9"
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index f81bc1d7b..557fcd0f2 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -27,7 +27,7 @@
#include <tqcheckbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kurl.h>
#include <klocale.h>
#include <klineedit.h>
diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h
index 0ba4fcbc6..1f59834de 100644
--- a/akregator/src/akregator_options.h
+++ b/akregator/src/akregator_options.h
@@ -25,7 +25,7 @@
#ifndef AKREGATOR_OPTIONS_H
#define AKREGATOR_OPTIONS_H
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
namespace Akregator {
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index fdfbf447a..16ae8e085 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -23,11 +23,11 @@
without including the source code for TQt in the source distribution.
*/
#include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <tdeactionclasses.h>
#include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <tdeconfigdialog.h>
#include <tdefiledialog.h>
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 3ec31e9e5..f03c23612 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -59,7 +59,7 @@
#include "notificationmanager.h"
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcharsets.h>
#include <kcombobox.h>
#include <tdeconfig.h>
diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp
index 1bb5646a5..0f773e342 100644
--- a/akregator/src/articlefilter.cpp
+++ b/akregator/src/articlefilter.cpp
@@ -28,7 +28,7 @@
#include "article.h"
#include "shared.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kurl.h>
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 229b197b1..e31cd3abc 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -28,7 +28,7 @@
#include <tqvaluelist.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobalsettings.h>
#include <tdehtmlview.h>
diff --git a/akregator/src/feediconmanager.cpp b/akregator/src/feediconmanager.cpp
index b4d600d45..2167abf43 100644
--- a/akregator/src/feediconmanager.cpp
+++ b/akregator/src/feediconmanager.cpp
@@ -27,7 +27,7 @@
#include "feediconmanager.h"
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index 4a02ff0f2..bef989c68 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -2,9 +2,9 @@
#include "image.h"
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
#include <kdebug.h>
using namespace RSS;
diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp
index 70567e504..f1726fccd 100644
--- a/akregator/src/main.cpp
+++ b/akregator/src/main.cpp
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <dcopref.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <knotifyclient.h>
#include <kuniqueapplication.h>
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index b4276c6d1..a2d0725e3 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -31,7 +31,7 @@
#include <dcopclient.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kedittoolbar.h>
diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
index 4acf5adaa..c5d9529bb 100644
--- a/akregator/src/mainwindow.h
+++ b/akregator/src/mainwindow.h
@@ -29,7 +29,7 @@
#include <config.h>
#endif
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/browserinterface.h>
#include <tdeparts/browserextension.h>
diff --git a/akregator/src/nodelist.cpp b/akregator/src/nodelist.cpp
index 4af5def2b..8a4123dc0 100644
--- a/akregator/src/nodelist.cpp
+++ b/akregator/src/nodelist.cpp
@@ -27,7 +27,7 @@
#include "treenode.h"
#include "treenodevisitor.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqmap.h>
#include <tqstring.h>
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 8e316d7d8..6bc2592ab 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -30,7 +30,7 @@
#include "viewer.h"
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbookmark.h>
#include <kbookmarkmanager.h>
#include <tdeconfig.h>
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 30d75a54b..38f1f8bfb 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -27,7 +27,7 @@
#include "utils.h"
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcharsets.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index d4f4bd4f1..da69b69e1 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -34,7 +34,7 @@
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <ktabwidget.h>
#include <ktabbar.h>
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index d517f740b..f987409c9 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -26,7 +26,7 @@
#include "tag.h"
#include "tagaction.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdepopupmenu.h>
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index becd5b96b..a30e1b3df 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -35,7 +35,7 @@
#include <tqstring.h>
#include <tqvaluelist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
namespace Akregator {
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index cdbec1626..3e87ca77f 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -25,7 +25,7 @@
#include "akregatorconfig.h"
#include "trayicon.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <twin.h>
#include <kiconeffect.h>
#include <kdebug.h>
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 70a2d5cf4..0693fd219 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -24,7 +24,7 @@
*/
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdefiledialog.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
diff --git a/certmanager/aboutdata.h b/certmanager/aboutdata.h
index 5161b9c23..2c4825bed 100644
--- a/certmanager/aboutdata.h
+++ b/certmanager/aboutdata.h
@@ -33,7 +33,7 @@
#ifndef __ABOUTDATA_H__
#define __ABOUTDATA_H__
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
class AboutData : public TDEAboutData {
public:
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 48d190dda..583470e9c 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -54,7 +54,7 @@
#include <kmessagebox.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kurlrequester.h>
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index 9e01cc6d0..bed7d94ae 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -74,7 +74,7 @@
#include <tdefiledialog.h>
#include <kprocess.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <dcopclient.h>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 83879de8e..b1e994137 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -34,7 +34,7 @@
#include "configuredialog.h"
#include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
diff --git a/certmanager/customactions.cpp b/certmanager/customactions.cpp
index e8ea4312f..bf96302a3 100644
--- a/certmanager/customactions.cpp
+++ b/certmanager/customactions.cpp
@@ -33,7 +33,7 @@
#include "customactions.h"
#include <tdetoolbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqlineedit.h>
#include <tqlabel.h>
diff --git a/certmanager/kwatchgnupg/aboutdata.h b/certmanager/kwatchgnupg/aboutdata.h
index de8d2be2f..6a10cac0f 100644
--- a/certmanager/kwatchgnupg/aboutdata.h
+++ b/certmanager/kwatchgnupg/aboutdata.h
@@ -33,7 +33,7 @@
#ifndef ABOUTDATA_H
#define ABOUTDATA_H
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
class AboutData : public TDEAboutData {
public:
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 1cb31ef44..8b1101716 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -35,7 +35,7 @@
#include <klocale.h>
#include <kurlrequester.h>
#include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqframe.h>
#include <tqlayout.h>
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 738f01b1e..9ce5f6b16 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kprocio.h>
diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp
index 76db02903..323c8b5ef 100644
--- a/certmanager/kwatchgnupg/main.cpp
+++ b/certmanager/kwatchgnupg/main.cpp
@@ -38,7 +38,7 @@
#include "kwatchgnupgmainwin.h"
#include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kglobal.h>
diff --git a/certmanager/lib/cryptplugfactory.cpp b/certmanager/lib/cryptplugfactory.cpp
index 50db2ab74..6165cadda 100644
--- a/certmanager/lib/cryptplugfactory.cpp
+++ b/certmanager/lib/cryptplugfactory.cpp
@@ -41,7 +41,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <assert.h>
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index eb2ccafea..b1ee42746 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -61,7 +61,7 @@
// kde
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdeconfig.h>
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index 0397e168d..f6af5283d 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -50,7 +50,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <iterator>
#include <algorithm>
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index 847127eab..b5b016447 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -39,7 +39,7 @@
#include "oidmap.h"
#include "ui/dnattributeorderconfigwidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp
index 10e750c7f..9e5736e77 100644
--- a/certmanager/lib/tests/test_cryptoconfig.cpp
+++ b/certmanager/lib/tests/test_cryptoconfig.cpp
@@ -31,9 +31,9 @@
#include <backends/qgpgme/qgpgmecryptoconfig.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <iostream>
using namespace std;
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index 33267350b..ea7ccae73 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -38,9 +38,9 @@
#include <backends/qgpgme/gnupgprocessbase.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include <kdebug.h>
diff --git a/certmanager/lib/tests/test_jobs.cpp b/certmanager/lib/tests/test_jobs.cpp
index 5c2c8606d..ba26bfb58 100644
--- a/certmanager/lib/tests/test_jobs.cpp
+++ b/certmanager/lib/tests/test_jobs.cpp
@@ -43,9 +43,9 @@
#include <kdebug.h>
#include <assert.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
#include <memory>
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index e0406e801..e5b4bcd92 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -43,9 +43,9 @@
#include <gpgmepp/keygenerationresult.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include <kdebug.h>
diff --git a/certmanager/lib/tests/test_keylister.cpp b/certmanager/lib/tests/test_keylister.cpp
index 78d09bc20..0e357b591 100644
--- a/certmanager/lib/tests/test_keylister.cpp
+++ b/certmanager/lib/tests/test_keylister.cpp
@@ -40,9 +40,9 @@
#include <gpgmepp/keylistresult.h>
#include <gpgmepp/key.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tqmessagebox.h>
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index 763a1637a..6e1fa7df9 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -34,9 +34,9 @@
#include <ui/keyselectiondialog.h>
#include <gpgmepp/key.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/certmanager/lib/tests/test_verify.cpp b/certmanager/lib/tests/test_verify.cpp
index 85a1b32f1..f70c4e109 100644
--- a/certmanager/lib/tests/test_verify.cpp
+++ b/certmanager/lib/tests/test_verify.cpp
@@ -38,9 +38,9 @@
#include <gpgmepp/verificationresult.h>
#include <gpgmepp/key.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <tqdir.h>
#include <tqfile.h>
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index cc9f0c257..7b65a538f 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -46,7 +46,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqpushbutton.h>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 67f1929e8..71ac8a951 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -43,7 +43,7 @@
#include <kdialog.h>
#include <kiconloader.h>
#include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqtoolbutton.h>
#include <tqlayout.h>
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 2aaf84768..53d658439 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -53,7 +53,7 @@
// KDE
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/certmanager/main.cpp b/certmanager/main.cpp
index 011543f58..8bdb346d8 100644
--- a/certmanager/main.cpp
+++ b/certmanager/main.cpp
@@ -39,8 +39,8 @@
#include <kleo/cryptobackendfactory.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kglobal.h>
diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp
index f98f7ee97..7367508be 100644
--- a/kabc/frontend/main.cpp
+++ b/kabc/frontend/main.cpp
@@ -1,8 +1,8 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include "mainWindow.h"
diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index 96cf79232..7f346a62c 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -18,7 +18,7 @@
*/
#include <kabc/distributionlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <tqregexp.h>
diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp
index b44a01430..3d6fad649 100644
--- a/kabc/kabc2mutt/main.cpp
+++ b/kabc/kabc2mutt/main.cpp
@@ -17,8 +17,8 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <iostream>
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index 4a15e1782..38fe294ab 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
#include <kglobal.h>
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 5cf3b791b..71c6ba9ea 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -38,7 +38,7 @@
#include <tdeaccelmanager.h>
#include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kcombobox.h>
#include <tdeconfig.h>
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 8c98da740..faf3e4e3e 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -35,7 +35,7 @@
#include <kabc/resource.h>
#include <kabc/stdaddressbook.h>
#include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <kdebug.h>
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index 11fd2c110..ee6bbebe7 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -21,7 +21,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <tdeversion.h>
#include <kglobal.h>
diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp
index c3bea4b01..cc6bc51da 100644
--- a/kaddressbook/contacteditorwidgetmanager.cpp
+++ b/kaddressbook/contacteditorwidgetmanager.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialog.h>
#include <klibloader.h>
#include <ktrader.h>
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index 09da74d78..c19d31096 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -30,7 +30,7 @@
#include <kabc/addressbook.h>
#include <kabc/resource.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialogbase.h>
#include <kglobal.h>
#include <kiconloader.h>
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index 2dce6b05d..a6d566bbe 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -29,7 +29,7 @@
#include <kabc/addressbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kinputdialog.h>
#include <tdelistbox.h>
#include <klocale.h>
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 3845f59fc..57427855a 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -33,7 +33,7 @@
#include <tqtooltip.h>
#include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index e32a71b28..fb2680677 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -27,7 +27,7 @@
#include <tdeaction.h>
#include <kinstance.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "xxport.h"
using namespace KAB;
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 924aa083e..c35197ed5 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -43,12 +43,12 @@
#include <kabc/stdaddressbook.h>
#include <kabc/vcardconverter.h>
#include <kabc/resourcefile.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <tdeactionclasses.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kcmultidialog.h>
#include <kdebug.h>
#include <tdeversion.h>
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index db623dbad..779af2b59 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -23,7 +23,7 @@
#include <kabc/addressbook.h>
#include <kabc/vcardconverter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <ktempdir.h>
diff --git a/kaddressbook/kaddressbook_options.h b/kaddressbook/kaddressbook_options.h
index e0c189fb8..8aa632e4f 100644
--- a/kaddressbook/kaddressbook_options.h
+++ b/kaddressbook/kaddressbook_options.h
@@ -24,7 +24,7 @@
#ifndef KADDRESSBOOK_OPTIONS_H
#define KADDRESSBOOK_OPTIONS_H
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
static TDECmdLineOptions kaddressbook_options[] =
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 07e778df9..259ac5ea0 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -24,7 +24,7 @@
#include <tqlayout.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kinstance.h>
diff --git a/kaddressbook/kaddressbootdemain.h b/kaddressbook/kaddressbootdemain.h
index 49e4a8a65..904206596 100644
--- a/kaddressbook/kaddressbootdemain.h
+++ b/kaddressbook/kaddressbootdemain.h
@@ -27,7 +27,7 @@
#include <tqptrlist.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdemainwindow.h>
#include "kaddressbookiface.h"
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 8f3bb5e58..6f1706974 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index ba512b63a..a95fa2c84 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -25,7 +25,7 @@
#include <tqframe.h>
#include <tqlayout.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include "ldapoptionswidget.h"
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 3225b0a2e..71a41ba48 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -29,7 +29,7 @@
#include <tqtoolbutton.h>
#include <tqstring.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <tdeconfig.h>
#include <tdelistview.h>
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index 8f0ca7bce..d6f28c87a 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -26,7 +26,7 @@
#include <tqlayout.h>
#include <tqpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <kdialog.h>
#include <tdefiledialog.h>
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index b9bdd1f64..22a79d276 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -30,7 +30,7 @@
#include <tqpushbutton.h>
#include <addresseelineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kcombobox.h>
#include <tdeconfig.h>
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index d08b9ad4d..d6322373f 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -27,8 +27,8 @@
#include <tqstring.h>
#include <kabc/stdaddressbook.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kcrash.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 765d62deb..aa81b2ed1 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -32,7 +32,7 @@
#include <tqwhatsthis.h>
#include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <tdeconfig.h>
#include <klineedit.h>
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index bb1c72451..cd5eab785 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -32,7 +32,7 @@
#include <tqstring.h>
#include <tqtooltip.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kcombobox.h>
#include <tdeconfig.h>
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index adcbe5ec3..50e767321 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -21,7 +21,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqcheckbox.h>
#include <kcolorbutton.h>
#include <tdeconfig.h>
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index 99ead8138..b17db1454 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -26,7 +26,7 @@
#include <tqpainter.h>
#include <kabc/addressee.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index 1ea33d53b..1ee71a8c1 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -32,7 +32,7 @@
#include <tqradiobutton.h>
#include <kabc/addresseelist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kdialogbase.h>
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 64442056e..59ad2304c 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -25,7 +25,7 @@
#include <tqprogressbar.h>
#include <tqtextbrowser.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
#include <klocale.h>
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index e781a72e7..abe2bfe64 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -26,7 +26,7 @@
#include <tqclipboard.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kabc/resource.h>
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 5dfe4084b..0aaceb80d 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -24,7 +24,7 @@
#include <tqlayout.h>
#include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index a0aec1e90..f4b98e468 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -34,7 +34,7 @@
#include <kglobalsettings.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kurl.h>
#include <kabc/addressbook.h>
#include <kabc/addressee.h>
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index f0c4c594d..4c726ca30 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -37,7 +37,7 @@
#include <tqpixmap.h>
#include <kabc/addressbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kcolorbutton.h>
#include <kdebug.h>
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 4a363e76f..700eceae8 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -32,7 +32,7 @@
#include <tqtextcodec.h>
#include <tqtooltip.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <tdefiledialog.h>
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 8e219fca4..b1e0b0f1d 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -36,7 +36,7 @@
#include <kmessagebox.h>
#include <ktempfile.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <libtdepim/addresseeview.h>
#include "config.h" // ??
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index ed9743111..65414ff55 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -29,7 +29,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <ktrader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "core.h"
#include "kablock.h"
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index fa029a52b..aa18bf79a 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -23,7 +23,7 @@
*/
#include <kabc/addressbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <klocale.h>
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 1f778c868..c3c7b8106 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -32,7 +32,7 @@
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
#include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeio/netaccess.h>
#include <tdefileitem.h>
#include <ktempfile.h>
diff --git a/kalarm/calendarcompat.cpp b/kalarm/calendarcompat.cpp
index fef0f59df..9a5aca37a 100644
--- a/kalarm/calendarcompat.cpp
+++ b/kalarm/calendarcompat.cpp
@@ -24,8 +24,8 @@
#include <tqtextstream.h>
#include <tqstringlist.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include <libkcal/calendar.h>
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index db9b3b04d..734636dd5 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -25,7 +25,7 @@
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kmessagebox.h>
#include <dcopclient.h>
#include <kdebug.h>
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index a971d98f6..b2ecb86f5 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -29,11 +29,11 @@
#include <tqregexp.h>
#include <tqfile.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <dcopclient.h>
#include <kprocess.h>
#include <ktempfile.h>
diff --git a/kalarm/kalarmd/adapp.cpp b/kalarm/kalarmd/adapp.cpp
index d4613b0bd..2c9e09dc7 100644
--- a/kalarm/kalarmd/adapp.cpp
+++ b/kalarm/kalarmd/adapp.cpp
@@ -22,7 +22,7 @@
#include "kalarmd.h"
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include "alarmdaemon.h"
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp
index 8e2c4b499..314b6ad86 100644
--- a/kalarm/kalarmd/admain.cpp
+++ b/kalarm/kalarmd/admain.cpp
@@ -25,8 +25,8 @@
#include <stdlib.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <kstartupinfo.h>
#include "adapp.h"
diff --git a/kalarm/kalarmd/alarmdaemon.cpp b/kalarm/kalarmd/alarmdaemon.cpp
index 67c112d18..4af7f0de7 100644
--- a/kalarm/kalarmd/alarmdaemon.cpp
+++ b/kalarm/kalarmd/alarmdaemon.cpp
@@ -28,7 +28,7 @@
#include <tqfile.h>
#include <tqdatetime.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <kprocess.h>
#include <tdeio/netaccess.h>
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 6c0e5e637..ddcd38f35 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -36,7 +36,7 @@
#include <kmessagebox.h>
#include <kprocess.h>
#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdefileitem.h>
#include <tdeio/netaccess.h>
#include <ktempfile.h>
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index 94666d532..c3653e9b8 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -24,7 +24,7 @@
#include <stdlib.h>
#include <sys/stat.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/kalarm/main.cpp b/kalarm/main.cpp
index b4474917f..b4c3f251e 100644
--- a/kalarm/main.cpp
+++ b/kalarm/main.cpp
@@ -22,8 +22,8 @@
#include <stdlib.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 2db16ff1e..3cacb47ea 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -39,7 +39,7 @@
#include <tdeconfig.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <dcopclient.h>
#include <kdebug.h>
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 297e5149c..b437fffd7 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -37,7 +37,7 @@
#include <kstandarddirs.h>
#include <tdeaction.h>
#include <kstdguiitem.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 0e7450326..40b716756 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -38,8 +38,8 @@
#include <kstandarddirs.h>
#include <kshell.h>
#include <kmessagebox.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
#include <kcolorcombo.h>
#include <kstdguiitem.h>
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index 2e057eaf7..c0d9ff6cc 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -23,7 +23,7 @@
#include <kglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobalsettings.h>
#include <kmessagebox.h>
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index bb6322523..465fdf510 100644
--- a/kalarm/specialactions.cpp
+++ b/kalarm/specialactions.cpp
@@ -25,8 +25,8 @@
#include <tqwhatsthis.h>
#include <klineedit.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 5fc29fd72..54a043080 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -24,9 +24,9 @@
#include <tqtooltip.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdepopupmenu.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index b2703d0f7..5e9b98ee2 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <tqstringlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kdebug.h>
diff --git a/kandy/src/kandy.h b/kandy/src/kandy.h
index 54e3dc2a4..77a646ba9 100644
--- a/kandy/src/kandy.h
+++ b/kandy/src/kandy.h
@@ -28,7 +28,7 @@
#include <config.h>
#endif
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdemainwindow.h>
#include "kandyview.h"
diff --git a/kandy/src/kandy_client.cpp b/kandy/src/kandy_client.cpp
index b27e5de69..395b925a7 100644
--- a/kandy/src/kandy_client.cpp
+++ b/kandy/src/kandy_client.cpp
@@ -22,7 +22,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqdatastream.h>
#include <tqstring.h>
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index c9af96308..9ff0bf665 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -37,7 +37,7 @@
#include <tqspinbox.h>
#include <tqdatetime.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index 06683a70c..d7d8e7ad0 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -24,10 +24,10 @@
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index a4217be07..0408e9c6d 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -38,7 +38,7 @@
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstatusbar.h>
#include <kabc/stdaddressbook.h>
diff --git a/kandy/src/mobilemain.h b/kandy/src/mobilemain.h
index 1b7a7f427..9270fb94f 100644
--- a/kandy/src/mobilemain.h
+++ b/kandy/src/mobilemain.h
@@ -28,7 +28,7 @@
#include <config.h>
#endif
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdemainwindow.h>
#include "kandyprefs.h"
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index d0c86e21b..8d968ed7c 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -368,7 +368,7 @@ void karmPart::fileSaveAs()
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
TDEInstance* karmPartFactory::s_instance = 0L;
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 0eb16c1ec..2f90e8f31 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -35,7 +35,7 @@
#include <tqstringlist.h>
#include "incidence.h"
-#include "kapplication.h" // kapp
+#include "tdeapplication.h" // kapp
#include <kdebug.h>
#include <kemailsettings.h>
#include <klocale.h> // i18n
diff --git a/karm/main.cpp b/karm/main.cpp
index 28ea4354f..96f599442 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -1,8 +1,8 @@
#include <signal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include "version.h"
#include "mainwindow.h"
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 1eebca1e7..231cfeda1 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -9,7 +9,7 @@
#include <dcopclient.h>
#include <tdeaccel.h>
#include <tdeaction.h>
-#include <kapplication.h> // kapp
+#include <tdeapplication.h> // kapp
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
diff --git a/karm/plannerparser.h b/karm/plannerparser.h
index c5294b8d3..cba672119 100644
--- a/karm/plannerparser.h
+++ b/karm/plannerparser.h
@@ -32,7 +32,7 @@ test cases:
#include "taskview.h"
#include "task.h"
#include "karmstorage.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
class PlannerParser : public TQXmlDefaultHandler
{
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 1ccf46a3f..d331188a7 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -5,7 +5,7 @@
#include <tqspinbox.h>
#include <tqlayout.h>
-#include <kapplication.h> // kapp
+#include <tdeapplication.h> // kapp
#include <tdeconfig.h>
#include <kdebug.h>
#include <kemailsettings.h>
diff --git a/karm/task.cpp b/karm/task.cpp
index 20e9c5118..5b05407d7 100644
--- a/karm/task.cpp
+++ b/karm/task.cpp
@@ -5,7 +5,7 @@
#include <kiconloader.h>
-#include "kapplication.h" // kapp
+#include "tdeapplication.h" // kapp
#include "kdebug.h"
#include "event.h"
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 14477cf51..544593515 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -10,7 +10,7 @@
#include <tqtimer.h>
#include <tqxml.h>
-#include "kapplication.h" // kapp
+#include "tdeapplication.h" // kapp
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdefiledialog.h>
diff --git a/karm/test/locking.cpp b/karm/test/locking.cpp
index 448e7c1dc..a8f32c059 100644
--- a/karm/test/locking.cpp
+++ b/karm/test/locking.cpp
@@ -3,8 +3,8 @@
#include <tqstring.h>
#include <tqfile.h>
#include <tqdir.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
#include <resourcecalendar.h>
#include <resourcelocal.h>
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 674af0b18..726ffb148 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -21,8 +21,8 @@
#include <tqfile.h>
#include <tqlayout.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdehtml_part.h>
#include <tdehtmlview.h>
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index e9fa56213..09f6e345e 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -18,7 +18,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialog.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/kitchensync/src/main.cpp b/kitchensync/src/main.cpp
index 0c4726a67..d5a0c267c 100644
--- a/kitchensync/src/main.cpp
+++ b/kitchensync/src/main.cpp
@@ -19,8 +19,8 @@
*/
#include <kdebug.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kuniqueapplication.h>
#include <stdlib.h>
diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp
index f400de142..2b71f9070 100644
--- a/kitchensync/src/mainwidget.cpp
+++ b/kitchensync/src/mainwidget.cpp
@@ -28,7 +28,7 @@
#include <libqopensync/environment.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index dfe7327f6..027b3bcf2 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -22,7 +22,7 @@
#include <tqvbox.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kinstance.h>
diff --git a/kmail/aboutdata.h b/kmail/aboutdata.h
index 39fe56621..5c5b08ae0 100644
--- a/kmail/aboutdata.h
+++ b/kmail/aboutdata.h
@@ -32,7 +32,7 @@
#ifndef __KMAIL_ABOUTDATA_H__
#define __KMAIL_ABOUTDATA_H__
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdepimmacros.h>
namespace KMail {
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 47184b730..3cac88d46 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -42,7 +42,7 @@
#include <kmessagebox.h>
#include <knuminput.h>
#include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <kprotocolinfo.h>
#include <kiconloader.h>
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index eeed8f66f..b65de83ab 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -23,7 +23,7 @@
#include <kmessagebox.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqregexp.h>
#include <tqvaluelist.h>
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 19d543b3b..8b450f44b 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -40,7 +40,7 @@
#include "folderrequester.h"
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index c89f58b9e..434ddac18 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -83,7 +83,7 @@ using KMime::DateFormatter;
// other KDE headers:
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcharsets.h>
#include <kasciistringtools.h>
#include <kdebug.h>
diff --git a/kmail/dcoptest.cpp b/kmail/dcoptest.cpp
index b960b55cc..7501cc455 100644
--- a/kmail/dcoptest.cpp
+++ b/kmail/dcoptest.cpp
@@ -3,9 +3,9 @@
#endif
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include "aboutdata.h"
#include <kmailIface_stub.h>
diff --git a/kmail/folderIface.cpp b/kmail/folderIface.cpp
index d6dd6daae..981e1b373 100644
--- a/kmail/folderIface.cpp
+++ b/kmail/folderIface.cpp
@@ -38,7 +38,7 @@
#include "kmfoldermgr.h"
#include "kmfolder.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <stdlib.h>
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index fb382e15d..9a26dfcdd 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -39,7 +39,7 @@
#ifndef KMAIL_TESTING
#include "kmkernel.h"
#else
-#include <kapplication.h>
+#include <tdeapplication.h>
#endif
#include <klocale.h>
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index f464f0872..28a73cc9d 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -50,7 +50,7 @@ using KPIM::ProgressManager;
#include "kmfoldermgr.h"
#include "listjob.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <klocale.h>
diff --git a/kmail/index.cpp b/kmail/index.cpp
index 17de11d78..af4f4cb5b 100644
--- a/kmail/index.cpp
+++ b/kmail/index.cpp
@@ -36,7 +36,7 @@
#include "kmfoldersearch.h"
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqfile.h>
#include <tqtimer.h>
#include <tqvaluestack.h>
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index f89b7870d..ad5007914 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -24,7 +24,7 @@ using KPIM::ProgressManager;
using KMail::FolderJob;
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kdebug.h>
diff --git a/kmail/kmacctcachedimap.cpp b/kmail/kmacctcachedimap.cpp
index de22e7f69..9de08019e 100644
--- a/kmail/kmacctcachedimap.cpp
+++ b/kmail/kmacctcachedimap.cpp
@@ -50,7 +50,7 @@ using KMail::AccountManager;
#include <tdeio/slave.h>
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <tqstylesheet.h>
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 0e941b42d..93ba3a16a 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -14,7 +14,7 @@ using KPIM::ProgressManager;
#include "kmfoldermgr.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kdebug.h>
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index 226d99a54..f3e69d2b2 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -13,7 +13,7 @@ using KPIM::BroadcastStatus;
#include "progressmanager.h"
using KPIM::ProgressManager;
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kdebug.h>
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index adc888a42..84715a6fe 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -23,7 +23,7 @@
#include "kmaddrbook.h"
#include "kcursorsaver.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kmail/kmail.kcfg b/kmail/kmail.kcfg
index 91d2e51ef..c6080eb49 100644
--- a/kmail/kmail.kcfg
+++ b/kmail/kmail.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<include>tqtextcodec.h</include>
- <include>kapplication.h</include>
+ <include>tdeapplication.h</include>
<kcfgfile name="kmailrc"/>
<group name="Behaviour">
<entry name="DelayedMarkAsRead" type="Bool">
diff --git a/kmail/kmail_options.h b/kmail/kmail_options.h
index 62c1c311a..a8830c41e 100644
--- a/kmail/kmail_options.h
+++ b/kmail/kmail_options.h
@@ -2,7 +2,7 @@
#ifndef KMAIL_OPTIONS_H
#define KMAIL_OPTIONS_H
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
TDECmdLineOptions kmail_options[] =
diff --git a/kmail/kmail_part.cpp b/kmail/kmail_part.cpp
index ff0e0f0c9..69ccfc9bd 100644
--- a/kmail/kmail_part.cpp
+++ b/kmail/kmail_part.cpp
@@ -43,7 +43,7 @@ using KMail::AccountManager;
#include "recentaddresses.h"
using TDERecentAddress::RecentAddresses;
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/genericfactory.h>
#include <knotifyclient.h>
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 34c994009..9faa35e59 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -51,7 +51,7 @@
#include <mimelib/field.h>
#include <mimelib/mimepp.h>
#include <mimelib/string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqtextcodec.h>
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 84a744939..6031254a4 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -93,7 +93,7 @@ using TDERecentAddress::RecentAddresses;
#include <tdeio/scheduler.h>
#include <ktempfile.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstatusbar.h>
#include <tdeaction.h>
#include <kstdaction.h>
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index cfe3ff5e0..15889f126 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -31,7 +31,7 @@ using KPIM::MailListDrag;
#include <ktempfile.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdirwatch.h>
#include <kiconloader.h>
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 9441b63d0..2185ccf89 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -24,7 +24,7 @@ using KMail::FilterImporterExporter;
#include <klocale.h>
#include <kinputdialog.h>
#include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <twin.h>
#include <tdeconfig.h>
#include <kicondialog.h>
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index ab66c95fe..25abffe86 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -62,7 +62,7 @@ using KMail::ListJob;
#include "kmcommands.h"
#include "kmmainwidget.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index e1c1b811f..39839e324 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -51,7 +51,7 @@
#ifdef HAVE_BYTESWAP_H
#include <byteswap.h>
#endif
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcursor.h>
#include <kmessagebox.h>
#include <klocale.h>
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 6f291f41b..669bd6e1b 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -22,7 +22,7 @@ using KMail::MaildirJob;
#include "kmmsgdict.h"
#include "util.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kstaticdeleter.h>
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 321ed3158..2513258c2 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -22,7 +22,7 @@
#include <kmessagebox.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kmmainwin.h"
#include "kmfiltermgr.h"
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index ae340e7fe..0b13f07b8 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -30,7 +30,7 @@ using KMail::FolderViewToolTip;
#include <maillistdrag.h>
using namespace KPIM;
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
#include <kmessagebox.h>
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 432c02131..a768513f4 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -31,7 +31,7 @@ using KPIM::ProgressItem;
using namespace KPIM;
#include "messageactions.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeaccelmanager.h>
#include <kglobalsettings.h>
#include <kmessagebox.h>
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index 05571bf3c..e748c5507 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -56,7 +56,7 @@ using KMail::FolderIface;
#include "jobscheduler.h"
#include "templateparser.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <knotifyclient.h>
#include <kstaticdeleter.h>
@@ -89,7 +89,7 @@ using KWallet::Wallet;
#include <X11/Xlib.h>
#include <fixx11h.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kstartupinfo.h>
KMKernel *KMKernel::mySelf = 0;
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 155e00be6..6675149c7 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -33,7 +33,7 @@
#include <kcharsets.h>
#include <knotifyclient.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdefiledialog.h>
#include <ktip.h>
#include <knotifydialog.h>
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 9f6f497aa..1a3a6cb9e 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -14,7 +14,7 @@
#include "accountmanager.h"
#include "kmtransport.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kedittoolbar.h>
#include <tdeconfig.h>
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index da63f2034..201416b25 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -34,7 +34,7 @@ using KMail::HeaderStrategy;
#include <kpgpblock.h>
#include <kaddrbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobalsettings.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kmail/kmmsgpartdlg.cpp b/kmail/kmmsgpartdlg.cpp
index dd92e8634..869ee015c 100644
--- a/kmail/kmmsgpartdlg.cpp
+++ b/kmail/kmmsgpartdlg.cpp
@@ -14,9 +14,9 @@
// other KDE includes:
#include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kstringvalidator.h>
#include <kcombobox.h>
#include <kdebug.h>
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index 37534cbd3..fdf965ae5 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -27,7 +27,7 @@
#endif
#include <tqaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kedittoolbar.h>
#include <klocale.h>
#include <tdestdaccel.h>
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index b3220b1f7..9d8db6c9f 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -89,7 +89,7 @@ using KMail::TeeHtmlWriter;
#include <dom/dom_string.h>
#include <dom/dom_exception.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
// for the click on attachment stuff (dnaber):
#include <kuserprofile.h>
#include <kcharsets.h>
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index bf9a819cc..64c56cb15 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -12,7 +12,7 @@ using namespace KMime::Types;
#include <tdeio/passdlg.h>
#include <tdeio/scheduler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <tdeversion.h>
#include <klocale.h>
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index d2326394a..6b4848f00 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -38,7 +38,7 @@
#include <kmessagebox.h>
#include <kdebug.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeio/scheduler.h>
#include <tdeio/slave.h>
#include <tdeio/job.h>
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index bb484e864..9cf1b905a 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -30,8 +30,8 @@
#include <dcopclient.h>
#include <kcrash.h>
#include <kglobal.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
#include <kiconloader.h>
#include <errno.h>
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index 2a3bd975a..f4e1d4328 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -28,7 +28,7 @@
using KMail::AccountManager;
#include "globalsettings.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdemainwindow.h>
#include <kglobalsettings.h>
#include <kiconloader.h>
diff --git a/kmail/korghelper.cpp b/kmail/korghelper.cpp
index 4c17f2344..17097126b 100644
--- a/kmail/korghelper.cpp
+++ b/kmail/korghelper.cpp
@@ -21,7 +21,7 @@
#include <dcopclient.h>
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kdcopservicestarter.h>
diff --git a/kmail/maildirjob.cpp b/kmail/maildirjob.cpp
index ac5959009..b507d9272 100644
--- a/kmail/maildirjob.cpp
+++ b/kmail/maildirjob.cpp
@@ -36,7 +36,7 @@
#include "kmfoldermaildir.h"
#include "kmfolder.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tqtimer.h>
diff --git a/kmail/mailsourceviewer.cpp b/kmail/mailsourceviewer.cpp
index d2469348c..eff69cce1 100644
--- a/kmail/mailsourceviewer.cpp
+++ b/kmail/mailsourceviewer.cpp
@@ -35,7 +35,7 @@
#include "mailsourceviewer.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <twin.h>
#include <tqregexp.h>
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 0c972130c..269c5870c 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -10,7 +10,7 @@
#include <klocale.h>
#include <kiconloader.h>
#include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kinputdialog.h>
#include <kglobalsettings.h>
#include <kmessagebox.h>
diff --git a/kmail/mboxjob.cpp b/kmail/mboxjob.cpp
index 2205e86f6..7fb22ddbe 100644
--- a/kmail/mboxjob.cpp
+++ b/kmail/mboxjob.cpp
@@ -37,7 +37,7 @@
#include "kmfoldermbox.h"
#include "kmfolder.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tqtimer.h>
#include <tqdatetime.h>
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index a5c862b91..295b76010 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -92,7 +92,7 @@
#include <tdehtml_part.h>
#include <ktempfile.h>
#include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kmdcodec.h>
@@ -102,7 +102,7 @@
#include <tqdir.h>
#include <tqfile.h>
#include <tqapplication.h>
-#include <kstyle.h>
+#include <tdestyle.h>
#include <tqbuffer.h>
#include <tqpixmap.h>
#include <tqpainter.h>
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index 01529b81e..c16fdf011 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -31,7 +31,7 @@
#include <libemailfunctions/email.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdecompletionbox.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index 22140e85b..d5c5b3a19 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -26,10 +26,10 @@
#include "recipientseditor.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kmessagebox.h>
#include "aboutdata.h"
diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp
index 796cc8c0c..52f4647ec 100644
--- a/kmail/searchwindow.cpp
+++ b/kmail/searchwindow.cpp
@@ -35,7 +35,7 @@
#include "messagecopyhelper.h"
#include "textsource.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kstatusbar.h>
#include <twin.h>
diff --git a/kmail/secondarywindow.cpp b/kmail/secondarywindow.cpp
index 38f6b32dc..5a6896335 100644
--- a/kmail/secondarywindow.cpp
+++ b/kmail/secondarywindow.cpp
@@ -33,7 +33,7 @@
#include "kmkernel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
namespace KMail {
diff --git a/kmail/transportmanager.cpp b/kmail/transportmanager.cpp
index 158d9abb1..7cb9d9acb 100644
--- a/kmail/transportmanager.cpp
+++ b/kmail/transportmanager.cpp
@@ -20,7 +20,7 @@
#include "kmtransport.h"
#include "kmkernel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
namespace KMail {
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index e214a46cd..da5648c7d 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -28,7 +28,7 @@ using KMime::HeaderParsing::parseAddressList;
#include <klocale.h>
#include <kdebug.h>
#include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp
index 62e5b7de7..90da2e9c6 100644
--- a/kmailcvt/kimportpage.cpp
+++ b/kmailcvt/kimportpage.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <tqlabel.h>
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index 6f886a0c8..d34e0641d 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -15,7 +15,7 @@
***************************************************************************/
#include "kmailcvt.h"
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
#include <tqpushbutton.h>
#include <dcopclient.h>
#include <dcopref.h>
diff --git a/kmailcvt/kmailcvt.h b/kmailcvt/kmailcvt.h
index 87617a990..7253d5ac4 100644
--- a/kmailcvt/kmailcvt.h
+++ b/kmailcvt/kmailcvt.h
@@ -18,7 +18,7 @@
#include <config.h>
#endif
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kwizard.h>
#include "kimportpage.h"
diff --git a/kmailcvt/main.cpp b/kmailcvt/main.cpp
index b5d19a86a..d9bb4f16b 100644
--- a/kmailcvt/main.cpp
+++ b/kmailcvt/main.cpp
@@ -15,8 +15,8 @@
* *
***************************************************************************/
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <dcopclient.h>
#include "kmailcvt.h"
diff --git a/kmobile/kmobile.h b/kmobile/kmobile.h
index f2d6d613f..f2e110acc 100644
--- a/kmobile/kmobile.h
+++ b/kmobile/kmobile.h
@@ -5,7 +5,7 @@
#ifndef _KMOBILE_H_
#define _KMOBILE_H_
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdemainwindow.h>
#include <ktrader.h>
diff --git a/kmobile/main.cpp b/kmobile/main.cpp
index 107803d2d..423c8be87 100644
--- a/kmobile/main.cpp
+++ b/kmobile/main.cpp
@@ -20,8 +20,8 @@
#include "kmobile.h"
#include <kuniqueapplication.h>
#include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
static const char description[] =
diff --git a/kmobile/testlibkmobile.cpp b/kmobile/testlibkmobile.cpp
index 1f43cc9bf..4a883dede 100644
--- a/kmobile/testlibkmobile.cpp
+++ b/kmobile/testlibkmobile.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2003 Helge Deller <deller@kde.org>
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqdatastream.h>
#include <tqstring.h>
diff --git a/knode/aboutdata.h b/knode/aboutdata.h
index b1796897a..528e75b02 100644
--- a/knode/aboutdata.h
+++ b/knode/aboutdata.h
@@ -14,7 +14,7 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
*/
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdepimmacros.h>
#ifndef KNODE_ABOUTDATA_H
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index 8e8c10e85..e6dca1ccd 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -29,7 +29,7 @@
#include <tdeaction.h>
#include <kaddrbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbookmarkmanager.h>
#include <kcharsets.h>
#include <tdehtml_part.h>
diff --git a/knode/knapplication.cpp b/knode/knapplication.cpp
index b607da538..b74f41cf6 100644
--- a/knode/knapplication.cpp
+++ b/knode/knapplication.cpp
@@ -16,7 +16,7 @@
#include <twin.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include "knode.h"
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index d3240bbfc..6a20c4dd5 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -19,7 +19,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "knarticlefactory.h"
#include "knglobals.h"
diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp
index 3e79b4a62..f2078d71b 100644
--- a/knode/kncleanup.cpp
+++ b/knode/kncleanup.cpp
@@ -22,7 +22,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include "knfolder.h"
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 8c05e1a82..afebca1af 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -46,7 +46,7 @@ using TDERecentAddress::RecentAddresses;
#include <kurldrag.h>
#include <tdecompletionbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "kngroupselectdialog.h"
#include "utilities.h"
#include "knglobals.h"
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index b0b909138..b2bfb8bf7 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -21,7 +21,7 @@
#include <ksimpleconfig.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobalsettings.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index 619833d77..19e2c56ae 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -24,7 +24,7 @@
#include <kstandarddirs.h>
#include <klineedit.h>
#include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kpushbutton.h>
#include <kmime_util.h>
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index ec2176347..7a1f407c0 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <kstatusbar.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "broadcaststatus.h"
#include "krsqueezedtextlabel.h"
@@ -62,7 +62,7 @@ using TDERecentAddress::RecentAddresses;
#include "knscoring.h"
#include <kpgp.h>
#include "knmemorymanager.h"
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tdelistviewsearchline.h>
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 59cc0455d..299a1200a 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -23,7 +23,7 @@
#include <tdeio/job.h>
#include <tdeio/passdlg.h>
#include <ksocks.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "knaccountmanager.h"
#include "knarticle.h"
diff --git a/knode/knode.cpp b/knode/knode.cpp
index 40dfa2cf6..a29cb7db5 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -25,7 +25,7 @@
#include <kiconloader.h>
#include <kstatusbar.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "broadcaststatus.h"
#include "krsqueezedtextlabel.h"
diff --git a/knode/knode_options.h b/knode/knode_options.h
index 2614669a0..f8329e380 100644
--- a/knode/knode_options.h
+++ b/knode/knode_options.h
@@ -17,7 +17,7 @@
#ifndef KNODE_OPTIONS_H
#define KNODE_OPTIONS_H
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
static TDECmdLineOptions knode_options[] =
diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp
index 1d09376fc..c5169a5b3 100644
--- a/knode/knode_part.cpp
+++ b/knode/knode_part.cpp
@@ -31,7 +31,7 @@
#include "sidebarextension.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeparts/genericfactory.h>
#include <tdeparts/statusbarextension.h>
#include <knotifyclient.h>
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index f72afe472..45c59cb47 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -18,7 +18,7 @@
#include <tqcheckbox.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/knode/knsourceviewwindow.cpp b/knode/knsourceviewwindow.cpp
index 607e4c39f..71af3c18e 100644
--- a/knode/knsourceviewwindow.cpp
+++ b/knode/knsourceviewwindow.cpp
@@ -14,7 +14,7 @@
#include <tqaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "knsourceviewwindow.h"
#include "knglobals.h"
diff --git a/knode/main.cpp b/knode/main.cpp
index 663ddaaca..f7f1a835c 100644
--- a/knode/main.cpp
+++ b/knode/main.cpp
@@ -14,8 +14,8 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
*/
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include "knapplication.h"
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 07ab136fd..29ad10f5a 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -32,7 +32,7 @@
#include <tqcheckbox.h>
#include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeaction.h>
#include <kstdaction.h>
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index 752061a60..e3ee66fae 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -25,7 +25,7 @@
#include <tqhgroupbox.h>
#include <tqtabwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kiconloader.h>
diff --git a/knotes/knotesapp.h b/knotes/knotesapp.h
index 74a8fdc89..2c2656f3a 100644
--- a/knotes/knotesapp.h
+++ b/knotes/knotesapp.h
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqdom.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kxmlguiclient.h>
#include "KNotesAppIface.h"
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index 2605d7f44..35816f88e 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -26,7 +26,7 @@
#include <tqtextstream.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <kurl.h>
#include <kstandarddirs.h>
diff --git a/knotes/main.cpp b/knotes/main.cpp
index 13a525cf0..a8dde2d0f 100644
--- a/knotes/main.cpp
+++ b/knotes/main.cpp
@@ -19,8 +19,8 @@
*******************************************************************/
#include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kxerrorhandler.h>
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index bfab6aa81..8c2e3a364 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -26,9 +26,9 @@
#include <kabc/stdaddressbook.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -396,8 +396,8 @@ int create( TDECmdLineArgs *args )
file.setNameSpace( args->getOption( "namespace" ) );
if ( createMain ) {
- file.addInclude( "kaboutdata.h" );
- file.addInclude( "kapplication.h" );
+ file.addInclude( "tdeaboutdata.h" );
+ file.addInclude( "tdeapplication.h" );
file.addInclude( "kdebug" );
file.addInclude( "klocale" );
file.addInclude( "kcmdlineargs" );
diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp
index 3075fe8ff..9f236c3cf 100644
--- a/kode/kwsdl/kung/main.cpp
+++ b/kode/kwsdl/kung/main.cpp
@@ -19,9 +19,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp
index b4c7fb98f..ab40e3a33 100644
--- a/kode/kwsdl/main.cpp
+++ b/kode/kwsdl/main.cpp
@@ -21,9 +21,9 @@
#include "compiler.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cc
index 269c022f4..38c645940 100644
--- a/kode/kwsdl/tests/google/main.cc
+++ b/kode/kwsdl/tests/google/main.cc
@@ -1,6 +1,6 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kmdcodec.h>
#include "googlesearch.hh"
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index b297cc789..b46a99eb2 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -26,11 +26,11 @@
#include <kode/typedef.h>
#include <kode/statemachine.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h
index 33ab410c5..c0018fd5e 100644
--- a/kode/kxml_compiler/creator.h
+++ b/kode/kxml_compiler/creator.h
@@ -28,11 +28,11 @@
#include <kode/typedef.h>
#include <kode/file.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index e8a379f29..87c3bb1d3 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -26,11 +26,11 @@
#include <kode/printer.h>
#include <kode/typedef.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 9881aff5c..163213f99 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -25,11 +25,11 @@
#include <kode/printer.h>
#include <kode/typedef.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h
index ce5d65e26..07052787e 100644
--- a/kode/kxml_compiler/parser.h
+++ b/kode/kxml_compiler/parser.h
@@ -25,11 +25,11 @@
#include <kode/printer.h>
#include <kode/typedef.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
diff --git a/konsolekalendar/konsolekalendar.h b/konsolekalendar/konsolekalendar.h
index df09b69f0..2c6beb981 100644
--- a/konsolekalendar/konsolekalendar.h
+++ b/konsolekalendar/konsolekalendar.h
@@ -30,7 +30,7 @@
#include <tqdatetime.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/resourcecalendar.h>
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 1cd4148de..0339634ce 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -45,8 +45,8 @@
# endif
#endif
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
#include <kglobal.h>
#include <tdeconfig.h>
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index ae7efa528..a14a50db9 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -23,7 +23,7 @@
#include <tqobjectlist.h>
#include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kglobal.h>
#include <tdeparts/componentfactory.h>
#include <kdebug.h>
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index c465d7244..11b7bc5f1 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -21,8 +21,8 @@
#include "uniqueapphandler.h"
#include <kstartupinfo.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include "core.h"
#include <twin.h>
#include <dcopclient.h>
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index b977cfd34..bf59486c2 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -26,10 +26,10 @@
#include <dcopclient.h>
#include <dcopref.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 0e9f43451..86a75ed06 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -26,7 +26,7 @@
#include <tqdragobject.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
index 7ebac4fb2..1240687a2 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
@@ -24,9 +24,9 @@
#include <tqwidget.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index ba05ddd09..3a4500172 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -26,9 +26,9 @@
#include <dcopref.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 6db41f4cb..90d7b6ddd 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -24,7 +24,7 @@
#include <tqwidget.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 95d8ad75c..b203c3628 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -26,7 +26,7 @@
#include <tqlayout.h>
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index bbe5d9551..a0a0807fb 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -26,10 +26,10 @@
#include "core.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeparts/componentfactory.h>
#include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 9cdb854e9..5cac9cafa 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -22,7 +22,7 @@
#include <tqpopupmenu.h>
#include <tqclipboard.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeaction.h>
#include <kmessagebox.h>
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index d6414cbc1..fceeb65b4 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -19,7 +19,7 @@
*/
#include <dcopref.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index 054c0f91e..dc0a3fa75 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -33,7 +33,7 @@
#include <tqlayout.h>
#include <tqtextedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobalsettings.h>
#include "knotetip.h"
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index c0a92617c..ff517a43f 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -28,7 +28,7 @@
#include <dcopclient.h>
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kiconloader.h>
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 0c0af4a3c..4b017af94 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -24,7 +24,7 @@
#include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeaction.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index ab574346d..43d027d4d 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -27,8 +27,8 @@
#include <tqradiobutton.h>
#include <tqspinbox.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index 1a90a8aad..6131206e0 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp
@@ -24,7 +24,7 @@
#include "core.h"
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstartupinfo.h>
#include <twin.h>
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 7f04a0c7f..1cc6fb527 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -27,7 +27,7 @@
#include <tqwidget.h>
#include <tqdragobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kabc/vcardconverter.h>
#include <tdeaction.h>
#include <dcopref.h>
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 7fbc2a9c3..a0208f539 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -26,7 +26,7 @@
#include <tqdragobject.h>
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kabc/vcardconverter.h>
#include <tdeaction.h>
#include <kdebug.h>
diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp
index 43ffb6294..188457c28 100644
--- a/kontact/plugins/kpilot/kpilot_plugin.cpp
+++ b/kontact/plugins/kpilot/kpilot_plugin.cpp
@@ -21,7 +21,7 @@
#include "options.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kgenericfactory.h>
#include <tdeparts/componentfactory.h>
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 42b69f4f6..ec17c1f32 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -33,7 +33,7 @@
#include <dcopclient.h>
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 72132b997..5c388f2aa 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -31,8 +31,8 @@
#include <dcopref.h>
#include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index db83e3de0..8fff21806 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -30,7 +30,7 @@
#include <tqcursor.h>
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcharsets.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index 08131e57b..e375c7946 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -29,8 +29,8 @@
#include <tqradiobutton.h>
#include <tqspinbox.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index 80e0f1465..a378a1218 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -32,7 +32,7 @@
#include <dcopref.h>
#include <kabc/stdaddressbook.h>
#include <korganizer/stdcalendar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialog.h>
#include <kglobal.h>
#include <kiconloader.h>
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index 97b4d8100..fbbdfe0a1 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -22,7 +22,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <klocale.h>
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index b43af7ffb..8b2999f4d 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -22,7 +22,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index c968e5f80..4ba14d2eb 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -28,7 +28,7 @@
#include <dcopclient.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdcopservicestarter.h>
#include <kdebug.h>
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 23e2ff8a2..5f0a1e4b5 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -24,7 +24,7 @@
#include <dcopref.h>
#include <kgenericfactory.h>
#include <tdeparts/componentfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <tqpopupmenu.h>
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index c360ba523..bd5fed431 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -33,7 +33,7 @@
#include <kmessagebox.h>
#include <klocale.h>
#include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <dcopclient.h>
#include <kdcopservicestarter.h>
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 64d3d2691..65d0e73b3 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -27,7 +27,7 @@
#include <dcopclient.h>
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index 6c1f57d97..a1decfbb2 100644
--- a/kontact/plugins/weather/weather_plugin.cpp
+++ b/kontact/plugins/weather/weather_plugin.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kgenericfactory.h>
#include <tdeparts/componentfactory.h>
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index f655ca691..ca3bc265a 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -29,7 +29,7 @@
#include <klocale.h>
#include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kactivelabel.h>
#include <ktextbrowser.h>
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 581a91b96..d4eb6d3d1 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -37,7 +37,7 @@
#include <tqtooltip.h>
#include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdialog.h>
#include <klocale.h>
#include <kiconloader.h>
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index d2f9d0a23..61628bf9d 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -26,7 +26,7 @@
#include "prefs.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include <tdelistview.h>
#include <klocale.h>
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 1fa4e7f72..268acb897 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -22,8 +22,8 @@
#include <iostream>
#include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <klocale.h>
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index eff2d9089..e36cd8270 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -34,7 +34,7 @@
#include <tqwhatsthis.h>
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kedittoolbar.h>
@@ -65,7 +65,7 @@
#include <libtdepim/tdefileio.h>
#include <kcursor.h>
#include <krun.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kmenubar.h>
#include <tdestdaccel.h>
#include <kcmultidialog.h>
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 3b0a568c6..80fdc8139 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -26,7 +26,7 @@
#include <tdeio/job.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kstandarddirs.h>
diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h
index c78361eee..0edf98110 100644
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@@ -24,7 +24,7 @@
#ifndef KORG_ABOUTDATA_H
#define KORG_ABOUTDATA_H
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <tdepimmacros.h>
namespace KOrg {
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 30f2c262f..6c85c48b7 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -70,7 +70,7 @@
#include <kstdguiitem.h>
#include <tdeversion.h>
#include <tdeactionclasses.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqapplication.h>
#include <tqcursor.h>
diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp
index 5d479e889..d23c75285 100644
--- a/korganizer/freebusymanager.cpp
+++ b/korganizer/freebusymanager.cpp
@@ -56,7 +56,7 @@
#include <tdeio/jobclasses.h>
#include <tdeio/netaccess.h>
#include <tdeio/scheduler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kstandarddirs.h>
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index a1828671f..869fe119b 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -39,7 +39,7 @@
#include <tqcursor.h>
#include <tqbitarray.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp
index 8f9412ba3..ad9943593 100644
--- a/korganizer/koapp.cpp
+++ b/korganizer/koapp.cpp
@@ -28,7 +28,7 @@
#include <iostream>
#include <kglobal.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp
index b951b7598..c88b6383d 100644
--- a/korganizer/komailclient.cpp
+++ b/korganizer/komailclient.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <kmessagebox.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <kprocess.h>
diff --git a/korganizer/konewstuff.cpp b/korganizer/konewstuff.cpp
index 1c9daa813..346ebf7e2 100644
--- a/korganizer/konewstuff.cpp
+++ b/korganizer/konewstuff.cpp
@@ -21,7 +21,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <libkcal/calendarlocal.h>
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index 8b6881260..fc3369461 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -36,7 +36,7 @@
#include <dcopclient.h>
#include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdcopservicestarter.h>
#include <kiconloader.h>
diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp
index 6c3e22564..d1eb5347a 100644
--- a/korganizer/korgac/alarmdockwindow.cpp
+++ b/korganizer/korgac/alarmdockwindow.cpp
@@ -25,7 +25,7 @@
#include "alarmdockwindow.h"
#include "koalarmclient.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <klocale.h>
diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp
index be9205bea..7707e0eca 100644
--- a/korganizer/korgac/koalarmclient.cpp
+++ b/korganizer/korgac/koalarmclient.cpp
@@ -34,7 +34,7 @@
#include <kstandarddirs.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <twin.h>
#include <tqpushbutton.h>
diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h
index 6ba8a5fbf..a86288483 100644
--- a/korganizer/korgac/koalarmclient.h
+++ b/korganizer/korgac/koalarmclient.h
@@ -28,7 +28,7 @@
#include "alarmclientiface.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqtimer.h>
#include <tqdatetime.h>
diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp
index b4c6a69c7..6dce72116 100644
--- a/korganizer/korgac/korgacmain.cpp
+++ b/korganizer/korgac/korgacmain.cpp
@@ -27,8 +27,8 @@
#include <kglobal.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <kuniqueapplication.h>
#include "koalarmclient.h"
diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp
index 8f21106a3..38b6310e0 100644
--- a/korganizer/korgac/testalarmdlg.cpp
+++ b/korganizer/korgac/testalarmdlg.cpp
@@ -24,11 +24,11 @@
#include <tqwidget.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/korganizer/korganizer_options.h b/korganizer/korganizer_options.h
index b29366165..29e0a543e 100644
--- a/korganizer/korganizer_options.h
+++ b/korganizer/korganizer_options.h
@@ -26,7 +26,7 @@
#ifndef KORGANIZER_OPTIONS_H
#define KORGANIZER_OPTIONS_H
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
static const TDECmdLineOptions korganizer_options[] =
diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp
index 8b2a5343b..3ee64db4f 100644
--- a/korganizer/korgplugins.cpp
+++ b/korganizer/korgplugins.cpp
@@ -22,11 +22,11 @@
with any edition of TQt, and distribute the resulting executable,
without including the source code for TQt in the source distribution.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <calendar/plugin.h>
diff --git a/korganizer/main.cpp b/korganizer/main.cpp
index 118b32643..8a022d8ab 100644
--- a/korganizer/main.cpp
+++ b/korganizer/main.cpp
@@ -28,8 +28,8 @@
#include <kglobal.h>
#include <kdebug.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include "korganizer.h"
diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp
index 3fbf84104..a8ad5858d 100644
--- a/korganizer/plugins/datenums/configdialog.cpp
+++ b/korganizer/plugins/datenums/configdialog.cpp
@@ -25,7 +25,7 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp
index bacb04760..e6695e53c 100644
--- a/korganizer/plugins/exchange/exchange.cpp
+++ b/korganizer/plugins/exchange/exchange.cpp
@@ -19,7 +19,7 @@
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp
index 91e4670e5..55710bcc8 100644
--- a/korganizer/plugins/exchange/exchangeconfig.cpp
+++ b/korganizer/plugins/exchange/exchangeconfig.cpp
@@ -21,7 +21,7 @@
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp
index de56a3a19..d998f37f3 100644
--- a/korganizer/plugins/exchange/exchangedialog.cpp
+++ b/korganizer/plugins/exchange/exchangedialog.cpp
@@ -23,7 +23,7 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp
index 668fad5ab..a6dd2e5a8 100644
--- a/korganizer/plugins/hebrew/configdialog.cpp
+++ b/korganizer/plugins/hebrew/configdialog.cpp
@@ -20,7 +20,7 @@
#include "configdialog.moc"
#include <klocale.h>
#include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp
index 5847d0c25..8f0c3b662 100644
--- a/korganizer/plugins/projectview/koprojectview.cpp
+++ b/korganizer/plugins/projectview/koprojectview.cpp
@@ -28,7 +28,7 @@
#include <tqstrlist.h>
#include <tqlistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kglobal.h>
diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp
index 636309a93..9c8b611e0 100644
--- a/korganizer/plugins/projectview/projectview.cpp
+++ b/korganizer/plugins/projectview/projectview.cpp
@@ -19,7 +19,7 @@
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <klocale.h>
diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp
index 9853ac871..d3ab6a6cf 100644
--- a/korganizer/plugins/timespanview/timespanview.cpp
+++ b/korganizer/plugins/timespanview/timespanview.cpp
@@ -19,7 +19,7 @@
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <klocale.h>
diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp
index 69e0b4f0e..1753e0376 100644
--- a/korganizer/timezone.cpp
+++ b/korganizer/timezone.cpp
@@ -25,11 +25,11 @@
#include <tqdatetime.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include "koprefs.h"
diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp
index f5b91e781..236a71244 100644
--- a/korganizer/urihandler.cpp
+++ b/korganizer/urihandler.cpp
@@ -35,7 +35,7 @@ using namespace KCal;
#include "kmailIface_stub.h"
#endif
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <tdefiledialog.h>
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index becf02c3f..4b1fd76da 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -20,9 +20,9 @@
#include "mailsubject.h"
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
#include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kbugreport.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index fb24c821b..7d5de1865 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -20,7 +20,7 @@
#include "systemtray.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp
index 2cee96650..cede9c478 100644
--- a/korn/hvitem.cpp
+++ b/korn/hvitem.cpp
@@ -21,7 +21,7 @@
#include "label.h"
#include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kpassivepopup.h>
#include <tdepopupmenu.h>
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index 5d075b65f..72ca18a8c 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -24,7 +24,7 @@
#include "hvcontainer.h"
#include "password.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialogbase.h>
diff --git a/korn/main.cpp b/korn/main.cpp
index 073a7fcc0..d5a68a3ae 100644
--- a/korn/main.cpp
+++ b/korn/main.cpp
@@ -4,8 +4,8 @@
*/
#include"kornapp.h"
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include"kornshell.h"
diff --git a/korn/systemtray.cpp b/korn/systemtray.cpp
index a0bd191d5..5a4697172 100644
--- a/korn/systemtray.cpp
+++ b/korn/systemtray.cpp
@@ -18,7 +18,7 @@
#include "systemtray.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/ktnef/gui/ktnefmain.cpp b/ktnef/gui/ktnefmain.cpp
index 735085331..4db5013fc 100644
--- a/ktnef/gui/ktnefmain.cpp
+++ b/ktnef/gui/ktnefmain.cpp
@@ -28,7 +28,7 @@
#include <tqpopupmenu.h>
#include <tdelistview.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
#include <tqpixmap.h>
#include <tdestdaccel.h>
diff --git a/ktnef/gui/ktnefview.cpp b/ktnef/gui/ktnefview.cpp
index caadcc9e9..b06a8d6a2 100644
--- a/ktnef/gui/ktnefview.cpp
+++ b/ktnef/gui/ktnefview.cpp
@@ -23,7 +23,7 @@
#include <tqpixmap.h>
#include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/ktnef/gui/main.cpp b/ktnef/gui/main.cpp
index 9c690863d..c68fd3e6f 100644
--- a/ktnef/gui/main.cpp
+++ b/ktnef/gui/main.cpp
@@ -15,10 +15,10 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "ktnefmain.h"
diff --git a/libemailfunctions/tests/testemail.cpp b/libemailfunctions/tests/testemail.cpp
index 5b2f5bcb2..ee8880494 100644
--- a/libemailfunctions/tests/testemail.cpp
+++ b/libemailfunctions/tests/testemail.cpp
@@ -19,8 +19,8 @@
// Test program for libemailfunctions/email.h
#include "email.h"
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <stdio.h>
diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp
index 9b4926769..aff810c10 100644
--- a/libkcal/attachmenthandler.cpp
+++ b/libkcal/attachmenthandler.cpp
@@ -34,7 +34,7 @@
#include "incidence.h"
#include "scheduler.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp
index c29437ac5..6775c9ec9 100644
--- a/libkcal/calformat.cpp
+++ b/libkcal/calformat.cpp
@@ -21,7 +21,7 @@
#include <klocale.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include "calformat.h"
diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp
index dd03ed556..ef585e633 100644
--- a/libkcal/convertqtopia.cpp
+++ b/libkcal/convertqtopia.cpp
@@ -23,11 +23,11 @@
#include "icalformat.h"
#include "qtopiaformat.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index 1c1efe1da..0a42e2aac 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -42,7 +42,7 @@
#include <kabc/vcardconverter.h>
#include <kabc/stdaddressbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kemailsettings.h>
#include <klocale.h>
diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index 626f5a52a..53e082a3d 100644
--- a/libkcal/tests/readandwrite.cpp
+++ b/libkcal/tests/readandwrite.cpp
@@ -25,11 +25,11 @@ extern "C" {
#include "icaltimezone.h"
}
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqfile.h>
#include <tqfileinfo.h>
diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp
index 7e3770a3a..85f77d78e 100644
--- a/libkcal/tests/testcalendar.cpp
+++ b/libkcal/tests/testcalendar.cpp
@@ -19,11 +19,11 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include "calendarlocal.h"
diff --git a/libkcal/tests/testcalselectdialog.cpp b/libkcal/tests/testcalselectdialog.cpp
index 976a6ffea..2c3ae7f72 100644
--- a/libkcal/tests/testcalselectdialog.cpp
+++ b/libkcal/tests/testcalselectdialog.cpp
@@ -20,8 +20,8 @@
#include "calselectdialog.h"
using namespace KCal;
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index eeadbaae5..2d393aa65 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -19,11 +19,11 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include "calendarlocal.h"
diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp
index a4f101133..858ed9ccd 100644
--- a/libkcal/tests/testincidence.cpp
+++ b/libkcal/tests/testincidence.cpp
@@ -19,11 +19,11 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include "icalformat.h"
#include "event.h"
diff --git a/libkcal/tests/testrecurprevious.cpp b/libkcal/tests/testrecurprevious.cpp
index e65803b12..2dae1543f 100644
--- a/libkcal/tests/testrecurprevious.cpp
+++ b/libkcal/tests/testrecurprevious.cpp
@@ -26,10 +26,10 @@ extern "C" {
#include "icaltimezone.h"
}
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqfile.h>
diff --git a/libkcal/tests/testrecurrence.cpp b/libkcal/tests/testrecurrence.cpp
index 8102c0991..5a77de866 100644
--- a/libkcal/tests/testrecurrence.cpp
+++ b/libkcal/tests/testrecurrence.cpp
@@ -26,10 +26,10 @@ extern "C" {
#include "icaltimezone.h"
}
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqfile.h>
diff --git a/libkcal/tests/testrecurrencetype.cpp b/libkcal/tests/testrecurrencetype.cpp
index 8102c0991..5a77de866 100644
--- a/libkcal/tests/testrecurrencetype.cpp
+++ b/libkcal/tests/testrecurrencetype.cpp
@@ -26,10 +26,10 @@ extern "C" {
#include "icaltimezone.h"
}
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqfile.h>
diff --git a/libkcal/tests/testrecurson.cpp b/libkcal/tests/testrecurson.cpp
index 09b65aa64..f5d1841cd 100644
--- a/libkcal/tests/testrecurson.cpp
+++ b/libkcal/tests/testrecurson.cpp
@@ -26,10 +26,10 @@ extern "C" {
#include "icaltimezone.h"
}
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqfile.h>
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index 54b536831..64ada3b0a 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -23,11 +23,11 @@
#include <kabc/stdaddressbook.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kinputdialog.h>
#include <tderesources/factory.h>
diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp
index 304569c06..d6997ef49 100644
--- a/libkcal/tests/testvcalexport.cpp
+++ b/libkcal/tests/testvcalexport.cpp
@@ -29,11 +29,11 @@ extern "C" {
#include "icaltimezone.h"
}
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqfile.h>
#include <tqfileinfo.h>
diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp
index 369b021cb..ec9a770f7 100644
--- a/libkholidays/kholidays.cpp
+++ b/libkholidays/kholidays.cpp
@@ -19,7 +19,7 @@
*/
#include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 4062d1e4f..fbcb3efdd 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -41,7 +41,7 @@
#include <tdeconfigbase.h>
#include <tdeconfig.h>
#include <kprogress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <twin.h>
#if KDE_IS_VERSION( 3, 1, 90 )
#include <kglobalsettings.h>
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index dc7d7daa9..75b1446d9 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -29,7 +29,7 @@
#include <tqfile.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <dcopclient.h>
diff --git a/libkpimexchange/core/exchangeclient.cpp b/libkpimexchange/core/exchangeclient.cpp
index c316a25a4..4f540aee9 100644
--- a/libkpimexchange/core/exchangeclient.cpp
+++ b/libkpimexchange/core/exchangeclient.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kurl.h>
#include <kdebug.h>
#include <kcursor.h>
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index 89bc53ff8..9ff3040f5 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -24,7 +24,7 @@
#include <tqcstring.h>
#include <tqregexp.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp
index 2b6e0286f..0c7393bb7 100644
--- a/libkpimexchange/core/exchangeprogress.cpp
+++ b/libkpimexchange/core/exchangeprogress.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index d9d626156..44cabc047 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -42,7 +42,7 @@ static const char configKeyDefaultIdentity[] = "Default Identity";
#include <libemailfunctions/email.h> // for static helper functions
#include <kemailsettings.h> // for IdentityEntry::fromControlCenter()
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp
index e2aa2e42c..e4c0a0c48 100644
--- a/libtdepim/addresseeview.cpp
+++ b/libtdepim/addresseeview.cpp
@@ -29,7 +29,7 @@
#include <kabc/phonenumber.h>
#include <kabc/resource.h>
#include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp
index 1a3dc662a..d7c540031 100644
--- a/libtdepim/addressesdialog.cpp
+++ b/libtdepim/addressesdialog.cpp
@@ -39,7 +39,7 @@
#endif
#include <kabc/stdaddressbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kiconloader.h>
diff --git a/libtdepim/alarmclient.cpp b/libtdepim/alarmclient.cpp
index da1ef891c..b41cc2a9c 100644
--- a/libtdepim/alarmclient.cpp
+++ b/libtdepim/alarmclient.cpp
@@ -22,7 +22,7 @@
#include "alarmclient.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/libtdepim/cfgc/autoexample.cpp b/libtdepim/cfgc/autoexample.cpp
index 8f5d08e8d..ea94e0916 100644
--- a/libtdepim/cfgc/autoexample.cpp
+++ b/libtdepim/cfgc/autoexample.cpp
@@ -24,11 +24,11 @@
#include <libtdepim/kprefsdialog.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/libtdepim/cfgc/example.cpp b/libtdepim/cfgc/example.cpp
index d3f068799..ab58e0d20 100644
--- a/libtdepim/cfgc/example.cpp
+++ b/libtdepim/cfgc/example.cpp
@@ -21,11 +21,11 @@
#include "exampleprefs_base.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp
index 8c9f599ff..1ee6f8a88 100644
--- a/libtdepim/completionordereditor.cpp
+++ b/libtdepim/completionordereditor.cpp
@@ -46,7 +46,7 @@
#include <tqvbox.h>
#include <tqheader.h>
#include <tqtoolbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
/*
diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp
index 72fa4f3d0..9da5eb628 100644
--- a/libtdepim/kaddrbook.cpp
+++ b/libtdepim/kaddrbook.cpp
@@ -13,7 +13,7 @@
#include <kabc/distributionlist.h>
#endif
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp
index f3e8597de..eda7248a9 100644
--- a/libtdepim/kcmdesignerfields.cpp
+++ b/libtdepim/kcmdesignerfields.cpp
@@ -34,7 +34,7 @@
#include <tqregexp.h>
#include <tqtimer.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kglobal.h>
diff --git a/libtdepim/kimportdialog.cpp b/libtdepim/kimportdialog.cpp
index df1181ed1..861cbfb4d 100644
--- a/libtdepim/kimportdialog.cpp
+++ b/libtdepim/kimportdialog.cpp
@@ -36,7 +36,7 @@
#include <tqtextstream.h>
#include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <kcombobox.h>
#include <kinputdialog.h>
diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index 79485f89c..acd798120 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -28,7 +28,7 @@
#include <ksettings/dialog.h>
#include <kplugininfo.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <ktrader.h>
#include <klibloader.h>
diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 46ed94975..2e5aa4f67 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -30,7 +30,7 @@
#include <tqtimer.h>
#include <tqvaluestack.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeparts/componentfactory.h>
#include <kplugininfo.h>
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index eeeaff62d..80b9951a2 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -21,7 +21,7 @@
#include "prefsmodule.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include <kcombobox.h>
#include <klocale.h>
diff --git a/libtdepim/komposer/core/tests/main.cpp b/libtdepim/komposer/core/tests/main.cpp
index 39ac630e5..c59080ed4 100644
--- a/libtdepim/komposer/core/tests/main.cpp
+++ b/libtdepim/komposer/core/tests/main.cpp
@@ -19,11 +19,11 @@
* 02110-1301 USA
*/
#include "testfactory.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/libtdepim/komposer/core/tests/testkomposer.cpp b/libtdepim/komposer/core/tests/testkomposer.cpp
index efacb460f..634daba60 100644
--- a/libtdepim/komposer/core/tests/testkomposer.cpp
+++ b/libtdepim/komposer/core/tests/testkomposer.cpp
@@ -1,8 +1,8 @@
#include "core.h"
#include <kplugininfo.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
#include <kdebug.h>
int main( int argc, char **argv )
diff --git a/libtdepim/komposer/core/tests/testmanager.cpp b/libtdepim/komposer/core/tests/testmanager.cpp
index b883997f3..a690c67c6 100644
--- a/libtdepim/komposer/core/tests/testmanager.cpp
+++ b/libtdepim/komposer/core/tests/testmanager.cpp
@@ -5,8 +5,8 @@
#include "plugin.h"
#include <kplugininfo.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
#include <kdebug.h>
using namespace Komposer;
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index accd10505..a5e2ff696 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -22,7 +22,7 @@
#include "core.h"
#include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/libtdepim/komposer/test/test.cpp b/libtdepim/komposer/test/test.cpp
index 4f811e90f..40996d1e6 100644
--- a/libtdepim/komposer/test/test.cpp
+++ b/libtdepim/komposer/test/test.cpp
@@ -21,8 +21,8 @@
#include "core.h"
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kuniqueapplication.h>
diff --git a/libtdepim/ksubscription.cpp b/libtdepim/ksubscription.cpp
index 601da0fbb..94030bcc1 100644
--- a/libtdepim/ksubscription.cpp
+++ b/libtdepim/ksubscription.cpp
@@ -21,7 +21,7 @@
#include <tqtoolbutton.h>
#include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/libtdepim/ktimeedit.h b/libtdepim/ktimeedit.h
index 1b93b8fa3..1bb307f85 100644
--- a/libtdepim/ktimeedit.h
+++ b/libtdepim/ktimeedit.h
@@ -31,7 +31,7 @@
#include <tqdatetime.h>
#include <tqcombobox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdepimmacros.h>
/**
diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp
index 32202b3da..4ea3b4584 100644
--- a/libtdepim/ldapclient.cpp
+++ b/libtdepim/ldapclient.cpp
@@ -31,7 +31,7 @@
#include <kabc/ldapurl.h>
#include <kabc/ldif.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdirwatch.h>
diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp
index 586e9011d..7a1319b74 100644
--- a/libtdepim/ldapsearchdialog.cpp
+++ b/libtdepim/ldapsearchdialog.cpp
@@ -32,7 +32,7 @@
#include <tqpushbutton.h>
#include <kabc/addresslineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kcombobox.h>
#include <tdeconfig.h>
#include <klineedit.h>
diff --git a/libtdepim/maillistdrag.cpp b/libtdepim/maillistdrag.cpp
index 91cd1dca7..159ca2f24 100644
--- a/libtdepim/maillistdrag.cpp
+++ b/libtdepim/maillistdrag.cpp
@@ -24,7 +24,7 @@
#include <tqbuffer.h>
#include <tqdatastream.h>
#include <tqeventloop.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kprogress.h>
diff --git a/libtdepim/tdeconfigwizard.cpp b/libtdepim/tdeconfigwizard.cpp
index 026c85991..30e11fbc9 100644
--- a/libtdepim/tdeconfigwizard.cpp
+++ b/libtdepim/tdeconfigwizard.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <tdeconfigskeleton.h>
#include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqlistview.h>
#include <tqlayout.h>
diff --git a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
index 97dec07ef..2801a9d3a 100644
--- a/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
+++ b/libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp
@@ -23,7 +23,7 @@
#include <tdeparts/part.h>
#include <kmimetype.h>
#include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdepimmacros.h>
KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name )
diff --git a/libtdepim/tests/testaddresseelineedit.cpp b/libtdepim/tests/testaddresseelineedit.cpp
index b08e1d8ac..9fb3470d0 100644
--- a/libtdepim/tests/testaddresseelineedit.cpp
+++ b/libtdepim/tests/testaddresseelineedit.cpp
@@ -19,11 +19,11 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include "../addresseelineedit.h"
diff --git a/libtdepim/tests/testaddresseeselector.cpp b/libtdepim/tests/testaddresseeselector.cpp
index 0be82ca3a..438208698 100644
--- a/libtdepim/tests/testaddresseeselector.cpp
+++ b/libtdepim/tests/testaddresseeselector.cpp
@@ -19,11 +19,11 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include "../addresseeselector.h"
#include "../addresseeemailselection.h"
diff --git a/libtdepim/tests/testdateedit.cpp b/libtdepim/tests/testdateedit.cpp
index 24bade100..257624645 100644
--- a/libtdepim/tests/testdateedit.cpp
+++ b/libtdepim/tests/testdateedit.cpp
@@ -21,9 +21,9 @@
#include <tqlayout.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <klocale.h>
diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp
index 75c4d5574..d57cc5929 100644
--- a/libtdepim/tests/testdistrlist.cpp
+++ b/libtdepim/tests/testdistrlist.cpp
@@ -25,11 +25,11 @@ using KPIM::DistributionList;
#include <kabc/stdaddressbook.h>
#include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqdir.h>
#include <tqfileinfo.h>
diff --git a/libtdepim/tests/testkincidencechooser.cpp b/libtdepim/tests/testkincidencechooser.cpp
index 539508253..d2f8cadf3 100644
--- a/libtdepim/tests/testkincidencechooser.cpp
+++ b/libtdepim/tests/testkincidencechooser.cpp
@@ -17,8 +17,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include <libkcal/event.h>
diff --git a/libtdepim/tests/testlinklocator.cpp b/libtdepim/tests/testlinklocator.cpp
index 0ed3f1f95..478b370b0 100644
--- a/libtdepim/tests/testlinklocator.cpp
+++ b/libtdepim/tests/testlinklocator.cpp
@@ -19,8 +19,8 @@
// Test program for libtdepim/linklocator.*
#include <linklocator.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <stdio.h>
diff --git a/libtdepim/tests/testwizard.cpp b/libtdepim/tests/testwizard.cpp
index 6cb51f8f6..fd6c70eb8 100644
--- a/libtdepim/tests/testwizard.cpp
+++ b/libtdepim/tests/testwizard.cpp
@@ -23,11 +23,11 @@
#include <tdeconfigwizard.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqlayout.h>
#include <tqcheckbox.h>
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 17659a38d..b85cca490 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -68,7 +68,7 @@
#include <kdcopservicestarter.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <ktempfile.h>
#include <kmdcodec.h>
#include <kmimetype.h>
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 959a7d2eb..74b564570 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -32,7 +32,7 @@
#include <tqurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kglobal.h>
#include <klocale.h>
#include <kstringhandler.h>
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index c5c577647..7e364450c 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -45,7 +45,7 @@
#include <kdebug.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqurl.h>
#include <tqfile.h>
diff --git a/tderesources/egroupware/synchronizer.cpp b/tderesources/egroupware/synchronizer.cpp
index 8152828cb..b9154e4b6 100644
--- a/tderesources/egroupware/synchronizer.cpp
+++ b/tderesources/egroupware/synchronizer.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <tqeventloop.h>
#include <unistd.h>
diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp
index 16344d015..6335dc64b 100644
--- a/tderesources/exchange/resourceexchange.cpp
+++ b/tderesources/exchange/resourceexchange.cpp
@@ -27,7 +27,7 @@
#include <tqwidget.h>
#include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kstringhandler.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/tderesources/featureplan/benchmarkfeaturelist.cpp b/tderesources/featureplan/benchmarkfeaturelist.cpp
index 14225d74c..fbb41b5b6 100644
--- a/tderesources/featureplan/benchmarkfeaturelist.cpp
+++ b/tderesources/featureplan/benchmarkfeaturelist.cpp
@@ -22,9 +22,9 @@
#include "kde-features.h"
#include "kde-features_parser.h"
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include <tqfile.h>
diff --git a/tderesources/featureplan/dumpfeaturelist.cpp b/tderesources/featureplan/dumpfeaturelist.cpp
index e599f7107..812ff3c6e 100644
--- a/tderesources/featureplan/dumpfeaturelist.cpp
+++ b/tderesources/featureplan/dumpfeaturelist.cpp
@@ -22,9 +22,9 @@
#include "kde-features.h"
#include "kde-features_parser.h"
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
#include <kdebug.h>
#include <tqfile.h>
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 809c29b8b..16ddf70db 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -27,7 +27,7 @@
#include <ksslpeerinfo.h>
#include <ksslcertchain.h>
#include <ksslcertificatecache.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kmessagebox.h>
#include "ksslsocket.h"
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index 2e55f1674..5ea29cbea 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -1,8 +1,8 @@
#include "groupwiseserver.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <ktempfile.h>
diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp
index 889c4811b..93308b39f 100644
--- a/tderesources/kolab/kabc/resourcekolab.cpp
+++ b/tderesources/kolab/kabc/resourcekolab.cpp
@@ -42,7 +42,7 @@
#include <tdeio/uiserver_stub.h>
#include <kabc/vcardconverter.h>
#include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqobject.h>
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index bfcb3c89f..101a9858b 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -39,7 +39,7 @@
#include <tdeio/observer.h>
#include <tdeio/uiserver_stub.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <libtdepim/kincidencechooser.h>
#include <kabc/locknull.h>
diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp
index e82102a34..d05b64a7b 100644
--- a/tderesources/kolab/shared/kmailconnection.cpp
+++ b/tderesources/kolab/shared/kmailconnection.cpp
@@ -36,7 +36,7 @@
#include <kdebug.h>
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdcopservicestarter.h>
#include <klocale.h>
diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp
index 6fd4f9761..0629b5169 100644
--- a/tderesources/scalix/kabc/resourcescalix.cpp
+++ b/tderesources/scalix/kabc/resourcescalix.cpp
@@ -41,7 +41,7 @@
#include <tdeio/observer.h>
#include <tdeio/uiserver_stub.h>
#include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqobject.h>
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index ab9cc0408..b75fd6c9d 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -35,7 +35,7 @@
#include <tdeio/observer.h>
#include <tdeio/uiserver_stub.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <dcopclient.h>
#include <libkcal/icalformat.h>
#include <libtdepim/kincidencechooser.h>
diff --git a/tderesources/scalix/scalixadmin/main.cpp b/tderesources/scalix/scalixadmin/main.cpp
index f9e891a50..caaabcf41 100644
--- a/tderesources/scalix/scalixadmin/main.cpp
+++ b/tderesources/scalix/scalixadmin/main.cpp
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <klocale.h>
#include "mainwindow.h"
diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp
index 5a1570480..57f2f4489 100644
--- a/tderesources/scalix/shared/kmailconnection.cpp
+++ b/tderesources/scalix/shared/kmailconnection.cpp
@@ -35,7 +35,7 @@
#include <kdebug.h>
#include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <kdcopservicestarter.h>
#include <klocale.h>
diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp
index 515da3ee8..b4f662fdb 100644
--- a/tderesources/scalix/tdeioslave/scalix.cpp
+++ b/tderesources/scalix/tdeioslave/scalix.cpp
@@ -21,8 +21,8 @@
#include <tqapplication.h>
#include <tqeventloop.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <tdeio/global.h>
diff --git a/tderesources/slox/testsloxaccounts.cpp b/tderesources/slox/testsloxaccounts.cpp
index ba1077304..22c44e662 100644
--- a/tderesources/slox/testsloxaccounts.cpp
+++ b/tderesources/slox/testsloxaccounts.cpp
@@ -20,10 +20,10 @@
#include "sloxaccounts.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <tqpushbutton.h>
diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp
index 2abc46aea..657b8ad27 100644
--- a/wizards/egroupwaremain.cpp
+++ b/wizards/egroupwaremain.cpp
@@ -20,10 +20,10 @@
#include "egroupwarewizard.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
static const TDECmdLineOptions options[] =
diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp
index 4e5222939..fc50c0c04 100644
--- a/wizards/exchangemain.cpp
+++ b/wizards/exchangemain.cpp
@@ -20,10 +20,10 @@
#include "exchangewizard.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp
index 3d7a9bda2..cf48bc436 100644
--- a/wizards/groupwisemain.cpp
+++ b/wizards/groupwisemain.cpp
@@ -20,10 +20,10 @@
#include "groupwisewizard.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp
index 387e03eb3..7d722a913 100644
--- a/wizards/kmailchanges.cpp
+++ b/wizards/kmailchanges.cpp
@@ -22,7 +22,7 @@
#include "kmailchanges.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kemailsettings.h>
diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp
index 1fa3f3faa..94340f247 100644
--- a/wizards/kolabmain.cpp
+++ b/wizards/kolabmain.cpp
@@ -21,10 +21,10 @@
#include "kolabwizard.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/wizards/main.cpp b/wizards/main.cpp
index 0a7da75b3..98ce36837 100644
--- a/wizards/main.cpp
+++ b/wizards/main.cpp
@@ -1,6 +1,6 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp
index ae59311c4..a207d560c 100644
--- a/wizards/scalixmain.cpp
+++ b/wizards/scalixmain.cpp
@@ -21,10 +21,10 @@
#include "scalixwizard.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp
index 0f2853c0a..08be97d6b 100644
--- a/wizards/sloxmain.cpp
+++ b/wizards/sloxmain.cpp
@@ -20,10 +20,10 @@
#include "sloxwizard.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
#include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
#include <kglobal.h>
#include <klocale.h>