From 9cf777a45e756b1c9321df52bff937c0d9ff4a14 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 20:58:03 -0600
Subject: Rename kiobuffer and KHTML

---
 acinclude.m4               | 4 ++--
 cmake                      | 2 +-
 konversation/src/decoder.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 13a4e01..d7fe8c0 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2090,7 +2090,7 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@@ -2111,7 +2111,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
diff --git a/cmake b/cmake
index 9a21790..274366f 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d
+Subproject commit 274366fb8b90704586d7beef216b765cc0688b08
diff --git a/konversation/src/decoder.h b/konversation/src/decoder.h
index c951413..12e4dee 100644
--- a/konversation/src/decoder.h
+++ b/konversation/src/decoder.h
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 
 */
-#ifndef KHTMLDECODER_H
-#define KHTMLDECODER_H
+#ifndef TDEHTMLDECODER_H
+#define TDEHTMLDECODER_H
 
 #include <tqstring.h>
 
-- 
cgit v1.2.3