TDE
/
libkexiv2
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/libkexiv2
0
0
Fork 0
Code Issues Releases Wiki Activity

rename the following methods:

Browse Source 
tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/libkexiv2@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 089f25de8a
commit a33d3b9e5b
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

34
libkexiv2/libkexiv2/kexiv2.cpp
Unescape View File

@ -408,7 +408,7 @@ bool KExiv2::save(const TQString& filePath)
// TIFF/EP Raw files based are supported by Exiv2 0.18 as experimental. We will do touch it for the moment. // TIFF/EP Raw files based are supported by Exiv2 0.18 as experimental. We will do touch it for the moment.
// Metadata writing is supported in implementation from svn trunk. // Metadata writing is supported in implementation from svn trunk.
TQString rawTiffBased("dng nef pef 3fr arw cr2 dcr erf k25 kdc mos orf raw sr2 srf"); TQString rawTiffBased("dng nef pef 3fr arw cr2 dcr erf k25 kdc mos orf raw sr2 srf");
if (rawTiffBased.tqcontains(finfo.extension(false).lower())) if (rawTiffBased.contains(finfo.extension(false).lower()))
{ {
qDebug("'%s' is TIFF based RAW file and writing mode is disable with this libkexiv2 version. Metadata not saved.", qDebug("'%s' is TIFF based RAW file and writing mode is disable with this libkexiv2 version. Metadata not saved.",
finfo.fileName().ascii()); finfo.fileName().ascii());
@ -462,7 +462,7 @@ bool KExiv2::save(const TQString& filePath)
for (Exiv2::ExifData::iterator it = d->exifMetadata.begin(); it != d->exifMetadata.end(); ++it) for (Exiv2::ExifData::iterator it = d->exifMetadata.begin(); it != d->exifMetadata.end(); ++it)
{ {
if (!untouchedTags.tqcontains(it->key().c_str())) if (!untouchedTags.contains(it->key().c_str()))
{ {
exif[it->key().c_str()] = d->exifMetadata[it->key().c_str()]; exif[it->key().c_str()] = d->exifMetadata[it->key().c_str()];
} }
@ -1003,7 +1003,7 @@ KExiv2::ImageColorWorkSpace KExiv2::getImageColorWorkSpace() const
{ {
// Nikon camera set Exif.Photo.ColorSpace to uncalibrated and // Nikon camera set Exif.Photo.ColorSpace to uncalibrated and
// Exif.Nikon3.ColorMode to "MODE2" when users work in AdobRGB color space. // Exif.Nikon3.ColorMode to "MODE2" when users work in AdobRGB color space.
if (getExifTagString("Exif.Nikon3.ColorMode").tqcontains("MODE2")) if (getExifTagString("Exif.Nikon3.ColorMode").contains("MODE2"))
return WORKSPACE_ADOBERGB; return WORKSPACE_ADOBERGB;
// TODO : add more Makernote parsing here ... // TODO : add more Makernote parsing here ...
@ -1289,7 +1289,7 @@ TQString KExiv2::getExifTagString(const char* exifTagName, bool escapeCR) const
TQString tagValue = TQString::fromLocal8Bit(os.str().c_str()); TQString tagValue = TQString::fromLocal8Bit(os.str().c_str());
#endif #endif
if (escapeCR) if (escapeCR)
tagValue.tqreplace("\n", " "); tagValue.replace("\n", " ");
return tagValue; return tagValue;
} }
@ -1335,7 +1335,7 @@ TQString KExiv2::getIptcTagString(const char* iptcTagName, bool escapeCR) const
TQString tagValue = TQString::fromLocal8Bit(os.str().c_str()); TQString tagValue = TQString::fromLocal8Bit(os.str().c_str());
if (escapeCR) if (escapeCR)
tagValue.tqreplace("\n", " "); tagValue.replace("\n", " ");
return tagValue; return tagValue;
} }
@ -1700,18 +1700,18 @@ KExiv2::MetaDataMap KExiv2::getExifTagsDataList(const TQStringList &exifKeysFilt
// Exif tag contents can be an i18n strings, no only simple ascii. // Exif tag contents can be an i18n strings, no only simple ascii.
tagValue = TQString::fromLocal8Bit(os.str().c_str()); tagValue = TQString::fromLocal8Bit(os.str().c_str());
} }
tagValue.tqreplace("\n", " "); tagValue.replace("\n", " ");
// We apply a filter to get only the Exif tags that we need. // We apply a filter to get only the Exif tags that we need.
if (!invertSelection) if (!invertSelection)
{ {
if (exifKeysFilter.tqcontains(key.section(".", 1, 1))) if (exifKeysFilter.contains(key.section(".", 1, 1)))
metaDataMap.insert(key, tagValue); metaDataMap.insert(key, tagValue);
} }
else else
{ {
if (!exifKeysFilter.tqcontains(key.section(".", 1, 1))) if (!exifKeysFilter.contains(key.section(".", 1, 1)))
metaDataMap.insert(key, tagValue); metaDataMap.insert(key, tagValue);
} }
} }
@ -1748,16 +1748,16 @@ KExiv2::MetaDataMap KExiv2::getIptcTagsDataList(const TQStringList &iptcKeysFilt
os << *md; os << *md;
TQString value = TQString::fromAscii(os.str().c_str()); TQString value = TQString::fromAscii(os.str().c_str());
// To make a string just on one line. // To make a string just on one line.
value.tqreplace("\n", " "); value.replace("\n", " ");
// Some IPTC key are redondancy. check if already one exist... // Some IPTC key are redondancy. check if already one exist...
MetaDataMap::iterator it = metaDataMap.tqfind(key); MetaDataMap::iterator it = metaDataMap.find(key);
// We apply a filter to get only the Exif tags that we need. // We apply a filter to get only the Exif tags that we need.
if (!invertSelection) if (!invertSelection)
{ {
if (iptcKeysFilter.tqcontains(key.section(".", 1, 1))) if (iptcKeysFilter.contains(key.section(".", 1, 1)))
{ {
if (it == metaDataMap.end()) if (it == metaDataMap.end())
metaDataMap.insert(key, value); metaDataMap.insert(key, value);
@ -1766,13 +1766,13 @@ KExiv2::MetaDataMap KExiv2::getIptcTagsDataList(const TQStringList &iptcKeysFilt
TQString v = *it; TQString v = *it;
v.append(", "); v.append(", ");
v.append(value); v.append(value);
metaDataMap.tqreplace(key, v); metaDataMap.replace(key, v);
} }
} }
} }
else else
{ {
if (!iptcKeysFilter.tqcontains(key.section(".", 1, 1))) if (!iptcKeysFilter.contains(key.section(".", 1, 1)))
{ {
if (it == metaDataMap.end()) if (it == metaDataMap.end())
metaDataMap.insert(key, value); metaDataMap.insert(key, value);
@ -1781,7 +1781,7 @@ KExiv2::MetaDataMap KExiv2::getIptcTagsDataList(const TQStringList &iptcKeysFilt
TQString v = *it; TQString v = *it;
v.append(", "); v.append(", ");
v.append(value); v.append(value);
metaDataMap.tqreplace(key, v); metaDataMap.replace(key, v);
} }
} }
} }
@ -2164,7 +2164,7 @@ bool KExiv2::setImageKeywords(const TQStringList& oldKeywords, const TQStringLis
// Also remove new keywords to avoid duplicates. They will be added again below. // Also remove new keywords to avoid duplicates. They will be added again below.
if ( key == TQString("Iptc.Application2.Keywords") && if ( key == TQString("Iptc.Application2.Keywords") &&
(oldKeywords.tqcontains(val) || newKeywords.tqcontains(val)) (oldKeywords.contains(val) || newKeywords.contains(val))
) )
it = iptcData.erase(it); it = iptcData.erase(it);
else else
@ -2248,7 +2248,7 @@ bool KExiv2::setImageSubjects(const TQStringList& oldSubjects, const TQStringLis
TQString key = TQString::fromLocal8Bit(it->key().c_str()); TQString key = TQString::fromLocal8Bit(it->key().c_str());
TQString val(it->toString().c_str()); TQString val(it->toString().c_str());
if (key == TQString("Iptc.Application2.Subject") && oldDef.tqcontains(val)) if (key == TQString("Iptc.Application2.Subject") && oldDef.contains(val))
it = iptcData.erase(it); it = iptcData.erase(it);
else else
++it; ++it;
@ -2331,7 +2331,7 @@ bool KExiv2::setImageSubCategories(const TQStringList& oldSubCategories, const T
TQString key = TQString::fromLocal8Bit(it->key().c_str()); TQString key = TQString::fromLocal8Bit(it->key().c_str());
TQString val(it->toString().c_str()); TQString val(it->toString().c_str());
if (key == TQString("Iptc.Application2.SuppCategory") && oldSubCategories.tqcontains(val)) if (key == TQString("Iptc.Application2.SuppCategory") && oldSubCategories.contains(val))
it = iptcData.erase(it); it = iptcData.erase(it);
else else
++it; ++it;

Write Preview
Loading…
Cancel
Save