diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdm/kfrontend/themer | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdm/kfrontend/themer')
| -rw-r--r-- | tdm/kfrontend/themer/tdmitem.cpp | 2 | ||||
| -rw-r--r-- | tdm/kfrontend/themer/tdmlabel.cpp | 4 | ||||
| -rw-r--r-- | tdm/kfrontend/themer/tdmthemer.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index 13969c4bf..91ab5efda 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -29,7 +29,7 @@ #include "tdmlayout.h" #include "tdmconfig.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqframe.h> diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp index 8841eb22d..f2fae90a6 100644 --- a/tdm/kfrontend/themer/tdmlabel.cpp +++ b/tdm/kfrontend/themer/tdmlabel.cpp @@ -24,8 +24,8 @@ #include "tdmconfig.h" #include "../kgreeter.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kmacroexpander.h> #include <kdebug.h> diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp index da7580272..d485ab1ee 100644 --- a/tdm/kfrontend/themer/tdmthemer.cpp +++ b/tdm/kfrontend/themer/tdmthemer.cpp @@ -30,7 +30,7 @@ #include <kiconloader.h> #include <kimageeffect.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kdebug.h> |