From 3fbcc4ac109b550db8ab5cbaa2e3bfa620477cb5 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 1 Jun 2019 14:42:38 +0900
Subject: Completed previous commit. Some files had not been properly updated.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 digikam/digikam/kipiinterface.cpp | 8 ++++----
 digikam/digikam/kipiinterface.h   | 4 ++--
 digikam/libs/dimg/dimgprivate.h   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp
index b721a13d..7b30c517 100644
--- a/digikam/digikam/kipiinterface.cpp
+++ b/digikam/digikam/kipiinterface.cpp
@@ -181,9 +181,9 @@ void DigikamImageInfo::cloneData( ImageInfoShared* other )
     addAttributes( other->attributes() );
 }
 
-TQMap<TQString, TQVariant> DigikamImageInfo::attributes()
+TQStringVariantMap DigikamImageInfo::attributes()
 {
-    TQMap<TQString, TQVariant> res;
+    TQStringVariantMap res;
 
     PAlbum* p = parentAlbum();
     if (p)
@@ -204,14 +204,14 @@ TQMap<TQString, TQVariant> DigikamImageInfo::attributes()
     return res;
 }
 
-void DigikamImageInfo::addAttributes(const TQMap<TQString, TQVariant>& res)
+void DigikamImageInfo::addAttributes(const TQStringVariantMap& res)
 {
     PAlbum* p = parentAlbum();
     if (p)
     {
         AlbumDB* db                        = AlbumManager::instance()->albumDB();
         TQ_LLONG imageId                    = db->getImageId(p->id(), _url.filename());
-        TQMap<TQString, TQVariant> attributes = res;
+        TQStringVariantMap attributes = res;
         
         // Set digiKam Tags list of picture.
         if (attributes.find("tags") != attributes.end())
diff --git a/digikam/digikam/kipiinterface.h b/digikam/digikam/kipiinterface.h
index 37f124a2..7c1a2552 100644
--- a/digikam/digikam/kipiinterface.h
+++ b/digikam/digikam/kipiinterface.h
@@ -88,8 +88,8 @@ public:
     virtual TQDateTime time( KIPI::TimeSpec spec );
     virtual void setTime( const TQDateTime& time, KIPI::TimeSpec spec = KIPI::FromInfo );
     
-    virtual TQMap<TQString, TQVariant> attributes();                    
-    virtual void addAttributes(const TQMap<TQString, TQVariant>& res);
+    virtual TQStringVariantMap attributes();
+    virtual void addAttributes(const TQStringVariantMap& res);
     virtual void clearAttributes();
     
     virtual int  angle();
diff --git a/digikam/libs/dimg/dimgprivate.h b/digikam/libs/dimg/dimgprivate.h
index 021e98ff..021208d3 100644
--- a/digikam/libs/dimg/dimgprivate.h
+++ b/digikam/libs/dimg/dimgprivate.h
@@ -71,7 +71,7 @@ public:
     unsigned char          *data;
     
     TQMap<int, TQByteArray>   metaData;
-    TQMap<TQString, TQVariant> attributes;
+    TQStringVariantMap attributes;
     TQMap<TQString, TQString>  embeddedText;
 
 };
-- 
cgit v1.2.1