Rename additional header files to avoid conflicts with KDE4

16 files changed, 24 insertions, 24 deletions

diff --git a/kalzium/src/detailedgraphicaloverview.cpp b/kalzium/src/detailedgraphicaloverview.cpp
index 00424746..c5312439 100644
--- a/kalzium/src/detailedgraphicaloverview.cpp
+++ b/kalzium/src/detailedgraphicaloverview.cpp
@@ -18,9 +18,9 @@ email                : cniehaus@kde.org
 
 //KDE-Includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 
 //QT-Includes
 #include <tqpainter.h>
diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp
index 3c8bb116..97dd76e6 100644
--- a/kalzium/src/detailinfodlg.cpp
+++ b/kalzium/src/detailinfodlg.cpp
@@ -19,7 +19,7 @@
 #include "kalziumdataobject.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp
index b5342952..14dea1a1 100644
--- a/kalzium/src/element.cpp
+++ b/kalzium/src/element.cpp
@@ -33,7 +33,7 @@
 #include <tqfontmetrics.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 
diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp
index e7c6b915..500f9354 100644
--- a/kalzium/src/elementdataviewer.cpp
+++ b/kalzium/src/elementdataviewer.cpp
@@ -18,7 +18,7 @@
 #include "plotwidget.h"
 #include "kalziumdataobject.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdebug.h>
diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp
index d6b44922..19d1469a 100644
--- a/kalzium/src/eqchemview.cpp
+++ b/kalzium/src/eqchemview.cpp
@@ -23,11 +23,11 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 
 #include "config.h"
diff --git a/kalzium/src/isotope.cpp b/kalzium/src/isotope.cpp
index 268e99d4..c4b3b30b 100644
--- a/kalzium/src/isotope.cpp
+++ b/kalzium/src/isotope.cpp
@@ -21,7 +21,7 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 Isotope::Isotope( int neutrons, int protones,  double percentage, double weight, double halflife, TQString format, double alphadecay, double betaplusdecay, double betaminusdecay, double ecdecay, double alphapercentage, double betapluspercentage, double betaminuspercentage, double ecpercentage, TQString spin, TQString magmoment)
 {
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index e3c6f8c3..e7393ec0 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -41,7 +41,7 @@
 
 #include <tdeconfigdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp
index df8ae11a..1e4f93e3 100644
--- a/kalzium/src/kalziumdataobject.cpp
+++ b/kalzium/src/kalziumdataobject.cpp
@@ -26,9 +26,9 @@
 #include <tqdom.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp
index c7b3ff26..e78cb0ef 100644
--- a/kalzium/src/kalziumtip.cpp
+++ b/kalzium/src/kalziumtip.cpp
@@ -33,9 +33,9 @@
 
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWidget( parent, name, f ) 
diff --git a/kalzium/src/kalziumutils.cpp b/kalzium/src/kalziumutils.cpp
index 8498962b..29a5bc02 100644
--- a/kalzium/src/kalziumutils.cpp
+++ b/kalzium/src/kalziumutils.cpp
@@ -13,8 +13,8 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqfont.h>
 #include <tqrect.h>
 #include <tqpainter.h>
diff --git a/kalzium/src/molcalcwidget.cpp b/kalzium/src/molcalcwidget.cpp
index 435f6d7a..4b58ab2a 100644
--- a/kalzium/src/molcalcwidget.cpp
+++ b/kalzium/src/molcalcwidget.cpp
@@ -31,7 +31,7 @@
 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <tdetoolbar.h>
diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp
index 548974d1..d1e20339 100644
--- a/kalzium/src/periodictableview.cpp
+++ b/kalzium/src/periodictableview.cpp
@@ -24,7 +24,7 @@
 #include "kalziumutils.h"
 #include "kalziumdataobject.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp
index c0b8ef6a..93ae5838 100644
--- a/kalzium/src/somwidget_impl.cpp
+++ b/kalzium/src/somwidget_impl.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <math.h>
 
diff --git a/kalzium/src/spectrum.cpp b/kalzium/src/spectrum.cpp
index 5fea3d8e..1e486338 100644
--- a/kalzium/src/spectrum.cpp
+++ b/kalzium/src/spectrum.cpp
@@ -21,7 +21,7 @@
 
 #include "element.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <math.h>
 
diff --git a/kalzium/src/spectrumviewimpl.cpp b/kalzium/src/spectrumviewimpl.cpp
index e74c8a59..614dbbd1 100644
--- a/kalzium/src/spectrumviewimpl.cpp
+++ b/kalzium/src/spectrumviewimpl.cpp
@@ -16,8 +16,8 @@
 
 #include <tdefiledialog.h>
 #include <kguiitem.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include "exporter.h"
diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp
index bc0d2af1..88355a1c 100644
--- a/kalzium/src/spectrumwidget.cpp
+++ b/kalzium/src/spectrumwidget.cpp
@@ -24,8 +24,8 @@
 #include "kalziumutils.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <math.h>
 
 #include <tqcursor.h>