Rename additional header files to avoid conflicts with KDE4

15 files changed, 24 insertions, 24 deletions

diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index d4173bd3..1e721d16 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -36,9 +36,9 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 
 CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*seperator*/)
diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc
index c7a3b6c0..ceeb8b5e 100644
--- a/filters/kspread/csv/csvexport.cc
+++ b/filters/kspread/csv/csvexport.cc
@@ -24,7 +24,7 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgenericfactory.h>
 #include <KoFilterChain.h>
 #include <KoFilterManager.h>
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index c136fd91..ebf1523e 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -40,10 +40,10 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 
 using namespace KSpread;
diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc
index f5c4262a..72cadfa2 100644
--- a/filters/kspread/csv/csvimport.cc
+++ b/filters/kspread/csv/csvimport.cc
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 
diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc
index 6121baaf..001b35a2 100644
--- a/filters/kspread/dbase/dbaseimport.cc
+++ b/filters/kspread/dbase/dbaseimport.cc
@@ -37,7 +37,7 @@
 #include <KoGlobal.h>
 #include <KoUnit.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 typedef KGenericFactory<DBaseImport, KoFilter> DBaseImportFactory;
 K_EXPORT_COMPONENT_FACTORY( libdbaseimport, DBaseImportFactory( "kofficefilters" ) )
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index 05a57be6..28f5453e 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -24,7 +24,7 @@
 #include <gnumericexport.h>
 #include <kdebug.h>
 #include <kfilterdev.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgenericfactory.h>
 #include <KoFilterChain.h>
 #include <tqapplication.h>
diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc
index 665a6161..856a8491 100644
--- a/filters/kspread/gnumeric/gnumericimport.cc
+++ b/filters/kspread/gnumeric/gnumericimport.cc
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 
 #include <gnumericimport.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kfilterdev.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index cff62773..8df7e0ce 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -25,8 +25,8 @@
 #include <tqtextcodec.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include <exportdialog.h>
diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc
index 0c025525..6100dabe 100644
--- a/filters/kspread/kexi/kspread_kexiimport.cc
+++ b/filters/kspread/kexi/kspread_kexiimport.cc
@@ -50,8 +50,8 @@
 
 //KDE Includes
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <tqcolor.h>
 
diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc
index 090b4de1..0e15acbe 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialog.cc
+++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc
@@ -30,14 +30,14 @@
 
 //KDE Includes
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
 #include <kcombobox.h>
 #include <tqradiobutton.h>
 #include <tqtextedit.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //Kexi Includes
 #include <kexidb/global.h>
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 6a53ee95..b088afe1 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -27,12 +27,12 @@
 #include <tqcheckbox.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tderecentdocument.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc
index c303a59e..d9ebd794 100644
--- a/filters/kspread/latex/export/latexexport.cc
+++ b/filters/kspread/latex/export/latexexport.cc
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include <KoFilterChain.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqtextcodec.h>
 #include "kspreadlatexexportdiaImpl.h"
 
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index f092d6b1..2db60420 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -31,10 +31,10 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <KoDocumentInfo.h>
 #include <KoFilterChain.h>
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 08ccaca7..6dc3216e 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <KoDocumentInfo.h>
 #include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 #include <KoFilterChain.h>
 #include <KoGlobal.h>
diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc
index ec4793d0..e282a769 100644
--- a/filters/kspread/qpro/qproimport.cc
+++ b/filters/kspread/qpro/qproimport.cc
@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kgenericfactory.h>
 #include <KoFilterChain.h>