Rename additional header files to avoid conflicts with KDE4

32 files changed, 42 insertions, 42 deletions

diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc
index 5f404eb3..cf13c1b5 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cc
@@ -35,9 +35,9 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 
 
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc
index 798e27d5..d7716d31 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cc
@@ -20,11 +20,11 @@
 #include "kchartBackgroundPixmapConfigPage.h"
 #include "kchartBackgroundPixmapConfigPage.moc"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdefilemetainfo.h>
 #include <kstringhandler.h>
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index faaa81d2..921b42c4 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -22,7 +22,7 @@
 
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc
index 85313c0e..dcf99e4a 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cc
@@ -21,7 +21,7 @@
 #include "kchartComboConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tqlayout.h>
diff --git a/kchart/kchartConfigDialog.cc b/kchart/kchartConfigDialog.cc
index e92d20f9..f0f57d62 100644
--- a/kchart/kchartConfigDialog.cc
+++ b/kchart/kchartConfigDialog.cc
@@ -38,7 +38,7 @@
 #include "kchartParameterPolarConfigPage.h"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqradiobutton.h>
diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc
index d31e4799..f9cc7e25 100644
--- a/kchart/kchartDataConfigPage.cc
+++ b/kchart/kchartDataConfigPage.cc
@@ -22,7 +22,7 @@
 #include "kchartDataConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc
index 2bd0230d..8f08dd78 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cc
@@ -10,9 +10,9 @@
 #include <tqpushbutton.h>
 
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 #include "kdchart/KDChartAxisParams.h"
diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc
index 2b23b22f..27f91581 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cc
@@ -23,7 +23,7 @@
 #include "kchartFontConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index 8730063f..8e11184e 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -22,7 +22,7 @@
 
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index e0baf943..dc18d717 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -21,7 +21,7 @@
 #include "kchartLegendConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <tdefontdialog.h>
 #include <kiconloader.h>
diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc
index 6308fe43..f3750f73 100644
--- a/kchart/kchartLine3dConfigPage.cc
+++ b/kchart/kchartLine3dConfigPage.cc
@@ -21,7 +21,7 @@
 #include "kchartLine3dConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc
index 9292f1f9..e2587b9f 100644
--- a/kchart/kchartPageLayout.cc
+++ b/kchart/kchartPageLayout.cc
@@ -23,7 +23,7 @@
 #include <knumvalidator.h>
 #include <tqlineedit.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 
diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc
index a74878d2..1b37b8cc 100644
--- a/kchart/kchartParameter3dConfigPage.cc
+++ b/kchart/kchartParameter3dConfigPage.cc
@@ -22,7 +22,7 @@
 
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc
index 2025be3b..da6c8017 100644
--- a/kchart/kchartParameterConfigPage.cc
+++ b/kchart/kchartParameterConfigPage.cc
@@ -22,7 +22,7 @@
 #include "kchartParameterConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cc
index 99bfb6ff..d640333e 100644
--- a/kchart/kchartParameterPieConfigPage.cc
+++ b/kchart/kchartParameterPieConfigPage.cc
@@ -22,7 +22,7 @@
 #include "kchartParameterPieConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cc
index 32775fc0..b6e1fe59 100644
--- a/kchart/kchartParameterPolarConfigPage.cc
+++ b/kchart/kchartParameterPolarConfigPage.cc
@@ -22,7 +22,7 @@
 #include "kchartParameterPolarConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc
index cf96654a..31ec42a6 100644
--- a/kchart/kchartPieConfigPage.cc
+++ b/kchart/kchartPieConfigPage.cc
@@ -21,7 +21,7 @@
 #include "kchartPieConfigPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tdefontdialog.h>
diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc
index a7d0e88f..a02592de 100644
--- a/kchart/kchartPrinterDlg.cc
+++ b/kchart/kchartPrinterDlg.cc
@@ -26,7 +26,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // local includes
 #include "kchartPrinterDlg.h"
diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc
index e171da84..9ccad59e 100644
--- a/kchart/kchartSubTypeChartPage.cc
+++ b/kchart/kchartSubTypeChartPage.cc
@@ -23,7 +23,7 @@
 #include "kchartSubTypeChartPage.moc"
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tqvbuttongroup.h>
diff --git a/kchart/kchartWizard.cc b/kchart/kchartWizard.cc
index a2166f2e..01e5bf45 100644
--- a/kchart/kchartWizard.cc
+++ b/kchart/kchartWizard.cc
@@ -12,7 +12,7 @@
 #include <tqwidget.h>
 #include <tqpushbutton.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/kchart/kchartWizard.h b/kchart/kchartWizard.h
index e3725bc1..1e14840b 100644
--- a/kchart/kchartWizard.h
+++ b/kchart/kchartWizard.h
@@ -1,7 +1,7 @@
 #ifndef kchartWIZARD_H
 #define kchartWIZARD_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kwizard.h"
 #include "kchart_part.h"
 
diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc
index c745a16a..3899a276 100644
--- a/kchart/kchartWizardLabelsLegendPage.cc
+++ b/kchart/kchartWizardLabelsLegendPage.cc
@@ -6,7 +6,7 @@
 #include <tqlineedit.h>
 #include <tqradiobutton.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefontdialog.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc
index 2aa08afe..2c86549a 100644
--- a/kchart/kchartWizardSelectChartSubTypePage.cc
+++ b/kchart/kchartWizardSelectChartSubTypePage.cc
@@ -15,8 +15,8 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "kchart_params.h"
diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc
index b0365ddd..8ea02100 100644
--- a/kchart/kchartWizardSelectChartTypePage.cc
+++ b/kchart/kchartWizardSelectChartTypePage.cc
@@ -10,8 +10,8 @@
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 namespace KChart
diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc
index e7ab0ba8..d40e95fe 100644
--- a/kchart/kchartWizardSelectDataFormatPage.cc
+++ b/kchart/kchartWizardSelectDataFormatPage.cc
@@ -18,8 +18,8 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "kchart_params.h"
diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc
index 5043313f..5514e82b 100644
--- a/kchart/kchartWizardSetupAxesPage.cc
+++ b/kchart/kchartWizardSetupAxesPage.cc
@@ -8,7 +8,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefontdialog.h>
 #include <knumvalidator.h>
 #include <math.h>
diff --git a/kchart/kchart_aboutdata.h b/kchart/kchart_aboutdata.h
index abf8b2f7..5e53ed37 100644
--- a/kchart/kchart_aboutdata.h
+++ b/kchart/kchart_aboutdata.h
@@ -21,7 +21,7 @@
 #define KCHART_ABOUTDATA
 
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <config.h>
 
 namespace KChart
diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc
index f45e6aed..05362738 100644
--- a/kchart/kchart_factory.cc
+++ b/kchart/kchart_factory.cc
@@ -8,7 +8,7 @@
 #include "kchart_factory.h"
 #include "kchart_aboutdata.h"
 #include "kchart_part.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/kchart/kchart_params.cc b/kchart/kchart_params.cc
index 55a158d7..2cd8da51 100644
--- a/kchart/kchart_params.cc
+++ b/kchart/kchart_params.cc
@@ -26,7 +26,7 @@ using std::cerr;
 
 
 #include <dcopobject.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <KoXmlNS.h>
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index 67b0ab57..fb6a6414 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -26,7 +26,7 @@ using std::cerr;
 #include <KoOasisLoadingContext.h>
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqdom.h>
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc
index 1a40d1a9..ba2d1321 100644
--- a/kchart/kchart_view.cc
+++ b/kchart/kchart_view.cc
@@ -12,17 +12,17 @@
 #include <tqcstring.h> // For TQByteArray
 
 #include <tdeaction.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kprinter.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <dcopobject.h>
 #include <kxmlguifactory.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <KoTemplateCreateDia.h>
 
diff --git a/kchart/main.cc b/kchart/main.cc
index a82f44dd..97d046d1 100644
--- a/kchart/main.cc
+++ b/kchart/main.cc
@@ -19,7 +19,7 @@
 
 #include <KoApplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kchart_aboutdata.h"
 
 using namespace KChart;