diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 21:01:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 21:01:02 -0600 |
| commit | 220812aa709a51b45f7038a30df8cb9133eb5a02 (patch) | |
| tree | 31a690808c04b61ea072d0cea4d2ceb77b2ac902 | |
| parent | 34289d2ab8dece6524c4e7afd18edbe8954e0215 (diff) | |
| download | libkexiv2-220812aa709a51b45f7038a30df8cb9133eb5a02.tar.gz libkexiv2-220812aa709a51b45f7038a30df8cb9133eb5a02.zip | |
Rename kiobuffer and KHTML
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | libkexiv2/libkexiv2/kexiv2private.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 5d61873..4b73468 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 -Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131 +Subproject 274366fb8b90704586d7beef216b765cc0688b0 diff --git a/libkexiv2/libkexiv2/kexiv2private.cpp b/libkexiv2/libkexiv2/kexiv2private.cpp index b9bb669..4cca2be 100644 --- a/libkexiv2/libkexiv2/kexiv2private.cpp +++ b/libkexiv2/libkexiv2/kexiv2private.cpp @@ -175,7 +175,7 @@ TQString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum) TQString KExiv2Priv::detectEncodingAndDecode(const std::string &value) { // 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. // We check for UTF8, Local encoding and ASCII. |