Rename kiobuffer and KHTML

11 years ago · c5350fd422
parent dbf4561691
commit c5350fd422
5 changed files with 6 additions and 6 deletions
--- 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")
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d
+Subproject commit 274366fb8b90704586d7beef216b765cc0688b08
--- 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) \
--- 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):
--- 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