summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:53 -0600
commit508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch)
tree1df40da8f05d010a3e175c3d48e3529cccf2e067
parent19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff)
downloadtdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip
tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--cervisia/addremovedlg.cpp2
-rw-r--r--cervisia/addrepositorydlg.cpp2
-rw-r--r--cervisia/annotatectl.cpp2
-rw-r--r--cervisia/annotateview.cpp2
-rw-r--r--cervisia/cervisiapart.cpp6
-rw-r--r--cervisia/cervisiashell.cpp4
-rw-r--r--cervisia/changelogdlg.cpp6
-rw-r--r--cervisia/checkoutdlg.cpp4
-rw-r--r--cervisia/commitdlg.cpp2
-rw-r--r--cervisia/cvsinitdlg.cpp2
-rw-r--r--cervisia/cvsservice/cvsaskpass.cpp2
-rw-r--r--cervisia/cvsservice/cvsloginjob.cpp2
-rw-r--r--cervisia/cvsservice/cvsservice.cpp4
-rw-r--r--cervisia/cvsservice/main.cpp2
-rw-r--r--cervisia/diffdlg.cpp6
-rw-r--r--cervisia/diffview.cpp4
-rw-r--r--cervisia/entry_status.cpp2
-rw-r--r--cervisia/globalignorelist.cpp2
-rw-r--r--cervisia/historydlg.cpp2
-rw-r--r--cervisia/logdlg.cpp6
-rw-r--r--cervisia/loginfo.cpp4
-rw-r--r--cervisia/loglist.cpp2
-rw-r--r--cervisia/logplainview.cpp2
-rw-r--r--cervisia/logtree.cpp4
-rw-r--r--cervisia/main.cpp2
-rw-r--r--cervisia/mergedlg.cpp2
-rw-r--r--cervisia/misc.cpp8
-rw-r--r--cervisia/patchoptiondlg.cpp2
-rw-r--r--cervisia/protocolview.cpp4
-rw-r--r--cervisia/repositorydlg.cpp4
-rw-r--r--cervisia/resolvedlg.cpp4
-rw-r--r--cervisia/settingsdlg.cpp4
-rw-r--r--cervisia/tagdlg.cpp4
-rw-r--r--cervisia/tooltip.cpp4
-rw-r--r--cervisia/updatedlg.cpp2
-rw-r--r--cervisia/updateview.cpp2
-rw-r--r--cervisia/updateview_items.cpp4
-rw-r--r--cervisia/watchdlg.cpp2
-rw-r--r--cervisia/watchersdlg.cpp2
-rw-r--r--doc/kbabel/using.docbook2
-rw-r--r--kapptemplate/kapp/app.cpp6
-rw-r--r--kapptemplate/kapp/apppref.cpp2
-rw-r--r--kapptemplate/kapp/appview.cpp2
-rw-r--r--kapptemplate/kapp/main.cpp2
-rw-r--r--kapptemplate/kpartapp/app.cpp2
-rw-r--r--kapptemplate/kpartapp/main.cpp2
-rw-r--r--kapptemplate/kpartplugin/plugin_app.cpp4
-rw-r--r--kbabel/addons/preview/pothumbcreator.cpp2
-rw-r--r--kbabel/catalogmanager/catalogmanager.cpp8
-rw-r--r--kbabel/catalogmanager/catalogmanagerview.cpp10
-rw-r--r--kbabel/catalogmanager/catmanlistitem.cpp2
-rw-r--r--kbabel/catalogmanager/findinfilesdialog.cpp4
-rw-r--r--kbabel/catalogmanager/libcvs/cvsdialog.cpp8
-rw-r--r--kbabel/catalogmanager/libcvs/cvshandler.cpp6
-rw-r--r--kbabel/catalogmanager/libsvn/svndialog.cpp8
-rw-r--r--kbabel/catalogmanager/libsvn/svnhandler.cpp6
-rw-r--r--kbabel/catalogmanager/main.cpp4
-rw-r--r--kbabel/catalogmanager/markpatterndialog.cpp4
-rw-r--r--kbabel/catalogmanager/multiroughtransdlg.cpp6
-rw-r--r--kbabel/catalogmanager/validateprogress.cpp4
-rw-r--r--kbabel/common/catalog.cpp8
-rw-r--r--kbabel/common/catalogsettings.cpp8
-rw-r--r--kbabel/common/kbmailer.cpp4
-rw-r--r--kbabel/common/kbproject.cpp4
-rw-r--r--kbabel/common/projectsettings.cpp4
-rw-r--r--kbabel/common/tagextractor.cpp2
-rw-r--r--kbabel/commonui/cmdedit.cpp2
-rw-r--r--kbabel/commonui/context.cpp4
-rw-r--r--kbabel/commonui/finddialog.cpp4
-rw-r--r--kbabel/commonui/projectpref.cpp2
-rw-r--r--kbabel/commonui/projectprefwidgets.cpp4
-rw-r--r--kbabel/commonui/projectwizard.cpp4
-rw-r--r--kbabel/commonui/roughtransdlg.cpp6
-rw-r--r--kbabel/commonui/tdeactionselector.cpp2
-rw-r--r--kbabel/datatools/accelerators/main.cc2
-rw-r--r--kbabel/datatools/arguments/main.cc4
-rw-r--r--kbabel/datatools/context/main.cc4
-rw-r--r--kbabel/datatools/equations/main.cc4
-rw-r--r--kbabel/datatools/length/main.cc4
-rw-r--r--kbabel/datatools/not-translated/main.cc4
-rw-r--r--kbabel/datatools/pluralforms/main.cc4
-rw-r--r--kbabel/datatools/punctuation/main.cc2
-rw-r--r--kbabel/datatools/regexp/main.cc4
-rw-r--r--kbabel/datatools/setfuzzy/main.cc2
-rw-r--r--kbabel/datatools/whitespace/main.cc4
-rw-r--r--kbabel/datatools/xml/main.cc4
-rw-r--r--kbabel/filters/gettext/gettextimport.cpp2
-rw-r--r--kbabel/kbabel/charselectview.cpp2
-rw-r--r--kbabel/kbabel/commentview.cpp2
-rw-r--r--kbabel/kbabel/contextview.cpp2
-rw-r--r--kbabel/kbabel/editorpreferences.ui.h2
-rw-r--r--kbabel/kbabel/errorlistview.cpp2
-rw-r--r--kbabel/kbabel/gotodialog.cpp2
-rw-r--r--kbabel/kbabel/headereditor.cpp8
-rw-r--r--kbabel/kbabel/hidingmsgedit.cpp2
-rw-r--r--kbabel/kbabel/kbabel.cpp6
-rw-r--r--kbabel/kbabel/kbabelpref.cpp2
-rw-r--r--kbabel/kbabel/kbabelview.cpp10
-rw-r--r--kbabel/kbabel/kbabelview2.cpp4
-rw-r--r--kbabel/kbabel/kbcataloglistview.cpp4
-rw-r--r--kbabel/kbabel/kbcharselect.cpp2
-rw-r--r--kbabel/kbabel/kbhighlighting.cpp4
-rw-r--r--kbabel/kbabel/main.cpp4
-rw-r--r--kbabel/kbabel/mymultilineedit.cpp6
-rw-r--r--kbabel/kbabel/sourceview.cpp2
-rw-r--r--kbabel/kbabel/spelldlg.cpp4
-rw-r--r--kbabel/kbabel/taglistview.cpp2
-rw-r--r--kbabel/kbabeldict/aboutmoduledlg.cpp2
-rw-r--r--kbabel/kbabeldict/dictchooser.cpp4
-rw-r--r--kbabel/kbabeldict/kbabeldict.cpp4
-rw-r--r--kbabel/kbabeldict/kbabeldictbox.cpp6
-rw-r--r--kbabel/kbabeldict/kbabeldictview.cpp4
-rw-r--r--kbabel/kbabeldict/main.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp4
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/database.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/database.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui2
-rw-r--r--kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp2
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp2
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp4
-rw-r--r--kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp2
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp2
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp2
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp4
-rw-r--r--kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp2
-rw-r--r--kbabel/kbabeldict/modules/tmx/pc_factory.cpp2
-rw-r--r--kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp2
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp4
-rw-r--r--kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp2
-rw-r--r--kbugbuster/backend/bugcommand.cpp2
-rw-r--r--kbugbuster/backend/bugdetails.cpp2
-rw-r--r--kbugbuster/backend/bugjob.cpp2
-rw-r--r--kbugbuster/backend/bugsystem.cpp4
-rw-r--r--kbugbuster/backend/kbbprefs.cpp2
-rw-r--r--kbugbuster/backend/mailsender.cpp4
-rw-r--r--kbugbuster/backend/person.h2
-rw-r--r--kbugbuster/backend/smtp.cpp4
-rw-r--r--kbugbuster/gui/centralwidget.cpp2
-rw-r--r--kbugbuster/gui/cwbugdetails.cpp2
-rw-r--r--kbugbuster/gui/cwbugdetailscontainer.cpp2
-rw-r--r--kbugbuster/gui/cwbuglistcontainer.cpp2
-rw-r--r--kbugbuster/gui/cwloadingwidget.cpp4
-rw-r--r--kbugbuster/gui/cwsearchwidget.cpp2
-rw-r--r--kbugbuster/gui/kbbmainwindow.cpp6
-rw-r--r--kbugbuster/gui/messageeditor.cpp4
-rw-r--r--kbugbuster/gui/msginputdialog.cpp2
-rw-r--r--kbugbuster/gui/preferencesdialog.cpp2
-rw-r--r--kbugbuster/gui/serverconfigdialog.cpp2
-rw-r--r--kbugbuster/main.cpp2
-rw-r--r--kbugbuster/tderesources/kcalresource.cpp4
-rw-r--r--kbugbuster/tderesources/kcalresource_plugin.cpp4
-rw-r--r--kbugbuster/tderesources/kcalresourceconfig.cpp2
-rw-r--r--kdeaccounts-plugin/CMakeLists.txt4
-rw-r--r--kdeaccounts-plugin/Makefile.am2
-rw-r--r--kdeaccounts-plugin/kdeaccountsformat.cpp6
-rw-r--r--kdeaccounts-plugin/kdeaccountsformat.h2
-rw-r--r--kmtrace/demangle.cpp2
-rw-r--r--kmtrace/kmtrace.cpp2
-rw-r--r--kmtrace/match.cpp2
-rw-r--r--kompare/kompare_shell.cpp4
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.cpp2
-rw-r--r--kompare/komparepart/kompare_part.cpp6
-rw-r--r--kompare/komparepart/komparelistview.cpp4
-rw-r--r--kompare/komparepart/kompareprefdlg.cpp2
-rw-r--r--kompare/komparepart/komparesplitter.cpp2
-rw-r--r--kompare/kompareurldialog.cpp2
-rw-r--r--kompare/libdialogpages/diffpage.cpp2
-rw-r--r--kompare/libdialogpages/filespage.cpp2
-rw-r--r--kompare/libdialogpages/viewpage.cpp2
-rw-r--r--kompare/libdialogpages/viewsettings.cpp2
-rw-r--r--kompare/libdiff2/diffmodel.cpp2
-rw-r--r--kompare/libdiff2/komparemodellist.cpp4
-rw-r--r--kompare/libdiff2/kompareprocess.cpp2
-rw-r--r--kompare/libdiff2/levenshteintable.cpp2
-rw-r--r--kompare/main.cpp4
-rw-r--r--kspy/classinfoview.cpp2
-rw-r--r--kspy/main.cpp2
-rw-r--r--kspy/navview.cpp2
-rw-r--r--kspy/propsview.cpp2
-rw-r--r--kspy/receiversview.cpp2
-rw-r--r--kspy/sigslotview.cpp2
-rw-r--r--kspy/spy.cpp2
-rw-r--r--kstartperf/kstartperf.cpp2
-rw-r--r--kuiviewer/kuiviewer.cpp4
-rw-r--r--kuiviewer/main.cpp2
-rw-r--r--scripts/kde-devel-vim.vim2
-rw-r--r--scripts/kde-emacs/klaralv.el2
-rw-r--r--tdecachegrind/tdecachegrind/cachegrindloader.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/callgraphview.cpp4
-rw-r--r--tdecachegrind/tdecachegrind/callitem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/callmapview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/callview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/configdlg.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/configuration.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/costlistitem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/costtypeitem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/costtypeview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/coverageitem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/coverageview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/functionitem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/functionselection.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/instritem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/instrview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/main.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/partgraph.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/partlistitem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/partselection.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/partview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/sourceitem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/sourceview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/stackitem.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/tabview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/toplevel.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/tracedata.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/traceitemview.cpp2
-rw-r--r--tdecachegrind/tdecachegrind/treemap.cpp2
-rw-r--r--tdefile-plugins/c++/tdefile_cpp.cpp2
-rw-r--r--tdefile-plugins/diff/tdefile_diff.cpp2
-rw-r--r--tdeioslave/svn/ksvnd/ksvnd.cpp4
-rw-r--r--tdeioslave/svn/svn.cpp6
-rw-r--r--tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp10
-rw-r--r--tdeunittest/example/simple/maingui.cpp2
-rw-r--r--tdeunittest/guimodrunner.cpp4
-rw-r--r--tdeunittest/runnergui.cpp2
-rw-r--r--umbrello/umbrello/activitywidget.cpp2
-rw-r--r--umbrello/umbrello/aligntoolbar.cpp4
-rw-r--r--umbrello/umbrello/artifact.cpp2
-rw-r--r--umbrello/umbrello/association.cpp2
-rw-r--r--umbrello/umbrello/associationwidget.cpp2
-rw-r--r--umbrello/umbrello/classifier.cpp4
-rw-r--r--umbrello/umbrello/classifierlistitem.cpp2
-rw-r--r--umbrello/umbrello/clipboard/umlclipboard.cpp4
-rw-r--r--umbrello/umbrello/codegenerator.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/adawriter.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationform.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/idlwriter.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/javacodegenerator.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/pascalwriter.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/pythonwriter.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp2
-rw-r--r--umbrello/umbrello/codegenerators/rubycodegenerator.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/rubywriter.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/simplecodegenerator.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/sqlwriter.cpp4
-rw-r--r--umbrello/umbrello/codegenerators/xmlschemawriter.cpp4
-rw-r--r--umbrello/umbrello/codeimport/classimport.cpp2
-rw-r--r--umbrello/umbrello/codeimport/cppimport.cpp2
-rw-r--r--umbrello/umbrello/codeimport/import_utils.cpp4
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/errors.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp2
-rw-r--r--umbrello/umbrello/codeimport/kdevcppparser/parser.cpp2
-rw-r--r--umbrello/umbrello/codeimport/nativeimportbase.cpp2
-rw-r--r--umbrello/umbrello/component.cpp2
-rw-r--r--umbrello/umbrello/dialogs/activitydialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/activitypage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/assocgenpage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/assocpage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/assocpropdlg.cpp4
-rw-r--r--umbrello/umbrello/dialogs/assocrolepage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/classgenpage.cpp4
-rw-r--r--umbrello/umbrello/dialogs/classifierlistpage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/classoptionspage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/classpropdlg.cpp2
-rw-r--r--umbrello/umbrello/dialogs/classwizard.cpp2
-rw-r--r--umbrello/umbrello/dialogs/codeeditor.cpp2
-rw-r--r--umbrello/umbrello/dialogs/codegenerationoptionspage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/codegenerationpolicypage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/codegenerationwizard.cpp4
-rw-r--r--umbrello/umbrello/dialogs/codeviewerdialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/diagramprintpage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/exportallviewsdialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/notedialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/overwritedialogue.cpp2
-rw-r--r--umbrello/umbrello/dialogs/parmpropdlg.cpp2
-rw-r--r--umbrello/umbrello/dialogs/pkgcontentspage.cpp2
-rw-r--r--umbrello/umbrello/dialogs/selectopdlg.cpp2
-rw-r--r--umbrello/umbrello/dialogs/settingsdlg.cpp2
-rw-r--r--umbrello/umbrello/dialogs/statedialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/umlattributedialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/umlentityattributedialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/umloperationdialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/umlroledialog.cpp2
-rw-r--r--umbrello/umbrello/dialogs/umlroleproperties.cpp4
-rw-r--r--umbrello/umbrello/dialogs/umltemplatedialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/umlviewdialog.cpp4
-rw-r--r--umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp2
-rw-r--r--umbrello/umbrello/docgenerators/docbookgenerator.cpp6
-rw-r--r--umbrello/umbrello/docgenerators/main.cpp2
-rw-r--r--umbrello/umbrello/docgenerators/xhtmlgenerator.cpp6
-rw-r--r--umbrello/umbrello/docwindow.cpp2
-rw-r--r--umbrello/umbrello/entity.cpp4
-rw-r--r--umbrello/umbrello/enum.cpp4
-rw-r--r--umbrello/umbrello/enumliteral.cpp2
-rw-r--r--umbrello/umbrello/floatingtextwidget.cpp2
-rw-r--r--umbrello/umbrello/folder.cpp4
-rw-r--r--umbrello/umbrello/import_rose.cpp2
-rw-r--r--umbrello/umbrello/listpopupmenu.cpp2
-rw-r--r--umbrello/umbrello/main.cpp2
-rw-r--r--umbrello/umbrello/model_utils.cpp2
-rw-r--r--umbrello/umbrello/node.cpp2
-rw-r--r--umbrello/umbrello/object_factory.cpp4
-rw-r--r--umbrello/umbrello/objectwidget.cpp2
-rw-r--r--umbrello/umbrello/operation.cpp2
-rw-r--r--umbrello/umbrello/package.cpp2
-rw-r--r--umbrello/umbrello/refactoring/refactoringassistant.cpp4
-rw-r--r--umbrello/umbrello/statewidget.cpp2
-rw-r--r--umbrello/umbrello/stereotype.cpp2
-rw-r--r--umbrello/umbrello/toolbarstateassociation.cpp4
-rw-r--r--umbrello/umbrello/toolbarstateother.cpp2
-rw-r--r--umbrello/umbrello/uml.cpp6
-rw-r--r--umbrello/umbrello/umlattributelist.cpp2
-rw-r--r--umbrello/umbrello/umlcanvasobject.cpp2
-rw-r--r--umbrello/umbrello/umlclassifierlistitemlist.cpp2
-rw-r--r--umbrello/umbrello/umldoc.cpp6
-rw-r--r--umbrello/umbrello/umlentityattributelist.cpp2
-rw-r--r--umbrello/umbrello/umllistview.cpp4
-rw-r--r--umbrello/umbrello/umllistviewitem.cpp4
-rw-r--r--umbrello/umbrello/umlobjectlist.cpp2
-rw-r--r--umbrello/umbrello/umlview.cpp6
-rw-r--r--umbrello/umbrello/umlviewimageexporter.cpp4
-rw-r--r--umbrello/umbrello/umlviewimageexporterall.cpp4
-rw-r--r--umbrello/umbrello/umlviewimageexportermodel.cpp4
-rw-r--r--umbrello/umbrello/umlwidget.cpp2
-rw-r--r--umbrello/umbrello/umlwidgetcontroller.cpp2
-rw-r--r--umbrello/umbrello/wortdetoolbar.cpp2
334 files changed, 509 insertions, 509 deletions
diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp
index d3f3864..f4803d1 100644
--- a/cervisia/addremovedlg.cpp
+++ b/cervisia/addremovedlg.cpp
@@ -27,7 +27,7 @@
#include <tqstringlist.h>
#include <tdeapplication.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char* name)
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index 32a38c7..7784f1d 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -28,7 +28,7 @@
#include <tdeconfig.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp
index 1f22034..d374eae 100644
--- a/cervisia/annotatectl.cpp
+++ b/cervisia/annotatectl.cpp
@@ -23,7 +23,7 @@
#include <tqmap.h>
#include <dcopref.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <krfcdate.h>
#include "annotatedlg.h"
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index a46e52b..567c661 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -22,7 +22,7 @@
#include <tqheader.h>
#include <tqpainter.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "loginfo.h"
#include "tooltip.h"
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index b67225d..ef6f42e 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -30,7 +30,7 @@
#include <tdefiledialog.h>
#include <kinputdialog.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <kprocess.h>
#include <kpropertiesdialog.h>
@@ -39,8 +39,8 @@
#include <kxmlguifactory.h>
#include <krun.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
#include <tdeio/netaccess.h>
#include "progressdlg.h"
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index ff4cec2..ec59499 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -27,8 +27,8 @@
#include <khelpmenu.h>
#include <kkeydialog.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <kurl.h>
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 80a3c72..94c0642 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -24,9 +24,9 @@
#include <tqfile.h>
#include <tqtextstream.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ktextedit.h>
#include "misc.h"
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index 2f63dcd..9519c0a 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -30,8 +30,8 @@
#include <kprocess.h>
#include <tdefiledialog.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kurlcompletion.h>
#include "progressdlg.h"
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index dd62a77..792a419 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -29,7 +29,7 @@
#include <tqheader.h>
#include <tdelistview.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "cvsservice_stub.h"
#include "logmessageedit.h"
diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp
index e29f061..db39be2 100644
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@@ -25,7 +25,7 @@
#include <tdefiledialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlcompletion.h>
diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp
index 9196b9c..810c906 100644
--- a/cervisia/cvsservice/cvsaskpass.cpp
+++ b/cervisia/cvsservice/cvsaskpass.cpp
@@ -22,7 +22,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpassdlg.h>
#include <iostream>
diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp
index ad6f917..5eb1d9f 100644
--- a/cervisia/cvsservice/cvsloginjob.cpp
+++ b/cervisia/cvsservice/cvsloginjob.cpp
@@ -21,7 +21,7 @@
#include "cvsloginjob.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpassdlg.h>
#include <sys/types.h>
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index 9efbd86..9eabda4 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -27,8 +27,8 @@
#include <dcopclient.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include "cvsjob.h"
diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp
index d0180b6..6e11f60 100644
--- a/cervisia/cvsservice/main.cpp
+++ b/cervisia/cvsservice/main.cpp
@@ -21,7 +21,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "cvsservice.h"
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 3561550..8a932cb 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -29,9 +29,9 @@
#include <tqregexp.h>
#include <tdeconfig.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kprocess.h>
#include "cvsservice_stub.h"
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 83f5a1c..481edf1 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -29,8 +29,8 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
class DiffViewItem
diff --git a/cervisia/entry_status.cpp b/cervisia/entry_status.cpp
index 00ff3b3..d3ba463 100644
--- a/cervisia/entry_status.cpp
+++ b/cervisia/entry_status.cpp
@@ -21,7 +21,7 @@
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace Cervisia
diff --git a/cervisia/globalignorelist.cpp b/cervisia/globalignorelist.cpp
index b3834a4..d3633ee 100644
--- a/cervisia/globalignorelist.cpp
+++ b/cervisia/globalignorelist.cpp
@@ -21,7 +21,7 @@ using namespace Cervisia;
#include <tqdir.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <stdlib.h> // for getenv()
#include "cvsservice_stub.h"
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 1913153..0b21e8d 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -28,7 +28,7 @@
#include <tdeconfig.h>
#include <klineedit.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <krfcdate.h>
#include "misc.h"
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index a257119..e924672 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -34,11 +34,11 @@
#include <kdebug.h>
#include <tdefiledialog.h>
#include <kfinddialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <tdelistviewsearchline.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <krfcdate.h>
#include <krun.h>
diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp
index 07468ae..a7daa7a 100644
--- a/cervisia/loginfo.cpp
+++ b/cervisia/loginfo.cpp
@@ -21,8 +21,8 @@
#include <tqstylesheet.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace Cervisia
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index 68d07d9..4bc4ff1 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -22,7 +22,7 @@
#include <tqapplication.h>
#include <tqkeycode.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "loginfo.h"
#include "misc.h"
diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp
index 413180a..4cf7806 100644
--- a/cervisia/logplainview.cpp
+++ b/cervisia/logplainview.cpp
@@ -24,7 +24,7 @@
#include <tqstylesheet.h>
#include <kfind.h>
#include <kfinddialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "loginfo.h"
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index 57d635c..ede6d30 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -22,8 +22,8 @@
#include <tqpainter.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include "loginfo.h"
#include "tooltip.h"
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 6c13ba9..5fe4028 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include "misc.h"
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp
index e2b770c..1cbecfd 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -27,7 +27,7 @@
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqstyle.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "misc.h"
#include "cvsservice_stub.h"
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 11e60e5..090861c 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -30,11 +30,11 @@
#include <tqregexp.h>
#include <tqstringlist.h>
#include <tdeconfig.h>
-#include <kemailsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kuser.h>
#include <kdebug.h>
diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp
index 6516528..43ba7fd 100644
--- a/cervisia/patchoptiondlg.cpp
+++ b/cervisia/patchoptiondlg.cpp
@@ -25,7 +25,7 @@ using Cervisia::PatchOptionDialog;
#include <tqradiobutton.h>
#include <tqvbuttongroup.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
PatchOptionDialog::PatchOptionDialog(TQWidget* parent, const char* name)
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index a94be9f..7e2cb3a 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -25,8 +25,8 @@
#include <tqpopupmenu.h>
#include <dcopref.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "cervisiapart.h"
#include "cvsjob_stub.h"
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 24fcf60..5b34830 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -26,8 +26,8 @@
#include <kbuttonbox.h>
#include <tdeconfig.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include "addrepositorydlg.h"
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 93c915f..cd12c75 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -30,8 +30,8 @@
#include <tqtextstream.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqregexp.h>
#include "misc.h"
#include "resolvedlg_p.h"
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index 98a3e01..b55d310 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -34,10 +34,10 @@
#include <kcolorbutton.h>
#include <tdeconfig.h>
#include <tdefontdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kurlrequester.h>
diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp
index b2bd150..0ad161d 100644
--- a/cervisia/tagdlg.cpp
+++ b/cervisia/tagdlg.cpp
@@ -26,8 +26,8 @@
#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "misc.h"
#include "cvsservice_stub.h"
diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp
index 5cd34b8..2f92823 100644
--- a/cervisia/tooltip.cpp
+++ b/cervisia/tooltip.cpp
@@ -19,8 +19,8 @@
#include "tooltip.h"
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <tqsimplerichtext.h>
diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp
index 4cd4367..d48d625 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -27,7 +27,7 @@
#include <tqradiobutton.h>
#include <tqstyle.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "misc.h"
#include "cvsservice_stub.h"
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 4aa5a44..ef3f170 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -26,7 +26,7 @@
#include <tqfileinfo.h>
#include <tqptrstack.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "cervisiasettings.h"
#include "entry.h"
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 34204ca..ce74fd2 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -27,9 +27,9 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
#include "cvsdir.h"
diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp
index 7be45e3..e4579d7 100644
--- a/cervisia/watchdlg.cpp
+++ b/cervisia/watchdlg.cpp
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index a3ca17e..f3c1823 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -23,7 +23,7 @@
#include <tqtable.h>
#include <tdeconfig.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "misc.h"
#include "cvsservice_stub.h"
diff --git a/doc/kbabel/using.docbook b/doc/kbabel/using.docbook
index ce67d1a..2e293aa 100644
--- a/doc/kbabel/using.docbook
+++ b/doc/kbabel/using.docbook
@@ -742,7 +742,7 @@ number of plural forms. This is done by translating a specific entry in <filenam
The number is set by selecting the name of a language, which uses
the same number and <emphasis>rules</emphasis> for finding the
right plural form. The up-to-date list of possible values can be found in the
-tdelibs source code, in the file <filename>tdecore/klocale.cpp</filename>.
+tdelibs source code, in the file <filename>tdecore/tdelocale.cpp</filename>.
</para>
<note><para>
diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp
index 5785102..e328025 100644
--- a/kapptemplate/kapp/app.cpp
+++ b/kapptemplate/kapp/app.cpp
@@ -14,10 +14,10 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
#include <tqpaintdevicemetrics.h>
#include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <tdeaccel.h>
#include <tdeio/netaccess.h>
diff --git a/kapptemplate/kapp/apppref.cpp b/kapptemplate/kapp/apppref.cpp
index 6a479b8..59b46b4 100644
--- a/kapptemplate/kapp/apppref.cpp
+++ b/kapptemplate/kapp/apppref.cpp
@@ -2,7 +2,7 @@ echo "Creating $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}pref.cpp...";
cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}pref.cpp
#include "${APP_NAME_LC}pref.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kapptemplate/kapp/appview.cpp b/kapptemplate/kapp/appview.cpp
index 28b5bac..d2299c2 100644
--- a/kapptemplate/kapp/appview.cpp
+++ b/kapptemplate/kapp/appview.cpp
@@ -9,7 +9,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}view.cpp
#include <ktrader.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <krun.h>
${APP_NAME}View::${APP_NAME}View(TQWidget *parent)
diff --git a/kapptemplate/kapp/main.cpp b/kapptemplate/kapp/main.cpp
index 8f03043..c1c04ec 100644
--- a/kapptemplate/kapp/main.cpp
+++ b/kapptemplate/kapp/main.cpp
@@ -5,7 +5,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/main.cpp
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE Application");
diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp
index e2610d9..85fb8dc 100644
--- a/kapptemplate/kpartapp/app.cpp
+++ b/kapptemplate/kpartapp/app.cpp
@@ -18,7 +18,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
#include <kstdaction.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <kstatusbar.h>
diff --git a/kapptemplate/kpartapp/main.cpp b/kapptemplate/kpartapp/main.cpp
index c6b61d1..f83359e 100644
--- a/kapptemplate/kpartapp/main.cpp
+++ b/kapptemplate/kpartapp/main.cpp
@@ -4,7 +4,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/main.cpp
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("A TDE KPart Application");
diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp
index ccc7fec..0bebbb3 100644
--- a/kapptemplate/kpartplugin/plugin_app.cpp
+++ b/kapptemplate/kpartplugin/plugin_app.cpp
@@ -5,8 +5,8 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp
#include <tdehtml_part.h>
#include <tdeaction.h>
#include <kinstance.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
typedef KGenericFactory<Plugin${APP_NAME}> ${APP_NAME}Factory;
diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp
index 7853a25..8efd135 100644
--- a/kbabel/addons/preview/pothumbcreator.cpp
+++ b/kbabel/addons/preview/pothumbcreator.cpp
@@ -38,7 +38,7 @@
#include <tqimage.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <kpixmapsplitter.h>
diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index b9ff166..c38dc42 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -58,11 +58,11 @@
#include <kdialogbase.h>
//#include <kedittoolbar.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kprogress.h>
#include <tdestdaccel.h>
diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp
index daba1fc..9dc0691 100644
--- a/kbabel/catalogmanager/catalogmanagerview.cpp
+++ b/kbabel/catalogmanager/catalogmanagerview.cpp
@@ -57,13 +57,13 @@
#include <kcmenumngr.h>
#include <kcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kdatatool.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tdeaction.h>
#include <tdefiledialog.h>
@@ -71,7 +71,7 @@
#include <kprogress.h>
#include <twin.h>
#include <tdeversion.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfileinfo.h>
#include <tqdir.h>
diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp
index 52f248e..c2d03d5 100644
--- a/kbabel/catalogmanager/catmanlistitem.cpp
+++ b/kbabel/catalogmanager/catmanlistitem.cpp
@@ -40,7 +40,7 @@
#include "resources.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfileinfo.h>
#include <tqdir.h>
diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp
index be29301..66926de 100644
--- a/kbabel/catalogmanager/findinfilesdialog.cpp
+++ b/kbabel/catalogmanager/findinfilesdialog.cpp
@@ -39,8 +39,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KBabel;
diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
index ce4c498..9568eff 100644
--- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp
+++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp
@@ -48,11 +48,11 @@
// KDE include files
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kprocess.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <kstringhandler.h>
#include <kcombobox.h>
#include <kcharsets.h>
diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp
index 4513158..0d6be57 100644
--- a/kbabel/catalogmanager/libcvs/cvshandler.cpp
+++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp
@@ -45,9 +45,9 @@
#include <tqstringlist.h>
// KDE include files
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
// project specific include files
#include "cvshandler.h"
diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp
index cd859d2..c0b8277 100644
--- a/kbabel/catalogmanager/libsvn/svndialog.cpp
+++ b/kbabel/catalogmanager/libsvn/svndialog.cpp
@@ -47,11 +47,11 @@
// KDE include files
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kprocess.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <kstringhandler.h>
// Project specific include files
#include "svndialog.h"
diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp
index b7e0fd4..4587f0e 100644
--- a/kbabel/catalogmanager/libsvn/svnhandler.cpp
+++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp
@@ -46,9 +46,9 @@
#include <tqdom.h>
// KDE include files
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kprocess.h>
// project specific include files
diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp
index 306fece..ef64c45 100644
--- a/kbabel/catalogmanager/main.cpp
+++ b/kbabel/catalogmanager/main.cpp
@@ -46,9 +46,9 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <twin.h>
#include <tdemainwindow.h>
diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp
index ee86ead..d4ff458 100644
--- a/kbabel/catalogmanager/markpatterndialog.cpp
+++ b/kbabel/catalogmanager/markpatterndialog.cpp
@@ -39,8 +39,8 @@
#include <kcombobox.h>
#include <kcompletion.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h>
diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp
index 6f3b750..841f8bb 100644
--- a/kbabel/catalogmanager/multiroughtransdlg.cpp
+++ b/kbabel/catalogmanager/multiroughtransdlg.cpp
@@ -39,9 +39,9 @@
#include <tqlayout.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprogress.h>
#include <kurl.h>
diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp
index 76728e0..02c9773 100644
--- a/kbabel/catalogmanager/validateprogress.cpp
+++ b/kbabel/catalogmanager/validateprogress.cpp
@@ -37,8 +37,8 @@
#include <kdebug.h>
#include <kdatatool.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprogress.h>
#include <ksqueezedtextlabel.h>
diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index e58ffd8..aaf844a 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -42,10 +42,10 @@
#include <tdeconfig.h>
#include <kdatatool.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
@@ -67,7 +67,7 @@
#include "version.h"
#include "stringdistance.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
using namespace KBabel;
Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile)
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index b217d9c..d7236b8 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -35,11 +35,11 @@
#include "kbprojectsettings.h"
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kemailsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeemailsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <stdlib.h>
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 418c1de..a85fb99 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -41,8 +41,8 @@
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ktar.h>
#include <kurl.h>
#include <kdebug.h>
diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp
index 9700c08..35ce08a 100644
--- a/kbabel/common/kbproject.cpp
+++ b/kbabel/common/kbproject.cpp
@@ -39,8 +39,8 @@
#include <tqfileinfo.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <tdespell.h>
diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp
index 98df492..8ac63cd 100644
--- a/kbabel/common/projectsettings.cpp
+++ b/kbabel/common/projectsettings.cpp
@@ -36,8 +36,8 @@
#include "resources.h"
#include <tqstring.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdespell.h>
diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp
index bbf9ee1..ef89fa3 100644
--- a/kbabel/common/tagextractor.cpp
+++ b/kbabel/common/tagextractor.cpp
@@ -35,7 +35,7 @@
#include "catalogsettings.h"
#include "tagextractor.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
using namespace KBabel;
diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp
index 8d3658f..e6db0b5 100644
--- a/kbabel/commonui/cmdedit.cpp
+++ b/kbabel/commonui/cmdedit.cpp
@@ -38,7 +38,7 @@
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqtoolbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 0ae0000..bd05078 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -49,8 +49,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tdeversion.h>
#include <tdeio/netaccess.h>
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 0fe463f..b58cf7b 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -45,8 +45,8 @@
#include <kcombobox.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeparts/componentfactory.h>
#include <kregexpeditorinterface.h>
diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp
index 34f5223..e2d3ced 100644
--- a/kbabel/commonui/projectpref.cpp
+++ b/kbabel/commonui/projectpref.cpp
@@ -42,7 +42,7 @@
#include <tqvbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index f07ba99..8ecc12d 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -43,11 +43,11 @@
#include <kcombobox.h>
#include <kdatatool.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tdefiledialog.h>
#include <knuminput.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <kurlcompletion.h>
#include <tdefontdialog.h>
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index 8365d03..7926648 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -40,9 +40,9 @@
#include <tqcombobox.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
using namespace KBabel;
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 7ed5d60..677b68e 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -53,9 +53,9 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprogress.h>
diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp
index fd497a4..8b56ae4 100644
--- a/kbabel/commonui/tdeactionselector.cpp
+++ b/kbabel/commonui/tdeactionselector.cpp
@@ -30,7 +30,7 @@
#include "tdeactionselector.h"
#include <resources.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdialog.h> // for spacingHint()
#include <kdebug.h>
diff --git a/kbabel/datatools/accelerators/main.cc b/kbabel/datatools/accelerators/main.cc
index 275a628..0c7cae3 100644
--- a/kbabel/datatools/accelerators/main.cc
+++ b/kbabel/datatools/accelerators/main.cc
@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
/***************************************************
*
diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cc
index e125d79..b6c3fa5 100644
--- a/kbabel/datatools/arguments/main.cc
+++ b/kbabel/datatools/arguments/main.cc
@@ -38,8 +38,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/datatools/context/main.cc b/kbabel/datatools/context/main.cc
index 3288aa9..0fb989d 100644
--- a/kbabel/datatools/context/main.cc
+++ b/kbabel/datatools/context/main.cc
@@ -39,8 +39,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/datatools/equations/main.cc b/kbabel/datatools/equations/main.cc
index a5c9688..c0dbbba 100644
--- a/kbabel/datatools/equations/main.cc
+++ b/kbabel/datatools/equations/main.cc
@@ -39,8 +39,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/datatools/length/main.cc b/kbabel/datatools/length/main.cc
index ec4bab1..f1c295e 100644
--- a/kbabel/datatools/length/main.cc
+++ b/kbabel/datatools/length/main.cc
@@ -42,8 +42,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cc
index 4bcdd41..6809319 100644
--- a/kbabel/datatools/not-translated/main.cc
+++ b/kbabel/datatools/not-translated/main.cc
@@ -41,8 +41,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/datatools/pluralforms/main.cc b/kbabel/datatools/pluralforms/main.cc
index cdc6e99..693a843 100644
--- a/kbabel/datatools/pluralforms/main.cc
+++ b/kbabel/datatools/pluralforms/main.cc
@@ -40,8 +40,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/datatools/punctuation/main.cc b/kbabel/datatools/punctuation/main.cc
index 7a05aab..6d77951 100644
--- a/kbabel/datatools/punctuation/main.cc
+++ b/kbabel/datatools/punctuation/main.cc
@@ -39,7 +39,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
/***************************************************
*
diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc
index 9f948e0..e500728 100644
--- a/kbabel/datatools/regexp/main.cc
+++ b/kbabel/datatools/regexp/main.cc
@@ -36,8 +36,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/datatools/setfuzzy/main.cc b/kbabel/datatools/setfuzzy/main.cc
index 86dc332..7bc0ed1 100644
--- a/kbabel/datatools/setfuzzy/main.cc
+++ b/kbabel/datatools/setfuzzy/main.cc
@@ -37,7 +37,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
/***************************************************
*
diff --git a/kbabel/datatools/whitespace/main.cc b/kbabel/datatools/whitespace/main.cc
index e838770..0655821 100644
--- a/kbabel/datatools/whitespace/main.cc
+++ b/kbabel/datatools/whitespace/main.cc
@@ -41,8 +41,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/datatools/xml/main.cc b/kbabel/datatools/xml/main.cc
index 2f32db9..59342c0 100644
--- a/kbabel/datatools/xml/main.cc
+++ b/kbabel/datatools/xml/main.cc
@@ -41,8 +41,8 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
/***************************************************
*
diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp
index 4adf1eb..6678306 100644
--- a/kbabel/filters/gettext/gettextimport.cpp
+++ b/kbabel/filters/gettext/gettextimport.cpp
@@ -47,7 +47,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
K_EXPORT_COMPONENT_FACTORY( kbabel_gettextimport, KGenericFactory<GettextImportPlugin> ( "kbabelgettextimportfilter" ) )
diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index d4a7c47..4522201 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -42,7 +42,7 @@
#include <tdeconfig.h>
#include <kcursor.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharselect.h>
#include "kbcatalog.h"
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index e003ff5..0ca858d 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -45,7 +45,7 @@
#include <tdeconfig.h>
#include <kcursor.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <kurldrag.h>
diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 0eba050..de5263a 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -40,7 +40,7 @@
#include <tqwhatsthis.h>
#include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "resources.h"
#include "kbcatalog.h"
diff --git a/kbabel/kbabel/editorpreferences.ui.h b/kbabel/kbabel/editorpreferences.ui.h
index 99819cd..ab2bbc3 100644
--- a/kbabel/kbabel/editorpreferences.ui.h
+++ b/kbabel/kbabel/editorpreferences.ui.h
@@ -7,7 +7,7 @@
** place of a destructor.
*****************************************************************************/
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "toolselectionwidget.h"
void EditorPreferences::ledWarning( bool show )
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index 044b107..cd1cc6c 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -40,7 +40,7 @@
#include <tqwhatsthis.h>
#include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "resources.h"
#include "kbcatalog.h"
diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp
index a6fca91..ff5d1df 100644
--- a/kbabel/kbabel/gotodialog.cpp
+++ b/kbabel/kbabel/gotodialog.cpp
@@ -32,7 +32,7 @@
**************************************************************************** */
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "gotodialog.h"
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 38b1192..4a7624c 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -33,11 +33,11 @@
**************************************************************************** */
#include <kcursor.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ktextedit.h>
#include <kurl.h>
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index a3dcb3c..11bf219 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -37,7 +37,7 @@
#include <tqtabwidget.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KBabel;
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index 9be4ec1..2f6cd4e 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -64,9 +64,9 @@
#include <kstatusbar.h>
#include <tdestdaccel.h>
#include <kedittoolbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kled.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdetoolbar.h>
#include <tdefiledialog.h>
@@ -75,7 +75,7 @@
#include <kdialogbase.h>
#include <kprogress.h>
#include <kpushbutton.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <twin.h>
#include <tdeaction.h>
#include <kstdaction.h>
diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp
index a3841c8..a3f3abb 100644
--- a/kbabel/kbabel/kbabelpref.cpp
+++ b/kbabel/kbabel/kbabelpref.cpp
@@ -44,7 +44,7 @@
#include "toolselectionwidget.h"
#include "tqcombobox.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
using namespace KBabel;
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index e415f06..001b148 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -61,9 +61,9 @@
#include <kcmenumngr.h>
#include <tdeconfigdialog.h>
#include <kdatatool.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kcursor.h>
#include <tdefiledialog.h>
#include <tdeconfig.h>
@@ -72,12 +72,12 @@
#include <tdelistbox.h>
#include <tdeio/netaccess.h>
#include <knotifyclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdespell.h>
#include <twin.h>
#include <tdestdaccel.h>
#include <kurldrag.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "resources.h"
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index 02462e1..5089f56 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -37,8 +37,8 @@
#include <kdebug.h>
#include <tdefiledialog.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kurl.h>
#include <tdeio/netaccess.h>
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index 9b7d753..4082286 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -26,11 +26,11 @@
#include "kbabel.h"
#include "editcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <tqcolor.h>
#include <tqlayout.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
using namespace KBabel;
diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp
index 0f50f63..70977aa 100644
--- a/kbabel/kbabel/kbcharselect.cpp
+++ b/kbabel/kbabel/kbcharselect.cpp
@@ -35,7 +35,7 @@
#include <tdeconfig.h>
#include <kcharselect.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqspinbox.h>
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index d75de27..3f9df53 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -41,8 +41,8 @@
#include "tdeapplication.h"
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kbabelsettings.h>
#include <tdespell.h>
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index 15dd932..a6282e8 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -44,8 +44,8 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kcursor.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kuniqueapplication.h>
#include <twin.h>
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index 1e75f78..ea46b9a 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -53,9 +53,9 @@
#include <tqpopupmenu.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
#include <tdestdaccel.h>
#include "kbhighlighting.h"
diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp
index d60bf35..58013ea 100644
--- a/kbabel/kbabel/sourceview.cpp
+++ b/kbabel/kbabel/sourceview.cpp
@@ -38,7 +38,7 @@
#include <tqwhatsthis.h>
#include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "resources.h"
#include "kbcatalog.h"
diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp
index 7bb4385..62a88c8 100644
--- a/kbabel/kbabel/spelldlg.cpp
+++ b/kbabel/kbabel/spelldlg.cpp
@@ -37,8 +37,8 @@
#include <tqradiobutton.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name)
: KDialogBase(parent,name,true,i18n("Caption of dialog","Spelling")
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index d1adb64..3233ab5 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -38,7 +38,7 @@
#include <kcursor.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kbcatalog.h"
diff --git a/kbabel/kbabeldict/aboutmoduledlg.cpp b/kbabel/kbabeldict/aboutmoduledlg.cpp
index 693a3ac..bb34fc2 100644
--- a/kbabel/kbabeldict/aboutmoduledlg.cpp
+++ b/kbabel/kbabeldict/aboutmoduledlg.cpp
@@ -33,7 +33,7 @@
#include "aboutmoduledlg.h"
#include <kbugreport.h>
-#include <klocale.h>
+#include <tdelocale.h>
AboutModuleDlg::AboutModuleDlg(const TDEAboutData *aboutData, TQWidget *parent)
: TDEAboutApplication(aboutData, parent)
diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp
index 796cf51..ae3f506 100644
--- a/kbabel/kbabeldict/dictchooser.cpp
+++ b/kbabel/kbabeldict/dictchooser.cpp
@@ -40,9 +40,9 @@
#include <tqpushbutton.h>
#include <tdeconfig.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected
, TQWidget *parent, const char *name)
diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp
index 09a98fb..03d08e3 100644
--- a/kbabel/kbabeldict/kbabeldict.cpp
+++ b/kbabel/kbabeldict/kbabeldict.cpp
@@ -34,8 +34,8 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "kbabeldict.h"
#include "kbabeldictview.h"
diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp
index e0e631a..4b158ef 100644
--- a/kbabel/kbabeldict/kbabeldictbox.cpp
+++ b/kbabel/kbabeldict/kbabeldictbox.cpp
@@ -50,10 +50,10 @@
#include <kdialogbase.h>
#include <klibloader.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <ktrader.h>
#include <twin.h>
diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp
index 7ed294c..7964c65 100644
--- a/kbabel/kbabeldict/kbabeldictview.cpp
+++ b/kbabel/kbabeldict/kbabeldictview.cpp
@@ -52,9 +52,9 @@
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprogress.h>
#include <kseparator.h>
#include <kdebug.h>
diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp
index f863a4c..98d00d0 100644
--- a/kbabel/kbabeldict/main.cpp
+++ b/kbabel/kbabeldict/main.cpp
@@ -37,7 +37,7 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <twin.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
index a560ae4..5423bca 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp
@@ -33,10 +33,10 @@
#include <tqinputdialog.h>
#include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
#include <kurlrequester.h>
#include <kstandarddirs.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
index 8d48df5..50880dc 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp
@@ -38,7 +38,7 @@
#include <tqfile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
WordItem::WordItem (char *data, TQString w)
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
index 71b8e1a..2273a9c 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp
@@ -1,5 +1,5 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
index 7833bef..e1f1db7 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui
@@ -1029,7 +1029,7 @@ Finally you can set the maximum number of entries in the list.</string>
</connection>
</connections>
<includes>
- <include location="local" impldecl="in declaration">klocale.h</include>
+ <include location="local" impldecl="in declaration">tdelocale.h</include>
<include location="global" impldecl="in declaration">kseparator.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
index ed2c506..e87294e 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp
@@ -4,7 +4,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kurlrequester.h>
#include <tqtoolbutton.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
index a3309a2..2d56426 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp
@@ -40,7 +40,7 @@
#include <tqcheckbox.h>
#include <knuminput.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqmap.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
index b880cd5..0abd3dc 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp
@@ -12,7 +12,7 @@ License: GPLv2
#include <tqdict.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#define i18n (const char*)
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
index c4091e4..ad2aa0d 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp
@@ -1,5 +1,5 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
index e3ef377..5bf22ce 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui
@@ -1032,7 +1032,7 @@ Finally you can set the maximum number of entries in the list.</string>
</connection>
</connections>
<includes>
- <include location="local" impldecl="in declaration">klocale.h</include>
+ <include location="local" impldecl="in declaration">tdelocale.h</include>
<include location="global" impldecl="in declaration">kseparator.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
index d70ae69..0b332ee 100644
--- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp
@@ -4,7 +4,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kurlrequester.h>
#include <tqtoolbutton.h>
diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
index 436dced..8d706b9 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp
@@ -32,7 +32,7 @@
**************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
index 7972b0b..815e025 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp
@@ -30,11 +30,11 @@
your version.
**************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <tqregexp.h>
diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
index 116d3c6..378b183 100644
--- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp
@@ -37,7 +37,7 @@
#include <tdefiledialog.h>
#include <tqpushbutton.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include "preferenceswidget.h"
diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
index eaa0a93..22598cb 100644
--- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp
@@ -38,7 +38,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KBabel;
diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
index 0d604c8..936a5a5 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp
@@ -32,7 +32,7 @@
**************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
index 3c20242..10e92ca 100644
--- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp
@@ -32,12 +32,12 @@
your version.
**************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kstaticdeleter.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <tdeio/netaccess.h>
diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
index 893a1f1..a33270d 100644
--- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp
@@ -38,7 +38,7 @@
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include "preferenceswidget.h"
diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
index 3e3a0d9..6a522d4 100644
--- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
+++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp
@@ -32,7 +32,7 @@
**************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
index eeeb53c..163f48e 100644
--- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
+++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp
@@ -40,7 +40,7 @@
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include "preferenceswidget.h"
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
index 46232e4..1a056c5 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp
@@ -32,12 +32,12 @@
your version.
**************************************************************************** */
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kstaticdeleter.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <tdeio/netaccess.h>
diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
index 1159618..17a9ec1 100644
--- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
+++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp
@@ -42,7 +42,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/netaccess.h>
using namespace KBabel;
diff --git a/kbugbuster/backend/bugcommand.cpp b/kbugbuster/backend/bugcommand.cpp
index 399eab5..30507e7 100644
--- a/kbugbuster/backend/bugcommand.cpp
+++ b/kbugbuster/backend/bugcommand.cpp
@@ -1,6 +1,6 @@
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "bugcommand.h"
diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp
index 0cc7fb7..75159d0 100644
--- a/kbugbuster/backend/bugdetails.cpp
+++ b/kbugbuster/backend/bugdetails.cpp
@@ -5,7 +5,7 @@
#include <tqstringlist.h>
#include <kdebug.h>
#include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqregexp.h>
BugDetails::BugDetails()
diff --git a/kbugbuster/backend/bugjob.cpp b/kbugbuster/backend/bugjob.cpp
index dbc21e5..3d3c776 100644
--- a/kbugbuster/backend/bugjob.cpp
+++ b/kbugbuster/backend/bugjob.cpp
@@ -6,7 +6,7 @@
#include <tdeio/job.h>
#include <string.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
BugJob::BugJob( BugServer *server )
diff --git a/kbugbuster/backend/bugsystem.cpp b/kbugbuster/backend/bugsystem.cpp
index 699a720..9d96243 100644
--- a/kbugbuster/backend/bugsystem.cpp
+++ b/kbugbuster/backend/bugsystem.cpp
@@ -8,8 +8,8 @@
#include <kstaticdeleter.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kemailsettings.h>
+#include <tdelocale.h>
+#include <tdeemailsettings.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
#include <tdeconfig.h>
diff --git a/kbugbuster/backend/kbbprefs.cpp b/kbugbuster/backend/kbbprefs.cpp
index 393f1ac..73a6be5 100644
--- a/kbugbuster/backend/kbbprefs.cpp
+++ b/kbugbuster/backend/kbbprefs.cpp
@@ -25,7 +25,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp
index 239b9da..8420cbf 100644
--- a/kbugbuster/backend/mailsender.cpp
+++ b/kbugbuster/backend/mailsender.cpp
@@ -7,10 +7,10 @@
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tdeapplication.h>
#include <dcopclient.h>
diff --git a/kbugbuster/backend/person.h b/kbugbuster/backend/person.h
index 7f6da63..9d4a84a 100644
--- a/kbugbuster/backend/person.h
+++ b/kbugbuster/backend/person.h
@@ -2,7 +2,7 @@
#define __person_h__
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
struct Person
{
diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp
index 438a03e..2b5f58e 100644
--- a/kbugbuster/backend/smtp.cpp
+++ b/kbugbuster/backend/smtp.cpp
@@ -13,8 +13,8 @@
#include <tqsocket.h>
#include <tqtimer.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
Smtp::Smtp( const TQString &from, const TQStringList &to,
const TQString &aMessage,
diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp
index a8b87fc..524bab7 100644
--- a/kbugbuster/gui/centralwidget.cpp
+++ b/kbugbuster/gui/centralwidget.cpp
@@ -41,7 +41,7 @@
#include "centralwidget.h"
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "loadallbugsdlg.h"
using namespace KBugBusterMainWindow;
diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp
index 1c6fa6c..d5902f4 100644
--- a/kbugbuster/gui/cwbugdetails.cpp
+++ b/kbugbuster/gui/cwbugdetails.cpp
@@ -27,7 +27,7 @@
#include <tdehtml_part.h>
#include <tdehtmlview.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <krun.h>
#include <tqlayout.h>
diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp
index 6ad503c..b045c96 100644
--- a/kbugbuster/gui/cwbugdetailscontainer.cpp
+++ b/kbugbuster/gui/cwbugdetailscontainer.cpp
@@ -20,7 +20,7 @@
#include <tqtooltip.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kactivelabel.h>
#include <kdialog.h>
diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp
index 199b01d..ce3ab2b 100644
--- a/kbugbuster/gui/cwbuglistcontainer.cpp
+++ b/kbugbuster/gui/cwbuglistcontainer.cpp
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#if KDE_IS_VERSION( 3, 2, 90 )
#include <tdelistviewsearchline.h>
diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp
index c60bb3e..038dac8 100644
--- a/kbugbuster/gui/cwloadingwidget.cpp
+++ b/kbugbuster/gui/cwloadingwidget.cpp
@@ -22,8 +22,8 @@
#include <kpixmapeffect.h>
#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
using namespace KBugBusterMainWindow;
diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp
index c51b7ea..8274ee9 100644
--- a/kbugbuster/gui/cwsearchwidget.cpp
+++ b/kbugbuster/gui/cwsearchwidget.cpp
@@ -15,7 +15,7 @@
*/
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tqlineedit.h>
#include <tqlayout.h>
diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp
index cfbde06..87cb809 100644
--- a/kbugbuster/gui/kbbmainwindow.cpp
+++ b/kbugbuster/gui/kbbmainwindow.cpp
@@ -33,9 +33,9 @@
#include <kinputdialog.h>
#include <klineedit.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <kstdguiitem.h>
diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp
index 29da4b1..e77c659 100644
--- a/kbugbuster/gui/messageeditor.cpp
+++ b/kbugbuster/gui/messageeditor.cpp
@@ -4,8 +4,8 @@
#include <tqlayout.h>
#include <tqlabel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include "kbbprefs.h"
diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp
index 4bd8437..5bea95b 100644
--- a/kbugbuster/gui/msginputdialog.cpp
+++ b/kbugbuster/gui/msginputdialog.cpp
@@ -4,7 +4,7 @@
#include <ktextedit.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqcombobox.h>
#include <tqsplitter.h>
diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp
index 5151be0..e14d8e7 100644
--- a/kbugbuster/gui/preferencesdialog.cpp
+++ b/kbugbuster/gui/preferencesdialog.cpp
@@ -10,7 +10,7 @@
#include <knuminput.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kbugbuster/gui/serverconfigdialog.cpp b/kbugbuster/gui/serverconfigdialog.cpp
index feaab83..090e479 100644
--- a/kbugbuster/gui/serverconfigdialog.cpp
+++ b/kbugbuster/gui/serverconfigdialog.cpp
@@ -4,7 +4,7 @@
#include <kpassdlg.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlineedit.h>
diff --git a/kbugbuster/main.cpp b/kbugbuster/main.cpp
index 0c1182b..219253f 100644
--- a/kbugbuster/main.cpp
+++ b/kbugbuster/main.cpp
@@ -21,7 +21,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include "gui/kbbmainwindow.h"
diff --git a/kbugbuster/tderesources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp
index 1eb04c9..0e59e55 100644
--- a/kbugbuster/tderesources/kcalresource.cpp
+++ b/kbugbuster/tderesources/kcalresource.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <vcaldrag.h>
@@ -42,7 +42,7 @@
#include <journal.h>
#include <filestorage.h>
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
#include <tderesources/configwidget.h>
diff --git a/kbugbuster/tderesources/kcalresource_plugin.cpp b/kbugbuster/tderesources/kcalresource_plugin.cpp
index 7cf8128..d9f33ec 100644
--- a/kbugbuster/tderesources/kcalresource_plugin.cpp
+++ b/kbugbuster/tderesources/kcalresource_plugin.cpp
@@ -22,8 +22,8 @@
#include "kcalresourceconfig.h"
#include "kcalresource.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KCal;
diff --git a/kbugbuster/tderesources/kcalresourceconfig.cpp b/kbugbuster/tderesources/kcalresourceconfig.cpp
index 5846664..d3f37a5 100644
--- a/kbugbuster/tderesources/kcalresourceconfig.cpp
+++ b/kbugbuster/tderesources/kcalresourceconfig.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kdialog.h>
diff --git a/kdeaccounts-plugin/CMakeLists.txt b/kdeaccounts-plugin/CMakeLists.txt
index 2a14486..04fc43e 100644
--- a/kdeaccounts-plugin/CMakeLists.txt
+++ b/kdeaccounts-plugin/CMakeLists.txt
@@ -22,13 +22,13 @@ link_directories(
##### other data ################################
install( FILES kdeaccountsplugin.desktop
- DESTINATION ${DATA_INSTALL_DIR}/kabc/formats )
+ DESTINATION ${DATA_INSTALL_DIR}/tdeabc/formats )
##### kabcformat_kdeaccounts (module) ###########
tde_add_kpart( kabcformat_kdeaccounts
SOURCES kdeaccountsformat.cpp
- LINK kabc-shared
+ LINK tdeabc-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kdeaccounts-plugin/Makefile.am b/kdeaccounts-plugin/Makefile.am
index 7be8cea..9c412ff 100644
--- a/kdeaccounts-plugin/Makefile.am
+++ b/kdeaccounts-plugin/Makefile.am
@@ -12,6 +12,6 @@ METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kabcformat_kdeaccounts.pot
-linkdir = $(kde_datadir)/kabc/formats
+linkdir = $(kde_datadir)/tdeabc/formats
link_DATA = kdeaccountsplugin.desktop
EXTRA_DIST = $(link_DATA) README
diff --git a/kdeaccounts-plugin/kdeaccountsformat.cpp b/kdeaccounts-plugin/kdeaccountsformat.cpp
index fc9f2cb..97a07d4 100644
--- a/kdeaccounts-plugin/kdeaccountsformat.cpp
+++ b/kdeaccounts-plugin/kdeaccountsformat.cpp
@@ -3,9 +3,9 @@
#include <tqcstring.h>
#include <tqfile.h>
-#include <kabc/addressbook.h>
-#include <kabc/addressee.h>
-#include <kabc/resourcefile.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/resourcefile.h>
extern "C"
{
diff --git a/kdeaccounts-plugin/kdeaccountsformat.h b/kdeaccounts-plugin/kdeaccountsformat.h
index db132fe..ea763c3 100644
--- a/kdeaccounts-plugin/kdeaccountsformat.h
+++ b/kdeaccounts-plugin/kdeaccountsformat.h
@@ -10,7 +10,7 @@
#ifndef KDEACCOUNTSPARSER_H
#define KDEACCOUNTSPARSER_H
-#include <kabc/formatplugin.h>
+#include <tdeabc/formatplugin.h>
namespace KABC {
class AddressBook;
diff --git a/kmtrace/demangle.cpp b/kmtrace/demangle.cpp
index 509ecee..52d7186 100644
--- a/kmtrace/demangle.cpp
+++ b/kmtrace/demangle.cpp
@@ -8,7 +8,7 @@
#include <tqtl.h>
#include <tqvaluelist.h>
#include <stdlib.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kinstance.h>
#include <kstandarddirs.h>
#include <tdecmdlineargs.h>
diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp
index 60e63b9..eaa9668 100644
--- a/kmtrace/kmtrace.cpp
+++ b/kmtrace/kmtrace.cpp
@@ -8,7 +8,7 @@
#include <tqtl.h>
#include <tqvaluelist.h>
#include <stdlib.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kinstance.h>
#include <kstandarddirs.h>
#include <tdecmdlineargs.h>
diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp
index cc6e330..ac04f29 100644
--- a/kmtrace/match.cpp
+++ b/kmtrace/match.cpp
@@ -8,7 +8,7 @@
#include <tqtl.h>
#include <tqvaluelist.h>
#include <stdlib.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kinstance.h>
#include <kstandarddirs.h>
#include <tdecmdlineargs.h>
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 6ec2a17..2236b0a 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -26,8 +26,8 @@
#include <kiconloader.h>
#include <kkeydialog.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include <ksqueezedtextlabel.h>
#include <kstatusbar.h>
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index d02644d..daa3a51 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -18,7 +18,7 @@
***************************************************************************/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kmimetype.h>
#include <tdelistview.h>
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 8443a37..7cc62ef 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -29,11 +29,11 @@
#include <kdebug.h>
#include <tdefiletreeview.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstdaction.h>
#include <kinstance.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeparts/genericfactory.h>
//#include <ktempdir.h>
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index 77158e9..31b946b 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -25,8 +25,8 @@
#include <tqtimer.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include "diffmodel.h"
#include "diffhunk.h"
diff --git a/kompare/komparepart/kompareprefdlg.cpp b/kompare/komparepart/kompareprefdlg.cpp
index f920d03..399f7e3 100644
--- a/kompare/komparepart/kompareprefdlg.cpp
+++ b/kompare/komparepart/kompareprefdlg.cpp
@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "diffpage.h"
#include "viewpage.h"
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 0f4e1a7..09e670b 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "diffmodel.h"
#include "difference.h"
diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp
index 5c541c7..363179e 100644
--- a/kompare/kompareurldialog.cpp
+++ b/kompare/kompareurldialog.cpp
@@ -20,7 +20,7 @@
#include <tqvbox.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include "diffpage.h"
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index b5f4f2d..5111346 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -30,7 +30,7 @@
#include <kdialog.h>
#include <keditlistbox.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktrader.h>
#include <kurlcombobox.h>
#include <kurlrequester.h>
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index 041cff4..b855a52 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -24,7 +24,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlcombobox.h>
#include <kurlrequester.h>
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index cf8ef75..b09f6b3 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -28,7 +28,7 @@
#include <kcolorbutton.h>
#include <kdialog.h>
#include <tdefontcombo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "viewpage.h"
#include "viewsettings.h"
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 902f409..02d158c 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -20,7 +20,7 @@
#include <tqfont.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "viewsettings.h"
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index 1b3822b..82c3625 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -21,7 +21,7 @@
#include <tqvaluelist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "difference.h"
#include "diffhunk.h"
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 8bb6cf8..2a701b2 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -30,9 +30,9 @@
#include <kdebug.h>
#include <kdirwatch.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "difference.h"
#include "diffhunk.h"
diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp
index f66b4e0..08913d7 100644
--- a/kompare/libdiff2/kompareprocess.cpp
+++ b/kompare/libdiff2/kompareprocess.cpp
@@ -25,7 +25,7 @@
#include <kcharsets.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "diffsettings.h"
#include "kompareprocess.h"
diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp
index 7e4ddbb..2a78e71 100644
--- a/kompare/libdiff2/levenshteintable.cpp
+++ b/kompare/libdiff2/levenshteintable.cpp
@@ -21,7 +21,7 @@
#include <tqstring.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "levenshteintable.h"
diff --git a/kompare/main.cpp b/kompare/main.cpp
index a866fd3..7c93e16 100644
--- a/kompare/main.cpp
+++ b/kompare/main.cpp
@@ -22,8 +22,8 @@
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <tdefile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kompare_part.h"
#include "kompare_shell.h"
diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp
index 5326aea..b5e3473 100644
--- a/kspy/classinfoview.cpp
+++ b/kspy/classinfoview.cpp
@@ -21,7 +21,7 @@
#include <tqstrlist.h>
#include <tqvariant.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "classinfoview.h"
diff --git a/kspy/main.cpp b/kspy/main.cpp
index 9a1515b..c31b678 100644
--- a/kspy/main.cpp
+++ b/kspy/main.cpp
@@ -17,7 +17,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "spy.h"
diff --git a/kspy/navview.cpp b/kspy/navview.cpp
index 871792e..43ba840 100644
--- a/kspy/navview.cpp
+++ b/kspy/navview.cpp
@@ -18,7 +18,7 @@
#include <tqobjectlist.h>
#include <tqobjectdict.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "navview.h"
#include "navviewitem.h"
diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp
index 1ac9475..2b625c6 100644
--- a/kspy/propsview.cpp
+++ b/kspy/propsview.cpp
@@ -22,7 +22,7 @@
#include <tqvariant.h>
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "propsview.h"
diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp
index 98132b5..bb5505e 100644
--- a/kspy/receiversview.cpp
+++ b/kspy/receiversview.cpp
@@ -22,7 +22,7 @@
#include <tqvariant.h>
#include <tqsignalslotimp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "receiversview.h"
diff --git a/kspy/sigslotview.cpp b/kspy/sigslotview.cpp
index a381a2f..c74df01 100644
--- a/kspy/sigslotview.cpp
+++ b/kspy/sigslotview.cpp
@@ -21,7 +21,7 @@
#include <tqstrlist.h>
#include <tqvariant.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "sigslotview.h"
diff --git a/kspy/spy.cpp b/kspy/spy.cpp
index 9d61989..24ebaf4 100644
--- a/kspy/spy.cpp
+++ b/kspy/spy.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
#include <tdelistviewsearchline.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp
index f54a45c..1c6a8aa 100644
--- a/kstartperf/kstartperf.cpp
+++ b/kstartperf/kstartperf.cpp
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp
index 196293d..430afaa 100644
--- a/kuiviewer/kuiviewer.cpp
+++ b/kuiviewer/kuiviewer.cpp
@@ -37,8 +37,8 @@
#include <kiconloader.h>
#include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
KUIViewer::KUIViewer()
diff --git a/kuiviewer/main.cpp b/kuiviewer/main.cpp
index d089527..bcd6803 100644
--- a/kuiviewer/main.cpp
+++ b/kuiviewer/main.cpp
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static TDECmdLineOptions options[] =
{
diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim
index 9ae1161..d59069e 100644
--- a/scripts/kde-devel-vim.vim
+++ b/scripts/kde-devel-vim.vim
@@ -244,7 +244,7 @@ function! MapIdentHeader( ident )
return '<tdeapplication.h>'
elseif a:ident == 'i18n' ||
\a:ident == 'I18N_NOOP'
- return '<klocale.h>'
+ return '<tdelocale.h>'
elseif a:ident == 'locate' ||
\a:ident == 'locateLocal'
return '<kstandarddirs.h>'
diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el
index 6bfdd85..b4d7c6c 100644
--- a/scripts/kde-emacs/klaralv.el
+++ b/scripts/kde-emacs/klaralv.el
@@ -174,7 +174,7 @@
; Useful fake entries
(qapplication.h tqApp)
(tdeapplication.h kapp)
- (klocale.h i18n I18N_NOOP)
+ (tdelocale.h i18n I18N_NOOP)
(kstandarddirs.h locate locateLocal)
(stdlib.h getenv)
(unistd.h unlink sleep usleep)
diff --git a/tdecachegrind/tdecachegrind/cachegrindloader.cpp b/tdecachegrind/tdecachegrind/cachegrindloader.cpp
index 4fe57d3..9434ee3 100644
--- a/tdecachegrind/tdecachegrind/cachegrindloader.cpp
+++ b/tdecachegrind/tdecachegrind/cachegrindloader.cpp
@@ -21,7 +21,7 @@
#include <tqfile.h>
#include <tqcstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "loader.h"
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index 32ee92b..9f1df42 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -36,9 +36,9 @@
#include <tqprocess.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
diff --git a/tdecachegrind/tdecachegrind/callitem.cpp b/tdecachegrind/tdecachegrind/callitem.cpp
index 6d984ca..77bbc88 100644
--- a/tdecachegrind/tdecachegrind/callitem.cpp
+++ b/tdecachegrind/tdecachegrind/callitem.cpp
@@ -21,7 +21,7 @@
*/
#include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kiconloader.h>
diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp
index 8f3d9bf..550eb8a 100644
--- a/tdecachegrind/tdecachegrind/callmapview.cpp
+++ b/tdecachegrind/tdecachegrind/callmapview.cpp
@@ -23,7 +23,7 @@
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
diff --git a/tdecachegrind/tdecachegrind/callview.cpp b/tdecachegrind/tdecachegrind/callview.cpp
index 317d137..f4be7ae 100644
--- a/tdecachegrind/tdecachegrind/callview.cpp
+++ b/tdecachegrind/tdecachegrind/callview.cpp
@@ -22,7 +22,7 @@
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configuration.h"
#include "callitem.h"
diff --git a/tdecachegrind/tdecachegrind/configdlg.cpp b/tdecachegrind/tdecachegrind/configdlg.cpp
index 0523d97..47a3c78 100644
--- a/tdecachegrind/tdecachegrind/configdlg.cpp
+++ b/tdecachegrind/tdecachegrind/configdlg.cpp
@@ -29,7 +29,7 @@
#include <kcolorbutton.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knumvalidator.h>
#include "configdlg.h"
diff --git a/tdecachegrind/tdecachegrind/configuration.cpp b/tdecachegrind/tdecachegrind/configuration.cpp
index 78736b6..d02e79e 100644
--- a/tdecachegrind/tdecachegrind/configuration.cpp
+++ b/tdecachegrind/tdecachegrind/configuration.cpp
@@ -21,7 +21,7 @@
*/
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "configuration.h"
diff --git a/tdecachegrind/tdecachegrind/costlistitem.cpp b/tdecachegrind/tdecachegrind/costlistitem.cpp
index d461d0d..8d9c92d 100644
--- a/tdecachegrind/tdecachegrind/costlistitem.cpp
+++ b/tdecachegrind/tdecachegrind/costlistitem.cpp
@@ -21,7 +21,7 @@
#include <tqpainter.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/tdecachegrind/tdecachegrind/costtypeitem.cpp b/tdecachegrind/tdecachegrind/costtypeitem.cpp
index dc35cb2..ef5921d 100644
--- a/tdecachegrind/tdecachegrind/costtypeitem.cpp
+++ b/tdecachegrind/tdecachegrind/costtypeitem.cpp
@@ -21,7 +21,7 @@
*/
#include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configuration.h"
#include "listutils.h"
diff --git a/tdecachegrind/tdecachegrind/costtypeview.cpp b/tdecachegrind/tdecachegrind/costtypeview.cpp
index 3f5417e..3f8780a 100644
--- a/tdecachegrind/tdecachegrind/costtypeview.cpp
+++ b/tdecachegrind/tdecachegrind/costtypeview.cpp
@@ -22,7 +22,7 @@
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configuration.h"
#include "costtypeitem.h"
diff --git a/tdecachegrind/tdecachegrind/coverageitem.cpp b/tdecachegrind/tdecachegrind/coverageitem.cpp
index 26e5b36..eadafc6 100644
--- a/tdecachegrind/tdecachegrind/coverageitem.cpp
+++ b/tdecachegrind/tdecachegrind/coverageitem.cpp
@@ -21,7 +21,7 @@
*/
#include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configuration.h"
#include "listutils.h"
diff --git a/tdecachegrind/tdecachegrind/coverageview.cpp b/tdecachegrind/tdecachegrind/coverageview.cpp
index 6657e92..b1ead5e 100644
--- a/tdecachegrind/tdecachegrind/coverageview.cpp
+++ b/tdecachegrind/tdecachegrind/coverageview.cpp
@@ -22,7 +22,7 @@
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configuration.h"
#include "coverageitem.h"
diff --git a/tdecachegrind/tdecachegrind/functionitem.cpp b/tdecachegrind/tdecachegrind/functionitem.cpp
index 17716e1..7ac2094 100644
--- a/tdecachegrind/tdecachegrind/functionitem.cpp
+++ b/tdecachegrind/tdecachegrind/functionitem.cpp
@@ -26,7 +26,7 @@
//#include <tqpainter.h>
//#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/tdecachegrind/tdecachegrind/functionselection.cpp b/tdecachegrind/tdecachegrind/functionselection.cpp
index da243fd..84bdeab 100644
--- a/tdecachegrind/tdecachegrind/functionselection.cpp
+++ b/tdecachegrind/tdecachegrind/functionselection.cpp
@@ -29,7 +29,7 @@
#include <tqregexp.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "traceitemview.h"
#include "stackbrowser.h"
diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp
index 3051b17..2b7258d 100644
--- a/tdecachegrind/tdecachegrind/instritem.cpp
+++ b/tdecachegrind/tdecachegrind/instritem.cpp
@@ -23,7 +23,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/tdecachegrind/tdecachegrind/instrview.cpp b/tdecachegrind/tdecachegrind/instrview.cpp
index 9413508..bfeaccd 100644
--- a/tdecachegrind/tdecachegrind/instrview.cpp
+++ b/tdecachegrind/tdecachegrind/instrview.cpp
@@ -24,7 +24,7 @@
#include <tqregexp.h>
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp
index 75ca0b5..95b02ea 100644
--- a/tdecachegrind/tdecachegrind/main.cpp
+++ b/tdecachegrind/tdecachegrind/main.cpp
@@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "toplevel.h"
#include "tracedata.h"
diff --git a/tdecachegrind/tdecachegrind/partgraph.cpp b/tdecachegrind/tdecachegrind/partgraph.cpp
index 9b5ecbc..284bc4a 100644
--- a/tdecachegrind/tdecachegrind/partgraph.cpp
+++ b/tdecachegrind/tdecachegrind/partgraph.cpp
@@ -20,7 +20,7 @@
* TracePart as Nested Area
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "partgraph.h"
#include "configuration.h"
diff --git a/tdecachegrind/tdecachegrind/partlistitem.cpp b/tdecachegrind/tdecachegrind/partlistitem.cpp
index 339189d..7e5f60b 100644
--- a/tdecachegrind/tdecachegrind/partlistitem.cpp
+++ b/tdecachegrind/tdecachegrind/partlistitem.cpp
@@ -21,7 +21,7 @@
#include <tqpainter.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/tdecachegrind/tdecachegrind/partselection.cpp b/tdecachegrind/tdecachegrind/partselection.cpp
index 1b6ff15..9c8140f 100644
--- a/tdecachegrind/tdecachegrind/partselection.cpp
+++ b/tdecachegrind/tdecachegrind/partselection.cpp
@@ -29,7 +29,7 @@
#include <tqpopupmenu.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/tdecachegrind/tdecachegrind/partview.cpp b/tdecachegrind/tdecachegrind/partview.cpp
index 3f344bb..e2dc707 100644
--- a/tdecachegrind/tdecachegrind/partview.cpp
+++ b/tdecachegrind/tdecachegrind/partview.cpp
@@ -23,7 +23,7 @@
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
#include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configuration.h"
#include "partlistitem.h"
diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp
index b8703e8..d6e1c1a 100644
--- a/tdecachegrind/tdecachegrind/sourceitem.cpp
+++ b/tdecachegrind/tdecachegrind/sourceitem.cpp
@@ -24,7 +24,7 @@
#include <tqregexp.h>
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/tdecachegrind/tdecachegrind/sourceview.cpp b/tdecachegrind/tdecachegrind/sourceview.cpp
index 52de520..22e8345 100644
--- a/tdecachegrind/tdecachegrind/sourceview.cpp
+++ b/tdecachegrind/tdecachegrind/sourceview.cpp
@@ -24,7 +24,7 @@
#include <tqfile.h>
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "configuration.h"
diff --git a/tdecachegrind/tdecachegrind/stackitem.cpp b/tdecachegrind/tdecachegrind/stackitem.cpp
index 412781d..69494f3 100644
--- a/tdecachegrind/tdecachegrind/stackitem.cpp
+++ b/tdecachegrind/tdecachegrind/stackitem.cpp
@@ -21,7 +21,7 @@
*/
#include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "configuration.h"
#include "listutils.h"
diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp
index 5a36011..f809e92 100644
--- a/tdecachegrind/tdecachegrind/tabview.cpp
+++ b/tdecachegrind/tdecachegrind/tabview.cpp
@@ -28,7 +28,7 @@
#include <tqwhatsthis.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include "tabview.h"
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index 75598f0..8bb8d45 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -36,7 +36,7 @@
#include <tqeventloop.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstatusbar.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
diff --git a/tdecachegrind/tdecachegrind/tracedata.cpp b/tdecachegrind/tdecachegrind/tracedata.cpp
index 70a8bd0..da0726b 100644
--- a/tdecachegrind/tdecachegrind/tracedata.cpp
+++ b/tdecachegrind/tdecachegrind/tracedata.cpp
@@ -24,7 +24,7 @@
#include <tqfileinfo.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "tracedata.h"
diff --git a/tdecachegrind/tdecachegrind/traceitemview.cpp b/tdecachegrind/tdecachegrind/traceitemview.cpp
index 82f4e11..672b095 100644
--- a/tdecachegrind/tdecachegrind/traceitemview.cpp
+++ b/tdecachegrind/tdecachegrind/traceitemview.cpp
@@ -22,7 +22,7 @@
#include <tqwidget.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "traceitemview.h"
diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp
index 46e661f..be85ce0 100644
--- a/tdecachegrind/tdecachegrind/treemap.cpp
+++ b/tdecachegrind/tdecachegrind/treemap.cpp
@@ -29,7 +29,7 @@
#include <tqstyle.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/tdefile-plugins/c++/tdefile_cpp.cpp b/tdefile-plugins/c++/tdefile_cpp.cpp
index 31f777d..9adf3f8 100644
--- a/tdefile-plugins/c++/tdefile_cpp.cpp
+++ b/tdefile-plugins/c++/tdefile_cpp.cpp
@@ -20,7 +20,7 @@
#include "tdefile_cpp.h"
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/tdefile-plugins/diff/tdefile_diff.cpp b/tdefile-plugins/diff/tdefile_diff.cpp
index 2edee0a..51807ee 100644
--- a/tdefile-plugins/diff/tdefile_diff.cpp
+++ b/tdefile-plugins/diff/tdefile_diff.cpp
@@ -36,7 +36,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <kurl.h>
diff --git a/tdeioslave/svn/ksvnd/ksvnd.cpp b/tdeioslave/svn/ksvnd/ksvnd.cpp
index e4c2454..82e51bb 100644
--- a/tdeioslave/svn/ksvnd/ksvnd.cpp
+++ b/tdeioslave/svn/ksvnd/ksvnd.cpp
@@ -19,9 +19,9 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqdir.h>
#include <tqfile.h>
diff --git a/tdeioslave/svn/svn.cpp b/tdeioslave/svn/svn.cpp
index be3e116..755541c 100644
--- a/tdeioslave/svn/svn.cpp
+++ b/tdeioslave/svn/svn.cpp
@@ -31,11 +31,11 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <ksock.h>
#include <dcopclient.h>
diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
index 6c93944..26098ad 100644
--- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
+++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp
@@ -18,19 +18,19 @@
*/
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <dcopclient.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqtimer.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
#include <tdeio/netaccess.h>
#include <tqpixmap.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "tdeio_svn_helper.h"
#include "subversioncheckout.h"
@@ -39,7 +39,7 @@
#include <kurlrequester.h>
#include <tqspinbox.h>
#include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqtextstream.h>
#include <tqtextedit.h>
#include <kstandarddirs.h>
diff --git a/tdeunittest/example/simple/maingui.cpp b/tdeunittest/example/simple/maingui.cpp
index 183d749..985276c 100644
--- a/tdeunittest/example/simple/maingui.cpp
+++ b/tdeunittest/example/simple/maingui.cpp
@@ -26,7 +26,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "tdeunittest/runnergui.h"
diff --git a/tdeunittest/guimodrunner.cpp b/tdeunittest/guimodrunner.cpp
index 0a9377e..d719069 100644
--- a/tdeunittest/guimodrunner.cpp
+++ b/tdeunittest/guimodrunner.cpp
@@ -25,11 +25,11 @@
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "runnergui.h"
diff --git a/tdeunittest/runnergui.cpp b/tdeunittest/runnergui.cpp
index 8e31dac..2e9ca35 100644
--- a/tdeunittest/runnergui.cpp
+++ b/tdeunittest/runnergui.cpp
@@ -35,7 +35,7 @@
#include <dcopobject.h>
#include <kiconloader.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeunittest/tester.h>
diff --git a/umbrello/umbrello/activitywidget.cpp b/umbrello/umbrello/activitywidget.cpp
index 3f9355f..0792325 100644
--- a/umbrello/umbrello/activitywidget.cpp
+++ b/umbrello/umbrello/activitywidget.cpp
@@ -16,7 +16,7 @@
#include <tqpainter.h>
// kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index 21748d4..a0e3db8 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -20,8 +20,8 @@
#include <tqmainwindow.h>
// kde includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
// app includes
diff --git a/umbrello/umbrello/artifact.cpp b/umbrello/umbrello/artifact.cpp
index 8576ca8..b5d1361 100644
--- a/umbrello/umbrello/artifact.cpp
+++ b/umbrello/umbrello/artifact.cpp
@@ -13,7 +13,7 @@
#include "association.h"
#include "clipboard/idchangelog.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
UMLArtifact::UMLArtifact(const TQString & name, Uml::IDType id)
: UMLCanvasObject(name, id) {
diff --git a/umbrello/umbrello/association.cpp b/umbrello/umbrello/association.cpp
index 62f47a4..38001b9 100644
--- a/umbrello/umbrello/association.cpp
+++ b/umbrello/umbrello/association.cpp
@@ -13,7 +13,7 @@
#include "association.h"
// qt/kde includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
// app includes
#include "classifier.h"
diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp
index 187368c..9c5f7ba 100644
--- a/umbrello/umbrello/associationwidget.cpp
+++ b/umbrello/umbrello/associationwidget.cpp
@@ -18,7 +18,7 @@
#include <tqcanvas.h>
#include <tqvalidator.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <kcolordialog.h>
#include <tdeapplication.h>
diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp
index 4b8e0bc..7aa9480 100644
--- a/umbrello/umbrello/classifier.cpp
+++ b/umbrello/umbrello/classifier.cpp
@@ -12,8 +12,8 @@
#include "classifier.h"
// qt/kde includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// app includes
#include "association.h"
#include "umlassociationlist.h"
diff --git a/umbrello/umbrello/classifierlistitem.cpp b/umbrello/umbrello/classifierlistitem.cpp
index 60e5b7b..4fa2d92 100644
--- a/umbrello/umbrello/classifierlistitem.cpp
+++ b/umbrello/umbrello/classifierlistitem.cpp
@@ -14,7 +14,7 @@
// qt/kde includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "classifier.h"
diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp
index 069ba84..9e30951 100644
--- a/umbrello/umbrello/clipboard/umlclipboard.cpp
+++ b/umbrello/umbrello/clipboard/umlclipboard.cpp
@@ -14,8 +14,8 @@
// qt/kde includes
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
// local includes
#include "umldrag.h"
diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp
index 41ca5d1..ea9bea4 100644
--- a/umbrello/umbrello/codegenerator.cpp
+++ b/umbrello/umbrello/codegenerator.cpp
@@ -28,8 +28,8 @@
// kde includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdialogbase.h>
#include <tdeapplication.h>
diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp
index ec2bf59..61ae797 100644
--- a/umbrello/umbrello/codegenerators/adawriter.cpp
+++ b/umbrello/umbrello/codegenerators/adawriter.cpp
@@ -16,8 +16,8 @@
#include "adawriter.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqregexp.h>
#include <tqtextstream.h>
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
index 609b7eb..136f57b 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp
@@ -23,9 +23,9 @@
#include <tqlistview.h>
#include <tdefiledialog.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name )
diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
index 60d37ba..f576e82 100644
--- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp
@@ -18,7 +18,7 @@
#include "cppcodegenerationpolicypage.h"
// qt/kde includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <kcombobox.h>
#include <tqcheckbox.h>
diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp
index efb49dc..89d54c6 100644
--- a/umbrello/umbrello/codegenerators/idlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/idlwriter.cpp
@@ -12,7 +12,7 @@
#include "idlwriter.h"
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqregexp.h>
#include <tqtextstream.h>
diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
index c7bfbf0..391a34a 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp
@@ -21,7 +21,7 @@
#include <tqcombobox.h>
#include <tqcheckbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app includes
#include "javacodegenerationformbase.h"
#include "../uml.h"
diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
index 8e20469..3a64b7b 100644
--- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp
@@ -21,8 +21,8 @@
#include <tqregexp.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// local includes
#include "javacodecomment.h"
diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp
index 0f3c32e..a57e272 100644
--- a/umbrello/umbrello/codegenerators/pascalwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp
@@ -12,8 +12,8 @@
#include "pascalwriter.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqregexp.h>
#include <tqtextstream.h>
diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp
index f243ab2..5ef17a4 100644
--- a/umbrello/umbrello/codegenerators/pythonwriter.cpp
+++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp
@@ -19,8 +19,8 @@
#include "pythonwriter.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqregexp.h>
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
index 5c890b4..ed8afbf 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp
@@ -24,7 +24,7 @@
#include <tqcombobox.h>
#include <tqcheckbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app includes
#include "rubycodegenerationformbase.h"
#include "../codegenerationpolicy.h"
diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
index 6305537..05fe648 100644
--- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp
@@ -24,8 +24,8 @@
#include <tqregexp.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// local includes
#include "rubycodecomment.h"
diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp
index e736641..9eedaba 100644
--- a/umbrello/umbrello/codegenerators/rubywriter.cpp
+++ b/umbrello/umbrello/codegenerators/rubywriter.cpp
@@ -19,8 +19,8 @@
#include "rubywriter.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqregexp.h>
diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
index 8463bab..f403c16 100644
--- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
+++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp
@@ -23,9 +23,9 @@
#include <tqregexp.h>
#include <tqdir.h>
// kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdialog.h>
#include <tdeapplication.h>
// app includes
diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp
index 8582ec9..ae2abda 100644
--- a/umbrello/umbrello/codegenerators/sqlwriter.cpp
+++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp
@@ -18,8 +18,8 @@
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqregexp.h>
diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
index 8c043a3..90201a9 100644
--- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
+++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp
@@ -16,8 +16,8 @@
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqregexp.h>
diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp
index e32758d..2b20bed 100644
--- a/umbrello/umbrello/codeimport/classimport.cpp
+++ b/umbrello/umbrello/codeimport/classimport.cpp
@@ -13,7 +13,7 @@
#include "classimport.h"
// qt/kde includes
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app includes
#include "../umldoc.h"
#include "../uml.h"
diff --git a/umbrello/umbrello/codeimport/cppimport.cpp b/umbrello/umbrello/codeimport/cppimport.cpp
index f97a535..06f68b3 100644
--- a/umbrello/umbrello/codeimport/cppimport.cpp
+++ b/umbrello/umbrello/codeimport/cppimport.cpp
@@ -14,7 +14,7 @@
// qt/kde includes
#include <tqmap.h>
#include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
// app includes
#include "import_utils.h"
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp
index 6b87f49..1ac2d74 100644
--- a/umbrello/umbrello/codeimport/import_utils.cpp
+++ b/umbrello/umbrello/codeimport/import_utils.cpp
@@ -14,9 +14,9 @@
// qt/kde includes
#include <tqmap.h>
#include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app includes
#include "../uml.h"
#include "../umldoc.h"
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
index d610520..d892eaf 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp
@@ -15,7 +15,7 @@
#include <tqstringlist.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
index e3cb19e..133b311 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp
@@ -18,7 +18,7 @@
*/
#include "errors.h"
-#include <klocale.h>
+#include <tdelocale.h>
QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") );
QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") );
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
index b67378e..e313052 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp
@@ -22,7 +22,7 @@
#include "keywords.lut.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
#include <tqmap.h>
diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
index d765a60..653376a 100644
--- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
+++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
@@ -29,7 +29,7 @@
#include <tqasciidict.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace std;
diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp
index b2f7dac..94cd6df 100644
--- a/umbrello/umbrello/codeimport/nativeimportbase.cpp
+++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp
@@ -16,7 +16,7 @@
#include <tqfile.h>
#include <tqtextstream.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// app includes
#include "import_utils.h"
diff --git a/umbrello/umbrello/component.cpp b/umbrello/umbrello/component.cpp
index eb69ccd..43384e6 100644
--- a/umbrello/umbrello/component.cpp
+++ b/umbrello/umbrello/component.cpp
@@ -13,7 +13,7 @@
#include "component.h"
// qt/kde includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app includes
#include "association.h"
#include "object_factory.h"
diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp
index c128e02..ba9e4bf 100644
--- a/umbrello/umbrello/dialogs/activitydialog.cpp
+++ b/umbrello/umbrello/dialogs/activitydialog.cpp
@@ -17,7 +17,7 @@
//kde includes
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
//local includes
#include "../umlview.h"
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 7eac7f6..71cef4e 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -15,7 +15,7 @@
#include "../uml.h"
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kbuttonbox.h>
#include <kdebug.h>
#include <tqlayout.h>
diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index 5a84a3e..7d0b14c 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -17,8 +17,8 @@
#include <kcombobox.h>
// kde includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
// local includes
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index feb193e..63617a7 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -11,7 +11,7 @@
#include "assocpage.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "assocpropdlg.h"
AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) {
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index 331e3e4..9451179 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -16,8 +16,8 @@
#include <tqlayout.h>
#include <tqlabel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index adb7dcc..4cf11a7 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -16,8 +16,8 @@
#include <tqlayout.h>
// kde includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
// local includes
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index 0e923cd..145148a 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -23,9 +23,9 @@
#include <tqcheckbox.h>
// kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcombobox.h>
// my class includes
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index e991d1e..4d44b44 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
using namespace Uml;
diff --git a/umbrello/umbrello/dialogs/classoptionspage.cpp b/umbrello/umbrello/dialogs/classoptionspage.cpp
index 670d86f..3d6fd66 100644
--- a/umbrello/umbrello/dialogs/classoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/classoptionspage.cpp
@@ -14,7 +14,7 @@
// qt/kde includes
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// local includes
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index ccd09bb..0a95bfc 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -15,7 +15,7 @@
// qt/kde includes
#include <tqlayout.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// app includes
diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp
index c49e418..8b38c47 100644
--- a/umbrello/umbrello/dialogs/classwizard.cpp
+++ b/umbrello/umbrello/dialogs/classwizard.cpp
@@ -14,7 +14,7 @@
// system includes
#include <khelpmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "classifierlistpage.h"
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index 33fb743..2bae53d 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -30,7 +30,7 @@
#include <tqlayout.h>
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "../attribute.h"
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
index d8e9485..d0cb73f 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp
@@ -30,7 +30,7 @@
//kde include
#include <knuminput.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
//qt include
#include <tqlineedit.h>
diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
index 0e488e7..968e8ae 100644
--- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp
@@ -20,7 +20,7 @@
// qt/kde includes
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "../codegenerationpolicy.h"
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index b64e30d..1113086 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -26,8 +26,8 @@
#include <tqfileinfo.h>
#include <tqapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// local includes
#include "codegenerationoptionspage.h"
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index 0478475..37f8f53 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -23,7 +23,7 @@
#include <tqtabwidget.h>
#include <tqcheckbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "../codedocument.h"
diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
index 3da163b..a572531 100644
--- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
+++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp
@@ -23,7 +23,7 @@
// qt/kde includes
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
/** This is the page which comes up IF there is no special options for the
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index 8374def..c6e34b1 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -20,7 +20,7 @@
#include <tqcombobox.h>
#include <tqbuttongroup.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "../uml.h"
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index 12836f0..4f3bc56 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -19,7 +19,7 @@
// kde include files
#include <tdefilefiltercombo.h>
-#include <klocale.h>
+#include <tdelocale.h>
// application specific includes
#include "../umlviewimageexportermodel.h"
diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp
index effb585..2472f52 100644
--- a/umbrello/umbrello/dialogs/notedialog.cpp
+++ b/umbrello/umbrello/dialogs/notedialog.cpp
@@ -18,8 +18,8 @@
#include <tqtextedit.h>
#include <tqlayout.h>
#include <tqlabel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) {
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index c9cb8b9..687993d 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -16,7 +16,7 @@
#include <tqcheckbox.h>
#include <tqlayout.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index 0514093..2809b6b 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -17,7 +17,7 @@
#include <tqtooltip.h>
// kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// local includes
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index dce7c98..84bb95b 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -11,7 +11,7 @@
#include "pkgcontentspage.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "../umlobjectlist.h"
#include "../uml.h"
#include "../umldoc.h"
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index 63673e0..03aaed5 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -16,7 +16,7 @@
#include <tqlayout.h>
// kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// local includes
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index 234f67b..1bcb476 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -19,7 +19,7 @@
// kde includes
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
// app includes
#include "codegenerationoptionspage.h"
diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp
index da3c28d..5ac44dc 100644
--- a/umbrello/umbrello/dialogs/statedialog.cpp
+++ b/umbrello/umbrello/dialogs/statedialog.cpp
@@ -21,7 +21,7 @@
//kde includes
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
//local includes
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index c45241e..9adb17a 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -24,8 +24,8 @@
// kde includes
#include <kcombobox.h>
#include <kcompletion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
// app includes
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index b053145..39ba3c6 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -24,8 +24,8 @@
// kde includes
#include <kcombobox.h>
#include <kcompletion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kdebug.h>
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index e811376..4ac471a 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -26,8 +26,8 @@
//kde includes
#include <kcombobox.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kbuttonbox.h>
#include <karrowbutton.h>
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index 255f401..19fb27b 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -15,7 +15,7 @@
// qt/kde includes
#include <tqlayout.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app includes
#include "../umlrole.h"
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp
index fe2e2f5..cfad502 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.cpp
+++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp
@@ -16,8 +16,8 @@
#include <tqradiobutton.h>
#include <tqtextedit.h>
#include <tqlineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index 57b5824..53bf61a 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -21,8 +21,8 @@
// kde includes
#include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
// app includes
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp
index 9158609..f5b5f1e 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.cpp
+++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp
@@ -22,8 +22,8 @@
#include <tqtextedit.h>
#include <tqspinbox.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdefontdialog.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
index 824d708..7c1df12 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
@@ -13,7 +13,7 @@
#include "../optionstate.h"
#include "../umlview.h"
#include "../umlwidget.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index 41c43e6..bc7107f 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -26,9 +26,9 @@
#include <libxslt/xsltutils.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <tdeio/job.h>
#include <kstandarddirs.h>
#include <tqfile.h>
diff --git a/umbrello/umbrello/docgenerators/main.cpp b/umbrello/umbrello/docgenerators/main.cpp
index b6d70ef..62c47b6 100644
--- a/umbrello/umbrello/docgenerators/main.cpp
+++ b/umbrello/umbrello/docgenerators/main.cpp
@@ -28,7 +28,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktip.h>
#include <kdebug.h>
#include <twin.h>
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
index 1a9bab5..c57dad9 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
@@ -26,9 +26,9 @@
#include <libxslt/xsltutils.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <tdeio/job.h>
#include <kstandarddirs.h>
#include <tqfile.h>
diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp
index ab935d0..f4f3dd1 100644
--- a/umbrello/umbrello/docwindow.cpp
+++ b/umbrello/umbrello/docwindow.cpp
@@ -16,7 +16,7 @@
#include <tqgroupbox.h>
#include <tqlayout.h>
#include <tqmultilineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "associationwidget.h"
diff --git a/umbrello/umbrello/entity.cpp b/umbrello/umbrello/entity.cpp
index 31ef151..2df5328 100644
--- a/umbrello/umbrello/entity.cpp
+++ b/umbrello/umbrello/entity.cpp
@@ -13,8 +13,8 @@
#include "entity.h"
// qt/kde includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// app includes
#include "entityattribute.h"
#include "umldoc.h"
diff --git a/umbrello/umbrello/enum.cpp b/umbrello/umbrello/enum.cpp
index 93ee1bd..90682d5 100644
--- a/umbrello/umbrello/enum.cpp
+++ b/umbrello/umbrello/enum.cpp
@@ -13,8 +13,8 @@
#include "enum.h"
// qt/kde includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// app includes
#include "enumliteral.h"
#include "umldoc.h"
diff --git a/umbrello/umbrello/enumliteral.cpp b/umbrello/umbrello/enumliteral.cpp
index 8158e40..95060e7 100644
--- a/umbrello/umbrello/enumliteral.cpp
+++ b/umbrello/umbrello/enumliteral.cpp
@@ -13,7 +13,7 @@
#include <kinputdialog.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent,
const TQString& name, Uml::IDType id)
diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp
index f9e25f3..10ebba4 100644
--- a/umbrello/umbrello/floatingtextwidget.cpp
+++ b/umbrello/umbrello/floatingtextwidget.cpp
@@ -17,7 +17,7 @@
#include <tqpainter.h>
#include <tqevent.h>
#include <tqvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp
index 1c608d8..9b05aef 100644
--- a/umbrello/umbrello/folder.cpp
+++ b/umbrello/umbrello/folder.cpp
@@ -14,8 +14,8 @@
// qt/kde includes
#include <tqfile.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// app includes
#include "uml.h"
#include "umldoc.h"
diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp
index ff26e65..fb9d5a7 100644
--- a/umbrello/umbrello/import_rose.cpp
+++ b/umbrello/umbrello/import_rose.cpp
@@ -19,7 +19,7 @@
#include <tqstringlist.h>
#include <tqregexp.h>
#include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdebug.h>
// app includes
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 6e8f3d9..6279964 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -15,7 +15,7 @@
// qt/kde includes
#include <kstandarddirs.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// app includes
diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp
index ffbf3e9..24f12f0 100644
--- a/umbrello/umbrello/main.cpp
+++ b/umbrello/umbrello/main.cpp
@@ -16,7 +16,7 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktip.h>
#include <kdebug.h>
#include <twin.h>
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp
index 1c7a1ad..94abf51 100644
--- a/umbrello/umbrello/model_utils.cpp
+++ b/umbrello/umbrello/model_utils.cpp
@@ -15,7 +15,7 @@
// qt/kde includes
#include <tqregexp.h>
#include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/umbrello/umbrello/node.cpp b/umbrello/umbrello/node.cpp
index f035f32..08d5bc7 100644
--- a/umbrello/umbrello/node.cpp
+++ b/umbrello/umbrello/node.cpp
@@ -11,7 +11,7 @@
#include "node.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
UMLNode::UMLNode(const TQString & name, Uml::IDType id)
: UMLCanvasObject(name, id) {
diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp
index 925909f..5fc80b1 100644
--- a/umbrello/umbrello/object_factory.cpp
+++ b/umbrello/umbrello/object_factory.cpp
@@ -16,8 +16,8 @@
#include <tqregexp.h>
#include <tqstringlist.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/umbrello/umbrello/objectwidget.cpp b/umbrello/umbrello/objectwidget.cpp
index 504c865..4a9c4ca 100644
--- a/umbrello/umbrello/objectwidget.cpp
+++ b/umbrello/umbrello/objectwidget.cpp
@@ -16,7 +16,7 @@
#include <tqpainter.h>
#include <tqvalidator.h>
#include <tqevent.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp
index dce9b41..18b1b3b 100644
--- a/umbrello/umbrello/operation.cpp
+++ b/umbrello/umbrello/operation.cpp
@@ -15,7 +15,7 @@
// qt/kde includes
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app includes
#include "attribute.h"
diff --git a/umbrello/umbrello/package.cpp b/umbrello/umbrello/package.cpp
index 04e8c14..6321fdb 100644
--- a/umbrello/umbrello/package.cpp
+++ b/umbrello/umbrello/package.cpp
@@ -14,7 +14,7 @@
// system includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "uml.h"
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 3c9f304..bd55cf5 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -28,8 +28,8 @@
#include <typeinfo>
#include <kstandarddirs.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
using std::type_info;
diff --git a/umbrello/umbrello/statewidget.cpp b/umbrello/umbrello/statewidget.cpp
index 942ae0a..ee12f27 100644
--- a/umbrello/umbrello/statewidget.cpp
+++ b/umbrello/umbrello/statewidget.cpp
@@ -16,7 +16,7 @@
#include <tqevent.h>
// kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/umbrello/umbrello/stereotype.cpp b/umbrello/umbrello/stereotype.cpp
index c3b912f..688dbd3 100644
--- a/umbrello/umbrello/stereotype.cpp
+++ b/umbrello/umbrello/stereotype.cpp
@@ -13,7 +13,7 @@
#include "stereotype.h"
// qt/kde includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kinputdialog.h>
diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp
index 005e5de..3601791 100644
--- a/umbrello/umbrello/toolbarstateassociation.cpp
+++ b/umbrello/umbrello/toolbarstateassociation.cpp
@@ -14,8 +14,8 @@
// kde includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// app includes
#include "assocrules.h"
diff --git a/umbrello/umbrello/toolbarstateother.cpp b/umbrello/umbrello/toolbarstateother.cpp
index f6161db..718ac45 100644
--- a/umbrello/umbrello/toolbarstateother.cpp
+++ b/umbrello/umbrello/toolbarstateother.cpp
@@ -14,7 +14,7 @@
// kde includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
// app includes
diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp
index 778b6d3..a472cbf 100644
--- a/umbrello/umbrello/uml.cpp
+++ b/umbrello/umbrello/uml.cpp
@@ -29,10 +29,10 @@
#include <kdebug.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprinter.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <ktip.h>
diff --git a/umbrello/umbrello/umlattributelist.cpp b/umbrello/umbrello/umlattributelist.cpp
index f335b7e..f3ef56b 100644
--- a/umbrello/umbrello/umlattributelist.cpp
+++ b/umbrello/umbrello/umlattributelist.cpp
@@ -12,7 +12,7 @@
#include "umlattributelist.h"
#include "attribute.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
void UMLAttributeList::copyInto(UMLAttributeList *rhs) const {
// Don't copy yourself.
diff --git a/umbrello/umbrello/umlcanvasobject.cpp b/umbrello/umbrello/umlcanvasobject.cpp
index 800336e..db5fdf2 100644
--- a/umbrello/umbrello/umlcanvasobject.cpp
+++ b/umbrello/umbrello/umlcanvasobject.cpp
@@ -14,7 +14,7 @@
// qt/kde includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "uml.h"
diff --git a/umbrello/umbrello/umlclassifierlistitemlist.cpp b/umbrello/umbrello/umlclassifierlistitemlist.cpp
index 1672c0c..c54eed1 100644
--- a/umbrello/umbrello/umlclassifierlistitemlist.cpp
+++ b/umbrello/umbrello/umlclassifierlistitemlist.cpp
@@ -12,7 +12,7 @@
#include "umlclassifierlistitemlist.h"
#include "classifierlistitem.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
void UMLClassifierListItemList::copyInto(UMLClassifierListItemList *rhs) const {
// Prevent copying to yourself. (Can cause serious injuries)
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 2ed3aae..ad0a7d1 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -27,13 +27,13 @@
#include <kdebug.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <kprinter.h>
#include <ktar.h>
#include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kiconloader.h>
#include <kinputdialog.h>
#include <ktabwidget.h>
diff --git a/umbrello/umbrello/umlentityattributelist.cpp b/umbrello/umbrello/umlentityattributelist.cpp
index 5855859..c941ad1 100644
--- a/umbrello/umbrello/umlentityattributelist.cpp
+++ b/umbrello/umbrello/umlentityattributelist.cpp
@@ -12,7 +12,7 @@
#include "umlentityattributelist.h"
#include "entityattribute.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
void UMLEntityAttributeList::copyInto(UMLEntityAttributeList* rhs) const {
// Don't copy yourself.
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index b7a8179..8e0279f 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -23,8 +23,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kinputdialog.h>
diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp
index 8e45129..f5408e1 100644
--- a/umbrello/umbrello/umllistviewitem.cpp
+++ b/umbrello/umbrello/umllistviewitem.cpp
@@ -19,8 +19,8 @@
#include <tqfile.h>
#include <tqregexp.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
// app includes
diff --git a/umbrello/umbrello/umlobjectlist.cpp b/umbrello/umbrello/umlobjectlist.cpp
index f2850eb..f238c3c 100644
--- a/umbrello/umbrello/umlobjectlist.cpp
+++ b/umbrello/umbrello/umlobjectlist.cpp
@@ -12,7 +12,7 @@
#include "umlobjectlist.h"
#include "umlobject.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
void UMLObjectList::copyInto(UMLObjectList *rhs) const {
// Don't copy yourself.
diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp
index 2cdeefa..effbcf0 100644
--- a/umbrello/umbrello/umlview.cpp
+++ b/umbrello/umbrello/umlview.cpp
@@ -34,14 +34,14 @@
#include <tqregexp.h>
//kde include files
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprinter.h>
#include <kcursor.h>
#include <tdefiledialog.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
// application specific includes
diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp
index 9411fae..3349212 100644
--- a/umbrello/umbrello/umlviewimageexporter.cpp
+++ b/umbrello/umbrello/umlviewimageexporter.cpp
@@ -17,10 +17,10 @@
#include <tqstringlist.h>
//kde include files
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
// application specific includes
diff --git a/umbrello/umbrello/umlviewimageexporterall.cpp b/umbrello/umbrello/umlviewimageexporterall.cpp
index cb256ca..aeb5330 100644
--- a/umbrello/umbrello/umlviewimageexporterall.cpp
+++ b/umbrello/umbrello/umlviewimageexporterall.cpp
@@ -18,11 +18,11 @@
#include <tqcheckbox.h>
// kde include files
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <kurlrequester.h>
#include <tdefilefiltercombo.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// application specific includes
#include "dialogs/exportallviewsdialog.h"
diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp
index 379e5f7..2c45bb0 100644
--- a/umbrello/umbrello/umlviewimageexportermodel.cpp
+++ b/umbrello/umbrello/umlviewimageexportermodel.cpp
@@ -27,8 +27,8 @@
// kde include files
#include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp
index a51a5ae..6d69fb1 100644
--- a/umbrello/umbrello/umlwidget.cpp
+++ b/umbrello/umbrello/umlwidget.cpp
@@ -17,7 +17,7 @@
#include <kdebug.h>
#include <kcolordialog.h>
#include <tdefontdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// local includes
#include "umlwidgetcontroller.h"
#include "umlobject.h"
diff --git a/umbrello/umbrello/umlwidgetcontroller.cpp b/umbrello/umbrello/umlwidgetcontroller.cpp
index c7b9ce9..efd0e4a 100644
--- a/umbrello/umbrello/umlwidgetcontroller.cpp
+++ b/umbrello/umbrello/umlwidgetcontroller.cpp
@@ -19,7 +19,7 @@
// kde includes
#include <kcursor.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app includes
#include "umlwidget.h"
diff --git a/umbrello/umbrello/wortdetoolbar.cpp b/umbrello/umbrello/wortdetoolbar.cpp
index 03fe2b1..c3aa3be 100644
--- a/umbrello/umbrello/wortdetoolbar.cpp
+++ b/umbrello/umbrello/wortdetoolbar.cpp
@@ -15,7 +15,7 @@
// qt/kde include files
#include <tqmainwindow.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdetoolbarbutton.h>