diff options
| author | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
|---|---|---|
| committer | Automated System <[email protected]> | 2013-02-15 22:07:52 -0600 |
| commit | 0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch) | |
| tree | 8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /tdm/kfrontend/themer | |
| parent | b2502b94cf23298f676853d91188b2cacc6ab0bd (diff) | |
| parent | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff) | |
| download | tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
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> |