diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:15 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:15 -0600 |
commit | ce1660ccd810825d9e087d0e9bc27dd4aea3e08a (patch) | |
tree | 57df8fa20601c7b06117399bd921a485b7476e4a /twin-styles | |
parent | 2a66a2cdb1c9c8017e821e34ec93732761b14d47 (diff) | |
download | tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.tar.gz tdeartwork-ce1660ccd810825d9e087d0e9bc27dd4aea3e08a.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'twin-styles')
-rw-r--r-- | twin-styles/cde/cdeclient.cpp | 2 | ||||
-rw-r--r-- | twin-styles/cde/config/config.cpp | 4 | ||||
-rw-r--r-- | twin-styles/glow/config/glowconfigdialog.cpp | 6 | ||||
-rw-r--r-- | twin-styles/glow/glowclient.cpp | 2 | ||||
-rw-r--r-- | twin-styles/icewm/config/config.cpp | 4 | ||||
-rw-r--r-- | twin-styles/icewm/icewm.cpp | 4 | ||||
-rw-r--r-- | twin-styles/kde1/kde1client.cpp | 2 | ||||
-rw-r--r-- | twin-styles/kstep/nextclient.cpp | 2 | ||||
-rw-r--r-- | twin-styles/openlook/OpenLook.cpp | 2 | ||||
-rw-r--r-- | twin-styles/riscos/Button.h | 2 | ||||
-rw-r--r-- | twin-styles/smooth-blend/client/config/smoothblendconfig.cc | 4 | ||||
-rw-r--r-- | twin-styles/smooth-blend/client/smoothblend.cc | 6 | ||||
-rw-r--r-- | twin-styles/system/systemclient.cpp | 2 |
13 files changed, 21 insertions, 21 deletions
diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index 5768f1bc..a2071de5 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 3905a583..0a6ce4f0 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 dad86658..6a80ed66 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 16d33c6f..41435e8f 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 870ceb06..21cd1ea5 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 495562d2..0edaee15 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 6b7e0649..e45313f3 100644 --- a/twin-styles/kde1/kde1client.cpp +++ b/twin-styles/kde1/kde1client.cpp @@ -11,7 +11,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <[email protected]> #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 99f878ac..ec4ad289 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 590ea07e..d0f3bff2 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 116857d6..429aa112 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 8ed14166..b4a64428 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 de3af31a..e60b297e 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 747f03b6..69e0709e 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> |