Rename additional header files to avoid conflicts with KDE4

31 files changed, 69 insertions, 69 deletions

diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp
index bae407da..0357ac3c 100644
--- a/tdescreensaver/kdesavers/Euphoria.cpp
+++ b/tdescreensaver/kdesavers/Euphoria.cpp
@@ -888,8 +888,8 @@ void EuphoriaWidget::setDefaults(int which)
 
 
 #ifndef UNIT_TEST
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 
@@ -969,7 +969,7 @@ void KEuphoriaScreenSaver::setMode( int id )
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 static const char* defaultText[] =
diff --git a/tdescreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp
index 507b2433..ff5c5612 100644
--- a/tdescreensaver/kdesavers/Flux.cpp
+++ b/tdescreensaver/kdesavers/Flux.cpp
@@ -772,8 +772,8 @@ void FluxWidget::updateParameters()
 
 
 #ifndef UNIT_TEST
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 
@@ -855,7 +855,7 @@ void KFluxScreenSaver::setMode( int id )
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <kbuttonbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 static const char* defaultText[] =
diff --git a/tdescreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp
index ed0856ad..07be1cce 100644
--- a/tdescreensaver/kdesavers/SolarWinds.cpp
+++ b/tdescreensaver/kdesavers/SolarWinds.cpp
@@ -586,8 +586,8 @@ void SWindsWidget::setDefaults(int which)
 
 
 #ifndef UNIT_TEST
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 
@@ -667,7 +667,7 @@ void KSWindsScreenSaver::setMode( int id )
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 static const char* defaultText[] =
diff --git a/tdescreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp
index b8d01339..706393c4 100644
--- a/tdescreensaver/kdesavers/banner.cpp
+++ b/tdescreensaver/kdesavers/banner.cpp
@@ -27,10 +27,10 @@
 
 #include <tdeapplication.h>
 #include <krandomsequence.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcolorbutton.h>
 #include <tdefontcombo.h>
 
diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp
index 2f09b19c..b84fc78c 100644
--- a/tdescreensaver/kdesavers/blob.cpp
+++ b/tdescreensaver/kdesavers/blob.cpp
@@ -32,10 +32,10 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <krandomsequence.h>
 
 #include "blob.moc"
diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp
index 7c7c2665..903a911e 100644
--- a/tdescreensaver/kdesavers/firesaver.cpp
+++ b/tdescreensaver/kdesavers/firesaver.cpp
@@ -24,10 +24,10 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <arts/kmedia2.h>
 #include <arts/kplayobject.h>
 #include <arts/kplayobjectfactory.h>
diff --git a/tdescreensaver/kdesavers/firesaverwriter.cpp b/tdescreensaver/kdesavers/firesaverwriter.cpp
index ff78fc5e..268b55be 100644
--- a/tdescreensaver/kdesavers/firesaverwriter.cpp
+++ b/tdescreensaver/kdesavers/firesaverwriter.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "firesaverwriter.h"
 
 
diff --git a/tdescreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp
index 310bd8f5..1350a12a 100644
--- a/tdescreensaver/kdesavers/fountain.cpp
+++ b/tdescreensaver/kdesavers/fountain.cpp
@@ -11,12 +11,12 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "fountain.h"
 #include "fountain.moc"
 #ifdef TQ_WS_MACX
