From 63f984a752aa6a6a73e3af795b05a5a042833eff Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:48:17 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kspread/dialogs/kspread_dlg_angle.cc       | 2 +-
 kspread/dialogs/kspread_dlg_area.cc        | 2 +-
 kspread/dialogs/kspread_dlg_comment.cc     | 2 +-
 kspread/dialogs/kspread_dlg_conditional.cc | 4 ++--
 kspread/dialogs/kspread_dlg_cons.cc        | 2 +-
 kspread/dialogs/kspread_dlg_csv.cc         | 4 ++--
 kspread/dialogs/kspread_dlg_database.cc    | 4 ++--
 kspread/dialogs/kspread_dlg_find.cc        | 2 +-
 kspread/dialogs/kspread_dlg_format.cc      | 2 +-
 kspread/dialogs/kspread_dlg_goalseek.cc    | 4 ++--
 kspread/dialogs/kspread_dlg_insert.cc      | 4 ++--
 kspread/dialogs/kspread_dlg_layout.cc      | 2 +-
 kspread/dialogs/kspread_dlg_list.cc        | 2 +-
 kspread/dialogs/kspread_dlg_paperlayout.cc | 4 ++--
 kspread/dialogs/kspread_dlg_pasteinsert.cc | 2 +-
 kspread/dialogs/kspread_dlg_preference.cc  | 2 +-
 kspread/dialogs/kspread_dlg_reference.cc   | 2 +-
 kspread/dialogs/kspread_dlg_series.cc      | 4 ++--
 kspread/dialogs/kspread_dlg_show.cc        | 2 +-
 kspread/dialogs/kspread_dlg_showColRow.cc  | 2 +-
 kspread/dialogs/kspread_dlg_sort.cc        | 4 ++--
 kspread/dialogs/kspread_dlg_special.cc     | 2 +-
 kspread/dialogs/kspread_dlg_styles.cc      | 2 +-
 kspread/dialogs/kspread_dlg_subtotal.cc    | 4 ++--
 kspread/dialogs/kspread_dlg_validity.cc    | 2 +-
 kspread/dialogs/link.cc                    | 4 ++--
 kspread/dialogs/sheet_properties.cc        | 2 +-
 27 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'kspread/dialogs')

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"
-- 
cgit v1.2.1