summaryrefslogtreecommitdiffstats
path: root/khexedit/lib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
commitbd11bce76f195adf4f3806cef8cf2e0737c99ff2 (patch)
treee3c1714d74f67cc51cd04162cd4afa927dd7f7d4 /khexedit/lib
parent2d7591be424ae10d974d01e0e2f781d19ef07cd6 (diff)
downloadtdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.tar.gz
tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/lib')
-rw-r--r--khexedit/lib/Makefile.am2
-rw-r--r--khexedit/lib/kbufferranges.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/khexedit/lib/Makefile.am b/khexedit/lib/Makefile.am
index e2f9b3c..6b124d3 100644
--- a/khexedit/lib/Makefile.am
+++ b/khexedit/lib/Makefile.am
@@ -26,7 +26,7 @@ noinst_HEADERS = kcolumn.h kbordercolumn.h koffsetcolumn.h \
kbuffercolumn.h kvaluecolumn.h kcharcolumn.h \
kbytecodec.h koffsetformat.h khexedit_export.h \
kbuffercursor.h kbufferlayout.h kbufferranges.h \
- kbuffercoord.h kselection.h \
+ kbuffercoord.h tdeselection.h \
kcursor.h kbufferdrag.h \
kcoordrange.h ksectionlist.h kcoordrangelist.h \
khechar.h kcharcodec.h \
diff --git a/khexedit/lib/kbufferranges.h b/khexedit/lib/kbufferranges.h
index 622ff4a..28e9f80 100644
--- a/khexedit/lib/kbufferranges.h
+++ b/khexedit/lib/kbufferranges.h
@@ -20,7 +20,7 @@
// lib specific
#include "kbufferlayout.h"
-#include "kselection.h"
+#include "tdeselection.h"
#include "ksectionlist.h"
#include "kcoordrangelist.h"