summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:15 -0600
commitce1660ccd810825d9e087d0e9bc27dd4aea3e08a (patch)
tree57df8fa20601c7b06117399bd921a485b7476e4a
parent2a66a2cdb1c9c8017e821e34ec93732761b14d47 (diff)
downloadtdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.zip
tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.tar.gz
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--styles/phase/config/phasestyleconfig.cpp4
-rw-r--r--tdescreensaver/kdesavers/Euphoria.cpp6
-rw-r--r--tdescreensaver/kdesavers/Flux.cpp6
-rw-r--r--tdescreensaver/kdesavers/SolarWinds.cpp6
-rw-r--r--tdescreensaver/kdesavers/banner.cpp6
-rw-r--r--tdescreensaver/kdesavers/blob.cpp6
-rw-r--r--tdescreensaver/kdesavers/firesaver.cpp4
-rw-r--r--tdescreensaver/kdesavers/firesaverwriter.cpp2
-rw-r--r--tdescreensaver/kdesavers/fountain.cpp6
-rw-r--r--tdescreensaver/kdesavers/gravity.cpp4
-rw-r--r--tdescreensaver/kdesavers/kclock.cpp6
-rw-r--r--tdescreensaver/kdesavers/kvm.cpp6
-rw-r--r--tdescreensaver/kdesavers/lines.cpp6
-rw-r--r--tdescreensaver/kdesavers/lorenz.cpp6
-rw-r--r--tdescreensaver/kdesavers/pendulum.cpp4
-rw-r--r--tdescreensaver/kdesavers/polygon.cpp6
-rw-r--r--tdescreensaver/kdesavers/rotation.cpp4
-rw-r--r--tdescreensaver/kdesavers/science.cpp6
-rw-r--r--tdescreensaver/kdesavers/slideshow.cpp6
-rw-r--r--tdescreensaver/kdesavers/wave.cpp6
-rw-r--r--tdescreensaver/kxsconfig/kxsconfig.cpp4
-rw-r--r--tdescreensaver/kxsconfig/kxscontrol.cpp2
-rw-r--r--tdescreensaver/kxsconfig/kxsitem.cpp2
-rw-r--r--tdescreensaver/kxsconfig/kxsrun.cpp2
-rw-r--r--tdescreensaver/tdepartsaver/configwidget.ui2
-rw-r--r--tdescreensaver/tdepartsaver/tdepartsaver.cpp2
-rw-r--r--tdescreensaver/tdepartsaver/tdepartsaver.h2
-rw-r--r--tdescreensaver/xsavers/demowin.h2
-rw-r--r--tdescreensaver/xsavers/main.cpp2
-rw-r--r--tdescreensaver/xsavers/saver.cpp4
-rw-r--r--tdescreensaver/xsavers/space.cpp6
-rw-r--r--tdescreensaver/xsavers/swarm.cpp6
-rw-r--r--twin-styles/cde/cdeclient.cpp2
-rw-r--r--twin-styles/cde/config/config.cpp4
-rw-r--r--twin-styles/glow/config/glowconfigdialog.cpp6
-rw-r--r--twin-styles/glow/glowclient.cpp2
-rw-r--r--twin-styles/icewm/config/config.cpp4
-rw-r--r--twin-styles/icewm/icewm.cpp4
-rw-r--r--twin-styles/kde1/kde1client.cpp2
-rw-r--r--twin-styles/kstep/nextclient.cpp2
-rw-r--r--twin-styles/openlook/OpenLook.cpp2
-rw-r--r--twin-styles/riscos/Button.h2
-rw-r--r--twin-styles/smooth-blend/client/config/smoothblendconfig.cc4
-rw-r--r--twin-styles/smooth-blend/client/smoothblend.cc6
-rw-r--r--twin-styles/system/systemclient.cpp2
45 files changed, 92 insertions, 92 deletions
diff --git a/styles/phase/config/phasestyleconfig.cpp b/styles/phase/config/phasestyleconfig.cpp
index bc53422..990b98e 100644
--- a/styles/phase/config/phasestyleconfig.cpp
+++ b/styles/phase/config/phasestyleconfig.cpp
@@ -11,8 +11,8 @@
#include <tqcheckbox.h>
#include <tqgroupbox.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include "phasestyleconfig.h"
#include "styledialog.h"
diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp
index bae407d..0357ac3 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 507b243..ff5c561 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 ed0856a..07be1cc 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 b8d0133..706393c 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 2f09b19..b84fc78 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 7c7c266..903a911 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 ff78fc5..268b55b 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 310bd8f..1350a12 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 f671049..119224c 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 c1838cf..8cf1788 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 d2af8df..d1384a2 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 720261e..2fb57c2 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 5981748..2d52158 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 1b2abc0..a8aebd4 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 f4cb08b..8ce1667 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 30b49da..c960c66 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 7ac72b2..2430908 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 e83aa5f..066117a 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 685669a..880219b 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 a8eb9bc..fdff38e 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 594a025..294c18b 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 96e2075..62614cb 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 2151f30..1d7f6cc 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 a246d8f..75fc07d 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 10eb9a5..69628e6 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 feba06e..8ce9505 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 dea8b37..c20f549 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 3456c94..d649cae 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 dc3c397..1034326 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 bd87a9b..c94294c 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 9c5a492..c813d80 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"
diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp
index 5768f1b..a2071de 100644
--- a/twin-styles/cde/cdeclient.cpp
+++ b/twin-styles/cde/cdeclient.cpp
@@ -27,7 +27,7 @@
#include <tqdrawutil.h>
#include <tqpainter.h>
#include <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
extern "C" KDE_EXPORT KDecorationFactory* create_factory()
diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp
index 3905a58..0a6ce4f 100644
--- a/twin-styles/cde/config/config.cpp
+++ b/twin-styles/cde/config/config.cpp
@@ -1,10 +1,10 @@
// $Id$
#include "config.h"
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqwhatsthis.h>
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
extern "C" KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
{
diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp
index dad8665..6a80ed6 100644
--- a/twin-styles/glow/config/glowconfigdialog.cpp
+++ b/twin-styles/glow/config/glowconfigdialog.cpp
@@ -31,9 +31,9 @@
#include <tdeconfig.h>
#include <kcolorbutton.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
#include <kstandarddirs.h>
diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp
index 16d33c6..41435e8 100644
--- a/twin-styles/glow/glowclient.cpp
+++ b/twin-styles/glow/glowclient.cpp
@@ -23,7 +23,7 @@
#include <tqpixmap.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpixmapeffect.h>
#include <kpixmap.h>
#include <kstandarddirs.h>
diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp
index 870ceb0..21cd1ea 100644
--- a/twin-styles/icewm/config/config.cpp
+++ b/twin-styles/icewm/config/config.cpp
@@ -29,8 +29,8 @@
#include <tqregexp.h>
#include <tqvbox.h>
#include <tqwhatsthis.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdialog.h>
#include <kdirwatch.h>
diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp
index 495562d..0edaee1 100644
--- a/twin-styles/icewm/icewm.cpp
+++ b/twin-styles/icewm/icewm.cpp
@@ -42,8 +42,8 @@
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdrawutil.h>
#include <tqapplication.h>
#include <tqlabel.h>
diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp
index 6b7e064..e45313f 100644
--- a/twin-styles/kde1/kde1client.cpp
+++ b/twin-styles/kde1/kde1client.cpp
@@ -11,7 +11,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
#include <tqdrawutil.h>
#include <tqbitmap.h>
#include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpixmap.h>
#include <tqdatetime.h>
#include <tqimage.h>
diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp
index 99f878a..ec4ad28 100644
--- a/twin-styles/kstep/nextclient.cpp
+++ b/twin-styles/kstep/nextclient.cpp
@@ -7,7 +7,7 @@
#include <tqlabel.h>
#include <tqtooltip.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpixmapeffect.h>
namespace KStep {
diff --git a/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp
index 590ea07..d0f3bff 100644
--- a/twin-styles/openlook/OpenLook.cpp
+++ b/twin-styles/openlook/OpenLook.cpp
@@ -35,7 +35,7 @@
#include <tqpixmap.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "OpenLook.h"
diff --git a/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h
index 116857d..429aa11 100644
--- a/twin-styles/riscos/Button.h
+++ b/twin-styles/riscos/Button.h
@@ -25,7 +25,7 @@
#include <tqpixmap.h>
#include <tqwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdecoration.h>
namespace RiscOS
diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cc b/twin-styles/smooth-blend/client/config/smoothblendconfig.cc
index 8ed1416..b4a6442 100644
--- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cc
+++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cc
@@ -8,8 +8,8 @@
//////////////////////////////////////////////////////////////////////////////
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tqbuttongroup.h>
#include <tqgroupbox.h>
#include <tqradiobutton.h>
diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc
index de3af31..e60b297 100644
--- a/twin-styles/smooth-blend/client/smoothblend.cc
+++ b/twin-styles/smooth-blend/client/smoothblend.cc
@@ -9,9 +9,9 @@
#include <tdeconfig.h>
#include <tdeversion.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kpixmap.h>
#include <kimageeffect.h>
#include <kpixmapeffect.h>
diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp
index 747f03b..69e0709 100644
--- a/twin-styles/system/systemclient.cpp
+++ b/twin-styles/system/systemclient.cpp
@@ -9,7 +9,7 @@
#include <kpixmapeffect.h>
#include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kdebug.h>