summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:52:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:52:12 -0600
commita60c036acac4ed3000fa5e3516b5f0814d1119ec (patch)
tree0410eb9d505c981f9cc79c26ba54ec4d91548744
parent5df33a9e2a8bf3c38f18b469a6ece8776abc0582 (diff)
downloadtwin-style-crystal-a60c036acac4ed3000fa5e3516b5f0814d1119ec.tar.gz
twin-style-crystal-a60c036acac4ed3000fa5e3516b5f0814d1119ec.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--client/config/crystalconfig.cc4
-rw-r--r--client/crystalclient.cc6
2 files changed, 5 insertions, 5 deletions
diff --git a/client/config/crystalconfig.cc b/client/config/crystalconfig.cc
index be7ce3c..117aafc 100644
--- a/client/config/crystalconfig.cc
+++ b/client/config/crystalconfig.cc
@@ -19,8 +19,8 @@
***************************************************************************/
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tqbuttongroup.h>
#include <tqlabel.h>
#include <tqgroupbox.h>
diff --git a/client/crystalclient.cc b/client/crystalclient.cc
index 2459b4a..ef77e0d 100644
--- a/client/crystalclient.cc
+++ b/client/crystalclient.cc
@@ -20,9 +20,9 @@
#include "config.h"
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqbitmap.h>