From 783715b853042d24841e3e888051f3a184e78a40 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:04 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kcharselect/kcharselectdia.cc | 2 +-
 kcharselect/main.cc           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'kcharselect')

diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index df3fa63..1df590b 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -13,7 +13,7 @@
 #include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 
 /******************************************************************/
diff --git a/kcharselect/main.cc b/kcharselect/main.cc
index 66d5771..cb74af5 100644
--- a/kcharselect/main.cc
+++ b/kcharselect/main.cc
@@ -10,7 +10,7 @@
 #include <tdeconfig.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 static const char description[] = 
 	I18N_NOOP("TDE character selection utility");
-- 
cgit v1.2.3