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 /kcontrol/background | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/background')
| -rw-r--r-- | kcontrol/background/bgadvanced.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/background/bgdialog.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/background/bgmonitor.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/background/bgrender.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/background/bgsettings.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/background/bgwallpaper.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index bfe3eff28..697836797 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -34,8 +34,8 @@ #include <tdeconfig.h> #include <kcolorbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpixmap.h> #include <kstandarddirs.h> #include <twin.h> diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index ff200149a..d8d6efaa0 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -44,10 +44,10 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <tdefilemetainfo.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include <kstandarddirs.h> #include <kstringhandler.h> diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index f78a7b616..b9283360a 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -23,7 +23,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include <kstandarddirs.h> #include <kurldrag.h> diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 4f7a6be2c..08cb3055f 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -27,7 +27,7 @@ #include <kimageeffect.h> #include <kprocess.h> #include <kpixmapio.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kcursor.h> #include <kmimetype.h> #include <tdefilemetainfo.h> diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index cb6cf956d..d36d7f140 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -23,7 +23,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <krandomsequence.h> diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index 1edf37a8d..460c9c56c 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -29,7 +29,7 @@ #include <tdefiledialog.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kurldrag.h> |