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 /ksplashml/themeengine | |
| 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')
| -rw-r--r-- | ksplashml/themeengine/default/themelegacy.cpp | 4 | ||||
| -rw-r--r-- | ksplashml/themeengine/objkstheme.cpp | 4 | ||||
| -rw-r--r-- | ksplashml/themeengine/redmond/previewredmond.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/redmond/themeredmond.cpp | 6 | ||||
| -rw-r--r-- | ksplashml/themeengine/standard/themestandard.cpp | 4 | ||||
| -rw-r--r-- | ksplashml/themeengine/standard/wndicon.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/standard/wndstatus.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/themeengine.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/unified/themeunified.cpp | 4 |
9 files changed, 15 insertions, 15 deletions
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 064b404b7..bd56f968b 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -13,8 +13,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kprogress.h> diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index 450bef75a..89a9601be 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -13,8 +13,8 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqcolor.h> 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> diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index ee7fefb0d..ce0fd124e 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -12,9 +12,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeconfig.h> diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 9ddf7e6a7..030456f4e 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -18,7 +18,7 @@ #include <kcursor.h> #include <kdebug.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <twin.h> #include <tqdesktopwidget.h> diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index a89a8301f..b3a2e69f9 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -13,7 +13,7 @@ #include <tdeapplication.h> #include <kcursor.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kprogress.h> #include <twin.h> diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index 45f8bbbcc..9a7d3aba5 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -17,7 +17,7 @@ #include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <twin.h> #include <tqevent.h> diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp index 9d3d2c3e5..0a2eb6343 100644 --- a/ksplashml/themeengine/unified/themeunified.cpp +++ b/ksplashml/themeengine/unified/themeunified.cpp @@ -13,8 +13,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kprogress.h> |