@@ -33,7 +33,7 @@
 #include <tqspinbox.h>
 #include <kstandarddirs.h>
 #include <math.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 // libtdescreensaver interface
 extern "C"
 {
diff --git a/tdescreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp
index f671049c..119224cd 100644
--- a/tdescreensaver/kdesavers/gravity.cpp
+++ b/tdescreensaver/kdesavers/gravity.cpp
@@ -11,7 +11,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kbuttonbox.h>
@@ -32,7 +32,7 @@
 #include <tqspinbox.h>
 #include <kstandarddirs.h>
 #include <math.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 // libtdescreensaver interface
 extern "C"
 {
diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp
index c1838cff..8cf1788a 100644
--- a/tdescreensaver/kdesavers/kclock.cpp
+++ b/tdescreensaver/kdesavers/kclock.cpp
@@ -24,9 +24,9 @@
 #include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <libart_lgpl/art_affine.h>
 #include <libart_lgpl/art_misc.h>
diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp
index d2af8df1..d1384a21 100644
--- a/tdescreensaver/kdesavers/kvm.cpp
+++ b/tdescreensaver/kdesavers/kvm.cpp
@@ -42,9 +42,9 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 
 #ifdef DEBUG_MEM
 #include <mcheck.h>
diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp
index 720261e7..2fb57c25 100644
--- a/tdescreensaver/kdesavers/lines.cpp
+++ b/tdescreensaver/kdesavers/lines.cpp
@@ -16,7 +16,7 @@
 #include <tqslider.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcolorbutton.h>
 
 #include "kcolordialog.h"
@@ -24,8 +24,8 @@
 #include "lines.moc"
 
 #include <tqlayout.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tqpainter.h>
 
 #define MAXLENGTH	256
diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp
index 5981748e..2d521583 100644
--- a/tdescreensaver/kdesavers/lorenz.cpp
+++ b/tdescreensaver/kdesavers/lorenz.cpp
@@ -18,10 +18,10 @@
 #include <tqlabel.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "lorenz.h"
 #include "lorenz.moc"
diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp
index 1b2abc0f..a8aebd45 100644
--- a/tdescreensaver/kdesavers/pendulum.cpp
+++ b/tdescreensaver/kdesavers/pendulum.cpp
@@ -37,10 +37,10 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 // KDE headers
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "sspreviewarea.h"
 
diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp
index f4cb08ba..8ce16671 100644
--- a/tdescreensaver/kdesavers/polygon.cpp
+++ b/tdescreensaver/kdesavers/polygon.cpp
@@ -14,10 +14,10 @@
 #include <tqlabel.h>
 #include <tqslider.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
 
 #include "polygon.h"
 #include <tqpainter.h>
diff --git a/tdescreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp
index 30b49da8..c960c66c 100644
--- a/tdescreensaver/kdesavers/rotation.cpp
+++ b/tdescreensaver/kdesavers/rotation.cpp
@@ -37,10 +37,10 @@
 #include <tqvalidator.h>
 #include <tqtooltip.h>
 // KDE headers
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "sspreviewarea.h"
 
diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp
index 7ac72b2c..24309087 100644
--- a/tdescreensaver/kdesavers/science.cpp
+++ b/tdescreensaver/kdesavers/science.cpp
@@ -21,9 +21,9 @@
 #include <tqlayout.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <krandomsequence.h>
diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp
index e83aa5f5..066117a1 100644
--- a/tdescreensaver/kdesavers/slideshow.cpp
+++ b/tdescreensaver/kdesavers/slideshow.cpp
@@ -23,10 +23,10 @@
 #include <tqdesktopwidget.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kimageio.h>
 #include <tdefiledialog.h>
 #include <kstandarddirs.h>
diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp
index 685669aa..880219bf 100644
--- a/tdescreensaver/kdesavers/wave.cpp
+++ b/tdescreensaver/kdesavers/wave.cpp
@@ -8,12 +8,12 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include "wave.h"
 #include "wave.moc"
 #ifdef TQ_WS_MACX
@@ -30,7 +30,7 @@
 #include <tqspinbox.h>
 #include <kstandarddirs.h>
 #include <math.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #ifndef GLU_NURBS_TEXTURE_COORD
 #define GLU_NURBS_TEXTURE_COORD            100168
 #endif
diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp
index a8eb9bca..fdff38e2 100644
--- a/tdescreensaver/kxsconfig/kxsconfig.cpp
+++ b/tdescreensaver/kxsconfig/kxsconfig.cpp
@@ -49,9 +49,9 @@
 #include <kdialogbase.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kxsconfig.h"
 #include "kxscontrol.h"
diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp
index 594a0255..294c18bd 100644
--- a/tdescreensaver/kxsconfig/kxscontrol.cpp
+++ b/tdescreensaver/kxsconfig/kxscontrol.cpp
@@ -27,7 +27,7 @@
 #include <tqspinbox.h>
 #include <tqpushbutton.h>
 #include <tqxml.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include "kxscontrol.h"
 
diff --git a/tdescreensaver/kxsconfig/kxsitem.cpp b/tdescreensaver/kxsconfig/kxsitem.cpp
index 96e20758..62614cb6 100644
--- a/tdescreensaver/kxsconfig/kxsitem.cpp
+++ b/tdescreensaver/kxsconfig/kxsitem.cpp
@@ -20,7 +20,7 @@
 // Boston, MA 02110-1301, USA.
 
 #include "kxsconfig.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqxml.h>
 
 //===========================================================================
diff --git a/tdescreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp
index 2151f306..1d7f6cc6 100644
--- a/tdescreensaver/kxsconfig/kxsrun.cpp
+++ b/tdescreensaver/kxsconfig/kxsrun.cpp
@@ -33,7 +33,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "kxsitem.h"
diff --git a/tdescreensaver/tdepartsaver/configwidget.ui b/tdescreensaver/tdepartsaver/configwidget.ui
index a246d8f4..75fc07db 100644
--- a/tdescreensaver/tdepartsaver/configwidget.ui
+++ b/tdescreensaver/tdepartsaver/configwidget.ui
@@ -293,7 +293,7 @@
     </vbox>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
+    <include location="global" impldecl="in declaration">tdelocale.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
index 10eb9a5a..69628e66 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <klibloader.h>
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.h b/tdescreensaver/tdepartsaver/tdepartsaver.h
index feba06ed..8ce95052 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.h
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.h
@@ -31,7 +31,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/tdescreensaver/xsavers/demowin.h b/tdescreensaver/xsavers/demowin.h
index dea8b376..c20f5495 100644
--- a/tdescreensaver/xsavers/demowin.h
+++ b/tdescreensaver/xsavers/demowin.h
@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
diff --git a/tdescreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp
index 3456c943..d649caec 100644
--- a/tdescreensaver/xsavers/main.cpp
+++ b/tdescreensaver/xsavers/main.cpp
@@ -13,7 +13,7 @@
 
 #include <tqcolor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/tdescreensaver/xsavers/saver.cpp b/tdescreensaver/xsavers/saver.cpp
index dc3c3977..10343267 100644
--- a/tdescreensaver/xsavers/saver.cpp
+++ b/tdescreensaver/xsavers/saver.cpp
@@ -1,7 +1,7 @@
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <X11/Xlib.h>
 
diff --git a/tdescreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp
index bd87a9b4..c94294c5 100644
--- a/tdescreensaver/xsavers/space.cpp
+++ b/tdescreensaver/xsavers/space.cpp
@@ -51,7 +51,7 @@
 
 #include <tqslider.h>
 #include <tqlayout.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <krandomsequence.h>
 #include <kdebug.h>
@@ -63,7 +63,7 @@
 
 #ifdef HAVE_GL
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #undef index
 #include "space.h"
@@ -467,7 +467,7 @@ initSpace(Window window)
 #include <tqlabel.h>
 #include <tqcolor.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "space.moc"
 
diff --git a/tdescreensaver/xsavers/swarm.cpp b/tdescreensaver/xsavers/swarm.cpp
index 9c5a4923..c813d809 100644
--- a/tdescreensaver/xsavers/swarm.cpp
+++ b/tdescreensaver/xsavers/swarm.cpp
@@ -22,7 +22,7 @@
 #define DEFBATCH 20
 
 #include <tqslider.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <krandomsequence.h>
 #include "xlock.h"
@@ -222,8 +222,8 @@ drawswarm(Window win, KRandomSequence &rnd)
 #include <tqcolor.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "swarm.h"
 #include "swarm.moc"