summaryrefslogtreecommitdiffstats
path: root/kcontrol/background
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-15 22:07:52 -0600
committerAutomated System <[email protected]>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kcontrol/background
parentb2502b94cf23298f676853d91188b2cacc6ab0bd (diff)
parent77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff)
downloadtdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz
tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/background')
-rw-r--r--kcontrol/background/bgadvanced.cpp4
-rw-r--r--kcontrol/background/bgdialog.cpp4
-rw-r--r--kcontrol/background/bgmonitor.cpp2
-rw-r--r--kcontrol/background/bgrender.cpp2
-rw-r--r--kcontrol/background/bgsettings.cpp2
-rw-r--r--kcontrol/background/bgwallpaper.cpp2
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>