summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--CMakeLists.txt2
-rw-r--r--KDE2PORTING.html4
-rw-r--r--Mainpage.dox4
-rw-r--r--Makefile.am.in2
-rw-r--r--arts/kde/kaudioplaystream.cpp2
-rw-r--r--arts/kde/kaudiorecordstream.cpp2
-rw-r--r--arts/kde/kconverttest.cc2
-rw-r--r--arts/kde/kiotest.cc2
-rw-r--r--arts/kde/kiotestslow.cc2
-rw-r--r--arts/kde/kvideowidget.cpp2
-rw-r--r--arts/kde/mcop-dcop/kmcop.cpp2
-rw-r--r--arts/knotify/knotify.cpp6
-rw-r--r--arts/message/artsmessage.cc6
-rw-r--r--configure.in.in2
-rw-r--r--interfaces/tdeimproxy/library/tdeimproxy.cpp2
-rw-r--r--interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp4
-rw-r--r--interfaces/tdescript/scriptloader.cpp4
-rw-r--r--interfaces/tdescript/scriptmanager.cpp4
-rw-r--r--interfaces/tdetexteditor/CMakeLists.txt2
-rw-r--r--interfaces/tdetexteditor/Makefile.am2
-rw-r--r--interfaces/tdetexteditor/editorchooser.cpp2
-rw-r--r--interfaces/tdetexteditor/templateinterface.cpp6
-rw-r--r--interfaces/terminal/test/main.cc2
-rw-r--r--kab/addressbook.cc6
-rw-r--r--kab/kabapi.cc4
-rw-r--r--kate/part/kateautoindent.cpp2
-rw-r--r--kate/part/katebookmarks.cpp2
-rw-r--r--kate/part/katebuffer.cpp2
-rw-r--r--kate/part/katecmds.cpp2
-rw-r--r--kate/part/kateconfig.cpp4
-rw-r--r--kate/part/katedialogs.cpp10
-rw-r--r--kate/part/katedocument.cpp10
-rw-r--r--kate/part/katedocument.h2
-rw-r--r--kate/part/katedocumenthelpers.cpp2
-rw-r--r--kate/part/katefactory.cpp2
-rw-r--r--kate/part/katefiletype.cpp2
-rw-r--r--kate/part/katefont.cpp2
-rw-r--r--kate/part/katehighlight.cpp8
-rw-r--r--kate/part/katejscript.cpp4
-rw-r--r--kate/part/kateluaindentscript.cpp4
-rw-r--r--kate/part/kateprinter.cpp2
-rw-r--r--kate/part/kateschema.cpp4
-rw-r--r--kate/part/katesearch.cpp4
-rw-r--r--kate/part/katespell.cpp2
-rw-r--r--kate/part/katesyntaxdocument.cpp4
-rw-r--r--kate/part/katetextline.cpp2
-rw-r--r--kate/part/kateview.cpp8
-rw-r--r--kate/part/kateviewhelpers.cpp6
-rw-r--r--kate/part/kateviewinternal.cpp2
-rw-r--r--kate/part/test_regression.cpp2
-rw-r--r--kate/plugins/autobookmarker/autobookmarker.cpp2
-rw-r--r--kate/plugins/insertfile/insertfileplugin.cpp6
-rw-r--r--kate/plugins/isearch/ISearchPlugin.cpp2
-rw-r--r--kate/plugins/kdatatool/kate_kdatatool.cpp2
-rw-r--r--kate/plugins/wordcompletion/docwordcompletion.cpp2
-rw-r--r--kded/kbuildimageiofactory.cpp4
-rw-r--r--kded/kbuildprotocolinfofactory.cpp4
-rw-r--r--kded/kbuildservicefactory.cpp4
-rw-r--r--kded/kbuildservicegroupfactory.cpp4
-rw-r--r--kded/kbuildservicetypefactory.cpp4
-rw-r--r--kded/kded.cpp4
-rw-r--r--kded/khostname.cpp4
-rw-r--r--kded/tde-menu.cpp4
-rw-r--r--kded/tdebuildsycoca.cpp6
-rw-r--r--kded/vfolder_menu.cpp2
-rw-r--r--kdewidgets/CMakeLists.txt2
-rw-r--r--kdewidgets/kde.widgets2
-rw-r--r--kdewidgets/tests/test.widgets2
-rw-r--r--kdoctools/meinproc.cpp2
-rw-r--r--kdoctools/tdeio_help.cpp4
-rw-r--r--kdoctools/xslt.cpp2
-rw-r--r--kimgio/dds.cpp2
-rw-r--r--kimgio/eps.cpp2
-rw-r--r--kimgio/exr.cpp2
-rw-r--r--kimgio/gimp.h2
-rw-r--r--kimgio/hdr.cpp2
-rw-r--r--kimgio/jp2.cpp2
-rw-r--r--kinit/autostart.cpp2
-rw-r--r--kinit/kinit.cpp6
-rw-r--r--kinit/tdelauncher.cpp8
-rw-r--r--kinit/tdelauncher_main.cpp2
-rw-r--r--knewstuff/downloaddialog.cpp4
-rw-r--r--knewstuff/engine.cpp4
-rw-r--r--knewstuff/entry.cpp4
-rw-r--r--knewstuff/ghns.cpp2
-rw-r--r--knewstuff/knewstuff.cpp2
-rw-r--r--knewstuff/knewstuffbutton.cpp2
-rw-r--r--knewstuff/knewstuffgeneric.cpp4
-rw-r--r--knewstuff/knewstuffsecure.cpp6
-rw-r--r--knewstuff/provider.cpp6
-rw-r--r--knewstuff/providerdialog.cpp4
-rw-r--r--knewstuff/security.cpp4
-rw-r--r--knewstuff/tdehotnewstuff.cpp2
-rw-r--r--knewstuff/testnewstuff.cpp2
-rw-r--r--knewstuff/uploaddialog.cpp4
-rw-r--r--kstyles/highcontrast/config/highcontrastconfig.cpp4
-rw-r--r--kstyles/klegacy/klegacystyle.cpp2
-rw-r--r--kstyles/klegacy/plugin.cpp2
-rw-r--r--kstyles/kthemestyle/kthemestyle.cpp2
-rw-r--r--kstyles/plastik/config/plastitdeconf.cpp4
-rw-r--r--kstyles/utils/installtheme/main.cpp4
-rw-r--r--kstyles/web/plugin.cpp2
-rw-r--r--kstyles/web/webstyle.cpp2
-rw-r--r--libtdemid/deviceman.cc2
-rw-r--r--libtdescreensaver/main.cpp4
-rw-r--r--networkstatus/connectionmanager.cpp4
-rw-r--r--networkstatus/networkstatusindicator.cpp2
-rw-r--r--tdeabc/CMakeLists.txt (renamed from kabc/CMakeLists.txt)10
-rw-r--r--tdeabc/HACKING (renamed from kabc/HACKING)0
-rw-r--r--tdeabc/HOWTO (renamed from kabc/HOWTO)16
-rw-r--r--tdeabc/Makefile.am (renamed from kabc/Makefile.am)0
-rw-r--r--tdeabc/README (renamed from kabc/README)0
-rw-r--r--tdeabc/README.AddressFormat (renamed from kabc/README.AddressFormat)0
-rw-r--r--tdeabc/TODO (renamed from kabc/TODO)0
-rw-r--r--tdeabc/address.cpp (renamed from kabc/address.cpp)6
-rw-r--r--tdeabc/address.h (renamed from kabc/address.h)0
-rw-r--r--tdeabc/addressbook.cpp (renamed from kabc/addressbook.cpp)4
-rw-r--r--tdeabc/addressbook.h (renamed from kabc/addressbook.h)0
-rw-r--r--tdeabc/addresseedialog.cpp (renamed from kabc/addresseedialog.cpp)2
-rw-r--r--tdeabc/addresseedialog.h (renamed from kabc/addresseedialog.h)0
-rw-r--r--tdeabc/addresseehelper.cpp (renamed from kabc/addresseehelper.cpp)2
-rw-r--r--tdeabc/addresseehelper.h (renamed from kabc/addresseehelper.h)0
-rw-r--r--tdeabc/addresseelist.cpp (renamed from kabc/addresseelist.cpp)0
-rw-r--r--tdeabc/addresseelist.h (renamed from kabc/addresseelist.h)0
-rw-r--r--tdeabc/addresslineedit.cpp (renamed from kabc/addresslineedit.cpp)4
-rw-r--r--tdeabc/addresslineedit.h (renamed from kabc/addresslineedit.h)0
-rw-r--r--tdeabc/agent.cpp (renamed from kabc/agent.cpp)0
-rw-r--r--tdeabc/agent.h (renamed from kabc/agent.h)0
-rw-r--r--tdeabc/countrytransl.map (renamed from kabc/countrytransl.map)0
-rw-r--r--tdeabc/distributionlist.cpp (renamed from kabc/distributionlist.cpp)6
-rw-r--r--tdeabc/distributionlist.h (renamed from kabc/distributionlist.h)0
-rw-r--r--tdeabc/distributionlistdialog.cpp (renamed from kabc/distributionlistdialog.cpp)4
-rw-r--r--tdeabc/distributionlistdialog.h (renamed from kabc/distributionlistdialog.h)0
-rw-r--r--tdeabc/distributionlisteditor.cpp (renamed from kabc/distributionlisteditor.cpp)2
-rw-r--r--tdeabc/distributionlisteditor.h (renamed from kabc/distributionlisteditor.h)0
-rw-r--r--tdeabc/errorhandler.cpp (renamed from kabc/errorhandler.cpp)4
-rw-r--r--tdeabc/errorhandler.h (renamed from kabc/errorhandler.h)0
-rw-r--r--tdeabc/field.h (renamed from kabc/field.h)0
-rw-r--r--tdeabc/format.h (renamed from kabc/format.h)0
-rw-r--r--tdeabc/formatfactory.cpp (renamed from kabc/formatfactory.cpp)4
-rw-r--r--tdeabc/formatfactory.h (renamed from kabc/formatfactory.h)0
-rw-r--r--tdeabc/formatplugin.h (renamed from kabc/formatplugin.h)0
-rw-r--r--tdeabc/formats/CMakeLists.txt (renamed from kabc/formats/CMakeLists.txt)4
-rw-r--r--tdeabc/formats/Makefile.am (renamed from kabc/formats/Makefile.am)4
-rw-r--r--tdeabc/formats/binary.desktop (renamed from kabc/formats/binary.desktop)0
-rw-r--r--tdeabc/formats/binaryformat.cpp (renamed from kabc/formats/binaryformat.cpp)10
-rw-r--r--tdeabc/formats/binaryformat.h (renamed from kabc/formats/binaryformat.h)0
-rw-r--r--tdeabc/geo.cpp (renamed from kabc/geo.cpp)0
-rw-r--r--tdeabc/geo.h (renamed from kabc/geo.h)0
-rw-r--r--tdeabc/kabc_manager.desktop (renamed from kabc/kabc_manager.desktop)0
-rw-r--r--tdeabc/key.cpp (renamed from kabc/key.cpp)2
-rw-r--r--tdeabc/key.h (renamed from kabc/key.h)0
-rw-r--r--tdeabc/ldapclient.cpp (renamed from kabc/ldapclient.cpp)0
-rw-r--r--tdeabc/ldapclient.h (renamed from kabc/ldapclient.h)0
-rw-r--r--tdeabc/ldapconfigwidget.cpp (renamed from kabc/ldapconfigwidget.cpp)4
-rw-r--r--tdeabc/ldapconfigwidget.h (renamed from kabc/ldapconfigwidget.h)4
-rw-r--r--tdeabc/ldapurl.cpp (renamed from kabc/ldapurl.cpp)0
-rw-r--r--tdeabc/ldapurl.h (renamed from kabc/ldapurl.h)0
-rw-r--r--tdeabc/ldif.cpp (renamed from kabc/ldif.cpp)0
-rw-r--r--tdeabc/ldif.h (renamed from kabc/ldif.h)0
-rw-r--r--tdeabc/ldifconverter.cpp (renamed from kabc/ldifconverter.cpp)2
-rw-r--r--tdeabc/ldifconverter.h (renamed from kabc/ldifconverter.h)0
-rw-r--r--tdeabc/lock.cpp (renamed from kabc/lock.cpp)10
-rw-r--r--tdeabc/lock.h (renamed from kabc/lock.h)0
-rw-r--r--tdeabc/locknull.cpp (renamed from kabc/locknull.cpp)2
-rw-r--r--tdeabc/locknull.h (renamed from kabc/locknull.h)0
-rw-r--r--tdeabc/phonenumber.cpp (renamed from kabc/phonenumber.cpp)2
-rw-r--r--tdeabc/phonenumber.h (renamed from kabc/phonenumber.h)0
-rw-r--r--tdeabc/picture.cpp (renamed from kabc/picture.cpp)0
-rw-r--r--tdeabc/picture.h (renamed from kabc/picture.h)0
-rw-r--r--tdeabc/plugin.cpp (renamed from kabc/plugin.cpp)0
-rw-r--r--tdeabc/plugin.h (renamed from kabc/plugin.h)0
-rw-r--r--tdeabc/plugins/CMakeLists.txt (renamed from kabc/plugins/CMakeLists.txt)0
-rw-r--r--tdeabc/plugins/Makefile.am (renamed from kabc/plugins/Makefile.am)0
-rw-r--r--tdeabc/plugins/dir/CMakeLists.txt (renamed from kabc/plugins/dir/CMakeLists.txt)2
-rw-r--r--tdeabc/plugins/dir/Makefile.am (renamed from kabc/plugins/dir/Makefile.am)2
-rw-r--r--tdeabc/plugins/dir/dir.desktop (renamed from kabc/plugins/dir/dir.desktop)0
-rw-r--r--tdeabc/plugins/dir/resourcedir.cpp (renamed from kabc/plugins/dir/resourcedir.cpp)4
-rw-r--r--tdeabc/plugins/dir/resourcedir.h (renamed from kabc/plugins/dir/resourcedir.h)2
-rw-r--r--tdeabc/plugins/dir/resourcedirconfig.cpp (renamed from kabc/plugins/dir/resourcedirconfig.cpp)2
-rw-r--r--tdeabc/plugins/dir/resourcedirconfig.h (renamed from kabc/plugins/dir/resourcedirconfig.h)0
-rw-r--r--tdeabc/plugins/dir/resourcedirplugin.cpp (renamed from kabc/plugins/dir/resourcedirplugin.cpp)0
-rw-r--r--tdeabc/plugins/evolution/Makefile.am (renamed from kabc/plugins/evolution/Makefile.am)2
-rw-r--r--tdeabc/plugins/evolution/README (renamed from kabc/plugins/evolution/README)0
-rw-r--r--tdeabc/plugins/evolution/dbwrapper.cpp (renamed from kabc/plugins/evolution/dbwrapper.cpp)0
-rw-r--r--tdeabc/plugins/evolution/dbwrapper.h (renamed from kabc/plugins/evolution/dbwrapper.h)0
-rw-r--r--tdeabc/plugins/evolution/evolution.desktop (renamed from kabc/plugins/evolution/evolution.desktop)0
-rw-r--r--tdeabc/plugins/evolution/resourceevo.cpp (renamed from kabc/plugins/evolution/resourceevo.cpp)6
-rw-r--r--tdeabc/plugins/evolution/resourceevo.h (renamed from kabc/plugins/evolution/resourceevo.h)0
-rw-r--r--tdeabc/plugins/file/CMakeLists.txt (renamed from kabc/plugins/file/CMakeLists.txt)2
-rw-r--r--tdeabc/plugins/file/Makefile.am (renamed from kabc/plugins/file/Makefile.am)4
-rw-r--r--tdeabc/plugins/file/file.desktop (renamed from kabc/plugins/file/file.desktop)0
-rw-r--r--tdeabc/plugins/file/resourcefile.cpp (renamed from kabc/plugins/file/resourcefile.cpp)8
-rw-r--r--tdeabc/plugins/file/resourcefile.h (renamed from kabc/plugins/file/resourcefile.h)2
-rw-r--r--tdeabc/plugins/file/resourcefileconfig.cpp (renamed from kabc/plugins/file/resourcefileconfig.cpp)2
-rw-r--r--tdeabc/plugins/file/resourcefileconfig.h (renamed from kabc/plugins/file/resourcefileconfig.h)0
-rw-r--r--tdeabc/plugins/file/resourcefileplugin.cpp (renamed from kabc/plugins/file/resourcefileplugin.cpp)0
-rw-r--r--tdeabc/plugins/ldaptdeio/CMakeLists.txt (renamed from kabc/plugins/ldaptdeio/CMakeLists.txt)2
-rw-r--r--tdeabc/plugins/ldaptdeio/Makefile.am (renamed from kabc/plugins/ldaptdeio/Makefile.am)2
-rw-r--r--tdeabc/plugins/ldaptdeio/ldaptdeio.desktop (renamed from kabc/plugins/ldaptdeio/ldaptdeio.desktop)0
-rw-r--r--tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp (renamed from kabc/plugins/ldaptdeio/resourceldaptdeio.cpp)10
-rw-r--r--tdeabc/plugins/ldaptdeio/resourceldaptdeio.h (renamed from kabc/plugins/ldaptdeio/resourceldaptdeio.h)4
-rw-r--r--tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp (renamed from kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp)4
-rw-r--r--tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h (renamed from kabc/plugins/ldaptdeio/resourceldaptdeioconfig.h)4
-rw-r--r--tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp (renamed from kabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp)4
-rw-r--r--tdeabc/plugins/net/CMakeLists.txt (renamed from kabc/plugins/net/CMakeLists.txt)2
-rw-r--r--tdeabc/plugins/net/Makefile.am (renamed from kabc/plugins/net/Makefile.am)4
-rw-r--r--tdeabc/plugins/net/net.desktop (renamed from kabc/plugins/net/net.desktop)0
-rw-r--r--tdeabc/plugins/net/resourcenet.cpp (renamed from kabc/plugins/net/resourcenet.cpp)4
-rw-r--r--tdeabc/plugins/net/resourcenet.h (renamed from kabc/plugins/net/resourcenet.h)2
-rw-r--r--tdeabc/plugins/net/resourcenetconfig.cpp (renamed from kabc/plugins/net/resourcenetconfig.cpp)2
-rw-r--r--tdeabc/plugins/net/resourcenetconfig.h (renamed from kabc/plugins/net/resourcenetconfig.h)0
-rw-r--r--tdeabc/plugins/net/resourcenetplugin.cpp (renamed from kabc/plugins/net/resourcenetplugin.cpp)0
-rw-r--r--tdeabc/plugins/sql/Makefile.am (renamed from kabc/plugins/sql/Makefile.am)0
-rw-r--r--tdeabc/plugins/sql/resourcesql.cpp (renamed from kabc/plugins/sql/resourcesql.cpp)4
-rw-r--r--tdeabc/plugins/sql/resourcesql.h (renamed from kabc/plugins/sql/resourcesql.h)0
-rw-r--r--tdeabc/plugins/sql/resourcesqlconfig.cpp (renamed from kabc/plugins/sql/resourcesqlconfig.cpp)2
-rw-r--r--tdeabc/plugins/sql/resourcesqlconfig.h (renamed from kabc/plugins/sql/resourcesqlconfig.h)0
-rw-r--r--tdeabc/plugins/sql/sql.desktop (renamed from kabc/plugins/sql/sql.desktop)0
-rw-r--r--tdeabc/resource.cpp (renamed from kabc/resource.cpp)2
-rw-r--r--tdeabc/resource.h (renamed from kabc/resource.h)0
-rw-r--r--tdeabc/resourceselectdialog.cpp (renamed from kabc/resourceselectdialog.cpp)2
-rw-r--r--tdeabc/resourceselectdialog.h (renamed from kabc/resourceselectdialog.h)0
-rw-r--r--tdeabc/scripts/Makefile.am (renamed from kabc/scripts/Makefile.am)0
-rw-r--r--tdeabc/scripts/addressee.src.cpp (renamed from kabc/scripts/addressee.src.cpp)2
-rw-r--r--tdeabc/scripts/addressee.src.h (renamed from kabc/scripts/addressee.src.h)0
-rwxr-xr-xtdeabc/scripts/createisomap.pl (renamed from kabc/scripts/createisomap.pl)0
-rw-r--r--tdeabc/scripts/entrylist (renamed from kabc/scripts/entrylist)0
-rw-r--r--tdeabc/scripts/field.src.cpp (renamed from kabc/scripts/field.src.cpp)4
-rwxr-xr-xtdeabc/scripts/makeaddressee (renamed from kabc/scripts/makeaddressee)0
-rw-r--r--tdeabc/secrecy.cpp (renamed from kabc/secrecy.cpp)2
-rw-r--r--tdeabc/secrecy.h (renamed from kabc/secrecy.h)0
-rw-r--r--tdeabc/sortmode.cpp (renamed from kabc/sortmode.cpp)2
-rw-r--r--tdeabc/sortmode.h (renamed from kabc/sortmode.h)2
-rw-r--r--tdeabc/sound.cpp (renamed from kabc/sound.cpp)0
-rw-r--r--tdeabc/sound.h (renamed from kabc/sound.h)0
-rw-r--r--tdeabc/stdaddressbook.cpp (renamed from kabc/stdaddressbook.cpp)6
-rw-r--r--tdeabc/stdaddressbook.h (renamed from kabc/stdaddressbook.h)0
-rw-r--r--tdeabc/tdeab2tdeabc.cpp (renamed from kabc/tdeab2tdeabc.cpp)6
-rw-r--r--tdeabc/tdeab2tdeabc.desktop (renamed from kabc/tdeab2tdeabc.desktop)8
-rw-r--r--tdeabc/tests/Makefile.am (renamed from kabc/tests/Makefile.am)4
-rw-r--r--tdeabc/tests/bigread.cpp (renamed from kabc/tests/bigread.cpp)2
-rw-r--r--tdeabc/tests/bigwrite.cpp (renamed from kabc/tests/bigwrite.cpp)2
-rw-r--r--tdeabc/tests/kabcargl.cpp (renamed from kabc/tests/kabcargl.cpp)2
-rw-r--r--tdeabc/tests/testaddressee.cpp (renamed from kabc/tests/testaddressee.cpp)2
-rw-r--r--tdeabc/tests/testaddresseelist.cpp (renamed from kabc/tests/testaddresseelist.cpp)2
-rw-r--r--tdeabc/tests/testaddressfmt.cpp (renamed from kabc/tests/testaddressfmt.cpp)2
-rw-r--r--tdeabc/tests/testaddresslineedit.cpp (renamed from kabc/tests/testaddresslineedit.cpp)2
-rw-r--r--tdeabc/tests/testdb.cpp (renamed from kabc/tests/testdb.cpp)2
-rw-r--r--tdeabc/tests/testdistlist.cpp (renamed from kabc/tests/testdistlist.cpp)2
-rw-r--r--tdeabc/tests/testkabc.cpp (renamed from kabc/tests/testkabc.cpp)2
-rw-r--r--tdeabc/tests/testkabcdlg.cpp (renamed from kabc/tests/testkabcdlg.cpp)2
-rw-r--r--tdeabc/tests/testldapclient.cpp (renamed from kabc/tests/testldapclient.cpp)0
-rw-r--r--tdeabc/tests/testldapclient.h (renamed from kabc/tests/testldapclient.h)0
-rw-r--r--tdeabc/tests/testlock.cpp (renamed from kabc/tests/testlock.cpp)4
-rw-r--r--tdeabc/tests/testlock.h (renamed from kabc/tests/testlock.h)0
-rw-r--r--tdeabc/timezone.cpp (renamed from kabc/timezone.cpp)0
-rw-r--r--tdeabc/timezone.h (renamed from kabc/timezone.h)0
-rw-r--r--tdeabc/vcard/AdrParam.cpp (renamed from kabc/vcard/AdrParam.cpp)0
-rw-r--r--tdeabc/vcard/AdrValue.cpp (renamed from kabc/vcard/AdrValue.cpp)0
-rw-r--r--tdeabc/vcard/AgentParam.cpp (renamed from kabc/vcard/AgentParam.cpp)0
-rw-r--r--tdeabc/vcard/AgentValue.cpp (renamed from kabc/vcard/AgentValue.cpp)0
-rw-r--r--tdeabc/vcard/CMakeLists.txt (renamed from kabc/vcard/CMakeLists.txt)0
-rw-r--r--tdeabc/vcard/ClassValue.cpp (renamed from kabc/vcard/ClassValue.cpp)0
-rw-r--r--tdeabc/vcard/ContentLine.cpp (renamed from kabc/vcard/ContentLine.cpp)0
-rw-r--r--tdeabc/vcard/DateParam.cpp (renamed from kabc/vcard/DateParam.cpp)0
-rw-r--r--tdeabc/vcard/DateValue.cpp (renamed from kabc/vcard/DateValue.cpp)0
-rw-r--r--tdeabc/vcard/EmailParam.cpp (renamed from kabc/vcard/EmailParam.cpp)0
-rw-r--r--tdeabc/vcard/Entity.cpp (renamed from kabc/vcard/Entity.cpp)0
-rw-r--r--tdeabc/vcard/Enum.cpp (renamed from kabc/vcard/Enum.cpp)0
-rw-r--r--tdeabc/vcard/FloatValue.cpp (renamed from kabc/vcard/FloatValue.cpp)0
-rw-r--r--tdeabc/vcard/GeoValue.cpp (renamed from kabc/vcard/GeoValue.cpp)0
-rw-r--r--tdeabc/vcard/ImageParam.cpp (renamed from kabc/vcard/ImageParam.cpp)0
-rw-r--r--tdeabc/vcard/ImageValue.cpp (renamed from kabc/vcard/ImageValue.cpp)0
-rw-r--r--tdeabc/vcard/ImgValue.cpp (renamed from kabc/vcard/ImgValue.cpp)0
-rw-r--r--tdeabc/vcard/LangValue.cpp (renamed from kabc/vcard/LangValue.cpp)0
-rw-r--r--tdeabc/vcard/Makefile.am (renamed from kabc/vcard/Makefile.am)0
-rw-r--r--tdeabc/vcard/NValue.cpp (renamed from kabc/vcard/NValue.cpp)0
-rw-r--r--tdeabc/vcard/OrgValue.cpp (renamed from kabc/vcard/OrgValue.cpp)0
-rw-r--r--tdeabc/vcard/Param.cpp (renamed from kabc/vcard/Param.cpp)0
-rw-r--r--tdeabc/vcard/PhoneNumberValue.cpp (renamed from kabc/vcard/PhoneNumberValue.cpp)0
-rw-r--r--tdeabc/vcard/README (renamed from kabc/vcard/README)0
-rw-r--r--tdeabc/vcard/RToken.cpp (renamed from kabc/vcard/RToken.cpp)0
-rw-r--r--tdeabc/vcard/SoundValue.cpp (renamed from kabc/vcard/SoundValue.cpp)0
-rw-r--r--tdeabc/vcard/SourceParam.cpp (renamed from kabc/vcard/SourceParam.cpp)0
-rw-r--r--tdeabc/vcard/TelParam.cpp (renamed from kabc/vcard/TelParam.cpp)0
-rw-r--r--tdeabc/vcard/TelValue.cpp (renamed from kabc/vcard/TelValue.cpp)0
-rw-r--r--tdeabc/vcard/TextBinParam.cpp (renamed from kabc/vcard/TextBinParam.cpp)0
-rw-r--r--tdeabc/vcard/TextBinValue.cpp (renamed from kabc/vcard/TextBinValue.cpp)0
-rw-r--r--tdeabc/vcard/TextListValue.cpp (renamed from kabc/vcard/TextListValue.cpp)0
-rw-r--r--tdeabc/vcard/TextParam.cpp (renamed from kabc/vcard/TextParam.cpp)0
-rw-r--r--tdeabc/vcard/TextValue.cpp (renamed from kabc/vcard/TextValue.cpp)0
-rw-r--r--tdeabc/vcard/URIValue.cpp (renamed from kabc/vcard/URIValue.cpp)0
-rw-r--r--tdeabc/vcard/UTCValue.cpp (renamed from kabc/vcard/UTCValue.cpp)0
-rw-r--r--tdeabc/vcard/VCard.cpp (renamed from kabc/vcard/VCard.cpp)0
-rw-r--r--tdeabc/vcard/VCardEntity.cpp (renamed from kabc/vcard/VCardEntity.cpp)0
-rw-r--r--tdeabc/vcard/Value.cpp (renamed from kabc/vcard/Value.cpp)0
-rw-r--r--tdeabc/vcard/include/VCard.h (renamed from kabc/vcard/include/VCard.h)0
-rw-r--r--tdeabc/vcard/include/VCardAdrParam.h (renamed from kabc/vcard/include/VCardAdrParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardAdrValue.h (renamed from kabc/vcard/include/VCardAdrValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardAgentParam.h (renamed from kabc/vcard/include/VCardAgentParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardAgentValue.h (renamed from kabc/vcard/include/VCardAgentValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardClassValue.h (renamed from kabc/vcard/include/VCardClassValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardContentLine.h (renamed from kabc/vcard/include/VCardContentLine.h)0
-rw-r--r--tdeabc/vcard/include/VCardDateParam.h (renamed from kabc/vcard/include/VCardDateParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardDateValue.h (renamed from kabc/vcard/include/VCardDateValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardDefines.h (renamed from kabc/vcard/include/VCardDefines.h)0
-rw-r--r--tdeabc/vcard/include/VCardEmailParam.h (renamed from kabc/vcard/include/VCardEmailParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardEntity.h (renamed from kabc/vcard/include/VCardEntity.h)0
-rw-r--r--tdeabc/vcard/include/VCardEnum.h (renamed from kabc/vcard/include/VCardEnum.h)0
-rw-r--r--tdeabc/vcard/include/VCardFloatValue.h (renamed from kabc/vcard/include/VCardFloatValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardGeoValue.h (renamed from kabc/vcard/include/VCardGeoValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardGroup.h (renamed from kabc/vcard/include/VCardGroup.h)0
-rw-r--r--tdeabc/vcard/include/VCardImageParam.h (renamed from kabc/vcard/include/VCardImageParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardImageValue.h (renamed from kabc/vcard/include/VCardImageValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardImgValue.h (renamed from kabc/vcard/include/VCardImgValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardLangValue.h (renamed from kabc/vcard/include/VCardLangValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardNValue.h (renamed from kabc/vcard/include/VCardNValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardOrgValue.h (renamed from kabc/vcard/include/VCardOrgValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardParam.h (renamed from kabc/vcard/include/VCardParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardPhoneNumberValue.h (renamed from kabc/vcard/include/VCardPhoneNumberValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardRToken.h (renamed from kabc/vcard/include/VCardRToken.h)0
-rw-r--r--tdeabc/vcard/include/VCardSndValue.h (renamed from kabc/vcard/include/VCardSndValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardSoundValue.h (renamed from kabc/vcard/include/VCardSoundValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardSourceParam.h (renamed from kabc/vcard/include/VCardSourceParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardTelParam.h (renamed from kabc/vcard/include/VCardTelParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardTelValue.h (renamed from kabc/vcard/include/VCardTelValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardTextBinParam.h (renamed from kabc/vcard/include/VCardTextBinParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardTextBinValue.h (renamed from kabc/vcard/include/VCardTextBinValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardTextListValue.h (renamed from kabc/vcard/include/VCardTextListValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardTextParam.h (renamed from kabc/vcard/include/VCardTextParam.h)0
-rw-r--r--tdeabc/vcard/include/VCardTextValue.h (renamed from kabc/vcard/include/VCardTextValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardURIValue.h (renamed from kabc/vcard/include/VCardURIValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardUTCValue.h (renamed from kabc/vcard/include/VCardUTCValue.h)0
-rw-r--r--tdeabc/vcard/include/VCardVCard.h (renamed from kabc/vcard/include/VCardVCard.h)0
-rw-r--r--tdeabc/vcard/include/VCardVCardEntity.h (renamed from kabc/vcard/include/VCardVCardEntity.h)0
-rw-r--r--tdeabc/vcard/include/VCardValue.h (renamed from kabc/vcard/include/VCardValue.h)0
-rw-r--r--tdeabc/vcard/include/generated/AdrParam-generated.h (renamed from kabc/vcard/include/generated/AdrParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/AdrValue-generated.h (renamed from kabc/vcard/include/generated/AdrValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/AgentParam-generated.h (renamed from kabc/vcard/include/generated/AgentParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/AgentValue-generated.h (renamed from kabc/vcard/include/generated/AgentValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/ClassValue-generated.h (renamed from kabc/vcard/include/generated/ClassValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/ContentLine-generated.h (renamed from kabc/vcard/include/generated/ContentLine-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/DateParam-generated.h (renamed from kabc/vcard/include/generated/DateParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/DateValue-generated.h (renamed from kabc/vcard/include/generated/DateValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/EmailParam-generated.h (renamed from kabc/vcard/include/generated/EmailParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/FloatValue-generated.h (renamed from kabc/vcard/include/generated/FloatValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/GeoValue-generated.h (renamed from kabc/vcard/include/generated/GeoValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/Group-generated.h (renamed from kabc/vcard/include/generated/Group-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/ImageParam-generated.h (renamed from kabc/vcard/include/generated/ImageParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/ImageValue-generated.h (renamed from kabc/vcard/include/generated/ImageValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/ImgParam-generated.h (renamed from kabc/vcard/include/generated/ImgParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/ImgValue-generated.h (renamed from kabc/vcard/include/generated/ImgValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/LangValue-generated.h (renamed from kabc/vcard/include/generated/LangValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/NValue-generated.h (renamed from kabc/vcard/include/generated/NValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/Name-generated.h (renamed from kabc/vcard/include/generated/Name-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/OrgValue-generated.h (renamed from kabc/vcard/include/generated/OrgValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/Param-generated.h (renamed from kabc/vcard/include/generated/Param-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/ParamName-generated.h (renamed from kabc/vcard/include/generated/ParamName-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/ParamValue-generated.h (renamed from kabc/vcard/include/generated/ParamValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/PhoneNumberValue-generated.h (renamed from kabc/vcard/include/generated/PhoneNumberValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/SoundValue-generated.h (renamed from kabc/vcard/include/generated/SoundValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/SourceParam-generated.h (renamed from kabc/vcard/include/generated/SourceParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/TelParam-generated.h (renamed from kabc/vcard/include/generated/TelParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/TelValue-generated.h (renamed from kabc/vcard/include/generated/TelValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/TextBinParam-generated.h (renamed from kabc/vcard/include/generated/TextBinParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/TextBinValue-generated.h (renamed from kabc/vcard/include/generated/TextBinValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/TextListValue-generated.h (renamed from kabc/vcard/include/generated/TextListValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/TextNSParam-generated.h (renamed from kabc/vcard/include/generated/TextNSParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/TextParam-generated.h (renamed from kabc/vcard/include/generated/TextParam-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/TextValue-generated.h (renamed from kabc/vcard/include/generated/TextValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/URIValue-generated.h (renamed from kabc/vcard/include/generated/URIValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/UTCValue-generated.h (renamed from kabc/vcard/include/generated/UTCValue-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/VCard-generated.h (renamed from kabc/vcard/include/generated/VCard-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/VCardEntity-generated.h (renamed from kabc/vcard/include/generated/VCardEntity-generated.h)0
-rw-r--r--tdeabc/vcard/include/generated/Value-generated.h (renamed from kabc/vcard/include/generated/Value-generated.h)0
-rwxr-xr-xtdeabc/vcard/include/generated/generate (renamed from kabc/vcard/include/generated/generate)0
-rwxr-xr-xtdeabc/vcard/include/generated/generateHeaders.awk (renamed from kabc/vcard/include/generated/generateHeaders.awk)0
-rw-r--r--tdeabc/vcard/include/generated/headerBodies (renamed from kabc/vcard/include/generated/headerBodies)0
-rw-r--r--tdeabc/vcard/testread.cpp (renamed from kabc/vcard/testread.cpp)0
-rw-r--r--tdeabc/vcard/testwrite.cpp (renamed from kabc/vcard/testwrite.cpp)2
-rw-r--r--tdeabc/vcard/vCard-all.cpp (renamed from kabc/vcard/vCard-all.cpp)0
-rw-r--r--tdeabc/vcard21parser.cpp (renamed from kabc/vcard21parser.cpp)0
-rw-r--r--tdeabc/vcard21parser.h (renamed from kabc/vcard21parser.h)0
-rw-r--r--tdeabc/vcardconverter.cpp (renamed from kabc/vcardconverter.cpp)0
-rw-r--r--tdeabc/vcardconverter.h (renamed from kabc/vcardconverter.h)0
-rw-r--r--tdeabc/vcardformat.cpp (renamed from kabc/vcardformat.cpp)0
-rw-r--r--tdeabc/vcardformat.h (renamed from kabc/vcardformat.h)0
-rw-r--r--tdeabc/vcardformatimpl.cpp (renamed from kabc/vcardformatimpl.cpp)10
-rw-r--r--tdeabc/vcardformatimpl.h (renamed from kabc/vcardformatimpl.h)0
-rw-r--r--tdeabc/vcardformatplugin.cpp (renamed from kabc/vcardformatplugin.cpp)0
-rw-r--r--tdeabc/vcardformatplugin.h (renamed from kabc/vcardformatplugin.h)0
-rw-r--r--tdeabc/vcardparser/CMakeLists.txt (renamed from kabc/vcardparser/CMakeLists.txt)0
-rw-r--r--tdeabc/vcardparser/Makefile.am (renamed from kabc/vcardparser/Makefile.am)10
-rw-r--r--tdeabc/vcardparser/README.testing (renamed from kabc/vcardparser/README.testing)0
-rwxr-xr-xtdeabc/vcardparser/checkvcard.pl (renamed from kabc/vcardparser/checkvcard.pl)0
-rw-r--r--tdeabc/vcardparser/testread.cpp (renamed from kabc/vcardparser/testread.cpp)2
-rw-r--r--tdeabc/vcardparser/testread2.cpp (renamed from kabc/vcardparser/testread2.cpp)2
-rw-r--r--tdeabc/vcardparser/tests/vcard1.vcf (renamed from kabc/vcardparser/tests/vcard1.vcf)0
-rw-r--r--tdeabc/vcardparser/tests/vcard1.vcf.ref (renamed from kabc/vcardparser/tests/vcard1.vcf.ref)0
-rw-r--r--tdeabc/vcardparser/tests/vcard2.vcf (renamed from kabc/vcardparser/tests/vcard2.vcf)0
-rw-r--r--tdeabc/vcardparser/tests/vcard2.vcf.ref (renamed from kabc/vcardparser/tests/vcard2.vcf.ref)0
-rw-r--r--tdeabc/vcardparser/tests/vcard3.vcf (renamed from kabc/vcardparser/tests/vcard3.vcf)0
-rw-r--r--tdeabc/vcardparser/tests/vcard3.vcf.ref (renamed from kabc/vcardparser/tests/vcard3.vcf.ref)0
-rw-r--r--tdeabc/vcardparser/tests/vcard4.vcf (renamed from kabc/vcardparser/tests/vcard4.vcf)0
-rw-r--r--tdeabc/vcardparser/tests/vcard4.vcf.ref (renamed from kabc/vcardparser/tests/vcard4.vcf.ref)0
-rw-r--r--tdeabc/vcardparser/tests/vcard5.vcf (renamed from kabc/vcardparser/tests/vcard5.vcf)0
-rw-r--r--tdeabc/vcardparser/tests/vcard5.vcf.ref (renamed from kabc/vcardparser/tests/vcard5.vcf.ref)0
-rw-r--r--tdeabc/vcardparser/tests/vcard6.vcf (renamed from kabc/vcardparser/tests/vcard6.vcf)0
-rw-r--r--tdeabc/vcardparser/tests/vcard6.vcf.ref (renamed from kabc/vcardparser/tests/vcard6.vcf.ref)0
-rw-r--r--tdeabc/vcardparser/tests/vcard7.vcf (renamed from kabc/vcardparser/tests/vcard7.vcf)0
-rw-r--r--tdeabc/vcardparser/tests/vcard7.vcf.ref (renamed from kabc/vcardparser/tests/vcard7.vcf.ref)0
-rw-r--r--tdeabc/vcardparser/testutils.cpp (renamed from kabc/vcardparser/testutils.cpp)2
-rw-r--r--tdeabc/vcardparser/testutils.h (renamed from kabc/vcardparser/testutils.h)2
-rw-r--r--tdeabc/vcardparser/testwrite.cpp (renamed from kabc/vcardparser/testwrite.cpp)14
-rw-r--r--tdeabc/vcardparser/vcard.cpp (renamed from kabc/vcardparser/vcard.cpp)0
-rw-r--r--tdeabc/vcardparser/vcard.h (renamed from kabc/vcardparser/vcard.h)0
-rw-r--r--tdeabc/vcardparser/vcardline.cpp (renamed from kabc/vcardparser/vcardline.cpp)0
-rw-r--r--tdeabc/vcardparser/vcardline.h (renamed from kabc/vcardparser/vcardline.h)0
-rw-r--r--tdeabc/vcardparser/vcardparser.cpp (renamed from kabc/vcardparser/vcardparser.cpp)0
-rw-r--r--tdeabc/vcardparser/vcardparser.h (renamed from kabc/vcardparser/vcardparser.h)0
-rw-r--r--tdeabc/vcardtool.cpp (renamed from kabc/vcardtool.cpp)0
-rw-r--r--tdeabc/vcardtool.h (renamed from kabc/vcardtool.h)0
-rw-r--r--tdecert/tdecertpart.cc4
-rw-r--r--tdecmshell/main.cpp6
-rw-r--r--tdeconf_update/tdeconf_update.cpp6
-rw-r--r--tdecore/CMakeLists.txt16
-rw-r--r--tdecore/MAINTAINERS10
-rw-r--r--tdecore/Makefile.am16
-rw-r--r--tdecore/kappdcopiface.cpp2
-rw-r--r--tdecore/kapplication_win.cpp2
-rw-r--r--tdecore/kcalendarsystem.cpp4
-rw-r--r--tdecore/kcalendarsystemgregorian.cpp2
-rw-r--r--tdecore/kcalendarsystemhebrew.cpp2
-rw-r--r--tdecore/kcalendarsystemhijri.cpp2
-rw-r--r--tdecore/kcalendarsystemjalali.cpp4
-rw-r--r--tdecore/kcharsets.cpp4
-rw-r--r--tdecore/kcheckaccelerators.cpp4
-rw-r--r--tdecore/kclipboard.cpp2
-rw-r--r--tdecore/kcompletion.cpp4
-rw-r--r--tdecore/kcompletion.h2
-rw-r--r--tdecore/kcrash.cpp2
-rw-r--r--tdecore/kdebug.areas2
-rw-r--r--tdecore/kdebug.cpp4
-rw-r--r--tdecore/kdebugrc2
-rw-r--r--tdecore/kdesktopfile.cpp2
-rw-r--r--tdecore/kdetcompmgr.cpp2
-rw-r--r--tdecore/kgenericfactory.h4
-rw-r--r--tdecore/kglobal.cpp6
-rw-r--r--tdecore/kglobalaccel.cpp2
-rw-r--r--tdecore/kglobalsettings.cpp6
-rw-r--r--tdecore/kiconeffect.cpp4
-rw-r--r--tdecore/kiconloader.cpp2
-rw-r--r--tdecore/kiconloader.h2
-rw-r--r--tdecore/kicontheme.cpp2
-rw-r--r--tdecore/kinstance.cpp4
-rw-r--r--tdecore/kkeynative_x11.cpp2
-rw-r--r--tdecore/kkeyserver_x11.cpp4
-rw-r--r--tdecore/klibloader.cpp2
-rw-r--r--tdecore/klibloader.h2
-rw-r--r--tdecore/klocale.cpp4
-rw-r--r--tdecore/klocale.h2
-rw-r--r--tdecore/klockfile.cpp4
-rw-r--r--tdecore/kmimesourcefactory.cpp2
-rw-r--r--tdecore/kmimesourcefactory.h2
-rw-r--r--tdecore/kpalette.cpp2
-rw-r--r--tdecore/kprotocolinfo_tdecore.cpp2
-rw-r--r--tdecore/kprotocolinfofactory.cpp2
-rw-r--r--tdecore/krootprop.cpp4
-rw-r--r--tdecore/ksavefile.h2
-rw-r--r--tdecore/ksimpleconfig.cpp2
-rw-r--r--tdecore/ksimpledirwatch.cpp2
-rw-r--r--tdecore/ksockaddr.cpp2
-rw-r--r--tdecore/ksocks.cpp2
-rw-r--r--tdecore/kstandarddirs.h2
-rw-r--r--tdecore/kstartupinfo.cpp4
-rw-r--r--tdecore/kstartupinfo.h2
-rw-r--r--tdecore/kstaticdeleter.h2
-rw-r--r--tdecore/kstringhandler.cpp2
-rw-r--r--tdecore/ktempdir.cpp2
-rw-r--r--tdecore/ktempfile.cpp4
-rw-r--r--tdecore/ktimezones.cpp2
-rw-r--r--tdecore/kuniqueapplication.cpp2
-rw-r--r--tdecore/kurl.cpp2
-rw-r--r--tdecore/kurldrag.cpp4
-rw-r--r--tdecore/kvmallocator.cpp2
-rw-r--r--tdecore/netsupp.cpp2
-rw-r--r--tdecore/network/kresolver.cpp2
-rw-r--r--tdecore/network/kresolverstandardworkers.cpp2
-rw-r--r--tdecore/network/tdesocketaddress.cpp2
-rw-r--r--tdecore/network/tdesocketbase.cpp2
-rw-r--r--tdecore/networkbackends/network-manager/network-manager_p.h2
-rw-r--r--tdecore/tde-config.cpp.cmake6
-rw-r--r--tdecore/tde-config.cpp.in6
-rw-r--r--tdecore/tdeaboutdata.h2
-rw-r--r--tdecore/tdeaccel.cpp2
-rw-r--r--tdecore/tdeaccelaction.cpp4
-rw-r--r--tdecore/tdeaccelbase.cpp4
-rw-r--r--tdecore/tdeapplication.cpp8
-rw-r--r--tdecore/tdecmdlineargs.cpp4
-rw-r--r--tdecore/tdeconfig.cpp2
-rw-r--r--tdecore/tdeconfig_compiler/example/autoexample.cpp4
-rw-r--r--tdecore/tdeconfig_compiler/example/example.cpp4
-rw-r--r--tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp8
-rw-r--r--tdecore/tdeconfig_compiler/tests/test2.cpp.ref2
-rw-r--r--tdecore/tdeconfig_compiler/tests/test8a.h.ref2
-rw-r--r--tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref2
-rw-r--r--tdecore/tdeconfigbackend.cpp4
-rw-r--r--tdecore/tdeconfigbackend.h2
-rw-r--r--tdecore/tdeconfigbase.cpp4
-rw-r--r--tdecore/tdeconfigdialogmanager.cpp2
-rw-r--r--tdecore/tdeconfigskeleton.cpp4
-rw-r--r--tdecore/tdeconfigskeleton.h2
-rw-r--r--tdecore/tdehardwaredevices.cpp6
-rw-r--r--tdecore/tdenetworkconnections.cpp2
-rw-r--r--tdecore/tdeshortcut.cpp4
-rw-r--r--tdecore/tdeshortcutlist.cpp2
-rw-r--r--tdecore/tdeshortcutmenu.cpp2
-rw-r--r--tdecore/tdestdaccel.cpp4
-rw-r--r--tdecore/tdesycoca.cpp2
-rw-r--r--tdecore/tests/Makefile.am2
-rw-r--r--tdecore/tests/kapptest.cpp2
-rw-r--r--tdecore/tests/kcalendartest.cpp4
-rw-r--r--tdecore/tests/kcmdlineargstest.cpp2
-rw-r--r--tdecore/tests/kglobaltest.cpp2
-rw-r--r--tdecore/tests/klocaletest.cpp6
-rw-r--r--tdecore/tests/kmdcodectest.cpp2
-rw-r--r--tdecore/tests/krfcdatetest.cpp2
-rw-r--r--tdecore/tests/ksocktest.cpp2
-rw-r--r--tdecore/tests/ktempfiletest.cpp2
-rw-r--r--tdecore/tests/kuniqueapptest.cpp2
-rw-r--r--tdecore/tests/kurltest.cpp2
-rw-r--r--tdecore/tests/startserviceby.cpp2
-rw-r--r--tdecore/tests/testqtargs.cpp2
-rw-r--r--tdecore/twin.cpp6
-rw-r--r--tdecore/twinmodule.cpp2
-rw-r--r--tdefile-plugins/elf/tdefile_elf.cpp2
-rw-r--r--tdehtml/css/csshelper.cpp2
-rw-r--r--tdehtml/css/cssparser.cpp2
-rw-r--r--tdehtml/css/cssstyleselector.cpp2
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp10
-rw-r--r--tdehtml/ecma/kjs_html.cpp4
-rw-r--r--tdehtml/ecma/kjs_mozilla.cpp2
-rw-r--r--tdehtml/ecma/kjs_navigator.cpp4
-rw-r--r--tdehtml/ecma/kjs_proxy.cpp6
-rw-r--r--tdehtml/ecma/kjs_window.cpp6
-rw-r--r--tdehtml/html/dtd.cpp2
-rw-r--r--tdehtml/html/html_documentimpl.cpp4
-rw-r--r--tdehtml/html/html_elementimpl.cpp2
-rw-r--r--tdehtml/html/html_formimpl.cpp6
-rw-r--r--tdehtml/html/html_imageimpl.cpp2
-rw-r--r--tdehtml/html/html_tableimpl.cpp2
-rw-r--r--tdehtml/html/htmlparser.cpp2
-rw-r--r--tdehtml/html/htmltokenizer.cpp2
-rw-r--r--tdehtml/java/kjavaapplet.cpp2
-rw-r--r--tdehtml/java/kjavaappletcontext.cpp4
-rw-r--r--tdehtml/java/kjavaappletserver.cpp4
-rw-r--r--tdehtml/java/kjavaappletviewer.cpp2
-rw-r--r--tdehtml/java/kjavaappletwidget.cpp2
-rw-r--r--tdehtml/java/kjavaprocess.cpp2
-rw-r--r--tdehtml/misc/arena.cpp2
-rw-r--r--tdehtml/misc/decoder.cpp4
-rw-r--r--tdehtml/misc/htmlhashes.cpp2
-rw-r--r--tdehtml/misc/htmltags.h2
-rw-r--r--tdehtml/misc/knsplugininstaller.cpp6
-rw-r--r--tdehtml/misc/loader.cpp4
-rw-r--r--tdehtml/misc/loader_jpeg.cpp2
-rw-r--r--tdehtml/misc/maketags2
-rw-r--r--tdehtml/rendering/font.cpp2
-rw-r--r--tdehtml/rendering/render_applet.cpp2
-rw-r--r--tdehtml/rendering/render_body.cpp2
-rw-r--r--tdehtml/rendering/render_box.cpp2
-rw-r--r--tdehtml/rendering/render_canvas.cpp2
-rw-r--r--tdehtml/rendering/render_flow.cpp2
-rw-r--r--tdehtml/rendering/render_form.cpp4
-rw-r--r--tdehtml/rendering/render_frames.cpp4
-rw-r--r--tdehtml/rendering/render_image.cpp2
-rw-r--r--tdehtml/rendering/render_inline.cpp2
-rw-r--r--tdehtml/rendering/render_line.cpp2
-rw-r--r--tdehtml/rendering/render_list.cpp2
-rw-r--r--tdehtml/rendering/render_object.cpp2
-rw-r--r--tdehtml/rendering/render_object.h2
-rw-r--r--tdehtml/rendering/render_replaced.cpp2
-rw-r--r--tdehtml/rendering/render_table.cpp2
-rw-r--r--tdehtml/rendering/render_text.cpp2
-rw-r--r--tdehtml/rendering/table_layout.cpp2
-rw-r--r--tdehtml/tdehtml_ext.cpp4
-rw-r--r--tdehtml/tdehtml_factory.cpp2
-rw-r--r--tdehtml/tdehtml_pagecache.cpp2
-rw-r--r--tdehtml/tdehtml_part.cpp10
-rw-r--r--tdehtml/tdehtml_printsettings.cpp2
-rw-r--r--tdehtml/tdehtml_run.cpp2
-rw-r--r--tdehtml/tdehtml_settings.cc8
-rw-r--r--tdehtml/tdehtmlimage.cpp2
-rw-r--r--tdehtml/tdehtmlview.cpp2
-rw-r--r--tdehtml/tdemultipart/tdemultipart.cpp6
-rw-r--r--tdehtml/test_regression.cpp2
-rw-r--r--tdehtml/xml/dom_docimpl.cpp4
-rw-r--r--tdehtml/xml/dom_nodeimpl.cpp2
-rw-r--r--tdehtml/xml/xml_tokenizer.cpp2
-rw-r--r--tdeio/bookmarks/kbookmark.cc4
-rw-r--r--tdeio/bookmarks/kbookmarkexporter.cc2
-rw-r--r--tdeio/bookmarks/kbookmarkimporter.cc2
-rw-r--r--tdeio/bookmarks/kbookmarkimporter_crash.cc2
-rw-r--r--tdeio/bookmarks/kbookmarkimporter_ie.cc2
-rw-r--r--tdeio/bookmarks/kbookmarkimporter_kde1.cc2
-rw-r--r--tdeio/bookmarks/kbookmarkimporter_ns.cc2
-rw-r--r--tdeio/bookmarks/kbookmarkimporter_opera.cc2
-rw-r--r--tdeio/bookmarks/kbookmarkmanager.cc4
-rw-r--r--tdeio/bookmarks/kbookmarkmenu.cc4
-rw-r--r--tdeio/bookmarks/kbookmarkmenu.h2
-rw-r--r--tdeio/bookmarks/kbookmarkmenu_p.h2
-rw-r--r--tdeio/httpfilter/httpfilter.cc2
-rw-r--r--tdeio/kpasswdserver/kpasswdserver.cpp4
-rw-r--r--tdeio/kssl/kssl.cc2
-rw-r--r--tdeio/kssl/ksslcertdlg.cc6
-rw-r--r--tdeio/kssl/ksslcertificate.cc4
-rw-r--r--tdeio/kssl/ksslinfodlg.cc6
-rw-r--r--tdeio/kssl/ksslkeygen.cc6
-rw-r--r--tdeio/kssl/ksslpemcallback.cc2
-rw-r--r--tdeio/kssl/ksslpkcs12.cc2
-rw-r--r--tdeio/kssl/ksslpkcs7.cc2
-rw-r--r--tdeio/kssl/ksslsettings.cc2
-rw-r--r--tdeio/kssl/ksslutils.cc4
-rw-r--r--tdeio/misc/kpac/discovery.cpp2
-rw-r--r--tdeio/misc/kpac/downloader.cpp4
-rw-r--r--tdeio/misc/kpac/proxyscout.cpp4
-rw-r--r--tdeio/misc/kssld/kssld.cpp2
-rw-r--r--tdeio/misc/tdefile/fileprops.cpp2
-rw-r--r--tdeio/misc/tdemailservice.cpp2
-rw-r--r--tdeio/misc/tdesendbugmail/main.cpp4
-rw-r--r--tdeio/misc/tdetelnetservice.cpp4
-rw-r--r--tdeio/misc/tdewalletd/tdewalletd.cpp6
-rw-r--r--tdeio/misc/tdewalletd/tdewalletwizard.ui2
-rw-r--r--tdeio/misc/uiserver.cpp6
-rw-r--r--tdeio/tdefile/CMakeLists.txt4
-rw-r--r--tdeio/tdefile/ChangeLog14
-rw-r--r--tdeio/tdefile/Makefile.am4
-rw-r--r--tdeio/tdefile/kacleditwidget.cpp2
-rw-r--r--tdeio/tdefile/kcombiview.cpp2
-rw-r--r--tdeio/tdefile/kcombiview.h2
-rw-r--r--tdeio/tdefile/kcustommenueditor.cpp4
-rw-r--r--tdeio/tdefile/kdiroperator.cpp8
-rw-r--r--tdeio/tdefile/kdirselectdialog.cpp6
-rw-r--r--tdeio/tdefile/kdirsize.cpp2
-rw-r--r--tdeio/tdefile/kencodingfiledialog.cpp6
-rw-r--r--tdeio/tdefile/kicondialog.cpp4
-rw-r--r--tdeio/tdefile/kimagefilepreview.cpp4
-rw-r--r--tdeio/tdefile/kmetaprops.cpp6
-rw-r--r--tdeio/tdefile/knotifydialog.cpp4
-rw-r--r--tdeio/tdefile/knotifydialog.h2
-rw-r--r--tdeio/tdefile/kopenwith.cpp4
-rw-r--r--tdeio/tdefile/kpreviewprops.cpp4
-rw-r--r--tdeio/tdefile/kpropertiesdialog.cpp8
-rw-r--r--tdeio/tdefile/kurlbar.cpp4
-rw-r--r--tdeio/tdefile/kurlcombobox.cpp4
-rw-r--r--tdeio/tdefile/kurlrequester.cpp4
-rw-r--r--tdeio/tdefile/kurlrequesterdlg.cpp4
-rw-r--r--tdeio/tdefile/tdefiledetailview.cpp6
-rw-r--r--tdeio/tdefile/tdefiledialog.cpp10
-rw-r--r--tdeio/tdefile/tdefilefiltercombo.cpp2
-rw-r--r--tdeio/tdefile/tdefileiconview.cpp4
-rw-r--r--tdeio/tdefile/tdefilemetainfowidget.cpp2
-rw-r--r--tdeio/tdefile/tdefilepreview.cpp2
-rw-r--r--tdeio/tdefile/tdefilesharedlg.cpp6
-rw-r--r--tdeio/tdefile/tdefilespeedbar.cpp6
-rw-r--r--tdeio/tdefile/tdefiletreeview.cpp2
-rw-r--r--tdeio/tdefile/tdefileview.cpp4
-rw-r--r--tdeio/tdefile/tderecentdirs.cpp2
-rw-r--r--tdeio/tdefile/tests/kcustommenueditortest.cpp2
-rw-r--r--tdeio/tdefile/tests/kdirselectdialogtest.cpp2
-rw-r--r--tdeio/tdefile/tests/kfdtest.cpp2
-rw-r--r--tdeio/tdefile/tests/kfstest.cpp4
-rw-r--r--tdeio/tdefile/tests/tdefiletreeviewtest.cpp2
-rw-r--r--tdeio/tdeio/CMakeLists.txt8
-rw-r--r--tdeio/tdeio/Makefile.am8
-rw-r--r--tdeio/tdeio/chmodjob.cpp4
-rw-r--r--tdeio/tdeio/dataslave.cpp2
-rw-r--r--tdeio/tdeio/defaultprogress.cpp4
-rw-r--r--tdeio/tdeio/global.cpp6
-rw-r--r--tdeio/tdeio/job.cpp10
-rw-r--r--tdeio/tdeio/kdcopservicestarter.cpp2
-rw-r--r--tdeio/tdeio/kdirlister.cpp8
-rw-r--r--tdeio/tdeio/kdirwatch.cpp2
-rw-r--r--tdeio/tdeio/kemailsettings.cpp4
-rw-r--r--tdeio/tdeio/kimageio.cpp4
-rw-r--r--tdeio/tdeio/kmessageboxwrapper.h2
-rw-r--r--tdeio/tdeio/kmimetype.cpp2
-rw-r--r--tdeio/tdeio/kmimetypechooser.cpp2
-rw-r--r--tdeio/tdeio/kprotocolinfo.cpp2
-rw-r--r--tdeio/tdeio/kprotocolmanager.cpp6
-rw-r--r--tdeio/tdeio/krun.cpp4
-rw-r--r--tdeio/tdeio/krun.h2
-rw-r--r--tdeio/tdeio/kscan.cpp2
-rw-r--r--tdeio/tdeio/kservice.cpp4
-rw-r--r--tdeio/tdeio/kservicefactory.cpp4
-rw-r--r--tdeio/tdeio/kservicegroup.cpp4
-rw-r--r--tdeio/tdeio/kservicegroupfactory.cpp4
-rw-r--r--tdeio/tdeio/kshred.cpp2
-rw-r--r--tdeio/tdeio/ktar.cpp2
-rw-r--r--tdeio/tdeio/kurlcompletion.cpp4
-rw-r--r--tdeio/tdeio/kuserprofile.cpp2
-rw-r--r--tdeio/tdeio/netaccess.cpp4
-rw-r--r--tdeio/tdeio/observer.cpp4
-rw-r--r--tdeio/tdeio/passdlg.cpp2
-rw-r--r--tdeio/tdeio/paste.cpp8
-rw-r--r--tdeio/tdeio/pastedialog.cpp2
-rw-r--r--tdeio/tdeio/previewjob.cpp4
-rw-r--r--tdeio/tdeio/renamedlg.cpp6
-rw-r--r--tdeio/tdeio/scheduler.cpp4
-rw-r--r--tdeio/tdeio/sessiondata.cpp6
-rw-r--r--tdeio/tdeio/skipdlg.cpp2
-rw-r--r--tdeio/tdeio/slave.cpp8
-rw-r--r--tdeio/tdeio/slavebase.cpp2
-rw-r--r--tdeio/tdeio/slaveconfig.cpp2
-rw-r--r--tdeio/tdeio/statusbarprogress.cpp2
-rw-r--r--tdeio/tdeio/tcpslavebase.cpp6
-rw-r--r--tdeio/tdeio/tdefilefilter.cpp2
-rw-r--r--tdeio/tdeio/tdefileitem.cpp6
-rw-r--r--tdeio/tdeio/tdefilemetainfo.cpp2
-rw-r--r--tdeio/tdeio/tdefileshare.cpp2
-rw-r--r--tdeio/tdeioexec/main.cpp6
-rw-r--r--tdeio/tests/kiopassdlgtest.cpp4
-rw-r--r--tdeio/tests/kpropsdlgtest.cpp2
-rw-r--r--tdeio/tests/kprotocolinfotest.cpp4
-rw-r--r--tdeio/tests/tdeioslavetest.cpp2
-rw-r--r--tdeioslave/file/file.cc6
-rw-r--r--tdeioslave/ftp/ftp.cc2
-rw-r--r--tdeioslave/http/http.cc2
-rw-r--r--tdeioslave/http/http_cache_cleaner.cpp6
-rw-r--r--tdeioslave/http/kcookiejar/kcookiewin.cpp4
-rw-r--r--tdeioslave/http/kcookiejar/main.cpp2
-rw-r--r--tdeioslave/metainfo/metainfo.cpp2
-rw-r--r--tdelfeditor/tdelfeditor.cpp2
-rw-r--r--tdemdi/tdemdi/dockcontainer.cpp4
-rw-r--r--tdemdi/tdemdi/guiclient.cpp2
-rw-r--r--tdemdi/tdemdi/mainwindow.cpp4
-rw-r--r--tdemdi/tdemdi/mainwindow.h2
-rw-r--r--tdemdi/tdemdichildarea.cpp4
-rw-r--r--tdemdi/tdemdichildfrm.cpp2
-rw-r--r--tdemdi/tdemdichildfrmcaption.cpp2
-rw-r--r--tdemdi/tdemdichildview.cpp2
-rw-r--r--tdemdi/tdemdidockcontainer.cpp4
-rw-r--r--tdemdi/tdemdiguiclient.cpp2
-rw-r--r--tdemdi/tdemdimainfrm.cpp4
-rw-r--r--tdemdi/tdemdimainfrm.h2
-rw-r--r--tdeparts/browserextension.cpp4
-rw-r--r--tdeparts/browserrun.cpp6
-rw-r--r--tdeparts/factory.cpp4
-rw-r--r--tdeparts/part.cpp6
-rw-r--r--tdeparts/partmanager.cpp2
-rw-r--r--tdeparts/plugin.cpp2
-rw-r--r--tdeparts/tests/example.cpp4
-rw-r--r--tdeparts/tests/ghostview.cpp4
-rw-r--r--tdeparts/tests/normalktm.cpp6
-rw-r--r--tdeparts/tests/notepad.cpp2
-rw-r--r--tdeparts/tests/parts.cpp4
-rw-r--r--tdeparts/tests/plugin_spellcheck.cpp4
-rw-r--r--tdeprint/cups/cupsaddsmb2.cpp4
-rw-r--r--tdeprint/cups/cupsdconf2/addressdialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/browsedialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdcomment.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdconf.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddialog.cpp6
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddirpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdjobspage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdlogpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp4
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdserverpage.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/cupsdsplash.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/editlist.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/locationdialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/main.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/portdialog.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp2
-rw-r--r--tdeprint/cups/cupsdconf2/sizewidget.cpp2
-rw-r--r--tdeprint/cups/cupsinfos.cpp2
-rw-r--r--tdeprint/cups/ippreportdlg.cpp4
-rw-r--r--tdeprint/cups/ipprequest.cpp4
-rw-r--r--tdeprint/cups/kmconfigcups.cpp2
-rw-r--r--tdeprint/cups/kmconfigcupsdir.cpp2
-rw-r--r--tdeprint/cups/kmcupsconfigwidget.cpp2
-rw-r--r--tdeprint/cups/kmcupsfactory.cpp2
-rw-r--r--tdeprint/cups/kmcupsjobmanager.cpp2
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp4
-rw-r--r--tdeprint/cups/kmcupsuimanager.cpp4
-rw-r--r--tdeprint/cups/kmpropbanners.cpp2
-rw-r--r--tdeprint/cups/kmpropquota.cpp2
-rw-r--r--tdeprint/cups/kmpropusers.cpp2
-rw-r--r--tdeprint/cups/kmwbanners.cpp2
-rw-r--r--tdeprint/cups/kmwfax.cpp2
-rw-r--r--tdeprint/cups/kmwipp.cpp2
-rw-r--r--tdeprint/cups/kmwippprinter.cpp4
-rw-r--r--tdeprint/cups/kmwippselect.cpp2
-rw-r--r--tdeprint/cups/kmwother.cpp2
-rw-r--r--tdeprint/cups/kmwquota.cpp2
-rw-r--r--tdeprint/cups/kmwusers.cpp2
-rw-r--r--tdeprint/cups/kphpgl2page.cpp2
-rw-r--r--tdeprint/cups/kpimagepage.cpp2
-rw-r--r--tdeprint/cups/kpschedulepage.cpp2
-rw-r--r--tdeprint/cups/kptagspage.cpp2
-rw-r--r--tdeprint/cups/kptextpage.cpp2
-rw-r--r--tdeprint/driver.cpp2
-rw-r--r--tdeprint/driverview.cpp2
-rw-r--r--tdeprint/droptionview.cpp2
-rw-r--r--tdeprint/ext/kextprinterimpl.cpp2
-rw-r--r--tdeprint/ext/kmextmanager.cpp2
-rw-r--r--tdeprint/ext/kmextuimanager.cpp2
-rw-r--r--tdeprint/foomatic/kfoomaticprinterimpl.cpp2
-rw-r--r--tdeprint/foomatic/kmfoomaticmanager.cpp2
-rw-r--r--tdeprint/foomatic2loader.cpp2
-rw-r--r--tdeprint/kmfactory.cpp4
-rw-r--r--tdeprint/kmjob.cpp2
-rw-r--r--tdeprint/kmmanager.cpp2
-rw-r--r--tdeprint/kmprinter.cpp2
-rw-r--r--tdeprint/kmspecialmanager.cpp4
-rw-r--r--tdeprint/kmuimanager.cpp2
-rw-r--r--tdeprint/kmvirtualmanager.cpp4
-rw-r--r--tdeprint/kpcopiespage.cpp2
-rw-r--r--tdeprint/kpdriverpage.cpp2
-rw-r--r--tdeprint/kpfileselectpage.cpp2
-rw-r--r--tdeprint/kpfilterpage.cpp4
-rw-r--r--tdeprint/kpgeneralpage.cpp2
-rw-r--r--tdeprint/kpmarginpage.cpp4
-rw-r--r--tdeprint/kpposterpage.cpp2
-rw-r--r--tdeprint/kpqtpage.cpp2
-rw-r--r--tdeprint/kprintaction.cpp2
-rw-r--r--tdeprint/kprintdialog.cpp6
-rw-r--r--tdeprint/kprinter.cpp6
-rw-r--r--tdeprint/kprinterimpl.cpp4
-rw-r--r--tdeprint/kprinterpropertydialog.cpp4
-rw-r--r--tdeprint/kprintpreview.cpp4
-rw-r--r--tdeprint/kprintprocess.cpp2
-rw-r--r--tdeprint/kxmlcommand.cpp4
-rw-r--r--tdeprint/lpd/klpdprinterimpl.cpp2
-rw-r--r--tdeprint/lpd/kmlpdmanager.cpp2
-rw-r--r--tdeprint/lpd/kmlpduimanager.cpp2
-rw-r--r--tdeprint/lpd/lpdtools.cpp2
-rw-r--r--tdeprint/lpdunix/klpdunixprinterimpl.cpp2
-rw-r--r--tdeprint/lpdunix/kmlpdunixmanager.cpp2
-rw-r--r--tdeprint/lpdunix/kmlpdunixuimanager.cpp2
-rw-r--r--tdeprint/lpr/apshandler.cpp2
-rw-r--r--tdeprint/lpr/editentrydialog.cpp2
-rw-r--r--tdeprint/lpr/kmconfiglpr.cpp2
-rw-r--r--tdeprint/lpr/kmlprjobmanager.cpp2
-rw-r--r--tdeprint/lpr/kmlprmanager.cpp4
-rw-r--r--tdeprint/lpr/kmlpruimanager.cpp2
-rw-r--r--tdeprint/lpr/lpchelper.cpp2
-rw-r--r--tdeprint/lpr/lprhandler.cpp2
-rw-r--r--tdeprint/lpr/lprngtoolhandler.cpp2
-rw-r--r--tdeprint/lpr/matichandler.cpp2
-rw-r--r--tdeprint/management/kaddprinterwizard.cpp6
-rw-r--r--tdeprint/management/kmconfigcommand.cpp2
-rw-r--r--tdeprint/management/kmconfigdialog.cpp2
-rw-r--r--tdeprint/management/kmconfigfilter.cpp2
-rw-r--r--tdeprint/management/kmconfigfonts.cpp2
-rw-r--r--tdeprint/management/kmconfiggeneral.cpp4
-rw-r--r--tdeprint/management/kmconfigjobs.cpp2
-rw-r--r--tdeprint/management/kmconfigpreview.cpp2
-rw-r--r--tdeprint/management/kmdbcreator.cpp2
-rw-r--r--tdeprint/management/kmdriverdb.cpp2
-rw-r--r--tdeprint/management/kmdriverdbwidget.cpp4
-rw-r--r--tdeprint/management/kmdriverdialog.cpp4
-rw-r--r--tdeprint/management/kminfopage.cpp2
-rw-r--r--tdeprint/management/kminstancepage.cpp4
-rw-r--r--tdeprint/management/kmjobviewer.cpp6
-rw-r--r--tdeprint/management/kmlistview.cpp2
-rw-r--r--tdeprint/management/kmmainview.cpp6
-rw-r--r--tdeprint/management/kmpages.cpp2
-rw-r--r--tdeprint/management/kmprinterview.cpp2
-rw-r--r--tdeprint/management/kmpropbackend.cpp2
-rw-r--r--tdeprint/management/kmpropcontainer.cpp2
-rw-r--r--tdeprint/management/kmpropdriver.cpp2
-rw-r--r--tdeprint/management/kmpropgeneral.cpp2
-rw-r--r--tdeprint/management/kmpropmembers.cpp2
-rw-r--r--tdeprint/management/kmpropwidget.cpp4
-rw-r--r--tdeprint/management/kmspecialprinterdlg.cpp4
-rw-r--r--tdeprint/management/kmwbackend.cpp2
-rw-r--r--tdeprint/management/kmwclass.cpp2
-rw-r--r--tdeprint/management/kmwdriver.cpp2
-rw-r--r--tdeprint/management/kmwdriverselect.cpp4
-rw-r--r--tdeprint/management/kmwdrivertest.cpp4
-rw-r--r--tdeprint/management/kmwend.cpp2
-rw-r--r--tdeprint/management/kmwfile.cpp2
-rw-r--r--tdeprint/management/kmwinfopage.cpp2
-rw-r--r--tdeprint/management/kmwizard.cpp4
-rw-r--r--tdeprint/management/kmwlocal.cpp4
-rw-r--r--tdeprint/management/kmwlpd.cpp4
-rw-r--r--tdeprint/management/kmwname.cpp4
-rw-r--r--tdeprint/management/kmwpassword.cpp2
-rw-r--r--tdeprint/management/kmwsmb.cpp2
-rw-r--r--tdeprint/management/kmwsocket.cpp4
-rw-r--r--tdeprint/management/kmwsocketutil.cpp4
-rw-r--r--tdeprint/management/kxmlcommanddlg.cpp4
-rw-r--r--tdeprint/management/kxmlcommandselector.cpp4
-rw-r--r--tdeprint/management/networkscanner.cpp4
-rw-r--r--tdeprint/management/smbview.cpp6
-rw-r--r--tdeprint/management/tdeprint_management_module.cpp4
-rw-r--r--tdeprint/marginpreview.cpp2
-rw-r--r--tdeprint/marginwidget.cpp4
-rw-r--r--tdeprint/plugincombobox.cpp2
-rw-r--r--tdeprint/posterpreview.cpp4
-rw-r--r--tdeprint/ppdloader.cpp2
-rw-r--r--tdeprint/printerfilter.cpp2
-rw-r--r--tdeprint/rlpr/kmconfigproxy.cpp2
-rw-r--r--tdeprint/rlpr/kmproprlpr.cpp2
-rw-r--r--tdeprint/rlpr/kmproxywidget.cpp2
-rw-r--r--tdeprint/rlpr/kmrlprmanager.cpp2
-rw-r--r--tdeprint/rlpr/kmrlpruimanager.cpp2
-rw-r--r--tdeprint/rlpr/kmwrlpr.cpp2
-rw-r--r--tdeprint/rlpr/krlprprinterimpl.cpp2
-rw-r--r--tdeprint/tdefilelist.cpp2
-rw-r--r--tdeprint/tdeprintd.cpp4
-rw-r--r--tdeprint/tests/helpwindow.cpp2
-rw-r--r--tdeprint/tools/escputil/escpwidget.cpp4
-rw-r--r--tdeprint/util.h2
-rw-r--r--tderandr/ktimerdialog.cpp2
-rw-r--r--tderandr/libtderandr.cc4
-rw-r--r--tderandr/randr.cpp4
-rw-r--r--tderesources/configdialog.cpp4
-rw-r--r--tderesources/configpage.cpp4
-rw-r--r--tderesources/factory.cpp2
-rw-r--r--tderesources/kcmtderesources.cpp2
-rw-r--r--tderesources/resource.cpp2
-rw-r--r--tderesources/selectdialog.cpp4
-rw-r--r--tdersync/rsyncconfigdialog.cpp4
-rw-r--r--tdersync/tdersync.h4
-rw-r--r--tdespell2/settings.cpp4
-rw-r--r--tdespell2/ui/configdialog.cpp2
-rw-r--r--tdespell2/ui/configwidget.cpp2
-rw-r--r--tdespell2/ui/dialog.cpp2
-rw-r--r--tdesu/ssh.cpp2
-rw-r--r--tdesu/su.cpp2
-rw-r--r--tdeui/CMakeLists.txt8
-rw-r--r--tdeui/MAINTAINERS4
-rw-r--r--tdeui/Makefile.am8
-rw-r--r--tdeui/kauthicon.cpp2
-rw-r--r--tdeui/kbugreport.cpp6
-rw-r--r--tdeui/kbuttonbox.cpp2
-rw-r--r--tdeui/kcharselect.cpp2
-rw-r--r--tdeui/kcmenumngr.cpp2
-rw-r--r--tdeui/kcolorbutton.cpp2
-rw-r--r--tdeui/kcolorcombo.cpp8
-rw-r--r--tdeui/kcolordialog.cpp8
-rw-r--r--tdeui/kcombobox.cpp2
-rw-r--r--tdeui/kcommand.cpp2
-rw-r--r--tdeui/kcursor.cpp2
-rw-r--r--tdeui/kdatepicker.cpp4
-rw-r--r--tdeui/kdatetbl.cpp6
-rw-r--r--tdeui/kdatewidget.cpp4
-rw-r--r--tdeui/kdialog.cpp4
-rw-r--r--tdeui/kdialogbase.cpp6
-rw-r--r--tdeui/kdockwidget.cpp6
-rw-r--r--tdeui/kdualcolorbutton.cpp2
-rw-r--r--tdeui/keditcl1.cpp4
-rw-r--r--tdeui/keditcl2.cpp4
-rw-r--r--tdeui/keditlistbox.cpp2
-rw-r--r--tdeui/kedittoolbar.cpp4
-rw-r--r--tdeui/kguiitem.h2
-rw-r--r--tdeui/khelpmenu.cpp4
-rw-r--r--tdeui/kiconview.cpp4
-rw-r--r--tdeui/kiconviewsearchline.cpp2
-rw-r--r--tdeui/kjanuswidget.cpp6
-rw-r--r--tdeui/kkeybutton.cpp2
-rw-r--r--tdeui/kkeydialog.cpp6
-rw-r--r--tdeui/klineedit.cpp2
-rw-r--r--tdeui/klineeditdlg.cpp2
-rw-r--r--tdeui/kmenubar.cpp8
-rw-r--r--tdeui/kmessagebox.cpp6
-rw-r--r--tdeui/knuminput.cpp4
-rw-r--r--tdeui/knumvalidator.cpp4
-rw-r--r--tdeui/kpanelmenu.cpp2
-rw-r--r--tdeui/kpassdlg.cpp6
-rw-r--r--tdeui/kpassivepopup.cpp2
-rw-r--r--tdeui/kpixmapio.cpp2
-rw-r--r--tdeui/kpixmapregionselectordialog.cpp2
-rw-r--r--tdeui/kpixmapregionselectorwidget.cpp2
-rw-r--r--tdeui/kprogress.cpp2
-rw-r--r--tdeui/kprogressbox.cpp2
-rw-r--r--tdeui/kpushbutton.cpp4
-rw-r--r--tdeui/ksconfig.cpp4
-rw-r--r--tdeui/kscrollview.cpp2
-rw-r--r--tdeui/ksplashscreen.cpp4
-rw-r--r--tdeui/kstatusbar.cpp2
-rw-r--r--tdeui/kstdaction.cpp4
-rw-r--r--tdeui/kstdaction_p.h2
-rw-r--r--tdeui/kstdguiitem.cpp2
-rw-r--r--tdeui/kswitchlanguagedialog.cpp4
-rw-r--r--tdeui/ksyntaxhighlighter.cpp4
-rw-r--r--tdeui/ksystemtray.cpp4
-rw-r--r--tdeui/ksystemtray.h2
-rw-r--r--tdeui/ktabbar.cpp4
-rw-r--r--tdeui/ktextbrowser.cpp2
-rw-r--r--tdeui/ktextedit.cpp4
-rw-r--r--tdeui/ktimezonewidget.cpp2
-rw-r--r--tdeui/ktip.cpp6
-rw-r--r--tdeui/kurllabel.cpp2
-rw-r--r--tdeui/kwhatsthismanager.cpp2
-rw-r--r--tdeui/kwizard.cpp4
-rw-r--r--tdeui/kxmlguibuilder.cpp6
-rw-r--r--tdeui/kxmlguifactory.cpp2
-rw-r--r--tdeui/kxmlguifactory_p.cpp2
-rw-r--r--tdeui/tdeaboutapplication.cpp4
-rw-r--r--tdeui/tdeaboutdialog.cpp6
-rw-r--r--tdeui/tdeabouttde.cpp2
-rw-r--r--tdeui/tdeaction.cpp2
-rw-r--r--tdeui/tdeactionclasses.cpp4
-rw-r--r--tdeui/tdeactionselector.cpp2
-rw-r--r--tdeui/tdecmodule.cpp4
-rw-r--r--tdeui/tdecompletionbox.cpp2
-rw-r--r--tdeui/tdeconfigdialog.cpp2
-rw-r--r--tdeui/tdefontcombo.cpp2
-rw-r--r--tdeui/tdefontdialog.cpp6
-rw-r--r--tdeui/tdefontrequester.cpp2
-rw-r--r--tdeui/tdelistbox.cpp2
-rw-r--r--tdeui/tdelistview.cpp2
-rw-r--r--tdeui/tdelistviewsearchline.cpp2
-rw-r--r--tdeui/tdemainwindow.cpp4
-rw-r--r--tdeui/tdeshortcutdialog.cpp4
-rw-r--r--tdeui/tdespell.cpp4
-rw-r--r--tdeui/tdespelldlg.cpp2
-rw-r--r--tdeui/tdetoolbar.cpp4
-rw-r--r--tdeui/tdetoolbar.h2
-rw-r--r--tdeui/tdetoolbarbutton.cpp4
-rw-r--r--tdeui/tdetoolbarbutton.h2
-rw-r--r--tdeui/tdetoolbarhandler.cpp2
-rw-r--r--tdeui/tests/itemcontainertest.cpp2
-rw-r--r--tdeui/tests/kaboutdialogtest.cpp2
-rw-r--r--tdeui/tests/kcharselecttest.cpp2
-rw-r--r--tdeui/tests/kcolordlgtest.cpp2
-rw-r--r--tdeui/tests/kcomboboxtest.cpp2
-rw-r--r--tdeui/tests/kcompletiontest.cpp2
-rw-r--r--tdeui/tests/kdatepicktest.cpp2
-rw-r--r--tdeui/tests/kdatetimewidgettest.cpp2
-rw-r--r--tdeui/tests/kdatewidgettest.cpp2
-rw-r--r--tdeui/tests/kdockwidgettest.cpp2
-rw-r--r--tdeui/tests/kdualcolortest.cpp2
-rw-r--r--tdeui/tests/klineedittest.cpp4
-rw-r--r--tdeui/tests/kmessageboxtest.cpp4
-rw-r--r--tdeui/tests/kstatusbartest.cpp2
-rw-r--r--tdeui/tests/kstatusbartest.h2
-rw-r--r--tdeui/tests/ktimewidgettest.cpp2
-rw-r--r--tdeui/tests/tdemainwindowtest.cpp2
-rw-r--r--tdeui/tests/twindowtest.cpp4
-rw-r--r--tdeui/tests/twindowtest.h2
-rw-r--r--tdeui/twindowlistmenu.cpp2
-rw-r--r--tdeunittest/modrunner.cpp4
-rw-r--r--tdeunittest/runner.cpp2
-rw-r--r--tdeunittest/tester.h2
-rw-r--r--tdeutils/kcmultidialog.cpp4
-rw-r--r--tdeutils/kcmultidialog.h2
-rw-r--r--tdeutils/kfind.cpp4
-rw-r--r--tdeutils/kfinddialog.cpp4
-rw-r--r--tdeutils/kplugininfo.cpp2
-rw-r--r--tdeutils/kpluginselector.cpp6
-rw-r--r--tdeutils/kreplace.cpp4
-rw-r--r--tdeutils/kreplacedialog.cpp4
-rw-r--r--tdeutils/ksettings/componentsdialog.cpp2
-rw-r--r--tdeutils/ksettings/dialog.cpp2
-rw-r--r--tdeutils/tdecmodulecontainer.cpp2
-rw-r--r--tdeutils/tdecmoduleinfo.cpp4
-rw-r--r--tdeutils/tdecmoduleloader.cpp4
-rw-r--r--tdeutils/tdecmoduleproxy.cpp2
-rw-r--r--tdewallet/backend/tdewalletbackend.cc4
-rw-r--r--tdewallet/tests/tdewalletasync.cpp2
-rw-r--r--tdewallet/tests/tdewalletboth.cpp2
-rw-r--r--tdewallet/tests/tdewalletsync.cpp2
-rw-r--r--win/pro_files/kabc/kabc.pro4
-rw-r--r--win/pro_files/kabc/vcard/vcard.pro4
-rw-r--r--win/pro_files/kio/kio.pro6
-rw-r--r--win/pro_files/tdecore/tdecore.pro10
-rw-r--r--win/pro_files/tdeui/tdeui.pro4
-rw-r--r--win/tools/build_tdelibs_dbg2
-rw-r--r--win/tools/build_tdelibs_rel2
1077 files changed, 1372 insertions, 1372 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a9f23a4..ac1ecf1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -953,7 +953,7 @@ add_subdirectory( kinit )
add_subdirectory( tdeprint )
add_subdirectory( kab )
add_subdirectory( tderesources )
-add_subdirectory( kabc )
+add_subdirectory( tdeabc )
add_subdirectory( arts )
add_subdirectory( interfaces )
add_subdirectory( kate )
diff --git a/KDE2PORTING.html b/KDE2PORTING.html
index b375854d..322efffb 100644
--- a/KDE2PORTING.html
+++ b/KDE2PORTING.html
@@ -204,9 +204,9 @@ must have created a TDEApplication object before the methods can be used.<P>
<TR>
<TD COLSPAN="2">
<PRE>
- #include &lt;kglobal.h&gt;
+ #include &lt;tdeglobal.h&gt;
#include &lt;tdeconfig.h&gt; // Needed to use TDEConfig
- #include &lt;klocale.h&gt; // Needed to use TDELocale
+ #include &lt;tdelocale.h&gt; // Needed to use TDELocale
#include &lt;kiconloader.h&gt; // Needed to use TDEIconLoader
</PRE>
</TD>
diff --git a/Mainpage.dox b/Mainpage.dox
index 15904678..702510fc 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -49,8 +49,8 @@
* (<a target="_top" href="interfaces/html/classes.html">classes</a>)\n
* <i>Defines interfaces for common components so that new implementations
* can be dropped in.</i>
- * - <a target="_top" href="kabc/html/index.html"><b>kabc</b></a>
- * (<a target="_top" href="kabc/html/classes.html">classes</a>)\n
+ * - <a target="_top" href="tdeabc/html/index.html"><b>kabc</b></a>
+ * (<a target="_top" href="tdeabc/html/classes.html">classes</a>)\n
* <i>Access to the Trinity address book.</i>
* - <a target="_top" href="tderesources/html/index.html"><b>tderesources</b></a>
* (<a target="_top" href="tderesources/html/classes.html">classes</a>)\n
diff --git a/Makefile.am.in b/Makefile.am.in
index 83d0901f..2ebb4f8c 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -39,7 +39,7 @@ potdir = $(kde_includes)
pot_DATA = kde.pot
messages:
- cd kabc/scripts && perl ./makeaddressee
+ cd tdeabc/scripts && perl ./makeaddressee
find . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
mfs=`find . -name Makefile.am | xargs egrep -l '^messages:'` ;\
for dir in $$mfs; do \
diff --git a/arts/kde/kaudioplaystream.cpp b/arts/kde/kaudioplaystream.cpp
index 52743a67..0ef5b833 100644
--- a/arts/kde/kaudioplaystream.cpp
+++ b/arts/kde/kaudioplaystream.cpp
@@ -26,7 +26,7 @@
#include <artsflow.h>
#include <soundserver.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tqstring.h>
diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp
index 0d180d1f..0c11bcf0 100644
--- a/arts/kde/kaudiorecordstream.cpp
+++ b/arts/kde/kaudiorecordstream.cpp
@@ -29,7 +29,7 @@
#include <artsflow.h>
#include <soundserver.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tqstring.h>
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc
index 70c4b791..647c2f32 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cc
@@ -3,7 +3,7 @@
#include <tqfile.h>
#include <tqobject.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index 01ce8f3f..ed9a3fad 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -2,7 +2,7 @@
#include <kmedia2.h>
#include <tdecmdlineargs.h>
#include <connect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include "qiomanager.h"
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index df6ed645..93bfac38 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -2,7 +2,7 @@
#include <kmedia2.h>
#include <tdecmdlineargs.h>
#include <connect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <stdsynthmodule.h>
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index 389228d9..c03a18c2 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -27,7 +27,7 @@
#endif
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kvideowidget.h"
diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp
index d134aeca..d5e8c864 100644
--- a/arts/kde/mcop-dcop/kmcop.cpp
+++ b/arts/kde/mcop-dcop/kmcop.cpp
@@ -20,7 +20,7 @@
#include <kuniqueapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include <tqvaluelist.h>
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 3d0e45d0..313a7a99 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -52,9 +52,9 @@
#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 <kpassivepopup.h>
#include <kiconloader.h>
#include <kmacroexpander.h>
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index 4eb62f1f..eaa5c8e2 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -31,11 +31,11 @@ Gnome, etc. and used instead.
#include <tqregexp.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdecmdlineargs.h>
// command line options
diff --git a/configure.in.in b/configure.in.in
index 651d6f2e..c414bafd 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -249,7 +249,7 @@ AC_SUBST(LIBRESOLV)
AC_SUBST(LIBICE)
AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
-AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
+AC_SUBST(LIB_KABC, '$(top_builddir)/tdeabc/libkabc.la')
AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index c4d77c61..fb2db0eb 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <kdcopservicestarter.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ksimpleconfig.h>
#include <kiconloader.h>
#include <kservice.h>
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 7dd746c4..370805a7 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -5,10 +5,10 @@
#include <tqlayout.h>
#include <tqvgroupbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemediaplayer/player.h>
#include <kmimetype.h>
#include <tdeparts/componentfactory.h>
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index ad6c8df2..803feb3a 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -21,8 +21,8 @@
#include <tdeapplication.h>
#include <tdeparts/part.h>
#include <tdeparts/componentfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdesktopfile.h>
#include <kstandarsdirs.h>
diff --git a/interfaces/tdescript/scriptmanager.cpp b/interfaces/tdescript/scriptmanager.cpp
index 42e20cd5..a0dfbe92 100644
--- a/interfaces/tdescript/scriptmanager.cpp
+++ b/interfaces/tdescript/scriptmanager.cpp
@@ -5,8 +5,8 @@
#include <kdesktopfile.h>
#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
//using namespace KScriptInterface;
diff --git a/interfaces/tdetexteditor/CMakeLists.txt b/interfaces/tdetexteditor/CMakeLists.txt
index 0808a84f..ca0176ce 100644
--- a/interfaces/tdetexteditor/CMakeLists.txt
+++ b/interfaces/tdetexteditor/CMakeLists.txt
@@ -90,7 +90,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 0.0.0
- LINK tdeui-shared kabc-shared tdeparts-shared
+ LINK tdeui-shared tdeabc-shared tdeparts-shared
DEPENDENCIES dcopidl dcopidl2cpp
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am
index b535b39c..4b1590ab 100644
--- a/interfaces/tdetexteditor/Makefile.am
+++ b/interfaces/tdetexteditor/Makefile.am
@@ -46,7 +46,7 @@ servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetextedit
kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
-templateinterface.lo: $(top_builddir)/kabc/addressee.h
+templateinterface.lo: $(top_builddir)/tdeabc/addressee.h
include ../../admin/Doxyfile.am
diff --git a/interfaces/tdetexteditor/editorchooser.cpp b/interfaces/tdetexteditor/editorchooser.cpp
index aed904c5..1eddfb8d 100644
--- a/interfaces/tdetexteditor/editorchooser.cpp
+++ b/interfaces/tdetexteditor/editorchooser.cpp
@@ -6,7 +6,7 @@
#include <tdeconfig.h>
#include <tqstringlist.h>
#include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tdeapplication.h>
#include <tqlayout.h>
diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp
index ecc34c7e..01e0c292 100644
--- a/interfaces/tdetexteditor/templateinterface.cpp
+++ b/interfaces/tdetexteditor/templateinterface.cpp
@@ -22,11 +22,11 @@
#include <addressee.h>
#include <addresseedialog.h>
#include <tqstring.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tqdatetime.h>
#include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcalendarsystem.h>
#include <unistd.h>
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cc
index bcce6fdb..8130f85d 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cc
@@ -8,7 +8,7 @@
#include <tdeapplication.h>
#include <tqdir.h>
#include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <cassert>
#include "main.h"
#include "main.moc"
diff --git a/kab/addressbook.cc b/kab/addressbook.cc
index ab73111b..852f56d5 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cc
@@ -22,11 +22,11 @@
#include <tqstringlist.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
extern "C" {
#include <sys/stat.h>
diff --git a/kab/kabapi.cc b/kab/kabapi.cc
index 05cffe94..7f2159e2 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cc
@@ -18,8 +18,8 @@
#include "kabapi.h"
#include <tdelistbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index d904e16c..9bbe317d 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -27,7 +27,7 @@
#include "katejscript.h"
#include "kateview.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdepopupmenu.h>
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index 5a1a085c..f29ec991 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -23,7 +23,7 @@
#include "katedocument.h"
#include "kateview.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
#include <kstringhandler.h>
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 7d930570..61f81fad 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -31,7 +31,7 @@
#include "kateautoindent.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <tqpopupmenu.h>
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index ad894332..09dd46f1 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -32,7 +32,7 @@
#include "../interfaces/katecmd.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <kshellcompletion.h>
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 9c8e0856..ed4eaacd 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -29,9 +29,9 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kcharsets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kfinddialog.h>
#include <kreplacedialog.h>
#include <kinstance.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 03257735..1b8ce89e 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -53,15 +53,15 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdefontdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kkeybutton.h>
#include <kkeydialog.h>
#include <klineedit.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetypechooser.h>
#include <knuminput.h>
#include <tdeparts/componentfactory.h>
@@ -72,7 +72,7 @@
#include <krun.h>
#include <kseparator.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 1928ec22..e42bfb0b 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -49,24 +49,24 @@
#include <tdeparts/event.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <tdepopupmenu.h>
#include <tdeconfig.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstdaction.h>
#include <kiconloader.h>
#include <kxmlguifactory.h>
#include <kdialogbase.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <klibloader.h>
#include <kdirwatch.h>
#include <twin.h>
#include <kencodingfiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmdcodec.h>
#include <kstandarddirs.h>
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index a2a2c640..adc0dc92 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -38,7 +38,7 @@
#include <dcopobject.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqintdict.h>
#include <tqmap.h>
diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp
index e50906b0..b2e43758 100644
--- a/kate/part/katedocumenthelpers.cpp
+++ b/kate/part/katedocumenthelpers.cpp
@@ -25,7 +25,7 @@
#include "kateview.h"
#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
: KParts::BrowserExtension( doc, "katepartbrowserextension" ),
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index eb760aaf..d6a9e0d5 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -34,7 +34,7 @@
#include "../interfaces/katecmd.h"
#include <kvmallocator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdirwatch.h>
#include <kstaticdeleter.h>
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index f0b01ef2..281bf7e2 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tqregexp.h>
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp
index 29955d7e..c0095346 100644
--- a/kate/part/katefont.cpp
+++ b/kate/part/katefont.cpp
@@ -21,7 +21,7 @@
#include "katefont.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqfontinfo.h>
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index f6d5ae31..119b718f 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -33,16 +33,16 @@
#include "kateconfig.h"
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kregexp.h>
#include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstaticdeleter.h>
#include <tdeapplication.h>
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index f3a5cd54..cab33531 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -35,8 +35,8 @@
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <kjs/function_object.h>
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index 46cf531a..375b0b7d 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -32,8 +32,8 @@
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
extern "C" {
#include <lua.h>
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 6f22b240..e6611974 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -35,7 +35,7 @@
#include <kdebug.h>
#include <kdialog.h> // for spacingHint()
#include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <kurl.h>
#include <kuser.h> // for loginName
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 388513f1..5b71c92e 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -27,7 +27,7 @@
#include "kateview.h"
#include "katerenderer.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include <kcolorbutton.h>
#include <kcombobox.h>
@@ -35,7 +35,7 @@
#include <tdefontdialog.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kcolordialog.h>
#include <tdeapplication.h>
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 9d0dc896..930e4d90 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -31,9 +31,9 @@
#include "kateconfig.h"
#include "katehighlight.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstringhandler.h>
#include <kdebug.h>
#include <kfinddialog.h>
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index fc7e943c..494e5289 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -31,7 +31,7 @@
#include <tdespell.h>
#include <ksconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
KateSpell::KateSpell( KateView* view )
: TQObject( view )
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index d90f5de7..700daa9d 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -25,8 +25,8 @@
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tqfile.h>
diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp
index 6c701e1e..00589260 100644
--- a/kate/part/katetextline.cpp
+++ b/kate/part/katetextline.cpp
@@ -23,7 +23,7 @@
#include "katetextline.h"
#include "katerenderer.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqregexp.h>
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 92d1bb97..821cb0fa 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -57,10 +57,10 @@
#include <kdebug.h>
#include <tdeapplication.h>
#include <kcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kxmlguifactory.h>
@@ -68,7 +68,7 @@
#include <klibloader.h>
#include <kencodingfiledialog.h>
#include <tdemultipledrag.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <ksavefile.h>
#include <tqfont.h>
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index e8df70aa..dd52451b 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -33,10 +33,10 @@
#include "kateviewinternal.h"
#include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <tdepopupmenu.h>
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index a687c552..c2b0ca4d 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -38,7 +38,7 @@
#include <kcursor.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kurldrag.h>
#include <tqstyle.h>
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index a503020c..1b6decfe 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -45,7 +45,7 @@
#include <tdeio/job.h>
#include <tdemainwindow.h>
#include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqcolor.h>
#include <tqcursor.h>
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp
index 495233d4..3f87f158 100644
--- a/kate/plugins/autobookmarker/autobookmarker.cpp
+++ b/kate/plugins/autobookmarker/autobookmarker.cpp
@@ -34,7 +34,7 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
#include <kmimetypechooser.h>
#include <kprocess.h>
diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp
index 567262a6..e2e3d354 100644
--- a/kate/plugins/insertfile/insertfileplugin.cpp
+++ b/kate/plugins/insertfile/insertfileplugin.cpp
@@ -28,10 +28,10 @@
#include <tdeaction.h>
#include <tdefiledialog.h>
#include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurl.h>
#include <tqfile.h>
diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp
index a36c9dc6..7cb01ccc 100644
--- a/kate/plugins/isearch/ISearchPlugin.cpp
+++ b/kate/plugins/isearch/ISearchPlugin.cpp
@@ -21,7 +21,7 @@
#include <tqstyle.h>
#include <tqpopupmenu.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kcombobox.h>
#include <tdeconfig.h>
diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp
index d3b762b8..e14cd924 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.cpp
+++ b/kate/plugins/kdatatool/kate_kdatatool.cpp
@@ -29,7 +29,7 @@
#include <tdepopupmenu.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
//END includes
diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp
index 4a3d3420..26dce06d 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.cpp
+++ b/kate/plugins/wordcompletion/docwordcompletion.cpp
@@ -37,7 +37,7 @@
#include <tdeconfig.h>
#include <kdialog.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <knotifyclient.h>
#include <tdeparts/part.h>
diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp
index 267af31f..b5873cad 100644
--- a/kded/kbuildimageiofactory.cpp
+++ b/kded/kbuildimageiofactory.cpp
@@ -20,10 +20,10 @@
#include "tdesycocadict.h"
#include "kresourcelist.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
#include <kimageiofactory.h>
diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp
index f3fe698d..921e55ab 100644
--- a/kded/kbuildprotocolinfofactory.cpp
+++ b/kded/kbuildprotocolinfofactory.cpp
@@ -21,11 +21,11 @@
#include "tdesycocadict.h"
#include "kresourcelist.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kmessageboxwrapper.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
KBuildProtocolInfoFactory::KBuildProtocolInfoFactory() :
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 7d9406d3..6f127caf 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -23,10 +23,10 @@
#include "kresourcelist.h"
#include "kmimetype.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kmessageboxwrapper.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <assert.h>
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index 76f27ba5..3903a6b3 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -21,11 +21,11 @@
#include "tdesycocadict.h"
#include "kresourcelist.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kmessageboxwrapper.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
KBuildServiceGroupFactory::KBuildServiceGroupFactory() :
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index 351b7847..da286334 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -21,11 +21,11 @@
#include "tdesycocadict.h"
#include "kresourcelist.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kmessageboxwrapper.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
#include <kdesktopfile.h>
diff --git a/kded/kded.cpp b/kded/kded.cpp
index b6e6b523..947d3b81 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -38,8 +38,8 @@
#include <kuniqueapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kprocess.h>
#include <kdebug.h>
#include <kdirwatch.h>
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 7585e0ad..c78152b9 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -30,9 +30,9 @@
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kprocess.h>
#include <kde_file.h>
diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp
index 4ad6bc3d..4cf7a843 100644
--- a/kded/tde-menu.cpp
+++ b/kded/tde-menu.cpp
@@ -26,8 +26,8 @@
#include "tdeaboutdata.h"
#include "tdeapplication.h"
#include "tdecmdlineargs.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
#include "kservice.h"
#include "kservicegroup.h"
#include "kstandarddirs.h"
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index aa03c2c9..4325162f 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -42,12 +42,12 @@
#include <assert.h>
#include <tdeapplication.h>
#include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kdirwatch.h>
#include <kstandarddirs.h>
#include <ksavefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kcrash.h>
@@ -55,7 +55,7 @@
#ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build
// GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
# include <tqlabel.h>
-# include <kmessagebox.h>
+# include <tdemessagebox.h>
bool silent;
bool showprogress;
#endif
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index e2dc603b..408c6af9 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -23,7 +23,7 @@
#include <stdlib.h> // getenv
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kservice.h>
#include <kde_file.h>
diff --git a/kdewidgets/CMakeLists.txt b/kdewidgets/CMakeLists.txt
index a0a6f29d..19768e7e 100644
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
@@ -61,6 +61,6 @@ add_custom_command( OUTPUT kdewidgets.cpp
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
)
diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets
index c81df539..81b5ba82 100644
--- a/kdewidgets/kde.widgets
+++ b/kdewidgets/kde.widgets
@@ -272,7 +272,7 @@ Group=Display (KDE)
ConstructorArgs=(parent, 210, 16)
[KABC::LdapConfigWidget]
-IncludeFile=kabc/ldapconfigwidget.h
+IncludeFile=tdeabc/ldapconfigwidget.h
ToolTip=A widget which allows the user to set up LDAP connection parameters
Group=Input (KDE)
ConstructorArgs=(KABC::LdapConfigWidget::W_ALL, parent, name)
diff --git a/kdewidgets/tests/test.widgets b/kdewidgets/tests/test.widgets
index 30758f69..aa5ade88 100644
--- a/kdewidgets/tests/test.widgets
+++ b/kdewidgets/tests/test.widgets
@@ -261,7 +261,7 @@ Group=Display (KDE)
ConstructorArgs=(parent, 210, 16)
[KABC::AddressLineEdit]
-IncludeFile=kabc/addresslineedit.h
+IncludeFile=tdeabc/addresslineedit.h
ToolTip=A lineedit with LDAP and kabc completion.
Group=Input (KDE)
ConstructorArgs=(parent, true, name)
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index d0a1b732..51f0b913 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -19,7 +19,7 @@
#include <tqfile.h>
#include <tqdir.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <stdlib.h>
#include <kdebug.h>
diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp
index d9f306b4..7b9d2a36 100644
--- a/kdoctools/tdeio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -25,8 +25,8 @@
#include <kdebug.h>
#include <kurl.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kinstance.h>
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index 2eb03cfb..498e6b2c 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -12,7 +12,7 @@
#include <xslt.h>
#include <kinstance.h>
#include "tdeio_help.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
#include <kfilterbase.h>
#include <kfilterdev.h>
diff --git a/kimgio/dds.cpp b/kimgio/dds.cpp
index d174bf89..22251002 100644
--- a/kimgio/dds.cpp
+++ b/kimgio/dds.cpp
@@ -24,7 +24,7 @@
#include <tqimage.h>
#include <tqdatastream.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <math.h> // sqrtf
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index d839ffe3..bcf91683 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -6,7 +6,7 @@
#include <tqpainter.h>
#include <tqprinter.h>
#include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "eps.h"
diff --git a/kimgio/exr.cpp b/kimgio/exr.cpp
index c28cb799..563c151a 100644
--- a/kimgio/exr.cpp
+++ b/kimgio/exr.cpp
@@ -35,7 +35,7 @@
#include <kurl.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/kimgio/gimp.h b/kimgio/gimp.h
index 114ffdc0..7da1a45f 100644
--- a/kimgio/gimp.h
+++ b/kimgio/gimp.h
@@ -21,7 +21,7 @@
*
*/
-#include <kglobal.h>
+#include <tdeglobal.h>
/*
* These are the constants and functions I extracted from The GIMP source
diff --git a/kimgio/hdr.cpp b/kimgio/hdr.cpp
index 82cba5c1..5f1832f0 100644
--- a/kimgio/hdr.cpp
+++ b/kimgio/hdr.cpp
@@ -14,7 +14,7 @@
#include <tqdatastream.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
typedef TQ_UINT8 uchar;
diff --git a/kimgio/jp2.cpp b/kimgio/jp2.cpp
index 2200c948..5de8fff8 100644
--- a/kimgio/jp2.cpp
+++ b/kimgio/jp2.cpp
@@ -12,7 +12,7 @@
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqcolor.h>
#include <tqcstring.h>
#include <tqfile.h>
diff --git a/kinit/autostart.cpp b/kinit/autostart.cpp
index 4e4ad1f5..ccdbd3d9 100644
--- a/kinit/autostart.cpp
+++ b/kinit/autostart.cpp
@@ -24,7 +24,7 @@
#include <tdeconfig.h>
#include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <stdlib.h>
diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
index f6b4a3e5..1dc03002 100644
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
@@ -54,11 +54,11 @@
#include <tqfont.h>
#include <kinstance.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <klibloader.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
@@ -68,7 +68,7 @@
#endif
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#include <kstartupinfo.h> // schroder
+#include <tdestartupinfo.h> // schroder
#endif
#include <tdeversion.h>
diff --git a/kinit/tdelauncher.cpp b/kinit/tdelauncher.cpp
index 7b75bfaf..f7ca0867 100644
--- a/kinit/tdelauncher.cpp
+++ b/kinit/tdelauncher.cpp
@@ -32,16 +32,16 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeprotocolmanager.h>
#include <kprotocolinfo.h>
#include <krun.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurl.h>
#if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#include <kstartupinfo.h> // schroder
+#include <tdestartupinfo.h> // schroder
#endif
diff --git a/kinit/tdelauncher_main.cpp b/kinit/tdelauncher_main.cpp
index d59cfb86..74705066 100644
--- a/kinit/tdelauncher_main.cpp
+++ b/kinit/tdelauncher_main.cpp
@@ -31,7 +31,7 @@
#include <stdlib.h>
#include <signal.h>
#include <tqcstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "tdelauncher_cmds.h"
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index ccbde83d..8c31712c 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -21,12 +21,12 @@
#include "downloaddialog.h"
#include "downloaddialog.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kdebug.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp
index a22750f8..2b33e85f 100644
--- a/knewstuff/engine.cpp
+++ b/knewstuff/engine.cpp
@@ -25,8 +25,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include "knewstuff.h"
diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp
index 56dd375f..00f7df52 100644
--- a/knewstuff/entry.cpp
+++ b/knewstuff/entry.cpp
@@ -23,8 +23,8 @@
#include <tqptrdict.h>
#include <tqwindowdefs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KNS;
diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp
index dfe86a2a..0702f16b 100644
--- a/knewstuff/ghns.cpp
+++ b/knewstuff/ghns.cpp
@@ -28,7 +28,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kprocess.h>
#include <kdialog.h>
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index 07034b45..b652ba4a 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -21,7 +21,7 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "engine.h"
diff --git a/knewstuff/knewstuffbutton.cpp b/knewstuff/knewstuffbutton.cpp
index 3ad0d6ac..3baa8339 100644
--- a/knewstuff/knewstuffbutton.cpp
+++ b/knewstuff/knewstuffbutton.cpp
@@ -18,7 +18,7 @@
*/
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "downloaddialog.h"
#include "knewstuffbutton.h"
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp
index aa94559b..ef6a3745 100644
--- a/knewstuff/knewstuffgeneric.cpp
+++ b/knewstuff/knewstuffgeneric.cpp
@@ -24,11 +24,11 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ktar.h>
#include "entry.h"
diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp
index b6192424..67374800 100644
--- a/knewstuff/knewstuffsecure.cpp
+++ b/knewstuff/knewstuffsecure.cpp
@@ -18,10 +18,10 @@
//kde includes
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <ktar.h>
#include <ktempdir.h>
diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp
index d5da6bdd..20f1668f 100644
--- a/knewstuff/provider.cpp
+++ b/knewstuff/provider.cpp
@@ -21,9 +21,9 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeio/job.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tqptrdict.h>
#include <tqwindowdefs.h>
diff --git a/knewstuff/providerdialog.cpp b/knewstuff/providerdialog.cpp
index ddc0b2ef..f71558ec 100644
--- a/knewstuff/providerdialog.cpp
+++ b/knewstuff/providerdialog.cpp
@@ -23,8 +23,8 @@
#include <tqlabel.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "engine.h"
#include "provider.h"
diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp
index d9ad85a7..d161c296 100644
--- a/knewstuff/security.cpp
+++ b/knewstuff/security.cpp
@@ -22,9 +22,9 @@
//kde includes
#include <kdebug.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpassdlg.h>
#include <kprocio.h>
diff --git a/knewstuff/tdehotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp
index 87d73533..fb9e92a9 100644
--- a/knewstuff/tdehotnewstuff.cpp
+++ b/knewstuff/tdehotnewstuff.cpp
@@ -20,7 +20,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp
index 82b6d18f..3494c523 100644
--- a/knewstuff/testnewstuff.cpp
+++ b/knewstuff/testnewstuff.cpp
@@ -27,7 +27,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kprocess.h>
#include <kdialog.h>
diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp
index 98f8f60c..f4b3dd50 100644
--- a/knewstuff/uploaddialog.cpp
+++ b/knewstuff/uploaddialog.cpp
@@ -27,10 +27,10 @@
#include <ktextedit.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <kuser.h>
diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp
index 9de7f1bf..f271113c 100644
--- a/kstyles/highcontrast/config/highcontrastconfig.cpp
+++ b/kstyles/highcontrast/config/highcontrastconfig.cpp
@@ -28,8 +28,8 @@ DEALINGS IN THE SOFTWARE.
#include <tqlayout.h>
#include <tqsettings.h>
#include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "highcontrastconfig.h"
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index 5c083632..a169de87 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -24,7 +24,7 @@
#include "klegacystyle.h"
#include "klegacystyle.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#define INCLUDE_MENUITEM_DEF
diff --git a/kstyles/klegacy/plugin.cpp b/kstyles/klegacy/plugin.cpp
index 5d3a5849..558b54e7 100644
--- a/kstyles/klegacy/plugin.cpp
+++ b/kstyles/klegacy/plugin.cpp
@@ -1,5 +1,5 @@
#include "klegacystyle.h"
-#include <klocale.h>
+#include <tdelocale.h>
extern "C" {
TDEStyle* allocate();
diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp
index 4cc374e5..a164821b 100644
--- a/kstyles/kthemestyle/kthemestyle.cpp
+++ b/kstyles/kthemestyle/kthemestyle.cpp
@@ -53,7 +53,7 @@ Port version 0.9.7
#include <tqpalette.h>
#include <tqtabbar.h>
#include <tqtoolbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdrawutil.h>
#include <tqdrawutil.h>
#include <tqprogressbar.h>
diff --git a/kstyles/plastik/config/plastitdeconf.cpp b/kstyles/plastik/config/plastitdeconf.cpp
index 8d3e4acf..38cda242 100644
--- a/kstyles/plastik/config/plastitdeconf.cpp
+++ b/kstyles/plastik/config/plastitdeconf.cpp
@@ -30,8 +30,8 @@ DEALINGS IN THE SOFTWARE.
#include <tqsettings.h>
#include <tqcolor.h>
#include <tqgroupbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <kdemacros.h>
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index 274c2d33..3ce63dfd 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -27,8 +27,8 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kstyles/web/plugin.cpp b/kstyles/web/plugin.cpp
index 6ab10ebd..bd4371ce 100644
--- a/kstyles/web/plugin.cpp
+++ b/kstyles/web/plugin.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include "webstyle.h"
extern "C"
diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp
index d96688ee..b3b46195 100644
--- a/kstyles/web/webstyle.cpp
+++ b/kstyles/web/webstyle.cpp
@@ -34,7 +34,7 @@
#include <tdeapplication.h>
#include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/libtdemid/deviceman.cc b/libtdemid/deviceman.cc
index b8210af6..fec0ff09 100644
--- a/libtdemid/deviceman.cc
+++ b/libtdemid/deviceman.cc
@@ -67,7 +67,7 @@
#if 1
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#endif
diff --git a/libtdescreensaver/main.cpp b/libtdescreensaver/main.cpp
index f9d8ccb1..073d7845 100644
--- a/libtdescreensaver/main.cpp
+++ b/libtdescreensaver/main.cpp
@@ -24,8 +24,8 @@
#include <signal.h>
#include <tqdialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp
index c37214ec..f3622088 100644
--- a/networkstatus/connectionmanager.cpp
+++ b/networkstatus/connectionmanager.cpp
@@ -20,8 +20,8 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstaticdeleter.h>
#include "clientiface_stub.h"
diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp
index 957d6f73..a77f1c1f 100644
--- a/networkstatus/networkstatusindicator.cpp
+++ b/networkstatus/networkstatusindicator.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqtooltip.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "connectionmanager.h"
diff --git a/kabc/CMakeLists.txt b/tdeabc/CMakeLists.txt
index 57c4741f..e0ec832d 100644
--- a/kabc/CMakeLists.txt
+++ b/tdeabc/CMakeLists.txt
@@ -53,14 +53,14 @@ install( FILES
ldapclient.h addresseelist.h locknull.h ldif.h
ldapurl.h ldapconfigwidget.h sortmode.h
${CMAKE_CURRENT_BINARY_DIR}/addressee.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
##### other data ################################
install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
-install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
+install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/tdeabc )
##### generated files ###########################
@@ -80,9 +80,9 @@ add_custom_command(
)
-##### kabc ######################################
+##### tdeabc ######################################
-set( target kabc )
+set( target tdeabc )
set( ${target}_SRCS
address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp
@@ -118,6 +118,6 @@ set( ${target}_SRCS
tde_add_executable( ${target}
SOURCES ${${target}_SRCS}
- LINK kab-static kabc-shared
+ LINK kab-static tdeabc-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kabc/HACKING b/tdeabc/HACKING
index 429ae086..429ae086 100644
--- a/kabc/HACKING
+++ b/tdeabc/HACKING
diff --git a/kabc/HOWTO b/tdeabc/HOWTO
index 7b41371b..3941b203 100644
--- a/kabc/HOWTO
+++ b/tdeabc/HOWTO
@@ -96,7 +96,7 @@ a special class KABC::StdAddressBook, which loads all resources of the standard
address book of the user automatically. You can use it the following way:
- #include <kabc/stdaddressbook.h>
+ #include <tdeabc/stdaddressbook.h>
1: KABC::AddressBook *ab = KABC::StdAddressBook::self();
2: KABC::AddressBook::Iterator it;
@@ -125,8 +125,8 @@ class KABC::AddressBook and handle the resource stuff manually.
The following code will create a file resource and save a contact into it:
- #include <kabc/addressbook.h>
- #include <kabc/resourcefile.h>
+ #include <tdeabc/addressbook.h>
+ #include <tdeabc/resourcefile.h>
1: KABC::AddressBook ab;
2:
@@ -320,8 +320,8 @@ track of all available distribution lists and the latter one is the
representation of one list.
- #include <kabc/distributionlist.h>
- #include <kabc/stdaddressbook.h>
+ #include <tdeabc/distributionlist.h>
+ #include <tdeabc/stdaddressbook.h>
1: KABC::DistributionListManager manager( KABC::StdAddressBook::self() );
2:
@@ -344,7 +344,7 @@ In the first line a KABC::DistributionListManager is created. The manager takes
a pointer to a KABC::AddressBook, because he has to resolve the stored uids to
currently available email addresses.
In line 4 the manager loads all distribution lists from the central config file
-$HOME/.trinity/share/apps/kabc/distlists.
+$HOME/.trinity/share/apps/tdeabc/distlists.
The next line queries the names of all available distribution lists, which are
used in line 9 to retrieve a pointer to the specific list.
Now that you have a KABC::DistributionList object, you can performe the
@@ -357,13 +357,13 @@ following actions on it:
In line 12 we query all email addresses of every resource and print them out.
-<kabc/distributionlist.h> contains also the declaration for the class
+<tdeabc/distributionlist.h> contains also the declaration for the class
KABC::DistributionListWatcher. This class exists only once per application and
its only job is to emit a signal as soon as the distribution list file has
changed. So to make your application aware of changes use the following code:
- #include <kabc/distributionlist.h>
+ #include <tdeabc/distributionlist.h>
1: connect( KABC::DistributionListWatcher::self(), SIGNAL( changed() ),
2: this, SLOT( slotDistributionListChanged() ) );
diff --git a/kabc/Makefile.am b/tdeabc/Makefile.am
index 57e72aec..57e72aec 100644
--- a/kabc/Makefile.am
+++ b/tdeabc/Makefile.am
diff --git a/kabc/README b/tdeabc/README
index 46d21b9b..46d21b9b 100644
--- a/kabc/README
+++ b/tdeabc/README
diff --git a/kabc/README.AddressFormat b/tdeabc/README.AddressFormat
index 8079e491..8079e491 100644
--- a/kabc/README.AddressFormat
+++ b/tdeabc/README.AddressFormat
diff --git a/kabc/TODO b/tdeabc/TODO
index 13f75b6b..13f75b6b 100644
--- a/kabc/TODO
+++ b/tdeabc/TODO
diff --git a/kabc/address.cpp b/tdeabc/address.cpp
index 46b483b4..112a7061 100644
--- a/kabc/address.cpp
+++ b/tdeabc/address.cpp
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
@@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname )
return it.data();
TQString mapfile = TDEGlobal::dirs()->findResource( "data",
- TQString::fromLatin1( "kabc/countrytransl.map" ) );
+ TQString::fromLatin1( "tdeabc/countrytransl.map" ) );
TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
return TQString::null;
TQString mapfile = TDEGlobal::dirs()->findResource( "data",
- TQString::fromLatin1( "kabc/countrytransl.map" ) );
+ TQString::fromLatin1( "tdeabc/countrytransl.map" ) );
TQFile file( mapfile );
if ( file.open( IO_ReadOnly ) ) {
diff --git a/kabc/address.h b/tdeabc/address.h
index b4165a09..b4165a09 100644
--- a/kabc/address.h
+++ b/tdeabc/address.h
diff --git a/kabc/addressbook.cpp b/tdeabc/addressbook.cpp
index 8e1eca33..50cd9c8a 100644
--- a/kabc/addressbook.cpp
+++ b/tdeabc/addressbook.cpp
@@ -24,9 +24,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "errorhandler.h"
diff --git a/kabc/addressbook.h b/tdeabc/addressbook.h
index 8b87b689..8b87b689 100644
--- a/kabc/addressbook.h
+++ b/tdeabc/addressbook.h
diff --git a/kabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp
index c8a1bf51..2b8bc91e 100644
--- a/kabc/addresseedialog.cpp
+++ b/tdeabc/addresseedialog.cpp
@@ -23,7 +23,7 @@
#include <tqgroupbox.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "stdaddressbook.h"
diff --git a/kabc/addresseedialog.h b/tdeabc/addresseedialog.h
index 74470d1b..74470d1b 100644
--- a/kabc/addresseedialog.h
+++ b/tdeabc/addresseedialog.h
diff --git a/kabc/addresseehelper.cpp b/tdeabc/addresseehelper.cpp
index 5b899885..e8faeb89 100644
--- a/kabc/addresseehelper.cpp
+++ b/tdeabc/addresseehelper.cpp
@@ -20,7 +20,7 @@
#include <tqapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "addresseehelper.h"
diff --git a/kabc/addresseehelper.h b/tdeabc/addresseehelper.h
index 5280e6b2..5280e6b2 100644
--- a/kabc/addresseehelper.h
+++ b/tdeabc/addresseehelper.h
diff --git a/kabc/addresseelist.cpp b/tdeabc/addresseelist.cpp
index 47324001..47324001 100644
--- a/kabc/addresseelist.cpp
+++ b/tdeabc/addresseelist.cpp
diff --git a/kabc/addresseelist.h b/tdeabc/addresseelist.h
index 7c9df027..7c9df027 100644
--- a/kabc/addresseelist.h
+++ b/tdeabc/addresseelist.h
diff --git a/kabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp
index a61e7a5c..dc7a889a 100644
--- a/kabc/addresslineedit.cpp
+++ b/tdeabc/addresslineedit.cpp
@@ -40,8 +40,8 @@
#include <tdestdaccel.h>
#include <kurldrag.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/distributionlist.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/distributionlist.h>
#include "ldapclient.h"
#include <kdebug.h>
diff --git a/kabc/addresslineedit.h b/tdeabc/addresslineedit.h
index f81ffbfe..f81ffbfe 100644
--- a/kabc/addresslineedit.h
+++ b/tdeabc/addresslineedit.h
diff --git a/kabc/agent.cpp b/tdeabc/agent.cpp
index 571b7803..571b7803 100644
--- a/kabc/agent.cpp
+++ b/tdeabc/agent.cpp
diff --git a/kabc/agent.h b/tdeabc/agent.h
index dbe048f0..dbe048f0 100644
--- a/kabc/agent.h
+++ b/tdeabc/agent.h
diff --git a/kabc/countrytransl.map b/tdeabc/countrytransl.map
index 1459f094..1459f094 100644
--- a/kabc/countrytransl.map
+++ b/tdeabc/countrytransl.map
diff --git a/kabc/distributionlist.cpp b/tdeabc/distributionlist.cpp
index bb89b6d0..ee058ecd 100644
--- a/kabc/distributionlist.cpp
+++ b/tdeabc/distributionlist.cpp
@@ -185,7 +185,7 @@ TQStringList DistributionListManager::listNames()
bool DistributionListManager::load()
{
- KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+ KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
TQMap<TQString,TQString> entryMap = cfg.entryMap( "DistributionLists" );
cfg.setGroup( "DistributionLists" );
@@ -233,7 +233,7 @@ bool DistributionListManager::save()
{
kdDebug(5700) << "DistListManager::save()" << endl;
- KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+ KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
cfg.deleteGroup( "DistributionLists" );
cfg.setGroup( "DistributionLists" );
@@ -273,7 +273,7 @@ DistributionListWatcher::DistributionListWatcher()
: TQObject( tqApp, "DistributionListWatcher" )
{
mDirWatch = new KDirWatch;
- mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
+ mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) );
connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) );
mDirWatch->startScan();
diff --git a/kabc/distributionlist.h b/tdeabc/distributionlist.h
index 78d18246..78d18246 100644
--- a/kabc/distributionlist.h
+++ b/tdeabc/distributionlist.h
diff --git a/kabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp
index b00b14d4..8cd22e8f 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/tdeabc/distributionlistdialog.cpp
@@ -27,9 +27,9 @@
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "addressbook.h"
#include "addresseedialog.h"
diff --git a/kabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h
index 1bd6fc78..1bd6fc78 100644
--- a/kabc/distributionlistdialog.h
+++ b/tdeabc/distributionlistdialog.h
diff --git a/kabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp
index 573f0970..5c26c812 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/tdeabc/distributionlisteditor.cpp
@@ -26,7 +26,7 @@
#include <tqradiobutton.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "addressbook.h"
diff --git a/kabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h
index faec280e..faec280e 100644
--- a/kabc/distributionlisteditor.h
+++ b/tdeabc/distributionlisteditor.h
diff --git a/kabc/errorhandler.cpp b/tdeabc/errorhandler.cpp
index d8ab650c..d2245e44 100644
--- a/kabc/errorhandler.cpp
+++ b/tdeabc/errorhandler.cpp
@@ -21,8 +21,8 @@
*/
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqapplication.h>
diff --git a/kabc/errorhandler.h b/tdeabc/errorhandler.h
index 9a316541..9a316541 100644
--- a/kabc/errorhandler.h
+++ b/tdeabc/errorhandler.h
diff --git a/kabc/field.h b/tdeabc/field.h
index 118ce2d5..118ce2d5 100644
--- a/kabc/field.h
+++ b/tdeabc/field.h
diff --git a/kabc/format.h b/tdeabc/format.h
index ed036673..ed036673 100644
--- a/kabc/format.h
+++ b/tdeabc/format.h
diff --git a/kabc/formatfactory.cpp b/tdeabc/formatfactory.cpp
index 17e7b0f3..0795957a 100644
--- a/kabc/formatfactory.cpp
+++ b/tdeabc/formatfactory.cpp
@@ -19,7 +19,7 @@
*/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
@@ -56,7 +56,7 @@ FormatFactory::FormatFactory()
info->descriptionLabel = i18n( "vCard Format" );
mFormatList.insert( "vcard", info );
- const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
+ const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"tdeabc/formats/*.desktop", true, true );
for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
{
KSimpleConfig config( *it, true );
diff --git a/kabc/formatfactory.h b/tdeabc/formatfactory.h
index ff9da550..ff9da550 100644
--- a/kabc/formatfactory.h
+++ b/tdeabc/formatfactory.h
diff --git a/kabc/formatplugin.h b/tdeabc/formatplugin.h
index 33f4beea..33f4beea 100644
--- a/kabc/formatplugin.h
+++ b/tdeabc/formatplugin.h
diff --git a/kabc/formats/CMakeLists.txt b/tdeabc/formats/CMakeLists.txt
index 60ea1c3f..d7a9e0fc 100644
--- a/kabc/formats/CMakeLists.txt
+++ b/tdeabc/formats/CMakeLists.txt
@@ -29,7 +29,7 @@ link_directories(
##### other data ################################
-install( FILES binary.desktop DESTINATION ${DATA_INSTALL_DIR}/kabc/formats )
+install( FILES binary.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeabc/formats )
##### kabcformat_binary #########################
@@ -42,6 +42,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kabc/formats/Makefile.am b/tdeabc/formats/Makefile.am
index 57c2caaa..d769d88d 100644
--- a/kabc/formats/Makefile.am
+++ b/tdeabc/formats/Makefile.am
@@ -6,7 +6,7 @@ kabcformat_binary_la_SOURCES = binaryformat.cpp
kabcformat_binary_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
-no-undefined
kabcformat_binary_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(LIB_TDECORE)
-kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
# these are the headers for your project
noinst_HEADERS = binaryformat.h
@@ -17,6 +17,6 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabcformat_binary.pot
-linkdir = $(kde_datadir)/kabc/formats
+linkdir = $(kde_datadir)/tdeabc/formats
link_DATA = binary.desktop
EXTRA_DIST = $(link_DATA)
diff --git a/kabc/formats/binary.desktop b/tdeabc/formats/binary.desktop
index 993286ad..993286ad 100644
--- a/kabc/formats/binary.desktop
+++ b/tdeabc/formats/binary.desktop
diff --git a/kabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp
index a82a017a..f37146e5 100644
--- a/kabc/formats/binaryformat.cpp
+++ b/tdeabc/formats/binaryformat.cpp
@@ -22,7 +22,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "addressbook.h"
@@ -172,7 +172,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
if ( photo.isIntern() ) {
TQImage img;
- if ( !img.load( locateLocal( "data", "kabc/photos/" ) + addressee.uid() ) )
+ if ( !img.load( locateLocal( "data", "tdeabc/photos/" ) + addressee.uid() ) )
kdDebug(5700) << "No photo available for '" << addressee.uid() << "'." << endl;
addressee.setPhoto( img );
@@ -180,7 +180,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
if ( logo.isIntern() ) {
TQImage img;
- if ( !img.load( locateLocal( "data", "kabc/logos/" ) + addressee.uid() ) )
+ if ( !img.load( locateLocal( "data", "tdeabc/logos/" ) + addressee.uid() ) )
kdDebug(5700) << "No logo available for '" << addressee.uid() << "'." << endl;
addressee.setLogo( img );
@@ -201,7 +201,7 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stre
if ( photo.isIntern() ) {
TQImage img = photo.data();
- TQString fileName = locateLocal( "data", "kabc/photos/" ) + addressee.uid();
+ TQString fileName = locateLocal( "data", "tdeabc/photos/" ) + addressee.uid();
if ( !img.save( fileName, "PNG" ) )
kdDebug(5700) << "Unable to save photo for '" << addressee.uid() << "'." << endl;
@@ -209,7 +209,7 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stre
if ( logo.isIntern() ) {
TQImage img = logo.data();
- TQString fileName = locateLocal( "data", "kabc/logos/" ) + addressee.uid();
+ TQString fileName = locateLocal( "data", "tdeabc/logos/" ) + addressee.uid();
if ( !img.save( fileName, "PNG" ) )
kdDebug(5700) << "Unable to save logo for '" << addressee.uid() << "'." << endl;
diff --git a/kabc/formats/binaryformat.h b/tdeabc/formats/binaryformat.h
index 09efde41..09efde41 100644
--- a/kabc/formats/binaryformat.h
+++ b/tdeabc/formats/binaryformat.h
diff --git a/kabc/geo.cpp b/tdeabc/geo.cpp
index 44f9851e..44f9851e 100644
--- a/kabc/geo.cpp
+++ b/tdeabc/geo.cpp
diff --git a/kabc/geo.h b/tdeabc/geo.h
index cac6abaf..cac6abaf 100644
--- a/kabc/geo.h
+++ b/tdeabc/geo.h
diff --git a/kabc/kabc_manager.desktop b/tdeabc/kabc_manager.desktop
index 0af910f5..0af910f5 100644
--- a/kabc/kabc_manager.desktop
+++ b/tdeabc/kabc_manager.desktop
diff --git a/kabc/key.cpp b/tdeabc/key.cpp
index 7c66579b..08d9c687 100644
--- a/kabc/key.cpp
+++ b/tdeabc/key.cpp
@@ -19,7 +19,7 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "key.h"
diff --git a/kabc/key.h b/tdeabc/key.h
index 08df0264..08df0264 100644
--- a/kabc/key.h
+++ b/tdeabc/key.h
diff --git a/kabc/ldapclient.cpp b/tdeabc/ldapclient.cpp
index 1c2b2d83..1c2b2d83 100644
--- a/kabc/ldapclient.cpp
+++ b/tdeabc/ldapclient.cpp
diff --git a/kabc/ldapclient.h b/tdeabc/ldapclient.h
index f43a644c..f43a644c 100644
--- a/kabc/ldapclient.h
+++ b/tdeabc/ldapclient.h
diff --git a/kabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp
index 5996477a..fa092754 100644
--- a/kabc/ldapconfigwidget.cpp
+++ b/tdeabc/ldapconfigwidget.cpp
@@ -29,10 +29,10 @@
#include <tqhbuttongroup.h>
#include <tqradiobutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaccelmanager.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kcombobox.h>
#include <kprogress.h>
diff --git a/kabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h
index 01074292..7071bce1 100644
--- a/kabc/ldapconfigwidget.h
+++ b/tdeabc/ldapconfigwidget.h
@@ -25,8 +25,8 @@
#include <tqmap.h>
#include <tqstring.h>
-#include <kabc/ldapurl.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldapurl.h>
+#include <tdeabc/ldif.h>
#include <tdeio/job.h>
class TQGridLayout;
diff --git a/kabc/ldapurl.cpp b/tdeabc/ldapurl.cpp
index 9032c16d..9032c16d 100644
--- a/kabc/ldapurl.cpp
+++ b/tdeabc/ldapurl.cpp
diff --git a/kabc/ldapurl.h b/tdeabc/ldapurl.h
index 0c269375..0c269375 100644
--- a/kabc/ldapurl.h
+++ b/tdeabc/ldapurl.h
diff --git a/kabc/ldif.cpp b/tdeabc/ldif.cpp
index 408f5223..408f5223 100644
--- a/kabc/ldif.cpp
+++ b/tdeabc/ldif.cpp
diff --git a/kabc/ldif.h b/tdeabc/ldif.h
index f4da5f4f..f4da5f4f 100644
--- a/kabc/ldif.h
+++ b/tdeabc/ldif.h
diff --git a/kabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp
index 4bf98939..dcab83a4 100644
--- a/kabc/ldifconverter.cpp
+++ b/tdeabc/ldifconverter.cpp
@@ -38,7 +38,7 @@
#include <tqregexp.h>
#include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kmdcodec.h>
diff --git a/kabc/ldifconverter.h b/tdeabc/ldifconverter.h
index a8052a65..a8052a65 100644
--- a/kabc/ldifconverter.h
+++ b/tdeabc/ldifconverter.h
diff --git a/kabc/lock.cpp b/tdeabc/lock.cpp
index 8f64a3c2..a78cb4c5 100644
--- a/kabc/lock.cpp
+++ b/tdeabc/lock.cpp
@@ -22,9 +22,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
@@ -48,7 +48,7 @@ Lock::~Lock()
TQString Lock::locksDir()
{
- return locateLocal( "data", "kabc/lock/" );
+ return locateLocal( "data", "tdeabc/lock/" );
}
bool Lock::readLockFile( const TQString &filename, int &pid, TQString &app )
@@ -104,14 +104,14 @@ bool Lock::lock()
identifier.replace( '_', '/' );
mError = i18n("The address book '%1' is locked by application '%2'.\nIf you believe this is incorrect, just remove the lock file from '%3'")
- .arg( identifier ).arg( app ).arg( locateLocal( "data", "kabc/lock/*.lock" ) );
+ .arg( identifier ).arg( app ).arg( locateLocal( "data", "tdeabc/lock/*.lock" ) );
return false;
}
}
TQString lockUniqueName;
lockUniqueName = mIdentifier + kapp->randomString( 8 );
- mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
+ mLockUniqueName = locateLocal( "data", "tdeabc/lock/" + lockUniqueName );
kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
// Create unique file
diff --git a/kabc/lock.h b/tdeabc/lock.h
index addc2032..addc2032 100644
--- a/kabc/lock.h
+++ b/tdeabc/lock.h
diff --git a/kabc/locknull.cpp b/tdeabc/locknull.cpp
index 234c2c21..5f3ee06c 100644
--- a/kabc/locknull.cpp
+++ b/tdeabc/locknull.cpp
@@ -21,7 +21,7 @@
#include "locknull.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
using namespace KABC;
diff --git a/kabc/locknull.h b/tdeabc/locknull.h
index dfefe122..dfefe122 100644
--- a/kabc/locknull.h
+++ b/tdeabc/locknull.h
diff --git a/kabc/phonenumber.cpp b/tdeabc/phonenumber.cpp
index adf8566f..fd2468c7 100644
--- a/kabc/phonenumber.cpp
+++ b/tdeabc/phonenumber.cpp
@@ -19,7 +19,7 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "phonenumber.h"
diff --git a/kabc/phonenumber.h b/tdeabc/phonenumber.h
index 3e6ae094..3e6ae094 100644
--- a/kabc/phonenumber.h
+++ b/tdeabc/phonenumber.h
diff --git a/kabc/picture.cpp b/tdeabc/picture.cpp
index 4ddd3f53..4ddd3f53 100644
--- a/kabc/picture.cpp
+++ b/tdeabc/picture.cpp
diff --git a/kabc/picture.h b/tdeabc/picture.h
index e6ed690c..e6ed690c 100644
--- a/kabc/picture.h
+++ b/tdeabc/picture.h
diff --git a/kabc/plugin.cpp b/tdeabc/plugin.cpp
index a5319255..a5319255 100644
--- a/kabc/plugin.cpp
+++ b/tdeabc/plugin.cpp
diff --git a/kabc/plugin.h b/tdeabc/plugin.h
index 0c8e3b33..0c8e3b33 100644
--- a/kabc/plugin.h
+++ b/tdeabc/plugin.h
diff --git a/kabc/plugins/CMakeLists.txt b/tdeabc/plugins/CMakeLists.txt
index 59748681..59748681 100644
--- a/kabc/plugins/CMakeLists.txt
+++ b/tdeabc/plugins/CMakeLists.txt
diff --git a/kabc/plugins/Makefile.am b/tdeabc/plugins/Makefile.am
index bdedbec0..bdedbec0 100644
--- a/kabc/plugins/Makefile.am
+++ b/tdeabc/plugins/Makefile.am
diff --git a/kabc/plugins/dir/CMakeLists.txt b/tdeabc/plugins/dir/CMakeLists.txt
index 737d1144..fd416134 100644
--- a/kabc/plugins/dir/CMakeLists.txt
+++ b/tdeabc/plugins/dir/CMakeLists.txt
@@ -53,7 +53,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.0.0
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kabc/plugins/dir/Makefile.am b/tdeabc/plugins/dir/Makefile.am
index 4b61d282..94ddad3c 100644
--- a/kabc/plugins/dir/Makefile.am
+++ b/tdeabc/plugins/dir/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libkabc_dir.la
libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
-libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = kabc_dir.la
kabc_dir_la_SOURCES = resourcedirplugin.cpp
diff --git a/kabc/plugins/dir/dir.desktop b/tdeabc/plugins/dir/dir.desktop
index a841040f..a841040f 100644
--- a/kabc/plugins/dir/dir.desktop
+++ b/tdeabc/plugins/dir/dir.desktop
diff --git a/kabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp
index 936eea6e..53f178a6 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/tdeabc/plugins/dir/resourcedir.cpp
@@ -32,8 +32,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
diff --git a/kabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h
index f62ee91b..dc3bdbd2 100644
--- a/kabc/plugins/dir/resourcedir.h
+++ b/tdeabc/plugins/dir/resourcedir.h
@@ -26,7 +26,7 @@
#include <sys/types.h>
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
class TQTimer;
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/tdeabc/plugins/dir/resourcedirconfig.cpp
index 819d75d9..2807872f 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/tdeabc/plugins/dir/resourcedirconfig.cpp
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdialog.h>
diff --git a/kabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h
index 9df1778d..9df1778d 100644
--- a/kabc/plugins/dir/resourcedirconfig.h
+++ b/tdeabc/plugins/dir/resourcedirconfig.h
diff --git a/kabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp
index a2bd6d13..a2bd6d13 100644
--- a/kabc/plugins/dir/resourcedirplugin.cpp
+++ b/tdeabc/plugins/dir/resourcedirplugin.cpp
diff --git a/kabc/plugins/evolution/Makefile.am b/tdeabc/plugins/evolution/Makefile.am
index fd7b9be3..2c22cf37 100644
--- a/kabc/plugins/evolution/Makefile.am
+++ b/tdeabc/plugins/evolution/Makefile.am
@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la
kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
kabc_evo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kabc_evo_la_LIBADD = ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
+kabc_evo_la_LIBADD = ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../tdeabc/vcardparser/libvcards.la
METASOURCES = AUTO
diff --git a/kabc/plugins/evolution/README b/tdeabc/plugins/evolution/README
index 7dfefce0..7dfefce0 100644
--- a/kabc/plugins/evolution/README
+++ b/tdeabc/plugins/evolution/README
diff --git a/kabc/plugins/evolution/dbwrapper.cpp b/tdeabc/plugins/evolution/dbwrapper.cpp
index fbdff165..fbdff165 100644
--- a/kabc/plugins/evolution/dbwrapper.cpp
+++ b/tdeabc/plugins/evolution/dbwrapper.cpp
diff --git a/kabc/plugins/evolution/dbwrapper.h b/tdeabc/plugins/evolution/dbwrapper.h
index e5e0a2c3..e5e0a2c3 100644
--- a/kabc/plugins/evolution/dbwrapper.h
+++ b/tdeabc/plugins/evolution/dbwrapper.h
diff --git a/kabc/plugins/evolution/evolution.desktop b/tdeabc/plugins/evolution/evolution.desktop
index 98030e90..98030e90 100644
--- a/kabc/plugins/evolution/evolution.desktop
+++ b/tdeabc/plugins/evolution/evolution.desktop
diff --git a/kabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp
index 415e9928..e6545f73 100644
--- a/kabc/plugins/evolution/resourceevo.cpp
+++ b/tdeabc/plugins/evolution/resourceevo.cpp
@@ -1,12 +1,12 @@
#include <tqdir.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <stdio.h>
-#include <kabc/vcardparser/vcardtool.h>
+#include <tdeabc/vcardparser/vcardtool.h>
#include "dbwrapper.h"
#include "resourceevo.h"
diff --git a/kabc/plugins/evolution/resourceevo.h b/tdeabc/plugins/evolution/resourceevo.h
index 29e163e1..29e163e1 100644
--- a/kabc/plugins/evolution/resourceevo.h
+++ b/tdeabc/plugins/evolution/resourceevo.h
diff --git a/kabc/plugins/file/CMakeLists.txt b/tdeabc/plugins/file/CMakeLists.txt
index f8847d7e..6c17d2dc 100644
--- a/kabc/plugins/file/CMakeLists.txt
+++ b/tdeabc/plugins/file/CMakeLists.txt
@@ -53,7 +53,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.0.0
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kabc/plugins/file/Makefile.am b/tdeabc/plugins/file/Makefile.am
index b1530d97..d00ffea3 100644
--- a/kabc/plugins/file/Makefile.am
+++ b/tdeabc/plugins/file/Makefile.am
@@ -7,14 +7,14 @@ lib_LTLIBRARIES = libkabc_file.la
libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
-libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = kabc_file.la
kabc_file_la_SOURCES = resourcefileplugin.cpp
kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE)
-kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
METASOURCES = AUTO
diff --git a/kabc/plugins/file/file.desktop b/tdeabc/plugins/file/file.desktop
index 1359dd1c..1359dd1c 100644
--- a/kabc/plugins/file/file.desktop
+++ b/tdeabc/plugins/file/file.desktop
diff --git a/kabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp
index 7c99782c..b29cf33c 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/tdeabc/plugins/file/resourcefile.cpp
@@ -33,7 +33,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksavefile.h>
#include <kstandarddirs.h>
@@ -365,9 +365,9 @@ void ResourceFile::fileChanged()
void ResourceFile::removeAddressee( const Addressee &addr )
{
- TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
- TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
- TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
+ TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/photos/" ) + addr.uid() ) );
+ TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/logos/" ) + addr.uid() ) );
+ TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/sounds/" ) + addr.uid() ) );
mAddrMap.erase( addr.uid() );
}
diff --git a/kabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h
index 3d2efe85..a77f5579 100644
--- a/kabc/plugins/file/resourcefile.h
+++ b/tdeabc/plugins/file/resourcefile.h
@@ -26,7 +26,7 @@
#include <sys/types.h>
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
namespace KABC {
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp
index 92b07594..7c3f4da1 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/tdeabc/plugins/file/resourcefileconfig.cpp
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdialog.h>
diff --git a/kabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h
index 18c217ed..18c217ed 100644
--- a/kabc/plugins/file/resourcefileconfig.h
+++ b/tdeabc/plugins/file/resourcefileconfig.h
diff --git a/kabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp
index 4dce19bc..4dce19bc 100644
--- a/kabc/plugins/file/resourcefileplugin.cpp
+++ b/tdeabc/plugins/file/resourcefileplugin.cpp
diff --git a/kabc/plugins/ldaptdeio/CMakeLists.txt b/tdeabc/plugins/ldaptdeio/CMakeLists.txt
index 75098cc9..820f6e01 100644
--- a/kabc/plugins/ldaptdeio/CMakeLists.txt
+++ b/tdeabc/plugins/ldaptdeio/CMakeLists.txt
@@ -53,7 +53,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.0.0
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kabc/plugins/ldaptdeio/Makefile.am b/tdeabc/plugins/ldaptdeio/Makefile.am
index 9c2d31ad..bc81d13d 100644
--- a/kabc/plugins/ldaptdeio/Makefile.am
+++ b/tdeabc/plugins/ldaptdeio/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libkabc_ldaptdeio.la
libkabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
libkabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
libkabc_ldaptdeio_la_LIBADD = $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = kabc_ldaptdeio.la
kabc_ldaptdeio_la_SOURCES = resourceldaptdeioplugin.cpp
diff --git a/kabc/plugins/ldaptdeio/ldaptdeio.desktop b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
index 9bcd1333..9bcd1333 100644
--- a/kabc/plugins/ldaptdeio/ldaptdeio.desktop
+++ b/tdeabc/plugins/ldaptdeio/ldaptdeio.desktop
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index b28289ec..ea1a4294 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeio.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -25,18 +25,18 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <stdlib.h>
#include <tdeio/netaccess.h>
-#include <kabc/ldif.h>
-#include <kabc/ldapurl.h>
+#include <tdeabc/ldif.h>
+#include <tdeabc/ldapurl.h>
#include "resourceldaptdeio.h"
#include "resourceldaptdeioconfig.h"
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
index 5c9282b9..bf1b70ec 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeio.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
@@ -22,8 +22,8 @@
#ifndef KABC_RESOURCELDAP_H
#define KABC_RESOURCELDAP_H
-#include <kabc/resource.h>
-#include <kabc/ldif.h>
+#include <tdeabc/resource.h>
+#include <tdeabc/ldif.h>
#include <tdeio/job.h>
class TDEConfig;
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index f53ee7d3..a6af7d06 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -33,9 +33,9 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include "resourceldaptdeio.h"
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
index 0fde41d6..121cf639 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
@@ -28,8 +28,8 @@
#include <kdialogbase.h>
#include <tderesources/configwidget.h>
-#include <kabc/ldif.h>
-#include <kabc/ldapconfigwidget.h>
+#include <tdeabc/ldif.h>
+#include <tdeabc/ldapconfigwidget.h>
class TQCheckBox;
diff --git a/kabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
index ac08e8e2..6d173eb5 100644
--- a/kabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp
@@ -21,8 +21,8 @@
#include "resourceldaptdeio.h"
#include "resourceldaptdeioconfig.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KABC;
diff --git a/kabc/plugins/net/CMakeLists.txt b/tdeabc/plugins/net/CMakeLists.txt
index e92fbfc3..cc956499 100644
--- a/kabc/plugins/net/CMakeLists.txt
+++ b/tdeabc/plugins/net/CMakeLists.txt
@@ -53,7 +53,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.0.0
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kabc/plugins/net/Makefile.am b/tdeabc/plugins/net/Makefile.am
index ca0ece01..c2ded1b4 100644
--- a/kabc/plugins/net/Makefile.am
+++ b/tdeabc/plugins/net/Makefile.am
@@ -6,8 +6,8 @@ noinst_HEADERS = resourcenetconfig.h
lib_LTLIBRARIES = libkabc_net.la
libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_net_la_LIBADD = $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
-libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_net_la_LIBADD = $(top_builddir)/tdeabc/libkabc.la $(LIB_KIO)
+libkabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
kde_module_LTLIBRARIES = kabc_net.la
kabc_net_la_SOURCES = resourcenetplugin.cpp
diff --git a/kabc/plugins/net/net.desktop b/tdeabc/plugins/net/net.desktop
index 2c72c202..2c72c202 100644
--- a/kabc/plugins/net/net.desktop
+++ b/tdeabc/plugins/net/net.desktop
diff --git a/kabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp
index 9ef90990..5a46890d 100644
--- a/kabc/plugins/net/resourcenet.cpp
+++ b/tdeabc/plugins/net/resourcenet.cpp
@@ -23,9 +23,9 @@
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksavefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurlrequester.h>
#include "addressbook.h"
diff --git a/kabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h
index 940627ec..49707081 100644
--- a/kabc/plugins/net/resourcenet.h
+++ b/tdeabc/plugins/net/resourcenet.h
@@ -25,7 +25,7 @@
#include <sys/types.h>
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
class TQFile;
class TQTimer;
diff --git a/kabc/plugins/net/resourcenetconfig.cpp b/tdeabc/plugins/net/resourcenetconfig.cpp
index b441fbd9..8d5903f8 100644
--- a/kabc/plugins/net/resourcenetconfig.cpp
+++ b/tdeabc/plugins/net/resourcenetconfig.cpp
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include "formatfactory.h"
diff --git a/kabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
index 3c898612..3c898612 100644
--- a/kabc/plugins/net/resourcenetconfig.h
+++ b/tdeabc/plugins/net/resourcenetconfig.h
diff --git a/kabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp
index 189bab05..189bab05 100644
--- a/kabc/plugins/net/resourcenetplugin.cpp
+++ b/tdeabc/plugins/net/resourcenetplugin.cpp
diff --git a/kabc/plugins/sql/Makefile.am b/tdeabc/plugins/sql/Makefile.am
index 3fa3986c..3fa3986c 100644
--- a/kabc/plugins/sql/Makefile.am
+++ b/tdeabc/plugins/sql/Makefile.am
diff --git a/kabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp
index 150fe54e..e3744eee 100644
--- a/kabc/plugins/sql/resourcesql.cpp
+++ b/tdeabc/plugins/sql/resourcesql.cpp
@@ -22,9 +22,9 @@
#include <tqsqlcursor.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "resourcesql.h"
#include "resourcesqlconfig.h"
diff --git a/kabc/plugins/sql/resourcesql.h b/tdeabc/plugins/sql/resourcesql.h
index 770e5b73..770e5b73 100644
--- a/kabc/plugins/sql/resourcesql.h
+++ b/tdeabc/plugins/sql/resourcesql.h
diff --git a/kabc/plugins/sql/resourcesqlconfig.cpp b/tdeabc/plugins/sql/resourcesqlconfig.cpp
index f62890c3..2f5b9d5b 100644
--- a/kabc/plugins/sql/resourcesqlconfig.cpp
+++ b/tdeabc/plugins/sql/resourcesqlconfig.cpp
@@ -24,7 +24,7 @@
#include <tqvbox.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "resource.h"
#include "resourcesqlconfig.h"
diff --git a/kabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h
index ae2de7d6..ae2de7d6 100644
--- a/kabc/plugins/sql/resourcesqlconfig.h
+++ b/tdeabc/plugins/sql/resourcesqlconfig.h
diff --git a/kabc/plugins/sql/sql.desktop b/tdeabc/plugins/sql/sql.desktop
index 4ac55300..4ac55300 100644
--- a/kabc/plugins/sql/sql.desktop
+++ b/tdeabc/plugins/sql/sql.desktop
diff --git a/kabc/resource.cpp b/tdeabc/resource.cpp
index 57c8588e..9613d90b 100644
--- a/kabc/resource.cpp
+++ b/tdeabc/resource.cpp
@@ -19,7 +19,7 @@
*/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "resource.h"
diff --git a/kabc/resource.h b/tdeabc/resource.h
index 0f5167e7..0f5167e7 100644
--- a/kabc/resource.h
+++ b/tdeabc/resource.h
diff --git a/kabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp
index 3b6e2575..92f770ed 100644
--- a/kabc/resourceselectdialog.cpp
+++ b/tdeabc/resourceselectdialog.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kbuttonbox.h>
#include <tdelistbox.h>
#include <kstdguiitem.h>
diff --git a/kabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h
index f5f2d698..f5f2d698 100644
--- a/kabc/resourceselectdialog.h
+++ b/tdeabc/resourceselectdialog.h
diff --git a/kabc/scripts/Makefile.am b/tdeabc/scripts/Makefile.am
index 7715fba5..7715fba5 100644
--- a/kabc/scripts/Makefile.am
+++ b/tdeabc/scripts/Makefile.am
diff --git a/kabc/scripts/addressee.src.cpp b/tdeabc/scripts/addressee.src.cpp
index 9aff3a70..7514b4a1 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/tdeabc/scripts/addressee.src.cpp
@@ -25,7 +25,7 @@
#include <ksharedptr.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "addresseehelper.h"
#include "field.h"
diff --git a/kabc/scripts/addressee.src.h b/tdeabc/scripts/addressee.src.h
index 9cadfd41..9cadfd41 100644
--- a/kabc/scripts/addressee.src.h
+++ b/tdeabc/scripts/addressee.src.h
diff --git a/kabc/scripts/createisomap.pl b/tdeabc/scripts/createisomap.pl
index 897cd489..897cd489 100755
--- a/kabc/scripts/createisomap.pl
+++ b/tdeabc/scripts/createisomap.pl
diff --git a/kabc/scripts/entrylist b/tdeabc/scripts/entrylist
index 87c342a0..87c342a0 100644
--- a/kabc/scripts/entrylist
+++ b/tdeabc/scripts/entrylist
diff --git a/kabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp
index 2c80810b..bec31888 100644
--- a/kabc/scripts/field.src.cpp
+++ b/tdeabc/scripts/field.src.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "field.h"
#include "address.h"
diff --git a/kabc/scripts/makeaddressee b/tdeabc/scripts/makeaddressee
index fa955b0b..fa955b0b 100755
--- a/kabc/scripts/makeaddressee
+++ b/tdeabc/scripts/makeaddressee
diff --git a/kabc/secrecy.cpp b/tdeabc/secrecy.cpp
index 7ec439b0..2725612b 100644
--- a/kabc/secrecy.cpp
+++ b/tdeabc/secrecy.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "secrecy.h"
diff --git a/kabc/secrecy.h b/tdeabc/secrecy.h
index 5cc60b11..5cc60b11 100644
--- a/kabc/secrecy.h
+++ b/tdeabc/secrecy.h
diff --git a/kabc/sortmode.cpp b/tdeabc/sortmode.cpp
index ee9a6f82..efb4a391 100644
--- a/kabc/sortmode.cpp
+++ b/tdeabc/sortmode.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kabc/field.h>
+#include <tdeabc/field.h>
#include "sortmode.h"
diff --git a/kabc/sortmode.h b/tdeabc/sortmode.h
index 9768fc8c..f02662b7 100644
--- a/kabc/sortmode.h
+++ b/tdeabc/sortmode.h
@@ -23,7 +23,7 @@
#include <tdelibs_export.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
namespace KABC {
diff --git a/kabc/sound.cpp b/tdeabc/sound.cpp
index cf645be8..cf645be8 100644
--- a/kabc/sound.cpp
+++ b/tdeabc/sound.cpp
diff --git a/kabc/sound.h b/tdeabc/sound.h
index 98dcf320..98dcf320 100644
--- a/kabc/sound.h
+++ b/tdeabc/sound.h
diff --git a/kabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp
index c887fcb8..3e64645e 100644
--- a/kabc/stdaddressbook.cpp
+++ b/tdeabc/stdaddressbook.cpp
@@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <kcrash.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tderesources/manager.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
@@ -42,12 +42,12 @@ static KStaticDeleter<StdAddressBook> addressBookDeleter;
TQString StdAddressBook::fileName()
{
- return locateLocal( "data", "kabc/std.vcf" );
+ return locateLocal( "data", "tdeabc/std.vcf" );
}
TQString StdAddressBook::directoryName()
{
- return locateLocal( "data", "kabc/stdvcf" );
+ return locateLocal( "data", "tdeabc/stdvcf" );
}
void StdAddressBook::handleCrash()
diff --git a/kabc/stdaddressbook.h b/tdeabc/stdaddressbook.h
index 935b2bad..935b2bad 100644
--- a/kabc/stdaddressbook.h
+++ b/tdeabc/stdaddressbook.h
diff --git a/kabc/tdeab2tdeabc.cpp b/tdeabc/tdeab2tdeabc.cpp
index f03a80f4..13b433ab 100644
--- a/kabc/tdeab2tdeabc.cpp
+++ b/tdeabc/tdeab2tdeabc.cpp
@@ -27,9 +27,9 @@
#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 "addressbook.h"
diff --git a/kabc/tdeab2tdeabc.desktop b/tdeabc/tdeab2tdeabc.desktop
index 945f044d..ef7641b2 100644
--- a/kabc/tdeab2tdeabc.desktop
+++ b/tdeabc/tdeab2tdeabc.desktop
@@ -23,19 +23,19 @@ Comment[ar]=أداة تحويل libkab إلى libkabc.
Comment[az]=libkab - libkabc dönüşdürmə vasitəsi.
Comment[be]=Інструмент пераўтварэння libkab у libkabc.
Comment[bg]=Програма за конвертиране на libkab до libkabc.
-Comment[bn]=libkab থেকে libkabc-তে পরিবর্তন করার প্রোগ্রাম।
+Comment[bn]=libkab থেকে libtdeabc-তে পরিবর্তন করার প্রোগ্রাম।
Comment[bs]=alat za pretvaranje libkab u libkabc.
Comment[ca]=Eina de conversió de libkab a libkabc.
Comment[cs]=Převod dat z libkab do libkabc.
Comment[csb]=Nôrzãdze do kònwersëji z libkab do libkabc.
Comment[cy]=erfyn trosi libkab i libkabc
-Comment[da]=libkab-til-libkabc-konverteringsværktøj.
+Comment[da]=libkab-til-libtdeabc-konverteringsværktøj.
Comment[de]=Konvertierung von libkab in libkabc
Comment[el]=Εργαλείο μετατροπής από το libkab στο libkabc.
Comment[eo]=Konvertilo de "libkab" al "libkabc"
Comment[es]=Conversor libkab a libkabc.
Comment[et]=libkab -> libkabc teisendamine
-Comment[eu]=libkab-etik libkabc-era bihurtzeko tresna.
+Comment[eu]=libkab-etik libtdeabc-era bihurtzeko tresna.
Comment[fa]=ابزار تبدیل libkab به libcabc.
Comment[fi]=libkab-libkabc -muunnin
Comment[fr]=Outil de conversion de libkab vers libkabc.
@@ -59,7 +59,7 @@ Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel.
Comment[lt]=libkab į libkabc konvertavimo įrankis.
Comment[lv]=libkab uz libkabc kovertēšanas rīks.
Comment[mk]=алатка за претворање од libkab во libkabc.
-Comment[mn]=libkab-аас libkabc-руу хөрвүүлэгч
+Comment[mn]=libkab-аас libtdeabc-руу хөрвүүлэгч
Comment[ms]=perkakasan penukaran libkab to libkabc.
Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc
Comment[nb]=libkab til libkabc konverteringsverktøy.
diff --git a/kabc/tests/Makefile.am b/tdeabc/tests/Makefile.am
index 961d12bd..201cf746 100644
--- a/kabc/tests/Makefile.am
+++ b/tdeabc/tests/Makefile.am
@@ -40,11 +40,11 @@ testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(L
testaddresslineedit_SOURCES = testaddresslineedit.cpp
bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
+bigread_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libkabc_file.la
bigread_SOURCES = bigread.cpp
bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
+bigwrite_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libkabc_file.la
bigwrite_SOURCES = bigwrite.cpp
testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
diff --git a/kabc/tests/bigread.cpp b/tdeabc/tests/bigread.cpp
index 5ea2393d..a5022367 100644
--- a/kabc/tests/bigread.cpp
+++ b/tdeabc/tests/bigread.cpp
@@ -3,7 +3,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "addressbook.h"
diff --git a/kabc/tests/bigwrite.cpp b/tdeabc/tests/bigwrite.cpp
index 167f5d44..4b9fa7bc 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/tdeabc/tests/bigwrite.cpp
@@ -3,7 +3,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "addressbook.h"
diff --git a/kabc/tests/kabcargl.cpp b/tdeabc/tests/kabcargl.cpp
index 589c973f..e38a8a22 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/tdeabc/tests/kabcargl.cpp
@@ -26,7 +26,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include "stdaddressbook.h"
diff --git a/kabc/tests/testaddressee.cpp b/tdeabc/tests/testaddressee.cpp
index 09f95d29..ef55ae40 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/tdeabc/tests/testaddressee.cpp
@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kstandarddirs.h>
diff --git a/kabc/tests/testaddresseelist.cpp b/tdeabc/tests/testaddresseelist.cpp
index 10fa4aae..f247f174 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/tdeabc/tests/testaddresseelist.cpp
@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kstandarddirs.h>
diff --git a/kabc/tests/testaddressfmt.cpp b/tdeabc/tests/testaddressfmt.cpp
index ca13a116..2eb43833 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/tdeabc/tests/testaddressfmt.cpp
@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kstandarddirs.h>
diff --git a/kabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp
index 7315aef7..74446f48 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/tdeabc/tests/testaddresslineedit.cpp
@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "addresslineedit.h"
diff --git a/kabc/tests/testdb.cpp b/tdeabc/tests/testdb.cpp
index fd4e4f6c..f7ec1d17 100644
--- a/kabc/tests/testdb.cpp
+++ b/tdeabc/tests/testdb.cpp
@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "addressbook.h"
diff --git a/kabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp
index 0f0e90f9..69a309ff 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/tdeabc/tests/testdistlist.cpp
@@ -3,7 +3,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "stdaddressbook.h"
diff --git a/kabc/tests/testkabc.cpp b/tdeabc/tests/testkabc.cpp
index 3caea88f..427262ca 100644
--- a/kabc/tests/testkabc.cpp
+++ b/tdeabc/tests/testkabc.cpp
@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kstandarddirs.h>
diff --git a/kabc/tests/testkabcdlg.cpp b/tdeabc/tests/testkabcdlg.cpp
index 24225cc1..aef203d2 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/tdeabc/tests/testkabcdlg.cpp
@@ -3,7 +3,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "addresseedialog.h"
diff --git a/kabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp
index df9fd622..df9fd622 100644
--- a/kabc/tests/testldapclient.cpp
+++ b/tdeabc/tests/testldapclient.cpp
diff --git a/kabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h
index 1995914c..1995914c 100644
--- a/kabc/tests/testldapclient.h
+++ b/tdeabc/tests/testldapclient.h
diff --git a/kabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
index 632c690a..3ebd724b 100644
--- a/kabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -26,11 +26,11 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kdirwatch.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdialog.h>
#include <tqwidget.h>
diff --git a/kabc/tests/testlock.h b/tdeabc/tests/testlock.h
index a94d4e8c..a94d4e8c 100644
--- a/kabc/tests/testlock.h
+++ b/tdeabc/tests/testlock.h
diff --git a/kabc/timezone.cpp b/tdeabc/timezone.cpp
index 59a184c6..59a184c6 100644
--- a/kabc/timezone.cpp
+++ b/tdeabc/timezone.cpp
diff --git a/kabc/timezone.h b/tdeabc/timezone.h
index 8705797f..8705797f 100644
--- a/kabc/timezone.h
+++ b/tdeabc/timezone.h
diff --git a/kabc/vcard/AdrParam.cpp b/tdeabc/vcard/AdrParam.cpp
index 5ad56f4f..5ad56f4f 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/tdeabc/vcard/AdrParam.cpp
diff --git a/kabc/vcard/AdrValue.cpp b/tdeabc/vcard/AdrValue.cpp
index 535ba698..535ba698 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/tdeabc/vcard/AdrValue.cpp
diff --git a/kabc/vcard/AgentParam.cpp b/tdeabc/vcard/AgentParam.cpp
index 9e4531b0..9e4531b0 100644
--- a/kabc/vcard/AgentParam.cpp
+++ b/tdeabc/vcard/AgentParam.cpp
diff --git a/kabc/vcard/AgentValue.cpp b/tdeabc/vcard/AgentValue.cpp
index 7d356f8d..7d356f8d 100644
--- a/kabc/vcard/AgentValue.cpp
+++ b/tdeabc/vcard/AgentValue.cpp
diff --git a/kabc/vcard/CMakeLists.txt b/tdeabc/vcard/CMakeLists.txt
index 8ad98843..8ad98843 100644
--- a/kabc/vcard/CMakeLists.txt
+++ b/tdeabc/vcard/CMakeLists.txt
diff --git a/kabc/vcard/ClassValue.cpp b/tdeabc/vcard/ClassValue.cpp
index 21417f87..21417f87 100644
--- a/kabc/vcard/ClassValue.cpp
+++ b/tdeabc/vcard/ClassValue.cpp
diff --git a/kabc/vcard/ContentLine.cpp b/tdeabc/vcard/ContentLine.cpp
index 52bcdf4f..52bcdf4f 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/tdeabc/vcard/ContentLine.cpp
diff --git a/kabc/vcard/DateParam.cpp b/tdeabc/vcard/DateParam.cpp
index ffaf4b3f..ffaf4b3f 100644
--- a/kabc/vcard/DateParam.cpp
+++ b/tdeabc/vcard/DateParam.cpp
diff --git a/kabc/vcard/DateValue.cpp b/tdeabc/vcard/DateValue.cpp
index 9f578a15..9f578a15 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/tdeabc/vcard/DateValue.cpp
diff --git a/kabc/vcard/EmailParam.cpp b/tdeabc/vcard/EmailParam.cpp
index 7daf19cc..7daf19cc 100644
--- a/kabc/vcard/EmailParam.cpp
+++ b/tdeabc/vcard/EmailParam.cpp
diff --git a/kabc/vcard/Entity.cpp b/tdeabc/vcard/Entity.cpp
index 5eaf6a1d..5eaf6a1d 100644
--- a/kabc/vcard/Entity.cpp
+++ b/tdeabc/vcard/Entity.cpp
diff --git a/kabc/vcard/Enum.cpp b/tdeabc/vcard/Enum.cpp
index bcb48f98..bcb48f98 100644
--- a/kabc/vcard/Enum.cpp
+++ b/tdeabc/vcard/Enum.cpp
diff --git a/kabc/vcard/FloatValue.cpp b/tdeabc/vcard/FloatValue.cpp
index ac1f2c6b..ac1f2c6b 100644
--- a/kabc/vcard/FloatValue.cpp
+++ b/tdeabc/vcard/FloatValue.cpp
diff --git a/kabc/vcard/GeoValue.cpp b/tdeabc/vcard/GeoValue.cpp
index 2bac28c1..2bac28c1 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/tdeabc/vcard/GeoValue.cpp
diff --git a/kabc/vcard/ImageParam.cpp b/tdeabc/vcard/ImageParam.cpp
index 69611eea..69611eea 100644
--- a/kabc/vcard/ImageParam.cpp
+++ b/tdeabc/vcard/ImageParam.cpp
diff --git a/kabc/vcard/ImageValue.cpp b/tdeabc/vcard/ImageValue.cpp
index 5d8d29bb..5d8d29bb 100644
--- a/kabc/vcard/ImageValue.cpp
+++ b/tdeabc/vcard/ImageValue.cpp
diff --git a/kabc/vcard/ImgValue.cpp b/tdeabc/vcard/ImgValue.cpp
index 42889acd..42889acd 100644
--- a/kabc/vcard/ImgValue.cpp
+++ b/tdeabc/vcard/ImgValue.cpp
diff --git a/kabc/vcard/LangValue.cpp b/tdeabc/vcard/LangValue.cpp
index f7e5a759..f7e5a759 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/tdeabc/vcard/LangValue.cpp
diff --git a/kabc/vcard/Makefile.am b/tdeabc/vcard/Makefile.am
index e8a33c3a..e8a33c3a 100644
--- a/kabc/vcard/Makefile.am
+++ b/tdeabc/vcard/Makefile.am
diff --git a/kabc/vcard/NValue.cpp b/tdeabc/vcard/NValue.cpp
index e6326813..e6326813 100644
--- a/kabc/vcard/NValue.cpp
+++ b/tdeabc/vcard/NValue.cpp
diff --git a/kabc/vcard/OrgValue.cpp b/tdeabc/vcard/OrgValue.cpp
index 94ca1824..94ca1824 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/tdeabc/vcard/OrgValue.cpp
diff --git a/kabc/vcard/Param.cpp b/tdeabc/vcard/Param.cpp
index 8c5ad9e2..8c5ad9e2 100644
--- a/kabc/vcard/Param.cpp
+++ b/tdeabc/vcard/Param.cpp
diff --git a/kabc/vcard/PhoneNumberValue.cpp b/tdeabc/vcard/PhoneNumberValue.cpp
index 02a1266f..02a1266f 100644
--- a/kabc/vcard/PhoneNumberValue.cpp
+++ b/tdeabc/vcard/PhoneNumberValue.cpp
diff --git a/kabc/vcard/README b/tdeabc/vcard/README
index 18a9daf4..18a9daf4 100644
--- a/kabc/vcard/README
+++ b/tdeabc/vcard/README
diff --git a/kabc/vcard/RToken.cpp b/tdeabc/vcard/RToken.cpp
index 582a9e1c..582a9e1c 100644
--- a/kabc/vcard/RToken.cpp
+++ b/tdeabc/vcard/RToken.cpp
diff --git a/kabc/vcard/SoundValue.cpp b/tdeabc/vcard/SoundValue.cpp
index 5be75d35..5be75d35 100644
--- a/kabc/vcard/SoundValue.cpp
+++ b/tdeabc/vcard/SoundValue.cpp
diff --git a/kabc/vcard/SourceParam.cpp b/tdeabc/vcard/SourceParam.cpp
index 6a0e772a..6a0e772a 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/tdeabc/vcard/SourceParam.cpp
diff --git a/kabc/vcard/TelParam.cpp b/tdeabc/vcard/TelParam.cpp
index 072b1dc8..072b1dc8 100644
--- a/kabc/vcard/TelParam.cpp
+++ b/tdeabc/vcard/TelParam.cpp
diff --git a/kabc/vcard/TelValue.cpp b/tdeabc/vcard/TelValue.cpp
index c9c1b85a..c9c1b85a 100644
--- a/kabc/vcard/TelValue.cpp
+++ b/tdeabc/vcard/TelValue.cpp
diff --git a/kabc/vcard/TextBinParam.cpp b/tdeabc/vcard/TextBinParam.cpp
index 4e0ebadf..4e0ebadf 100644
--- a/kabc/vcard/TextBinParam.cpp
+++ b/tdeabc/vcard/TextBinParam.cpp
diff --git a/kabc/vcard/TextBinValue.cpp b/tdeabc/vcard/TextBinValue.cpp
index e7da0b7c..e7da0b7c 100644
--- a/kabc/vcard/TextBinValue.cpp
+++ b/tdeabc/vcard/TextBinValue.cpp
diff --git a/kabc/vcard/TextListValue.cpp b/tdeabc/vcard/TextListValue.cpp
index 2bec2e18..2bec2e18 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/tdeabc/vcard/TextListValue.cpp
diff --git a/kabc/vcard/TextParam.cpp b/tdeabc/vcard/TextParam.cpp
index b353483e..b353483e 100644
--- a/kabc/vcard/TextParam.cpp
+++ b/tdeabc/vcard/TextParam.cpp
diff --git a/kabc/vcard/TextValue.cpp b/tdeabc/vcard/TextValue.cpp
index cf8e0673..cf8e0673 100644
--- a/kabc/vcard/TextValue.cpp
+++ b/tdeabc/vcard/TextValue.cpp
diff --git a/kabc/vcard/URIValue.cpp b/tdeabc/vcard/URIValue.cpp
index bba8db0f..bba8db0f 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/tdeabc/vcard/URIValue.cpp
diff --git a/kabc/vcard/UTCValue.cpp b/tdeabc/vcard/UTCValue.cpp
index 30473661..30473661 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/tdeabc/vcard/UTCValue.cpp
diff --git a/kabc/vcard/VCard.cpp b/tdeabc/vcard/VCard.cpp
index eb3f57f6..eb3f57f6 100644
--- a/kabc/vcard/VCard.cpp
+++ b/tdeabc/vcard/VCard.cpp
diff --git a/kabc/vcard/VCardEntity.cpp b/tdeabc/vcard/VCardEntity.cpp
index 1f8cea5b..1f8cea5b 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/tdeabc/vcard/VCardEntity.cpp
diff --git a/kabc/vcard/Value.cpp b/tdeabc/vcard/Value.cpp
index c95c0712..c95c0712 100644
--- a/kabc/vcard/Value.cpp
+++ b/tdeabc/vcard/Value.cpp
diff --git a/kabc/vcard/include/VCard.h b/tdeabc/vcard/include/VCard.h
index 17b50e8f..17b50e8f 100644
--- a/kabc/vcard/include/VCard.h
+++ b/tdeabc/vcard/include/VCard.h
diff --git a/kabc/vcard/include/VCardAdrParam.h b/tdeabc/vcard/include/VCardAdrParam.h
index d40165f4..d40165f4 100644
--- a/kabc/vcard/include/VCardAdrParam.h
+++ b/tdeabc/vcard/include/VCardAdrParam.h
diff --git a/kabc/vcard/include/VCardAdrValue.h b/tdeabc/vcard/include/VCardAdrValue.h
index 94ed93ae..94ed93ae 100644
--- a/kabc/vcard/include/VCardAdrValue.h
+++ b/tdeabc/vcard/include/VCardAdrValue.h
diff --git a/kabc/vcard/include/VCardAgentParam.h b/tdeabc/vcard/include/VCardAgentParam.h
index 90c3bd52..90c3bd52 100644
--- a/kabc/vcard/include/VCardAgentParam.h
+++ b/tdeabc/vcard/include/VCardAgentParam.h
diff --git a/kabc/vcard/include/VCardAgentValue.h b/tdeabc/vcard/include/VCardAgentValue.h
index dd68145c..dd68145c 100644
--- a/kabc/vcard/include/VCardAgentValue.h
+++ b/tdeabc/vcard/include/VCardAgentValue.h
diff --git a/kabc/vcard/include/VCardClassValue.h b/tdeabc/vcard/include/VCardClassValue.h
index 5de79167..5de79167 100644
--- a/kabc/vcard/include/VCardClassValue.h
+++ b/tdeabc/vcard/include/VCardClassValue.h
diff --git a/kabc/vcard/include/VCardContentLine.h b/tdeabc/vcard/include/VCardContentLine.h
index ea59444a..ea59444a 100644
--- a/kabc/vcard/include/VCardContentLine.h
+++ b/tdeabc/vcard/include/VCardContentLine.h
diff --git a/kabc/vcard/include/VCardDateParam.h b/tdeabc/vcard/include/VCardDateParam.h
index 410eae6b..410eae6b 100644
--- a/kabc/vcard/include/VCardDateParam.h
+++ b/tdeabc/vcard/include/VCardDateParam.h
diff --git a/kabc/vcard/include/VCardDateValue.h b/tdeabc/vcard/include/VCardDateValue.h
index 4f2e2fe7..4f2e2fe7 100644
--- a/kabc/vcard/include/VCardDateValue.h
+++ b/tdeabc/vcard/include/VCardDateValue.h
diff --git a/kabc/vcard/include/VCardDefines.h b/tdeabc/vcard/include/VCardDefines.h
index e778bc24..e778bc24 100644
--- a/kabc/vcard/include/VCardDefines.h
+++ b/tdeabc/vcard/include/VCardDefines.h
diff --git a/kabc/vcard/include/VCardEmailParam.h b/tdeabc/vcard/include/VCardEmailParam.h
index 1fe558af..1fe558af 100644
--- a/kabc/vcard/include/VCardEmailParam.h
+++ b/tdeabc/vcard/include/VCardEmailParam.h
diff --git a/kabc/vcard/include/VCardEntity.h b/tdeabc/vcard/include/VCardEntity.h
index e87c5f1a..e87c5f1a 100644
--- a/kabc/vcard/include/VCardEntity.h
+++ b/tdeabc/vcard/include/VCardEntity.h
diff --git a/kabc/vcard/include/VCardEnum.h b/tdeabc/vcard/include/VCardEnum.h
index 4552ccdb..4552ccdb 100644
--- a/kabc/vcard/include/VCardEnum.h
+++ b/tdeabc/vcard/include/VCardEnum.h
diff --git a/kabc/vcard/include/VCardFloatValue.h b/tdeabc/vcard/include/VCardFloatValue.h
index 45a6823b..45a6823b 100644
--- a/kabc/vcard/include/VCardFloatValue.h
+++ b/tdeabc/vcard/include/VCardFloatValue.h
diff --git a/kabc/vcard/include/VCardGeoValue.h b/tdeabc/vcard/include/VCardGeoValue.h
index 4228587a..4228587a 100644
--- a/kabc/vcard/include/VCardGeoValue.h
+++ b/tdeabc/vcard/include/VCardGeoValue.h
diff --git a/kabc/vcard/include/VCardGroup.h b/tdeabc/vcard/include/VCardGroup.h
index ce884f10..ce884f10 100644
--- a/kabc/vcard/include/VCardGroup.h
+++ b/tdeabc/vcard/include/VCardGroup.h
diff --git a/kabc/vcard/include/VCardImageParam.h b/tdeabc/vcard/include/VCardImageParam.h
index 10ab8a3f..10ab8a3f 100644
--- a/kabc/vcard/include/VCardImageParam.h
+++ b/tdeabc/vcard/include/VCardImageParam.h
diff --git a/kabc/vcard/include/VCardImageValue.h b/tdeabc/vcard/include/VCardImageValue.h
index 45fbcad9..45fbcad9 100644
--- a/kabc/vcard/include/VCardImageValue.h
+++ b/tdeabc/vcard/include/VCardImageValue.h
diff --git a/kabc/vcard/include/VCardImgValue.h b/tdeabc/vcard/include/VCardImgValue.h
index 7d4bbfa2..7d4bbfa2 100644
--- a/kabc/vcard/include/VCardImgValue.h
+++ b/tdeabc/vcard/include/VCardImgValue.h
diff --git a/kabc/vcard/include/VCardLangValue.h b/tdeabc/vcard/include/VCardLangValue.h
index 7767d52f..7767d52f 100644
--- a/kabc/vcard/include/VCardLangValue.h
+++ b/tdeabc/vcard/include/VCardLangValue.h
diff --git a/kabc/vcard/include/VCardNValue.h b/tdeabc/vcard/include/VCardNValue.h
index 9db37fbb..9db37fbb 100644
--- a/kabc/vcard/include/VCardNValue.h
+++ b/tdeabc/vcard/include/VCardNValue.h
diff --git a/kabc/vcard/include/VCardOrgValue.h b/tdeabc/vcard/include/VCardOrgValue.h
index a2bd803e..a2bd803e 100644
--- a/kabc/vcard/include/VCardOrgValue.h
+++ b/tdeabc/vcard/include/VCardOrgValue.h
diff --git a/kabc/vcard/include/VCardParam.h b/tdeabc/vcard/include/VCardParam.h
index 93d70f06..93d70f06 100644
--- a/kabc/vcard/include/VCardParam.h
+++ b/tdeabc/vcard/include/VCardParam.h
diff --git a/kabc/vcard/include/VCardPhoneNumberValue.h b/tdeabc/vcard/include/VCardPhoneNumberValue.h
index 3f9e106c..3f9e106c 100644
--- a/kabc/vcard/include/VCardPhoneNumberValue.h
+++ b/tdeabc/vcard/include/VCardPhoneNumberValue.h
diff --git a/kabc/vcard/include/VCardRToken.h b/tdeabc/vcard/include/VCardRToken.h
index 17a3943d..17a3943d 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/tdeabc/vcard/include/VCardRToken.h
diff --git a/kabc/vcard/include/VCardSndValue.h b/tdeabc/vcard/include/VCardSndValue.h
index 09a3a823..09a3a823 100644
--- a/kabc/vcard/include/VCardSndValue.h
+++ b/tdeabc/vcard/include/VCardSndValue.h
diff --git a/kabc/vcard/include/VCardSoundValue.h b/tdeabc/vcard/include/VCardSoundValue.h
index 61858f05..61858f05 100644
--- a/kabc/vcard/include/VCardSoundValue.h
+++ b/tdeabc/vcard/include/VCardSoundValue.h
diff --git a/kabc/vcard/include/VCardSourceParam.h b/tdeabc/vcard/include/VCardSourceParam.h
index 1d9d03d4..1d9d03d4 100644
--- a/kabc/vcard/include/VCardSourceParam.h
+++ b/tdeabc/vcard/include/VCardSourceParam.h
diff --git a/kabc/vcard/include/VCardTelParam.h b/tdeabc/vcard/include/VCardTelParam.h
index 9eea5da2..9eea5da2 100644
--- a/kabc/vcard/include/VCardTelParam.h
+++ b/tdeabc/vcard/include/VCardTelParam.h
diff --git a/kabc/vcard/include/VCardTelValue.h b/tdeabc/vcard/include/VCardTelValue.h
index 043a45aa..043a45aa 100644
--- a/kabc/vcard/include/VCardTelValue.h
+++ b/tdeabc/vcard/include/VCardTelValue.h
diff --git a/kabc/vcard/include/VCardTextBinParam.h b/tdeabc/vcard/include/VCardTextBinParam.h
index 5a681ad4..5a681ad4 100644
--- a/kabc/vcard/include/VCardTextBinParam.h
+++ b/tdeabc/vcard/include/VCardTextBinParam.h
diff --git a/kabc/vcard/include/VCardTextBinValue.h b/tdeabc/vcard/include/VCardTextBinValue.h
index 316fa783..316fa783 100644
--- a/kabc/vcard/include/VCardTextBinValue.h
+++ b/tdeabc/vcard/include/VCardTextBinValue.h
diff --git a/kabc/vcard/include/VCardTextListValue.h b/tdeabc/vcard/include/VCardTextListValue.h
index 53760c75..53760c75 100644
--- a/kabc/vcard/include/VCardTextListValue.h
+++ b/tdeabc/vcard/include/VCardTextListValue.h
diff --git a/kabc/vcard/include/VCardTextParam.h b/tdeabc/vcard/include/VCardTextParam.h
index d593c057..d593c057 100644
--- a/kabc/vcard/include/VCardTextParam.h
+++ b/tdeabc/vcard/include/VCardTextParam.h
diff --git a/kabc/vcard/include/VCardTextValue.h b/tdeabc/vcard/include/VCardTextValue.h
index 66eed32a..66eed32a 100644
--- a/kabc/vcard/include/VCardTextValue.h
+++ b/tdeabc/vcard/include/VCardTextValue.h
diff --git a/kabc/vcard/include/VCardURIValue.h b/tdeabc/vcard/include/VCardURIValue.h
index 69688777..69688777 100644
--- a/kabc/vcard/include/VCardURIValue.h
+++ b/tdeabc/vcard/include/VCardURIValue.h
diff --git a/kabc/vcard/include/VCardUTCValue.h b/tdeabc/vcard/include/VCardUTCValue.h
index cb09ccf0..cb09ccf0 100644
--- a/kabc/vcard/include/VCardUTCValue.h
+++ b/tdeabc/vcard/include/VCardUTCValue.h
diff --git a/kabc/vcard/include/VCardVCard.h b/tdeabc/vcard/include/VCardVCard.h
index 53563e8c..53563e8c 100644
--- a/kabc/vcard/include/VCardVCard.h
+++ b/tdeabc/vcard/include/VCardVCard.h
diff --git a/kabc/vcard/include/VCardVCardEntity.h b/tdeabc/vcard/include/VCardVCardEntity.h
index 422790c2..422790c2 100644
--- a/kabc/vcard/include/VCardVCardEntity.h
+++ b/tdeabc/vcard/include/VCardVCardEntity.h
diff --git a/kabc/vcard/include/VCardValue.h b/tdeabc/vcard/include/VCardValue.h
index 3c167d70..3c167d70 100644
--- a/kabc/vcard/include/VCardValue.h
+++ b/tdeabc/vcard/include/VCardValue.h
diff --git a/kabc/vcard/include/generated/AdrParam-generated.h b/tdeabc/vcard/include/generated/AdrParam-generated.h
index 1afdcd36..1afdcd36 100644
--- a/kabc/vcard/include/generated/AdrParam-generated.h
+++ b/tdeabc/vcard/include/generated/AdrParam-generated.h
diff --git a/kabc/vcard/include/generated/AdrValue-generated.h b/tdeabc/vcard/include/generated/AdrValue-generated.h
index 9882d118..9882d118 100644
--- a/kabc/vcard/include/generated/AdrValue-generated.h
+++ b/tdeabc/vcard/include/generated/AdrValue-generated.h
diff --git a/kabc/vcard/include/generated/AgentParam-generated.h b/tdeabc/vcard/include/generated/AgentParam-generated.h
index 07b87d10..07b87d10 100644
--- a/kabc/vcard/include/generated/AgentParam-generated.h
+++ b/tdeabc/vcard/include/generated/AgentParam-generated.h
diff --git a/kabc/vcard/include/generated/AgentValue-generated.h b/tdeabc/vcard/include/generated/AgentValue-generated.h
index e2866bb8..e2866bb8 100644
--- a/kabc/vcard/include/generated/AgentValue-generated.h
+++ b/tdeabc/vcard/include/generated/AgentValue-generated.h
diff --git a/kabc/vcard/include/generated/ClassValue-generated.h b/tdeabc/vcard/include/generated/ClassValue-generated.h
index e10c6556..e10c6556 100644
--- a/kabc/vcard/include/generated/ClassValue-generated.h
+++ b/tdeabc/vcard/include/generated/ClassValue-generated.h
diff --git a/kabc/vcard/include/generated/ContentLine-generated.h b/tdeabc/vcard/include/generated/ContentLine-generated.h
index ad2ac764..ad2ac764 100644
--- a/kabc/vcard/include/generated/ContentLine-generated.h
+++ b/tdeabc/vcard/include/generated/ContentLine-generated.h
diff --git a/kabc/vcard/include/generated/DateParam-generated.h b/tdeabc/vcard/include/generated/DateParam-generated.h
index 75e7ad72..75e7ad72 100644
--- a/kabc/vcard/include/generated/DateParam-generated.h
+++ b/tdeabc/vcard/include/generated/DateParam-generated.h
diff --git a/kabc/vcard/include/generated/DateValue-generated.h b/tdeabc/vcard/include/generated/DateValue-generated.h
index cf0eb40d..cf0eb40d 100644
--- a/kabc/vcard/include/generated/DateValue-generated.h
+++ b/tdeabc/vcard/include/generated/DateValue-generated.h
diff --git a/kabc/vcard/include/generated/EmailParam-generated.h b/tdeabc/vcard/include/generated/EmailParam-generated.h
index 46ae1f80..46ae1f80 100644
--- a/kabc/vcard/include/generated/EmailParam-generated.h
+++ b/tdeabc/vcard/include/generated/EmailParam-generated.h
diff --git a/kabc/vcard/include/generated/FloatValue-generated.h b/tdeabc/vcard/include/generated/FloatValue-generated.h
index 155f52ae..155f52ae 100644
--- a/kabc/vcard/include/generated/FloatValue-generated.h
+++ b/tdeabc/vcard/include/generated/FloatValue-generated.h
diff --git a/kabc/vcard/include/generated/GeoValue-generated.h b/tdeabc/vcard/include/generated/GeoValue-generated.h
index b525e8c2..b525e8c2 100644
--- a/kabc/vcard/include/generated/GeoValue-generated.h
+++ b/tdeabc/vcard/include/generated/GeoValue-generated.h
diff --git a/kabc/vcard/include/generated/Group-generated.h b/tdeabc/vcard/include/generated/Group-generated.h
index 38e1c2a3..38e1c2a3 100644
--- a/kabc/vcard/include/generated/Group-generated.h
+++ b/tdeabc/vcard/include/generated/Group-generated.h
diff --git a/kabc/vcard/include/generated/ImageParam-generated.h b/tdeabc/vcard/include/generated/ImageParam-generated.h
index 78a5a97c..78a5a97c 100644
--- a/kabc/vcard/include/generated/ImageParam-generated.h
+++ b/tdeabc/vcard/include/generated/ImageParam-generated.h
diff --git a/kabc/vcard/include/generated/ImageValue-generated.h b/tdeabc/vcard/include/generated/ImageValue-generated.h
index 882081fb..882081fb 100644
--- a/kabc/vcard/include/generated/ImageValue-generated.h
+++ b/tdeabc/vcard/include/generated/ImageValue-generated.h
diff --git a/kabc/vcard/include/generated/ImgParam-generated.h b/tdeabc/vcard/include/generated/ImgParam-generated.h
index 04132c85..04132c85 100644
--- a/kabc/vcard/include/generated/ImgParam-generated.h
+++ b/tdeabc/vcard/include/generated/ImgParam-generated.h
diff --git a/kabc/vcard/include/generated/ImgValue-generated.h b/tdeabc/vcard/include/generated/ImgValue-generated.h
index 0774de9b..0774de9b 100644
--- a/kabc/vcard/include/generated/ImgValue-generated.h
+++ b/tdeabc/vcard/include/generated/ImgValue-generated.h
diff --git a/kabc/vcard/include/generated/LangValue-generated.h b/tdeabc/vcard/include/generated/LangValue-generated.h
index c4930c59..c4930c59 100644
--- a/kabc/vcard/include/generated/LangValue-generated.h
+++ b/tdeabc/vcard/include/generated/LangValue-generated.h
diff --git a/kabc/vcard/include/generated/NValue-generated.h b/tdeabc/vcard/include/generated/NValue-generated.h
index d78715ec..d78715ec 100644
--- a/kabc/vcard/include/generated/NValue-generated.h
+++ b/tdeabc/vcard/include/generated/NValue-generated.h
diff --git a/kabc/vcard/include/generated/Name-generated.h b/tdeabc/vcard/include/generated/Name-generated.h
index 17d56e68..17d56e68 100644
--- a/kabc/vcard/include/generated/Name-generated.h
+++ b/tdeabc/vcard/include/generated/Name-generated.h
diff --git a/kabc/vcard/include/generated/OrgValue-generated.h b/tdeabc/vcard/include/generated/OrgValue-generated.h
index 661ecf5a..661ecf5a 100644
--- a/kabc/vcard/include/generated/OrgValue-generated.h
+++ b/tdeabc/vcard/include/generated/OrgValue-generated.h
diff --git a/kabc/vcard/include/generated/Param-generated.h b/tdeabc/vcard/include/generated/Param-generated.h
index bf63e716..bf63e716 100644
--- a/kabc/vcard/include/generated/Param-generated.h
+++ b/tdeabc/vcard/include/generated/Param-generated.h
diff --git a/kabc/vcard/include/generated/ParamName-generated.h b/tdeabc/vcard/include/generated/ParamName-generated.h
index 60b1e12d..60b1e12d 100644
--- a/kabc/vcard/include/generated/ParamName-generated.h
+++ b/tdeabc/vcard/include/generated/ParamName-generated.h
diff --git a/kabc/vcard/include/generated/ParamValue-generated.h b/tdeabc/vcard/include/generated/ParamValue-generated.h
index f31a166c..f31a166c 100644
--- a/kabc/vcard/include/generated/ParamValue-generated.h
+++ b/tdeabc/vcard/include/generated/ParamValue-generated.h
diff --git a/kabc/vcard/include/generated/PhoneNumberValue-generated.h b/tdeabc/vcard/include/generated/PhoneNumberValue-generated.h
index f0eb6b4f..f0eb6b4f 100644
--- a/kabc/vcard/include/generated/PhoneNumberValue-generated.h
+++ b/tdeabc/vcard/include/generated/PhoneNumberValue-generated.h
diff --git a/kabc/vcard/include/generated/SoundValue-generated.h b/tdeabc/vcard/include/generated/SoundValue-generated.h
index 64081be0..64081be0 100644
--- a/kabc/vcard/include/generated/SoundValue-generated.h
+++ b/tdeabc/vcard/include/generated/SoundValue-generated.h
diff --git a/kabc/vcard/include/generated/SourceParam-generated.h b/tdeabc/vcard/include/generated/SourceParam-generated.h
index e3b13bca..e3b13bca 100644
--- a/kabc/vcard/include/generated/SourceParam-generated.h
+++ b/tdeabc/vcard/include/generated/SourceParam-generated.h
diff --git a/kabc/vcard/include/generated/TelParam-generated.h b/tdeabc/vcard/include/generated/TelParam-generated.h
index 9f8f2427..9f8f2427 100644
--- a/kabc/vcard/include/generated/TelParam-generated.h
+++ b/tdeabc/vcard/include/generated/TelParam-generated.h
diff --git a/kabc/vcard/include/generated/TelValue-generated.h b/tdeabc/vcard/include/generated/TelValue-generated.h
index 600da772..600da772 100644
--- a/kabc/vcard/include/generated/TelValue-generated.h
+++ b/tdeabc/vcard/include/generated/TelValue-generated.h
diff --git a/kabc/vcard/include/generated/TextBinParam-generated.h b/tdeabc/vcard/include/generated/TextBinParam-generated.h
index 37dc56e5..37dc56e5 100644
--- a/kabc/vcard/include/generated/TextBinParam-generated.h
+++ b/tdeabc/vcard/include/generated/TextBinParam-generated.h
diff --git a/kabc/vcard/include/generated/TextBinValue-generated.h b/tdeabc/vcard/include/generated/TextBinValue-generated.h
index 4c958042..4c958042 100644
--- a/kabc/vcard/include/generated/TextBinValue-generated.h
+++ b/tdeabc/vcard/include/generated/TextBinValue-generated.h
diff --git a/kabc/vcard/include/generated/TextListValue-generated.h b/tdeabc/vcard/include/generated/TextListValue-generated.h
index 8babb0d9..8babb0d9 100644
--- a/kabc/vcard/include/generated/TextListValue-generated.h
+++ b/tdeabc/vcard/include/generated/TextListValue-generated.h
diff --git a/kabc/vcard/include/generated/TextNSParam-generated.h b/tdeabc/vcard/include/generated/TextNSParam-generated.h
index bd8e74b0..bd8e74b0 100644
--- a/kabc/vcard/include/generated/TextNSParam-generated.h
+++ b/tdeabc/vcard/include/generated/TextNSParam-generated.h
diff --git a/kabc/vcard/include/generated/TextParam-generated.h b/tdeabc/vcard/include/generated/TextParam-generated.h
index 54ae611a..54ae611a 100644
--- a/kabc/vcard/include/generated/TextParam-generated.h
+++ b/tdeabc/vcard/include/generated/TextParam-generated.h
diff --git a/kabc/vcard/include/generated/TextValue-generated.h b/tdeabc/vcard/include/generated/TextValue-generated.h
index 5b56b54a..5b56b54a 100644
--- a/kabc/vcard/include/generated/TextValue-generated.h
+++ b/tdeabc/vcard/include/generated/TextValue-generated.h
diff --git a/kabc/vcard/include/generated/URIValue-generated.h b/tdeabc/vcard/include/generated/URIValue-generated.h
index 5a691e6d..5a691e6d 100644
--- a/kabc/vcard/include/generated/URIValue-generated.h
+++ b/tdeabc/vcard/include/generated/URIValue-generated.h
diff --git a/kabc/vcard/include/generated/UTCValue-generated.h b/tdeabc/vcard/include/generated/UTCValue-generated.h
index 0c6edfb4..0c6edfb4 100644
--- a/kabc/vcard/include/generated/UTCValue-generated.h
+++ b/tdeabc/vcard/include/generated/UTCValue-generated.h
diff --git a/kabc/vcard/include/generated/VCard-generated.h b/tdeabc/vcard/include/generated/VCard-generated.h
index 4f36d11d..4f36d11d 100644
--- a/kabc/vcard/include/generated/VCard-generated.h
+++ b/tdeabc/vcard/include/generated/VCard-generated.h
diff --git a/kabc/vcard/include/generated/VCardEntity-generated.h b/tdeabc/vcard/include/generated/VCardEntity-generated.h
index 4e973e62..4e973e62 100644
--- a/kabc/vcard/include/generated/VCardEntity-generated.h
+++ b/tdeabc/vcard/include/generated/VCardEntity-generated.h
diff --git a/kabc/vcard/include/generated/Value-generated.h b/tdeabc/vcard/include/generated/Value-generated.h
index 935d137b..935d137b 100644
--- a/kabc/vcard/include/generated/Value-generated.h
+++ b/tdeabc/vcard/include/generated/Value-generated.h
diff --git a/kabc/vcard/include/generated/generate b/tdeabc/vcard/include/generated/generate
index 926dbf13..926dbf13 100755
--- a/kabc/vcard/include/generated/generate
+++ b/tdeabc/vcard/include/generated/generate
diff --git a/kabc/vcard/include/generated/generateHeaders.awk b/tdeabc/vcard/include/generated/generateHeaders.awk
index 471db11b..471db11b 100755
--- a/kabc/vcard/include/generated/generateHeaders.awk
+++ b/tdeabc/vcard/include/generated/generateHeaders.awk
diff --git a/kabc/vcard/include/generated/headerBodies b/tdeabc/vcard/include/generated/headerBodies
index 5e77b2b5..5e77b2b5 100644
--- a/kabc/vcard/include/generated/headerBodies
+++ b/tdeabc/vcard/include/generated/headerBodies
diff --git a/kabc/vcard/testread.cpp b/tdeabc/vcard/testread.cpp
index 3a33c7d5..3a33c7d5 100644
--- a/kabc/vcard/testread.cpp
+++ b/tdeabc/vcard/testread.cpp
diff --git a/kabc/vcard/testwrite.cpp b/tdeabc/vcard/testwrite.cpp
index 67f8eb20..42b76c80 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/tdeabc/vcard/testwrite.cpp
@@ -1,7 +1,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <VCard.h>
diff --git a/kabc/vcard/vCard-all.cpp b/tdeabc/vcard/vCard-all.cpp
index 07bbcd2b..07bbcd2b 100644
--- a/kabc/vcard/vCard-all.cpp
+++ b/tdeabc/vcard/vCard-all.cpp
diff --git a/kabc/vcard21parser.cpp b/tdeabc/vcard21parser.cpp
index 8a3bfcae..8a3bfcae 100644
--- a/kabc/vcard21parser.cpp
+++ b/tdeabc/vcard21parser.cpp
diff --git a/kabc/vcard21parser.h b/tdeabc/vcard21parser.h
index 0eb66fa9..0eb66fa9 100644
--- a/kabc/vcard21parser.h
+++ b/tdeabc/vcard21parser.h
diff --git a/kabc/vcardconverter.cpp b/tdeabc/vcardconverter.cpp
index d575b019..d575b019 100644
--- a/kabc/vcardconverter.cpp
+++ b/tdeabc/vcardconverter.cpp
diff --git a/kabc/vcardconverter.h b/tdeabc/vcardconverter.h
index ab09279f..ab09279f 100644
--- a/kabc/vcardconverter.h
+++ b/tdeabc/vcardconverter.h
diff --git a/kabc/vcardformat.cpp b/tdeabc/vcardformat.cpp
index 147aa425..147aa425 100644
--- a/kabc/vcardformat.cpp
+++ b/tdeabc/vcardformat.cpp
diff --git a/kabc/vcardformat.h b/tdeabc/vcardformat.h
index 8194056c..8194056c 100644
--- a/kabc/vcardformat.h
+++ b/tdeabc/vcardformat.h
diff --git a/kabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp
index ebaf337b..c0d39bb9 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/tdeabc/vcardformatimpl.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kmdcodec.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <VCard.h>
@@ -849,7 +849,7 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty
if ( type == EntityLogo )
dir = "logos";
- img.save( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ), pic.type().utf8() );
+ img.save( locateLocal( "data", "tdeabc/" + dir + "/" + addr.uid() ), pic.type().utf8() );
cl.setValue( new TextValue( "<dummy>" ) );
}
params.append( new Param( "ENCODING", "b" ) );
@@ -889,7 +889,7 @@ Picture VCardFormatImpl::readPictureValue( VCARD::ContentLine *cl, VCARD::Entity
if ( type == EntityLogo )
dir = "logos";
- img.load( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ) );
+ img.load( locateLocal( "data", "tdeabc/" + dir + "/" + addr.uid() ) );
} else {
TQByteArray data;
KCodecs::base64Decode( v->asString(), data );
@@ -921,7 +921,7 @@ void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, co
if ( intern ) { // only for vCard export we really write the data inline
cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
} else { // save sound in cache
- TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+ TQFile file( locateLocal( "data", "tdeabc/sounds/" + addr.uid() ) );
if ( file.open( IO_WriteOnly ) ) {
file.writeBlock( data );
}
@@ -953,7 +953,7 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
if ( isInline ) {
TQByteArray data;
if ( v->asString() == "<dummy>" ) { // no sound inline stored => sound is in cache
- TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+ TQFile file( locateLocal( "data", "tdeabc/sounds/" + addr.uid() ) );
if ( file.open( IO_ReadOnly ) ) {
data = file.readAll();
file.close();
diff --git a/kabc/vcardformatimpl.h b/tdeabc/vcardformatimpl.h
index 78c466a8..78c466a8 100644
--- a/kabc/vcardformatimpl.h
+++ b/tdeabc/vcardformatimpl.h
diff --git a/kabc/vcardformatplugin.cpp b/tdeabc/vcardformatplugin.cpp
index 6194cd0f..6194cd0f 100644
--- a/kabc/vcardformatplugin.cpp
+++ b/tdeabc/vcardformatplugin.cpp
diff --git a/kabc/vcardformatplugin.h b/tdeabc/vcardformatplugin.h
index 5ac7e49c..5ac7e49c 100644
--- a/kabc/vcardformatplugin.h
+++ b/tdeabc/vcardformatplugin.h
diff --git a/kabc/vcardparser/CMakeLists.txt b/tdeabc/vcardparser/CMakeLists.txt
index 2c6fa112..2c6fa112 100644
--- a/kabc/vcardparser/CMakeLists.txt
+++ b/tdeabc/vcardparser/CMakeLists.txt
diff --git a/kabc/vcardparser/Makefile.am b/tdeabc/vcardparser/Makefile.am
index 53e4e42a..a855c975 100644
--- a/kabc/vcardparser/Makefile.am
+++ b/tdeabc/vcardparser/Makefile.am
@@ -9,15 +9,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
check_PROGRAMS = testread testwrite testread2
testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testread_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
testread_SOURCES = testread.cpp
testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testread2_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
testread2_SOURCES = testread2.cpp testutils.cpp
testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testwrite_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
testwrite_SOURCES = testwrite.cpp
TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
@@ -25,7 +25,7 @@ TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
check-local: testread
rm -f FAILED; \
for i in $(TESTFILES); \
- do perl $(top_srcdir)/kabc/vcardparser/checkvcard.pl \
- $(top_srcdir)/kabc/vcardparser/tests/$$i; \
+ do perl $(top_srcdir)/tdeabc/vcardparser/checkvcard.pl \
+ $(top_srcdir)/tdeabc/vcardparser/tests/$$i; \
done; \
[ ! -e FAILED ]
diff --git a/kabc/vcardparser/README.testing b/tdeabc/vcardparser/README.testing
index a7794931..a7794931 100644
--- a/kabc/vcardparser/README.testing
+++ b/tdeabc/vcardparser/README.testing
diff --git a/kabc/vcardparser/checkvcard.pl b/tdeabc/vcardparser/checkvcard.pl
index 67160ea4..67160ea4 100755
--- a/kabc/vcardparser/checkvcard.pl
+++ b/tdeabc/vcardparser/checkvcard.pl
diff --git a/kabc/vcardparser/testread.cpp b/tdeabc/vcardparser/testread.cpp
index 6c3405ef..fd3524b5 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/tdeabc/vcardparser/testread.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include "vcardconverter.h"
diff --git a/kabc/vcardparser/testread2.cpp b/tdeabc/vcardparser/testread2.cpp
index ba73081e..ea278602 100644
--- a/kabc/vcardparser/testread2.cpp
+++ b/tdeabc/vcardparser/testread2.cpp
@@ -1,5 +1,5 @@
#include "testutils.h"
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <vcardconverter.h>
#include <kdebug.h>
diff --git a/kabc/vcardparser/tests/vcard1.vcf b/tdeabc/vcardparser/tests/vcard1.vcf
index 2c77b094..2c77b094 100644
--- a/kabc/vcardparser/tests/vcard1.vcf
+++ b/tdeabc/vcardparser/tests/vcard1.vcf
diff --git a/kabc/vcardparser/tests/vcard1.vcf.ref b/tdeabc/vcardparser/tests/vcard1.vcf.ref
index 073a7f31..073a7f31 100644
--- a/kabc/vcardparser/tests/vcard1.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard1.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard2.vcf b/tdeabc/vcardparser/tests/vcard2.vcf
index a4136b1b..a4136b1b 100644
--- a/kabc/vcardparser/tests/vcard2.vcf
+++ b/tdeabc/vcardparser/tests/vcard2.vcf
diff --git a/kabc/vcardparser/tests/vcard2.vcf.ref b/tdeabc/vcardparser/tests/vcard2.vcf.ref
index 55151c79..55151c79 100644
--- a/kabc/vcardparser/tests/vcard2.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard2.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard3.vcf b/tdeabc/vcardparser/tests/vcard3.vcf
index f3f64978..f3f64978 100644
--- a/kabc/vcardparser/tests/vcard3.vcf
+++ b/tdeabc/vcardparser/tests/vcard3.vcf
diff --git a/kabc/vcardparser/tests/vcard3.vcf.ref b/tdeabc/vcardparser/tests/vcard3.vcf.ref
index c9135176..c9135176 100644
--- a/kabc/vcardparser/tests/vcard3.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard3.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard4.vcf b/tdeabc/vcardparser/tests/vcard4.vcf
index 7152ceb0..7152ceb0 100644
--- a/kabc/vcardparser/tests/vcard4.vcf
+++ b/tdeabc/vcardparser/tests/vcard4.vcf
diff --git a/kabc/vcardparser/tests/vcard4.vcf.ref b/tdeabc/vcardparser/tests/vcard4.vcf.ref
index fc3b7a50..fc3b7a50 100644
--- a/kabc/vcardparser/tests/vcard4.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard4.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard5.vcf b/tdeabc/vcardparser/tests/vcard5.vcf
index 957a1e55..957a1e55 100644
--- a/kabc/vcardparser/tests/vcard5.vcf
+++ b/tdeabc/vcardparser/tests/vcard5.vcf
diff --git a/kabc/vcardparser/tests/vcard5.vcf.ref b/tdeabc/vcardparser/tests/vcard5.vcf.ref
index 712b4949..712b4949 100644
--- a/kabc/vcardparser/tests/vcard5.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard5.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard6.vcf b/tdeabc/vcardparser/tests/vcard6.vcf
index 92339c79..92339c79 100644
--- a/kabc/vcardparser/tests/vcard6.vcf
+++ b/tdeabc/vcardparser/tests/vcard6.vcf
diff --git a/kabc/vcardparser/tests/vcard6.vcf.ref b/tdeabc/vcardparser/tests/vcard6.vcf.ref
index 3cfde20b..3cfde20b 100644
--- a/kabc/vcardparser/tests/vcard6.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard6.vcf.ref
diff --git a/kabc/vcardparser/tests/vcard7.vcf b/tdeabc/vcardparser/tests/vcard7.vcf
index 8b5be8ec..8b5be8ec 100644
--- a/kabc/vcardparser/tests/vcard7.vcf
+++ b/tdeabc/vcardparser/tests/vcard7.vcf
diff --git a/kabc/vcardparser/tests/vcard7.vcf.ref b/tdeabc/vcardparser/tests/vcard7.vcf.ref
index 84ed6236..84ed6236 100644
--- a/kabc/vcardparser/tests/vcard7.vcf.ref
+++ b/tdeabc/vcardparser/tests/vcard7.vcf.ref
diff --git a/kabc/vcardparser/testutils.cpp b/tdeabc/vcardparser/testutils.cpp
index df4b60c9..62d1b412 100644
--- a/kabc/vcardparser/testutils.cpp
+++ b/tdeabc/vcardparser/testutils.cpp
@@ -1,5 +1,5 @@
#include <vcardparser.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tqfile.h>
using namespace KABC;
diff --git a/kabc/vcardparser/testutils.h b/tdeabc/vcardparser/testutils.h
index 4f202417..c8218b7b 100644
--- a/kabc/vcardparser/testutils.h
+++ b/tdeabc/vcardparser/testutils.h
@@ -1,7 +1,7 @@
#ifndef TESTUTILS_H
#define TESTUTILS_H
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <tqstring.h>
KABC::Addressee vcard1();
diff --git a/kabc/vcardparser/testwrite.cpp b/tdeabc/vcardparser/testwrite.cpp
index 5a58bd8a..e40ffe4d 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/tdeabc/vcardparser/testwrite.cpp
@@ -17,13 +17,13 @@
Boston, MA 02110-1301, USA.
*/
-#include <kabc/addressee.h>
-#include <kabc/phonenumber.h>
-#include <kabc/address.h>
-#include <kabc/key.h>
-#include <kabc/picture.h>
-#include <kabc/sound.h>
-#include <kabc/secrecy.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/phonenumber.h>
+#include <tdeabc/address.h>
+#include <tdeabc/key.h>
+#include <tdeabc/picture.h>
+#include <tdeabc/sound.h>
+#include <tdeabc/secrecy.h>
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
diff --git a/kabc/vcardparser/vcard.cpp b/tdeabc/vcardparser/vcard.cpp
index 30a8e1c4..30a8e1c4 100644
--- a/kabc/vcardparser/vcard.cpp
+++ b/tdeabc/vcardparser/vcard.cpp
diff --git a/kabc/vcardparser/vcard.h b/tdeabc/vcardparser/vcard.h
index 6afeeda2..6afeeda2 100644
--- a/kabc/vcardparser/vcard.h
+++ b/tdeabc/vcardparser/vcard.h
diff --git a/kabc/vcardparser/vcardline.cpp b/tdeabc/vcardparser/vcardline.cpp
index 6680cf7d..6680cf7d 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/tdeabc/vcardparser/vcardline.cpp
diff --git a/kabc/vcardparser/vcardline.h b/tdeabc/vcardparser/vcardline.h
index 92fe743f..92fe743f 100644
--- a/kabc/vcardparser/vcardline.h
+++ b/tdeabc/vcardparser/vcardline.h
diff --git a/kabc/vcardparser/vcardparser.cpp b/tdeabc/vcardparser/vcardparser.cpp
index aed9ebd3..aed9ebd3 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/tdeabc/vcardparser/vcardparser.cpp
diff --git a/kabc/vcardparser/vcardparser.h b/tdeabc/vcardparser/vcardparser.h
index da5fdd46..da5fdd46 100644
--- a/kabc/vcardparser/vcardparser.h
+++ b/tdeabc/vcardparser/vcardparser.h
diff --git a/kabc/vcardtool.cpp b/tdeabc/vcardtool.cpp
index 295360a0..295360a0 100644
--- a/kabc/vcardtool.cpp
+++ b/tdeabc/vcardtool.cpp
diff --git a/kabc/vcardtool.h b/tdeabc/vcardtool.h
index fbf95961..fbf95961 100644
--- a/kabc/vcardtool.h
+++ b/tdeabc/vcardtool.h
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc
index 7c84f31d..9a50e6e2 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -24,14 +24,14 @@
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqbutton.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpassdlg.h>
#include <ksslall.h>
#include <kopenssl.h>
diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp
index 3d54abc4..72f3c66f 100644
--- a/tdecmshell/main.cpp
+++ b/tdecmshell/main.cpp
@@ -37,12 +37,12 @@
#include <kdebug.h>
#include <kdialogbase.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kservice.h>
#include <kservicegroup.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include <twin.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "main.h"
#include "main.moc"
diff --git a/tdeconf_update/tdeconf_update.cpp b/tdeconf_update/tdeconf_update.cpp
index 458b3b52..814e68a1 100644
--- a/tdeconf_update/tdeconf_update.cpp
+++ b/tdeconf_update/tdeconf_update.cpp
@@ -30,13 +30,13 @@
#include <tdeconfig.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <tdeaboutdata.h>
#include <kinstance.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
static TDECmdLineOptions options[] =
{
diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt
index 850bb10f..b8f51287 100644
--- a/tdecore/CMakeLists.txt
+++ b/tdecore/CMakeLists.txt
@@ -74,19 +74,19 @@ install( FILES
kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h
kapp.h tdeapplication.h kuniqueapp.h kuniqueapplication.h
kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
- klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
+ tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
kregexp.h kcompletion.h kstringhandler.h kstddirs.h
- kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h
+ kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
- kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h
+ kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h
krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
- tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h
+ tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h
klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc
ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h
kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h
@@ -123,15 +123,15 @@ set( ${target}_SRCS
libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp
tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
- ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
+ ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp tdelocale.cpp
krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp
kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
- kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp
+ kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp
kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
- kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
+ kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp
kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
@@ -139,7 +139,7 @@ set( ${target}_SRCS
kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp
fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel
- tdesycocafactory.cpp kxmessages.cpp kstartupinfo.cpp
+ tdesycocafactory.cpp kxmessages.cpp tdestartupinfo.cpp
kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp
kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp
kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp
diff --git a/tdecore/MAINTAINERS b/tdecore/MAINTAINERS
index e4a9ad80..ae94ecd7 100644
--- a/tdecore/MAINTAINERS
+++ b/tdecore/MAINTAINERS
@@ -27,10 +27,10 @@ kcrash.cpp Waldo Bastian <bastian@kde.org>
kdcoppropertyproxy.cpp
kdebug.cpp Stephan Kulow <coolo@kde.org>
kdesktopfile.cpp
-kglobal.cpp Stephan Kulow <coolo@kde.org>
+tdeglobal.cpp Stephan Kulow <coolo@kde.org>
kglobalaccel.cpp Ellis Whitehead <ellis@kde.org>
kglobalaccel_x11.cpp Ellis Whitehead <ellis@kde.org>
-kglobalsettings.cpp David Faure <faure@kde.org>
+tdeglobalsettings.cpp David Faure <faure@kde.org>
kiconeffect.cpp
kiconloader.cpp
kicontheme.cpp
@@ -41,7 +41,7 @@ kkeynative_x11.cpp Ellis Whitehead <ellis@kde.org>
kkeysequence.cpp Ellis Whitehead <ellis@kde.org>
kkeysequence_emb.cpp Ellis Whitehead <ellis@kde.org>
klibloader.cpp
-klocale.cpp Hans Petter Bieker <bieker@kde.org>
+tdelocale.cpp Hans Petter Bieker <bieker@kde.org>
kmdcodec.cpp
kmimesourcefactory.cpp
tdemultipledrag.cpp David Faure <faure@kde.org>
@@ -60,14 +60,14 @@ tdeshortcut.cpp Ellis Whitehead <ellis@kde.org>
ksimpleconfig.cpp Waldo Bastian <bastian@kde.org>
ksocks.cpp
kstandarddirs.cpp Waldo Bastian <bastian@kde.org>
-kstartupinfo.cpp Lubos Lunak <l.lunak@kde.org>
+tdestartupinfo.cpp Lubos Lunak <l.lunak@kde.org>
kstaticdeleter.cpp Stephan Kulow <coolo@kde.org>
tdestdaccel.cpp Ellis Whitehead <ellis@kde.org>
kstringhandler.cpp
tdesycoca.cpp Waldo Bastian <bastian@kde.org>
tdesycocadict.cpp Waldo Bastian <bastian@kde.org>
tdesycocafactory.cpp Waldo Bastian <bastian@kde.org>
-ktempfile.cpp Waldo Bastian <bastian@kde.org>
+tdetempfile.cpp Waldo Bastian <bastian@kde.org>
kuniqueapplication.cpp Waldo Bastian <bastian@kde.org>
kurl.cpp Waldo Bastian <bastian@kde.org>
kurldrag.cpp David Faure <faure@kde.org>
diff --git a/tdecore/Makefile.am b/tdecore/Makefile.am
index ae5048ed..c04ee4c6 100644
--- a/tdecore/Makefile.am
+++ b/tdecore/Makefile.am
@@ -41,19 +41,19 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \
tdecmdlineargs.h tdeconfigbackend.h kapp.h tdeapplication.h kuniqueapp.h \
kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
- kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
+ kprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \
twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
kregexp.h kcompletion.h kstringhandler.h \
- kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \
+ kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
kallocator.h kvmallocator.h kcrash.h krfcdate.h \
- kinstance.h kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h \
+ kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \
krandomsequence.h knotifyclient.h kiconeffect.h \
kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
- tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h \
+ tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h \
klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \
ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \
kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
@@ -93,14 +93,14 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp \
tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
- klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
+ tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
- kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp \
+ kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \
kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
- kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
+ kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \
kuniqueapplication.cpp tdeaccelmanager.cpp \
ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
@@ -109,7 +109,7 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
kpixmapprovider.cpp kurldrag.cpp \
kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \
tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \
- kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
+ kxmessages.cpp tdestartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \
tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \
diff --git a/tdecore/kappdcopiface.cpp b/tdecore/kappdcopiface.cpp
index 31bc8dd5..ed6e2616 100644
--- a/tdecore/kappdcopiface.cpp
+++ b/tdecore/kappdcopiface.cpp
@@ -20,7 +20,7 @@
#include "kappdcopiface.h"
#include <tdeapplication.h>
#include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
diff --git a/tdecore/kapplication_win.cpp b/tdecore/kapplication_win.cpp
index 940bc379..38bafaef 100644
--- a/tdecore/kapplication_win.cpp
+++ b/tdecore/kapplication_win.cpp
@@ -19,7 +19,7 @@
#include <tdeapplication.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include "kcheckaccelerators.h"
diff --git a/tdecore/kcalendarsystem.cpp b/tdecore/kcalendarsystem.cpp
index 39331e17..20d00d18 100644
--- a/tdecore/kcalendarsystem.cpp
+++ b/tdecore/kcalendarsystem.cpp
@@ -22,10 +22,10 @@
// systems.
// Also default gregorian and factory classes
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "kcalendarsystem.h"
-#include "klocale.h"
+#include "tdelocale.h"
class KCalendarSystemPrivate
{
diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp
index ead1aca6..9d4d1466 100644
--- a/tdecore/kcalendarsystemgregorian.cpp
+++ b/tdecore/kcalendarsystemgregorian.cpp
@@ -24,7 +24,7 @@
#include <tqdatetime.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kcalendarsystemgregorian.h"
diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp
index a0db927f..2f0aa111 100644
--- a/tdecore/kcalendarsystemhebrew.cpp
+++ b/tdecore/kcalendarsystemhebrew.cpp
@@ -21,7 +21,7 @@
// Derived hebrew kde calendar class
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kcalendarsystemhebrew.h"
diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp
index 8c9fac47..cc66805e 100644
--- a/tdecore/kcalendarsystemhijri.cpp
+++ b/tdecore/kcalendarsystemhijri.cpp
@@ -23,7 +23,7 @@
#include <tqdatetime.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kcalendarsystemhijri.h"
diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp
index 559ebb39..631693e4 100644
--- a/tdecore/kcalendarsystemjalali.cpp
+++ b/tdecore/kcalendarsystemjalali.cpp
@@ -26,8 +26,8 @@
#include <tqstringlist.h>
#include <math.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <stdio.h>
diff --git a/tdecore/kcharsets.cpp b/tdecore/kcharsets.cpp
index fa623b69..23786c53 100644
--- a/tdecore/kcharsets.cpp
+++ b/tdecore/kcharsets.cpp
@@ -22,8 +22,8 @@
#include "kentities.c"
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tqfontinfo.h>
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index b7e113f4..306591e6 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -41,9 +41,9 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
/*
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 54d05148..8ab23ccc 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -18,7 +18,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "kclipboard.h"
diff --git a/tdecore/kcompletion.cpp b/tdecore/kcompletion.cpp
index a5349b3e..4a80d85d 100644
--- a/tdecore/kcompletion.cpp
+++ b/tdecore/kcompletion.cpp
@@ -20,9 +20,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqptrvector.h>
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index e6d7f531..2bce648f 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -28,7 +28,7 @@
#include <tqguardedptr.h>
#include "tdelibs_export.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <ksortablevaluelist.h>
#include <tdeshortcut.h>
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 2eed7c28..08abe75c 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -44,7 +44,7 @@
#include <errno.h>
#include <tqwindowdefs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/tdecore/kdebug.areas b/tdecore/kdebug.areas
index b6e74248..5653a9a0 100644
--- a/tdecore/kdebug.areas
+++ b/tdecore/kdebug.areas
@@ -184,7 +184,7 @@
5602 kontact (plugins)
5650 tderesources
5700 kabc
-5710 kabc/vcard
+5710 tdeabc/vcard
5720 kaddressbook
5800 libkcal
5850 korganizer
diff --git a/tdecore/kdebug.cpp b/tdecore/kdebug.cpp
index 062864fc..656edf6f 100644
--- a/tdecore/kdebug.cpp
+++ b/tdecore/kdebug.cpp
@@ -28,12 +28,12 @@
#include "kdebugdcopiface.h"
#include "tdeapplication.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "kinstance.h"
#include "kstandarddirs.h"
#include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqintdict.h>
#include <tqstring.h>
diff --git a/tdecore/kdebugrc b/tdecore/kdebugrc
index e1317ddf..dbf3ed53 100644
--- a/tdecore/kdebugrc
+++ b/tdecore/kdebugrc
@@ -96,7 +96,7 @@ InfoOutput=4
[5400]
InfoOutput=4
-# kabc/vcard
+# tdeabc/vcard
[5710]
InfoOutput=4
diff --git a/tdecore/kdesktopfile.cpp b/tdecore/kdesktopfile.cpp
index a5a57cdd..b385eeb1 100644
--- a/tdecore/kdesktopfile.cpp
+++ b/tdecore/kdesktopfile.cpp
@@ -35,7 +35,7 @@
#include "kstandarddirs.h"
#include "kmountpoint.h"
#include "kcatalogue.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "kdesktopfile.h"
#include "kdesktopfile.moc"
diff --git a/tdecore/kdetcompmgr.cpp b/tdecore/kdetcompmgr.cpp
index d78d76b3..964cd49b 100644
--- a/tdecore/kdetcompmgr.cpp
+++ b/tdecore/kdetcompmgr.cpp
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/tdecore/kgenericfactory.h b/tdecore/kgenericfactory.h
index 426b29ef..7f2b7b45 100644
--- a/tdecore/kgenericfactory.h
+++ b/tdecore/kgenericfactory.h
@@ -23,8 +23,8 @@
#include <ktypelist.h>
#include <kinstance.h>
#include <kgenericfactory.tcc>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
/* @internal */
diff --git a/tdecore/kglobal.cpp b/tdecore/kglobal.cpp
index 965a537a..f8639d52 100644
--- a/tdecore/kglobal.cpp
+++ b/tdecore/kglobal.cpp
@@ -16,7 +16,7 @@
Boston, MA 02110-1301, USA.
*/
/*
-* kglobal.cpp -- Implementation of class TDEGlobal.
+* tdeglobal.cpp -- Implementation of class TDEGlobal.
* Author: Sirtaj Singh Kang
* Version: $Id$
* Generated: Sat May 1 02:08:43 EST 1999
@@ -25,13 +25,13 @@
#include <tqglobal.h>
#include <tqdict.h>
#include <tqptrlist.h>
-#include "kglobal.h"
+#include "tdeglobal.h"
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharsets.h>
#include <kiconloader.h>
#include <tdehardwaredevices.h>
diff --git a/tdecore/kglobalaccel.cpp b/tdecore/kglobalaccel.cpp
index 6af97065..746721e4 100644
--- a/tdecore/kglobalaccel.cpp
+++ b/tdecore/kglobalaccel.cpp
@@ -32,7 +32,7 @@
#include "tdeaccelbase.h"
#include <kdebug.h>
#include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
//----------------------------------------------------
diff --git a/tdecore/kglobalsettings.cpp b/tdecore/kglobalsettings.cpp
index a103c465..c0c6329c 100644
--- a/tdecore/kglobalsettings.cpp
+++ b/tdecore/kglobalsettings.cpp
@@ -16,7 +16,7 @@
Boston, MA 02110-1301, USA.
*/
#include "config.h"
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
#include <tqdir.h>
#include <tqpixmap.h>
@@ -40,12 +40,12 @@ static QRgb qt_colorref2qrgb(COLORREF col)
#endif
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeshortcut.h>
#include <kstandarddirs.h>
#include <kcharsets.h>
#include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfontinfo.h>
#include <stdlib.h>
#include <kprotocolinfo.h>
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp
index e865a131..c1a4a8ca 100644
--- a/tdecore/kiconeffect.cpp
+++ b/tdecore/kiconeffect.cpp
@@ -29,9 +29,9 @@
#include <tqrect.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kicontheme.h>
#include "kiconeffect.h"
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index be44a921..e8129398 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -30,7 +30,7 @@
#include <kipc.h>
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kinstance.h>
diff --git a/tdecore/kiconloader.h b/tdecore/kiconloader.h
index 0c7e67a2..434a3d97 100644
--- a/tdecore/kiconloader.h
+++ b/tdecore/kiconloader.h
@@ -27,7 +27,7 @@
#undef TDEIconLoaderXStatus
#endif
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <kicontheme.h>
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index 9d5d2b7d..544eefe0 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kinstance.h>
diff --git a/tdecore/kinstance.cpp b/tdecore/kinstance.cpp
index cf0b3579..6760c95a 100644
--- a/tdecore/kinstance.cpp
+++ b/tdecore/kinstance.cpp
@@ -21,7 +21,7 @@
#include <unistd.h>
#include "tdeconfig.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "kcharsets.h"
#include "kiconloader.h"
#include "tdehardwaredevices.h"
@@ -29,7 +29,7 @@
#include "tdeaboutdata.h"
#include "kstandarddirs.h"
#include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "kmimesourcefactory.h"
#include <tqfont.h>
diff --git a/tdecore/kkeynative_x11.cpp b/tdecore/kkeynative_x11.cpp
index 64635acc..a44305da 100644
--- a/tdecore/kkeynative_x11.cpp
+++ b/tdecore/kkeynative_x11.cpp
@@ -32,7 +32,7 @@
#include <tqstringlist.h>
#include "kckey.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#ifdef Q_WS_X11
#define XK_MISCELLANY
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index cd4abb6f..64bfe383 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -33,8 +33,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#ifdef Q_WS_X11
# define XK_MISCELLANY
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index f7e63c21..aed2c06a 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -29,7 +29,7 @@
#include "klibloader.h"
#include "kstandarddirs.h"
#include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "ltdl.h"
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index 3e8f9ff4..d9e63218 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <tqasciidict.h>
#include <tqptrlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <stdlib.h> // For backwards compatibility
diff --git a/tdecore/klocale.cpp b/tdecore/klocale.cpp
index 3e169ba0..4402dd18 100644
--- a/tdecore/klocale.cpp
+++ b/tdecore/klocale.cpp
@@ -33,7 +33,7 @@
#include <tqregexp.h>
#include "kcatalogue.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "kstandarddirs.h"
#include "ksimpleconfig.h"
#include "kinstance.h"
@@ -41,7 +41,7 @@
#include "kdebug.h"
#include "kcalendarsystem.h"
#include "kcalendarsystemfactory.h"
-#include "klocale.h"
+#include "tdelocale.h"
#ifdef Q_WS_WIN
#include <windows.h>
diff --git a/tdecore/klocale.h b/tdecore/klocale.h
index 65a21d13..94cf704f 100644
--- a/tdecore/klocale.h
+++ b/tdecore/klocale.h
@@ -39,7 +39,7 @@ class KCatalogue;
class KCalendarSystem;
/**
- * \file klocale.h
+ * \file tdelocale.h
*/
#ifndef I18N_NOOP
diff --git a/tdecore/klockfile.cpp b/tdecore/klockfile.cpp
index ee09a06c..1f4f8337 100644
--- a/tdecore/klockfile.cpp
+++ b/tdecore/klockfile.cpp
@@ -39,8 +39,8 @@
#include <kde_file.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdetempfile.h>
// TODO: http://www.spinnaker.de/linux/nfs-locking.html
// TODO: Make regression test
diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp
index f08cb249..8ed02941 100644
--- a/tdecore/kmimesourcefactory.cpp
+++ b/tdecore/kmimesourcefactory.cpp
@@ -19,7 +19,7 @@
*/
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <kiconloader.h>
diff --git a/tdecore/kmimesourcefactory.h b/tdecore/kmimesourcefactory.h
index 16302dfe..8292cda4 100644
--- a/tdecore/kmimesourcefactory.h
+++ b/tdecore/kmimesourcefactory.h
@@ -23,7 +23,7 @@
#define KMIMESOURCEFACTORY_H
#include <tqmime.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
class KMimeSourceFactoryPrivate;
class TDEInstance;
diff --git a/tdecore/kpalette.cpp b/tdecore/kpalette.cpp
index c0618422..7335e8e1 100644
--- a/tdecore/kpalette.cpp
+++ b/tdecore/kpalette.cpp
@@ -24,7 +24,7 @@
#include <tqfile.h>
#include <tqtextstream.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <ksavefile.h>
#include <kstringhandler.h>
diff --git a/tdecore/kprotocolinfo_tdecore.cpp b/tdecore/kprotocolinfo_tdecore.cpp
index 8cc5091c..86a9a6fc 100644
--- a/tdecore/kprotocolinfo_tdecore.cpp
+++ b/tdecore/kprotocolinfo_tdecore.cpp
@@ -26,7 +26,7 @@
#include "kprotocolinfofactory.h"
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <ksimpleconfig.h>
diff --git a/tdecore/kprotocolinfofactory.cpp b/tdecore/kprotocolinfofactory.cpp
index 4daab08d..115a44f2 100644
--- a/tdecore/kprotocolinfofactory.cpp
+++ b/tdecore/kprotocolinfofactory.cpp
@@ -18,7 +18,7 @@
*/
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdesycoca.h>
diff --git a/tdecore/krootprop.cpp b/tdecore/krootprop.cpp
index bb15462d..c717a182 100644
--- a/tdecore/krootprop.cpp
+++ b/tdecore/krootprop.cpp
@@ -23,8 +23,8 @@
#ifdef Q_WS_X11 // not needed anyway :-)
#include "krootprop.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
#include "kcharsets.h"
#include "tdeapplication.h"
#include <tqtextstream.h>
diff --git a/tdecore/ksavefile.h b/tdecore/ksavefile.h
index e035115a..282652de 100644
--- a/tdecore/ksavefile.h
+++ b/tdecore/ksavefile.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <stdio.h>
#include <errno.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
class KSaveFilePrivate;
diff --git a/tdecore/ksimpleconfig.cpp b/tdecore/ksimpleconfig.cpp
index 55cf7485..dc359f17 100644
--- a/tdecore/ksimpleconfig.cpp
+++ b/tdecore/ksimpleconfig.cpp
@@ -31,7 +31,7 @@
#include <tqfileinfo.h>
#include <tqdir.h>
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "kstandarddirs.h"
#include "tdeconfigbackend.h"
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index f39a9422..83556626 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -46,7 +46,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstaticdeleter.h>
#include <kde_file.h>
diff --git a/tdecore/ksockaddr.cpp b/tdecore/ksockaddr.cpp
index cd2f9c93..a645b3aa 100644
--- a/tdecore/ksockaddr.cpp
+++ b/tdecore/ksockaddr.cpp
@@ -38,7 +38,7 @@
#include <tqfile.h>
#include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
//#include "kextsock.h"
#ifndef HAVE_STRUCT_SOCKADDR_IN6
diff --git a/tdecore/ksocks.cpp b/tdecore/ksocks.cpp
index 95e36dc1..a6ecc37d 100644
--- a/tdecore/ksocks.cpp
+++ b/tdecore/ksocks.cpp
@@ -26,7 +26,7 @@
#include <tqstring.h>
#include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "klibloader.h"
#include <tdeconfig.h>
diff --git a/tdecore/kstandarddirs.h b/tdecore/kstandarddirs.h
index 7eb654f4..7cdf44e3 100644
--- a/tdecore/kstandarddirs.h
+++ b/tdecore/kstandarddirs.h
@@ -26,7 +26,7 @@
#include <tqstring.h>
#include <tqdict.h>
#include <tqstringlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
class TDEConfig;
class TDEStandardDirsPrivate;
diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp
index a472de5f..3d798cdc 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/kstartupinfo.cpp
@@ -45,7 +45,7 @@ DEALINGS IN THE SOFTWARE.
#define QT_CLEAN_NAMESPACE
#endif
-#include "kstartupinfo.h"
+#include "tdestartupinfo.h"
#include <unistd.h>
#include <sys/time.h>
@@ -1525,5 +1525,5 @@ static TQString escape_str( const TQString& str_P )
return ret;
}
-#include "kstartupinfo.moc"
+#include "tdestartupinfo.moc"
#endif
diff --git a/tdecore/kstartupinfo.h b/tdecore/kstartupinfo.h
index dcc80f97..3f8310f6 100644
--- a/tdecore/kstartupinfo.h
+++ b/tdecore/kstartupinfo.h
@@ -49,7 +49,7 @@ class TDEStartupInfoPrivate;
*
* This class can be used to send information about started application,
* change the information and receive this information. For detailed
- * description, see tdelibs/tdecore/README.kstartupinfo.
+ * description, see tdelibs/tdecore/README.tdestartupinfo.
*
* You usually don't need to use this class for sending the notification
* information, as KDE libraries should do this when an application is
diff --git a/tdecore/kstaticdeleter.h b/tdecore/kstaticdeleter.h
index dd759adf..b6967268 100644
--- a/tdecore/kstaticdeleter.h
+++ b/tdecore/kstaticdeleter.h
@@ -23,7 +23,7 @@
#ifndef _KSTATIC_DELETER_H_
#define _KSTATIC_DELETER_H_
-#include <kglobal.h>
+#include <tdeglobal.h>
/**
* Static deleters are used to manage static resources. They can register
diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp
index c562c539..b19c5b87 100644
--- a/tdecore/kstringhandler.cpp
+++ b/tdecore/kstringhandler.cpp
@@ -18,7 +18,7 @@
*/
#include "kstringhandler.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
static void parsePythonRange( const TQCString &range, uint &start, uint &end )
{
diff --git a/tdecore/ktempdir.cpp b/tdecore/ktempdir.cpp
index 53cc83f9..d16d2e18 100644
--- a/tdecore/ktempdir.cpp
+++ b/tdecore/ktempdir.cpp
@@ -47,7 +47,7 @@
#include <tqdatetime.h>
#include <tqdir.h>
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "tdeapplication.h"
#include "kinstance.h"
#include "ktempdir.h"
diff --git a/tdecore/ktempfile.cpp b/tdecore/ktempfile.cpp
index 973e1407..805d315a 100644
--- a/tdecore/ktempfile.cpp
+++ b/tdecore/ktempfile.cpp
@@ -48,10 +48,10 @@
#include <tqdatastream.h>
#include <tqtextstream.h>
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "tdeapplication.h"
#include "kinstance.h"
-#include "ktempfile.h"
+#include "tdetempfile.h"
#include "kstandarddirs.h"
#include "kde_file.h"
#include "kdebug.h"
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp
index 6b21e039..3436cdab 100644
--- a/tdecore/ktimezones.cpp
+++ b/tdecore/ktimezones.cpp
@@ -24,7 +24,7 @@
#include <kmdcodec.h>
#include <kprocess.h>
#include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqdatetime.h>
#include <tqfile.h>
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 964c7c8c..0a3a0962 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -40,7 +40,7 @@
#if defined Q_WS_X11
#include <twin.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#endif
#include <tdeconfig.h>
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index 9479029a..2079c050 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -27,7 +27,7 @@
// KDE_QT_ONLY is first used for dcop/client (e.g. marshalling)
#ifndef KDE_QT_ONLY
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kidna.h>
#include <kprotocolinfo.h>
#endif
diff --git a/tdecore/kurldrag.cpp b/tdecore/kurldrag.cpp
index 20aa6388..5e64d09b 100644
--- a/tdecore/kurldrag.cpp
+++ b/tdecore/kurldrag.cpp
@@ -24,8 +24,8 @@
#include <unistd.h>
#include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
class KURLDragPrivate
diff --git a/tdecore/kvmallocator.cpp b/tdecore/kvmallocator.cpp
index 996d5579..3b887eee 100644
--- a/tdecore/kvmallocator.cpp
+++ b/tdecore/kvmallocator.cpp
@@ -31,7 +31,7 @@
#include <tqintdict.h>
#include <tqmap.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include "kvmallocator.h"
diff --git a/tdecore/netsupp.cpp b/tdecore/netsupp.cpp
index c7e968c1..0c072752 100644
--- a/tdecore/netsupp.cpp
+++ b/tdecore/netsupp.cpp
@@ -37,7 +37,7 @@
#include "config.h"
#include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
#ifndef IN6_IS_ADDR_V4MAPPED
#define NEED_IN6_TESTS
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index 1c32e80e..b9ac605c 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -54,7 +54,7 @@
#endif
// KDE
-#include <klocale.h>
+#include <tdelocale.h>
// Us
#include "kresolver.h"
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp
index cde24f75..96519d1a 100644
--- a/tdecore/network/kresolverstandardworkers.cpp
+++ b/tdecore/network/kresolverstandardworkers.cpp
@@ -44,7 +44,7 @@
#include <tqfile.h>
#include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "kstandarddirs.h"
#include "tdeapplication.h"
diff --git a/tdecore/network/tdesocketaddress.cpp b/tdecore/network/tdesocketaddress.cpp
index ff97699c..a6da5f7c 100644
--- a/tdecore/network/tdesocketaddress.cpp
+++ b/tdecore/network/tdesocketaddress.cpp
@@ -36,7 +36,7 @@
#include <tqfile.h>
#include <tqobject.h>
-#include "klocale.h"
+#include "tdelocale.h"
#include "tdesocketaddress.h"
#include "netsupp.h"
diff --git a/tdecore/network/tdesocketbase.cpp b/tdecore/network/tdesocketbase.cpp
index 0eb31bbc..66decb15 100644
--- a/tdecore/network/tdesocketbase.cpp
+++ b/tdecore/network/tdesocketbase.cpp
@@ -24,7 +24,7 @@
#include <config.h>
#include <tqmutex.h>
-#include "klocale.h"
+#include "tdelocale.h"
#include "tdesocketbase.h"
#include "tdesocketdevice.h"
diff --git a/tdecore/networkbackends/network-manager/network-manager_p.h b/tdecore/networkbackends/network-manager/network-manager_p.h
index 474f628b..0e1fe4de 100644
--- a/tdecore/networkbackends/network-manager/network-manager_p.h
+++ b/tdecore/networkbackends/network-manager/network-manager_p.h
@@ -27,7 +27,7 @@
/* TDE headers */
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
/* TQDbus headers */
#include <tqdbusconnection.h>
diff --git a/tdecore/tde-config.cpp.cmake b/tdecore/tde-config.cpp.cmake
index 98481cef..36e752f3 100644
--- a/tdecore/tde-config.cpp.cmake
+++ b/tdecore/tde-config.cpp.cmake
@@ -1,11 +1,11 @@
// -*- c++ -*-
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <stdio.h>
#include <tdeaboutdata.h>
#include <config.h>
diff --git a/tdecore/tde-config.cpp.in b/tdecore/tde-config.cpp.in
index ac49e5c4..f86e5f5d 100644
--- a/tdecore/tde-config.cpp.in
+++ b/tdecore/tde-config.cpp.in
@@ -1,11 +1,11 @@
// -*- c++ -*-
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <stdio.h>
#include <tdeaboutdata.h>
#include <config.h>
diff --git a/tdecore/tdeaboutdata.h b/tdecore/tdeaboutdata.h
index d5addac0..db76287f 100644
--- a/tdecore/tdeaboutdata.h
+++ b/tdecore/tdeaboutdata.h
@@ -22,7 +22,7 @@
#include <tqvaluelist.h>
#include <tqstring.h>
#include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
#ifndef _KABOUTDATA_H_
#define _KABOUTDATA_H_
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index e019baaf..5430c252 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -29,7 +29,7 @@
#include "tdeaccelbase.h"
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeshortcut.h>
#include "tdeaccelprivate.h"
diff --git a/tdecore/tdeaccelaction.cpp b/tdecore/tdeaccelaction.cpp
index 93f17ae2..89d8efaa 100644
--- a/tdecore/tdeaccelaction.cpp
+++ b/tdecore/tdeaccelaction.cpp
@@ -28,9 +28,9 @@
#include <tdeconfig.h>
#include "kckey.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kkeynative.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeshortcutlist.h>
//---------------------------------------------------------------------
diff --git a/tdecore/tdeaccelbase.cpp b/tdecore/tdeaccelbase.cpp
index 434801f6..6673cabb 100644
--- a/tdecore/tdeaccelbase.cpp
+++ b/tdecore/tdeaccelbase.cpp
@@ -29,10 +29,10 @@
#include <tdeconfig.h>
#include "kckey.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kkeynative.h>
#include "kkeyserver.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "tdeshortcutmenu.h"
//---------------------------------------------------------------------
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 24c77826..58b010e4 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -61,10 +61,10 @@
#include <tqsqlpropertymap.h>
#endif
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdestyle.h>
#include <kiconloader.h>
#include <kclipboard.h>
@@ -72,7 +72,7 @@
#include <ksimpleconfig.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kcrash.h>
#include <kdatastream.h>
#include <klibloader.h>
@@ -89,7 +89,7 @@
#include <kglobalaccel.h>
#if defined Q_WS_X11
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#endif
#include <dcopclient.h>
diff --git a/tdecore/tdecmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp
index ad24467e..46d1b9f4 100644
--- a/tdecore/tdecmdlineargs.cpp
+++ b/tdecore/tdecmdlineargs.cpp
@@ -37,9 +37,9 @@
#include "tdecmdlineargs.h"
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstringhandler.h>
#include <kstaticdeleter.h>
diff --git a/tdecore/tdeconfig.cpp b/tdecore/tdeconfig.cpp
index 35c5b73b..68307dc8 100644
--- a/tdecore/tdeconfig.cpp
+++ b/tdecore/tdeconfig.cpp
@@ -36,7 +36,7 @@
#include "tdeconfigbackend.h"
#include "tdeconfig.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "kstandarddirs.h"
#include "kstaticdeleter.h"
#include <tqtimer.h>
diff --git a/tdecore/tdeconfig_compiler/example/autoexample.cpp b/tdecore/tdeconfig_compiler/example/autoexample.cpp
index e2521978..6085fa6e 100644
--- a/tdecore/tdeconfig_compiler/example/autoexample.cpp
+++ b/tdecore/tdeconfig_compiler/example/autoexample.cpp
@@ -27,9 +27,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 <kstandarddirs.h>
#include <tdeconfigdialog.h>
diff --git a/tdecore/tdeconfig_compiler/example/example.cpp b/tdecore/tdeconfig_compiler/example/example.cpp
index c08339d4..157570d9 100644
--- a/tdecore/tdeconfig_compiler/example/example.cpp
+++ b/tdecore/tdeconfig_compiler/example/example.cpp
@@ -24,9 +24,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 <kstandarddirs.h>
diff --git a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
index 753bae53..207a7840 100644
--- a/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
+++ b/tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp
@@ -30,9 +30,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>
@@ -1151,7 +1151,7 @@ int main( int argc, char **argv )
if ( headerIncludes.count() > 0 ) h << endl;
if ( !singleton && cfgFileNameArg && parameters.isEmpty() )
- h << "#include <kglobal.h>" << endl;
+ h << "#include <tdeglobal.h>" << endl;
h << "#include <tdeconfigskeleton.h>" << endl;
h << "#include <kdebug.h>" << endl << endl;
@@ -1421,7 +1421,7 @@ int main( int argc, char **argv )
cpp << "#include \"" << headerFileName << "\"" << endl << endl;
- if ( setUserTexts ) cpp << "#include <klocale.h>" << endl << endl;
+ if ( setUserTexts ) cpp << "#include <tdelocale.h>" << endl << endl;
// Header required by singleton implementation
if ( singleton )
diff --git a/tdecore/tdeconfig_compiler/tests/test2.cpp.ref b/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
index cc3f67b5..e66c5b9d 100644
--- a/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test2.cpp.ref
@@ -3,7 +3,7 @@
#include "test2.h"
-#include <klocale.h>
+#include <tdelocale.h>
Test2::Test2( )
: MyPrefs( TQString::fromLatin1( "korganizerrc" ) )
diff --git a/tdecore/tdeconfig_compiler/tests/test8a.h.ref b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
index 88686ca1..a1e5b7e3 100644
--- a/tdecore/tdeconfig_compiler/tests/test8a.h.ref
+++ b/tdecore/tdeconfig_compiler/tests/test8a.h.ref
@@ -3,7 +3,7 @@
#ifndef TEST8A_H
#define TEST8A_H
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfigskeleton.h>
#include <kdebug.h>
diff --git a/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref b/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
index 5aad12fe..b3fde433 100644
--- a/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
+++ b/tdecore/tdeconfig_compiler/tests/test_dpointer.cpp.ref
@@ -3,7 +3,7 @@
#include "test_dpointer.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
diff --git a/tdecore/tdeconfigbackend.cpp b/tdecore/tdeconfigbackend.cpp
index d050a2ef..6d5197ff 100644
--- a/tdecore/tdeconfigbackend.cpp
+++ b/tdecore/tdeconfigbackend.cpp
@@ -42,9 +42,9 @@
#include "tdeconfigbackend.h"
#include "tdeconfigbase.h"
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <ksavefile.h>
#include <kurl.h>
diff --git a/tdecore/tdeconfigbackend.h b/tdecore/tdeconfigbackend.h
index 71ba1528..83c8047b 100644
--- a/tdecore/tdeconfigbackend.h
+++ b/tdecore/tdeconfigbackend.h
@@ -25,7 +25,7 @@
#include "tdeconfigdata.h"
#include <tdeconfigbase.h>
#include <klockfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "tdelibs_export.h"
class TQFile;
diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index 668a688d..a3b15185 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -28,8 +28,8 @@
#include <tqtextstream.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcharsets.h>
#include "tdeconfigbase.h"
diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index dfabefb5..9578c05c 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -33,7 +33,7 @@
#include <tdeapplication.h>
#include <tdeconfigskeleton.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <assert.h>
diff --git a/tdecore/tdeconfigskeleton.cpp b/tdecore/tdeconfigskeleton.cpp
index 1abaf388..45a4b411 100644
--- a/tdecore/tdeconfigskeleton.cpp
+++ b/tdecore/tdeconfigskeleton.cpp
@@ -24,8 +24,8 @@
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include "kstringhandler.h"
diff --git a/tdecore/tdeconfigskeleton.h b/tdecore/tdeconfigskeleton.h
index ccbf4529..b260db1e 100644
--- a/tdecore/tdeconfigskeleton.h
+++ b/tdecore/tdeconfigskeleton.h
@@ -34,7 +34,7 @@
#include <tqstringlist.h>
#include <tqvariant.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
/**
* @short Class for storing a preferences setting
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehardwaredevices.cpp
index 263bc550..60f3efde 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehardwaredevices.cpp
@@ -23,10 +23,10 @@
#include <tqstringlist.h>
#include <tqsocketnotifier.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <ksimpledirwatch.h>
#include <kstandarddirs.h>
diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdenetworkconnections.cpp
index 2705343f..2682aa99 100644
--- a/tdecore/tdenetworkconnections.cpp
+++ b/tdecore/tdenetworkconnections.cpp
@@ -23,7 +23,7 @@
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
// #define DEBUG_SIGNAL_QUEUE 1
diff --git a/tdecore/tdeshortcut.cpp b/tdecore/tdeshortcut.cpp
index 33797b0b..bae897e9 100644
--- a/tdecore/tdeshortcut.cpp
+++ b/tdecore/tdeshortcut.cpp
@@ -25,8 +25,8 @@
#include <tqstringlist.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
//----------------------------------------------------
diff --git a/tdecore/tdeshortcutlist.cpp b/tdecore/tdeshortcutlist.cpp
index 645e6956..ffacd001 100644
--- a/tdecore/tdeshortcutlist.cpp
+++ b/tdecore/tdeshortcutlist.cpp
@@ -5,7 +5,7 @@
#include "tdeaccelaction.h"
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kglobalaccel.h>
#include <kinstance.h>
#include <tdeshortcut.h>
diff --git a/tdecore/tdeshortcutmenu.cpp b/tdecore/tdeshortcutmenu.cpp
index 91061a73..c035c0df 100644
--- a/tdecore/tdeshortcutmenu.cpp
+++ b/tdecore/tdeshortcutmenu.cpp
@@ -23,7 +23,7 @@
#include "tdeaccelaction.h"
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "tdeshortcutmenu.h"
//#include <kkeynative.h>
diff --git a/tdecore/tdestdaccel.cpp b/tdecore/tdestdaccel.cpp
index f91d2ee6..ba3e64ca 100644
--- a/tdecore/tdestdaccel.cpp
+++ b/tdecore/tdestdaccel.cpp
@@ -25,8 +25,8 @@
#include "tdeaccelbase.h"
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeshortcut.h>
#include <tdeshortcutlist.h>
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp
index 16914c0b..8f5ede96 100644
--- a/tdecore/tdesycoca.cpp
+++ b/tdecore/tdesycoca.cpp
@@ -28,7 +28,7 @@
#include <tdeapplication.h>
#include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kprocess.h>
#include <kstandarddirs.h>
diff --git a/tdecore/tests/Makefile.am b/tdecore/tests/Makefile.am
index 2911d3ab..a831eb65 100644
--- a/tdecore/tests/Makefile.am
+++ b/tdecore/tests/Makefile.am
@@ -41,7 +41,7 @@ LDADD = ../libtdecore.la
tdeconfigtestgui_SOURCES = tdeconfigtestgui.cpp
kdebugtest_SOURCES = kdebugtest.cpp
klocaletest_SOURCES = klocaletest.cpp
-#klocaletest2_SOURCES = klocaletest2.cpp klocale.cpp libintl.cpp kcatalogue.cpp
+#klocaletest2_SOURCES = klocaletest2.cpp tdelocale.cpp libintl.cpp kcatalogue.cpp
#kcatalogue_SOURCES = kcatalogue.cpp libintl.cpp
ksimpleconfigtest_SOURCES = ksimpleconfigtest.cpp
kurltest_SOURCES = kurltest.cpp
diff --git a/tdecore/tests/kapptest.cpp b/tdecore/tests/kapptest.cpp
index 0952f292..6a3abace 100644
--- a/tdecore/tests/kapptest.cpp
+++ b/tdecore/tests/kapptest.cpp
@@ -22,7 +22,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdesycoca.h>
int
diff --git a/tdecore/tests/kcalendartest.cpp b/tdecore/tests/kcalendartest.cpp
index 12c9010e..7dc2cc6d 100644
--- a/tdecore/tests/kcalendartest.cpp
+++ b/tdecore/tests/kcalendartest.cpp
@@ -10,8 +10,8 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
class TDELocale;
diff --git a/tdecore/tests/kcmdlineargstest.cpp b/tdecore/tests/kcmdlineargstest.cpp
index 8148e420..5213e443 100644
--- a/tdecore/tests/kcmdlineargstest.cpp
+++ b/tdecore/tests/kcmdlineargstest.cpp
@@ -1,5 +1,5 @@
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <stdio.h>
diff --git a/tdecore/tests/kglobaltest.cpp b/tdecore/tests/kglobaltest.cpp
index eaab091f..852e2ba3 100644
--- a/tdecore/tests/kglobaltest.cpp
+++ b/tdecore/tests/kglobaltest.cpp
@@ -1,6 +1,6 @@
#include <config.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <stdio.h>
#include <tdeapplication.h>
#include <stdlib.h>
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index 0647a10d..36f301d6 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -11,9 +11,9 @@
#include <tqdatetime.h>
#include <tqlabel.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include "klocale.h"
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include "tdelocale.h"
#include <tdeapplication.h>
#include <kcharsets.h>
#include <kdebug.h>
diff --git a/tdecore/tests/kmdcodectest.cpp b/tdecore/tests/kmdcodectest.cpp
index bd3162f5..571d3f10 100644
--- a/tdecore/tests/kmdcodectest.cpp
+++ b/tdecore/tests/kmdcodectest.cpp
@@ -27,7 +27,7 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeapplication.h>
diff --git a/tdecore/tests/krfcdatetest.cpp b/tdecore/tests/krfcdatetest.cpp
index 6ef0fe5e..94358a8f 100644
--- a/tdecore/tests/krfcdatetest.cpp
+++ b/tdecore/tests/krfcdatetest.cpp
@@ -2,7 +2,7 @@
#include <tdeapplication.h>
#include <stdlib.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <tqtextcodec.h>
#include <krfcdate.h>
diff --git a/tdecore/tests/ksocktest.cpp b/tdecore/tests/ksocktest.cpp
index 01a9c4c3..a1ce8f86 100644
--- a/tdecore/tests/ksocktest.cpp
+++ b/tdecore/tests/ksocktest.cpp
@@ -17,7 +17,7 @@
*/
#include "kuniqueapplication.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
#include "kdebug.h"
#include "ksock.h"
#include "ksockaddr.h"
diff --git a/tdecore/tests/ktempfiletest.cpp b/tdecore/tests/ktempfiletest.cpp
index 20cd6b36..5c2354ff 100644
--- a/tdecore/tests/ktempfiletest.cpp
+++ b/tdecore/tests/ktempfiletest.cpp
@@ -16,7 +16,7 @@
Boston, MA 02110-1301, USA.
*/
-#include "ktempfile.h"
+#include "tdetempfile.h"
#include "tdeapplication.h"
#include "kstandarddirs.h"
#include <tqstring.h>
diff --git a/tdecore/tests/kuniqueapptest.cpp b/tdecore/tests/kuniqueapptest.cpp
index 60ac98b5..13b8ca53 100644
--- a/tdecore/tests/kuniqueapptest.cpp
+++ b/tdecore/tests/kuniqueapptest.cpp
@@ -17,7 +17,7 @@
*/
#include "kuniqueapplication.h"
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
#include <unistd.h>
#include <stdlib.h>
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index 6694d0d8..0f57dd97 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -5,7 +5,7 @@
#include <tdeapplication.h>
#include <stdlib.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <tqtextcodec.h>
#include <tqdatastream.h>
diff --git a/tdecore/tests/startserviceby.cpp b/tdecore/tests/startserviceby.cpp
index 20fc95f3..67c535ce 100644
--- a/tdecore/tests/startserviceby.cpp
+++ b/tdecore/tests/startserviceby.cpp
@@ -21,7 +21,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
int
diff --git a/tdecore/tests/testqtargs.cpp b/tdecore/tests/testqtargs.cpp
index 8383f930..d69b3f6f 100644
--- a/tdecore/tests/testqtargs.cpp
+++ b/tdecore/tests/testqtargs.cpp
@@ -46,7 +46,7 @@ application palette (light and dark shades are\ncalculated)."), 0},
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const TDECmdLineOptions options[] =
{
diff --git a/tdecore/twin.cpp b/tdecore/twin.cpp
index 93352dac..e96c2501 100644
--- a/tdecore/twin.cpp
+++ b/tdecore/twin.cpp
@@ -37,16 +37,16 @@
#include "twin.h"
#include "tdeapplication.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <kdatastream.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include <dcopref.h>
#ifdef Q_WS_X11
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include <kxerrorhandler.h>
#include <X11/Xlib.h>
diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp
index 27b8b0cd..a37370e5 100644
--- a/tdecore/twinmodule.cpp
+++ b/tdecore/twinmodule.cpp
@@ -30,7 +30,7 @@
#include "kdebug.h"
#include <tqtl.h>
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include "netwm.h"
diff --git a/tdefile-plugins/elf/tdefile_elf.cpp b/tdefile-plugins/elf/tdefile_elf.cpp
index cad26971..7308a40d 100644
--- a/tdefile-plugins/elf/tdefile_elf.cpp
+++ b/tdefile-plugins/elf/tdefile_elf.cpp
@@ -21,7 +21,7 @@
#include "tdefile_elf.h"
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kstringvalidator.h>
#include <kdebug.h>
diff --git a/tdehtml/css/csshelper.cpp b/tdehtml/css/csshelper.cpp
index 02b5b3d3..a6ea9c38 100644
--- a/tdehtml/css/csshelper.cpp
+++ b/tdehtml/css/csshelper.cpp
@@ -28,7 +28,7 @@
#include <tqfontdatabase.h>
#include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "rendering/render_style.h"
diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp
index b33151b5..8b11c78d 100644
--- a/tdehtml/css/cssparser.cpp
+++ b/tdehtml/css/cssparser.cpp
@@ -26,7 +26,7 @@
#define YYDEBUG 0
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kurl.h>
#include "cssparser.h"
diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp
index 2a1fb547..79f8ba25 100644
--- a/tdehtml/css/cssstyleselector.cpp
+++ b/tdehtml/css/cssstyleselector.cpp
@@ -57,7 +57,7 @@ using namespace DOM;
#include <kstandarddirs.h>
#include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <tqfile.h>
#include <tqvaluelist.h>
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index f1b2b430..b7bd23de 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -41,17 +41,17 @@
#include <tqpainter.h>
#include <tqscrollbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
#include <kguiitem.h>
#include <tdepopupmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdeaction.h>
#include <tdeactioncollection.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeshortcut.h>
#include <tdeconfig.h>
#include <tdeconfigbase.h>
diff --git a/tdehtml/ecma/kjs_html.cpp b/tdehtml/ecma/kjs_html.cpp
index 8a63ba94..abd059e7 100644
--- a/tdehtml/ecma/kjs_html.cpp
+++ b/tdehtml/ecma/kjs_html.cpp
@@ -56,9 +56,9 @@
#include "rendering/render_frames.h"
#include "rendering/render_layer.h"
-#include "kmessagebox.h"
+#include "tdemessagebox.h"
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/tdehtml/ecma/kjs_mozilla.cpp b/tdehtml/ecma/kjs_mozilla.cpp
index 6fc7688d..d26aabb5 100644
--- a/tdehtml/ecma/kjs_mozilla.cpp
+++ b/tdehtml/ecma/kjs_mozilla.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kjs_mozilla.h"
diff --git a/tdehtml/ecma/kjs_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 03bc2298..29629074 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -21,13 +21,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
#include <tdeio/kmimetype.h>
#include <tdeio/kservice.h>
#include <tdeio/ktrader.h>
diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp
index 578cd30f..bdd7183f 100644
--- a/tdehtml/ecma/kjs_proxy.cpp
+++ b/tdehtml/ecma/kjs_proxy.cpp
@@ -38,10 +38,10 @@
#include "xml/dom_nodeimpl.h"
#include "tdehtmlpart_p.h"
#include <tdehtml_part.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <unistd.h>
#include <signal.h>
#include <sys/time.h>
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 1d38de27..554781cb 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -36,9 +36,9 @@
#include <tqpaintdevicemetrics.h>
#include <tqapplication.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
#include <tdeparts/browserinterface.h>
#include <twin.h>
@@ -50,7 +50,7 @@
#ifndef KONQ_EMBEDDED
#include <kbookmarkmanager.h>
#endif
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <assert.h>
#include <tqstyle.h>
#include <tqobjectlist.h>
diff --git a/tdehtml/html/dtd.cpp b/tdehtml/html/dtd.cpp
index accc8b85..d3ea86d5 100644
--- a/tdehtml/html/dtd.cpp
+++ b/tdehtml/html/dtd.cpp
@@ -26,7 +26,7 @@
using namespace DOM;
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
// priority of tags. Closing tags of higher priority close tags of lower
// priority.
diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp
index e4f09097..52ada7a7 100644
--- a/tdehtml/html/html_documentimpl.cpp
+++ b/tdehtml/html/html_documentimpl.cpp
@@ -47,9 +47,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "css/cssproperties.h"
#include "css/cssstyleselector.h"
diff --git a/tdehtml/html/html_elementimpl.cpp b/tdehtml/html/html_elementimpl.cpp
index 1153e8b7..fc116caf 100644
--- a/tdehtml/html/html_elementimpl.cpp
+++ b/tdehtml/html/html_elementimpl.cpp
@@ -50,7 +50,7 @@
#include "xml/dom2_eventsimpl.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "html_elementimpl.h"
using namespace DOM;
diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp
index 372904e0..6fae233d 100644
--- a/tdehtml/html/html_formimpl.cpp
+++ b/tdehtml/html/html_formimpl.cpp
@@ -47,12 +47,12 @@
#include "rendering/render_form.h"
#include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#ifndef TDEHTML_NO_WALLET
#include <tdewallet.h>
#endif
diff --git a/tdehtml/html/html_imageimpl.cpp b/tdehtml/html/html_imageimpl.cpp
index b1972aad..a006b3bd 100644
--- a/tdehtml/html/html_imageimpl.cpp
+++ b/tdehtml/html/html_imageimpl.cpp
@@ -29,7 +29,7 @@
#include "tdehtml_part.h"
#include <kstringhandler.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "rendering/render_image.h"
diff --git a/tdehtml/html/html_tableimpl.cpp b/tdehtml/html/html_tableimpl.cpp
index 71fe1477..f14ad858 100644
--- a/tdehtml/html/html_tableimpl.cpp
+++ b/tdehtml/html/html_tableimpl.cpp
@@ -43,7 +43,7 @@
#include "rendering/render_table.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
using namespace tdehtml;
using namespace DOM;
diff --git a/tdehtml/html/htmlparser.cpp b/tdehtml/html/htmlparser.cpp
index f7cc1daa..31d3d4c1 100644
--- a/tdehtml/html/htmlparser.cpp
+++ b/tdehtml/html/htmlparser.cpp
@@ -56,7 +56,7 @@
#include "html/htmlparser.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace DOM;
using namespace tdehtml;
diff --git a/tdehtml/html/htmltokenizer.cpp b/tdehtml/html/htmltokenizer.cpp
index 62d3ffab..292d1773 100644
--- a/tdehtml/html/htmltokenizer.cpp
+++ b/tdehtml/html/htmltokenizer.cpp
@@ -50,7 +50,7 @@
#include "css/csshelper.h"
#include "ecma/kjs_proxy.h"
#include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <ctype.h>
#include <assert.h>
#include <tqvariant.h>
diff --git a/tdehtml/java/kjavaapplet.cpp b/tdehtml/java/kjavaapplet.cpp
index 70a39afb..a28e541e 100644
--- a/tdehtml/java/kjavaapplet.cpp
+++ b/tdehtml/java/kjavaapplet.cpp
@@ -22,7 +22,7 @@
#include "kjavaappletwidget.h"
#include "kjavaappletcontext.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeparts/browserextension.h>
diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp
index 76914a5d..b644b67c 100644
--- a/tdehtml/java/kjavaappletcontext.cpp
+++ b/tdehtml/java/kjavaappletcontext.cpp
@@ -23,8 +23,8 @@
#include "kjavaappletserver.h"
#include "kjavaprocess.h"
#include "kjavaapplet.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqmap.h>
#include <tqguardedptr.h>
diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp
index 5d108ffc..952fe143 100644
--- a/tdehtml/java/kjavaappletserver.cpp
+++ b/tdehtml/java/kjavaappletserver.cpp
@@ -27,13 +27,13 @@
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/browserextension.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <tdeio/job.h>
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
#include <ksslcertificate.h>
#include <ksslcertchain.h>
#include <kssl.h>
diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp
index 5d5b47fb..f80690aa 100644
--- a/tdehtml/java/kjavaappletviewer.cpp
+++ b/tdehtml/java/kjavaappletviewer.cpp
@@ -32,7 +32,7 @@
#include <klibloader.h>
#include <tdeaboutdata.h>
#include <kstaticdeleter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstatusbar.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp
index c096261c..a1f5b8f1 100644
--- a/tdehtml/java/kjavaappletwidget.cpp
+++ b/tdehtml/java/kjavaappletwidget.cpp
@@ -24,7 +24,7 @@
#include <twin.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp
index 1ff68dd7..6b505c34 100644
--- a/tdehtml/java/kjavaprocess.cpp
+++ b/tdehtml/java/kjavaprocess.cpp
@@ -22,7 +22,7 @@
#include "kjavaprocess.h"
#include <kdebug.h>
-#include <tdeio/kprotocolmanager.h>
+#include <tdeio/tdeprotocolmanager.h>
#include <tqtextstream.h>
#include <tqmap.h>
diff --git a/tdehtml/misc/arena.cpp b/tdehtml/misc/arena.cpp
index cfbce24a..e2513ba3 100644
--- a/tdehtml/misc/arena.cpp
+++ b/tdehtml/misc/arena.cpp
@@ -45,7 +45,7 @@
#include <config.h>
#include <stdlib.h>
#include <string.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "arena.h"
#ifdef HAVE_GETPAGESIZE
diff --git a/tdehtml/misc/decoder.cpp b/tdehtml/misc/decoder.cpp
index 6000aa9c..28c8a5e9 100644
--- a/tdehtml/misc/decoder.cpp
+++ b/tdehtml/misc/decoder.cpp
@@ -39,12 +39,12 @@ using namespace tdehtml;
#include <tqregexp.h>
#include <tqtextcodec.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <ctype.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
diff --git a/tdehtml/misc/htmlhashes.cpp b/tdehtml/misc/htmlhashes.cpp
index e073f096..37600781 100644
--- a/tdehtml/misc/htmlhashes.cpp
+++ b/tdehtml/misc/htmlhashes.cpp
@@ -19,7 +19,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "htmlhashes.h"
#include "htmltags.c"
diff --git a/tdehtml/misc/htmltags.h b/tdehtml/misc/htmltags.h
index d8fbb323..bf9a8ded 100644
--- a/tdehtml/misc/htmltags.h
+++ b/tdehtml/misc/htmltags.h
@@ -5,7 +5,7 @@
#define TDEHTML_TAGS_H
#include "dom/dom_string.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
KDE_NO_EXPORT const char* getTagName(unsigned short id);
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index 0edcc34e..b8b94cd6 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -24,11 +24,11 @@
#include "knsplugininstaller.moc"
#include <kdebug.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <netaccess.h>
#include <tqbuttongroup.h>
diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp
index b7f42aa2..7621b5e4 100644
--- a/tdehtml/misc/loader.cpp
+++ b/tdehtml/misc/loader.cpp
@@ -59,7 +59,7 @@
#include <tdeapplication.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kimageio.h>
#include <kcharsets.h>
#include <kiconloader.h>
@@ -71,7 +71,7 @@
#ifdef IMAGE_TITLES
#include <tqfile.h>
#include <tdefilemetainfo.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#endif
#include "html/html_documentimpl.h"
diff --git a/tdehtml/misc/loader_jpeg.cpp b/tdehtml/misc/loader_jpeg.cpp
index 72816817..9ee5378f 100644
--- a/tdehtml/misc/loader_jpeg.cpp
+++ b/tdehtml/misc/loader_jpeg.cpp
@@ -37,7 +37,7 @@
#include <stdio.h>
#include <setjmp.h>
#include <tqdatetime.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
extern "C" {
#define XMD_H
diff --git a/tdehtml/misc/maketags b/tdehtml/misc/maketags
index b2b47289..8a6abf0e 100644
--- a/tdehtml/misc/maketags
+++ b/tdehtml/misc/maketags
@@ -41,7 +41,7 @@ print header <<EOF;
#define TDEHTML_TAGS_H
#include "dom/dom_string.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
KDE_NO_EXPORT const char* getTagName(unsigned short id);
diff --git a/tdehtml/rendering/font.cpp b/tdehtml/rendering/font.cpp
index b7632fc8..c7007394 100644
--- a/tdehtml/rendering/font.cpp
+++ b/tdehtml/rendering/font.cpp
@@ -33,7 +33,7 @@
#include "tdehtml_settings.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqpainter.h>
#include <tqfontdatabase.h>
diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index d14a9355..eb976289 100644
--- a/tdehtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -20,7 +20,7 @@
*
*/
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/tdehtml/rendering/render_body.cpp b/tdehtml/rendering/render_body.cpp
index 80a61300..820b1b87 100644
--- a/tdehtml/rendering/render_body.cpp
+++ b/tdehtml/rendering/render_body.cpp
@@ -25,7 +25,7 @@
#include "xml/dom_docimpl.h"
#include "tdehtmlview.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
using namespace tdehtml;
diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp
index d138d3ee..85e1f666 100644
--- a/tdehtml/rendering/render_box.cpp
+++ b/tdehtml/rendering/render_box.cpp
@@ -45,7 +45,7 @@
#include <tdehtmlview.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <assert.h>
diff --git a/tdehtml/rendering/render_canvas.cpp b/tdehtml/rendering/render_canvas.cpp
index a3dc548b..862f374b 100644
--- a/tdehtml/rendering/render_canvas.cpp
+++ b/tdehtml/rendering/render_canvas.cpp
@@ -29,7 +29,7 @@
#include "tdehtmlview.h"
#include "tdehtml_part.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
using namespace tdehtml;
diff --git a/tdehtml/rendering/render_flow.cpp b/tdehtml/rendering/render_flow.cpp
index 272ceb2d..a535b218 100644
--- a/tdehtml/rendering/render_flow.cpp
+++ b/tdehtml/rendering/render_flow.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <assert.h>
#include <tqpainter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "rendering/render_flow.h"
#include "rendering/render_text.h"
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 89f38a7b..9d302bfc 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -30,8 +30,8 @@
#include <kfind.h>
#include <kfinddialog.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kreplace.h>
#include <kreplacedialog.h>
#include <tdespell.h>
diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp
index 12d0d75e..68c66495 100644
--- a/tdehtml/rendering/render_frames.cpp
+++ b/tdehtml/rendering/render_frames.cpp
@@ -39,9 +39,9 @@
#include "misc/knsplugininstaller.h"
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqtimer.h>
#include <tqpainter.h>
diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp
index b41911e3..ad8f18bb 100644
--- a/tdehtml/rendering/render_image.cpp
+++ b/tdehtml/rendering/render_image.cpp
@@ -32,7 +32,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "css/csshelper.h"
#include "misc/helper.h"
diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp
index aee43a81..15bc1b0d 100644
--- a/tdehtml/rendering/render_inline.cpp
+++ b/tdehtml/rendering/render_inline.cpp
@@ -23,7 +23,7 @@
*
*/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "rendering/render_arena.h"
#include "rendering/render_inline.h"
diff --git a/tdehtml/rendering/render_line.cpp b/tdehtml/rendering/render_line.cpp
index b518d3a4..d8bc8d0e 100644
--- a/tdehtml/rendering/render_line.cpp
+++ b/tdehtml/rendering/render_line.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <assert.h>
#include <tqpainter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "rendering/render_flow.h"
#include "rendering/render_text.h"
diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp
index 5af983a7..cc9ba4e5 100644
--- a/tdehtml/rendering/render_list.cpp
+++ b/tdehtml/rendering/render_list.cpp
@@ -35,7 +35,7 @@
#include "xml/dom_docimpl.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqvaluelist.h>
//#define BOX_DEBUG
diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp
index 1d16057a..a979e1dc 100644
--- a/tdehtml/rendering/render_object.cpp
+++ b/tdehtml/rendering/render_object.cpp
@@ -45,7 +45,7 @@
#include "misc/loader.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqpainter.h>
#include "tdehtmlview.h"
#include <tdehtml_part.h>
diff --git a/tdehtml/rendering/render_object.h b/tdehtml/rendering/render_object.h
index 8d066201..bf120ff8 100644
--- a/tdehtml/rendering/render_object.h
+++ b/tdehtml/rendering/render_object.h
@@ -32,7 +32,7 @@
#include <tqvaluelist.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "xml/dom_docimpl.h"
#include "misc/tdehtmllayout.h"
diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp
index 5a96d06f..2d991c3a 100644
--- a/tdehtml/rendering/render_replaced.cpp
+++ b/tdehtml/rendering/render_replaced.cpp
@@ -35,7 +35,7 @@
#include <tqevent.h>
#include <tqapplication.h>
#include <tqlineedit.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqobjectlist.h>
#include <tqvaluevector.h>
diff --git a/tdehtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp
index 8a75c73f..9f2cc336 100644
--- a/tdehtml/rendering/render_table.cpp
+++ b/tdehtml/rendering/render_table.cpp
@@ -40,7 +40,7 @@
#include "rendering/render_line.h"
#include "xml/dom_docimpl.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqapplication.h>
#include <tqstyle.h>
diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp
index d125b04c..411f3f22 100644
--- a/tdehtml/rendering/render_text.cpp
+++ b/tdehtml/rendering/render_text.cpp
@@ -43,7 +43,7 @@
#include <tqimage.h>
#include <tqpainter.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <assert.h>
#include <limits.h>
#include <math.h>
diff --git a/tdehtml/rendering/table_layout.cpp b/tdehtml/rendering/table_layout.cpp
index eb815333..97a6a4c9 100644
--- a/tdehtml/rendering/table_layout.cpp
+++ b/tdehtml/rendering/table_layout.cpp
@@ -23,7 +23,7 @@
#include "table_layout.h"
#include "render_table.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
using namespace tdehtml;
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 3cc65676..b7dfb8a4 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -44,7 +44,7 @@
#include <tqdragobject.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <tdeio/job.h>
#include <kprocess.h>
@@ -54,7 +54,7 @@
#include <kurldrag.h>
#include <kstringhandler.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <krun.h>
#include <kurifilter.h>
diff --git a/tdehtml/tdehtml_factory.cpp b/tdehtml/tdehtml_factory.cpp
index b52476ea..4094030c 100644
--- a/tdehtml/tdehtml_factory.cpp
+++ b/tdehtml/tdehtml_factory.cpp
@@ -31,7 +31,7 @@
#include <kinstance.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp
index c2e0a89e..319dd816 100644
--- a/tdehtml/tdehtml_pagecache.cpp
+++ b/tdehtml/tdehtml_pagecache.cpp
@@ -21,7 +21,7 @@
#include "tdehtml_pagecache.h"
#include <kstaticdeleter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kstandarddirs.h>
#include <tqintdict.h>
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index c4bba759..28b15c7d 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -78,18 +78,18 @@ using namespace DOM;
#include <tdeio/job.h>
#include <tdeio/global.h>
#include <tdeio/netaccess.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstdaction.h>
#include <tdefiledialog.h>
#include <ktrader.h>
#include <kdatastream.h>
-#include <ktempfile.h>
-#include <kglobalsettings.h>
+#include <tdetempfile.h>
+#include <tdeglobalsettings.h>
#include <kurldrag.h>
#include <tdeapplication.h>
#include <tdeparts/browserinterface.h>
diff --git a/tdehtml/tdehtml_printsettings.cpp b/tdehtml/tdehtml_printsettings.cpp
index 251c3403..19fe7bdb 100644
--- a/tdehtml/tdehtml_printsettings.cpp
+++ b/tdehtml/tdehtml_printsettings.cpp
@@ -19,7 +19,7 @@
#include "tdehtml_printsettings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
#include <tqwhatsthis.h>
diff --git a/tdehtml/tdehtml_run.cpp b/tdehtml/tdehtml_run.cpp
index 2a5fd186..499616cc 100644
--- a/tdehtml/tdehtml_run.cpp
+++ b/tdehtml/tdehtml_run.cpp
@@ -24,7 +24,7 @@
#include "tdehtml_run.h"
#include <tdeio/job.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "tdehtml_ext.h"
#include <tqwidget.h>
diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cc
index 8e36f589..7f799e31 100644
--- a/tdehtml/tdehtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cc
@@ -21,14 +21,14 @@
#include "tdehtml_settings.h"
#include "tdehtmldefaults.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqregexp.h>
#include <tqvaluevector.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
/**
* @internal
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index bf05d849..31311cb3 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -32,7 +32,7 @@
#include <tdeio/job.h>
#include <kinstance.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
K_EXPORT_COMPONENT_FACTORY( tdehtmlimagefactory /*NOT the part name, see Makefile.am*/, TDEHTMLImageFactory )
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 010075f2..16b274cb 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -67,7 +67,7 @@
#include <kdialogbase.h>
#include <kiconloader.h>
#include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <kprinter.h>
#include <ksimpleconfig.h>
diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp
index dd864d65..201f1ef6 100644
--- a/tdehtml/tdemultipart/tdemultipart.cpp
+++ b/tdehtml/tdemultipart/tdemultipart.cpp
@@ -22,11 +22,11 @@
#include <tqvbox.h>
#include <kinstance.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <tqfile.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/genericfactory.h>
#include <tdehtml_part.h>
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 028fadc3..62842e08 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -65,7 +65,7 @@
#include <tdeio/job.h>
#include <tdemainwindow.h>
#include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqcolor.h>
#include <tqcursor.h>
diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp
index 47836b41..423a2a51 100644
--- a/tdehtml/xml/dom_docimpl.cpp
+++ b/tdehtml/xml/dom_docimpl.cpp
@@ -46,7 +46,7 @@
#include <tqptrstack.h>
#include <tqpaintdevicemetrics.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
#include "rendering/counter_tree.h"
@@ -60,7 +60,7 @@
#include "tdehtmlview.h"
#include "tdehtml_part.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kstringhandler.h>
#include <krfcdate.h>
#include "tdehtml_settings.h"
diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp
index ac8ca630..7e2e1bc5 100644
--- a/tdehtml/xml/dom_nodeimpl.cpp
+++ b/tdehtml/xml/dom_nodeimpl.cpp
@@ -33,7 +33,7 @@
#include "xml/dom_nodeimpl.h"
#include "xml/dom_restyler.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "rendering/render_text.h"
diff --git a/tdehtml/xml/xml_tokenizer.cpp b/tdehtml/xml/xml_tokenizer.cpp
index 44f90673..2ee90097 100644
--- a/tdehtml/xml/xml_tokenizer.cpp
+++ b/tdehtml/xml/xml_tokenizer.cpp
@@ -36,7 +36,7 @@
#include "tdehtml_part.h"
#include <tqvariant.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace DOM;
using namespace tdehtml;
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc
index e6bef2e0..8bbaa5e4 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cc
@@ -25,8 +25,8 @@
#include <kmimetype.h>
#include <kstringhandler.h>
#include <kinputdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <assert.h>
#include <tdeapplication.h>
#include <dcopclient.h>
diff --git a/tdeio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cc
index 30c52bdb..ee33612a 100644
--- a/tdeio/bookmarks/kbookmarkexporter.cc
+++ b/tdeio/bookmarks/kbookmarkexporter.cc
@@ -24,7 +24,7 @@
#include <tqstylesheet.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kbookmarkmanager.h"
#include "kbookmarkexporter.h"
diff --git a/tdeio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cc
index 36680290..513f89b4 100644
--- a/tdeio/bookmarks/kbookmarkimporter.cc
+++ b/tdeio/bookmarks/kbookmarkimporter.cc
@@ -20,7 +20,7 @@
#include <tdefiledialog.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kcharsets.h>
#include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cc
index 0443b3b1..9b0cacf2 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cc
@@ -22,7 +22,7 @@
#include <tdefiledialog.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cc
index 092ebe59..d588517a 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.cc
@@ -20,7 +20,7 @@
#include <tdefiledialog.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
index 6aca22b8..95937f89 100644
--- a/tdeio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cc
@@ -21,7 +21,7 @@
#include "kbookmarkimporter_kde1.h"
#include <tdefiledialog.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kcharsets.h>
#include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cc
index 8ce06a79..29960ce5 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.cc
@@ -25,7 +25,7 @@
#include "kbookmarkmanager.h"
#include <tdefiledialog.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kcharsets.h>
#include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cc
index 57b5d620..0609c7a3 100644
--- a/tdeio/bookmarks/kbookmarkimporter_opera.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.cc
@@ -20,7 +20,7 @@
#include <tdefiledialog.h>
#include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqtextcodec.h>
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc
index 205d879a..60d4f293 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cc
@@ -29,9 +29,9 @@
#include <ksavefile.h>
#include <dcopref.h>
#include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <dcopclient.h>
#include <tqfile.h>
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cc
index 0468bcd5..e1b00bc4 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cc
@@ -32,8 +32,8 @@
#include <kdialogbase.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 0c1ebb27..aeed441b 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -30,7 +30,7 @@
#include <tqlistview.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include "kbookmark.h"
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index fc34e902..b47af8eb 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -30,7 +30,7 @@
#include <tqlistview.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include "kbookmark.h"
diff --git a/tdeio/httpfilter/httpfilter.cc b/tdeio/httpfilter/httpfilter.cc
index 21086d61..0f6a4579 100644
--- a/tdeio/httpfilter/httpfilter.cc
+++ b/tdeio/httpfilter/httpfilter.cc
@@ -19,7 +19,7 @@
#include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "httpfilter.h"
diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp
index 4986eb45..cf4e0530 100644
--- a/tdeio/kpasswdserver/kpasswdserver.cpp
+++ b/tdeio/kpasswdserver/kpasswdserver.cpp
@@ -30,8 +30,8 @@
#include <tqtimer.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeio/passdlg.h>
#include <tdewallet.h>
diff --git a/tdeio/kssl/kssl.cc b/tdeio/kssl/kssl.cc
index 66cc503d..874da6aa 100644
--- a/tdeio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cc
@@ -48,7 +48,7 @@
#include <ksslx509v3.h>
#include <ksslpkcs12.h>
#include <ksslsession.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksocks.h>
#define sk_dup d->kossl->sk_dup
diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc
index ea3c2955..26550e71 100644
--- a/tdeio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cc
@@ -30,9 +30,9 @@
#include <tqlabel.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include <kseparator.h>
diff --git a/tdeio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cc
index e7310ccd..1f95c391 100644
--- a/tdeio/kssl/ksslcertificate.cc
+++ b/tdeio/kssl/ksslcertificate.cc
@@ -37,9 +37,9 @@
#include <kstandarddirs.h>
#include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdatetime.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <sys/types.h>
diff --git a/tdeio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cc
index 03a1300e..7567b859 100644
--- a/tdeio/kssl/ksslinfodlg.cc
+++ b/tdeio/kssl/ksslinfodlg.cc
@@ -31,11 +31,11 @@
#include <tqfile.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <ksqueezedtextlabel.h>
#include <kurllabel.h>
#include <kstdguiitem.h>
diff --git a/tdeio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cc
index 93d6d2da..65444499 100644
--- a/tdeio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cc
@@ -25,12 +25,12 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kopenssl.h>
#include <kprogress.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdewallet.h>
#include <tqlineedit.h>
diff --git a/tdeio/kssl/ksslpemcallback.cc b/tdeio/kssl/ksslpemcallback.cc
index 2dfbb914..207949a0 100644
--- a/tdeio/kssl/ksslpemcallback.cc
+++ b/tdeio/kssl/ksslpemcallback.cc
@@ -23,7 +23,7 @@
#endif
#include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "ksslpemcallback.h"
int KSSLPemCallback(char *buf, int size, int rwflag, void *userdata) {
diff --git a/tdeio/kssl/ksslpkcs12.cc b/tdeio/kssl/ksslpkcs12.cc
index b8b23cf1..9521e907 100644
--- a/tdeio/kssl/ksslpkcs12.cc
+++ b/tdeio/kssl/ksslpkcs12.cc
@@ -29,7 +29,7 @@
#include <tqfile.h>
#include <ksslall.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmdcodec.h>
#include <assert.h>
diff --git a/tdeio/kssl/ksslpkcs7.cc b/tdeio/kssl/ksslpkcs7.cc
index 8db0000f..cb66eb46 100644
--- a/tdeio/kssl/ksslpkcs7.cc
+++ b/tdeio/kssl/ksslpkcs7.cc
@@ -29,7 +29,7 @@
#include <tqfile.h>
#include <ksslall.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmdcodec.h>
#include <assert.h>
diff --git a/tdeio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cc
index 9895a702..fbf10b47 100644
--- a/tdeio/kssl/ksslsettings.cc
+++ b/tdeio/kssl/ksslsettings.cc
@@ -33,7 +33,7 @@
#include <tqsortedlist.h>
#include "ksslsettings.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/tdeio/kssl/ksslutils.cc b/tdeio/kssl/ksslutils.cc
index 80651757..444e5dd4 100644
--- a/tdeio/kssl/ksslutils.cc
+++ b/tdeio/kssl/ksslutils.cc
@@ -22,8 +22,8 @@
#include "ksslutils.h"
#include <tqstring.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqdatetime.h>
#include "kopenssl.h"
diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index 4f33d138..533c4fcc 100644
--- a/tdeio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
@@ -41,7 +41,7 @@
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocio.h>
#include <kurl.h>
diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index c94cc9b7..483e836c 100644
--- a/tdeio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -24,8 +24,8 @@
#include <tqtextcodec.h>
#include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include "downloader.moc"
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index a010d328..dfb68200 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -23,9 +23,9 @@
#include <dcopclient.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
#include "proxyscout.moc"
#include "discovery.h"
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index d4104163..d47845bb 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -42,7 +42,7 @@
#include <unistd.h>
#include <tqfile.h>
#include <tqsortedlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <tqdatetime.h>
diff --git a/tdeio/misc/tdefile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index df210fa4..aa6590ef 100644
--- a/tdeio/misc/tdefile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdefilemetainfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpropertiesdialog.h>
#include "fileprops.h"
diff --git a/tdeio/misc/tdemailservice.cpp b/tdeio/misc/tdemailservice.cpp
index 2d256c5c..23066d63 100644
--- a/tdeio/misc/tdemailservice.cpp
+++ b/tdeio/misc/tdemailservice.cpp
@@ -17,7 +17,7 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
static const TDECmdLineOptions options[] =
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index aaffd3b6..32465039 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -9,8 +9,8 @@
#include <tqtextstream.h>
#include <tdeapplication.h>
-#include <kemailsettings.h>
-#include <klocale.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp
index 99260d8d..bf175bdc 100644
--- a/tdeio/misc/tdetelnetservice.cpp
+++ b/tdeio/misc/tdetelnetservice.cpp
@@ -22,10 +22,10 @@
// $Id$
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <ksimpleconfig.h>
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 364197b7..126f0ce2 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -32,9 +32,9 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdirwatch.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpassdlg.h>
#include <kstandarddirs.h>
#include <tdewalletentry.h>
diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index aa3a1c09..c31062c2 100644
--- a/tdeio/misc/tdewalletd/tdewalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
@@ -531,7 +531,7 @@
</tabstops>
<includes>
<include location="global" impldecl="in declaration">tqcheckbox.h</include>
- <include location="global" impldecl="in implementation">klocale.h</include>
+ <include location="global" impldecl="in implementation">tdelocale.h</include>
<include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
</includes>
<Q_SLOTS>
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 107b57c6..c23628ea 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -31,12 +31,12 @@
#include <kuniqueapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include <kstatusbar.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdesu/client.h>
#include <twin.h>
#include <kdialog.h>
diff --git a/tdeio/tdefile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt
index a69cad53..ed035099 100644
--- a/tdeio/tdefile/CMakeLists.txt
+++ b/tdeio/tdefile/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(
install( FILES
tdefiledialog.h kencodingfiledialog.h
- kdiroperator.h tdefileview.h tdefilefiltercombo.h
+ tdediroperator.h tdefileview.h tdefilefiltercombo.h
tdefiledetailview.h kcombiview.h kdiskfreesp.h
tdefileiconview.h tderecentdocument.h
kurlrequester.h tdefilepreview.h tdefile.h
@@ -56,7 +56,7 @@ set( target tdefile )
set( ${target}_SRCS
tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp
- tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
+ tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp
tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp
tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp
diff --git a/tdeio/tdefile/ChangeLog b/tdeio/tdefile/ChangeLog
index ccfb45ab..229f9f2f 100644
--- a/tdeio/tdefile/ChangeLog
+++ b/tdeio/tdefile/ChangeLog
@@ -1,6 +1,6 @@
Sat Feb 26 00:26:55 2000 Carsten Pfeiffer <pfeiffer@kde.org>
- * kdiroperator.cpp:
+ * tdediroperator.cpp:
lottsa changes, e.g. action handling more clear now.
fixed completed item not clearning the previous selection
@@ -17,7 +17,7 @@ Sat Feb 26 00:26:55 2000 Carsten Pfeiffer <pfeiffer@kde.org>
Sun Feb 20 01:50:44 2000 Carsten Pfeiffer <pfeiffer@kde.org>
- * kdiroperator.*, tdefiledialog.* (saveConfig):
+ * tdediroperator.*, tdefiledialog.* (saveConfig):
implemented loading, saving and applying configuration
* tdefiledialog.cpp (setURL):
@@ -37,7 +37,7 @@ Thu Feb 17 19:09:54 2000 Carsten Pfeiffer <pfeiffer@kde.org>
Added KDirComboBox and replaced the directory combobox with it. It
even does something now :) Items need to be indented tho.
- * tdefilereader.cpp, kdiroperator.{cpp,h}:
+ * tdefilereader.cpp, tdediroperator.{cpp,h}:
fixed showHidden default
Tue Feb 15 14:21:41 2000 Carsten Pfeiffer <pfeiffer@kde.org>
@@ -60,7 +60,7 @@ Tue Feb 15 14:21:41 2000 Carsten Pfeiffer <pfeiffer@kde.org>
added static methods for multiselection
added getOpenURL(), getOpenURLs and getSaveURL()
- * kdiroperator.cpp (setSorting):
+ * tdediroperator.cpp (setSorting):
added setSorting() and sorting() to keep sorting when switching views
a few cosmetic and TDEAction changes
@@ -86,7 +86,7 @@ Fri Feb 11 12:17:59 2000 Carsten Pfeiffer <pfeiffer@kde.org>
Thu Feb 10 17:06:36 2000 Carsten Pfeiffer <pfeiffer@kde.org>
- * kdiroperator.cpp (connectView):
+ * tdediroperator.cpp (connectView):
- Now that TDEToggleAction is fixed, I can commit the new stuff:
Offer Actions for all the common functionality, i.e. sorting, setting
the view, home(), cdUp(), back, forward, etc.
@@ -107,7 +107,7 @@ Thu Feb 10 17:06:36 2000 Carsten Pfeiffer <pfeiffer@kde.org>
Thu Feb 10 12:59:29 2000 Carsten Pfeiffer <pfeiffer@kde.org>
- * kdiroperator.cpp (insertNewFiles):
+ * tdediroperator.cpp (insertNewFiles):
aahhh, finally fixed that infinite loop in KFileView::mergeLists
clear the view before calling view->addItemList( currentContents );
@@ -173,7 +173,7 @@ Sat Jan 29 15:33:37 2000 Carsten Pfeiffer <pfeiffer@kde.org>
* tdefileviewitem.cpp:
- added time_t mTime() to enable sorting by modification time
- * kdiroperator.cpp:
+ * tdediroperator.cpp:
- offer sorting options in popupmenu
- use checkAccess before creating directories. I guess this will again
change when the new kio will be used, tho.
diff --git a/tdeio/tdefile/Makefile.am b/tdeio/tdefile/Makefile.am
index 4e6b76ce..857e843c 100644
--- a/tdeio/tdefile/Makefile.am
+++ b/tdeio/tdefile/Makefile.am
@@ -27,7 +27,7 @@ METASOURCES = AUTO
#SUBDIRS = . acl_prop_page
include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
- kdiroperator.h tdefileview.h tdefilefiltercombo.h \
+ tdediroperator.h tdefileview.h tdefilefiltercombo.h \
tdefiledetailview.h kcombiview.h kdiskfreesp.h \
tdefileiconview.h tderecentdocument.h \
kurlrequester.h tdefilepreview.h tdefile.h \
@@ -44,7 +44,7 @@ noinst_HEADERS = config-tdefile.h tderecentdirs.h kmetaprops.h \
libtdefile_la_SOURCES = \
tdefilefiltercombo.cpp \
tdefileview.cpp tdefileiconview.cpp \
- tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
+ tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp \
tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \
diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 01eb8bcb..7e8e3dae 100644
--- a/tdeio/tdefile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -38,7 +38,7 @@
#include <tqwidgetstack.h>
#include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefileitem.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index 13830ab0..4c4f0cb0 100644
--- a/tdeio/tdefile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -35,7 +35,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqvaluelist.h>
diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index 995b80ff..af368057 100644
--- a/tdeio/tdefile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -23,7 +23,7 @@
#define _KCOMBIVIEW_H
#include <tqsplitter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefile.h>
#include <tdefileview.h>
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 65455aef..b5910807 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -24,8 +24,8 @@
#include <tqdir.h>
#include <kbuttonbox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdelistview.h>
#include <kservice.h>
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index 1ae03dae..dc44aa8b 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -38,8 +38,8 @@
#include <kdialogbase.h>
#include <kdirlister.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprogress.h>
#include <kstdaction.h>
@@ -55,7 +55,7 @@
#include "config-tdefile.h"
#include "kcombiview.h"
-#include "kdiroperator.h"
+#include "tdediroperator.h"
#include "tdefiledetailview.h"
#include "tdefileiconview.h"
#include "tdefilepreview.h"
@@ -1737,4 +1737,4 @@ TQString KDirOperator::viewConfigGroup() const
void KDirOperator::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
-#include "kdiroperator.moc"
+#include "tdediroperator.moc"
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 39959229..5027f631 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -29,9 +29,9 @@
#include <tdeconfig.h>
#include <tdefiledialog.h>
#include <tdefilespeedbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprotocolinfo.h>
#include <tderecentdirs.h>
#include <kshell.h>
@@ -41,7 +41,7 @@
#include <kinputdialog.h>
#include <tdeio/netaccess.h>
#include <tdeio/renamedlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "tdefiletreeview.h"
#include "kdirselectdialog.h"
diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp
index c2ea4079..b2d48b4b 100644
--- a/tdeio/tdefile/kdirsize.cpp
+++ b/tdeio/tdefile/kdirsize.cpp
@@ -19,7 +19,7 @@
#include "kdirsize.h"
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqapplication.h>
#include <tqtimer.h>
#include <config-tdefile.h>
diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index a4921064..d2d588a4 100644
--- a/tdeio/tdefile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -24,11 +24,11 @@
#include "kencodingfiledialog.h"
#include <kcombobox.h>
#include <tdetoolbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcharsets.h>
#include <tqtextcodec.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <tderecentdocument.h>
struct KEncodingFileDialogPrivate
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index 9d7975e2..154f9e89 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -20,8 +20,8 @@
#include <kiconviewsearchline.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kprogress.h>
diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index a1ce7d6b..f96be72f 100644
--- a/tdeio/tdefile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -16,12 +16,12 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <tdefileitem.h>
#include <tdeio/previewjob.h>
diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp
index ce620117..21c75e0c 100644
--- a/tdeio/tdefile/kmetaprops.cpp
+++ b/tdeio/tdefile/kmetaprops.cpp
@@ -23,9 +23,9 @@
#include <kdebug.h>
#include <tdefilemetainfowidget.h>
#include <tdefilemetainfo.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kprotocolinfo.h>
#include <tqvalidator.h>
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index f23ac78e..8397a5e7 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -29,8 +29,8 @@
#include <kiconloader.h>
#include <kicontheme.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <knotifydialog.h>
#include <kstandarddirs.h>
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index f31815e3..c8b5b21a 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -22,7 +22,7 @@
#include <tdelistview.h>
#include <kdialogbase.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "knotifywidgetbase.h"
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 5a855de2..5db8b79d 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -39,9 +39,9 @@
#include <kcombobox.h>
#include <kdesktopfile.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kmimemagic.h>
#include <krun.h>
diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp
index a053d562..c4533089 100644
--- a/tdeio/tdefile/kpreviewprops.cpp
+++ b/tdeio/tdefile/kpreviewprops.cpp
@@ -22,8 +22,8 @@
#include <tqlayout.h>
#include <tdefilemetapreview.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
class KPreviewPropsPlugin::KPreviewPropsPluginPrivate
{
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 389115a3..87d3926b 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -96,9 +96,9 @@ extern "C" {
#include <kicondialog.h>
#include <kurl.h>
#include <kurlrequester.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kstandarddirs.h>
#include <tdeio/job.h>
#include <tdeio/chmodjob.h>
@@ -109,7 +109,7 @@ extern "C" {
#include <kmimetype.h>
#include <kmountpoint.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kservice.h>
#include <kcompletion.h>
#include <klineedit.h>
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index 46b096c2..2aa79353 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -33,12 +33,12 @@
#include <tdeaboutdata.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kicondialog.h>
#include <kiconloader.h>
#include <kinstance.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
#include <kprotocolinfo.h>
#include <kstringhandler.h>
diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp
index 150e64b3..66fe8efb 100644
--- a/tdeio/tdefile/kurlcombobox.cpp
+++ b/tdeio/tdefile/kurlcombobox.cpp
@@ -20,9 +20,9 @@
#include <tqlistbox.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
#include <kurlcombobox.h>
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 9a76a69a..7ecfd543 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -30,10 +30,10 @@
#include <kdialog.h>
#include <kdirselectdialog.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlcompletion.h>
#include <kurldrag.h>
#include <kprotocolinfo.h>
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index d1e9ec10..1a040a65 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -28,10 +28,10 @@
#include <tdeaccel.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tderecentdocument.h>
#include <kurl.h>
#include <kurlrequester.h>
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index b3c44250..e267bdb6 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -27,11 +27,11 @@
#include <tdeapplication.h>
#include <tdefileitem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kurldrag.h>
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 8db76472..03bc1775 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -50,16 +50,16 @@
#include <tdecompletionbox.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kimageio.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/scheduler.h>
#include <tdeio/kservicetypefactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <tdepopupmenu.h>
#include <kprotocolinfo.h>
@@ -83,7 +83,7 @@
#include <tdefileview.h>
#include <tderecentdocument.h>
#include <tdefilefiltercombo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <kimagefilepreview.h>
#include <tdefilespeedbar.h>
diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp
index cd7bd54d..ed41f8f8 100644
--- a/tdeio/tdefile/tdefilefiltercombo.cpp
+++ b/tdeio/tdefile/tdefilefiltercombo.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstaticdeleter.h>
#include <config-tdefile.h>
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 13148527..92bbeba4 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -31,10 +31,10 @@
#include <tdeaction.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefileitem.h>
#include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kurldrag.h>
#include <tdeio/previewjob.h>
diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index dea9ea35..50fef856 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -21,7 +21,7 @@
#include "tdefilemetainfowidget.h"
#include <keditcl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcombobox.h>
#include <klineedit.h>
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 57543ea8..acec6147 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -22,7 +22,7 @@
#include <tdeaction.h>
#include <tdefilepreview.h>
#include <tdefilepreview.moc>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index 6204fa6b..a2fb01c2 100644
--- a/tdeio/tdefile/tdefilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -27,8 +27,8 @@
#include <tqlineedit.h>
#include <kprocess.h>
#include <kprocio.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <stdio.h>
@@ -39,7 +39,7 @@
#include <tqpushbutton.h>
#include <tdeapplication.h>
#include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
class KFileSharePropsPlugin::Private
{
diff --git a/tdeio/tdefile/tdefilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp
index defcb215..6f3365a5 100644
--- a/tdeio/tdefile/tdefilespeedbar.cpp
+++ b/tdeio/tdefile/tdefilespeedbar.cpp
@@ -25,9 +25,9 @@
#include <tqtextstream.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kprotocolinfo.h>
#include <kstandarddirs.h>
#include <kurl.h>
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index 6138b386..cb743242 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -22,7 +22,7 @@
#include <tqtimer.h>
#include <kdebug.h>
#include <kdirnotify_stub.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdefileitem.h>
#include <tdefileview.h>
#include <kmimetype.h>
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 63c97372..f171975d 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -25,8 +25,8 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "config-tdefile.h"
diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
index 12c2b647..0548261d 100644
--- a/tdeio/tdefile/tderecentdirs.cpp
+++ b/tdeio/tdefile/tderecentdirs.cpp
@@ -28,7 +28,7 @@
#include <tderecentdirs.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#define MAX_DIR_HISTORY 3
diff --git a/tdeio/tdefile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp
index 3d95b6c9..9e218940 100644
--- a/tdeio/tdefile/tests/kcustommenueditortest.cpp
+++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp
@@ -1,6 +1,6 @@
#include "kcustommenueditor.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
int main(int argc, char** argv)
diff --git a/tdeio/tdefile/tests/kdirselectdialogtest.cpp b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
index 0c2209d3..c1178c3b 100644
--- a/tdeio/tdefile/tests/kdirselectdialogtest.cpp
+++ b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
@@ -1,6 +1,6 @@
#include <tdeapplication.h>
#include <kdirselectdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
int main( int argc, char **argv )
diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index baf82725..ce7127d9 100644
--- a/tdeio/tdefile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -3,7 +3,7 @@
#include <tqstringlist.h>
#include <tdefiledialog.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqtimer.h>
KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name )
diff --git a/tdeio/tdefile/tests/kfstest.cpp b/tdeio/tdefile/tests/kfstest.cpp
index c57e3678..ada8d825 100644
--- a/tdeio/tdefile/tests/kfstest.cpp
+++ b/tdeio/tdefile/tests/kfstest.cpp
@@ -30,12 +30,12 @@
#include <tdefiledialog.h>
#include <tdefileiconview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <kurl.h>
#include <kurlbar.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <tdefile.h>
#include <kdebug.h>
#include <kicondialog.h>
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 529d12dd..9ff0199d 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -19,7 +19,7 @@
#include <tqdir.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdemainwindow.h>
#include <tdeapplication.h>
diff --git a/tdeio/tdeio/CMakeLists.txt b/tdeio/tdeio/CMakeLists.txt
index 8aaf395b..e2b96ebb 100644
--- a/tdeio/tdeio/CMakeLists.txt
+++ b/tdeio/tdeio/CMakeLists.txt
@@ -41,8 +41,8 @@ install( FILES
kurlcompletion.h kshellcompletion.h tdefileitem.h
tdefileshare.h ksambashare.h knfsshare.h kdirlister.h
kservicegroup.h kimageio.h kdirnotify.h kdirnotify_stub.h
- kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h
- kfilterbase.h kfilterdev.h kemailsettings.h kscan.h
+ kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h
+ kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h
kdatatool.h karchive.h tdefilefilter.h tdefilemetainfo.h
renamedlgplugin.h kmimetyperesolver.h kdcopservicestarter.h
kremoteencoding.h kmimetypechooser.h
@@ -71,7 +71,7 @@ install( FILES
set( target tdeiocore )
set( ${target}_SRCS
- authinfo.cpp kshred.cpp kprotocolmanager.cpp slave.cpp
+ authinfo.cpp kshred.cpp tdeprotocolmanager.cpp slave.cpp
slaveinterface.cpp observer.stub sessiondata.cpp
scheduler.cpp connection.cpp job.cpp global.cpp
slaveconfig.cpp kurlpixmapprovider.cpp netaccess.cpp
@@ -79,7 +79,7 @@ set( ${target}_SRCS
slavebase.cpp passdlg.cpp forwardingslavebase.cpp
progressbase.cpp defaultprogress.cpp statusbarprogress.cpp
kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp
- observer.cpp ../misc/uiserver.stub observer.skel kemailsettings.cpp
+ observer.cpp ../misc/uiserver.stub observer.skel tdeemailsettings.cpp
kprotocolinfo.cpp renamedlg.cpp skipdlg.cpp kremoteencoding.cpp
kmimetypechooser.cpp
)
diff --git a/tdeio/tdeio/Makefile.am b/tdeio/tdeio/Makefile.am
index f0766f5c..587cfe51 100644
--- a/tdeio/tdeio/Makefile.am
+++ b/tdeio/tdeio/Makefile.am
@@ -53,8 +53,8 @@ include_HEADERS = \
kshellcompletion.h tdefileitem.h tdefileshare.h ksambashare.h knfsshare.h \
kdirlister.h kservicegroup.h \
kimageio.h kdirnotify.h kdirnotify_stub.h \
- kurlpixmapprovider.h kprotocolinfo.h kprotocolmanager.h \
- kfilterbase.h kfilterdev.h kemailsettings.h kscan.h kdatatool.h \
+ kurlpixmapprovider.h kprotocolinfo.h tdeprotocolmanager.h \
+ kfilterbase.h kfilterdev.h tdeemailsettings.h kscan.h kdatatool.h \
karchive.h tdefilefilter.h tdefilemetainfo.h renamedlgplugin.h \
kmimetyperesolver.h kdcopservicestarter.h kremoteencoding.h \
kmimetypechooser.h
@@ -67,7 +67,7 @@ include_HEADERS += kacl.h
libtdeiocore_la_SOURCES = authinfo.cpp \
kshred.cpp \
- kprotocolmanager.cpp \
+ tdeprotocolmanager.cpp \
slave.cpp slaveinterface.cpp observer.stub \
sessiondata.cpp scheduler.cpp \
connection.cpp \
@@ -81,7 +81,7 @@ libtdeiocore_la_SOURCES = authinfo.cpp \
statusbarprogress.cpp \
kdirnotify.cpp kdirnotify.skel kdirnotify_stub.cpp \
observer.cpp uiserver.stub observer.skel \
- kemailsettings.cpp \
+ tdeemailsettings.cpp \
kprotocolinfo.cpp \
renamedlg.cpp skipdlg.cpp kremoteencoding.cpp \
kmimetypechooser.cpp
diff --git a/tdeio/tdeio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp
index 434466d7..24a5c247 100644
--- a/tdeio/tdeio/chmodjob.cpp
+++ b/tdeio/tdeio/chmodjob.cpp
@@ -29,9 +29,9 @@
#include <tqtimer.h>
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "tdeio/job.h"
#include "tdeio/chmodjob.h"
diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp
index 528368ba..a5b6bdf6 100644
--- a/tdeio/tdeio/dataslave.cpp
+++ b/tdeio/tdeio/dataslave.cpp
@@ -23,7 +23,7 @@
#include "dataslave.h"
#include "dataprotocol.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqtimer.h>
diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index 4293e752..5db9c5a0 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -26,8 +26,8 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kstringhandler.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kprocess.h>
#include <kpushbutton.h>
diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp
index e4bfec5f..8dce8a5f 100644
--- a/tdeio/tdeio/global.cpp
+++ b/tdeio/tdeio/global.cpp
@@ -33,9 +33,9 @@
#include "tdeio/job.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kprotocolmanager.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeprotocolmanager.h>
#include <kde_file.h>
#ifdef HAVE_VOLMGT
diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp
index a4e73145..7f8b9bda 100644
--- a/tdeio/tdeio/job.cpp
+++ b/tdeio/tdeio/job.cpp
@@ -42,12 +42,12 @@ extern "C" {
#include <tqfile.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdatastream.h>
#include <tdemainwindow.h>
#include <kde_file.h>
@@ -60,14 +60,14 @@ extern "C" {
#include "kdirwatch.h"
#include "kmimemagic.h"
#include "kprotocolinfo.h"
-#include "kprotocolmanager.h"
+#include "tdeprotocolmanager.h"
#include "tdeio/observer.h"
#include "kssl/ksslcsessioncache.h"
#include <kdirnotify_stub.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <dcopclient.h>
#ifdef Q_OS_UNIX
diff --git a/tdeio/tdeio/kdcopservicestarter.cpp b/tdeio/tdeio/kdcopservicestarter.cpp
index c859cce2..8a7a6763 100644
--- a/tdeio/tdeio/kdcopservicestarter.cpp
+++ b/tdeio/tdeio/kdcopservicestarter.cpp
@@ -22,7 +22,7 @@
#include "kservice.h"
#include <kstaticdeleter.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
static KStaticDeleter<KDCOPServiceStarter> dss_sd;
diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp
index 669766ab..b0027588 100644
--- a/tdeio/tdeio/kdirlister.cpp
+++ b/tdeio/tdeio/kdirlister.cpp
@@ -28,11 +28,11 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kstaticdeleter.h>
#include <kpro