Rename additional header files to avoid conflicts with KDE4

53 files changed, 71 insertions, 71 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
index 26834bea..5ca5de2f 100644
--- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp
@@ -26,8 +26,8 @@
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "blockoptions.h"
 #include "prefs.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
index 6cdcbb54..dc18ac4e 100644
--- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp
@@ -23,11 +23,11 @@
 #include <tqlistview.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <krestrictedline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
index 5def838a..197208d5 100644
--- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp
@@ -31,12 +31,12 @@
 #include <tqfileinfo.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <dcopclient.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "languageoptions.h"
 #include "kvoctraincore.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
index ca79f2d5..31a5f768 100644
--- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp
@@ -29,7 +29,7 @@
 #include <tqstringlist.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "pasteoptions.h"
 #include "prefs.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
index a782fd00..f898f754 100644
--- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp
@@ -20,9 +20,9 @@
 #include <tqpushbutton.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "profilesdialog.h"
 #include "groupoptions.h"
diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
index b54d60f6..271bde65 100644
--- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
+++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp
@@ -29,7 +29,7 @@
 #include <tqcombobox.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "thresholdoptions.h"
 #include "QueryManager.h"
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
index e928c578..9fcb088d 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
index 0900145d..48692758 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp
@@ -33,7 +33,7 @@
 #include <tqtabwidget.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <kvoctraindoc.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
index a9d255e6..646358f1 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp
@@ -28,7 +28,7 @@
 
 #include "LangPropPage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
index c499bf55..7d90f04b 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqcombobox.h>
 #include <tqpushbutton.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
index 1bd2bb8d..2e6e893c 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp
@@ -29,8 +29,8 @@
 
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <QueryManager.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
index 6ef9175c..f7a30bf3 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp
@@ -27,7 +27,7 @@
 
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqmultilineedit.h>
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
index ec15df05..9b126b17 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqpushbutton.h>
 
diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
index fb2a5709..7e6dad66 100644
--- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
+++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
index 9b983386..e4ce0679 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp
@@ -35,7 +35,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialogbase.h>
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
index 4fa57bad..5fbcc71f 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp
@@ -34,7 +34,7 @@
 #include <twinmodule.h>
 
 #include <langset.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 EntryDlg::EntryDlg(
   TDEMainWindow   *main,
diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
index 5f751d17..a4bb55f1 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp
@@ -32,7 +32,7 @@
 #include <tqpushbutton.h>
 #include <tqgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <QueryManager.h>
 #include <langset.h>
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index 4f086cb2..a7661be0 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -32,7 +32,7 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define KV_MAX_HORIZ  20
 #define KV_FONTSIZE   14
diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h
index 6f704913..727a970e 100644
--- a/kvoctrain/kvoctrain/kv_resource.h
+++ b/kvoctrain/kvoctrain/kv_resource.h
@@ -32,7 +32,7 @@
 #include <config.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 ///////////////////////////////////////////////////////////////////
 // kv_resource.h  -- contains macros used for commands
diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp
index d441cc2e..881fbed1 100644
--- a/kvoctrain/kvoctrain/kva_clip.cpp
+++ b/kvoctrain/kvoctrain/kva_clip.cpp
@@ -29,7 +29,7 @@
 #include <tqclipboard.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "prefs.h"
 #include <algorithm>
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index 04988b9b..e7e716a8 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -34,7 +34,7 @@
 
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp
index f016aa73..e8a40734 100644
--- a/kvoctrain/kvoctrain/kva_init.cpp
+++ b/kvoctrain/kvoctrain/kva_init.cpp
@@ -36,7 +36,7 @@
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "prefs.h"
 
diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp
index b3c2fddf..2d11c055 100644
--- a/kvoctrain/kvoctrain/kva_io.cpp
+++ b/kvoctrain/kvoctrain/kva_io.cpp
@@ -32,7 +32,7 @@
 #include <kprogress.h>
 #include <tderecentdocument.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <knewstuff/downloaddialog.h>
diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp
index e181936f..48c024f0 100644
--- a/kvoctrain/kvoctrain/kva_query.cpp
+++ b/kvoctrain/kvoctrain/kva_query.cpp
@@ -25,7 +25,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kvoctrain.h"
 #include "query-dialogs/RandomQueryDlg.h"
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index bc2ff5ba..5bcd011f 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -29,7 +29,7 @@
 #include <kprogress.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kprinter.h>
diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h
index b8b191c1..60e30731 100644
--- a/kvoctrain/kvoctrain/kvoctrain.h
+++ b/kvoctrain/kvoctrain/kvoctrain.h
@@ -38,8 +38,8 @@
 #include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <krandomsequence.h>
 
 // application specific includes
diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp
index cc0e9d17..e9447654 100644
--- a/kvoctrain/kvoctrain/kvoctraintable.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintable.cpp
@@ -28,10 +28,10 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 
diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
index b3d54a0b..641a6852 100644
--- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp
+++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp
@@ -26,8 +26,8 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 
 #include "kvoctraintableitem.h"
 
diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp
index bc179283..600f27a7 100644
--- a/kvoctrain/kvoctrain/kvoctrainview.cpp
+++ b/kvoctrain/kvoctrain/kvoctrainview.cpp
@@ -32,7 +32,7 @@
 
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <tdeapplication.h>
diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
index 7abb9b80..3baf5d6e 100644
--- a/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <iostream>
diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
index 9180d6e4..9a6a8591 100644
--- a/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.cpp
@@ -26,7 +26,7 @@
 
 #include "UsageManager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #include <iostream>
diff --git a/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp b/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
index 1119d011..e2b3a83d 100644
--- a/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/grammarmanager.cpp
@@ -25,7 +25,7 @@
 
 #include "grammarmanager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 Conjugation::conjug_name_t
 Conjugation::names [] =
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
index 6684b834..d48a7ebe 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp
@@ -23,7 +23,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kvoctrain.h"
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
index 30b451b4..aa158466 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp
@@ -24,8 +24,8 @@
  ***************************************************************************/
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kvoctraindoc.h"
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index 7a0d5a50..3f33b25f 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -28,8 +28,8 @@
 #include "UsageManager.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 bool kvoctrainDoc::extract_T_DESCR_attr (XmlReader &xml,
                                          XmlElement &elem, int &no)
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
index f4443ca5..91eb36e3 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml2.cpp
@@ -26,7 +26,7 @@
 
 #include "QueryManager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 bool kvoctrainDoc::parseBody_e (XmlElement elem, XmlReader& xml)
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
index 90cb7cb3..11842642 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
@@ -25,7 +25,7 @@
 
 #include "QueryManager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtextcodec.h>
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
index 84c800d3..a3eca8e4 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp
@@ -23,9 +23,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kvoctraindoc.h"
 #include "kvoctraincore.h"
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
index 38e773a7..bd916cb9 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_voc.cpp
@@ -21,9 +21,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "kvoctraindoc.h"
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
index ee4eaa14..5d0ec824 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp
@@ -29,9 +29,9 @@
 #include "kvoctraindoc.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include <tqfileinfo.h>
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
index a22b06e7..42e47edc 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h
@@ -26,7 +26,7 @@
 #ifndef KVOCTRAINEXPR_H
 #define KVOCTRAINEXPR_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define KV_MAX_GRADE       7
 #define KV_MIN_GRADE       0
diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp
index 83bdd14a..38338e43 100644
--- a/kvoctrain/kvoctrain/kvtnewstuff.cpp
+++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp
@@ -13,9 +13,9 @@
 #include <tqdir.h>
 
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knewstuff/entry.h>
 
 #include "kvoctrain.h"
diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp
index 8ea6b762..11db0aa3 100644
--- a/kvoctrain/kvoctrain/main.cpp
+++ b/kvoctrain/kvoctrain/main.cpp
@@ -27,7 +27,7 @@
 
 # include <tdecmdlineargs.h>
 # include <tdeaboutdata.h>
-# include <klocale.h>
+# include <tdelocale.h>
 
 int main(int argc, char* argv[]) {
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
index 713cce35..0fb0ec89 100644
--- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 #include <tqtimer.h>
diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
index 33df5b81..1912d7b3 100644
--- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp
@@ -29,7 +29,7 @@
 #include <kv_resource.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kprogress.h>
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
index 973f8606..42a578f0 100644
--- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kprogress.h>
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
index d70b92ed..075965d2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.cpp
@@ -31,7 +31,7 @@
 
 #include <LineList.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 QueryDlgBase::QueryDlgBase(const TQString & caption, TQWidget *parent, const char *name, bool modal)
   : KDialogBase(Swallow, caption, User1|User2, NoDefault, parent, name, modal, false,
diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
index 25720d33..42debac2 100644
--- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp
@@ -29,7 +29,7 @@
 #include <kv_resource.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kprogress.h>
 
diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
index a823d638..c5b40d09 100644
--- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp
@@ -34,7 +34,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 SimpleQueryDlg::SimpleQueryDlg(
diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
index 54a2c865..e7868a9e 100644
--- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
+++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp
@@ -29,7 +29,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 
 #include <tqtimer.h>
diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
index c1d114d5..d5be9e90 100644
--- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp
+++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp
@@ -32,7 +32,7 @@
 using namespace std;
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #define KVD_VERS_PREFIX " v"     //#include "kvoctraindoc.h"
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
index 7fd6bbb0..24eb87bf 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.cpp
@@ -29,7 +29,7 @@
 #include "StatistikPage.h"
 #include "GenStatPage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <langset.h>
 #include <kvoctraindoc.h>
diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
index fa4fc59a..ae34d191 100644
--- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
+++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp
@@ -26,7 +26,7 @@
 #include "StatistikPage.h"
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <kvoctraindoc.h>