summaryrefslogtreecommitdiffstats
path: root/ksplashml/themeengine/standard
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /ksplashml/themeengine/standard
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml/themeengine/standard')
-rw-r--r--ksplashml/themeengine/standard/themestandard.cpp4
-rw-r--r--ksplashml/themeengine/standard/wndicon.cpp2
-rw-r--r--ksplashml/themeengine/standard/wndstatus.cpp2
3 files changed, 4 insertions, 4 deletions
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>