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

---
 khexedit/parts/kpart/khepart.cpp        | 4 ++--
 khexedit/parts/kpart/khepartfactory.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'khexedit/parts/kpart')

diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index f7afb56..e23e26a 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -16,11 +16,11 @@
 
 
 // kde specific
-#include <klocale.h>
+#include <tdelocale.h>
 //#include <kinstance.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-//#include <kglobalsettings.h>
+//#include <tdeglobalsettings.h>
 // app specific
 #include "khexedit.h"
 #include "kcharcodec.h"
diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp
index b7116e6..7a9cce4 100644
--- a/khexedit/parts/kpart/khepartfactory.cpp
+++ b/khexedit/parts/kpart/khepartfactory.cpp
@@ -18,7 +18,7 @@
 // kde specific
 #include <kinstance.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 // app specific
 #include "khepart.h"
 #include "khepartfactory.h"
-- 
cgit v1.2.1