Merge pull request #2852 from pmzqla/qvarianthash

WebUI: Use QVariantMap instead of QVariantHash

src/webui/btjson.cpp

@@ -157,7 +157,7 @@ static const char KEY_SUFFIX_REMOVED[] = "_removed";
 QVariantMap getTranserInfoMap();
 QVariantMap toMap(const QTorrentHandle& h);
 void processMap(QVariantMap prevData, QVariantMap data, QVariantMap &syncData);
-void processHash(QVariantHash prevData, QVariantHash data, QVariantMap &syncData, QVariantList &removedItems);
+void processHash(QVariantMap prevData, QVariantMap data, QVariantMap &syncData, QVariantList &removedItems);
 void processList(QVariantList prevData, QVariantList data, QVariantList &syncData, QVariantList &removedItems);
 QVariantMap generateSyncData(int acceptedResponseId, QVariantMap data, QVariantMap &lastAcceptedData,  QVariantMap &lastData);
 
@@ -314,7 +314,7 @@ QByteArray btjson::getSyncMainData(int acceptedResponseId, QVariantMap &lastData
 {
     QVariantMap data;
 
-    QVariantHash torrents;
+    QVariantMap torrents;
 
     std::vector<torrent_handle> torrentsList = QBtSession::instance()->getTorrents();
     std::vector<torrent_handle>::const_iterator it = torrentsList.begin();
@@ -600,14 +600,7 @@ void processMap(QVariantMap prevData, QVariantMap data, QVariantMap &syncData)
         switch (data[key].type()) {
         case QVariant::Map: {
                 QVariantMap map;
-                processMap(prevData[key].toMap(), data[key].toMap(), map);
+                processHash(prevData[key].toMap(), data[key].toMap(), map, removedItems);
-                if (!map.isEmpty())
-                    syncData[key] = map;
-            }
-            break;
-        case QVariant::Hash: {
-                QVariantMap map;
-                processHash(prevData[key].toHash(), data[key].toHash(), map, removedItems);
                 if (!map.isEmpty())
                     syncData[key] = map;
                 if (!removedItems.isEmpty())
@@ -643,7 +636,7 @@ void processMap(QVariantMap prevData, QVariantMap data, QVariantMap &syncData)
 // Compare two lists of structures (prevData, data) and calculate difference (syncData, removedItems).
 // Structures encoded as map.
 // Lists are encoded as hash table (indexed by structure key value) to improve ease of searching for removed items.
-void processHash(QVariantHash prevData, QVariantHash data, QVariantMap &syncData, QVariantList &removedItems)
+void processHash(QVariantMap prevData, QVariantMap data, QVariantMap &syncData, QVariantList &removedItems)
 {
     // initialize output variables
     syncData.clear();