summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 20:55:03 -0600
committerTimothy Pearson <[email protected]>2013-01-27 20:55:03 -0600
commitdfbcbbfd362a224c92a8c58814302f5e7d4ada33 (patch)
treee3e9c55fc1203d64539f33a5d82f5f5fcb7d4c2e
parent349efc60a44ddeac59e3324eb147370b700a2f00 (diff)
downloadgwenview-dfbcbbfd362a224c92a8c58814302f5e7d4ada33.tar.gz
gwenview-dfbcbbfd362a224c92a8c58814302f5e7d4ada33.zip
Rename kiobuffer and KHTML
-rw-r--r--acinclude.m44
m---------cmake0
-rw-r--r--src/gvimagepart/gvimagepart.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index b3e5f8d..bf56a86 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2066,7 +2066,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")
@@ -2087,7 +2087,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
-Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131
+Subproject 274366fb8b90704586d7beef216b765cc0688b0
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 131c14f..6b89051 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -138,7 +138,7 @@ void GVImagePart::partActivateEvent(KParts::PartActivateEvent* event) {
void GVImagePart::guiActivateEvent( KParts::GUIActivateEvent* event) {
- // Stolen from KHTMLImage
+ // Stolen from TDEHTMLImage
//
// prevent the base implementation from emitting setWindowCaption with
// our url. It destroys our pretty, previously caption. Konq saves/restores