Rename kiobuffer and KHTML

pull/1/head
Timothy Pearson 12 years ago
parent 34289d2ab8
commit 220812aa70

@ -2099,7 +2099,7 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@ -2120,7 +2120,7 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")

@ -1 +1 @@
Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d Subproject commit 274366fb8b90704586d7beef216b765cc0688b08

@ -175,7 +175,7 @@ TQString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum)
TQString KExiv2Priv::detectEncodingAndDecode(const std::string &value) TQString KExiv2Priv::detectEncodingAndDecode(const std::string &value)
{ {
// For charset autodetection, we could use sophisticated code // For charset autodetection, we could use sophisticated code
// (Mozilla chardet, KHTML's autodetection, TQTextCodec::codecForContent), // (Mozilla chardet, TDEHTML's autodetection, TQTextCodec::codecForContent),
// but that is probably too much. // but that is probably too much.
// We check for UTF8, Local encoding and ASCII. // We check for UTF8, Local encoding and ASCII.

Loading…
Cancel
Save