summaryrefslogtreecommitdiffstats
path: root/twin/clients/quartz
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:55:37 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /twin/clients/quartz
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'twin/clients/quartz')
-rw-r--r--twin/clients/quartz/config/config.cpp4
-rw-r--r--twin/clients/quartz/quartz.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index d3364af14..3ce86239b 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -8,9 +8,9 @@
*/
#include "config.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
extern "C"
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 00aee9c58..511fafa6f 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -16,8 +16,8 @@
#include <tdeconfig.h>
#include <kdrawutil.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kpixmapeffect.h>
#include <tqbitmap.h>
#include <tqdrawutil.h>