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

---
 acinclude.m4                        | 4 ++--
 cmake                               | 2 +-
 digikam/digikam/Makefile.am         | 2 +-
 digikam/digikam/welcomepageview.cpp | 2 +-
 digikam/digikam/welcomepageview.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 657f827a..2413bad5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2099,7 +2099,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")
@@ -2120,7 +2120,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 9a217903..274366fb 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d
+Subproject commit 274366fb8b90704586d7beef216b765cc0688b08
diff --git a/digikam/digikam/Makefile.am b/digikam/digikam/Makefile.am
index d0275929..e41214d0 100644
--- a/digikam/digikam/Makefile.am
+++ b/digikam/digikam/Makefile.am
@@ -115,7 +115,7 @@ libdigikam_la_LIBADD = $(LIB_SQLITE3) \
 		       $(LIB_KPARTS) \
 	               $(LIB_KIO) \
 	               $(LIB_KABC) \
-	               $(LIB_KHTML) \
+	               $(LIB_TDEHTML) \
 	               $(LIBKIPI_LIBS) \
 	               $(LIBKEXIV2_LIBS) \
 	               $(LIB_KUTILS) \
diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp
index 94654d54..dfc1c23c 100644
--- a/digikam/digikam/welcomepageview.cpp
+++ b/digikam/digikam/welcomepageview.cpp
@@ -48,7 +48,7 @@ namespace Digikam
 {
 
 WelcomePageView::WelcomePageView(TQWidget* parent)
-               : KHTMLPart(parent)
+               : TDEHTMLPart(parent)
 {
     widget()->setFocusPolicy(TQ_WheelFocus);
     // Let's better be paranoid and disable plugins (it defaults to enabled):
diff --git a/digikam/digikam/welcomepageview.h b/digikam/digikam/welcomepageview.h
index dc30110a..2aca4564 100644
--- a/digikam/digikam/welcomepageview.h
+++ b/digikam/digikam/welcomepageview.h
@@ -40,7 +40,7 @@
 namespace Digikam
 {
 
-class DIGIKAM_EXPORT WelcomePageView : public KHTMLPart
+class DIGIKAM_EXPORT WelcomePageView : public TDEHTMLPart
 {
     Q_OBJECT
 
-- 
cgit v1.2.1