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 /ksplashml/themeengine/redmond | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml/themeengine/redmond')
| -rw-r--r-- | ksplashml/themeengine/redmond/previewredmond.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/redmond/themeredmond.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp index 3bfb80203..7a31a44b8 100644 --- a/ksplashml/themeengine/redmond/previewredmond.cpp +++ b/ksplashml/themeengine/redmond/previewredmond.cpp @@ -10,7 +10,7 @@ * * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> #include <tqpixmap.h> diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 38f54b8fe..b0e81ba72 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -19,12 +19,12 @@ #include <kdialogbase.h> #include <tdefontcombo.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kuser.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <tqcheckbox.h> #include <tqdesktopwidget.h> |