diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /twin/clients/default | |
parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'twin/clients/default')
-rw-r--r-- | twin/clients/default/config/config.cpp | 4 | ||||
-rw-r--r-- | twin/clients/default/kdedefault.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index 8e53dcc75..f479c0c69 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -8,10 +8,10 @@ */ #include "config.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tqwhatsthis.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpixmap.h> #include <tqvbox.h> diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index 938a9e06d..7892c4adc 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -13,11 +13,11 @@ #include "kdedefault.h" #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kpixmapeffect.h> #include <kimageeffect.h> #include <kdrawutil.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqdrawutil.h> #include <tqbitmap.h> |