Completed previous commit. Some files had not been properly updated.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 5 years ago
parent 912741617c
commit 3fbcc4ac10
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -181,9 +181,9 @@ void DigikamImageInfo::cloneData( ImageInfoShared* other )
addAttributes( other->attributes() ); addAttributes( other->attributes() );
} }
TQMap<TQString, TQVariant> DigikamImageInfo::attributes() TQStringVariantMap DigikamImageInfo::attributes()
{ {
TQMap<TQString, TQVariant> res; TQStringVariantMap res;
PAlbum* p = parentAlbum(); PAlbum* p = parentAlbum();
if (p) if (p)
@ -204,14 +204,14 @@ TQMap<TQString, TQVariant> DigikamImageInfo::attributes()
return res; return res;
} }
void DigikamImageInfo::addAttributes(const TQMap<TQString, TQVariant>& res) void DigikamImageInfo::addAttributes(const TQStringVariantMap& res)
{ {
PAlbum* p = parentAlbum(); PAlbum* p = parentAlbum();
if (p) if (p)
{ {
AlbumDB* db = AlbumManager::instance()->albumDB(); AlbumDB* db = AlbumManager::instance()->albumDB();
TQ_LLONG imageId = db->getImageId(p->id(), _url.filename()); TQ_LLONG imageId = db->getImageId(p->id(), _url.filename());
TQMap<TQString, TQVariant> attributes = res; TQStringVariantMap attributes = res;
// Set digiKam Tags list of picture. // Set digiKam Tags list of picture.
if (attributes.find("tags") != attributes.end()) if (attributes.find("tags") != attributes.end())

@ -88,8 +88,8 @@ public:
virtual TQDateTime time( KIPI::TimeSpec spec ); virtual TQDateTime time( KIPI::TimeSpec spec );
virtual void setTime( const TQDateTime& time, KIPI::TimeSpec spec = KIPI::FromInfo ); virtual void setTime( const TQDateTime& time, KIPI::TimeSpec spec = KIPI::FromInfo );
virtual TQMap<TQString, TQVariant> attributes(); virtual TQStringVariantMap attributes();
virtual void addAttributes(const TQMap<TQString, TQVariant>& res); virtual void addAttributes(const TQStringVariantMap& res);
virtual void clearAttributes(); virtual void clearAttributes();
virtual int angle(); virtual int angle();

@ -71,7 +71,7 @@ public:
unsigned char *data; unsigned char *data;
TQMap<int, TQByteArray> metaData; TQMap<int, TQByteArray> metaData;
TQMap<TQString, TQVariant> attributes; TQStringVariantMap attributes;
TQMap<TQString, TQString> embeddedText; TQMap<TQString, TQString> embeddedText;
}; };

Loading…
Cancel
Save