From 6791941276f854b17bfa5987d6f955f98c8440af Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:18:28 -0600 Subject: Rename old tq methods that no longer need a unique name --- libkexiv2/libkexiv2/kexiv2private.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libkexiv2/libkexiv2/kexiv2private.cpp b/libkexiv2/libkexiv2/kexiv2private.cpp index 180806b..65f03f0 100644 --- a/libkexiv2/libkexiv2/kexiv2private.cpp +++ b/libkexiv2/libkexiv2/kexiv2private.cpp @@ -157,7 +157,7 @@ TQString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum) } else if (charset == "\"Ascii\"") { - return TQString::tqfromLatin1(comment.c_str()); + return TQString::fromLatin1(comment.c_str()); } else { @@ -215,12 +215,12 @@ TQString KExiv2Priv::detectEncodingAndDecode(const std::string &value) // workaround for bug #134999: // The TQLatin15Codec may crash if strlen < value.length() int length = value.length(); - if (localCodec->name() == TQString::tqfromLatin1("ISO 8859-15")) + if (localCodec->name() == TQString::fromLatin1("ISO 8859-15")) length = strlen(value.c_str()); return localCodec->toUnicode(value.c_str(), length); } else - return TQString::tqfromLatin1(value.c_str()); + return TQString::fromLatin1(value.c_str()); } } // NameSpace KExiv2Iface -- cgit v1.2.3