github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-16 02:03:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Added Json encode support for QVariantList and QStringList

Browse source
This commit is contained in:
Christophe Dumez 2010-02-28 17:24:35 +00:00
parent b7edfea4ce
commit 8f28804f8c
2 changed files with 30 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/eventmanager.cpp
View file

@ -231,9 +231,8 @@ QVariantMap EventManager::getGlobalPreferences() const {
data["save_path"] = Preferences::getSavePath(); data["save_path"] = Preferences::getSavePath();
data["temp_path_enabled"] = Preferences::isTempPathEnabled(); data["temp_path_enabled"] = Preferences::isTempPathEnabled();
data["temp_path"] = Preferences::getTempPath(); data["temp_path"] = Preferences::getTempPath();
// XXX: json.h does not encode QStringList correctly data["scan_dirs"] = Preferences::getScanDirs();
//data["scan_dirs"] = Preferences::getScanDirs(); data["download_in_scan_dirs"] = Preferences::getDownloadInScanDirs();
//data["download_in_scan_dirs"] = Preferences::getDownloadInScanDirs();
data["export_dir_enabled"] = Preferences::isTorrentExportEnabled(); data["export_dir_enabled"] = Preferences::isTorrentExportEnabled();
data["export_dir"] = Preferences::getExportDir(); data["export_dir"] = Preferences::getExportDir();
data["preallocate_all"] = Preferences::preAllocateAllFiles(); data["preallocate_all"] = Preferences::preAllocateAllFiles();

8
src/json.h
View file

@ -49,6 +49,14 @@ namespace json {
case QVariant::ULongLong: case QVariant::ULongLong:
case QMetaType::Float: case QMetaType::Float:
return v.value<QString>(); return v.value<QString>();
case QVariant::StringList:
case QVariant::List: {
QStringList strList;
foreach(const QVariant &var, v.toList()) {
strList << toJson(var);
}
return "["+strList.join(",")+"]";
}
case QVariant::String: case QVariant::String:
{ {
QString s = v.value<QString>(); QString s = v.value<QString>();