summaryrefslogtreecommitdiffstats
path: root/khexedit/optiondialog.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:04 -0600
commit783715b853042d24841e3e888051f3a184e78a40 (patch)
tree33ce107e439bb622368ba17b8a2a6485ef28e3b5 /khexedit/optiondialog.cc
parent980088ed866120f458c10c1ec64295e84ad8ba82 (diff)
downloadtdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz
tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/optiondialog.cc')
-rw-r--r--khexedit/optiondialog.cc4
1 files changed, 2 insertions, 2 deletions
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>