d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-14 08:48:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert "WebUI: Use QVariantMap instead of QVariantHash"

Browse Source 
This reverts commit d49c79d032.
This commit is contained in:
sledgehammer999 2015-04-11 12:43:22 +03:00
parent daaac6fd10
commit 3c58b0cc9a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/webui/btjson.cpp
View File

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