summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--akregator/src/actionmanagerimpl.cpp2
-rw-r--r--akregator/src/addfeeddialog.cpp4
-rw-r--r--akregator/src/akregator_options.h2
-rw-r--r--akregator/src/akregator_part.cpp6
-rw-r--r--akregator/src/akregator_view.cpp4
-rw-r--r--akregator/src/articlelistview.cpp4
-rw-r--r--akregator/src/articleviewer.cpp6
-rw-r--r--akregator/src/articleviewer.h2
-rw-r--r--akregator/src/configdialog.cpp2
-rw-r--r--akregator/src/feed.cpp2
-rw-r--r--akregator/src/feedlist.cpp2
-rw-r--r--akregator/src/feedlistview.cpp2
-rw-r--r--akregator/src/frame.cpp2
-rw-r--r--akregator/src/main.cpp2
-rw-r--r--akregator/src/mainwindow.cpp6
-rw-r--r--akregator/src/mk4storage/feedstoragemk4impl.cpp2
-rw-r--r--akregator/src/mk4storage/mk4confwidget.cpp4
-rw-r--r--akregator/src/mk4storage/mk4plugin.cpp2
-rw-r--r--akregator/src/mk4storage/storagefactorymk4impl.cpp2
-rw-r--r--akregator/src/notificationmanager.cpp2
-rw-r--r--akregator/src/pageviewer.cpp4
-rw-r--r--akregator/src/pluginmanager.cpp4
-rw-r--r--akregator/src/progressmanager.cpp2
-rw-r--r--akregator/src/propertiesdialog.cpp2
-rw-r--r--akregator/src/searchbar.cpp2
-rw-r--r--akregator/src/simplenodeselector.cpp2
-rw-r--r--akregator/src/speechclient.cpp2
-rw-r--r--akregator/src/storagefactorydummyimpl.cpp2
-rw-r--r--akregator/src/tabwidget.cpp2
-rw-r--r--akregator/src/tagnodelist.cpp2
-rw-r--r--akregator/src/tagpropertiesdialog.cpp2
-rw-r--r--akregator/src/trayicon.cpp4
-rw-r--r--akregator/src/viewer.cpp4
-rw-r--r--certmanager/CMakeLists.txt2
-rw-r--r--certmanager/aboutdata.cpp2
-rw-r--r--certmanager/certificateinfowidgetimpl.cpp6
-rw-r--r--certmanager/certificatewizardimpl.cpp8
-rw-r--r--certmanager/certmanager.cpp6
-rw-r--r--certmanager/conf/appearanceconfigpage.cpp4
-rw-r--r--certmanager/conf/appearanceconfigwidget.cpp4
-rw-r--r--certmanager/conf/configuredialog.cpp2
-rw-r--r--certmanager/conf/dirservconfigpage.cpp6
-rw-r--r--certmanager/crlview.cpp6
-rw-r--r--certmanager/kwatchgnupg/aboutdata.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgconfig.cpp2
-rw-r--r--certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp4
-rw-r--r--certmanager/kwatchgnupg/main.cpp6
-rw-r--r--certmanager/kwatchgnupg/tray.cpp4
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusbackend.cpp2
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusjob.cpp4
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp2
-rw-r--r--certmanager/lib/backends/chiasmus/obtainkeysjob.cpp4
-rw-r--r--certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp2
-rw-r--r--certmanager/lib/backends/kpgp/kpgpbackendbase.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmebackend.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp6
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmejob.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp4
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp2
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp2
-rw-r--r--certmanager/lib/cryptplugfactory.cpp4
-rw-r--r--certmanager/lib/cryptplugwrapper.cpp4
-rw-r--r--certmanager/lib/kleo/cryptobackendfactory.cpp4
-rw-r--r--certmanager/lib/kleo/dn.cpp2
-rw-r--r--certmanager/lib/kleo/enum.cpp2
-rw-r--r--certmanager/lib/kleo/hierarchicalkeylistjob.cpp2
-rw-r--r--certmanager/lib/kleo/multideletejob.cpp2
-rw-r--r--certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp2
-rw-r--r--certmanager/lib/tests/test_gnupgprocessbase.cpp2
-rw-r--r--certmanager/lib/tests/test_keygen.cpp2
-rw-r--r--certmanager/lib/tests/test_keyselectiondialog.cpp2
-rw-r--r--certmanager/lib/ui/backendconfigwidget.cpp4
-rw-r--r--certmanager/lib/ui/cryptoconfigdialog.cpp2
-rw-r--r--certmanager/lib/ui/cryptoconfigmodule.cpp4
-rw-r--r--certmanager/lib/ui/dnattributeorderconfigwidget.cpp2
-rw-r--r--certmanager/lib/ui/keyapprovaldialog.cpp4
-rw-r--r--certmanager/lib/ui/keyrequester.cpp4
-rw-r--r--certmanager/lib/ui/keyselectiondialog.cpp6
-rw-r--r--certmanager/lib/ui/messagebox.cpp2
-rw-r--r--certmanager/lib/ui/messagebox.h2
-rw-r--r--certmanager/lib/ui/passphrasedialog.cpp2
-rw-r--r--certmanager/lib/ui/progressdialog.cpp2
-rw-r--r--certmanager/main.cpp6
-rw-r--r--doc/kaddressbook/index.docbook2
-rw-r--r--doc/kpilot/configuration.docbook2
-rw-r--r--kabc/frontend/main.cpp2
-rw-r--r--kabc/frontend/mainWindow.ui.h4
-rw-r--r--kabc/kabc2mutt/CMakeLists.txt2
-rw-r--r--kabc/kabc2mutt/kabc2mutt.cpp4
-rw-r--r--kabc/kabc2mutt/kabc2mutt.h2
-rw-r--r--kabc/kabc2mutt/main.cpp2
-rw-r--r--kabc/kabcdistlistupdater/kabcdistlistupdater.cpp8
-rw-r--r--kaddressbook/addresseditwidget.cpp4
-rw-r--r--kaddressbook/addresseditwidget.h4
-rw-r--r--kaddressbook/addresseeconfig.h2
-rw-r--r--kaddressbook/addresseeeditorbase.h2
-rw-r--r--kaddressbook/addresseeeditordialog.cpp2
-rw-r--r--kaddressbook/addresseeeditordialog.h2
-rw-r--r--kaddressbook/addresseeeditorextension.cpp2
-rw-r--r--kaddressbook/addresseeeditorwidget.cpp10
-rw-r--r--kaddressbook/addresseeeditorwidget.h2
-rw-r--r--kaddressbook/addresseeutil.cpp8
-rw-r--r--kaddressbook/addresseeutil.h4
-rw-r--r--kaddressbook/addviewdialog.cpp2
-rw-r--r--kaddressbook/advancedcustomfields.h2
-rw-r--r--kaddressbook/common/filter.h2
-rw-r--r--kaddressbook/common/kabprefs.cpp2
-rw-r--r--kaddressbook/common/locationmap.cpp6
-rw-r--r--kaddressbook/common/locationmap.h2
-rw-r--r--kaddressbook/customfieldswidget.cpp2
-rw-r--r--kaddressbook/customfieldswidget.h4
-rw-r--r--kaddressbook/distributionlisteditor.cpp10
-rw-r--r--kaddressbook/distributionlistentryview.cpp6
-rw-r--r--kaddressbook/distributionlistpicker.cpp6
-rw-r--r--kaddressbook/editors/CMakeLists.txt2
-rw-r--r--kaddressbook/editors/cryptowidget.cpp2
-rw-r--r--kaddressbook/editors/imaddresswidget.cpp2
-rw-r--r--kaddressbook/editors/imeditorwidget.cpp4
-rw-r--r--kaddressbook/emaileditwidget.cpp4
-rw-r--r--kaddressbook/emaileditwidget.h2
-rw-r--r--kaddressbook/extensionmanager.cpp2
-rw-r--r--kaddressbook/features/CMakeLists.txt4
-rw-r--r--kaddressbook/features/distributionlistngwidget.cpp4
-rw-r--r--kaddressbook/features/distributionlistngwidget.h2
-rw-r--r--kaddressbook/features/distributionlistwidget.cpp14
-rw-r--r--kaddressbook/features/resourceselection.cpp8
-rw-r--r--kaddressbook/filtereditdialog.cpp2
-rw-r--r--kaddressbook/filterselectionwidget.cpp2
-rw-r--r--kaddressbook/freebusywidget.cpp2
-rw-r--r--kaddressbook/geowidget.cpp4
-rw-r--r--kaddressbook/imagewidget.cpp8
-rw-r--r--kaddressbook/imagewidget.h2
-rw-r--r--kaddressbook/imeditwidget.cpp4
-rw-r--r--kaddressbook/imeditwidget.h2
-rw-r--r--kaddressbook/incsearchwidget.cpp2
-rw-r--r--kaddressbook/incsearchwidget.h2
-rw-r--r--kaddressbook/interfaces/CMakeLists.txt2
-rw-r--r--kaddressbook/interfaces/configurewidget.cpp2
-rw-r--r--kaddressbook/interfaces/contacteditorwidget.h2
-rw-r--r--kaddressbook/interfaces/core.h2
-rw-r--r--kaddressbook/interfaces/extensionwidget.h2
-rw-r--r--kaddressbook/interfaces/xxport.cpp2
-rw-r--r--kaddressbook/interfaces/xxport.h4
-rw-r--r--kaddressbook/jumpbuttonbar.cpp6
-rw-r--r--kaddressbook/kabcore.cpp16
-rw-r--r--kaddressbook/kabcore.h2
-rw-r--r--kaddressbook/kablock.cpp8
-rw-r--r--kaddressbook/kabtools.cpp4
-rw-r--r--kaddressbook/kaddressbook_options.h2
-rw-r--r--kaddressbook/kaddressbook_part.cpp2
-rw-r--r--kaddressbook/kaddressbookview.cpp6
-rw-r--r--kaddressbook/kaddressbookview.h2
-rw-r--r--kaddressbook/kaddressbootdemain.cpp4
-rw-r--r--kaddressbook/kcmconfigs/addhostdialog.cpp2
-rw-r--r--kaddressbook/kcmconfigs/addhostdialog.h2
-rw-r--r--kaddressbook/kcmconfigs/addresseewidget.cpp2
-rw-r--r--kaddressbook/kcmconfigs/extensionconfigdialog.cpp2
-rw-r--r--kaddressbook/kcmconfigs/kabconfigwidget.cpp4
-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.cpp6
-rw-r--r--kaddressbook/keywidget.h2
-rw-r--r--kaddressbook/ldapsearchdialog.cpp4
-rw-r--r--kaddressbook/ldapsearchdialog.h2
-rw-r--r--kaddressbook/main.cpp6
-rw-r--r--kaddressbook/nameeditdialog.cpp4
-rw-r--r--kaddressbook/nameeditdialog.h2
-rw-r--r--kaddressbook/phoneeditwidget.cpp4
-rw-r--r--kaddressbook/printing/detailledstyle.cpp4
-rw-r--r--kaddressbook/printing/detailledstyle.h2
-rw-r--r--kaddressbook/printing/kabentrypainter.cpp4
-rw-r--r--kaddressbook/printing/kabentrypainter.h2
-rw-r--r--kaddressbook/printing/mikesstyle.cpp6
-rw-r--r--kaddressbook/printing/printingwizard.cpp4
-rw-r--r--kaddressbook/printing/printingwizard.h2
-rw-r--r--kaddressbook/printing/printprogress.cpp2
-rw-r--r--kaddressbook/printing/printsortmode.cpp2
-rw-r--r--kaddressbook/printing/printsortmode.h2
-rw-r--r--kaddressbook/printing/printstyle.h2
-rw-r--r--kaddressbook/printing/selectionpage.cpp2
-rw-r--r--kaddressbook/printing/stylepage.cpp2
-rw-r--r--kaddressbook/printing/stylepage.h4
-rw-r--r--kaddressbook/searchmanager.cpp2
-rw-r--r--kaddressbook/searchmanager.h2
-rw-r--r--kaddressbook/secrecywidget.cpp2
-rw-r--r--kaddressbook/simpleaddresseeeditor.cpp2
-rw-r--r--kaddressbook/soundwidget.cpp6
-rw-r--r--kaddressbook/soundwidget.h2
-rw-r--r--kaddressbook/thumbnailcreator/CMakeLists.txt2
-rw-r--r--kaddressbook/thumbnailcreator/ldifvcardcreator.cpp10
-rw-r--r--kaddressbook/thumbnailcreator/ldifvcardcreator.h2
-rw-r--r--kaddressbook/typecombo.h2
-rw-r--r--kaddressbook/undocmds.cpp4
-rw-r--r--kaddressbook/undocmds.h6
-rw-r--r--kaddressbook/viewconfigurefieldspage.cpp2
-rw-r--r--kaddressbook/viewconfigurefieldspage.h4
-rw-r--r--kaddressbook/viewconfigurefilterpage.cpp2
-rw-r--r--kaddressbook/viewconfigurewidget.cpp4
-rw-r--r--kaddressbook/viewmanager.cpp8
-rw-r--r--kaddressbook/views/cardview.cpp2
-rw-r--r--kaddressbook/views/configurecardviewdialog.cpp6
-rw-r--r--kaddressbook/views/configuretableviewdialog.cpp4
-rw-r--r--kaddressbook/views/contactlistview.cpp8
-rw-r--r--kaddressbook/views/contactlistview.h2
-rw-r--r--kaddressbook/views/kaddressbookcardview.cpp6
-rw-r--r--kaddressbook/views/kaddressbookiconview.cpp8
-rw-r--r--kaddressbook/views/kaddressbooktableview.cpp8
-rw-r--r--kaddressbook/xxport/bookmark_xxport.cpp4
-rw-r--r--kaddressbook/xxport/csv_xxport.cpp6
-rw-r--r--kaddressbook/xxport/csvimportdialog.cpp4
-rw-r--r--kaddressbook/xxport/csvimportdialog.h4
-rw-r--r--kaddressbook/xxport/eudora_xxport.cpp6
-rw-r--r--kaddressbook/xxport/gnokii_xxport.cpp4
-rw-r--r--kaddressbook/xxport/kde2_xxport.cpp8
-rw-r--r--kaddressbook/xxport/ldif_xxport.cpp8
-rw-r--r--kaddressbook/xxport/opera_xxport.cpp6
-rw-r--r--kaddressbook/xxport/pab_pablib.h2
-rw-r--r--kaddressbook/xxport/pab_xxport.cpp6
-rw-r--r--kaddressbook/xxport/vcard_xxport.cpp8
-rw-r--r--kaddressbook/xxport/vcard_xxport.h2
-rw-r--r--kaddressbook/xxportmanager.cpp8
-rw-r--r--kaddressbook/xxportselectdialog.cpp4
-rw-r--r--kaddressbook/xxportselectdialog.h4
-rw-r--r--kalarm/alarmcalendar.cpp6
-rw-r--r--kalarm/alarmevent.cpp2
-rw-r--r--kalarm/alarmlistview.cpp4
-rw-r--r--kalarm/alarmtext.cpp2
-rw-r--r--kalarm/alarmtimewidget.cpp4
-rw-r--r--kalarm/birthdaydlg.cpp10
-rw-r--r--kalarm/daemon.cpp2
-rw-r--r--kalarm/deferdlg.cpp6
-rw-r--r--kalarm/editdlg.cpp8
-rw-r--r--kalarm/find.cpp4
-rw-r--r--kalarm/fontcolour.cpp4
-rw-r--r--kalarm/fontcolourbutton.cpp2
-rw-r--r--kalarm/functions.cpp6
-rw-r--r--kalarm/kalarmapp.cpp4
-rw-r--r--kalarm/kalarmd/adcalendar.cpp2
-rw-r--r--kalarm/kalarmd/admain.cpp4
-rw-r--r--kalarm/kamail.cpp8
-rw-r--r--kalarm/latecancel.cpp2
-rw-r--r--kalarm/lib/colourcombo.cpp2
-rw-r--r--kalarm/lib/dateedit.cpp6
-rw-r--r--kalarm/lib/datetime.cpp4
-rw-r--r--kalarm/lib/messagebox.h2
-rw-r--r--kalarm/lib/shellprocess.cpp2
-rw-r--r--kalarm/lib/timeedit.cpp4
-rw-r--r--kalarm/lib/timeperiod.cpp2
-rw-r--r--kalarm/lib/timespinbox.cpp2
-rw-r--r--kalarm/main.cpp2
-rw-r--r--kalarm/mainwindow.cpp8
-rw-r--r--kalarm/messagewin.cpp6
-rw-r--r--kalarm/prefdlg.cpp6
-rw-r--r--kalarm/preferences.cpp6
-rw-r--r--kalarm/recurrenceedit.cpp6
-rw-r--r--kalarm/reminder.cpp4
-rw-r--r--kalarm/repetition.cpp2
-rw-r--r--kalarm/sounddlg.cpp4
-rw-r--r--kalarm/soundpicker.cpp4
-rw-r--r--kalarm/specialactions.cpp2
-rw-r--r--kalarm/templatedlg.cpp4
-rw-r--r--kalarm/templatelistview.cpp2
-rw-r--r--kalarm/templatepickdlg.cpp2
-rw-r--r--kalarm/timeselector.cpp2
-rw-r--r--kalarm/traywindow.cpp4
-rw-r--r--kalarm/undo.cpp4
-rw-r--r--kandy/src/atcommand.cpp2
-rw-r--r--kandy/src/cmdpropertiesdialog.cpp2
-rw-r--r--kandy/src/commandscheduler.cpp2
-rw-r--r--kandy/src/kandy.cpp8
-rw-r--r--kandy/src/kandyprefsdialog.cpp6
-rw-r--r--kandy/src/kandyview.cpp6
-rw-r--r--kandy/src/main.cpp4
-rw-r--r--kandy/src/mobilegui.cpp6
-rw-r--r--kandy/src/mobilemain.cpp8
-rw-r--r--kandy/src/modem.cpp2
-rw-r--r--karm/csvexportdialog.cpp4
-rw-r--r--karm/edittaskdialog.cpp2
-rw-r--r--karm/idletimedetector.cpp4
-rw-r--r--karm/karm_part.cpp6
-rw-r--r--karm/karmstorage.cpp8
-rw-r--r--karm/karmutility.cpp4
-rw-r--r--karm/ktimewidget.cpp4
-rw-r--r--karm/main.cpp2
-rw-r--r--karm/mainwindow.cpp6
-rw-r--r--karm/plannerparser.h2
-rw-r--r--karm/preferences.cpp4
-rw-r--r--karm/print.cpp4
-rw-r--r--karm/printdialog.cpp2
-rw-r--r--karm/taskview.cpp8
-rw-r--r--karm/taskviewwhatsthis.cpp2
-rw-r--r--karm/timekard.cpp4
-rw-r--r--karm/tray.cpp6
-rw-r--r--kdgantt/KDGanttViewSubwidgets.cpp4
-rw-r--r--kgantt/kgantt/xQGanttBarViewPort.cpp2
-rw-r--r--kgantt/kgantt/xQGanttListView.cpp2
-rw-r--r--kitchensync/src/aboutpage.cpp2
-rw-r--r--kitchensync/src/addresseediffalgo.cpp2
-rw-r--r--kitchensync/src/addresseediffalgo.h2
-rw-r--r--kitchensync/src/calendardiffalgo.cpp2
-rw-r--r--kitchensync/src/configgui.cpp2
-rw-r--r--kitchensync/src/configguiblank.cpp2
-rw-r--r--kitchensync/src/configguievo2.cpp2
-rw-r--r--kitchensync/src/configguifile.cpp2
-rw-r--r--kitchensync/src/configguigcalendar.cpp2
-rw-r--r--kitchensync/src/configguignokii.cpp2
-rw-r--r--kitchensync/src/configguigpe.cpp2
-rw-r--r--kitchensync/src/configguiirmc.cpp6
-rw-r--r--kitchensync/src/configguijescs.cpp2
-rw-r--r--kitchensync/src/configguildap.cpp2
-rw-r--r--kitchensync/src/configguildap.h2
-rw-r--r--kitchensync/src/configguimoto.cpp2
-rw-r--r--kitchensync/src/configguiopie.cpp2
-rw-r--r--kitchensync/src/configguipalm.cpp2
-rw-r--r--kitchensync/src/configguisunbird.cpp2
-rw-r--r--kitchensync/src/configguisynce.cpp2
-rw-r--r--kitchensync/src/configguisyncmlhttp.cpp2
-rw-r--r--kitchensync/src/configguisyncmlobex.cpp2
-rw-r--r--kitchensync/src/connectionwidgets.cpp6
-rw-r--r--kitchensync/src/genericdiffalgo.cpp2
-rw-r--r--kitchensync/src/groupconfig.cpp4
-rw-r--r--kitchensync/src/groupconfigcommon.cpp2
-rw-r--r--kitchensync/src/groupconfigdialog.cpp2
-rw-r--r--kitchensync/src/groupitem.cpp6
-rw-r--r--kitchensync/src/htmldiffalgodisplay.cpp2
-rw-r--r--kitchensync/src/kwidgetlist.cpp2
-rw-r--r--kitchensync/src/mainwidget.cpp4
-rw-r--r--kitchensync/src/mainwindow.cpp2
-rw-r--r--kitchensync/src/memberconfig.cpp4
-rw-r--r--kitchensync/src/memberinfo.cpp4
-rw-r--r--kitchensync/src/multiconflictdialog.cpp2
-rw-r--r--kitchensync/src/part.cpp2
-rw-r--r--kitchensync/src/pluginpicker.cpp4
-rw-r--r--kitchensync/src/singleconflictdialog.cpp2
-rw-r--r--kitchensync/src/syncprocess.cpp2
-rw-r--r--kitchensync/src/syncprocessmanager.cpp4
-rw-r--r--kmail/accountdialog.cpp6
-rw-r--r--kmail/accountmanager.cpp4
-rw-r--r--kmail/accountwizard.cpp2
-rw-r--r--kmail/antispamwizard.cpp4
-rw-r--r--kmail/archivefolderdialog.cpp4
-rw-r--r--kmail/backupjob.cpp2
-rw-r--r--kmail/cachedimapjob.cpp2
-rw-r--r--kmail/callback.cpp2
-rw-r--r--kmail/chiasmuskeyselector.cpp2
-rw-r--r--kmail/compactionjob.cpp2
-rw-r--r--kmail/composer.h2
-rw-r--r--kmail/configuredialog.cpp4
-rw-r--r--kmail/configuredialog_p.cpp2
-rw-r--r--kmail/configuredialog_p.h2
-rw-r--r--kmail/copyfolderjob.cpp2
-rw-r--r--kmail/customtemplates.cpp6
-rw-r--r--kmail/distributionlistdialog.cpp10
-rw-r--r--kmail/editorwatcher.cpp4
-rw-r--r--kmail/encodingdetector.cpp4
-rw-r--r--kmail/expirejob.cpp2
-rw-r--r--kmail/expirypropertiesdialog.cpp4
-rw-r--r--kmail/favoritefolderview.cpp4
-rw-r--r--kmail/filterlogdlg.cpp4
-rw-r--r--kmail/folderdiaacltab.cpp10
-rw-r--r--kmail/folderdiaquotatab_p.cpp2
-rw-r--r--kmail/foldershortcutdialog.cpp4
-rw-r--r--kmail/folderstorage.cpp2
-rw-r--r--kmail/folderutil.cpp2
-rw-r--r--kmail/headeritem.cpp2
-rw-r--r--kmail/headerlistquicksearch.cpp2
-rw-r--r--kmail/headerstyle.cpp8
-rw-r--r--kmail/htmlstatusbar.cpp2
-rw-r--r--kmail/identitydialog.cpp4
-rw-r--r--kmail/identitylistview.cpp2
-rw-r--r--kmail/imapaccountbase.cpp4
-rw-r--r--kmail/imapjob.cpp2
-rw-r--r--kmail/importarchivedialog.cpp4
-rw-r--r--kmail/importjob.cpp4
-rw-r--r--kmail/keyresolver.cpp6
-rw-r--r--kmail/kmaccount.cpp4
-rw-r--r--kmail/kmacctimap.cpp2
-rw-r--r--kmail/kmacctlocal.cpp4
-rw-r--r--kmail/kmacctmaildir.cpp4
-rw-r--r--kmail/kmacctseldlg.cpp2
-rw-r--r--kmail/kmaddrbook.cpp8
-rw-r--r--kmail/kmaddrbook.h2
-rw-r--r--kmail/kmail_options.h2
-rw-r--r--kmail/kmailicalifaceimpl.cpp4
-rw-r--r--kmail/kmcommands.cpp10
-rw-r--r--kmail/kmcommands.h2
-rw-r--r--kmail/kmcomposewin.cpp6
-rw-r--r--kmail/kmcomposewin.h2
-rw-r--r--kmail/kmedit.cpp6
-rw-r--r--kmail/kmfawidgets.cpp4
-rw-r--r--kmail/kmfilter.cpp4
-rw-r--r--kmail/kmfilteraction.cpp4
-rw-r--r--kmail/kmfilterdlg.cpp4
-rw-r--r--kmail/kmfiltermgr.cpp2
-rw-r--r--kmail/kmfolder.cpp4
-rw-r--r--kmail/kmfoldercachedimap.cpp4
-rw-r--r--kmail/kmfolderdia.cpp4
-rw-r--r--kmail/kmfolderdir.cpp4
-rw-r--r--kmail/kmfolderindex.cpp4
-rw-r--r--kmail/kmfoldermaildir.cpp4
-rw-r--r--kmail/kmfoldermbox.cpp4
-rw-r--r--kmail/kmfoldermgr.cpp4
-rw-r--r--kmail/kmfoldersearch.cpp2
-rw-r--r--kmail/kmfoldertree.cpp4
-rw-r--r--kmail/kmfoldertree.h2
-rw-r--r--kmail/kmheaders.cpp6
-rw-r--r--kmail/kmkernel.cpp4
-rw-r--r--kmail/kmlineeditspell.cpp6
-rw-r--r--kmail/kmmainwidget.cpp4
-rw-r--r--kmail/kmmainwin.cpp4
-rw-r--r--kmail/kmmessage.cpp6
-rw-r--r--kmail/kmmimeparttree.cpp4
-rw-r--r--kmail/kmmsgbase.cpp2
-rw-r--r--kmail/kmpopfiltercnfrmdlg.cpp2
-rw-r--r--kmail/kmreadermainwin.cpp4
-rw-r--r--kmail/kmreaderwin.cpp12
-rw-r--r--kmail/kmsearchpattern.cpp6
-rw-r--r--kmail/kmsearchpattern.h2
-rw-r--r--kmail/kmsearchpatternedit.cpp2
-rw-r--r--kmail/kmsender.cpp4
-rw-r--r--kmail/kmservertest.cpp4
-rw-r--r--kmail/kmstartup.cpp6
-rw-r--r--kmail/kmsystemtray.cpp2
-rw-r--r--kmail/kmtransport.cpp4
-rw-r--r--kmail/listjob.cpp4
-rw-r--r--kmail/localsubscriptiondialog.cpp4
-rw-r--r--kmail/mailinglistpropertiesdialog.cpp4
-rw-r--r--kmail/main.cpp2
-rw-r--r--kmail/managesievescriptsdialog.cpp6
-rw-r--r--kmail/messageactions.cpp2
-rw-r--r--kmail/messagecomposer.cpp4
-rw-r--r--kmail/networkaccount.cpp4
-rw-r--r--kmail/newfolderdialog.cpp4
-rw-r--r--kmail/objecttreeparser.cpp8
-rw-r--r--kmail/partNode.cpp2
-rw-r--r--kmail/popaccount.cpp4
-rw-r--r--kmail/quotajobs.h2
-rw-r--r--kmail/recipientseditor.cpp4
-rw-r--r--kmail/recipientseditortest.cpp4
-rw-r--r--kmail/recipientspicker.cpp8
-rw-r--r--kmail/recipientspicker.h4
-rw-r--r--kmail/redirectdialog.cpp4
-rw-r--r--kmail/regexplineedit.cpp2
-rw-r--r--kmail/renamejob.cpp2
-rw-r--r--kmail/rulewidgethandlermanager.cpp2
-rw-r--r--kmail/searchjob.cpp4
-rw-r--r--kmail/sieveconfig.cpp2
-rw-r--r--kmail/sievedebugdialog.cpp4
-rw-r--r--kmail/signatureconfigurator.cpp2
-rw-r--r--kmail/simplestringlisteditor.cpp2
-rw-r--r--kmail/snippetdlg.cpp4
-rw-r--r--kmail/snippetitem.h2
-rw-r--r--kmail/snippetwidget.cpp4
-rw-r--r--kmail/subscriptiondialog.cpp4
-rw-r--r--kmail/templateparser.cpp6
-rw-r--r--kmail/templatesconfiguration.cpp4
-rw-r--r--kmail/templatesinsertcommand.cpp2
-rw-r--r--kmail/undostack.cpp4
-rw-r--r--kmail/urlhandlermanager.cpp4
-rw-r--r--kmail/util.h4
-rw-r--r--kmail/vacation.cpp4
-rw-r--r--kmail/vacationdialog.cpp2
-rw-r--r--kmail/vcardviewer.cpp6
-rw-r--r--kmail/vcardviewer.h4
-rw-r--r--kmail/xfaceconfigurator.cpp10
-rw-r--r--kmailcvt/filter_evolution.cxx4
-rw-r--r--kmailcvt/filter_evolution_v2.cxx4
-rw-r--r--kmailcvt/filter_kmail_archive.cxx2
-rw-r--r--kmailcvt/filter_kmail_maildir.cxx2
-rw-r--r--kmailcvt/filter_lnotes.cxx4
-rw-r--r--kmailcvt/filter_mailapp.cxx4
-rw-r--r--kmailcvt/filter_mbox.cxx4
-rw-r--r--kmailcvt/filter_oe.cxx4
-rw-r--r--kmailcvt/filter_opera.cxx4
-rw-r--r--kmailcvt/filter_outlook.cxx4
-rw-r--r--kmailcvt/filter_plain.cxx2
-rw-r--r--kmailcvt/filter_pmail.cxx4
-rw-r--r--kmailcvt/filter_sylpheed.cxx2
-rw-r--r--kmailcvt/filter_thebat.cxx6
-rw-r--r--kmailcvt/filter_thunderbird.cxx4
-rw-r--r--kmailcvt/filters.cxx4
-rw-r--r--kmailcvt/kselfilterpage.cpp2
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.cpp4
-rw-r--r--kmobile/devices/gnokii/gnokii_mobile.h2
-rw-r--r--kmobile/devices/skeleton/skeleton.cpp4
-rw-r--r--kmobile/kmobile.cpp8
-rw-r--r--kmobile/kmobileclient.cpp2
-rw-r--r--kmobile/kmobiledevice.cpp4
-rw-r--r--kmobile/kmobiledevice.h4
-rw-r--r--kmobile/kmobileitem.cpp2
-rw-r--r--kmobile/kmobileview.cpp4
-rw-r--r--kmobile/main.cpp2
-rw-r--r--kmobile/pref.cpp2
-rw-r--r--kmobile/tdeioslave/tdeio_mobile.cpp4
-rw-r--r--knode/articlewidget.cpp6
-rw-r--r--knode/headerview.cpp2
-rw-r--r--knode/knaccountmanager.cpp4
-rw-r--r--knode/knarticle.cpp2
-rw-r--r--knode/knarticlecollection.cpp4
-rw-r--r--knode/knarticlefactory.cpp4
-rw-r--r--knode/knarticlefilter.cpp2
-rw-r--r--knode/knarticlemanager.cpp6
-rw-r--r--knode/kncleanup.cpp4
-rw-r--r--knode/kncollectionview.cpp2
-rw-r--r--knode/kncomposer.cpp8
-rw-r--r--knode/kncomposer.h2
-rw-r--r--knode/knconfig.cpp6
-rw-r--r--knode/knconfigmanager.cpp2
-rw-r--r--knode/knconfigpages.cpp2
-rw-r--r--knode/knconfigwidgets.cpp4
-rw-r--r--knode/knconvert.cpp4
-rw-r--r--knode/kndisplayedheader.cpp2
-rw-r--r--knode/knfilterconfigwidget.cpp2
-rw-r--r--knode/knfilterdialog.cpp4
-rw-r--r--knode/knfiltermanager.cpp4
-rw-r--r--knode/knfolder.cpp2
-rw-r--r--knode/knfoldermanager.cpp4
-rw-r--r--knode/kngroup.cpp2
-rw-r--r--knode/kngroupbrowser.cpp2
-rw-r--r--knode/kngroupdialog.cpp6
-rw-r--r--knode/kngroupmanager.cpp4
-rw-r--r--knode/kngrouppropdlg.cpp2
-rw-r--r--knode/kngroupselectdialog.cpp4
-rw-r--r--knode/knjobdata.cpp2
-rw-r--r--knode/knmainwidget.cpp6
-rw-r--r--knode/knnetaccess.cpp4
-rw-r--r--knode/knnntpclient.cpp2
-rw-r--r--knode/knode.cpp4
-rw-r--r--knode/knode_options.h2
-rw-r--r--knode/knprotocolclient.cpp2
-rw-r--r--knode/knsearchdialog.cpp2
-rw-r--r--knode/knserverinfo.cpp4
-rw-r--r--knode/knstatusfilter.cpp2
-rw-r--r--knode/knstringfilter.cpp2
-rw-r--r--knode/main.cpp2
-rw-r--r--knode/utilities.cpp8
-rw-r--r--knotes/knote.cpp6
-rw-r--r--knotes/knotealarmdlg.cpp2
-rw-r--r--knotes/knotebutton.cpp2
-rw-r--r--knotes/knoteconfigdlg.cpp2
-rw-r--r--knotes/knoteedit.cpp2
-rw-r--r--knotes/knotehostdlg.cpp4
-rw-r--r--knotes/knoteprinter.cpp2
-rw-r--r--knotes/knotesalarm.cpp4
-rw-r--r--knotes/knotesapp.cpp2
-rw-r--r--knotes/knoteslegacy.cpp2
-rw-r--r--knotes/knotesnetrecv.cpp4
-rw-r--r--knotes/knotesnetsend.cpp4
-rw-r--r--knotes/main.cpp2
-rw-r--r--knotes/resourcelocal.cpp4
-rw-r--r--knotes/resourcelocalconfig.cpp2
-rw-r--r--kode/CMakeLists.txt2
-rw-r--r--kode/kodemain.cpp8
-rw-r--r--kode/kwsdl/kung/binaryinputfield.cpp6
-rw-r--r--kode/kwsdl/kung/dispatcher.cpp4
-rw-r--r--kode/kwsdl/kung/inputdialog.cpp2
-rw-r--r--kode/kwsdl/kung/listinputfield.cpp2
-rw-r--r--kode/kwsdl/kung/main.cpp2
-rw-r--r--kode/kwsdl/kung/outputdialog.cpp2
-rw-r--r--kode/kwsdl/main.cpp2
-rw-r--r--kode/kwsdl/schema/fileprovider.cpp2
-rw-r--r--kode/kxml_compiler/creator.cpp4
-rw-r--r--kode/kxml_compiler/creator.h4
-rw-r--r--kode/kxml_compiler/kxml_compiler.cpp4
-rw-r--r--kode/kxml_compiler/parser.cpp4
-rw-r--r--kode/kxml_compiler/parser.h4
-rw-r--r--konsolekalendar/konsolekalendar.cpp2
-rw-r--r--konsolekalendar/konsolekalendaradd.cpp2
-rw-r--r--konsolekalendar/konsolekalendarchange.cpp2
-rw-r--r--konsolekalendar/konsolekalendardelete.cpp2
-rw-r--r--konsolekalendar/konsolekalendarexports.cpp2
-rw-r--r--konsolekalendar/konsolekalendarvariables.cpp4
-rw-r--r--konsolekalendar/main.cpp4
-rw-r--r--konsolekalendar/stdcalendar.cpp2
-rw-r--r--kontact/interfaces/core.cpp2
-rw-r--r--kontact/interfaces/plugin.cpp2
-rw-r--r--kontact/interfaces/uniqueapphandler.cpp4
-rw-r--r--kontact/plugins/akregator/akregator_plugin.cpp2
-rw-r--r--kontact/plugins/akregator/akregator_plugin.h2
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp6
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.h2
-rw-r--r--kontact/plugins/karm/karm_plugin.h2
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.cpp2
-rw-r--r--kontact/plugins/kitchensync/kitchensync_plugin.h2
-rw-r--r--kontact/plugins/kmail/kcmkmailsummary.cpp2
-rw-r--r--kontact/plugins/kmail/kmail_plugin.cpp4
-rw-r--r--kontact/plugins/kmail/kmail_plugin.h2
-rw-r--r--kontact/plugins/kmail/summarywidget.cpp4
-rw-r--r--kontact/plugins/knode/knode_plugin.h2
-rw-r--r--kontact/plugins/knotes/knotes_part.cpp2
-rw-r--r--kontact/plugins/knotes/knotes_part.h2
-rw-r--r--kontact/plugins/knotes/knotes_part_p.h4
-rw-r--r--kontact/plugins/knotes/knotes_plugin.h2
-rw-r--r--kontact/plugins/knotes/knotetip.cpp2
-rw-r--r--kontact/plugins/knotes/summarywidget.cpp4
-rw-r--r--kontact/plugins/korganizer/journalplugin.cpp2
-rw-r--r--kontact/plugins/korganizer/journalplugin.h2
-rw-r--r--kontact/plugins/korganizer/kcmkorgsummary.cpp2
-rw-r--r--kontact/plugins/korganizer/korg_uniqueapp.cpp2
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/korganizerplugin.h2
-rw-r--r--kontact/plugins/korganizer/summarywidget.cpp4
-rw-r--r--kontact/plugins/korganizer/todoplugin.cpp6
-rw-r--r--kontact/plugins/korganizer/todoplugin.h2
-rw-r--r--kontact/plugins/korganizer/todosummarywidget.cpp4
-rw-r--r--kontact/plugins/kpilot/summarywidget.cpp8
-rw-r--r--kontact/plugins/newsticker/kcmkontactknt.cpp2
-rw-r--r--kontact/plugins/newsticker/newsticker_plugin.cpp2
-rw-r--r--kontact/plugins/newsticker/summarywidget.cpp4
-rw-r--r--kontact/plugins/specialdates/kcmsdsummary.cpp2
-rw-r--r--kontact/plugins/specialdates/sdsummarywidget.cpp6
-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.cpp8
-rw-r--r--kontact/plugins/summary/summaryview_plugin.h2
-rw-r--r--kontact/plugins/test/test_part.cpp4
-rw-r--r--kontact/plugins/test/test_plugin.cpp2
-rw-r--r--kontact/plugins/weather/summarywidget.cpp6
-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.cpp6
-rw-r--r--kontact/src/profiledialog.cpp4
-rw-r--r--kontact/src/profilemanager.cpp2
-rw-r--r--korganizer/actionmanager.cpp2
-rw-r--r--korganizer/archivedialog.cpp4
-rw-r--r--korganizer/calendarview.cpp4
-rw-r--r--korganizer/datechecker.cpp4
-rw-r--r--korganizer/datenavigator.cpp4
-rw-r--r--korganizer/datenavigatorcontainer.cpp2
-rw-r--r--korganizer/eventarchiver.cpp10
-rw-r--r--korganizer/exportwebdialog.cpp6
-rw-r--r--korganizer/filtereditdialog.cpp4
-rw-r--r--korganizer/freebusymanager.cpp10
-rw-r--r--korganizer/freebusyurldialog.cpp2
-rw-r--r--korganizer/history.cpp2
-rw-r--r--korganizer/importdialog.cpp2
-rw-r--r--korganizer/incidencechanger.cpp4
-rw-r--r--korganizer/interfaces/calendar/plugin.h2
-rw-r--r--korganizer/interfaces/korganizer/baseview.h4
-rw-r--r--korganizer/journalentry.cpp6
-rw-r--r--korganizer/kdatenavigator.cpp6
-rw-r--r--korganizer/koagenda.cpp6
-rw-r--r--korganizer/koagendaitem.cpp8
-rw-r--r--korganizer/koagendaview.cpp6
-rw-r--r--korganizer/koapp.cpp6
-rw-r--r--korganizer/koattendeeeditor.cpp10
-rw-r--r--korganizer/koattendeeeditor.h2
-rw-r--r--korganizer/kocore.cpp2
-rw-r--r--korganizer/kocounterdialog.cpp2
-rw-r--r--korganizer/kodaymatrix.cpp4
-rw-r--r--korganizer/koeditoralarms.cpp2
-rw-r--r--korganizer/koeditorattachments.cpp6
-rw-r--r--korganizer/koeditordetails.cpp10
-rw-r--r--korganizer/koeditorfreebusy.cpp10
-rw-r--r--korganizer/koeditorgeneral.cpp6
-rw-r--r--korganizer/koeditorgeneralevent.cpp6
-rw-r--r--korganizer/koeditorgeneraljournal.cpp4
-rw-r--r--korganizer/koeditorgeneraltodo.cpp6
-rw-r--r--korganizer/koeditorrecurrence.cpp6
-rw-r--r--korganizer/koeventeditor.cpp4
-rw-r--r--korganizer/koeventpopupmenu.cpp2
-rw-r--r--korganizer/koeventview.cpp4
-rw-r--r--korganizer/koeventviewer.cpp2
-rw-r--r--korganizer/koeventviewerdialog.cpp2
-rw-r--r--korganizer/koglobals.cpp6
-rw-r--r--korganizer/kogroupware.cpp2
-rw-r--r--korganizer/koincidenceeditor.cpp6
-rw-r--r--korganizer/kojournaleditor.cpp4
-rw-r--r--korganizer/kojournalview.cpp2
-rw-r--r--korganizer/kolistview.cpp4
-rw-r--r--korganizer/komailclient.cpp4
-rw-r--r--korganizer/komessagebox.cpp2
-rw-r--r--korganizer/komessagebox.h2
-rw-r--r--korganizer/komonthview.cpp4
-rw-r--r--korganizer/koprefs.cpp10
-rw-r--r--korganizer/koprefsdialog.cpp8
-rw-r--r--korganizer/korgac/alarmdialog.cpp4
-rw-r--r--korganizer/korgac/alarmdockwindow.cpp4
-rw-r--r--korganizer/korgac/koalarmclient.cpp2
-rw-r--r--korganizer/korgac/korgacmain.cpp4
-rw-r--r--korganizer/korgac/testalarmdlg.cpp2
-rw-r--r--korganizer/korganizer.cpp6
-rw-r--r--korganizer/korganizer.kcfg2
-rw-r--r--korganizer/korganizer_options.h2
-rw-r--r--korganizer/korganizer_part.cpp4
-rw-r--r--korganizer/korgplugins.cpp2
-rw-r--r--korganizer/kotodoeditor.cpp4
-rw-r--r--korganizer/kotodoview.cpp6
-rw-r--r--korganizer/kotodoviewitem.cpp2
-rw-r--r--korganizer/koviewmanager.cpp2
-rw-r--r--korganizer/kowhatsnextview.cpp6
-rw-r--r--korganizer/mailscheduler.cpp2
-rw-r--r--korganizer/main.cpp4
-rw-r--r--korganizer/multiagendaview.cpp2
-rw-r--r--korganizer/navigatorbar.cpp4
-rw-r--r--korganizer/plugins/datenums/configdialog.cpp6
-rw-r--r--korganizer/plugins/exchange/exchange.cpp6
-rw-r--r--korganizer/plugins/exchange/exchangeconfig.cpp4
-rw-r--r--korganizer/plugins/exchange/exchangedialog.cpp6
-rw-r--r--korganizer/plugins/hebrew/configdialog.cpp4
-rw-r--r--korganizer/plugins/hebrew/converter.cpp2
-rw-r--r--korganizer/plugins/hebrew/hebrew.cpp2
-rw-r--r--korganizer/plugins/hebrew/holiday.cpp2
-rw-r--r--korganizer/plugins/hebrew/parsha.cpp2
-rw-r--r--korganizer/plugins/printing/journal/journalprint.h2
-rw-r--r--korganizer/plugins/printing/list/listprint.h2
-rw-r--r--korganizer/plugins/printing/whatsnext/whatsnextprint.h2
-rw-r--r--korganizer/plugins/printing/year/yearprint.cpp2
-rw-r--r--korganizer/plugins/printing/year/yearprint.h2
-rw-r--r--korganizer/plugins/projectview/koprojectview.cpp6
-rw-r--r--korganizer/plugins/projectview/projectview.cpp4
-rw-r--r--korganizer/plugins/timespanview/timespanview.cpp4
-rw-r--r--korganizer/plugins/timespanview/timespanwidget.cpp2
-rw-r--r--korganizer/previewdialog.cpp4
-rw-r--r--korganizer/printing/calprintdefaultplugins.h2
-rw-r--r--korganizer/printing/cellitem.cpp2
-rw-r--r--korganizer/publishdialog.cpp6
-rw-r--r--korganizer/resourceview.cpp6
-rw-r--r--korganizer/searchdialog.cpp4
-rw-r--r--korganizer/statusdialog.cpp2
-rw-r--r--korganizer/stdcalendar.cpp2
-rw-r--r--korganizer/templatemanagementdialog.cpp4
-rw-r--r--korganizer/timelabels.cpp2
-rw-r--r--korganizer/timezone.cpp4
-rw-r--r--korganizer/urihandler.cpp6
-rw-r--r--korn/boxcontaineritem.cpp4
-rw-r--r--korn/dcop_proto.cpp2
-rw-r--r--korn/dockeditem.cpp4
-rw-r--r--korn/kio.cpp2
-rw-r--r--korn/kmail_proto.cpp2
-rw-r--r--korn/kornboxcfgimpl.cpp2
-rw-r--r--korn/korncfgimpl.cpp2
-rw-r--r--korn/kornshell.cpp2
-rw-r--r--korn/maildlg.cpp2
-rw-r--r--korn/mailsubject.cpp4
-rw-r--r--korn/main.cpp2
-rw-r--r--korn/subjectsdlg.cpp4
-rw-r--r--korn/tdeio_delete.cpp2
-rw-r--r--korn/tdeio_proto.h2
-rw-r--r--korn/tdeio_read.cpp2
-rw-r--r--korn/tdeio_single_subject.cpp2
-rw-r--r--ktnef/gui/attachpropertydialog.cpp4
-rw-r--r--ktnef/gui/ktnefmain.cpp6
-rw-r--r--ktnef/gui/ktnefview.cpp2
-rw-r--r--ktnef/gui/main.cpp2
-rw-r--r--ktnef/gui/messagepropertydialog.cpp2
-rw-r--r--ktnef/lib/mapi.cpp2
-rw-r--r--libemailfunctions/email.cpp2
-rw-r--r--libemailfunctions/kasciistricmp.h4
-rw-r--r--libemailfunctions/networkstatus.cpp2
-rw-r--r--libkcal/CMakeLists.txt2
-rw-r--r--libkcal/HACKING2
-rw-r--r--libkcal/attachmenthandler.cpp6
-rw-r--r--libkcal/attendee.cpp2
-rw-r--r--libkcal/calendar.cpp2
-rw-r--r--libkcal/calendarlocal.cpp4
-rw-r--r--libkcal/calendarresources.cpp4
-rw-r--r--libkcal/calformat.cpp2
-rw-r--r--libkcal/confirmsavedialog.cpp2
-rw-r--r--libkcal/convertqtopia.cpp4
-rw-r--r--libkcal/dndfactory.cpp4
-rw-r--r--libkcal/event.cpp4
-rw-r--r--libkcal/exceptions.cpp2
-rw-r--r--libkcal/htmlexport.cpp6
-rw-r--r--libkcal/icalformat.cpp2
-rw-r--r--libkcal/icalformatimpl.cpp2
-rw-r--r--libkcal/incidence.cpp4
-rw-r--r--libkcal/incidencebase.cpp4
-rw-r--r--libkcal/incidenceformatter.cpp12
-rw-r--r--libkcal/period.cpp2
-rw-r--r--libkcal/person.cpp2
-rw-r--r--libkcal/qtopiaformat.cpp2
-rw-r--r--libkcal/recurrence.cpp4
-rw-r--r--libkcal/recurrencerule.cpp2
-rw-r--r--libkcal/resourcecached.cpp2
-rw-r--r--libkcal/resourcecachedconfig.cpp2
-rw-r--r--libkcal/resourcecalendar.cpp2
-rw-r--r--libkcal/resourcecalendar.h2
-rw-r--r--libkcal/resourcelocal.cpp2
-rw-r--r--libkcal/resourcelocalconfig.cpp4
-rw-r--r--libkcal/resourcelocaldir.cpp2
-rw-r--r--libkcal/resourcelocaldirconfig.cpp4
-rw-r--r--libkcal/scheduler.cpp4
-rw-r--r--libkcal/tests/readandwrite.cpp2
-rw-r--r--libkcal/tests/testcalendar.cpp2
-rw-r--r--libkcal/tests/testcalselectdialog.cpp2
-rw-r--r--libkcal/tests/testfields.cpp2
-rw-r--r--libkcal/tests/testincidence.cpp2
-rw-r--r--libkcal/tests/testresource.cpp2
-rw-r--r--libkcal/tests/testvcalexport.cpp2
-rw-r--r--libkcal/todo.cpp4
-rw-r--r--libkcal/vcalformat.cpp4
-rw-r--r--libkholidays/lunarphase.cpp4
-rw-r--r--libkmime/kmime_codec_identity.cpp2
-rw-r--r--libkmime/kmime_content.cpp4
-rw-r--r--libkmime/kmime_header_parsing.cpp2
-rw-r--r--libkmime/kmime_headers.cpp2
-rw-r--r--libkmime/kmime_mdn.cpp2
-rw-r--r--libkmime/kmime_util.cpp4
-rw-r--r--libkpgp/kpgp.cpp4
-rw-r--r--libkpgp/kpgpbase2.cpp2
-rw-r--r--libkpgp/kpgpbase5.cpp2
-rw-r--r--libkpgp/kpgpbase6.cpp2
-rw-r--r--libkpgp/kpgpbaseG.cpp2
-rw-r--r--libkpgp/kpgpui.cpp4
-rw-r--r--libkpimexchange/core/exchangeaccount.cpp4
-rw-r--r--libkpimexchange/core/exchangeclient.cpp2
-rw-r--r--libkpimexchange/core/exchangedownload.cpp4
-rw-r--r--libkpimexchange/core/exchangeprogress.cpp6
-rw-r--r--libkpimidentities/identity.cpp4
-rw-r--r--libkpimidentities/identitycombo.cpp2
-rw-r--r--libkpimidentities/identitymanager.cpp4
-rw-r--r--libksieve/shared/error.cpp2
-rw-r--r--libtdepim/addresseediffalgo.h2
-rw-r--r--libtdepim/addresseeemailselection.cpp4
-rw-r--r--libtdepim/addresseelineedit.cpp8
-rw-r--r--libtdepim/addresseelineedit.h2
-rw-r--r--libtdepim/addresseeselector.cpp6
-rw-r--r--libtdepim/addresseeselector.h6
-rw-r--r--libtdepim/addresseeview.cpp18
-rw-r--r--libtdepim/addresseeview.h2
-rw-r--r--libtdepim/addressesdialog.cpp12
-rw-r--r--libtdepim/addressesdialog.h2
-rw-r--r--libtdepim/broadcaststatus.cpp4
-rw-r--r--libtdepim/calendardiffalgo.cpp2
-rw-r--r--libtdepim/categoryeditdialog.cpp2
-rw-r--r--libtdepim/categoryselectdialog.cpp2
-rw-r--r--libtdepim/cfgc/autoexample.cpp4
-rw-r--r--libtdepim/cfgc/example.cpp4
-rw-r--r--libtdepim/completionordereditor.cpp8
-rw-r--r--libtdepim/csshelper.cpp4
-rw-r--r--libtdepim/designerfields.h2
-rw-r--r--libtdepim/distributionlist.cpp2
-rw-r--r--libtdepim/distributionlist.h2
-rw-r--r--libtdepim/embeddedurlpage.cpp2
-rw-r--r--libtdepim/htmldiffalgodisplay.cpp2
-rw-r--r--libtdepim/kabcresourcecached.cpp10
-rw-r--r--libtdepim/kabcresourcecached.h2
-rw-r--r--libtdepim/kabcresourcenull.h2
-rw-r--r--libtdepim/kaddrbook.cpp14
-rw-r--r--libtdepim/kaddrbook.h2
-rw-r--r--libtdepim/kcmdesignerfields.cpp6
-rw-r--r--libtdepim/kdateedit.cpp6
-rw-r--r--libtdepim/kdatepickerpopup.cpp2
-rw-r--r--libtdepim/kfoldertree.cpp2
-rw-r--r--libtdepim/kimportdialog.cpp2
-rw-r--r--libtdepim/kincidencechooser.cpp4
-rw-r--r--libtdepim/komposer/core/core.cpp2
-rw-r--r--libtdepim/komposer/core/prefsmodule.cpp2
-rw-r--r--libtdepim/komposer/core/tests/main.cpp2
-rw-r--r--libtdepim/komposer/plugins/default/defaulteditor.cpp2
-rw-r--r--libtdepim/komposer/test/test.cpp2
-rw-r--r--libtdepim/kpimprefs.cpp4
-rw-r--r--libtdepim/kpimurlrequesterdlg.cpp2
-rw-r--r--libtdepim/kpixmapregionselectordialog.cpp2
-rw-r--r--libtdepim/kpixmapregionselectorwidget.cpp2
-rw-r--r--libtdepim/kprefsdialog.cpp4
-rw-r--r--libtdepim/kscoring.cpp2
-rw-r--r--libtdepim/kscoringeditor.cpp2
-rw-r--r--libtdepim/ksubscription.cpp2
-rw-r--r--libtdepim/ktimeedit.cpp6
-rw-r--r--libtdepim/kvcarddrag.cpp2
-rw-r--r--libtdepim/kvcarddrag.h4
-rw-r--r--libtdepim/kwidgetlister.cpp2
-rw-r--r--libtdepim/ldapclient.cpp4
-rw-r--r--libtdepim/ldapclient.h2
-rw-r--r--libtdepim/ldapsearchdialog.cpp6
-rw-r--r--libtdepim/linklocator.cpp2
-rw-r--r--libtdepim/maillistdrag.cpp2
-rw-r--r--libtdepim/pluginloaderbase.cpp4
-rw-r--r--libtdepim/progressdialog.cpp2
-rw-r--r--libtdepim/progressmanager.cpp2
-rw-r--r--libtdepim/recentaddresses.cpp4
-rw-r--r--libtdepim/recentaddresses.h2
-rw-r--r--libtdepim/resourceabc.h2
-rw-r--r--libtdepim/sendsmsdialog.cpp2
-rw-r--r--libtdepim/ssllabel.cpp2
-rw-r--r--libtdepim/statusbarprogresswidget.cpp2
-rw-r--r--libtdepim/tdeconfigpropagator.cpp2
-rw-r--r--libtdepim/tdeconfigwizard.cpp4
-rw-r--r--libtdepim/tdefileio.cpp4
-rw-r--r--libtdepim/tests/testaddresseelineedit.cpp2
-rw-r--r--libtdepim/tests/testaddresseeselector.cpp2
-rw-r--r--libtdepim/tests/testdateedit.cpp2
-rw-r--r--libtdepim/tests/testdistrlist.cpp2
-rw-r--r--libtdepim/tests/testkincidencechooser.cpp2
-rw-r--r--libtdepim/tests/testwizard.cpp2
-rw-r--r--plugins/kmail/bodypartformatter/attendeeselector.cpp2
-rw-r--r--plugins/kmail/bodypartformatter/delegateselector.cpp2
-rw-r--r--plugins/kmail/bodypartformatter/text_calendar.cpp10
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp14
-rw-r--r--plugins/kmail/bodypartformatter/text_xdiff.cpp8
-rw-r--r--tdefile-plugins/palm-databases/tdefile_palm.cpp2
-rw-r--r--tdefile-plugins/rfc822/tdefile_rfc822.cpp2
-rw-r--r--tdefile-plugins/vcf/CMakeLists.txt2
-rw-r--r--tdefile-plugins/vcf/tdefile_vcf.cpp4
-rw-r--r--tdeioslaves/imap4/imap4.cc6
-rw-r--r--tdeioslaves/imap4/imapcommand.cc4
-rw-r--r--tdeioslaves/imap4/mimeheader.cc2
-rw-r--r--tdeioslaves/mbox/mbox.cc4
-rw-r--r--tdeioslaves/opengroupware/opengroupware.cpp8
-rw-r--r--tdeioslaves/sieve/sieve.cpp6
-rw-r--r--tderesources/birthdays/resourcekabc.cpp6
-rw-r--r--tderesources/birthdays/resourcekabc.h2
-rw-r--r--tderesources/birthdays/resourcekabcconfig.cpp2
-rw-r--r--tderesources/blogging/kcal_resourceblogging_plugin.cpp4
-rw-r--r--tderesources/blogging/kcal_resourcebloggingconfig.cpp4
-rw-r--r--tderesources/blogging/xmlrpcjob.cpp2
-rw-r--r--tderesources/caldav/config.cpp2
-rw-r--r--tderesources/caldav/configwidgets.cpp2
-rw-r--r--tderesources/caldav/job.cpp2
-rw-r--r--tderesources/caldav/plugin.cpp4
-rw-r--r--tderesources/caldav/resource.cpp2
-rw-r--r--tderesources/caldav/resource.h2
-rw-r--r--tderesources/carddav/config.cpp2
-rw-r--r--tderesources/carddav/configwidgets.cpp2
-rw-r--r--tderesources/carddav/job.cpp2
-rw-r--r--tderesources/carddav/plugin.cpp4
-rw-r--r--tderesources/carddav/resource.cpp6
-rw-r--r--tderesources/carddav/resource.h2
-rw-r--r--tderesources/egroupware/debugdialog.cpp2
-rw-r--r--tderesources/egroupware/kabc_resourcexmlrpc.cpp4
-rw-r--r--tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp2
-rw-r--r--tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp4
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.cpp4
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp2
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp4
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.cpp2
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp2
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp4
-rw-r--r--tderesources/egroupware/xmlrpciface.cpp2
-rw-r--r--tderesources/exchange/resourceexchange.cpp6
-rw-r--r--tderesources/exchange/resourceexchangeconfig.cpp4
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplan.cpp4
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplan.h2
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplanconfig.cpp2
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplanplugin.cpp4
-rw-r--r--tderesources/groupdav/Makefile.am2
-rw-r--r--tderesources/groupdav/groupdavaddressbookadaptor.cpp4
-rw-r--r--tderesources/groupdav/groupdavaddressbookadaptor.h2
-rw-r--r--tderesources/groupdav/groupdavglobals.cpp2
-rw-r--r--tderesources/groupdav/kabc_resourcegroupdav_plugin.cpp4
-rw-r--r--tderesources/groupdav/kcal_resourcegroupdav_plugin.cpp4
-rw-r--r--tderesources/groupware/kabc_resourcegroupware.cpp6
-rw-r--r--tderesources/groupware/kabc_resourcegroupware_plugin.cpp4
-rw-r--r--tderesources/groupware/kabc_resourcegroupwareconfig.cpp2
-rw-r--r--tderesources/groupware/kcal_resourcegroupware.cpp4
-rw-r--r--tderesources/groupware/kcal_resourcegroupware.h2
-rw-r--r--tderesources/groupware/kcal_resourcegroupware_plugin.cpp4
-rw-r--r--tderesources/groupware/kcal_resourcegroupwareconfig.cpp2
-rw-r--r--tderesources/groupwise/kabc_resourcegroupwise.cpp6
-rw-r--r--tderesources/groupwise/kabc_resourcegroupwise_plugin.cpp4
-rw-r--r--tderesources/groupwise/kabc_resourcegroupwiseconfig.cpp2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.cpp4
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.h2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise_plugin.cpp4
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwiseconfig.cpp2
-rw-r--r--tderesources/groupwise/soap/contactconverter.cpp2
-rw-r--r--tderesources/groupwise/soap/contactconverter.h2
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.cpp10
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.h2
-rw-r--r--tderesources/groupwise/soap/gwjobs.cpp6
-rw-r--r--tderesources/groupwise/soap/gwjobs.h2
-rw-r--r--tderesources/groupwise/soap/incidenceconverter.cpp6
-rw-r--r--tderesources/groupwise/soap/ksslsocket.cpp4
-rw-r--r--tderesources/groupwise/soap/soapdebug.cpp2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.cpp8
-rw-r--r--tderesources/kolab/kabc/contact.cpp4
-rw-r--r--tderesources/kolab/kabc/resourcekolab.cpp10
-rw-r--r--tderesources/kolab/kcal/resourcekolab.cpp6
-rw-r--r--tderesources/kolab/knotes/resourcekolab.cpp4
-rw-r--r--tderesources/kolab/shared/kmailconnection.cpp2
-rw-r--r--tderesources/kolab/shared/kolabbase.cpp2
-rw-r--r--tderesources/kolab/shared/resourcekolabbase.cpp6
-rw-r--r--tderesources/lib/addressbookadaptor.cpp4
-rw-r--r--tderesources/lib/addressbookadaptor.h2
-rw-r--r--tderesources/lib/davaddressbookadaptor.cpp4
-rw-r--r--tderesources/lib/folderconfig.cpp2
-rw-r--r--tderesources/lib/folderlistview.cpp2
-rw-r--r--tderesources/lib/groupwaredownloadjob.cpp2
-rw-r--r--tderesources/lib/groupwareuploadjob.cpp2
-rw-r--r--tderesources/lib/kabc_resourcegroupwarebase.cpp6
-rw-r--r--tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp2
-rw-r--r--tderesources/lib/kcal_cachesettingsdlg.cpp2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.cpp2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.h2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp2
-rw-r--r--tderesources/newexchange/exchangeaddressbookadaptor.h2
-rw-r--r--tderesources/newexchange/exchangecalendaradaptor.cpp2
-rw-r--r--tderesources/newexchange/exchangeconvertercontact.h2
-rw-r--r--tderesources/newexchange/kabc_resourceexchange.cpp2
-rw-r--r--tderesources/newexchange/kcal_resourceexchange.cpp2
-rw-r--r--tderesources/remote/resourceremote.cpp6
-rw-r--r--tderesources/remote/resourceremote_plugin.cpp4
-rw-r--r--tderesources/remote/resourceremoteconfig.cpp4
-rw-r--r--tderesources/scalix/Makefile.am2
-rw-r--r--tderesources/scalix/kabc/contact.h2
-rw-r--r--tderesources/scalix/kabc/resourcescalix.cpp8
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp4
-rw-r--r--tderesources/scalix/knotes/resourcescalix.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/CMakeLists.txt2
-rw-r--r--tderesources/scalix/scalixadmin/delegatedialog.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/delegatepage.cpp4
-rw-r--r--tderesources/scalix/scalixadmin/delegateview.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/jobs.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/ldapdialog.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/ldapview.cpp6
-rw-r--r--tderesources/scalix/scalixadmin/main.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/mainwindow.cpp4
-rw-r--r--tderesources/scalix/scalixadmin/otheruserpage.cpp4
-rw-r--r--tderesources/scalix/scalixadmin/otheruserview.cpp2
-rw-r--r--tderesources/scalix/scalixadmin/outofofficepage.cpp4
-rw-r--r--tderesources/scalix/scalixadmin/passwordpage.cpp4
-rw-r--r--tderesources/scalix/shared/kmailconnection.cpp2
-rw-r--r--tderesources/scalix/shared/resourcescalixbase.cpp6
-rw-r--r--tderesources/scalix/shared/scalixbase.cpp2
-rw-r--r--tderesources/scalix/tdeioslave/scalix.cpp2
-rw-r--r--tderesources/slox/kabcresourceslox.cpp4
-rw-r--r--tderesources/slox/kabcresourceslox.h2
-rw-r--r--tderesources/slox/kabcresourceslox_plugin.cpp4
-rw-r--r--tderesources/slox/kabcresourcesloxconfig.cpp2
-rw-r--r--tderesources/slox/kcalresourceslox.cpp6
-rw-r--r--tderesources/slox/kcalresourceslox_plugin.cpp4
-rw-r--r--tderesources/slox/kcalresourcesloxconfig.cpp2
-rw-r--r--tderesources/slox/sloxaccounts.h2
-rw-r--r--tderesources/slox/sloxfolder.cpp2
-rw-r--r--tderesources/slox/sloxfolderdialog.cpp2
-rw-r--r--tderesources/slox/sloxfoldermanager.cpp2
-rw-r--r--tderesources/slox/webdavhandler.h2
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime.cpp6
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime.h2
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime_plugin.cpp4
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytimeconfig.cpp2
-rw-r--r--wizards/Makefile.am4
-rw-r--r--wizards/egroupwaremain.cpp2
-rw-r--r--wizards/egroupwarewizard.cpp4
-rw-r--r--wizards/exchangemain.cpp4
-rw-r--r--wizards/exchangewizard.cpp2
-rw-r--r--wizards/groupwarewizard.cpp2
-rw-r--r--wizards/groupwisemain.cpp4
-rw-r--r--wizards/groupwisewizard.cpp2
-rw-r--r--wizards/kmailchanges.cpp4
-rw-r--r--wizards/kolabkmailchanges.cpp2
-rw-r--r--wizards/kolabmain.cpp4
-rw-r--r--wizards/kolabwizard.cpp6
-rw-r--r--wizards/main.cpp4
-rw-r--r--wizards/overviewpage.cpp4
-rw-r--r--wizards/scalixkmailchanges.cpp2
-rw-r--r--wizards/scalixmain.cpp4
-rw-r--r--wizards/scalixwizard.cpp8
-rw-r--r--wizards/sloxmain.cpp4
-rw-r--r--wizards/sloxwizard.cpp2
1058 files changed, 1865 insertions, 1865 deletions
diff --git a/README b/README
index 2837f0b9..c06e866e 100644
--- a/README
+++ b/README
@@ -48,7 +48,7 @@ There is also quite an amount of infrastructure in this package:
* libkcal: C++ api for the iCalendar and vCalendar formats
* libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
* libkpimexchange: connecting to Exchange2000 servers
-* kabc/frontend: A GUI frontend for libkabc, not intended for end users.
+* tdeabc/frontend: A GUI frontend for libkabc, not intended for end users.
* kgantt: lib to display and manage Gantt diagrams used by the project view
plugin of KOrganizer
* kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of
diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 84695ce2..87b1ff19 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -25,7 +25,7 @@
#include <tqwidget.h>
#include <tdeaction.h>
#include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdeshortcut.h>
#include <kxmlguifactory.h>
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 557fcd0f..0642fa48 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -29,13 +29,13 @@
#include <tdeapplication.h>
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kiconloader.h>
#include <kicontheme.h>
#include <kdebug.h>
#include <ksqueezedtextlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
namespace Akregator {
diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h
index 1f59834d..20f29ffc 100644
--- a/akregator/src/akregator_options.h
+++ b/akregator/src/akregator_options.h
@@ -26,7 +26,7 @@
#define AKREGATOR_OPTIONS_H
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace Akregator {
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 16ae8e08..48311dcc 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -31,18 +31,18 @@
#include <tdeconfig.h>
#include <tdeconfigdialog.h>
#include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdehtmldefaults.h>
#include <kinstance.h>
#include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <knotifydialog.h>
#include <tdepopupmenu.h>
#include <kservice.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <ktrader.h>
#include <tdeio/netaccess.h>
#include <tdeparts/browserinterface.h>
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index f03c2361..fa869175 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -73,8 +73,8 @@
#include <kinputdialog.h>
#include <klineedit.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpassdlg.h>
#include <kprocess.h>
#include <krun.h>
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index c08867b2..96a2a050 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -34,9 +34,9 @@
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharsets.h>
#include <kurl.h>
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index e31cd3ab..96b269e6 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -30,14 +30,14 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <krun.h>
#include <kstandarddirs.h>
#include <kshell.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <libtdepim/tdefileio.h>
diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h
index ace931c8..44443f7d 100644
--- a/akregator/src/articleviewer.h
+++ b/akregator/src/articleviewer.h
@@ -26,7 +26,7 @@
#ifndef ARTICLEVIEWER_H
#define ARTICLEVIEWER_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcolor.h>
#include <tqfont.h>
diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp
index b88272b4..5a280e1c 100644
--- a/akregator/src/configdialog.cpp
+++ b/akregator/src/configdialog.cpp
@@ -25,7 +25,7 @@
#include <tqstringlist.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configdialog.h"
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index a68aedbb..3b0d8103 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -33,7 +33,7 @@
#include <kurl.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include "akregatorconfig.h"
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index e05aded8..708b4fb7 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -29,7 +29,7 @@
#include <tqvaluelist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "article.h"
#include "feed.h"
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index 6147f4d2..d6ea394a 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -42,7 +42,7 @@
#include <kdebug.h>
#include <kiconeffect.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemultipledrag.h>
#include <kstringhandler.h>
#include <kurldrag.h>
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index 351d3512..6e27b915 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -27,7 +27,7 @@
#include <tdeactioncollection.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/part.h>
diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp
index f1726fcc..4c4b31ec 100644
--- a/akregator/src/main.cpp
+++ b/akregator/src/main.cpp
@@ -26,7 +26,7 @@
#include <dcopref.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <kuniqueapplication.h>
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index a2d0725e..6cf6ad51 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -36,11 +36,11 @@
#include <kdebug.h>
#include <kedittoolbar.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kkeydialog.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeparts/partmanager.h>
#include <ksqueezedtextlabel.h>
#include <kstandarddirs.h>
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index 58d5e31f..501b8b26 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -35,7 +35,7 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
namespace Akregator {
diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp
index 788087f8..c028b156 100644
--- a/akregator/src/mk4storage/mk4confwidget.cpp
+++ b/akregator/src/mk4storage/mk4confwidget.cpp
@@ -28,8 +28,8 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kurlrequester.h>
namespace Akregator {
diff --git a/akregator/src/mk4storage/mk4plugin.cpp b/akregator/src/mk4storage/mk4plugin.cpp
index b3493be3..16000308 100644
--- a/akregator/src/mk4storage/mk4plugin.cpp
+++ b/akregator/src/mk4storage/mk4plugin.cpp
@@ -24,7 +24,7 @@
#include "mk4plugin.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "storagefactorymk4impl.h"
#include "storagefactoryregistry.h"
diff --git a/akregator/src/mk4storage/storagefactorymk4impl.cpp b/akregator/src/mk4storage/storagefactorymk4impl.cpp
index 7a9cd065..6f0eec34 100644
--- a/akregator/src/mk4storage/storagefactorymk4impl.cpp
+++ b/akregator/src/mk4storage/storagefactorymk4impl.cpp
@@ -26,7 +26,7 @@
//#include "mk4confwidget.h"
//#include "mk4config.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqwidget.h>
diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp
index 60066c5f..5a144681 100644
--- a/akregator/src/notificationmanager.cpp
+++ b/akregator/src/notificationmanager.cpp
@@ -22,7 +22,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <kstaticdeleter.h>
#include <kurl.h>
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 6bc2592a..1408255e 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -34,11 +34,11 @@
#include <kbookmark.h>
#include <kbookmarkmanager.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdehtml_settings.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <tdestdaccel.h>
diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp
index 87e77a3b..8efe9c71 100644
--- a/akregator/src/pluginmanager.cpp
+++ b/akregator/src/pluginmanager.cpp
@@ -23,8 +23,8 @@ email : markey@web.de
#include <klibloader.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
using std::vector;
using Akregator::Plugin;
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index 07290a13..dd27fbe9 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -25,7 +25,7 @@
#include <tqmap.h>
#include <tqstylesheet.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
#include <libtdepim/progressmanager.h>
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index a0f13c47..149eb480 100644
--- a/akregator/src/propertiesdialog.cpp
+++ b/akregator/src/propertiesdialog.cpp
@@ -29,7 +29,7 @@
#include <kcombobox.h>
#include <klineedit.h>
#include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tqcheckbox.h>
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index 9d234186..afd3b346 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -30,7 +30,7 @@
#include <kcombobox.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tqapplication.h>
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index 66ce00ae..4291bb45 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -29,7 +29,7 @@
#include "treenodevisitor.h"
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqmap.h>
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 38f1f8bf..1eae5740 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -29,7 +29,7 @@
#include <dcopclient.h>
#include <tdeapplication.h>
#include <kcharsets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstaticdeleter.h>
#include <ktrader.h>
diff --git a/akregator/src/storagefactorydummyimpl.cpp b/akregator/src/storagefactorydummyimpl.cpp
index 45f9fc0a..b794241c 100644
--- a/akregator/src/storagefactorydummyimpl.cpp
+++ b/akregator/src/storagefactorydummyimpl.cpp
@@ -24,7 +24,7 @@
#include "storagefactorydummyimpl.h"
#include "storagedummyimpl.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
#include <tqstringlist.h>
#include <tqwidget.h>
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index da69b69e..76c8b198 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -40,7 +40,7 @@
#include <ktabbar.h>
#include <tdepopupmenu.h>
#include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdehtmlview.h>
#include <tdehtml_part.h>
#include <kiconloader.h>
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index a30e1b3d..6d60da63 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -36,7 +36,7 @@
#include <tqvaluelist.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace Akregator {
diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp
index 531b7ff9..4f73467e 100644
--- a/akregator/src/tagpropertiesdialog.cpp
+++ b/akregator/src/tagpropertiesdialog.cpp
@@ -23,7 +23,7 @@
*/
#include <kicondialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 3e87ca77..fc26cade 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -29,8 +29,8 @@
#include <twin.h>
#include <kiconeffect.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <dcopclient.h>
#include <dcopref.h>
#include <tdepopupmenu.h>
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 0693fd21..a9c4d6fc 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -28,8 +28,8 @@
#include <tdefiledialog.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
#include <krun.h>
diff --git a/certmanager/CMakeLists.txt b/certmanager/CMakeLists.txt
index 8ff147bb..51465610 100644
--- a/certmanager/CMakeLists.txt
+++ b/certmanager/CMakeLists.txt
@@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC
hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp
certificateinfowidget.ui certificateinfowidgetimpl.cpp
crlview.cpp storedtransferjob.cpp certlistview.cpp
- LINK conf-static kleopatra-shared tdeutils-shared kabc-shared
+ LINK conf-static kleopatra-shared tdeutils-shared tdeabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/certmanager/aboutdata.cpp b/certmanager/aboutdata.cpp
index 8941ae00..21cae228 100644
--- a/certmanager/aboutdata.cpp
+++ b/certmanager/aboutdata.cpp
@@ -36,7 +36,7 @@
#include "aboutdata.h"
-#include <klocale.h>
+#include <tdelocale.h>
static const char kleopatra_version[] = "0.40";
static const char description[] = I18N_NOOP("TDE Key Manager");
diff --git a/certmanager/certificateinfowidgetimpl.cpp b/certmanager/certificateinfowidgetimpl.cpp
index c6add951..79b02b24 100644
--- a/certmanager/certificateinfowidgetimpl.cpp
+++ b/certmanager/certificateinfowidgetimpl.cpp
@@ -47,12 +47,12 @@
#include <gpgmepp/keylistresult.h>
// KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kprocio.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
// TQt
#include <tqlistview.h>
diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 583470e9..d220a10a 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -49,11 +49,11 @@
#include <gpgmepp/keygenerationresult.h>
// KDE
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/certmanager/certmanager.cpp b/certmanager/certmanager.cpp
index bed7d94a..044566f4 100644
--- a/certmanager/certmanager.cpp
+++ b/certmanager/certmanager.cpp
@@ -75,8 +75,8 @@
#include <kprocess.h>
#include <tdeaction.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <dcopclient.h>
#include <tdetoolbar.h>
#include <kstatusbar.h>
@@ -84,7 +84,7 @@
#include <kdebug.h>
#include <kdialogbase.h>
#include <kkeydialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <tdestdaccel.h>
diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 53030bbd..c31fa900 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -32,8 +32,8 @@
#include "appearanceconfigpage.h"
#include <tqlayout.h>
#include "appearanceconfigwidget.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdepimmacros.h>
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 19224cf9..54c677ca 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -43,9 +43,9 @@
#include <tdelistview.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefontdialog.h>
#include <kcolordialog.h>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index b1e99413..4d0d1e68 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -36,7 +36,7 @@
#include <twin.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
: KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal )
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 769b9532..7a19d451 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -34,8 +34,8 @@
#include <kleo/cryptobackendfactory.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <knuminput.h>
@@ -62,7 +62,7 @@ public:
KURL::List readCurrentList() const {
KURL::List lst;
- // stolen from kabc/ldapclient.cpp
+ // stolen from tdeabc/ldapclient.cpp
const uint numHosts = mConfig.readUnsignedNumEntry( "NumSelectedHosts" );
for ( uint j = 0; j < numHosts; j++ ) {
const TQString num = TQString::number( j );
diff --git a/certmanager/crlview.cpp b/certmanager/crlview.cpp
index 49c27d3e..f94a4557 100644
--- a/certmanager/crlview.cpp
+++ b/certmanager/crlview.cpp
@@ -36,12 +36,12 @@
#include "crlview.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/certmanager/kwatchgnupg/aboutdata.cpp b/certmanager/kwatchgnupg/aboutdata.cpp
index 5727003f..78944269 100644
--- a/certmanager/kwatchgnupg/aboutdata.cpp
+++ b/certmanager/kwatchgnupg/aboutdata.cpp
@@ -32,7 +32,7 @@
#include "aboutdata.h"
-#include <klocale.h>
+#include <tdelocale.h>
static const char kwatchgnupg_version[] = "1.0";
static const char description[] = I18N_NOOP("GnuPG log viewer");
diff --git a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
index 8b110171..6b186178 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgconfig.cpp
@@ -32,7 +32,7 @@
#include "kwatchgnupgconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
index 9ce5f6b1..3fd96db6 100644
--- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
+++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp
@@ -38,8 +38,8 @@
#include <kleo/cryptoconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaction.h>
#include <kstdaction.h>
diff --git a/certmanager/kwatchgnupg/main.cpp b/certmanager/kwatchgnupg/main.cpp
index 323c8b5e..975b45c7 100644
--- a/certmanager/kwatchgnupg/main.cpp
+++ b/certmanager/kwatchgnupg/main.cpp
@@ -39,9 +39,9 @@
#include <kuniqueapplication.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/certmanager/kwatchgnupg/tray.cpp b/certmanager/kwatchgnupg/tray.cpp
index a8d2f587..3ce760d9 100644
--- a/certmanager/kwatchgnupg/tray.cpp
+++ b/certmanager/kwatchgnupg/tray.cpp
@@ -34,8 +34,8 @@
#include "kwatchgnupgmainwin.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tqtooltip.h>
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index 53ad316d..7ed31197 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -42,7 +42,7 @@
#include "kleo/cryptoconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kshell.h>
#include <kdebug.h>
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index 2154f7aa..265d759b 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -44,9 +44,9 @@
#include <gpg-error.h>
#include <kshell.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqtimer.h>
#include <tqfileinfo.h>
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
index 002bf018..6bb588d6 100644
--- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
@@ -39,7 +39,7 @@
#include <klibloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
index 677fc6ec..d7ae22c1 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
@@ -40,8 +40,8 @@
#include "kleo/cryptoconfig.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kshell.h>
#include <tqdir.h>
diff --git a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
index ec396537..9391f023 100644
--- a/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
+++ b/certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp
@@ -32,7 +32,7 @@
#include "symcryptrunprocessbase.h"
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kshell.h>
diff --git a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
index 2395dc6e..b5b006b5 100644
--- a/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
+++ b/certmanager/lib/backends/kpgp/kpgpbackendbase.cpp
@@ -41,7 +41,7 @@
#include "pgp6backend.h"
#include "gpg1backend.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
index 744dd113..c38097ed 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmebackend.cpp
@@ -42,7 +42,7 @@
#include <gpgmepp/context.h>
#include <gpgmepp/engineinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tqfile.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 191ff427..e73b4363 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -34,11 +34,11 @@
#include <kdebug.h>
#include <kprocio.h>
#include <errno.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <assert.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <stdlib.h>
#include <tqtextcodec.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
index 480e6c8a..433859bd 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp
@@ -45,7 +45,7 @@
#include <gpgmepp/encryptionresult.h>
#include <gpgmepp/data.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 847b92f3..ee879742 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -46,7 +46,7 @@
#include <gpgmepp/context.h>
#include <gpgmepp/data.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tqstring.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
index c6370674..5561625c 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp
@@ -43,8 +43,8 @@
#include <gpgmepp/keylistresult.h>
#include <gpg-error.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqstringlist.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
index c2e21bb9..bc0d232e 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp
@@ -36,7 +36,7 @@
#include "qgpgmeprogresstokenmapper.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
index 1392afd5..70ff6b8f 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp
@@ -45,7 +45,7 @@
#include <gpgmepp/data.h>
#include <gpgmepp/key.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
index db5c225e..032514cd 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
@@ -46,7 +46,7 @@
#include <gpgmepp/data.h>
#include <gpgmepp/key.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
diff --git a/certmanager/lib/cryptplugfactory.cpp b/certmanager/lib/cryptplugfactory.cpp
index 6165cadd..12adac0f 100644
--- a/certmanager/lib/cryptplugfactory.cpp
+++ b/certmanager/lib/cryptplugfactory.cpp
@@ -38,9 +38,9 @@
#include "cryptplugwrapperlist.h"
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <assert.h>
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index b1ee4274..5bd5675b 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -62,8 +62,8 @@
// kde
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
// other
diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp
index f6af5283..ce31cc9a 100644
--- a/certmanager/lib/kleo/cryptobackendfactory.cpp
+++ b/certmanager/lib/kleo/cryptobackendfactory.cpp
@@ -47,9 +47,9 @@
#include <ui/backendconfigwidget.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <iterator>
diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp
index b5b01644..d4ed1301 100644
--- a/certmanager/lib/kleo/dn.cpp
+++ b/certmanager/lib/kleo/dn.cpp
@@ -41,7 +41,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstringlist.h>
#include <tqvaluevector.h>
diff --git a/certmanager/lib/kleo/enum.cpp b/certmanager/lib/kleo/enum.cpp
index 1d48c6b6..bc9011fc 100644
--- a/certmanager/lib/kleo/enum.cpp
+++ b/certmanager/lib/kleo/enum.cpp
@@ -32,7 +32,7 @@
#include "enum.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
#include <tqstringlist.h>
diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
index ffd3c6db..65b59725 100644
--- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
+++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp
@@ -38,7 +38,7 @@
#include "cryptobackend.h"
#include "keylistjob.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstringlist.h>
#include <tqtl.h>
diff --git a/certmanager/lib/kleo/multideletejob.cpp b/certmanager/lib/kleo/multideletejob.cpp
index 7d1a2730..7c83c24b 100644
--- a/certmanager/lib/kleo/multideletejob.cpp
+++ b/certmanager/lib/kleo/multideletejob.cpp
@@ -38,7 +38,7 @@
#include "cryptobackend.h"
#include "deletejob.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <gpgmepp/key.h>
#include <gpgmepp/context.h>
diff --git a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
index 05c6d04d..fd0766b9 100644
--- a/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
+++ b/certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp
@@ -37,7 +37,7 @@
#include "tdeconfigbasedkeyfilter.h"
#include <tdeconfigbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const struct {
const char * name;
diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp
index ea7ccae7..01e5d109 100644
--- a/certmanager/lib/tests/test_gnupgprocessbase.cpp
+++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp
@@ -41,7 +41,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqstringlist.h>
diff --git a/certmanager/lib/tests/test_keygen.cpp b/certmanager/lib/tests/test_keygen.cpp
index e5b4bcd9..b678e29d 100644
--- a/certmanager/lib/tests/test_keygen.cpp
+++ b/certmanager/lib/tests/test_keygen.cpp
@@ -46,7 +46,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqmessagebox.h>
diff --git a/certmanager/lib/tests/test_keyselectiondialog.cpp b/certmanager/lib/tests/test_keyselectiondialog.cpp
index 6e1fa7df..f3a73d51 100644
--- a/certmanager/lib/tests/test_keyselectiondialog.cpp
+++ b/certmanager/lib/tests/test_keyselectiondialog.cpp
@@ -37,7 +37,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp
index 7b65a538..2589e4d6 100644
--- a/certmanager/lib/ui/backendconfigwidget.cpp
+++ b/certmanager/lib/ui/backendconfigwidget.cpp
@@ -43,9 +43,9 @@
#include <tdelistview.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <dcopclient.h>
diff --git a/certmanager/lib/ui/cryptoconfigdialog.cpp b/certmanager/lib/ui/cryptoconfigdialog.cpp
index 410f4348..52402d6d 100644
--- a/certmanager/lib/ui/cryptoconfigdialog.cpp
+++ b/certmanager/lib/ui/cryptoconfigdialog.cpp
@@ -31,7 +31,7 @@
#include "cryptoconfigdialog.h"
#include "cryptoconfigmodule.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaccelmanager.h>
Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )
diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp
index c1c710d2..135958c0 100644
--- a/certmanager/lib/ui/cryptoconfigmodule.cpp
+++ b/certmanager/lib/ui/cryptoconfigmodule.cpp
@@ -37,12 +37,12 @@
#include <kleo/cryptoconfig.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include <kdebug.h>
#include <knuminput.h>
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kurlrequester.h>
#include <tqgrid.h>
diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
index 71ac8a95..262ad6c7 100644
--- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
+++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp
@@ -38,7 +38,7 @@
#include "kleo/dn.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp
index 434699d0..0ee6d865 100644
--- a/certmanager/lib/ui/keyapprovaldialog.cpp
+++ b/certmanager/lib/ui/keyapprovaldialog.cpp
@@ -45,8 +45,8 @@
#include <cryptplugfactory.h>
#include <kleo/cryptobackend.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <kseparator.h>
#include <tqstringlist.h>
diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp
index c3bcf024..53db6ce9 100644
--- a/certmanager/lib/ui/keyrequester.cpp
+++ b/certmanager/lib/ui/keyrequester.cpp
@@ -63,11 +63,11 @@
#include <gpgmepp/keylistresult.h>
// KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdialog.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
// TQt
diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp
index 53d65843..9e005d58 100644
--- a/certmanager/lib/ui/keyselectiondialog.cpp
+++ b/certmanager/lib/ui/keyselectiondialog.cpp
@@ -52,14 +52,14 @@
#include <gpgmepp/keylistresult.h>
// KDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <twin.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kactivelabel.h>
#include <kurl.h>
diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp
index 571ceccd..935084bd 100644
--- a/certmanager/lib/ui/messagebox.cpp
+++ b/certmanager/lib/ui/messagebox.cpp
@@ -43,7 +43,7 @@
#include <tdefiledialog.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksavefile.h>
#include <kguiitem.h>
#include <kdebug.h>
diff --git a/certmanager/lib/ui/messagebox.h b/certmanager/lib/ui/messagebox.h
index 69dea34c..083c1603 100644
--- a/certmanager/lib/ui/messagebox.h
+++ b/certmanager/lib/ui/messagebox.h
@@ -33,7 +33,7 @@
#ifndef __KLEO_UI_MESSAGEBOX_H__
#define __KLEO_UI_MESSAGEBOX_H__
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
namespace GpgME {
class SigningResult;
diff --git a/certmanager/lib/ui/passphrasedialog.cpp b/certmanager/lib/ui/passphrasedialog.cpp
index 5c7c44bd..a2d0e7c3 100644
--- a/certmanager/lib/ui/passphrasedialog.cpp
+++ b/certmanager/lib/ui/passphrasedialog.cpp
@@ -54,7 +54,7 @@
#include <kpassdlg.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp
index d6552922..692ee4cb 100644
--- a/certmanager/lib/ui/progressdialog.cpp
+++ b/certmanager/lib/ui/progressdialog.cpp
@@ -37,7 +37,7 @@
#include <kleo/job.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtimer.h>
diff --git a/certmanager/main.cpp b/certmanager/main.cpp
index 8bdb346d..bccb8d47 100644
--- a/certmanager/main.cpp
+++ b/certmanager/main.cpp
@@ -41,9 +41,9 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
int main( int argc, char** argv )
diff --git a/doc/kaddressbook/index.docbook b/doc/kaddressbook/index.docbook
index c684dbe7..b7156ca7 100644
--- a/doc/kaddressbook/index.docbook
+++ b/doc/kaddressbook/index.docbook
@@ -111,7 +111,7 @@ will be displayed:</para>
<para>&kaddressbook; can use multiple resources for loading and storing
its contacts. After starting &kaddressbook; for the first time you will have
a default resource installed that saves all contacts in a vCard file
-under $HOME/.trinity/share/apps/kabc/std.vcf; you can add more resources
+under $HOME/.trinity/share/apps/tdeabc/std.vcf; you can add more resources
by using the Resource Configuration dialog, which is available in
<application>kcontrol</application> under
<guilabel>TDE Components</guilabel>-><guilabel>TDE Resources Configuration</guilabel>:</para>
diff --git a/doc/kpilot/configuration.docbook b/doc/kpilot/configuration.docbook
index 1644d67b..e0b8979a 100644
--- a/doc/kpilot/configuration.docbook
+++ b/doc/kpilot/configuration.docbook
@@ -1402,7 +1402,7 @@ filename of the
vCard file (this will usually be a file that ends in <literal
role="extension">.vcf</literal>) to sync with, of if it uses the standard
&kde; address book file, it will be under the
-<filename class="directory">$TDEHOME/share/apps/kabc/</filename>
+<filename class="directory">$TDEHOME/share/apps/tdeabc/</filename>
folder, where the <filename class="directory">$TDEHOME</filename> environment
variable (typically <filename class="directory">/home/Login Name/.trinity/</filename>)
points to the folder that contains your configuration and data for the &kde;
diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp
index 7367508b..0e941e01 100644
--- a/kabc/frontend/main.cpp
+++ b/kabc/frontend/main.cpp
@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "mainWindow.h"
diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h
index 445b5945..1a88f1de 100644
--- a/kabc/frontend/mainWindow.ui.h
+++ b/kabc/frontend/mainWindow.ui.h
@@ -10,10 +10,10 @@
#include <kinputdialog.h>
#include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
using namespace KABC;
diff --git a/kabc/kabc2mutt/CMakeLists.txt b/kabc/kabc2mutt/CMakeLists.txt
index f7ec8dbe..98c30f0b 100644
--- a/kabc/kabc2mutt/CMakeLists.txt
+++ b/kabc/kabc2mutt/CMakeLists.txt
@@ -24,6 +24,6 @@ link_directories(
tde_add_executable( kabc2mutt AUTOMOC
SOURCES kabc2mutt.cpp main.cpp
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index 7f346a62..144ffe2d 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -17,9 +17,9 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h
index eb3ca733..328f06c1 100644
--- a/kabc/kabc2mutt/kabc2mutt.h
+++ b/kabc/kabc2mutt/kabc2mutt.h
@@ -20,7 +20,7 @@
#ifndef KABC2MUTT_H
#define KABC2MUTT_H
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
class KABC2Mutt : public TQObject
{
diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp
index 3d6fad64..d1aefd6e 100644
--- a/kabc/kabc2mutt/main.cpp
+++ b/kabc/kabc2mutt/main.cpp
@@ -19,7 +19,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <iostream>
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index 38fe294a..b2e8d93b 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -23,11 +23,11 @@
#include <tdecmdlineargs.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <libtdepim/distributionlist.h>
static const TDECmdLineOptions options[] =
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =
void convertDistributionLists()
{
- KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+ KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
const TQMap<TQString, TQString> entryMap = cfg.entryMap( "DistributionLists" );
if ( entryMap.isEmpty() ) // nothing to convert
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 71c6ba9e..a0209264 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -48,8 +48,8 @@
#include <kinputdialog.h>
#include <klineedit.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include "addresseditwidget.h"
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index c5b2f597..5d863573 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -27,8 +27,8 @@
#include <tqwidget.h>
#include <kdialogbase.h>
-#include <kabc/address.h>
-#include <kabc/addressee.h>
+#include <tdeabc/address.h>
+#include <tdeabc/addressee.h>
#include "addresseeconfig.h"
#include "typecombo.h"
diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h
index c267dce1..025663fd 100644
--- a/kaddressbook/addresseeconfig.h
+++ b/kaddressbook/addresseeconfig.h
@@ -24,7 +24,7 @@
#ifndef ADDRESSEECONFIG_H
#define ADDRESSEECONFIG_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tdeconfig.h>
using namespace KABC;
diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h
index 55eea432..d9124609 100644
--- a/kaddressbook/addresseeeditorbase.h
+++ b/kaddressbook/addresseeeditorbase.h
@@ -24,7 +24,7 @@
#ifndef ADDRESSEEEDITORBASE_H
#define ADDRESSEEEDITORBASE_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tqwidget.h>
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index d203e4dd..e53b5721 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "core.h"
#include "addresseeeditorwidget.h"
diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h
index 43f06c20..9e53580b 100644
--- a/kaddressbook/addresseeeditordialog.h
+++ b/kaddressbook/addresseeeditordialog.h
@@ -26,7 +26,7 @@
#include <kdialogbase.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
class AddresseeEditorBase;
class TQWidget;
diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp
index d13232b7..9b9aceac 100644
--- a/kaddressbook/addresseeeditorextension.cpp
+++ b/kaddressbook/addresseeeditorextension.cpp
@@ -24,7 +24,7 @@
#include <tqlayout.h>
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kabprefs.h"
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index faf3e4e3..357de392 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -32,19 +32,19 @@
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <kabc/resource.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/stdaddressbook.h>
#include <tdeaccelmanager.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include <ksqueezedtextlabel.h>
#include <kstandarddirs.h>
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index 1097aafa..30dcad3f 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -26,7 +26,7 @@
#include <tqdatetime.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <kdialogbase.h>
#include <kjanuswidget.h>
diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp
index e99677c1..1368e478 100644
--- a/kaddressbook/addresseeutil.cpp
+++ b/kaddressbook/addresseeutil.cpp
@@ -21,11 +21,11 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/stdaddressbook.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/vcardconverter.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "addresseeutil.h"
diff --git a/kaddressbook/addresseeutil.h b/kaddressbook/addresseeutil.h
index 11ccf653..ed84512f 100644
--- a/kaddressbook/addresseeutil.h
+++ b/kaddressbook/addresseeutil.h
@@ -25,8 +25,8 @@
#define ADDRESSEEUTIL_H
#include <tqstring.h>
-#include <kabc/addressee.h>
-#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
/**
This class provides some utility methods for transposing an
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 2da1ad4e..dbec842d 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -27,7 +27,7 @@
#include <tqlineedit.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kaddressbookview.h"
diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h
index bdd7fe68..7e36faa3 100644
--- a/kaddressbook/advancedcustomfields.h
+++ b/kaddressbook/advancedcustomfields.h
@@ -26,7 +26,7 @@
#ifndef ADVANCEDCUSTOMFIELDS_H
#define ADVANCEDCUSTOMFIELDS_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqmap.h>
#include <tqpair.h>
diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h
index 68df1036..004da642 100644
--- a/kaddressbook/common/filter.h
+++ b/kaddressbook/common/filter.h
@@ -28,7 +28,7 @@
#include <tqstringlist.h>
#include <tqvaluelist.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tdeconfig.h>
/**
diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp
index 1f9e2410..c4edf5d4 100644
--- a/kaddressbook/common/kabprefs.cpp
+++ b/kaddressbook/common/kabprefs.cpp
@@ -22,7 +22,7 @@
*/
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
#include "kabprefs.h"
diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp
index ee6bbebe..d4c5cb2d 100644
--- a/kaddressbook/common/locationmap.cpp
+++ b/kaddressbook/common/locationmap.cpp
@@ -24,9 +24,9 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstaticdeleter.h>
#include <kurl.h>
diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h
index 502aa01f..a5a53426 100644
--- a/kaddressbook/common/locationmap.h
+++ b/kaddressbook/common/locationmap.h
@@ -24,7 +24,7 @@
#ifndef LOCATIONMAP_H
#define LOCATIONMAP_H
-#include <kabc/address.h>
+#include <tdeabc/address.h>
#include <tqobject.h>
#include <tqstring.h>
diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp
index 867ccddb..788b4391 100644
--- a/kaddressbook/customfieldswidget.cpp
+++ b/kaddressbook/customfieldswidget.cpp
@@ -34,7 +34,7 @@
#include <kcombobox.h>
#include <kinputdialog.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "addresseeconfig.h"
#include "kabprefs.h"
diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h
index 414cea85..ac44521a 100644
--- a/kaddressbook/customfieldswidget.h
+++ b/kaddressbook/customfieldswidget.h
@@ -24,9 +24,9 @@
#ifndef CUSTOMFIELDSWIDGET_H
#define CUSTOMFIELDSWIDGET_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqmap.h>
#include <tqpair.h>
diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp
index c19d3109..485a3627 100644
--- a/kaddressbook/distributionlisteditor.cpp
+++ b/kaddressbook/distributionlisteditor.cpp
@@ -27,16 +27,16 @@
#include <libtdepim/distributionlist.h>
#include <libemailfunctions/email.h>
-#include <kabc/addressbook.h>
-#include <kabc/resource.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/resource.h>
#include <tdeapplication.h>
#include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp
index 3d50f730..0290f6e2 100644
--- a/kaddressbook/distributionlistentryview.cpp
+++ b/kaddressbook/distributionlistentryview.cpp
@@ -4,12 +4,12 @@
#include <libtdepim/resourceabc.h>
-#include <kabc/addressbook.h>
-#include <kabc/resource.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/resource.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurllabel.h>
#include <tqbuttongroup.h>
diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp
index a6d566bb..3a54e600 100644
--- a/kaddressbook/distributionlistpicker.cpp
+++ b/kaddressbook/distributionlistpicker.cpp
@@ -27,13 +27,13 @@
#include <libtdepim/distributionlist.h>
#endif
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include <tdeapplication.h>
#include <kinputdialog.h>
#include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kaddressbook/editors/CMakeLists.txt b/kaddressbook/editors/CMakeLists.txt
index 0fd3d0f8..a2b8c898 100644
--- a/kaddressbook/editors/CMakeLists.txt
+++ b/kaddressbook/editors/CMakeLists.txt
@@ -48,6 +48,6 @@ tde_add_library( kabim STATIC_PIC AUTOMOC
tde_add_kpart( libkaddrbk_cryptosettings AUTOMOC
SOURCES cryptowidget.cpp
- LINK kabinterfaces-shared kleopatra-shared kabc-shared
+ LINK kabinterfaces-shared kleopatra-shared tdeabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp
index f89a068e..89212585 100644
--- a/kaddressbook/editors/cryptowidget.cpp
+++ b/kaddressbook/editors/cryptowidget.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp
index 4b3516ea..0a3336d6 100644
--- a/kaddressbook/editors/imaddresswidget.cpp
+++ b/kaddressbook/editors/imaddresswidget.cpp
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kplugininfo.h>
#include "imaddresswidget.h"
diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp
index 45523de5..b0f1590e 100644
--- a/kaddressbook/editors/imeditorwidget.cpp
+++ b/kaddressbook/editors/imeditorwidget.cpp
@@ -32,8 +32,8 @@
#include <kdialogbase.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kplugininfo.h>
#include <kpushbutton.h>
#include <ktrader.h>
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index a1df16c3..a9bdf999 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -39,8 +39,8 @@
#include <kiconloader.h>
#include <kinputdialog.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "emaileditwidget.h"
diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h
index f584023c..46d259a4 100644
--- a/kaddressbook/emaileditwidget.h
+++ b/kaddressbook/emaileditwidget.h
@@ -24,7 +24,7 @@
#ifndef EMAILEDITWIDGET_H
#define EMAILEDITWIDGET_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <kdialogbase.h>
class TQButtonGroup;
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 4ec33675..7275f90c 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -24,7 +24,7 @@
#include <tdeactionclasses.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktrader.h>
#include <tqlayout.h>
diff --git a/kaddressbook/features/CMakeLists.txt b/kaddressbook/features/CMakeLists.txt
index f85bbf7e..7317b3b4 100644
--- a/kaddressbook/features/CMakeLists.txt
+++ b/kaddressbook/features/CMakeLists.txt
@@ -46,7 +46,7 @@ install( FILES
tde_add_kpart( ${TARGET} AUTOMOC
SOURCES ${SOURCE}
- LINK kabinterfaces-shared tdepim-shared kabc-shared
+ LINK kabinterfaces-shared tdepim-shared tdeabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -55,6 +55,6 @@ tde_add_kpart( ${TARGET} AUTOMOC
tde_add_kpart( libkaddrbk_resourceselection AUTOMOC
SOURCES resourceselection.cpp
- LINK kabinterfaces-shared tdepim-shared kabc-shared
+ LINK kabinterfaces-shared tdepim-shared tdeabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 47176961..1d5acc09 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -27,12 +27,12 @@
#include <libtdepim/distributionlist.h>
#include <libtdepim/kvcarddrag.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
#include <kdialog.h>
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tqevent.h>
diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h
index fdeb8386..3e551548 100644
--- a/kaddressbook/features/distributionlistngwidget.h
+++ b/kaddressbook/features/distributionlistngwidget.h
@@ -25,7 +25,7 @@
#include "extensionwidget.h"
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tdelistbox.h>
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 73afa2ea..95bf4660 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -33,21 +33,21 @@
#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addresseedialog.h>
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
typedef KPIM::DistributionList DistributionList;
#else
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
typedef KABC::DistributionList DistributionList;
#endif
-#include <kabc/stdaddressbook.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/vcardconverter.h>
#include <libtdepim/kvcarddrag.h>
#include "core.h"
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index d812c480..132d0bc8 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -29,13 +29,13 @@
#include <tqheader.h>
#include <tqtooltip.h>
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tderesources/configdialog.h>
#include "core.h"
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 57427855..09c06ae4 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -40,7 +40,7 @@
#include <klineedit.h>
#include <tdelistbox.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kabprefs.h"
#include "filtereditdialog.h"
diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp
index 32bdf7bf..58ec7a18 100644
--- a/kaddressbook/filterselectionwidget.cpp
+++ b/kaddressbook/filterselectionwidget.cpp
@@ -25,7 +25,7 @@
#include <kcombobox.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "filterselectionwidget.h"
diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp
index 7565584d..c325ec6f 100644
--- a/kaddressbook/freebusywidget.cpp
+++ b/kaddressbook/freebusywidget.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <libkcal/freebusyurlstore.h>
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 8bad2129..f7261bf7 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -21,12 +21,12 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/geo.h>
+#include <tdeabc/geo.h>
#include <tdeaccelmanager.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kstandarddirs.h>
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index a302f1a2..b69e90bb 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -21,16 +21,16 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/picture.h>
+#include <tdeabc/picture.h>
#include <kdebug.h>
#include <kdialog.h>
#include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kurldrag.h>
#include <libtdepim/kpixmapregionselectordialog.h>
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index 8e4db9ae..449790e2 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <kabc/picture.h>
+#include <tdeabc/picture.h>
#include <kdialogbase.h>
#include "contacteditorwidget.h"
diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp
index d11a588a..9a36cb77 100644
--- a/kaddressbook/imeditwidget.cpp
+++ b/kaddressbook/imeditwidget.cpp
@@ -37,8 +37,8 @@
#include <kdialog.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "imeditwidget.h"
#include "imeditorwidget.h"
diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h
index 52f1ec26..2ef2fb5f 100644
--- a/kaddressbook/imeditwidget.h
+++ b/kaddressbook/imeditwidget.h
@@ -24,7 +24,7 @@
#ifndef IMEDITWIDGET_H
#define IMEDITWIDGET_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <kdialogbase.h>
class TQButtonGroup;
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index b3ee3b09..dbec4651 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -33,7 +33,7 @@
#include <kdialog.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "incsearchwidget.h"
diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h
index faafe94d..9b22f75f 100644
--- a/kaddressbook/incsearchwidget.h
+++ b/kaddressbook/incsearchwidget.h
@@ -26,7 +26,7 @@
#include <tqwidget.h>
-#include <kabc/field.h>
+#include <tdeabc/field.h>
class TQComboBox;
class TQTimer;
diff --git a/kaddressbook/interfaces/CMakeLists.txt b/kaddressbook/interfaces/CMakeLists.txt
index d6876c93..b0511b83 100644
--- a/kaddressbook/interfaces/CMakeLists.txt
+++ b/kaddressbook/interfaces/CMakeLists.txt
@@ -46,6 +46,6 @@ tde_add_library( kabinterfaces SHARED AUTOMOC
configurewidget.cpp contacteditorwidget.cpp
core.cpp extensionwidget.cpp xxport.cpp
VERSION 1.0.0
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp
index c5efa60a..bcb7a176 100644
--- a/kaddressbook/interfaces/configurewidget.cpp
+++ b/kaddressbook/interfaces/configurewidget.cpp
@@ -21,7 +21,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include "configurewidget.h"
diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h
index 8ac5d692..c8efa56c 100644
--- a/kaddressbook/interfaces/contacteditorwidget.h
+++ b/kaddressbook/interfaces/contacteditorwidget.h
@@ -26,7 +26,7 @@
#include <tqwidget.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include <klibloader.h>
#include <tdepimmacros.h>
diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 3a5baba9..fcf41028 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -32,7 +32,7 @@
#include <tqobject.h>
-#include <kabc/field.h>
+#include <tdeabc/field.h>
#include <kcommand.h>
#include <kxmlguiclient.h>
#include <tdepimmacros.h>
diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h
index 1cca99af..265484a4 100644
--- a/kaddressbook/interfaces/extensionwidget.h
+++ b/kaddressbook/interfaces/extensionwidget.h
@@ -26,7 +26,7 @@
#include <tqwidget.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include <klibloader.h>
#include <tdepimmacros.h>
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index fb268067..d0790ccf 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include "xxport.h"
diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h
index f3eddebb..515470c5 100644
--- a/kaddressbook/interfaces/xxport.h
+++ b/kaddressbook/interfaces/xxport.h
@@ -26,8 +26,8 @@
#include <tqobject.h>
-#include <kabc/addressbook.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addresseelist.h>
#include <klibloader.h>
#include <kxmlguiclient.h>
#include <tdepimmacros.h>
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index 4d052fd7..b1be78ee 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -29,11 +29,11 @@
#include <tqstring.h>
#include <tqstyle.h>
-#include <kabc/addressbook.h>
-#include <kabc/field.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/field.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "core.h"
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c35197ed..142f03c4 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -37,12 +37,12 @@
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <kabc/addresseelist.h>
-#include <kabc/errorhandler.h>
-#include <kabc/resource.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/vcardconverter.h>
-#include <kabc/resourcefile.h>
+#include <tdeabc/addresseelist.h>
+#include <tdeabc/errorhandler.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/vcardconverter.h>
+#include <tdeabc/resourcefile.h>
#include <tdeaboutdata.h>
#include <tdeaccelmanager.h>
#include <tdeapplication.h>
@@ -53,8 +53,8 @@
#include <kdebug.h>
#include <tdeversion.h>
#include <tdeimproxy.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprinter.h>
#include <kprotocolinfo.h>
#include <kpushbutton.h>
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index a18692fa..f9a7fbf1 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -26,7 +26,7 @@
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS
-#include <kabc/field.h>
+#include <tdeabc/field.h>
#include <tqdict.h>
#include <tqlabel.h>
diff --git a/kaddressbook/kablock.cpp b/kaddressbook/kablock.cpp
index 9444df47..8d36977f 100644
--- a/kaddressbook/kablock.cpp
+++ b/kaddressbook/kablock.cpp
@@ -21,10 +21,10 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/addressbook.h>
-#include <kabc/resource.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/resource.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstaticdeleter.h>
#include "kablock.h"
diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp
index 779af2b5..cfa16df8 100644
--- a/kaddressbook/kabtools.cpp
+++ b/kaddressbook/kabtools.cpp
@@ -21,8 +21,8 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/addressbook.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/vcardconverter.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <ktempdir.h>
diff --git a/kaddressbook/kaddressbook_options.h b/kaddressbook/kaddressbook_options.h
index 8aa632e4..9ed4146e 100644
--- a/kaddressbook/kaddressbook_options.h
+++ b/kaddressbook/kaddressbook_options.h
@@ -25,7 +25,7 @@
#define KADDRESSBOOK_OPTIONS_H
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static TDECmdLineOptions kaddressbook_options[] =
{
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 259ac5ea..566ffd71 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/genericfactory.h>
#include <tdeparts/statusbarextension.h>
#include <kstatusbar.h>
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 98668618..09b713f2 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -24,11 +24,11 @@
#include <tqlayout.h>
#include <tqpopupmenu.h>
-#include <kabc/addressbook.h>
-#include <kabc/distributionlistdialog.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/distributionlistdialog.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kxmlguifactory.h>
#include <kxmlguiclient.h>
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index d6ba8d6a..44e82a57 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -29,7 +29,7 @@
#include <tqstringlist.h>
#include <tqwidget.h>
-#include <kabc/field.h>
+#include <tdeabc/field.h>
#include <klibloader.h>
#include <tdepimmacros.h>
diff --git a/kaddressbook/kaddressbootdemain.cpp b/kaddressbook/kaddressbootdemain.cpp
index 60013be1..4b8c4974 100644
--- a/kaddressbook/kaddressbootdemain.cpp
+++ b/kaddressbook/kaddressbootdemain.cpp
@@ -23,8 +23,8 @@
#include <kedittoolbar.h>
#include <kkeydialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
#include <libtdepim/statusbarprogresswidget.h>
diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp
index 0c248440..44a51680 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.cpp
+++ b/kaddressbook/kcmconfigs/addhostdialog.cpp
@@ -30,7 +30,7 @@
#include <tdeaccelmanager.h>
#include <kbuttonbox.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "addhostdialog.h"
AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const char* name )
diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h
index da6cc392..1ea1865f 100644
--- a/kaddressbook/kcmconfigs/addhostdialog.h
+++ b/kaddressbook/kcmconfigs/addhostdialog.h
@@ -25,7 +25,7 @@
#define ADDHOSTDIALOG_H
#include <kdialogbase.h>
-#include <kabc/ldapconfigwidget.h>
+#include <tdeabc/ldapconfigwidget.h>
#include <libtdepim/ldapclient.h>
class KLineEdit;
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index ce58d272..6d8522f6 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -35,7 +35,7 @@
#include <tdeconfig.h>
#include <kdialog.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include "addresseewidget.h"
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index 5bdec2f8..55eecb18 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configurewidget.h"
#include "extensionconfigdialog.h"
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 6e2c4f68..83e0bc89 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -36,8 +36,8 @@
#include <kdebug.h>
#include <kdialog.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ktrader.h>
#include "addresseewidget.h"
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 6f170697..db05432c 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -25,7 +25,7 @@
#include <tdeaboutdata.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kabconfigwidget.h"
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index a95fa2c8..73e8c5a2 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -26,7 +26,7 @@
#include <tqlayout.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "ldapoptionswidget.h"
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index 71a41ba4..46241855 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -33,7 +33,7 @@
#include <kbuttonbox.h>
#include <tdeconfig.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "addhostdialog.h"
#include "ldapoptionswidget.h"
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index d6f28c87..671d0729 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -32,9 +32,9 @@
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include "keywidget.h"
diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h
index 5f5153d4..3e437fa0 100644
--- a/kaddressbook/keywidget.h
+++ b/kaddressbook/keywidget.h
@@ -25,7 +25,7 @@
#define KEYWIDGET_H
#include <tqwidget.h>
-#include <kabc/key.h>
+#include <tdeabc/key.h>
class KComboBox;
diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index 22a79d27..3ed81504 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -35,8 +35,8 @@
#include <kcombobox.h>
#include <tdeconfig.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kabcore.h"
#include "ldapsearchdialog.h"
diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h
index 613a28b8..dde2bc95 100644
--- a/kaddressbook/ldapsearchdialog.h
+++ b/kaddressbook/ldapsearchdialog.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include <ldapclient.h>
#include <kdialogbase.h>
diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
index d6322373..90937cec 100644
--- a/kaddressbook/main.cpp
+++ b/kaddressbook/main.cpp
@@ -26,13 +26,13 @@
#include <tqstring.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kcrash.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kstartupinfo.h>
+#include <tdelocale.h>
+#include <tdestartupinfo.h>
#include <kuniqueapplication.h>
#include <twin.h>
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index aa81b2ed..91c018a7 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -38,10 +38,10 @@
#include <klineedit.h>
#include <tdelistview.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "nameeditdialog.h"
diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h
index f43e56b0..855cd04c 100644
--- a/kaddressbook/nameeditdialog.h
+++ b/kaddressbook/nameeditdialog.h
@@ -25,7 +25,7 @@
#define NAMEEDITDIALOG_H
#include <kdialogbase.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include "addresseeconfig.h"
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index cd5eab78..70381d8e 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -40,9 +40,9 @@
#include <kiconloader.h>
#include <klineedit.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kabc/phonenumber.h>
+#include <tdeabc/phonenumber.h>
#include "phoneeditwidget.h"
diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp
index 50e76732..e1d48db5 100644
--- a/kaddressbook/printing/detailledstyle.cpp
+++ b/kaddressbook/printing/detailledstyle.cpp
@@ -28,9 +28,9 @@
#include <kdebug.h>
#include <kdialog.h>
#include <tdefontcombo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tqpaintdevicemetrics.h>
#include <tqpainter.h>
diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h
index e8600e56..c68568aa 100644
--- a/kaddressbook/printing/detailledstyle.h
+++ b/kaddressbook/printing/detailledstyle.h
@@ -24,7 +24,7 @@
#ifndef DETAILLEDSTYLE_H
#define DETAILLEDSTYLE_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include "printstyle.h"
#include "kabentrypainter.h"
diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp
index 0bf45386..d973f810 100644
--- a/kaddressbook/printing/kabentrypainter.cpp
+++ b/kaddressbook/printing/kabentrypainter.cpp
@@ -26,8 +26,8 @@
#include <tqpainter.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <kprinter.h>
#include <kurl.h>
diff --git a/kaddressbook/printing/kabentrypainter.h b/kaddressbook/printing/kabentrypainter.h
index 6936128f..f8fea491 100644
--- a/kaddressbook/printing/kabentrypainter.h
+++ b/kaddressbook/printing/kabentrypainter.h
@@ -24,7 +24,7 @@
#ifndef KABENTRYPAINTER_H
#define KABENTRYPAINTER_H
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include <tqcolor.h>
#include <tqfont.h>
diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp
index b17db145..aa718dfd 100644
--- a/kaddressbook/printing/mikesstyle.cpp
+++ b/kaddressbook/printing/mikesstyle.cpp
@@ -25,11 +25,11 @@
#include <tqpaintdevicemetrics.h>
#include <tqpainter.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <kprogress.h>
diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp
index 1ee71a8c..9ee8fe4a 100644
--- a/kaddressbook/printing/printingwizard.cpp
+++ b/kaddressbook/printing/printingwizard.cpp
@@ -31,12 +31,12 @@
#include <tqpushbutton.h>
#include <tqradiobutton.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addresseelist.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprinter.h>
// including the styles
diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h
index 73d96bb2..359b746f 100644
--- a/kaddressbook/printing/printingwizard.h
+++ b/kaddressbook/printing/printingwizard.h
@@ -31,7 +31,7 @@
#include <kwizard.h>
#include "common/filter.h"
-#include "kabc/addressbook.h"
+#include "tdeabc/addressbook.h"
#include "printstyle.h"
#include "selectionpage.h"
diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp
index 59ad2304..459cfbee 100644
--- a/kaddressbook/printing/printprogress.cpp
+++ b/kaddressbook/printing/printprogress.cpp
@@ -28,7 +28,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "printprogress.h"
diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp
index 685a47ac..3e1af420 100644
--- a/kaddressbook/printing/printsortmode.cpp
+++ b/kaddressbook/printing/printsortmode.cpp
@@ -21,7 +21,7 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/field.h>
+#include <tdeabc/field.h>
#include "printsortmode.h"
diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h
index d8ec920d..a764e6c7 100644
--- a/kaddressbook/printing/printsortmode.h
+++ b/kaddressbook/printing/printsortmode.h
@@ -28,7 +28,7 @@
#if KDE_IS_VERSION(3,3,91)
-#include <kabc/sortmode.h>
+#include <tdeabc/sortmode.h>
class PrintSortMode : public KABC::SortMode
{
diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h
index 65fea06a..2c5ef51b 100644
--- a/kaddressbook/printing/printstyle.h
+++ b/kaddressbook/printing/printstyle.h
@@ -28,7 +28,7 @@
#include <tqstringlist.h>
#include <tqpixmap.h>
-#include <kabc/field.h>
+#include <tdeabc/field.h>
namespace KABPrinting {
diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp
index c77c00d9..39b1c4a8 100644
--- a/kaddressbook/printing/selectionpage.cpp
+++ b/kaddressbook/printing/selectionpage.cpp
@@ -23,7 +23,7 @@
*/
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
#include <tqcombobox.h>
diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp
index c3fdc1e0..0b67897d 100644
--- a/kaddressbook/printing/stylepage.cpp
+++ b/kaddressbook/printing/stylepage.cpp
@@ -30,7 +30,7 @@
#include <kcombobox.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "stylepage.h"
diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h
index 8f664271..46fbc2d6 100644
--- a/kaddressbook/printing/stylepage.h
+++ b/kaddressbook/printing/stylepage.h
@@ -27,8 +27,8 @@
#include <tqwidget.h>
-#include <kabc/addressbook.h>
-#include <kabc/field.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/field.h>
class TQLabel;
class TQPixmap;
diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp
index 4ec8f7bb..fef8f27d 100644
--- a/kaddressbook/searchmanager.cpp
+++ b/kaddressbook/searchmanager.cpp
@@ -22,7 +22,7 @@
*/
#include <config.h> // FOR TDEPIM_NEW_DISTRLISTS
-#include <kabc/addresseelist.h>
+#include <tdeabc/addresseelist.h>
#include <tdeversion.h>
#include "searchmanager.h"
diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h
index 539619db..9e137032 100644
--- a/kaddressbook/searchmanager.h
+++ b/kaddressbook/searchmanager.h
@@ -27,7 +27,7 @@
#include <config.h> // for TDEPIM_NEW_DISTRLISTS
#include <tqobject.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
#endif
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 5e4af749..62360196 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
-#include <kabc/secrecy.h>
+#include <tdeabc/secrecy.h>
#include <kcombobox.h>
#include <kdialog.h>
diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp
index 3a371dc6..cabd98ba 100644
--- a/kaddressbook/simpleaddresseeeditor.cpp
+++ b/kaddressbook/simpleaddresseeeditor.cpp
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include "simpleaddresseeeditor.h"
diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp
index 9a110e25..e26b3d3a 100644
--- a/kaddressbook/soundwidget.cpp
+++ b/kaddressbook/soundwidget.cpp
@@ -21,14 +21,14 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/sound.h>
+#include <tdeabc/sound.h>
#include <kaudioplayer.h>
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
#include <kurlrequester.h>
#include <tqcheckbox.h>
diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h
index 50f4a584..f72a0181 100644
--- a/kaddressbook/soundwidget.h
+++ b/kaddressbook/soundwidget.h
@@ -24,7 +24,7 @@
#ifndef SOUNDWIDGET_H
#define SOUNDWIDGET_H
-#include <kabc/sound.h>
+#include <tdeabc/sound.h>
#include "contacteditorwidget.h"
diff --git a/kaddressbook/thumbnailcreator/CMakeLists.txt b/kaddressbook/thumbnailcreator/CMakeLists.txt
index d8ac40f0..00173bfe 100644
--- a/kaddressbook/thumbnailcreator/CMakeLists.txt
+++ b/kaddressbook/thumbnailcreator/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES ldifvcardthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
tde_add_kpart( ldifvcardthumbnail
SOURCES ldifvcardcreator.cpp
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 4627ebd5..a0c557d1 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -34,13 +34,13 @@
#include <tqtextstream.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kabc/ldifconverter.h>
-#include <kabc/vcardconverter.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeabc/ldifconverter.h>
+#include <tdeabc/vcardconverter.h>
#include <kpixmapsplitter.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "ldifvcardcreator.h"
diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.h b/kaddressbook/thumbnailcreator/ldifvcardcreator.h
index 04f78831..f09ad8ea 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.h
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.h
@@ -23,7 +23,7 @@
#include <tqpixmap.h>
#include <tdeio/thumbcreator.h>
-#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
+#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
class KPixmapSplitter;
diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h
index e5cf6429..4b12ef86 100644
--- a/kaddressbook/typecombo.h
+++ b/kaddressbook/typecombo.h
@@ -24,7 +24,7 @@
#ifndef TYPECOMBO_H
#define TYPECOMBO_H
-#include <kabc/phonenumber.h>
+#include <tdeabc/phonenumber.h>
#include <kcombobox.h>
/**
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index abe2bfe6..dc66696e 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -25,10 +25,10 @@
#include <tqapplication.h>
#include <tqclipboard.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
#include "addresseeutil.h"
#include "addresseeconfig.h"
diff --git a/kaddressbook/undocmds.h b/kaddressbook/undocmds.h
index 55c43767..b9915f15 100644
--- a/kaddressbook/undocmds.h
+++ b/kaddressbook/undocmds.h
@@ -30,9 +30,9 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
#include <kcommand.h>
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index e3c9a81c..cdfb28ea 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "viewconfigurefieldspage.h"
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index 91bf6da7..cbafec5a 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -26,8 +26,8 @@
#include <tqwidget.h>
-#include <kabc/field.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/field.h>
+#include <tdeabc/addressbook.h>
class KComboBox;
class TQListBox;
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index 3dd0d7d6..c0d7fa7c 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -29,7 +29,7 @@
#include <tdeconfig.h>
#include <kcombobox.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "viewconfigurefilterpage.h"
#include "filter.h"
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 0aaceb80..105bd685 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -27,9 +27,9 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "viewconfigurefieldspage.h"
#include "viewconfigurefilterpage.h"
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 77608225..4a4f601a 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -26,15 +26,15 @@
#include <tqwidgetstack.h>
#include <libtdepim/kvcarddrag.h>
-#include <kabc/addressbook.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/vcardconverter.h>
#include <tdeactionclasses.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdemultipledrag.h>
#include <ktempdir.h>
#include <ktrader.h>
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index 2979ee5d..9b1ef52a 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -33,7 +33,7 @@
#include <tqtooltip.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "cardview.h"
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index 2c520ce7..a386743c 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -32,9 +32,9 @@
#include <tqwhatsthis.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeconfig.h>
#include <tdefontdialog.h>
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index 4e478e25..f14a5c45 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -30,8 +30,8 @@
#include <tqbuttongroup.h>
#include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kurlrequester.h>
#include <kiconloader.h>
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index f4b98e46..0d7942f9 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -30,14 +30,14 @@
#include <tqbrush.h>
#include <tqevent.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <kurl.h>
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
#include <tdeimproxy.h>
#include "kaddressbooktableview.h"
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 0ca029f6..b893cc35 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -31,7 +31,7 @@
#include <tdelistview.h>
-#include <kabc/field.h>
+#include <tdeabc/field.h>
class TQDropEvent;
class KAddressBookTableView;
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index f69ce0c1..f60d171a 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -28,11 +28,11 @@
#include <tqlayout.h>
#include <tqstringlist.h>
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "core.h"
#include "configurecardviewdialog.h"
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index e5f4ab25..f88af5ff 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -26,13 +26,13 @@
#include <tqlayout.h>
#include <tqstringlist.h>
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "core.h"
#include "kabprefs.h"
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 4c726ca3..6d8d0c97 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -36,16 +36,16 @@
#include <tqurl.h>
#include <tqpixmap.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kcolorbutton.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <kurlrequester.h>
#include <tdeimproxy.h>
diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp
index 83cdd2b7..62357a59 100644
--- a/kaddressbook/xxport/bookmark_xxport.cpp
+++ b/kaddressbook/xxport/bookmark_xxport.cpp
@@ -26,7 +26,7 @@
#include <kbookmarkmanager.h>
#include <kbookmarkmenu.h>
#include <kbookmarkdombuilder.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "bookmark_xxport.h"
@@ -41,7 +41,7 @@ BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const c
bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& )
{
- TQString fileName = locateLocal( "data", "kabc/bookmarks.xml" );
+ TQString fileName = locateLocal( "data", "tdeabc/bookmarks.xml" );
KBookmarkManager *mgr = KBookmarkManager::managerForFile( fileName );
KBookmarkDomBuilder *builder = new KBookmarkDomBuilder( mgr->root(), mgr );
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 673a0ec7..20ed9aac 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -25,9 +25,9 @@
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kurl.h>
#include "csvimportdialog.h"
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 700eceae..93635d25 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -37,9 +37,9 @@
#include <kdialogbase.h>
#include <tdefiledialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprogress.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index bf0cc774..b6b89d7e 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -22,8 +22,8 @@
#ifndef CSV_IMPORT_DLG_H
#define CSV_IMPORT_DLG_H
-#include <kabc/addressbook.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addresseelist.h>
#include <kdialogbase.h>
#include <tqvaluelist.h>
diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp
index c443cce3..75f2ea24 100644
--- a/kaddressbook/xxport/eudora_xxport.cpp
+++ b/kaddressbook/xxport/eudora_xxport.cpp
@@ -25,9 +25,9 @@
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kurl.h>
#include <kdebug.h>
diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp
index 0de310e9..306fbe80 100644
--- a/kaddressbook/xxport/gnokii_xxport.cpp
+++ b/kaddressbook/xxport/gnokii_xxport.cpp
@@ -46,8 +46,8 @@ extern "C" {
#include <tqcursor.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprogress.h>
#include <kguiitem.h>
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 6d8fd80e..730de823 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -26,11 +26,11 @@
#include <kdebug.h>
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurl.h>
#include "xxportmanager.h"
@@ -47,7 +47,7 @@ KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *nam
KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const
{
- TQString fileName = locateLocal( "data", "kabc/std.vcf" );
+ TQString fileName = locateLocal( "data", "tdeabc/std.vcf" );
if ( !TQFile::exists( fileName ) ) {
KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) );
return KABC::AddresseeList();
diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp
index 67c3684d..31d3c293 100644
--- a/kaddressbook/xxport/ldif_xxport.cpp
+++ b/kaddressbook/xxport/ldif_xxport.cpp
@@ -37,12 +37,12 @@
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kurl.h>
-#include <kabc/ldifconverter.h>
+#include <tdeabc/ldifconverter.h>
#include <kdebug.h>
diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp
index f1547481..0a4ac488 100644
--- a/kaddressbook/xxport/opera_xxport.cpp
+++ b/kaddressbook/xxport/opera_xxport.cpp
@@ -27,9 +27,9 @@
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kurl.h>
#include <kdebug.h>
diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h
index c26cbdf2..910688cc 100644
--- a/kaddressbook/xxport/pab_pablib.h
+++ b/kaddressbook/xxport/pab_pablib.h
@@ -19,7 +19,7 @@
#ifndef PAB_LIB_HXX
#define PAB_LIB_HXX
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include "pab_mapihd.h"
diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp
index c4db37a9..894adf3d 100644
--- a/kaddressbook/xxport/pab_xxport.cpp
+++ b/kaddressbook/xxport/pab_xxport.cpp
@@ -27,11 +27,11 @@
#include <kdebug.h>
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurl.h>
#include "xxportmanager.h"
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index b1e0b0f1..b12779cb 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -28,13 +28,13 @@
#include <tqlayout.h>
#include <tqpushbutton.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
#include <kdialogbase.h>
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kurl.h>
#include <tdeapplication.h>
#include <libtdepim/addresseeview.h>
diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h
index a2aa8be3..b4b03284 100644
--- a/kaddressbook/xxport/vcard_xxport.h
+++ b/kaddressbook/xxport/vcard_xxport.h
@@ -25,7 +25,7 @@
#define VCARD_XXPORT_H
#include <xxport.h>
-#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
+#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
class VCardXXPort : public KAB::XXPort
{
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 65414ff5..22d8a2d1 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -23,11 +23,11 @@
#include <tqlayout.h>
-#include <kabc/addressbook.h>
-#include <kabc/resource.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/resource.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ktrader.h>
#include <tdeapplication.h>
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index aa18bf79..6c67c8ff 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -22,10 +22,10 @@
without including the source code for TQt in the source distribution.
*/
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include <tdeapplication.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
#include <tqcombobox.h>
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index adfcfd02..5141e5d3 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -24,8 +24,8 @@
#ifndef XXPORTSELECTDIALOG_H
#define XXPORTSELECTDIALOG_H
-#include <kabc/addresseelist.h>
-#include <kabc/field.h>
+#include <tdeabc/addresseelist.h>
+#include <tdeabc/field.h>
#include <kdialogbase.h>
#include "filter.h"
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index c3c7b810..8d11854b 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -27,15 +27,15 @@
#include <tqregexp.h>
#include <tqtimer.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
#include <tdeconfig.h>
#include <tdeaboutdata.h>
#include <tdeio/netaccess.h>
#include <tdefileitem.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdefiledialog.h>
#include <dcopclient.h>
#include <kdebug.h>
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 78e57ad1..00edf210 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -26,7 +26,7 @@
#include <tqcolor.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "alarmtext.h"
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 6f88d3e4..6d7e5f9e 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -26,8 +26,8 @@
#include <tqheader.h>
#include <tqregexp.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <libkcal/icaldrag.h>
diff --git a/kalarm/alarmtext.cpp b/kalarm/alarmtext.cpp
index c030c384..e1194ab0 100644
--- a/kalarm/alarmtext.cpp
+++ b/kalarm/alarmtext.cpp
@@ -20,7 +20,7 @@
#include "kalarm.h"
#include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "alarmevent.h"
#include "editdlg.h"
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 45abca7c..94abd0e3 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -27,8 +27,8 @@
#include <tqwhatsthis.h>
#include <kdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include "checkbox.h"
#include "dateedit.h"
diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp
index 165e5aba..e50723ff 100644
--- a/kalarm/birthdaydlg.cpp
+++ b/kalarm/birthdaydlg.cpp
@@ -27,13 +27,13 @@
#include <tqlineedit.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaccel.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <kdebug.h>
#include "alarmcalendar.h"
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index 734636dd..c5769f94 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -26,7 +26,7 @@
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <dcopclient.h>
#include <kdebug.h>
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index 7ea2f216..c5fab880 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -22,9 +22,9 @@
#include <tqlayout.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <libkcal/event.h>
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index daf4406d..091a648a 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -37,21 +37,21 @@
#include <tqdir.h>
#include <tqstyle.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
#include <tdefileitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurldrag.h>
#include <kurlcompletion.h>
#include <twin.h>
#include <twinmodule.h>
#include <kstandarddirs.h>
#include <kstdguiitem.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addresseedialog.h>
#include <kdebug.h>
#include <libtdepim/maillistdrag.h>
diff --git a/kalarm/find.cpp b/kalarm/find.cpp
index f75d5f6f..9a469e57 100644
--- a/kalarm/find.cpp
+++ b/kalarm/find.cpp
@@ -29,8 +29,8 @@
#include <kfind.h>
#include <kseparator.h>
#include <twin.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include "alarmlistview.h"
diff --git a/kalarm/fontcolour.cpp b/kalarm/fontcolour.cpp
index e4b92243..74feffb6 100644
--- a/kalarm/fontcolour.cpp
+++ b/kalarm/fontcolour.cpp
@@ -27,8 +27,8 @@
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcolordialog.h>
#include "kalarmapp.h"
diff --git a/kalarm/fontcolourbutton.cpp b/kalarm/fontcolourbutton.cpp
index 6299049c..5321cdc9 100644
--- a/kalarm/fontcolourbutton.cpp
+++ b/kalarm/fontcolourbutton.cpp
@@ -24,7 +24,7 @@
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "fontcolour.h"
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index 9808f06e..f7dbc256 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -40,11 +40,11 @@
#include <tdeconfig.h>
#include <tdeaction.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include <tdestdaccel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <dcopclient.h>
#include <dcopref.h>
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index b2ecb86f..7530b14a 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -30,13 +30,13 @@
#include <tqfile.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <tdeaboutdata.h>
#include <dcopclient.h>
#include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdefileitem.h>
#include <kstdguiitem.h>
#include <ktrader.h>
diff --git a/kalarm/kalarmd/adcalendar.cpp b/kalarm/kalarmd/adcalendar.cpp
index e499f481..a2cc4836 100644
--- a/kalarm/kalarmd/adcalendar.cpp
+++ b/kalarm/kalarmd/adcalendar.cpp
@@ -23,7 +23,7 @@
#include <tqfile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <kdebug.h>
diff --git a/kalarm/kalarmd/admain.cpp b/kalarm/kalarmd/admain.cpp
index 314b6ad8..a5d9fd16 100644
--- a/kalarm/kalarmd/admain.cpp
+++ b/kalarm/kalarmd/admain.cpp
@@ -24,10 +24,10 @@
#include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include "adapp.h"
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index ddcd38f3..b68f45ba 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -33,14 +33,14 @@
#include <kstandarddirs.h>
#include <dcopclient.h>
#include <dcopref.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdefileitem.h>
#include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <kemailsettings.h>
+#include <tdetempfile.h>
+#include <tdeemailsettings.h>
#include <kdebug.h>
#include <libkpimidentities/identitymanager.h>
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index fa317c39..ff684a77 100644
--- a/kalarm/latecancel.cpp
+++ b/kalarm/latecancel.cpp
@@ -23,7 +23,7 @@
#include <tqwidgetstack.h>
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include "checkbox.h"
diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp
index 4db9f37a..625933c7 100644
--- a/kalarm/lib/colourcombo.cpp
+++ b/kalarm/lib/colourcombo.cpp
@@ -23,7 +23,7 @@
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolordialog.h>
#include "kalarm/preferences.h"
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 09712bed..29475f71 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -18,9 +18,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "dateedit.moc"
diff --git a/kalarm/lib/datetime.cpp b/kalarm/lib/datetime.cpp
index bc6e6439..b31d629a 100644
--- a/kalarm/lib/datetime.cpp
+++ b/kalarm/lib/datetime.cpp
@@ -19,8 +19,8 @@
*/
#include "kalarm.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "datetime.h"
diff --git a/kalarm/lib/messagebox.h b/kalarm/lib/messagebox.h
index b0cae293..5baccca0 100644
--- a/kalarm/lib/messagebox.h
+++ b/kalarm/lib/messagebox.h
@@ -22,7 +22,7 @@
#define MESSAGEBOX_H
#include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
/**
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index c3653e9b..c8ea891c 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "shellprocess.moc"
diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index 67a846d7..51760fc4 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -20,8 +20,8 @@
#include "kalarm.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "combobox.h"
#include "timespinbox.h"
diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index e372615a..7f370630 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -23,7 +23,7 @@
#include <tqwidgetstack.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include "combobox.h"
diff --git a/kalarm/lib/timespinbox.cpp b/kalarm/lib/timespinbox.cpp
index b2121072..0ac932e6 100644
--- a/kalarm/lib/timespinbox.cpp
+++ b/kalarm/lib/timespinbox.cpp
@@ -22,7 +22,7 @@
#include <tqvalidator.h>
#include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "timespinbox.moc"
diff --git a/kalarm/main.cpp b/kalarm/main.cpp
index b4c3f251..4b023588 100644
--- a/kalarm/main.cpp
+++ b/kalarm/main.cpp
@@ -24,7 +24,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kalarmapp.h"
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 3cacb47e..7487a8a2 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -24,7 +24,7 @@
#include <tqdragobject.h>
#include <tqheader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdetoolbar.h>
#include <tdepopupmenu.h>
#include <tdeaccel.h>
@@ -32,10 +32,10 @@
#include <tdeactionclasses.h>
#include <kstdaction.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurldrag.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index b437fffd..34814cbc 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -38,14 +38,14 @@
#include <tdeaction.h>
#include <kstdguiitem.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <kdialog.h>
#include <ktextbrowser.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <twin.h>
#include <twinmodule.h>
#include <kprocess.h>
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index 40b71675..2525139f 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -33,11 +33,11 @@
#include <tqtooltip.h>
#include <tqstyle.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kshell.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kiconloader.h>
diff --git a/kalarm/preferences.cpp b/kalarm/preferences.cpp
index c0d9ff6c..8bf67957 100644
--- a/kalarm/preferences.cpp
+++ b/kalarm/preferences.cpp
@@ -20,12 +20,12 @@
#include "kalarm.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
#include <libkpimidentities/identity.h>
#include <libkpimidentities/identitymanager.h>
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index cfda8fc2..4a39022e 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -34,12 +34,12 @@
#include <tqlineedit.h>
#include <tqwhatsthis.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
#include <kiconloader.h>
#include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <libkcal/event.h>
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index 60c60336..dd4b4151 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -23,8 +23,8 @@
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <kdebug.h>
diff --git a/kalarm/repetition.cpp b/kalarm/repetition.cpp
index 45de81cb..4305cd65 100644
--- a/kalarm/repetition.cpp
+++ b/kalarm/repetition.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "buttongroup.h"
#include "radiobutton.h"
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index d93a3b68..a63c4df8 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -31,7 +31,7 @@
#include <tqwhatsthis.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#ifdef WITHOUT_ARTS
@@ -43,7 +43,7 @@
#include <arts/kplayobjectfactory.h>
#include <arts/kplayobject.h>
#endif
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <kdebug.h>
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index 1ae3a6a8..947e9fb9 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -28,8 +28,8 @@
#include <tqhbox.h>
#include <tqwhatsthis.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/kalarm/specialactions.cpp b/kalarm/specialactions.cpp
index 465fdf51..fd4b7a7d 100644
--- a/kalarm/specialactions.cpp
+++ b/kalarm/specialactions.cpp
@@ -27,7 +27,7 @@
#include <klineedit.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "functions.h"
diff --git a/kalarm/templatedlg.cpp b/kalarm/templatedlg.cpp
index c555ce6a..8ee2ca38 100644
--- a/kalarm/templatedlg.cpp
+++ b/kalarm/templatedlg.cpp
@@ -24,9 +24,9 @@
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaccel.h>
#include <kdebug.h>
diff --git a/kalarm/templatelistview.cpp b/kalarm/templatelistview.cpp
index ac2852a7..64d17489 100644
--- a/kalarm/templatelistview.cpp
+++ b/kalarm/templatelistview.cpp
@@ -20,7 +20,7 @@
#include "kalarm.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "alarmcalendar.h"
diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp
index 3df2d8dd..b3bc4488 100644
--- a/kalarm/templatepickdlg.cpp
+++ b/kalarm/templatepickdlg.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "functions.h"
diff --git a/kalarm/timeselector.cpp b/kalarm/timeselector.cpp
index 9ec5c981..de7ef828 100644
--- a/kalarm/timeselector.cpp
+++ b/kalarm/timeselector.cpp
@@ -25,7 +25,7 @@
#include <tqhbox.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <kdebug.h>
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index 54a04308..7eb6d2a4 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -25,10 +25,10 @@
#include <tqtooltip.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <kstdguiitem.h>
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index 5e9b98ee..d1d3602f 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -24,8 +24,8 @@
#include <tqstringlist.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include "alarmcalendar.h"
diff --git a/kandy/src/atcommand.cpp b/kandy/src/atcommand.cpp
index 2fcf5f24..755e8e66 100644
--- a/kandy/src/atcommand.cpp
+++ b/kandy/src/atcommand.cpp
@@ -25,7 +25,7 @@
#include "atcommand.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
ATParameter::ATParameter()
{
diff --git a/kandy/src/cmdpropertiesdialog.cpp b/kandy/src/cmdpropertiesdialog.cpp
index 3e72754f..9d605fda 100644
--- a/kandy/src/cmdpropertiesdialog.cpp
+++ b/kandy/src/cmdpropertiesdialog.cpp
@@ -27,7 +27,7 @@
#include <tqcheckbox.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "atcommand.h"
diff --git a/kandy/src/commandscheduler.cpp b/kandy/src/commandscheduler.cpp
index 07658214..cc18a666 100644
--- a/kandy/src/commandscheduler.cpp
+++ b/kandy/src/commandscheduler.cpp
@@ -23,7 +23,7 @@
*/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "modem.h"
diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 7877cd9f..13bd4ff6 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -28,10 +28,10 @@
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kkeydialog.h>
#include <tdeaccel.h>
#include <tdeio/netaccess.h>
@@ -40,7 +40,7 @@
#include <kurl.h>
#include <kurlrequesterdlg.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kedittoolbar.h>
#include <tdestdaccel.h>
diff --git a/kandy/src/kandyprefsdialog.cpp b/kandy/src/kandyprefsdialog.cpp
index 9ff0bf66..15a4eb8d 100644
--- a/kandy/src/kandyprefsdialog.cpp
+++ b/kandy/src/kandyprefsdialog.cpp
@@ -39,11 +39,11 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdefontdialog.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcolordialog.h>
#include <kiconloader.h>
#include <kiconeffect.h>
diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp
index fbf5deaa..52e9de0a 100644
--- a/kandy/src/kandyview.cpp
+++ b/kandy/src/kandyview.cpp
@@ -39,10 +39,10 @@
#include <tqpushbutton.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kinputdialog.h>
#include <kdialog.h>
diff --git a/kandy/src/main.cpp b/kandy/src/main.cpp
index d7d8e7ad..a22229d5 100644
--- a/kandy/src/main.cpp
+++ b/kandy/src/main.cpp
@@ -28,9 +28,9 @@
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "modem.h"
#include "kandy.h"
diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp
index 0408e9c6..5b391c38 100644
--- a/kandy/src/mobilegui.cpp
+++ b/kandy/src/mobilegui.cpp
@@ -36,12 +36,12 @@
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kstatusbar.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include "modem.h"
#include "atcommand.h"
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 788fdc9b..33da5f56 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -22,15 +22,15 @@
without including the source code for TQt in the source distribution.
*/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kkeydialog.h>
#include <tdeaccel.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kedittoolbar.h>
#include <kurldrag.h>
diff --git a/kandy/src/modem.cpp b/kandy/src/modem.cpp
index f77a3365..86c36d67 100644
--- a/kandy/src/modem.cpp
+++ b/kandy/src/modem.cpp
@@ -42,7 +42,7 @@
#include <tqglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "modem.h"
diff --git a/karm/csvexportdialog.cpp b/karm/csvexportdialog.cpp
index 2bf6d9e2..0dc1911a 100644
--- a/karm/csvexportdialog.cpp
+++ b/karm/csvexportdialog.cpp
@@ -20,9 +20,9 @@
*/
#include <kdateedit.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kurlrequester.h>
#include <tqbuttongroup.h>
diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp
index bc223486..d0040f84 100644
--- a/karm/edittaskdialog.cpp
+++ b/karm/edittaskdialog.cpp
@@ -33,7 +33,7 @@
#include <tqwidget.h>
#include <tqwhatsthis.h>
-#include <klocale.h> // i18n
+#include <tdelocale.h> // i18n
#include <twinmodule.h>
#include "edittaskdialog.h"
diff --git a/karm/idletimedetector.cpp b/karm/idletimedetector.cpp
index 911d1b2f..74aad7da 100644
--- a/karm/idletimedetector.cpp
+++ b/karm/idletimedetector.cpp
@@ -4,8 +4,8 @@
#include <tqmessagebox.h>
#include <tqtimer.h>
-#include <kglobal.h>
-#include <klocale.h> // i18n
+#include <tdeglobal.h>
+#include <tdelocale.h> // i18n
IdleTimeDetector::IdleTimeDetector(int maxIdle)
// Trigger a warning after maxIdle minutes
diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index 8d968ed7..b46202bf 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -12,8 +12,8 @@
#include <tdeaction.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqtextstream.h>
@@ -369,7 +369,7 @@ void karmPart::fileSaveAs()
// It's usually safe to leave the factory code alone.. with the
// notable exception of the TDEAboutData data
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
TDEInstance* karmPartFactory::s_instance = 0L;
TDEAboutData* karmPartFactory::s_about = 0L;
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index 2f90e8f3..b9e68e65 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -37,11 +37,11 @@
#include "incidence.h"
#include "tdeapplication.h" // kapp
#include <kdebug.h>
-#include <kemailsettings.h>
-#include <klocale.h> // i18n
-#include <kmessagebox.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h> // i18n
+#include <tdemessagebox.h>
#include <kprogress.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <resourcecalendar.h>
#include <resourcelocal.h>
#include <resourceremote.h>
diff --git a/karm/karmutility.cpp b/karm/karmutility.cpp
index 39b1865a..994e3f8c 100644
--- a/karm/karmutility.cpp
+++ b/karm/karmutility.cpp
@@ -3,8 +3,8 @@
#include <stdlib.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "karmutility.h"
TQString formatTime( long minutes, bool decimal )
diff --git a/karm/ktimewidget.cpp b/karm/ktimewidget.cpp
index 112812b2..fb18e8be 100644
--- a/karm/ktimewidget.cpp
+++ b/karm/ktimewidget.cpp
@@ -7,8 +7,8 @@
#include <tqvalidator.h>
#include <tqwidget.h>
-#include <klocale.h> // i18n
-#include <kglobal.h>
+#include <tdelocale.h> // i18n
+#include <tdeglobal.h>
#include "ktimewidget.h"
enum ValidatorType { HOUR, MINUTE };
diff --git a/karm/main.cpp b/karm/main.cpp
index 96f59944..ef4326dc 100644
--- a/karm/main.cpp
+++ b/karm/main.cpp
@@ -1,6 +1,6 @@
#include <signal.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 231cfeda..9e530078 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -12,10 +12,10 @@
#include <tdeapplication.h> // kapp
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kkeydialog.h>
-#include <klocale.h> // i18n
-#include <kmessagebox.h>
+#include <tdelocale.h> // i18n
+#include <tdemessagebox.h>
#include <kstatusbar.h> // statusBar()
#include <kstdaction.h>
#include <tqkeycode.h>
diff --git a/karm/plannerparser.h b/karm/plannerparser.h
index cba67211..ee40a810 100644
--- a/karm/plannerparser.h
+++ b/karm/plannerparser.h
@@ -28,7 +28,7 @@ test cases:
*/
#include <tqxml.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "taskview.h"
#include "task.h"
#include "karmstorage.h"
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index d331188a..1307bfef 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -8,10 +8,10 @@
#include <tdeapplication.h> // kapp
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
#include <kiconloader.h>
#include <klineedit.h> // lineEdit()
-#include <klocale.h> // i18n
+#include <tdelocale.h> // i18n
#include <kstandarddirs.h>
#include <kurlrequester.h>
diff --git a/karm/print.cpp b/karm/print.cpp
index c540663b..08921d32 100644
--- a/karm/print.cpp
+++ b/karm/print.cpp
@@ -4,8 +4,8 @@
#include <tqpaintdevicemetrics.h>
#include <tqpainter.h>
-#include <kglobal.h>
-#include <klocale.h> // i18n
+#include <tdeglobal.h>
+#include <tdelocale.h> // i18n
#include "karmutility.h" // formatTime()
#include "print.h"
diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp
index e4dfe30e..9b4e3b78 100644
--- a/karm/printdialog.cpp
+++ b/karm/printdialog.cpp
@@ -33,7 +33,7 @@
#include <tqwhatsthis.h>
#include <kiconloader.h>
-#include <klocale.h> // i18n
+#include <tdelocale.h> // i18n
#include <twinmodule.h>
#include "printdialog.h"
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index 54459351..796e46d2 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -14,8 +14,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <klocale.h> // i18n
-#include <kmessagebox.h>
+#include <tdelocale.h> // i18n
+#include <tdemessagebox.h>
#include <kurlrequester.h>
#include "csvexportdialog.h"
@@ -402,7 +402,7 @@ void TaskView::startTimerFor(Task* task, TQDateTime startTime )
}
}
}
- else KMessageBox::error(0,i18n("Saving is impossible, so timing is useless. \nSaving problems may result from a full harddisk, a directory name instead of a file name, or stale locks. Check that your harddisk has enough space, that your calendar file exists and is a file and remove stale locks, typically from ~/.trinity/share/apps/kabc/lock."));
+ else KMessageBox::error(0,i18n("Saving is impossible, so timing is useless. \nSaving problems may result from a full harddisk, a directory name instead of a file name, or stale locks. Check that your harddisk has enough space, that your calendar file exists and is a file and remove stale locks, typically from ~/.trinity/share/apps/tdeabc/lock."));
}
void TaskView::clearActiveTasks()
@@ -518,7 +518,7 @@ void TaskView::newTask(TQString caption, Task *parent)
if ( uid.isNull() )
{
KMessageBox::error( 0, i18n(
- "Error storing new task. Your changes were not saved. Make sure you can edit your iCalendar file. Also quit all applications using this file and remove any lock file related to its name from ~/.trinity/share/apps/kabc/lock/ " ) );
+ "Error storing new task. Your changes were not saved. Make sure you can edit your iCalendar file. Also quit all applications using this file and remove any lock file related to its name from ~/.trinity/share/apps/tdeabc/lock/ " ) );
}
delete dialog;
diff --git a/karm/taskviewwhatsthis.cpp b/karm/taskviewwhatsthis.cpp
index 1598a851..d81b4e0d 100644
--- a/karm/taskviewwhatsthis.cpp
+++ b/karm/taskviewwhatsthis.cpp
@@ -12,7 +12,7 @@
#include "taskviewwhatsthis.h"
#include <kdebug.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
TaskViewWhatsThis::TaskViewWhatsThis( TQWidget* qw )
: TQWhatsThis( qw )
diff --git a/karm/timekard.cpp b/karm/timekard.cpp
index 1be72b96..d0932b92 100644
--- a/karm/timekard.cpp
+++ b/karm/timekard.cpp
@@ -27,9 +27,9 @@
#include <tqpainter.h>
#include <tqmap.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
-#include <klocale.h> // i18n
+#include <tdelocale.h> // i18n
#include <event.h>
#include "karmutility.h" // formatTime()
diff --git a/karm/tray.cpp b/karm/tray.cpp
index 06d08af2..5187c7e4 100644
--- a/karm/tray.cpp
+++ b/karm/tray.cpp
@@ -17,10 +17,10 @@
#include <tqtooltip.h>
#include <tdeaction.h> // actionPreferences()
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h> // UserIcon
-#include <klocale.h> // i18n
+#include <tdelocale.h> // i18n
#include <tdepopupmenu.h> // plug()
#include <ksystemtray.h>
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index 0abac719..e747beec 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -53,8 +53,8 @@
#include <tqptrlist.h>
#include <tqpen.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
#include <kdebug.h>
diff --git a/kgantt/kgantt/xQGanttBarViewPort.cpp b/kgantt/kgantt/xQGanttBarViewPort.cpp
index 1a3c8a7d..2c3a348e 100644
--- a/kgantt/kgantt/xQGanttBarViewPort.cpp
+++ b/kgantt/kgantt/xQGanttBarViewPort.cpp
@@ -17,7 +17,7 @@
#include <tdetoolbarbutton.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
diff --git a/kgantt/kgantt/xQGanttListView.cpp b/kgantt/kgantt/xQGanttListView.cpp
index 3f5f44c2..fd5ebae7 100644
--- a/kgantt/kgantt/xQGanttListView.cpp
+++ b/kgantt/kgantt/xQGanttListView.cpp
@@ -8,7 +8,7 @@
#include "xQGanttListView.h"
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
xQGanttListView::xQGanttListView(KGanttItem* toplevelitem, TQWidget* parent,
const char * name, WFlags f)
diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 726ffb14..f7dab2ac 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -27,7 +27,7 @@
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <krun.h>
#include <kstandarddirs.h>
diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp
index 2ecbe02c..f91873bb 100644
--- a/kitchensync/src/addresseediffalgo.cpp
+++ b/kitchensync/src/addresseediffalgo.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
#include "addresseediffalgo.h"
diff --git a/kitchensync/src/addresseediffalgo.h b/kitchensync/src/addresseediffalgo.h
index 575a96e2..30154d1b 100644
--- a/kitchensync/src/addresseediffalgo.h
+++ b/kitchensync/src/addresseediffalgo.h
@@ -22,7 +22,7 @@
#ifndef KSYNC_ADDRESSEEDIFFALGO_H
#define KSYNC_ADDRESSEEDIFFALGO_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <libtdepim/diffalgo.h>
using namespace KPIM;
diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp
index 7d3549e5..8d925322 100644
--- a/kitchensync/src/calendardiffalgo.cpp
+++ b/kitchensync/src/calendardiffalgo.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <libkcal/kcalversion.h>
diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp
index 553b2f5e..6a41032e 100644
--- a/kitchensync/src/configgui.cpp
+++ b/kitchensync/src/configgui.cpp
@@ -42,7 +42,7 @@
#include "memberinfo.h"
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <tqlayout.h>
diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp
index 3e9d47b6..b16c1f83 100644
--- a/kitchensync/src/configguiblank.cpp
+++ b/kitchensync/src/configguiblank.cpp
@@ -21,7 +21,7 @@
#include "configguiblank.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index 4d5c2edc..fb7116cb 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -30,7 +30,7 @@
#include <kurl.h>
#include <tdefile.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp
index 6a8b0402..22767ab8 100644
--- a/kitchensync/src/configguifile.cpp
+++ b/kitchensync/src/configguifile.cpp
@@ -22,7 +22,7 @@
#include "configguifile.h"
#include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tqlayout.h>
diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp
index 8e800676..8fb4fd0e 100644
--- a/kitchensync/src/configguigcalendar.cpp
+++ b/kitchensync/src/configguigcalendar.cpp
@@ -22,7 +22,7 @@
#include "configguigcalendar.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index 38f2fbf3..cd392cb6 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -21,7 +21,7 @@
#include "configguignokii.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <kcombobox.h>
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index 1a5cdb14..4dce7d9b 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -30,7 +30,7 @@
#include <kcombobox.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp
index 721c82d7..331f9daa 100644
--- a/kitchensync/src/configguiirmc.cpp
+++ b/kitchensync/src/configguiirmc.cpp
@@ -21,12 +21,12 @@
#include <kcombobox.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kinputdialog.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index 2b37ad42..c4167bb3 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -28,7 +28,7 @@
#include <klineedit.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 3ef451c3..f54bb8cf 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -30,7 +30,7 @@
#include <kcombobox.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index eea22f02..a5a76b78 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -23,7 +23,7 @@
#define CONFIGGUILDAP_H
#include "configgui.h"
-#include "kabc/ldapconfigwidget.h"
+#include "tdeabc/ldapconfigwidget.h"
class TQCheckBox;
class TQLabel;
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index a310692f..bcb9bd59 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -27,7 +27,7 @@
#include <klineedit.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index 39a7ea77..33bf9e08 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -21,7 +21,7 @@
#include "configguiopie.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcombobox.h>
#include <tqdom.h>
diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp
index 03d87cdb..ee85ba29 100644
--- a/kitchensync/src/configguipalm.cpp
+++ b/kitchensync/src/configguipalm.cpp
@@ -22,7 +22,7 @@
#include <kcombobox.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index 6a3b9aa6..7623e413 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -37,7 +37,7 @@
#include <klineedit.h>
#include <kpushbutton.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefile.h>
ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent )
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index 6e521bee..8a09c385 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -28,7 +28,7 @@
#include <klineedit.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent )
: ConfigGui( member, parent )
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 26a8c224..6f91d2fa 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -24,7 +24,7 @@
#include <kcombobox.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include <tqcheckbox.h>
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 372cf926..4074787a 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -25,7 +25,7 @@
#include <kcombobox.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include <tqlayout.h>
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index ac5277fb..37844be3 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -21,12 +21,12 @@
#include <kcombobox.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kinputdialog.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqapplication.h>
#include <tqeventloop.h>
diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp
index 21b83f45..5255c096 100644
--- a/kitchensync/src/genericdiffalgo.cpp
+++ b/kitchensync/src/genericdiffalgo.cpp
@@ -21,7 +21,7 @@
#include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "genericdiffalgo.h"
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index 3be36964..9f961ddc 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -33,8 +33,8 @@
#include <kdialog.h>
#include <kiconloader.h>
#include <kjanuswidget.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index b418af56..a3f89844 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -22,7 +22,7 @@
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlabel.h>
diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp
index 4d8be65d..522e54b1 100644
--- a/kitchensync/src/groupconfigdialog.cpp
+++ b/kitchensync/src/groupconfigdialog.cpp
@@ -22,7 +22,7 @@
#include "groupconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 09f6e345..d87ac37e 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -20,10 +20,10 @@
#include <tdeapplication.h>
#include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpassivepopup.h>
#include <kurllabel.h>
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
index e6f23afd..d91b7590 100644
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ b/kitchensync/src/htmldiffalgodisplay.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "htmldiffalgodisplay.h"
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index 0990e479..f26f8d68 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -21,7 +21,7 @@
#include <tqvbox.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "kwidgetlist.h"
diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp
index 2b71f907..7a665608 100644
--- a/kitchensync/src/mainwidget.cpp
+++ b/kitchensync/src/mainwidget.cpp
@@ -33,8 +33,8 @@
#include <kdebug.h>
#include <kinputdialog.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstdaction.h>
#include <kxmlguiclient.h>
diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp
index 5df9fe21..a267956d 100644
--- a/kitchensync/src/mainwindow.cpp
+++ b/kitchensync/src/mainwindow.cpp
@@ -19,7 +19,7 @@
*/
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <tdetoolbar.h>
diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
index 37755a50..93e5f1ff 100644
--- a/kitchensync/src/memberconfig.cpp
+++ b/kitchensync/src/memberconfig.cpp
@@ -23,8 +23,8 @@
#include "configgui.h"
#include "memberinfo.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp
index 39bb0098..87a17ec1 100644
--- a/kitchensync/src/memberinfo.cpp
+++ b/kitchensync/src/memberinfo.cpp
@@ -21,9 +21,9 @@
#include "memberinfo.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
MemberInfo::MemberInfo( const QSync::Member &member )
: mMember( member )
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 7d7805c4..608d33a8 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -19,7 +19,7 @@
*/
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kwidgetlist.h>
#include <tqlabel.h>
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index 027b3bcf..c52b28ae 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/genericfactory.h>
#include "mainwidget.h"
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index a88689d3..0b869248 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -27,9 +27,9 @@
#include <libqopensync/environment.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index 8975b6f9..bac94835 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -19,7 +19,7 @@
*/
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 60310b80..4e9c46b6 100644
--- a/kitchensync/src/syncprocess.cpp
+++ b/kitchensync/src/syncprocess.cpp
@@ -22,7 +22,7 @@
#include <libqopensync/environment.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "syncprocess.h"
#include "syncprocessmanager.h"
diff --git a/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp
index 95c49748..0485e156 100644
--- a/kitchensync/src/syncprocessmanager.cpp
+++ b/kitchensync/src/syncprocessmanager.cpp
@@ -26,8 +26,8 @@
#include <libqopensync/environment.h>
#include <kstaticdeleter.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
static KStaticDeleter<SyncProcessManager> selfDeleter;
diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp
index 3cac88d4..206cbfee 100644
--- a/kmail/accountdialog.cpp
+++ b/kmail/accountdialog.cpp
@@ -37,13 +37,13 @@
#include <tqgrid.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kseparator.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprotocolinfo.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
index b65de83a..6b9f38fe 100644
--- a/kmail/accountmanager.cpp
+++ b/kmail/accountmanager.cpp
@@ -19,8 +19,8 @@
#include "globalsettings.h"
#include <dcopclient.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
diff --git a/kmail/accountwizard.cpp b/kmail/accountwizard.cpp
index 664b95e3..92e6a232 100644
--- a/kmail/accountwizard.cpp
+++ b/kmail/accountwizard.cpp
@@ -30,7 +30,7 @@
#include <tdefiledialog.h>
#include <klineedit.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcheckbox.h>
#include <tqdir.h>
diff --git a/kmail/antispamwizard.cpp b/kmail/antispamwizard.cpp
index 8b450f44..5552b058 100644
--- a/kmail/antispamwizard.cpp
+++ b/kmail/antispamwizard.cpp
@@ -44,8 +44,8 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <tqdom.h>
diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp
index 49c9b1c3..435752c6 100644
--- a/kmail/archivefolderdialog.cpp
+++ b/kmail/archivefolderdialog.cpp
@@ -25,10 +25,10 @@
#include "folderrequester.h"
#include "util.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <tqlabel.h>
diff --git a/kmail/backupjob.cpp b/kmail/backupjob.cpp
index 132a8dba..bf78e68c 100644
--- a/kmail/backupjob.cpp
+++ b/kmail/backupjob.cpp
@@ -28,7 +28,7 @@
#include "kzip.h"
#include "ktar.h"
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
#include "tqfile.h"
#include "tqfileinfo.h"
diff --git a/kmail/cachedimapjob.cpp b/kmail/cachedimapjob.cpp
index 7b1fd517..da362346 100644
--- a/kmail/cachedimapjob.cpp
+++ b/kmail/cachedimapjob.cpp
@@ -50,7 +50,7 @@
#include <tdeio/scheduler.h>
#include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kmail/callback.cpp b/kmail/callback.cpp
index 9b6da633..b6e0e938 100644
--- a/kmail/callback.cpp
+++ b/kmail/callback.cpp
@@ -46,7 +46,7 @@
#include <mimelib/enum.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
using namespace KMail;
diff --git a/kmail/chiasmuskeyselector.cpp b/kmail/chiasmuskeyselector.cpp
index ca5fe114..9e25743e 100644
--- a/kmail/chiasmuskeyselector.cpp
+++ b/kmail/chiasmuskeyselector.cpp
@@ -2,7 +2,7 @@
#include <klineedit.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kmail/compactionjob.cpp b/kmail/compactionjob.cpp
index fd89f458..a2ace485 100644
--- a/kmail/compactionjob.cpp
+++ b/kmail/compactionjob.cpp
@@ -33,7 +33,7 @@ using KPIM::BroadcastStatus;
#include "kmfoldermaildir.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqfileinfo.h>
diff --git a/kmail/composer.h b/kmail/composer.h
index 3d86ec57..30cf0b28 100644
--- a/kmail/composer.h
+++ b/kmail/composer.h
@@ -8,7 +8,7 @@
#include "secondarywindow.h"
#include <kurl.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqstring.h>
#include <tqcstring.h>
diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp
index 434ddac1..e740e749 100644
--- a/kmail/configuredialog.cpp
+++ b/kmail/configuredialog.cpp
@@ -82,14 +82,14 @@ using KMime::DateFormatter;
#include <ui/keyselectiondialog.h>
// other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kcharsets.h>
#include <kasciistringtools.h>
#include <kdebug.h>
#include <knuminput.h>
#include <tdefontdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurlrequester.h>
#include <kseparator.h>
#include <kiconloader.h>
diff --git a/kmail/configuredialog_p.cpp b/kmail/configuredialog_p.cpp
index 37819739..83c13a31 100644
--- a/kmail/configuredialog_p.cpp
+++ b/kmail/configuredialog_p.cpp
@@ -22,7 +22,7 @@
// other KDE headers:
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// TQt headers:
diff --git a/kmail/configuredialog_p.h b/kmail/configuredialog_p.h
index 439393d3..6ba969de 100644
--- a/kmail/configuredialog_p.h
+++ b/kmail/configuredialog_p.h
@@ -17,7 +17,7 @@
#include <kdialogbase.h>
#include <tdelistview.h>
#include <tdecmodule.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepimmacros.h>
class TQPushButton;
diff --git a/kmail/copyfolderjob.cpp b/kmail/copyfolderjob.cpp
index 21f475d6..165d9468 100644
--- a/kmail/copyfolderjob.cpp
+++ b/kmail/copyfolderjob.cpp
@@ -39,7 +39,7 @@
#include "undostack.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <config.h>
using namespace KMail;
diff --git a/kmail/customtemplates.cpp b/kmail/customtemplates.cpp
index bbbd0aec..129ff756 100644
--- a/kmail/customtemplates.cpp
+++ b/kmail/customtemplates.cpp
@@ -31,15 +31,15 @@
#include <tqfont.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kpushbutton.h>
#include <tdelistview.h>
#include <klineedit.h>
#include <tqcombobox.h>
#include <tdeshortcut.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kkeybutton.h>
#include <kactivelabel.h>
diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp
index 516634ba..010fdd9b 100644
--- a/kmail/distributionlistdialog.cpp
+++ b/kmail/distributionlistdialog.cpp
@@ -24,9 +24,9 @@
#include "distributionlistdialog.h"
#include <libemailfunctions/email.h>
-#include <kabc/resource.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/distributionlist.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/distributionlist.h>
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h>
@@ -34,9 +34,9 @@
#include <libtdepim/kaddrbook.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kinputdialog.h>
#include <tqlayout.h>
diff --git a/kmail/editorwatcher.cpp b/kmail/editorwatcher.cpp
index da78a64d..a7f25c3b 100644
--- a/kmail/editorwatcher.cpp
+++ b/kmail/editorwatcher.cpp
@@ -21,8 +21,8 @@
#include <config.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kopenwith.h>
#include <kprocess.h>
#include <kuserprofile.h>
diff --git a/kmail/encodingdetector.cpp b/kmail/encodingdetector.cpp
index 01a60d88..fe378d73 100644
--- a/kmail/encodingdetector.cpp
+++ b/kmail/encodingdetector.cpp
@@ -40,10 +40,10 @@
#include <tqregexp.h>
#include <tqtextcodec.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ctype.h>
diff --git a/kmail/expirejob.cpp b/kmail/expirejob.cpp
index 2fcc323e..a3749947 100644
--- a/kmail/expirejob.cpp
+++ b/kmail/expirejob.cpp
@@ -35,7 +35,7 @@ using KPIM::BroadcastStatus;
#include "kmcommands.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KMail;
diff --git a/kmail/expirypropertiesdialog.cpp b/kmail/expirypropertiesdialog.cpp
index b6b0f6d7..f1c3274f 100644
--- a/kmail/expirypropertiesdialog.cpp
+++ b/kmail/expirypropertiesdialog.cpp
@@ -17,8 +17,8 @@
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
using namespace KMail;
diff --git a/kmail/favoritefolderview.cpp b/kmail/favoritefolderview.cpp
index 9764e240..45c056ee 100644
--- a/kmail/favoritefolderview.cpp
+++ b/kmail/favoritefolderview.cpp
@@ -35,10 +35,10 @@
#include <dcopclient.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdeio/global.h>
diff --git a/kmail/filterlogdlg.cpp b/kmail/filterlogdlg.cpp
index 25fb7d5c..eaaefd79 100644
--- a/kmail/filterlogdlg.cpp
+++ b/kmail/filterlogdlg.cpp
@@ -33,8 +33,8 @@
#include <kdebug.h>
#include <tdeversion.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp
index 27d2f0c7..2f86cdad 100644
--- a/kmail/folderdiaacltab.cpp
+++ b/kmail/folderdiaacltab.cpp
@@ -40,17 +40,17 @@
#include "kmfolder.h"
#include <addressesdialog.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addresseelist.h>
#ifdef TDEPIM_NEW_DISTRLISTS
#include <libtdepim/distributionlist.h> // libtdepim
#else
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
#endif
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <kaddrbook.h>
#include <kpushbutton.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
@@ -61,7 +61,7 @@
#include <tqwhatsthis.h>
#include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
using namespace KMail;
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index 103d961e..d11fb6a9 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -40,7 +40,7 @@
#include <math.h>
#include "kmkernel.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "tdeconfig.h"
#include "kdebug.h"
#include "kdialog.h"
diff --git a/kmail/foldershortcutdialog.cpp b/kmail/foldershortcutdialog.cpp
index 169af7aa..1c4e79cf 100644
--- a/kmail/foldershortcutdialog.cpp
+++ b/kmail/foldershortcutdialog.cpp
@@ -42,8 +42,8 @@
#include <tqwhatsthis.h>
#include <kkeybutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kmmainwidget.h"
#include "foldershortcutdialog.h"
diff --git a/kmail/folderstorage.cpp b/kmail/folderstorage.cpp
index 7be5c26a..f6d1a358 100644
--- a/kmail/folderstorage.cpp
+++ b/kmail/folderstorage.cpp
@@ -48,7 +48,7 @@ using KMail::ListJob;
#include "kmsearchpattern.h"
#include "globalsettings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kmail/folderutil.cpp b/kmail/folderutil.cpp
index 0c2554dc..76c12744 100644
--- a/kmail/folderutil.cpp
+++ b/kmail/folderutil.cpp
@@ -23,7 +23,7 @@
#include "kmfoldercachedimap.h"
#include "kmfoldermgr.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
using namespace KMail;
using namespace FolderUtil;
diff --git a/kmail/headeritem.cpp b/kmail/headeritem.cpp
index 806fba35..e3d2d05c 100644
--- a/kmail/headeritem.cpp
+++ b/kmail/headeritem.cpp
@@ -26,7 +26,7 @@
** your version.
**
*******************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqapplication.h>
#include <tqregexp.h>
#include <tqbitmap.h>
diff --git a/kmail/headerlistquicksearch.cpp b/kmail/headerlistquicksearch.cpp
index dba0135b..93795a52 100644
--- a/kmail/headerlistquicksearch.cpp
+++ b/kmail/headerlistquicksearch.cpp
@@ -38,7 +38,7 @@
#include <tdeaction.h>
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdetoolbarbutton.h>
#include "kmheaders.h"
diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index a762a7db..5f04982d 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -51,11 +51,11 @@ using namespace KPIM;
#include <mimelib/headers.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeimproxy.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addresseelist.h>
#include <kmdcodec.h>
#include <tqdatetime.h>
#include <tqbuffer.h>
diff --git a/kmail/htmlstatusbar.cpp b/kmail/htmlstatusbar.cpp
index 9a26dfcd..fecda8de 100644
--- a/kmail/htmlstatusbar.cpp
+++ b/kmail/htmlstatusbar.cpp
@@ -42,7 +42,7 @@
#include <tdeapplication.h>
#endif
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tqcolor.h>
diff --git a/kmail/identitydialog.cpp b/kmail/identitydialog.cpp
index 0e4e3c14..90b4ffdd 100644
--- a/kmail/identitydialog.cpp
+++ b/kmail/identitydialog.cpp
@@ -61,8 +61,8 @@ using KMail::FolderRequester;
#include <libemailfunctions/email.h>
// other KDE headers:
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdefileitem.h>
#include <kurl.h>
diff --git a/kmail/identitylistview.cpp b/kmail/identitylistview.cpp
index c5c9c059..c13b9d1f 100644
--- a/kmail/identitylistview.cpp
+++ b/kmail/identitylistview.cpp
@@ -39,7 +39,7 @@
#include <libkpimidentities/identitymanager.h>
#include "kmkernel.h"
-#include <klocale.h> // i18n
+#include <tdelocale.h> // i18n
#include <kiconloader.h> // SmallIcon
#include <cassert>
diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index 28a73cc9..e1568b11 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -53,8 +53,8 @@ using KPIM::ProgressManager;
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
using TDEIO::MetaData;
#include <tdeio/passdlg.h>
using TDEIO::PasswordDialog;
diff --git a/kmail/imapjob.cpp b/kmail/imapjob.cpp
index 52a11083..c50663ed 100644
--- a/kmail/imapjob.cpp
+++ b/kmail/imapjob.cpp
@@ -44,7 +44,7 @@ using KPIM::ProgressManager;
#include <tqstylesheet.h>
#include <tdeio/scheduler.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <mimelib/body.h>
#include <mimelib/bodypart.h>
#include <mimelib/string.h>
diff --git a/kmail/importarchivedialog.cpp b/kmail/importarchivedialog.cpp
index 0da3448c..08a6e4a4 100644
--- a/kmail/importarchivedialog.cpp
+++ b/kmail/importarchivedialog.cpp
@@ -24,8 +24,8 @@
#include "importjob.h"
#include <kurlrequester.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kmail/importjob.cpp b/kmail/importjob.cpp
index 3a7de198..58f9d974 100644
--- a/kmail/importjob.cpp
+++ b/kmail/importjob.cpp
@@ -29,8 +29,8 @@
#include <kdebug.h>
#include <kzip.h>
#include <ktar.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <tqwidget.h>
diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp
index a9f8dc6d..55459dd2 100644
--- a/kmail/keyresolver.cpp
+++ b/kmail/keyresolver.cpp
@@ -53,11 +53,11 @@
#include <gpgmepp/key.h>
#include <gpgmepp/keylistresult.h>
-#include <kabc/stdaddressbook.h>
-#include <klocale.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqstringlist.h>
#include <tqtl.h>
diff --git a/kmail/kmaccount.cpp b/kmail/kmaccount.cpp
index ad500791..825e0cef 100644
--- a/kmail/kmaccount.cpp
+++ b/kmail/kmaccount.cpp
@@ -25,8 +25,8 @@ using KPIM::ProgressManager;
using KMail::FolderJob;
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kmail/kmacctimap.cpp b/kmail/kmacctimap.cpp
index 70a5f0ca..d6b55332 100644
--- a/kmail/kmacctimap.cpp
+++ b/kmail/kmacctimap.cpp
@@ -47,7 +47,7 @@ using KPIM::ProgressItem;
using KPIM::ProgressManager;
#include <tdeio/scheduler.h>
#include <tdeio/slave.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqstylesheet.h>
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index 93ba3a16..e42407e6 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -15,8 +15,8 @@ using KPIM::ProgressManager;
#include "kmfoldermgr.h"
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index f3e69d2b..52b398e8 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -14,8 +14,8 @@ using KPIM::BroadcastStatus;
using KPIM::ProgressManager;
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kmail/kmacctseldlg.cpp b/kmail/kmacctseldlg.cpp
index 44df37c6..35f1fc42 100644
--- a/kmail/kmacctseldlg.cpp
+++ b/kmail/kmacctseldlg.cpp
@@ -28,7 +28,7 @@
#include <tqlayout.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kmacctseldlg.moc"
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index 84715a6f..0772ccfb 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -25,10 +25,10 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/distributionlist.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/distributionlist.h>
#include <dcopref.h>
#include <tqregexp.h>
diff --git a/kmail/kmaddrbook.h b/kmail/kmaddrbook.h
index 1a7c9222..26cd9c0b 100644
--- a/kmail/kmaddrbook.h
+++ b/kmail/kmaddrbook.h
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <tdeversion.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
class TQWidget;
diff --git a/kmail/kmail_options.h b/kmail/kmail_options.h
index a8830c41..c0489b7f 100644
--- a/kmail/kmail_options.h
+++ b/kmail/kmail_options.h
@@ -3,7 +3,7 @@
#define KMAIL_OPTIONS_H
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
TDECmdLineOptions kmail_options[] =
{
diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index b747be68..8f10be35 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -69,10 +69,10 @@ using KMail::AccountManager;
#include <kiconloader.h>
#include <kinputdialog.h>
#include <dcopclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <kurl.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
using namespace KMail;
diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 9faa35e5..c2cd8353 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -62,17 +62,17 @@
#include <kdcopservicestarter.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addresseelist.h>
#include <kdirselectdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeparts/browserextension.h>
#include <kprogress.h>
#include <krun.h>
#include <kbookmarkmanager.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeimproxy.h>
#include <kuserprofile.h>
// KIO headers
diff --git a/kmail/kmcommands.h b/kmail/kmcommands.h
index 5e8bf9c3..25c0a117 100644
--- a/kmail/kmcommands.h
+++ b/kmail/kmcommands.h
@@ -15,7 +15,7 @@
#include <mimelib/string.h>
#include <tdepimmacros.h>
#include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
class TQPopupMenu;
class TDEMainWindow;
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 6031254a..d7e96b26 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -88,11 +88,11 @@ using TDERecentAddress::RecentAddresses;
#include <tdefiledialog.h>
#include <twin.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurldrag.h>
#include <tdeio/scheduler.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kstatusbar.h>
#include <tdeaction.h>
diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h
index ec576bda..7e43749f 100644
--- a/kmail/kmcomposewin.h
+++ b/kmail/kmcomposewin.h
@@ -29,7 +29,7 @@
#include <tqsplitter.h>
#include <tdeio/job.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeversion.h>
#include <keditcl.h>
#include <ktempdir.h>
diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp
index 15889f12..afe854de 100644
--- a/kmail/kmedit.cpp
+++ b/kmail/kmedit.cpp
@@ -26,11 +26,11 @@ using KPIM::MailListDrag;
#include <tdepopupmenu.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurldrag.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdirwatch.h>
#include <kiconloader.h>
diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp
index 493fa6c5..80cd3fd9 100644
--- a/kmail/kmfawidgets.cpp
+++ b/kmail/kmfawidgets.cpp
@@ -8,9 +8,9 @@
#include "kmfawidgets.h"
-#include <kabc/addresseedialog.h> // for the button in KMFilterActionWithAddress
+#include <tdeabc/addresseedialog.h> // for the button in KMFilterActionWithAddress
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kaudioplayer.h>
#include <kurlrequester.h>
#include <tdefiledialog.h>
diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index 1a98963e..d681c6a6 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -31,8 +31,8 @@ using KMail::AccountManager;
#include "filterlog.h"
using KMail::FilterLog;
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp
index 1fce0df5..d97e5fa7 100644
--- a/kmail/kmfilteraction.cpp
+++ b/kmail/kmfilteraction.cpp
@@ -36,9 +36,9 @@ using KMail::ActionScheduler;
#include "regexplineedit.h"
using KMail::RegExpLineEdit;
#include <kregexp3.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <kaudioplayer.h>
#include <kurlrequester.h>
diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp
index 2185ccf8..f81a7071 100644
--- a/kmail/kmfilterdlg.cpp
+++ b/kmail/kmfilterdlg.cpp
@@ -19,9 +19,9 @@ using KMail::FilterImporterExporter;
#include "globalsettings.h"
// other KDE headers:
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/kmail/kmfiltermgr.cpp b/kmail/kmfiltermgr.cpp
index ac2915e7..e91a44a6 100644
--- a/kmail/kmfiltermgr.cpp
+++ b/kmail/kmfiltermgr.cpp
@@ -22,7 +22,7 @@ using KMail::MessageProperty;
// other KDE headers
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
// other TQt headers
diff --git a/kmail/kmfolder.cpp b/kmail/kmfolder.cpp
index 6083ea9e..45738939 100644
--- a/kmail/kmfolder.cpp
+++ b/kmail/kmfolder.cpp
@@ -38,9 +38,9 @@
#include <errno.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeshortcut.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqfileinfo.h>
diff --git a/kmail/kmfoldercachedimap.cpp b/kmail/kmfoldercachedimap.cpp
index 25abffe8..dcfcbe7f 100644
--- a/kmail/kmfoldercachedimap.cpp
+++ b/kmail/kmfoldercachedimap.cpp
@@ -63,8 +63,8 @@ using KMail::ListJob;
#include "kmmainwidget.h"
#include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdeio/global.h>
diff --git a/kmail/kmfolderdia.cpp b/kmail/kmfolderdia.cpp
index 4bbfa8e6..265b1ee9 100644
--- a/kmail/kmfolderdia.cpp
+++ b/kmail/kmfolderdia.cpp
@@ -51,9 +51,9 @@
#include <keditlistbox.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kicondialog.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/kmail/kmfolderdir.cpp b/kmail/kmfolderdir.cpp
index 980d0b14..6d673c4b 100644
--- a/kmail/kmfolderdir.cpp
+++ b/kmail/kmfolderdir.cpp
@@ -10,8 +10,8 @@
#include <assert.h>
#include <errno.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/kmail/kmfolderindex.cpp b/kmail/kmfolderindex.cpp
index 39839e32..7bb77f0d 100644
--- a/kmail/kmfolderindex.cpp
+++ b/kmail/kmfolderindex.cpp
@@ -53,8 +53,8 @@
#endif
#include <tdeapplication.h>
#include <kcursor.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include "kmmsgdict.h"
// We define functions as kmail_swap_NN so that we don't get compile errors
diff --git a/kmail/kmfoldermaildir.cpp b/kmail/kmfoldermaildir.cpp
index 669bd6e1..5242060a 100644
--- a/kmail/kmfoldermaildir.cpp
+++ b/kmail/kmfoldermaildir.cpp
@@ -24,9 +24,9 @@ using KMail::MaildirJob;
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdirsize.h>
#include <dirent.h>
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 1579db0c..6692f54c 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -33,8 +33,8 @@
#include "util.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kprocess.h>
#include <tdeconfig.h>
diff --git a/kmail/kmfoldermgr.cpp b/kmail/kmfoldermgr.cpp
index 2513258c..d270e710 100644
--- a/kmail/kmfoldermgr.cpp
+++ b/kmail/kmfoldermgr.cpp
@@ -18,8 +18,8 @@
#include <tqdir.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/kmail/kmfoldersearch.cpp b/kmail/kmfoldersearch.cpp
index 038ddbe1..e2a72cb2 100644
--- a/kmail/kmfoldersearch.cpp
+++ b/kmail/kmfoldersearch.cpp
@@ -29,7 +29,7 @@
#include "jobscheduler.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <assert.h>
diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp
index 0b13f07b..bf684661 100644
--- a/kmail/kmfoldertree.cpp
+++ b/kmail/kmfoldertree.cpp
@@ -31,9 +31,9 @@ using KMail::FolderViewToolTip;
using namespace KPIM;
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdepopupmenu.h>
#include <kdebug.h>
diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index 1c6b6b6a..11e7584f 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -20,7 +20,7 @@
#include "foldertreebase.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepimmacros.h>
#include <tqguardedptr.h>
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index a768513f..77af8e44 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -33,13 +33,13 @@ using namespace KPIM;
#include <tdeapplication.h>
#include <tdeaccelmanager.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <kimageio.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqbuffer.h>
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
index e748c550..056eaa4a 100644
--- a/kmail/kmkernel.cpp
+++ b/kmail/kmkernel.cpp
@@ -57,7 +57,7 @@ using KMail::FolderIface;
#include "templateparser.h"
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kstaticdeleter.h>
#include <kstandarddirs.h>
@@ -90,7 +90,7 @@ using KWallet::Wallet;
#include <X11/Xlib.h>
#include <fixx11h.h>
#include <tdecmdlineargs.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
KMKernel *KMKernel::mySelf = 0;
static bool s_askingToGoOnline = false;
diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp
index cc6de465..7d26495a 100644
--- a/kmail/kmlineeditspell.cpp
+++ b/kmail/kmlineeditspell.cpp
@@ -13,15 +13,15 @@
#include <libtdepim/kvcarddrag.h>
#include <libemailfunctions/email.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
#include <tdeio/netaccess.h>
#include <tdepopupmenu.h>
#include <kurl.h>
#include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdecompletionbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqevent.h>
#include <tqfile.h>
diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 6675149c..97f7922f 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -24,10 +24,10 @@
#include <tqstylesheet.h>
#include <kopenwith.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <tdeaccelmanager.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdestdaccel.h>
#include <kkeydialog.h>
#include <kcharsets.h>
diff --git a/kmail/kmmainwin.cpp b/kmail/kmmainwin.cpp
index 1a3a6cb9..67965db5 100644
--- a/kmail/kmmainwin.cpp
+++ b/kmail/kmmainwin.cpp
@@ -15,10 +15,10 @@
#include "kmtransport.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kedittoolbar.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstringhandler.h>
#include <kdebug.h>
#include <ktip.h>
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 201416b2..ba8fba5a 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -35,7 +35,7 @@ using KMail::HeaderStrategy;
#include <kaddrbook.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdehtml_part.h>
@@ -60,13 +60,13 @@ using namespace KMime::Types;
#include <assert.h>
#include <sys/time.h>
#include <time.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdlib.h>
#include <unistd.h>
#include "util.h"
#if ALLOW_GUI
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#endif
using namespace KMime;
diff --git a/kmail/kmmimeparttree.cpp b/kmail/kmmimeparttree.cpp
index 29d4b8f7..05307c96 100644
--- a/kmail/kmmimeparttree.cpp
+++ b/kmail/kmmimeparttree.cpp
@@ -41,9 +41,9 @@
#include "kmcommands.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <tqclipboard.h>
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index eaac2ebf..abf1ade7 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -13,7 +13,7 @@
using KMail::MessageProperty;
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <kasciistringtools.h>
#include <kmdcodec.h>
diff --git a/kmail/kmpopfiltercnfrmdlg.cpp b/kmail/kmpopfiltercnfrmdlg.cpp
index e07c7708..3689e663 100644
--- a/kmail/kmpopfiltercnfrmdlg.cpp
+++ b/kmail/kmpopfiltercnfrmdlg.cpp
@@ -19,7 +19,7 @@
#include <tqvgroupbox.h>
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/global.h>
#include <assert.h>
diff --git a/kmail/kmreadermainwin.cpp b/kmail/kmreadermainwin.cpp
index fdf965ae..3c342172 100644
--- a/kmail/kmreadermainwin.cpp
+++ b/kmail/kmreadermainwin.cpp
@@ -29,14 +29,14 @@
#include <tqaccel.h>
#include <tdeapplication.h>
#include <kedittoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdestdaccel.h>
#include <twin.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kdebug.h>
#include "kmcommands.h"
-#include "kmenubar.h"
+#include "tdemenubar.h"
#include "tdepopupmenu.h"
#include "kmreaderwin.h"
#include "kmfolder.h"
diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 9d8db6c9..fc93be5e 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -77,8 +77,8 @@ using KMail::TeeHtmlWriter;
#include <kleo/cryptobackendfactory.h>
// KABC includes
-#include <kabc/addressee.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
// tdehtml headers
#include <tdehtml_part.h>
@@ -98,11 +98,11 @@ using KMail::TeeHtmlWriter;
#include <kcursor.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
#include <krun.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kprocess.h>
#include <kdialog.h>
#include <tdeaction.h>
diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp
index 1ab6381e..90bc22a7 100644
--- a/kmail/kmsearchpattern.cpp
+++ b/kmail/kmsearchpattern.cpp
@@ -16,12 +16,12 @@ using KMail::FilterLog;
#include <libemailfunctions/email.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <tqregexp.h>
diff --git a/kmail/kmsearchpattern.h b/kmail/kmsearchpattern.h
index d532602e..9b521c1f 100644
--- a/kmail/kmsearchpattern.h
+++ b/kmail/kmsearchpattern.h
@@ -6,7 +6,7 @@
#ifndef _kmsearchpattern_h_
#define _kmsearchpattern_h_
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqptrlist.h>
#include <tqstring.h>
#include <tqcstring.h>
diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp
index ceafc27e..88f3609b 100644
--- a/kmail/kmsearchpatternedit.cpp
+++ b/kmail/kmsearchpatternedit.cpp
@@ -10,7 +10,7 @@
#include "rulewidgethandlermanager.h"
using KMail::RuleWidgetHandlerManager;
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <kdebug.h>
diff --git a/kmail/kmsender.cpp b/kmail/kmsender.cpp
index 64c56cb1..9a8ae5be 100644
--- a/kmail/kmsender.cpp
+++ b/kmail/kmsender.cpp
@@ -13,9 +13,9 @@ using namespace KMime::Types;
#include <tdeio/passdlg.h>
#include <tdeio/scheduler.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kmail/kmservertest.cpp b/kmail/kmservertest.cpp
index 6b4848f0..446c739e 100644
--- a/kmail/kmservertest.cpp
+++ b/kmail/kmservertest.cpp
@@ -34,8 +34,8 @@
#include "kmservertest.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kurl.h>
#include <tdeapplication.h>
diff --git a/kmail/kmstartup.cpp b/kmail/kmstartup.cpp
index 9cf1b905..c1eb6ccb 100644
--- a/kmail/kmstartup.cpp
+++ b/kmail/kmstartup.cpp
@@ -23,13 +23,13 @@
#include "kmkernel.h" //control center
#include "kcursorsaver.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <dcopclient.h>
#include <kcrash.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <kiconloader.h>
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index f4e1d432..7cb2fb43 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -30,7 +30,7 @@ using KMail::AccountManager;
#include <tdeapplication.h>
#include <tdemainwindow.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kiconeffect.h>
#include <twin.h>
diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp
index 2432031b..e14bd772 100644
--- a/kmail/kmtransport.cpp
+++ b/kmail/kmtransport.cpp
@@ -34,8 +34,8 @@
#include <tqwhatsthis.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include <kdebug.h>
#include <tdewallet.h>
diff --git a/kmail/listjob.cpp b/kmail/listjob.cpp
index d8ee1e10..75e4dee5 100644
--- a/kmail/listjob.cpp
+++ b/kmail/listjob.cpp
@@ -27,7 +27,7 @@
*/
#include "listjob.h"
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
#include "kmfolderimap.h"
#include "kmfoldercachedimap.h"
#include "kmacctimap.h"
@@ -42,7 +42,7 @@ using KPIM::ProgressManager;
#include <tdeio/scheduler.h>
#include <tdeio/job.h>
#include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstylesheet.h>
diff --git a/kmail/localsubscriptiondialog.cpp b/kmail/localsubscriptiondialog.cpp
index 3b6f55dc..c2d4e555 100644
--- a/kmail/localsubscriptiondialog.cpp
+++ b/kmail/localsubscriptiondialog.cpp
@@ -34,8 +34,8 @@
#endif
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "localsubscriptiondialog.h"
#include "kmkernel.h"
diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp
index 1bb2b144..0bfb2cc1 100644
--- a/kmail/mailinglistpropertiesdialog.cpp
+++ b/kmail/mailinglistpropertiesdialog.cpp
@@ -32,11 +32,11 @@
#include <tqcheckbox.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <keditlistbox.h>
#include <kdialogbase.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmcommands.h>
#include "kmfolder.h"
diff --git a/kmail/main.cpp b/kmail/main.cpp
index 628ae97a..bb3e0a8a 100644
--- a/kmail/main.cpp
+++ b/kmail/main.cpp
@@ -20,7 +20,7 @@
#include <config.h>
#include <kuniqueapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <knotifyclient.h>
#include <dcopclient.h>
#include "kmkernel.h" //control center
diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 269c5870..560fac90 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -7,13 +7,13 @@
#include "sievejob.h"
#include "kmkernel.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <twin.h>
#include <tdeapplication.h>
#include <kinputdialog.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <tqlistview.h>
diff --git a/kmail/messageactions.cpp b/kmail/messageactions.cpp
index 0b8c3cad..0d8c4369 100644
--- a/kmail/messageactions.cpp
+++ b/kmail/messageactions.cpp
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <tdeactioncollection.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqwidget.h>
diff --git a/kmail/messagecomposer.cpp b/kmail/messagecomposer.cpp
index 574c0838..2a82da9e 100644
--- a/kmail/messagecomposer.cpp
+++ b/kmail/messagecomposer.cpp
@@ -69,8 +69,8 @@
#include <mimelib/mimepp.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <kdebug.h>
#include <tdeaction.h>
diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 93693dd7..5e4f5b5e 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -34,8 +34,8 @@
#include <tdeconfig.h>
#include <tdeio/global.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdewallet.h>
using TDEIO::MetaData;
diff --git a/kmail/newfolderdialog.cpp b/kmail/newfolderdialog.cpp
index 21d39cd6..0643cbbc 100644
--- a/kmail/newfolderdialog.cpp
+++ b/kmail/newfolderdialog.cpp
@@ -36,9 +36,9 @@
#include <tqwhatsthis.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "folderutil.h"
#include "newfolderdialog.h"
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index 295b7601..2b736d2c 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -86,14 +86,14 @@
// other KDE headers
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdehtml_part.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <kmdcodec.h>
diff --git a/kmail/partNode.cpp b/kmail/partNode.cpp
index 576a1c17..9405544b 100644
--- a/kmail/partNode.cpp
+++ b/kmail/partNode.cpp
@@ -34,7 +34,7 @@
#include "partNode.h"
#include "kmreaderwin.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kmmimeparttree.h"
#include <mimelib/utility.h>
diff --git a/kmail/popaccount.cpp b/kmail/popaccount.cpp
index ceea3a52..b455cc54 100644
--- a/kmail/popaccount.cpp
+++ b/kmail/popaccount.cpp
@@ -39,8 +39,8 @@ using KPIM::BroadcastStatus;
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdemainwindow.h>
#include <tdeio/scheduler.h>
#include <tdeio/passdlg.h>
diff --git a/kmail/quotajobs.h b/kmail/quotajobs.h
index 1749fe0e..4eb7ea0e 100644
--- a/kmail/quotajobs.h
+++ b/kmail/quotajobs.h
@@ -35,7 +35,7 @@
#include <tqvariant.h>
#include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvaluevector.h>
#include <math.h>
diff --git a/kmail/recipientseditor.cpp b/kmail/recipientseditor.cpp
index c16fdf01..7497a460 100644
--- a/kmail/recipientseditor.cpp
+++ b/kmail/recipientseditor.cpp
@@ -35,9 +35,9 @@
#include <tdecompletionbox.h>
#include <kdebug.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kmail/recipientseditortest.cpp b/kmail/recipientseditortest.cpp
index d5c5b3a1..50ea58a2 100644
--- a/kmail/recipientseditortest.cpp
+++ b/kmail/recipientseditortest.cpp
@@ -28,9 +28,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "aboutdata.h"
#include <tqpushbutton.h>
diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp
index 2e851272..0b43795e 100644
--- a/kmail/recipientspicker.cpp
+++ b/kmail/recipientspicker.cpp
@@ -29,16 +29,16 @@
#include <libemailfunctions/email.h>
#ifndef TDEPIM_NEW_DISTRLISTS
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
#endif
#include <tdelistview.h>
-#include <klocale.h>
-#include <kabc/resource.h>
+#include <tdelocale.h>
+#include <tdeabc/resource.h>
#include <kiconloader.h>
#include <kdialog.h>
#include <twin.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <tqcombobox.h>
diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h
index 96401e17..38d36a98 100644
--- a/kmail/recipientspicker.h
+++ b/kmail/recipientspicker.h
@@ -27,8 +27,8 @@
#include <tdelistview.h>
#include <tdelistviewsearchline.h>
-#include <kabc/addressee.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
#include <tqwidget.h>
#include <tqdialog.h>
diff --git a/kmail/redirectdialog.cpp b/kmail/redirectdialog.cpp
index c6585a5a..f29b7947 100644
--- a/kmail/redirectdialog.cpp
+++ b/kmail/redirectdialog.cpp
@@ -39,8 +39,8 @@ using KPIM::AddressesDialog;
using TDERecentAddress::RecentAddresses;
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqvbox.h>
#include <tqhbox.h>
diff --git a/kmail/regexplineedit.cpp b/kmail/regexplineedit.cpp
index 3502cb17..1b14fb4f 100644
--- a/kmail/regexplineedit.cpp
+++ b/kmail/regexplineedit.cpp
@@ -36,7 +36,7 @@
#include "regexplineedit.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h>
diff --git a/kmail/renamejob.cpp b/kmail/renamejob.cpp
index 7b1b80e3..15c2778f 100644
--- a/kmail/renamejob.cpp
+++ b/kmail/renamejob.cpp
@@ -44,7 +44,7 @@
#include <tdeio/scheduler.h>
#include <tdeio/job.h>
#include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <config.h>
#include <tqmap.h>
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index fd5c811f..fac482ee 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -384,7 +384,7 @@ namespace {
#include "regexplineedit.h"
using KMail::RegExpLineEdit;
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tqcombobox.h>
diff --git a/kmail/searchjob.cpp b/kmail/searchjob.cpp
index f7af79c2..b0b1d9de 100644
--- a/kmail/searchjob.cpp
+++ b/kmail/searchjob.cpp
@@ -43,8 +43,8 @@ using KPIM::ProgressManager;
#include <tdeio/scheduler.h>
#include <tdeio/job.h>
#include <tdeio/global.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqstylesheet.h>
diff --git a/kmail/sieveconfig.cpp b/kmail/sieveconfig.cpp
index 61ebc7a6..ff3e156d 100644
--- a/kmail/sieveconfig.cpp
+++ b/kmail/sieveconfig.cpp
@@ -19,7 +19,7 @@
#include "sieveconfig.h"
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tdeconfigbase.h>
diff --git a/kmail/sievedebugdialog.cpp b/kmail/sievedebugdialog.cpp
index bc5d2cca..cd3ebdfc 100644
--- a/kmail/sievedebugdialog.cpp
+++ b/kmail/sievedebugdialog.cpp
@@ -28,8 +28,8 @@
#include <tqdatetime.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmime_header_parsing.h>
#include <ksieve/error.h>
diff --git a/kmail/signatureconfigurator.cpp b/kmail/signatureconfigurator.cpp
index 3451fb48..81131956 100644
--- a/kmail/signatureconfigurator.cpp
+++ b/kmail/signatureconfigurator.cpp
@@ -19,7 +19,7 @@
#include "signatureconfigurator.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <klineedit.h>
#include <kurlrequester.h>
diff --git a/kmail/simplestringlisteditor.cpp b/kmail/simplestringlisteditor.cpp
index cf58f98c..b0602428 100644
--- a/kmail/simplestringlisteditor.cpp
+++ b/kmail/simplestringlisteditor.cpp
@@ -37,7 +37,7 @@
#include <kinputdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kpushbutton.h>
diff --git a/kmail/snippetdlg.cpp b/kmail/snippetdlg.cpp
index f6af1272..60bf689e 100644
--- a/kmail/snippetdlg.cpp
+++ b/kmail/snippetdlg.cpp
@@ -15,7 +15,7 @@
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
@@ -23,7 +23,7 @@
#include <ktextedit.h>
#include "kkeybutton.h"
#include "tdeactioncollection.h"
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
/*
* Constructs a SnippetDlg as a child of 'parent', with the
diff --git a/kmail/snippetitem.h b/kmail/snippetitem.h
index 2111664e..cbc3c4eb 100644
--- a/kmail/snippetitem.h
+++ b/kmail/snippetitem.h
@@ -15,7 +15,7 @@
#define SNIPPETITEM_H
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqobject.h>
diff --git a/kmail/snippetwidget.cpp b/kmail/snippetwidget.cpp
index c5ccdd9e..c08d21e2 100644
--- a/kmail/snippetwidget.cpp
+++ b/kmail/snippetwidget.cpp
@@ -13,14 +13,14 @@
#include <kurl.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <kpushbutton.h>
#include <tdelistview.h>
#include <tqheader.h>
#include <klineedit.h>
#include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tqtooltip.h>
#include <tdepopupmenu.h>
diff --git a/kmail/subscriptiondialog.cpp b/kmail/subscriptiondialog.cpp
index 992ce2c4..cf4572b2 100644
--- a/kmail/subscriptiondialog.cpp
+++ b/kmail/subscriptiondialog.cpp
@@ -38,9 +38,9 @@
#include "listjob.h"
#include "imapaccountbase.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
namespace KMail {
diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 2ff9f56a..f94be954 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -22,14 +22,14 @@
#include <tqstring.h>
#include <tqdatetime.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
#include <kmime_util.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kprocess.h>
#include <tqregexp.h>
#include <tqfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kshell.h>
#include <tqfileinfo.h>
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 93e831fa..9a90ca5a 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -20,8 +20,8 @@
#include <config.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tqpopupmenu.h>
#include <tqpushbutton.h>
#include <tqtextedit.h>
diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index 2bfabd93..b89fd2a1 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -24,7 +24,7 @@
#include <tdeaction.h>
#include <tdeactionclasses.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqsignalmapper.h>
#include <kdebug.h>
diff --git a/kmail/undostack.cpp b/kmail/undostack.cpp
index c7e80e8f..24db928c 100644
--- a/kmail/undostack.cpp
+++ b/kmail/undostack.cpp
@@ -29,8 +29,8 @@
#include "kmfolder.h"
#include "kmmsgdict.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
namespace KMail {
diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp
index 1a72cb27..78102b2b 100644
--- a/kmail/urlhandlermanager.cpp
+++ b/kmail/urlhandlermanager.cpp
@@ -396,9 +396,9 @@ TQString KMail::URLHandlerManager::statusBarMessage( const KURL & url, KMReaderW
#include <ui/messagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdehtml_part.h>
#include <tqstring.h>
diff --git a/kmail/util.h b/kmail/util.h
index aa4aac28..3a496921 100644
--- a/kmail/util.h
+++ b/kmail/util.h
@@ -44,8 +44,8 @@
#include <tqcstring.h>
#include <tdeio/netaccess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
class DwString;
class KURL;
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index a027c33b..3066b559 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -39,8 +39,8 @@ using KMime::Types::AddrSpecList;
#include <ksieve/scriptbuilder.h>
#include <ksieve/error.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqdatetime.h>
diff --git a/kmail/vacationdialog.cpp b/kmail/vacationdialog.cpp
index da5648c7..19229895 100644
--- a/kmail/vacationdialog.cpp
+++ b/kmail/vacationdialog.cpp
@@ -25,7 +25,7 @@ using KMime::Types::MailboxList;
using KMime::HeaderParsing::parseAddressList;
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <twin.h>
#include <tdeapplication.h>
diff --git a/kmail/vcardviewer.cpp b/kmail/vcardviewer.cpp
index 0e34f72c..41d6705c 100644
--- a/kmail/vcardviewer.cpp
+++ b/kmail/vcardviewer.cpp
@@ -28,12 +28,12 @@
#include <addresseeview.h>
using KPIM::AddresseeView;
-#include <kabc/vcardconverter.h>
-#include <kabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
+#include <tdeabc/addressee.h>
using KABC::VCardConverter;
using KABC::Addressee;
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h
index 3ed8b213..a5460f99 100644
--- a/kmail/vcardviewer.h
+++ b/kmail/vcardviewer.h
@@ -21,8 +21,8 @@
#define VCARDVIEWER_H
#include <kdialogbase.h>
-#include <kabc/addressee.h>
-#include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define
#include <tqvaluelist.h>
diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp
index e35b2e0e..e27b192e 100644
--- a/kmail/xfaceconfigurator.cpp
+++ b/kmail/xfaceconfigurator.cpp
@@ -39,17 +39,17 @@
#include <kactivelabel.h>
#include <kdialog.h>
#include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kimageio.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tdeio/netaccess.h>
using namespace TDEIO;
#include <kxface.h>
using namespace KPIM;
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
using namespace KABC;
#include <tqbitmap.h>
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx
index 017385d4..b4443d14 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cxx
@@ -21,9 +21,9 @@
#include "filter_evolution.hxx"
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
/** Default constructor. */
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx
index 34192f6a..b6ee8a57 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cxx
@@ -19,9 +19,9 @@
#include "filter_evolution_v2.hxx"
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
/** Default constructor. */
diff --git a/kmailcvt/filter_kmail_archive.cxx b/kmailcvt/filter_kmail_archive.cxx
index 2fca99bd..3c7c20d0 100644
--- a/kmailcvt/filter_kmail_archive.cxx
+++ b/kmailcvt/filter_kmail_archive.cxx
@@ -18,7 +18,7 @@
*/
#include "filter_kmail_archive.hxx"
-#include <klocale.h>
+#include <tdelocale.h>
FilterKMailArchive::FilterKMailArchive()
: Filter( i18n( "Import KMail Archive File" ),
diff --git a/kmailcvt/filter_kmail_maildir.cxx b/kmailcvt/filter_kmail_maildir.cxx
index 9305e644..9d642814 100644
--- a/kmailcvt/filter_kmail_maildir.cxx
+++ b/kmailcvt/filter_kmail_maildir.cxx
@@ -18,7 +18,7 @@
#include "filter_kmail_maildir.hxx"
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
/** Default constructor. */
diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx
index 8d987d0d..af92e1b4 100644
--- a/kmailcvt/filter_lnotes.cxx
+++ b/kmailcvt/filter_lnotes.cxx
@@ -17,9 +17,9 @@
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <tqfileinfo.h>
diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx
index 51df3235..fded411d 100644
--- a/kmailcvt/filter_mailapp.cxx
+++ b/kmailcvt/filter_mailapp.cxx
@@ -21,9 +21,9 @@
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "filter_mailapp.hxx"
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx
index 78bfec07..19afccf2 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cxx
@@ -16,9 +16,9 @@
***************************************************************************/
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "filter_mbox.hxx"
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx
index 22c7a615..afd96527 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cxx
@@ -20,9 +20,9 @@
// This filter was created by looking at libdbx & liboe
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "filter_oe.hxx"
diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx
index 784c0b10..90aef382 100644
--- a/kmailcvt/filter_opera.cxx
+++ b/kmailcvt/filter_opera.cxx
@@ -16,9 +16,9 @@
***************************************************************************/
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "filter_opera.hxx"
diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx
index 63d2848b..10483d09 100644
--- a/kmailcvt/filter_outlook.cxx
+++ b/kmailcvt/filter_outlook.cxx
@@ -17,9 +17,9 @@
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "filter_outlook.hxx"
diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx
index b29d1338..9f78b939 100644
--- a/kmailcvt/filter_plain.cxx
+++ b/kmailcvt/filter_plain.cxx
@@ -16,7 +16,7 @@
***************************************************************************/
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <libgen.h>
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx
index d79c8f4b..e48e062d 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cxx
@@ -18,10 +18,10 @@
***************************************************************************/
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <tqregexp.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "filter_pmail.hxx"
diff --git a/kmailcvt/filter_sylpheed.cxx b/kmailcvt/filter_sylpheed.cxx
index af03a099..1fc008d4 100644
--- a/kmailcvt/filter_sylpheed.cxx
+++ b/kmailcvt/filter_sylpheed.cxx
@@ -18,7 +18,7 @@
#include "filter_sylpheed.hxx"
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kdebug.h>
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx
index 499caedb..eaf16461 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cxx
@@ -22,11 +22,11 @@
#include <tqregexp.h>
#include <tqvaluelist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
/** Default constructor. */
FilterTheBat::FilterTheBat( void ) :
diff --git a/kmailcvt/filter_thunderbird.cxx b/kmailcvt/filter_thunderbird.cxx
index d92e7efd..50f6355f 100644
--- a/kmailcvt/filter_thunderbird.cxx
+++ b/kmailcvt/filter_thunderbird.cxx
@@ -18,9 +18,9 @@
#include "filter_thunderbird.hxx"
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
/** Default constructor. */
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index 78728d2c..d7af7705 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -15,8 +15,8 @@
* *
***************************************************************************/
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include <dcopref.h>
#include <kurl.h>
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index b8af0d0b..7d97fcfd 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -18,7 +18,7 @@
#include <kstandarddirs.h>
#include <tqtextedit.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "filters.hxx"
#include "filter_mbox.hxx"
diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp
index a999fed0..e5629f87 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.cpp
+++ b/kmobile/devices/gnokii/gnokii_mobile.cpp
@@ -28,10 +28,10 @@
#include <klibloader.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/global.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <gnokii.h>
diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h
index fbcb3cb6..5ace3e0b 100644
--- a/kmobile/devices/gnokii/gnokii_mobile.h
+++ b/kmobile/devices/gnokii/gnokii_mobile.h
@@ -25,7 +25,7 @@
#define LIBKMOBILE_GNOKII_H
#include <kmobiledevice.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
class KMobileGnokii : public KMobileDevice
{
diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp
index 564681cd..3593c7f8 100644
--- a/kmobile/devices/skeleton/skeleton.cpp
+++ b/kmobile/devices/skeleton/skeleton.cpp
@@ -22,11 +22,11 @@
#include <klibloader.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/global.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "skeleton.h"
diff --git a/kmobile/kmobile.cpp b/kmobile/kmobile.cpp
index 70ec163b..2fda2db1 100644
--- a/kmobile/kmobile.cpp
+++ b/kmobile/kmobile.cpp
@@ -22,16 +22,16 @@
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <kkeydialog.h>
#include <tdeaccel.h>
#include <tdeio/netaccess.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <kedittoolbar.h>
diff --git a/kmobile/kmobileclient.cpp b/kmobile/kmobileclient.cpp
index 2eef7c53..8a0b967a 100644
--- a/kmobile/kmobileclient.cpp
+++ b/kmobile/kmobileclient.cpp
@@ -20,7 +20,7 @@
#include <tqstringlist.h>
#include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kmobileclient.h"
diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp
index 3c970ab1..e92bbd04 100644
--- a/kmobile/kmobiledevice.cpp
+++ b/kmobile/kmobiledevice.cpp
@@ -33,12 +33,12 @@
#include <klibloader.h>
#include <kstandarddirs.h>
#include "kmobiledevice.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdeio/global.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define KMOBILEDEVICE_DEBUG_AREA 5730
#define PRINT_DEBUG kdDebug(KMOBILEDEVICE_DEBUG_AREA) << "KMobileDevice: "
diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h
index 9dbad07a..aad9287c 100644
--- a/kmobile/kmobiledevice.h
+++ b/kmobile/kmobiledevice.h
@@ -27,8 +27,8 @@
#include <tdepimmacros.h>
#include <klibloader.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseelist.h>
#include <tdeio/global.h>
#include <tdeio/authinfo.h>
diff --git a/kmobile/kmobileitem.cpp b/kmobile/kmobileitem.cpp
index aa44cb93..8165eadd 100644
--- a/kmobile/kmobileitem.cpp
+++ b/kmobile/kmobileitem.cpp
@@ -20,7 +20,7 @@
#include <tqobject.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp
index 5356c879..14f7c0a3 100644
--- a/kmobile/kmobileview.cpp
+++ b/kmobile/kmobileview.cpp
@@ -22,8 +22,8 @@
#include <ktrader.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kabc/vcardconverter.h>
+#include <tdelocale.h>
+#include <tdeabc/vcardconverter.h>
#include <kprocess.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kmobile/main.cpp b/kmobile/main.cpp
index 423c8be8..6fe97df3 100644
--- a/kmobile/main.cpp
+++ b/kmobile/main.cpp
@@ -22,7 +22,7 @@
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("TDE mobile devices manager");
diff --git a/kmobile/pref.cpp b/kmobile/pref.cpp
index 6b5a0230..b4200601 100644
--- a/kmobile/pref.cpp
+++ b/kmobile/pref.cpp
@@ -4,7 +4,7 @@
#include "pref.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kmobile/tdeioslave/tdeio_mobile.cpp b/kmobile/tdeioslave/tdeio_mobile.cpp
index bb70b264..f30742fe 100644
--- a/kmobile/tdeioslave/tdeio_mobile.cpp
+++ b/kmobile/tdeioslave/tdeio_mobile.cpp
@@ -27,9 +27,9 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
#include "tdeio_mobile.h"
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp
index e6dca1cc..1af971b3 100644
--- a/knode/articlewidget.cpp
+++ b/knode/articlewidget.cpp
@@ -35,13 +35,13 @@
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <krun.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurl.h>
#include <libemailfunctions/email.h>
diff --git a/knode/headerview.cpp b/knode/headerview.cpp
index 1952f813..06210b2a 100644
--- a/knode/headerview.cpp
+++ b/knode/headerview.cpp
@@ -17,7 +17,7 @@
#include <tqstylesheet.h>
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <tdepopupmenu.h>
diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp
index ddc66afd..7eac9000 100644
--- a/knode/knaccountmanager.cpp
+++ b/knode/knaccountmanager.cpp
@@ -18,8 +18,8 @@
#include <kdebug.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdewallet.h>
diff --git a/knode/knarticle.cpp b/knode/knarticle.cpp
index fe475b1b..24ffe720 100644
--- a/knode/knarticle.cpp
+++ b/knode/knarticle.cpp
@@ -15,7 +15,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
#include <kmimemagic.h>
diff --git a/knode/knarticlecollection.cpp b/knode/knarticlecollection.cpp
index d39d4d83..e0a0af85 100644
--- a/knode/knarticlecollection.cpp
+++ b/knode/knarticlecollection.cpp
@@ -16,8 +16,8 @@
#include <stdlib.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include "knglobals.h"
diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp
index 6a20c4dd..9e801a6e 100644
--- a/knode/knarticlefactory.cpp
+++ b/knode/knarticlefactory.cpp
@@ -16,8 +16,8 @@
#include <tqlabel.h>
#include <tqvbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <twin.h>
#include <tdeapplication.h>
diff --git a/knode/knarticlefilter.cpp b/knode/knarticlefilter.cpp
index 65acb7c0..8a708e29 100644
--- a/knode/knarticlefilter.cpp
+++ b/knode/knarticlefilter.cpp
@@ -14,7 +14,7 @@
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kngroup.h"
diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp
index f5a59c57..e70f6243 100644
--- a/knode/knarticlemanager.cpp
+++ b/knode/knarticlemanager.cpp
@@ -12,13 +12,13 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
*/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kuserprofile.h>
#include <kopenwith.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <twin.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "articlewidget.h"
#include "knmainwidget.h"
diff --git a/knode/kncleanup.cpp b/knode/kncleanup.cpp
index f2078d71..33714840 100644
--- a/knode/kncleanup.cpp
+++ b/knode/kncleanup.cpp
@@ -19,8 +19,8 @@
#include <tqlayout.h>
#include <tqprogressbar.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include <tdeapplication.h>
#include <kdebug.h>
diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp
index a8e9088c..8a02fed2 100644
--- a/knode/kncollectionview.cpp
+++ b/knode/kncollectionview.cpp
@@ -16,7 +16,7 @@
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include "knglobals.h"
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index afebca1a..678b38eb 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -24,8 +24,8 @@ using KPIM::AddressesDialog;
using TDERecentAddress::RecentAddresses;
#include <tdeaccel.h>
#include <kcharsets.h>
-#include <kmessagebox.h>
-#include <kabc/addresseedialog.h>
+#include <tdemessagebox.h>
+#include <tdeabc/addresseedialog.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kkeydialog.h>
@@ -36,7 +36,7 @@ using TDERecentAddress::RecentAddresses;
#include <klineedit.h>
#include <kcombobox.h>
#include <tdespell.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kpgp.h>
#include <kpgpblock.h>
#include <kprocess.h>
@@ -57,7 +57,7 @@ using TDERecentAddress::RecentAddresses;
#include "knnntpaccount.h"
#include "knarticlefactory.h"
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpopupmenu.h>
#include <spellingfilter.h>
#include <kstdguiitem.h>
diff --git a/knode/kncomposer.h b/knode/kncomposer.h
index d12a0513..27cdade4 100644
--- a/knode/kncomposer.h
+++ b/knode/kncomposer.h
@@ -26,7 +26,7 @@
#include <tdeversion.h>
#include <keditcl.h>
-#include <kabc/addresslineedit.h>
+#include <tdeabc/addresslineedit.h>
#include <knodecomposeriface.h>
class TQGroupBox;
diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp
index b2bfb8bf..8a218eb2 100644
--- a/knode/knconfig.cpp
+++ b/knode/knconfig.cpp
@@ -19,10 +19,10 @@
#include <tqtextcodec.h>
#include <ksimpleconfig.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp
index 95e342d5..a07a9c5e 100644
--- a/knode/knconfigmanager.cpp
+++ b/knode/knconfigmanager.cpp
@@ -18,7 +18,7 @@
#include <kcmultidialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <twin.h>
#include <tqhbox.h>
diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp
index 9fa15394..237ff41b 100644
--- a/knode/knconfigpages.cpp
+++ b/knode/knconfigpages.cpp
@@ -15,7 +15,7 @@
#include <tdecmodule.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "knglobals.h"
#include "knconfig.h"
diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp
index 2ae1e1f0..3d4948a4 100644
--- a/knode/knconfigwidgets.cpp
+++ b/knode/knconfigwidgets.cpp
@@ -18,9 +18,9 @@
#include <tqwhatsthis.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knumvalidator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcolordialog.h>
#include <tdefontdialog.h>
#include <tdefiledialog.h>
diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp
index 19e2c56a..20a63ffa 100644
--- a/knode/knconvert.cpp
+++ b/knode/knconvert.cpp
@@ -17,10 +17,10 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <klineedit.h>
#include <kprocess.h>
diff --git a/knode/kndisplayedheader.cpp b/knode/kndisplayedheader.cpp
index 65b16522..ffca72cf 100644
--- a/knode/kndisplayedheader.cpp
+++ b/knode/kndisplayedheader.cpp
@@ -12,7 +12,7 @@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kndisplayedheader.h"
diff --git a/knode/knfilterconfigwidget.cpp b/knode/knfilterconfigwidget.cpp
index 3c7daee1..4ba0f45f 100644
--- a/knode/knfilterconfigwidget.cpp
+++ b/knode/knfilterconfigwidget.cpp
@@ -17,7 +17,7 @@
#include <tqlayout.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "knstringfilter.h"
#include "knstatusfilter.h"
diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp
index e9ebf66e..6a0e972a 100644
--- a/knode/knfilterdialog.cpp
+++ b/knode/knfilterdialog.cpp
@@ -18,8 +18,8 @@
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include "knglobals.h"
diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp
index 9efc23dc..2264dd29 100644
--- a/knode/knfiltermanager.cpp
+++ b/knode/knfiltermanager.cpp
@@ -14,8 +14,8 @@
#include <stdlib.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
diff --git a/knode/knfolder.cpp b/knode/knfolder.cpp
index 5be7535c..ee4449fa 100644
--- a/knode/knfolder.cpp
+++ b/knode/knfolder.cpp
@@ -17,7 +17,7 @@
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kqcstringsplitter.h>
diff --git a/knode/knfoldermanager.cpp b/knode/knfoldermanager.cpp
index 661e1b6c..2b6d1cc1 100644
--- a/knode/knfoldermanager.cpp
+++ b/knode/knfoldermanager.cpp
@@ -14,8 +14,8 @@
#include <tqdir.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/knode/kngroup.cpp b/knode/kngroup.cpp
index 087eb737..95de1a5b 100644
--- a/knode/kngroup.cpp
+++ b/knode/kngroup.cpp
@@ -14,7 +14,7 @@
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kqcstringsplitter.h>
diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp
index be91593a..f2379f51 100644
--- a/knode/kngroupbrowser.cpp
+++ b/knode/kngroupbrowser.cpp
@@ -21,7 +21,7 @@
#include <kseparator.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <klineedit.h>
diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp
index 4498898f..8c9a1746 100644
--- a/knode/kngroupdialog.cpp
+++ b/knode/kngroupdialog.cpp
@@ -21,10 +21,10 @@
#include <tqcheckbox.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdatepicker.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include "utilities.h"
diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp
index 92ed1666..706e9d9b 100644
--- a/knode/kngroupmanager.cpp
+++ b/knode/kngroupmanager.cpp
@@ -16,8 +16,8 @@
#include <stdlib.h>
#include <tqdir.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <kcharsets.h>
diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp
index 3ad2fee7..a6a90578 100644
--- a/knode/kngrouppropdlg.cpp
+++ b/knode/kngrouppropdlg.cpp
@@ -17,7 +17,7 @@
#include <tqvbox.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include "knglobals.h"
diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp
index 6767d3f6..3d137b8a 100644
--- a/knode/kngroupselectdialog.cpp
+++ b/knode/kngroupselectdialog.cpp
@@ -19,8 +19,8 @@
#include <tqheader.h>
#include <tqcheckbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "utilities.h"
#include "kngroupselectdialog.h"
diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp
index 0d626983..7d4ac912 100644
--- a/knode/knjobdata.cpp
+++ b/knode/knjobdata.cpp
@@ -14,7 +14,7 @@
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <libtdepim/progressmanager.h>
diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp
index 7a1f407c..bfb895d0 100644
--- a/knode/knmainwidget.cpp
+++ b/knode/knmainwidget.cpp
@@ -21,14 +21,14 @@
#include <tdeaccel.h>
#include <kxmlguiclient.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kedittoolbar.h>
#include <kstdaction.h>
#include <kdebug.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kiconloader.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include "broadcaststatus.h"
diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp
index 299a1200..747f6d4c 100644
--- a/knode/knnetaccess.cpp
+++ b/knode/knnetaccess.cpp
@@ -17,8 +17,8 @@
#include <tqsocketnotifier.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeio/job.h>
#include <tdeio/passdlg.h>
diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp
index 8cedae08..2ba465be 100644
--- a/knode/knnntpclient.cpp
+++ b/knode/knnntpclient.cpp
@@ -15,7 +15,7 @@
*/
#include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtextcodec.h>
#include <tqmutex.h>
diff --git a/knode/knode.cpp b/knode/knode.cpp
index a29cb7db..175d1845 100644
--- a/knode/knode.cpp
+++ b/knode/knode.cpp
@@ -21,10 +21,10 @@
#include <kedittoolbar.h>
#include <kstdaction.h>
#include <kdebug.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kiconloader.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include "broadcaststatus.h"
diff --git a/knode/knode_options.h b/knode/knode_options.h
index f8329e38..c7c44691 100644
--- a/knode/knode_options.h
+++ b/knode/knode_options.h
@@ -18,7 +18,7 @@
#define KNODE_OPTIONS_H
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static TDECmdLineOptions knode_options[] =
{
diff --git a/knode/knprotocolclient.cpp b/knode/knprotocolclient.cpp
index 8289d02e..9a10ca77 100644
--- a/knode/knprotocolclient.cpp
+++ b/knode/knprotocolclient.cpp
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kextsock.h>
#include <ksocks.h>
diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp
index 45c59cb4..737bece2 100644
--- a/knode/knsearchdialog.cpp
+++ b/knode/knsearchdialog.cpp
@@ -17,7 +17,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kpushbutton.h>
diff --git a/knode/knserverinfo.cpp b/knode/knserverinfo.cpp
index 6af554ce..3d4e4ded 100644
--- a/knode/knserverinfo.cpp
+++ b/knode/knserverinfo.cpp
@@ -13,9 +13,9 @@
*/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdewallet.h>
using namespace KWallet;
diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp
index a1379a26..ec098d9c 100644
--- a/knode/knstatusfilter.cpp
+++ b/knode/knstatusfilter.cpp
@@ -16,7 +16,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include "knarticle.h"
diff --git a/knode/knstringfilter.cpp b/knode/knstringfilter.cpp
index 4f69f7ea..ba594a9f 100644
--- a/knode/knstringfilter.cpp
+++ b/knode/knstringfilter.cpp
@@ -16,7 +16,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <klineedit.h>
diff --git a/knode/main.cpp b/knode/main.cpp
index f7f1a835..ab833dd7 100644
--- a/knode/main.cpp
+++ b/knode/main.cpp
@@ -16,7 +16,7 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "knapplication.h"
#include "resource.h"
diff --git a/knode/utilities.cpp b/knode/utilities.cpp
index 2274d2ef..05483813 100644
--- a/knode/utilities.cpp
+++ b/knode/utilities.cpp
@@ -17,12 +17,12 @@
#include <tqapplication.h>
#include <tqcursor.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdefiledialog.h>
#include "knwidgets.h"
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 29ad10f5..62c8efc8 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -43,14 +43,14 @@
#include <kxmlguifactory.h>
#include <kcolordrag.h>
#include <kiconeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kfind.h>
#include <kprocess.h>
#include <kinputdialog.h>
#include <kmdcodec.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp
index cb1ea116..4496da26 100644
--- a/knotes/knotealarmdlg.cpp
+++ b/knotes/knotealarmdlg.cpp
@@ -34,7 +34,7 @@
#include <tqbuttongroup.h>
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <libtdepim/kdateedit.h>
#include <libtdepim/ktimeedit.h>
diff --git a/knotes/knotebutton.cpp b/knotes/knotebutton.cpp
index 006b1e9c..ff89b2de 100644
--- a/knotes/knotebutton.cpp
+++ b/knotes/knotebutton.cpp
@@ -23,7 +23,7 @@
#include <tqiconset.h>
#include <tqsizepolicy.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kicontheme.h>
#include <kiconloader.h>
diff --git a/knotes/knoteconfigdlg.cpp b/knotes/knoteconfigdlg.cpp
index e3ee66fa..bd388c38 100644
--- a/knotes/knoteconfigdlg.cpp
+++ b/knotes/knoteconfigdlg.cpp
@@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kcolorbutton.h>
#include <knuminput.h>
diff --git a/knotes/knoteedit.cpp b/knotes/knoteedit.cpp
index 7ebb4435..2ba215b7 100644
--- a/knotes/knoteedit.cpp
+++ b/knotes/knoteedit.cpp
@@ -22,7 +22,7 @@
#include <tqfont.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kurldrag.h>
#include <kstdaction.h>
diff --git a/knotes/knotehostdlg.cpp b/knotes/knotehostdlg.cpp
index 3b8b8f50..9d8fff97 100644
--- a/knotes/knotehostdlg.cpp
+++ b/knotes/knotehostdlg.cpp
@@ -36,8 +36,8 @@
#include <tqvbox.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
#include <kcombobox.h>
diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp
index c5803167..ade0a8a7 100644
--- a/knotes/knoteprinter.cpp
+++ b/knotes/knoteprinter.cpp
@@ -2,7 +2,7 @@
#include <libkcal/journal.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <kdebug.h>
#include <tqfont.h>
diff --git a/knotes/knotesalarm.cpp b/knotes/knotesalarm.cpp
index 285d7224..c2d1bd1c 100644
--- a/knotes/knotesalarm.cpp
+++ b/knotes/knotesalarm.cpp
@@ -31,8 +31,8 @@
#include <tqstringlist.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <libkcal/calendarresources.h>
diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp
index f3b2ae15..26aee48c 100644
--- a/knotes/knotesapp.cpp
+++ b/knotes/knotesapp.cpp
@@ -27,7 +27,7 @@
#include <kxmlguifactory.h>
#include <kxmlguibuilder.h>
#include <ksystemtray.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconeffect.h>
#include <kstandarddirs.h>
#include <tdepopupmenu.h>
diff --git a/knotes/knoteslegacy.cpp b/knotes/knoteslegacy.cpp
index 35816f88..fb832a5b 100644
--- a/knotes/knoteslegacy.cpp
+++ b/knotes/knoteslegacy.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kurl.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
diff --git a/knotes/knotesnetrecv.cpp b/knotes/knotesnetrecv.cpp
index 94ff2952..48bb791f 100644
--- a/knotes/knotesnetrecv.cpp
+++ b/knotes/knotesnetrecv.cpp
@@ -38,8 +38,8 @@
#include <kdebug.h>
#include <kbufferedsocket.h>
#include <tdesocketaddress.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include "knotesnetrecv.h"
diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp
index 001dcf9f..26d2b8f7 100644
--- a/knotes/knotesnetsend.cpp
+++ b/knotes/knotesnetsend.cpp
@@ -30,8 +30,8 @@
your version.
*******************************************************************/
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "knotesnetsend.h"
diff --git a/knotes/main.cpp b/knotes/main.cpp
index a8dde2d0..e809a8f7 100644
--- a/knotes/main.cpp
+++ b/knotes/main.cpp
@@ -21,7 +21,7 @@
#include <kuniqueapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kxerrorhandler.h>
#include <X11/Xlib.h>
diff --git a/knotes/resourcelocal.cpp b/knotes/resourcelocal.cpp
index 7e208531..e5d4d6e5 100644
--- a/knotes/resourcelocal.cpp
+++ b/knotes/resourcelocal.cpp
@@ -31,8 +31,8 @@
your version.
*******************************************************************/
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <libkcal/icalformat.h>
diff --git a/knotes/resourcelocalconfig.cpp b/knotes/resourcelocalconfig.cpp
index 1214e0ad..c4eed4e0 100644
--- a/knotes/resourcelocalconfig.cpp
+++ b/knotes/resourcelocalconfig.cpp
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tderesources/configwidget.h>
#include <kurlrequester.h>
diff --git a/kode/CMakeLists.txt b/kode/CMakeLists.txt
index 179a539e..e2255d9a 100644
--- a/kode/CMakeLists.txt
+++ b/kode/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
tde_add_executable( kode
SOURCES kodemain.cpp
- LINK kode-shared kabc-shared
+ LINK kode-shared tdeabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index 8c2e3a36..e91be0c8 100644
--- a/kode/kodemain.cpp
+++ b/kode/kodemain.cpp
@@ -24,16 +24,16 @@
#include "license.h"
#include "automakefile.h"
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
#include <ksavefile.h>
diff --git a/kode/kwsdl/kung/binaryinputfield.cpp b/kode/kwsdl/kung/binaryinputfield.cpp
index 95ea292e..b0fb78b0 100644
--- a/kode/kwsdl/kung/binaryinputfield.cpp
+++ b/kode/kwsdl/kung/binaryinputfield.cpp
@@ -22,12 +22,12 @@
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
#include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmimemagic.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include <tdeparts/componentfactory.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <tqlabel.h>
diff --git a/kode/kwsdl/kung/dispatcher.cpp b/kode/kwsdl/kung/dispatcher.cpp
index 58ac17d1..5c65d0c4 100644
--- a/kode/kwsdl/kung/dispatcher.cpp
+++ b/kode/kwsdl/kung/dispatcher.cpp
@@ -24,8 +24,8 @@
#include <tqwidget.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "generalconversationmanager.h"
#include "inputdialog.h"
diff --git a/kode/kwsdl/kung/inputdialog.cpp b/kode/kwsdl/kung/inputdialog.cpp
index 17aa601b..353494e2 100644
--- a/kode/kwsdl/kung/inputdialog.cpp
+++ b/kode/kwsdl/kung/inputdialog.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "inputdialog.h"
diff --git a/kode/kwsdl/kung/listinputfield.cpp b/kode/kwsdl/kung/listinputfield.cpp
index 4a6921c0..539e3de2 100644
--- a/kode/kwsdl/kung/listinputfield.cpp
+++ b/kode/kwsdl/kung/listinputfield.cpp
@@ -23,7 +23,7 @@
#include <tqlistbox.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <schema/simpletype.h>
diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp
index 9f236c3c..2dadbe9d 100644
--- a/kode/kwsdl/kung/main.cpp
+++ b/kode/kwsdl/kung/main.cpp
@@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtimer.h>
diff --git a/kode/kwsdl/kung/outputdialog.cpp b/kode/kwsdl/kung/outputdialog.cpp
index 6cdb7e57..e8d67643 100644
--- a/kode/kwsdl/kung/outputdialog.cpp
+++ b/kode/kwsdl/kung/outputdialog.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "outputdialog.h"
diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp
index ab40e3a3..5ba4f533 100644
--- a/kode/kwsdl/main.cpp
+++ b/kode/kwsdl/main.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdir.h>
#include <tqfile.h>
diff --git a/kode/kwsdl/schema/fileprovider.cpp b/kode/kwsdl/schema/fileprovider.cpp
index 945f7261..ed5606fd 100644
--- a/kode/kwsdl/schema/fileprovider.cpp
+++ b/kode/kwsdl/schema/fileprovider.cpp
@@ -26,7 +26,7 @@
#include <tqfile.h>
#include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "fileprovider.h"
diff --git a/kode/kxml_compiler/creator.cpp b/kode/kxml_compiler/creator.cpp
index b46a99eb..bc330eaf 100644
--- a/kode/kxml_compiler/creator.cpp
+++ b/kode/kxml_compiler/creator.cpp
@@ -29,9 +29,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kode/kxml_compiler/creator.h b/kode/kxml_compiler/creator.h
index c0018fd5..39cac4c6 100644
--- a/kode/kxml_compiler/creator.h
+++ b/kode/kxml_compiler/creator.h
@@ -31,9 +31,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp
index 87c3bb1d..317515b6 100644
--- a/kode/kxml_compiler/kxml_compiler.cpp
+++ b/kode/kxml_compiler/kxml_compiler.cpp
@@ -29,9 +29,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kode/kxml_compiler/parser.cpp b/kode/kxml_compiler/parser.cpp
index 163213f9..5fc72f97 100644
--- a/kode/kxml_compiler/parser.cpp
+++ b/kode/kxml_compiler/parser.cpp
@@ -28,9 +28,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kode/kxml_compiler/parser.h b/kode/kxml_compiler/parser.h
index 07052787..9f0f21a1 100644
--- a/kode/kxml_compiler/parser.h
+++ b/kode/kxml_compiler/parser.h
@@ -28,9 +28,9 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp
index 3c7d2f00..535478cf 100644
--- a/konsolekalendar/konsolekalendar.cpp
+++ b/konsolekalendar/konsolekalendar.cpp
@@ -40,7 +40,7 @@
#include <tqtextstream.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/resourcecalendar.h>
diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp
index 36e23629..d7b2774b 100644
--- a/konsolekalendar/konsolekalendaradd.cpp
+++ b/konsolekalendar/konsolekalendaradd.cpp
@@ -38,7 +38,7 @@
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/calendar.h>
diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp
index 338ed1e5..7c9e3b5e 100644
--- a/konsolekalendar/konsolekalendarchange.cpp
+++ b/konsolekalendar/konsolekalendarchange.cpp
@@ -34,7 +34,7 @@
#include <iostream>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "konsolekalendarchange.h"
diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp
index 65b8d425..4da76100 100644
--- a/konsolekalendar/konsolekalendardelete.cpp
+++ b/konsolekalendar/konsolekalendardelete.cpp
@@ -34,7 +34,7 @@
#include <iostream>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "konsolekalendardelete.h"
diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp
index 9894ac96..bf0748a3 100644
--- a/konsolekalendar/konsolekalendarexports.cpp
+++ b/konsolekalendar/konsolekalendarexports.cpp
@@ -36,7 +36,7 @@
#include <tqdatetime.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <libkcal/calendarlocal.h>
#include <libkcal/calendar.h>
diff --git a/konsolekalendar/konsolekalendarvariables.cpp b/konsolekalendar/konsolekalendarvariables.cpp
index e5541e00..fddb77d9 100644
--- a/konsolekalendar/konsolekalendarvariables.cpp
+++ b/konsolekalendar/konsolekalendarvariables.cpp
@@ -30,9 +30,9 @@
* @author Tuukka Pasanen
* @author Allen Winter
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp
index 0339634c..d03d084a 100644
--- a/konsolekalendar/main.cpp
+++ b/konsolekalendar/main.cpp
@@ -47,8 +47,8 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/konsolekalendar/stdcalendar.cpp b/konsolekalendar/stdcalendar.cpp
index 3c735df7..0c871b81 100644
--- a/konsolekalendar/stdcalendar.cpp
+++ b/konsolekalendar/stdcalendar.cpp
@@ -28,7 +28,7 @@
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
using namespace KCal;
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 772ecc81..edaf86da 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -27,7 +27,7 @@
#include <tdeparts/componentfactory.h>
#include <kdebug.h>
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace Kontact;
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index a14a50db..ed81dcb6 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -24,7 +24,7 @@
#include <dcopclient.h>
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeparts/componentfactory.h>
#include <kdebug.h>
#include <kinstance.h>
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 11b7bc5f..98a5d45b 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -20,14 +20,14 @@
*/
#include "uniqueapphandler.h"
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include "core.h"
#include <twin.h>
#include <dcopclient.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kuniqueapplication.h>
/*
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index bf59486c..01997690 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include <core.h>
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 82ae6ea1..479ca896 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -25,7 +25,7 @@
#ifndef AKREGATOR_PLUGIN_H
#define AKREGATOR_PLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include <tdeparts/part.h>
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 86a75ed0..cb20a3ca 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -30,12 +30,12 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include <kaddrbook.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <dcopclient.h>
#include "kmailIface_stub.h"
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
index f9a7fff3..b3a8fee8 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
@@ -25,7 +25,7 @@
#ifndef KADDRESSBOOK_PLUGIN_H
#define KADDRESSBOOK_PLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include "kaddressbookiface_stub.h"
diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h
index 1b4c80bd..e65f8ff9 100644
--- a/kontact/plugins/karm/karm_plugin.h
+++ b/kontact/plugins/karm/karm_plugin.h
@@ -26,7 +26,7 @@
#ifndef KARM_PLUGIN_H
#define KARM_PLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include "karmdcopiface_stub.h"
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
index 1240687a..48e33627 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include "core.h"
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h
index e14ee9a0..5e961036 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.h
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.h
@@ -25,7 +25,7 @@
#ifndef KITCHENSYNC_PLUGIN_H
#define KITCHENSYNC_PLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include "plugin.h"
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 3a450017..497e2780 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kcmkmailsummary.h"
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 90d7b6dd..1fa5fc9f 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -31,9 +31,9 @@
#include <tdeparts/componentfactory.h>
#include <kstandarddirs.h>
#include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <libkcal/vcaldrag.h>
#include <libkcal/icaldrag.h>
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index d2c5f4a3..eb1914ec 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -24,7 +24,7 @@
#ifndef KMAIL_PLUGIN_H
#define KMAIL_PLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include "kmailIface_stub.h"
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index b203c362..9ac18602 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -30,9 +30,9 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include "core.h"
diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h
index 1062ff62..460e0603 100644
--- a/kontact/plugins/knode/knode_plugin.h
+++ b/kontact/plugins/knode/knode_plugin.h
@@ -25,7 +25,7 @@
#ifndef KNODE_PLUGIN_H
#define KNODE_PLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include "knodeiface_stub.h"
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 5cac9caf..7c3b456f 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <libtdepim/infoextension.h>
#include <libtdepim/sidebarextension.h>
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index cda762eb..023a78b9 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -25,7 +25,7 @@
#include <tqdict.h>
#include <kiconview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <libkcal/journal.h>
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index ab386d1a..aa5b602c 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -36,9 +36,9 @@
#include <tqlabel.h>
#include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kiconeffect.h>
#include <klineedit.h>
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index fe17bad5..01606fba 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -21,7 +21,7 @@
#ifndef KNOTES_PLUGIN_H
#define KNOTES_PLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include "plugin.h"
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index dc0a3fa7..97bd771f 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -34,7 +34,7 @@
#include <tqtextedit.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "knotetip.h"
#include "knotes_part_p.h"
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index ff517a43..ca0f6ae5 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -30,9 +30,9 @@
#include <dcopref.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurllabel.h>
#include <kstandarddirs.h>
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 4b017af9..ac3b7735 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <dcopclient.h>
#include <dcopref.h>
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index e8cb6051..f7d0a465 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -24,7 +24,7 @@
#ifndef KONTACT_JOURNALPLUGIN_H
#define KONTACT_JOURNALPLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include "kcalendariface_stub.h"
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 43d027d4..0f17435c 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -33,7 +33,7 @@