summaryrefslogtreecommitdiffstats
path: root/kspread
diff options
context:
space:
mode:
Diffstat (limited to 'kspread')
-rw-r--r--kspread/dialogs/kspread_dlg_angle.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_area.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_comment.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_conditional.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_cons.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_csv.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_database.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_find.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_format.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_goalseek.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_insert.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_layout.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_list.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_paperlayout.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_pasteinsert.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_preference.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_reference.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_series.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_show.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_showColRow.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_sort.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_special.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_styles.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_subtotal.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_validity.cc2
-rw-r--r--kspread/dialogs/link.cc4
-rw-r--r--kspread/dialogs/sheet_properties.cc2
-rw-r--r--kspread/formula.cc2
-rw-r--r--kspread/functions.cc2
-rw-r--r--kspread/kspread_aboutdata.h2
-rw-r--r--kspread/kspread_canvas.cc2
-rw-r--r--kspread/kspread_cell.cc2
-rw-r--r--kspread/kspread_doc.cc4
-rw-r--r--kspread/kspread_format.cc2
-rw-r--r--kspread/kspread_functions_datetime.cc2
-rw-r--r--kspread/kspread_functions_engineering.cc4
-rw-r--r--kspread/kspread_functions_financial.cc2
-rw-r--r--kspread/kspread_functions_information.cc2
-rw-r--r--kspread/kspread_functions_math.cc2
-rw-r--r--kspread/kspread_functions_text.cc2
-rw-r--r--kspread/kspread_generalProperty.cpp2
-rw-r--r--kspread/kspread_locale.h2
-rw-r--r--kspread/kspread_map.cc2
-rw-r--r--kspread/kspread_numformat.cc2
-rw-r--r--kspread/kspread_object.h2
-rw-r--r--kspread/kspread_propertyEditor.cpp2
-rw-r--r--kspread/kspread_sheet.cc2
-rw-r--r--kspread/kspread_sheetprint.cc2
-rw-r--r--kspread/kspread_style.cc2
-rw-r--r--kspread/kspread_style_manager.cc2
-rw-r--r--kspread/kspread_view.cc4
-rw-r--r--kspread/manipulator.cc4
-rw-r--r--kspread/manipulator.h2
-rw-r--r--kspread/manipulator_data.cc2
-rw-r--r--kspread/plugins/calculator/configdlg.cpp2
-rw-r--r--kspread/plugins/calculator/kcalc.cpp6
-rw-r--r--kspread/plugins/calculator/kcalc_core.cpp4
-rw-r--r--kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc4
-rw-r--r--kspread/tests/formula_tester.cc2
-rw-r--r--kspread/valueformatter.cc2
60 files changed, 78 insertions, 78 deletions
diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc
index e326dd53..763e47a5 100644
--- a/kspread/dialogs/kspread_dlg_angle.cc
+++ b/kspread/dialogs/kspread_dlg_angle.cc
@@ -26,7 +26,7 @@
#include <kbuttonbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kspread_cell.h>
diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc
index e4e130e8..108511ad 100644
--- a/kspread/dialogs/kspread_dlg_area.cc
+++ b/kspread/dialogs/kspread_dlg_area.cc
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqlineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "kspread_doc.h"
#include "kspread_locale.h"
diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc
index 9ed3c551..2494959c 100644
--- a/kspread/dialogs/kspread_dlg_comment.cc
+++ b/kspread/dialogs/kspread_dlg_comment.cc
@@ -25,7 +25,7 @@
#include <tqpushbutton.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kbuttonbox.h>
#include "kspread_canvas.h"
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index 9e9d47de..a75bd5bd 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -36,8 +36,8 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <KoGlobal.h>
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc
index f24e691a..139113c7 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cc
@@ -36,7 +36,7 @@
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "kspread_dlg_cons.h"
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index 653587fc..c068810b 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -36,8 +36,8 @@
#include <kdebug.h>
#include <kdialogbase.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kspread_cell.h>
#include <kspread_doc.h>
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 5f955074..34e680cd 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -29,8 +29,8 @@
#include <kdebug.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knumvalidator.h>
#include <kpushbutton.h>
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc
index dceca6b1..aa1c7f71 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -21,7 +21,7 @@
#include "kspread_dlg_find.h"
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
#include <tqcombobox.h>
diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc
index 6163710b..501d8bf3 100644
--- a/kspread/dialogs/kspread_dlg_format.cc
+++ b/kspread/dialogs/kspread_dlg_format.cc
@@ -30,7 +30,7 @@
#include <tqpushbutton.h>
#include <kbuttonbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc
index 49ec2461..b45525ad 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -37,8 +37,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc
index 6e217f24..454a43ba 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cc
@@ -31,8 +31,8 @@
#include <kbuttonbox.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kspread_doc.h"
#include "kspread_sheet.h"
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index ce97542d..ad876b3b 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -48,7 +48,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knumvalidator.h>
#include <KoUnitWidgets.h>
diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc
index 88496387..254470e1 100644
--- a/kspread/dialogs/kspread_dlg_list.cc
+++ b/kspread/dialogs/kspread_dlg_list.cc
@@ -29,7 +29,7 @@
#include <kbuttonbox.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "kspread_autofill.h"
#include "kspread_factory.h"
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index fcbbba78..3305963e 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -42,8 +42,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
using namespace KSpread;
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc
index cc49afad..93d67b06 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc
@@ -21,7 +21,7 @@
*/
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kbuttonbox.h>
#include <tqbuttongroup.h>
#include <kdebug.h>
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 0a15da25..b47d55f8 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -36,7 +36,7 @@
#include <kstatusbar.h>
#include <knuminput.h>
#include <tdespell.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeversion.h>
#include <kcolorbutton.h>
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index c5ae14c7..9e747dfb 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -43,7 +43,7 @@
#include <tqlayout.h>
#include <kbuttonbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeversion.h>
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc
index 0158dd2a..9c003498 100644
--- a/kspread/dialogs/kspread_dlg_series.cc
+++ b/kspread/dialogs/kspread_dlg_series.cc
@@ -31,12 +31,12 @@
#include "kspread_view.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqbuttongroup.h>
#include <tqgroupbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knumvalidator.h>
#include <tqradiobutton.h>
diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc
index c73f71ec..11f55e6d 100644
--- a/kspread/dialogs/kspread_dlg_show.cc
+++ b/kspread/dialogs/kspread_dlg_show.cc
@@ -23,7 +23,7 @@
*/
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlistbox.h>
#include <tqlabel.h>
diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc
index 0a32a44d..32c4c631 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.cc
+++ b/kspread/dialogs/kspread_dlg_showColRow.cc
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_doc.h"
#include "kspread_sheet.h"
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 7292b25b..52cda9b6 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -43,8 +43,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kspread_dlg_sort.h"
#include "kspread_doc.h"
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc
index 510e0ad8..2fbeb7eb 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cc
@@ -24,7 +24,7 @@
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_canvas.h"
#include "kspread_doc.h"
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index fdb8d6fe..bf8f4de2 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -25,7 +25,7 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_canvas.h"
#include "kspread_cell.h"
diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc
index f88f3a7f..054cc1f7 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.cc
+++ b/kspread/dialogs/kspread_dlg_subtotal.cc
@@ -25,8 +25,8 @@
#include <tqmemarray.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kspreadsubtotal.h"
#include "kspread_sheet.h"
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 2d0b5656..ea462527 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -32,7 +32,7 @@
#include <tqbuttongroup.h>
#include <knumvalidator.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqcombobox.h>
#include <tqlineedit.h>
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index dfa7c385..5d2217cb 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -33,8 +33,8 @@
#include <kdialogbase.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tderecentdocument.h>
#include <kurlrequester.h>
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc
index 7cdd6449..c4b79a9d 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cc
@@ -22,7 +22,7 @@
#include <kcombobox.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_sheet.h"
#include "sheet_properties_base.h"
diff --git a/kspread/formula.cc b/kspread/formula.cc
index b357151b..3522f06b 100644
--- a/kspread/formula.cc
+++ b/kspread/formula.cc
@@ -39,7 +39,7 @@
#include <tqvaluevector.h>
#include <tqvaluestack.h>
-#include <klocale.h>
+#include <tdelocale.h>
/*
To understand how this formula engine works, please refer to the documentation
diff --git a/kspread/functions.cc b/kspread/functions.cc
index de55f7e5..f6bc16e2 100644
--- a/kspread/functions.cc
+++ b/kspread/functions.cc
@@ -28,7 +28,7 @@
#include <tqvaluevector.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
diff --git a/kspread/kspread_aboutdata.h b/kspread/kspread_aboutdata.h
index 85b9797e..618fc132 100644
--- a/kspread/kspread_aboutdata.h
+++ b/kspread/kspread_aboutdata.h
@@ -21,7 +21,7 @@
#define KSPREAD_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
namespace KSpread
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 780dd5af..7ce1f63c 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -58,7 +58,7 @@
#include <kcursor.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdemultipledrag.h>
#include <krun.h>
#include <kmimetype.h>
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index d8799d9f..991f6433 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -79,7 +79,7 @@
#include <KoXmlWriter.h>
#include <KoOasisStyles.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 3afcfaf1..7643b31d 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -41,9 +41,9 @@
#include <kstandarddirs.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ksconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <KoApplication.h>
#include <KoCommandHistory.h>
diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc
index 2c0cf45a..430e2386 100644
--- a/kspread/kspread_format.cc
+++ b/kspread/kspread_format.cc
@@ -25,7 +25,7 @@
#include <dcopobject.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoXmlNS.h>
#include <KoGenStyles.h>
diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cc
index 0136d298..d322b6a4 100644
--- a/kspread/kspread_functions_datetime.cc
+++ b/kspread/kspread_functions_datetime.cc
@@ -27,7 +27,7 @@
#include "valueconverter.h"
#include <kcalendarsystem.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KSpread;
diff --git a/kspread/kspread_functions_engineering.cc b/kspread/kspread_functions_engineering.cc
index ddcda561..bca81ec8 100644
--- a/kspread/kspread_functions_engineering.cc
+++ b/kspread/kspread_functions_engineering.cc
@@ -29,8 +29,8 @@
#include <tqmap.h>
// these are needed for complex functions, while we handle them in the old way
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <math.h>
using namespace KSpread;
diff --git a/kspread/kspread_functions_financial.cc b/kspread/kspread_functions_financial.cc
index a9479efc..daccb640 100644
--- a/kspread/kspread_functions_financial.cc
+++ b/kspread/kspread_functions_financial.cc
@@ -28,7 +28,7 @@
#include "valuecalc.h"
#include "valueconverter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
using namespace KSpread;
diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cc
index 2a5775aa..30d64263 100644
--- a/kspread/kspread_functions_information.cc
+++ b/kspread/kspread_functions_information.cc
@@ -27,7 +27,7 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "functions.h"
#include "valuecalc.h"
diff --git a/kspread/kspread_functions_math.cc b/kspread/kspread_functions_math.cc
index b34996f6..06b6da2b 100644
--- a/kspread/kspread_functions_math.cc
+++ b/kspread/kspread_functions_math.cc
@@ -22,7 +22,7 @@
// built-in math functions
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "functions.h"
#include "valuecalc.h"
diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cc
index 432bfc28..5a8dccf6 100644
--- a/kspread/kspread_functions_text.cc
+++ b/kspread/kspread_functions_text.cc
@@ -25,7 +25,7 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <math.h>
#include "functions.h"
diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp
index d15c79c8..f233576a 100644
--- a/kspread/kspread_generalProperty.cpp
+++ b/kspread/kspread_generalProperty.cpp
@@ -26,7 +26,7 @@
#include <tqlineedit.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoGeneralPropertyUi.h>
#include <KoUnitWidgets.h>
diff --git a/kspread/kspread_locale.h b/kspread/kspread_locale.h
index 12081731..705d7b51 100644
--- a/kspread/kspread_locale.h
+++ b/kspread/kspread_locale.h
@@ -1,7 +1,7 @@
#ifndef KSPREAD_LOCALE_H
#define KSPREAD_LOCALE_H
-#include <klocale.h>
+#include <tdelocale.h>
class TQDomElement;
class TQDomDocument;
diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc
index d39f6c1f..d54c340a 100644
--- a/kspread/kspread_map.cc
+++ b/kspread/kspread_map.cc
@@ -23,7 +23,7 @@
#include <tqfile.h>
#include <kmdcodec.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <KoDom.h>
#include <KoGenStyles.h>
diff --git a/kspread/kspread_numformat.cc b/kspread/kspread_numformat.cc
index 769aa61a..e0962b96 100644
--- a/kspread/kspread_numformat.cc
+++ b/kspread/kspread_numformat.cc
@@ -34,7 +34,7 @@ Tomas
#include <tqstring.h>
#include <kcalendarsystem.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_util.h"
#include "kspread_value.h"
diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h
index b66d67ac..2aaab400 100644
--- a/kspread/kspread_object.h
+++ b/kspread/kspread_object.h
@@ -22,7 +22,7 @@
#include "kspread_sheet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoBrush.h>
#include <KoChild.h>
#include <KoDom.h>
diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp
index 3b84a3db..1f2aa1e6 100644
--- a/kspread/kspread_propertyEditor.cpp
+++ b/kspread/kspread_propertyEditor.cpp
@@ -33,7 +33,7 @@
// #include "KPrTextProperty.h"
// #include "KPrObjectProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
using namespace KSpread;
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index 8d6cf77b..a8965b9e 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -42,7 +42,7 @@
#include <kmdcodec.h>
#include <kfind.h>
#include <kfinddialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kreplace.h>
#include <kreplacedialog.h>
#include <kprinter.h>
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc
index a70445eb..3cc26bf3 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cc
@@ -30,7 +30,7 @@
#include "commands.h"
#include <KoDocumentInfo.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprinter.h>
#include <kdebug.h>
diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc
index f8ac8158..bd58ac88 100644
--- a/kspread/kspread_style.cc
+++ b/kspread/kspread_style.cc
@@ -21,7 +21,7 @@
#include <tqbuffer.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoGlobal.h>
#include <KoGenStyles.h>
diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cc
index 47ca18cc..8bfb8acf 100644
--- a/kspread/kspread_style_manager.cc
+++ b/kspread/kspread_style_manager.cc
@@ -21,7 +21,7 @@
#include <tqstringlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoOasisStyles.h>
#include <KoXmlNS.h>
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index b43dac6c..253a9267 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -56,7 +56,7 @@
#include <kfinddialog.h>
#include <tdefontdialog.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kpassdlg.h>
#include <kprocio.h>
@@ -67,7 +67,7 @@
#include <kstatusbar.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeparts/partmanager.h>
#include <tdelistview.h>
#include <kpushbutton.h>
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index f1a5838b..b095191c 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -22,8 +22,8 @@
#include <tqcolor.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstaticdeleter.h>
#include "kspread_canvas.h"
diff --git a/kspread/manipulator.h b/kspread/manipulator.h
index 622362bc..d7c03959 100644
--- a/kspread/manipulator.h
+++ b/kspread/manipulator.h
@@ -26,7 +26,7 @@
#include <tqvaluelist.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koffice_export.h>
diff --git a/kspread/manipulator_data.cc b/kspread/manipulator_data.cc
index 5b829de3..af231722 100644
--- a/kspread/manipulator_data.cc
+++ b/kspread/manipulator_data.cc
@@ -20,7 +20,7 @@
#include "manipulator_data.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_cell.h"
#include "kspread_sheet.h"
diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp
index 28ab2646..56af25b4 100644
--- a/kspread/plugins/calculator/configdlg.cpp
+++ b/kspread/plugins/calculator/configdlg.cpp
@@ -27,7 +27,7 @@
#include "configdlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tqlayout.h>
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index b6c71ca1..d7c0ce76 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -24,17 +24,17 @@
#include "configdlg.h"
#include "version.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <tqlayout.h>
#include <tqobjectlist.h>
#include <tqpushbutton.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqstyle.h>
#include <kdialog.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "kcalc.h"
extern last_input_type last_input;
diff --git a/kspread/plugins/calculator/kcalc_core.cpp b/kspread/plugins/calculator/kcalc_core.cpp
index bdba8469..881a05eb 100644
--- a/kspread/plugins/calculator/kcalc_core.cpp
+++ b/kspread/plugins/calculator/kcalc_core.cpp
@@ -36,8 +36,8 @@
#include <limits.h>
#include <math.h>
#include <signal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include "kcalc.h"
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index dc4c169e..ba6f2335 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
@@ -35,9 +35,9 @@
#include <kcalendarsystemfactory.h>
#include <tdeaboutdata.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqpoint.h>
#include <tqrect.h>
diff --git a/kspread/tests/formula_tester.cc b/kspread/tests/formula_tester.cc
index 97993c82..2c7381e1 100644
--- a/kspread/tests/formula_tester.cc
+++ b/kspread/tests/formula_tester.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "tester.h"
diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc
index 1eda41da..94b6b57c 100644
--- a/kspread/valueformatter.cc
+++ b/kspread/valueformatter.cc
@@ -27,7 +27,7 @@
#include <kcalendarsystem.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <float.h>
#include <math.h>