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/optiondialog.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'khexedit/optiondialog.cc')

diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 0b17930..789d739 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -35,8 +35,8 @@
 #include <kcolordrag.h>
 #include <tdefontdialog.h> // For TDEFontChooser
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 
 #include "optiondialog.h"
 #include <tqpushbutton.h>
-- 
cgit v1.2.1