Branch: master

91274161 2019-06-01 05:22:02 Michele Calgaro 
Adjusted to use new TQStringVariantMap type.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M digikam/utilities/cameragui/cameracontroller.cpp

digikam/utilities/cameragui/cameracontroller.cpp

diff --git a/digikam/utilities/cameragui/cameracontroller.cpp b/digikam/utilities/cameragui/cameracontroller.cpp
index a080f77..947df78 100644
--- a/digikam/utilities/cameragui/cameracontroller.cpp
+++ b/digikam/utilities/cameragui/cameracontroller.cpp
@@ -95,7 +95,7 @@
     };
 
     Action                 action;
-    TQMap<TQString,TQVariant> map; 
+    TQStringVariantMap map;
 };
 
 class CameraEvent : public TQCustomEvent
@@ -131,7 +131,7 @@
 
     bool                   result;
     TQString                msg;
-    TQMap<TQString,TQVariant> map; 
+    TQStringVariantMap map;
 };
 
 class CameraControllerPriv
3fbcc4ac 2019-06-01 05:42:38 Michele Calgaro 
Completed previous commit. Some files had not been properly updated.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M digikam/digikam/kipiinterface.cpp
M digikam/digikam/kipiinterface.h
M digikam/libs/dimg/dimgprivate.h

digikam/digikam/kipiinterface.cpp

diff --git a/digikam/digikam/kipiinterface.cpp b/digikam/digikam/kipiinterface.cpp
index b721a13..7b30c51 100644
--- a/digikam/digikam/kipiinterface.cpp
+++ b/digikam/digikam/kipiinterface.cpp
@@ -181,9 +181,9 @@
     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 @@
     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())

digikam/digikam/kipiinterface.h

diff --git a/digikam/digikam/kipiinterface.h b/digikam/digikam/kipiinterface.h
index 37f124a..7c1a255 100644
--- a/digikam/digikam/kipiinterface.h
+++ b/digikam/digikam/kipiinterface.h
@@ -88,8 +88,8 @@
     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();

digikam/libs/dimg/dimgprivate.h

diff --git a/digikam/libs/dimg/dimgprivate.h b/digikam/libs/dimg/dimgprivate.h
index 021e98f..021208d 100644
--- a/digikam/libs/dimg/dimgprivate.h
+++ b/digikam/libs/dimg/dimgprivate.h
@@ -71,7 +71,7 @@
     unsigned char          *data;
     
     TQMap<int, TQByteArray>   metaData;
-    TQMap<TQString, TQVariant> attributes;
+    TQStringVariantMap attributes;
     TQMap<TQString, TQString>  embeddedText;
 
 };