Follow project coding style. Issue #2192. - prefjson.cpp

This commit is contained in:
sledgehammer999
2015-07-04 00:45:42 +03:00
parent bf7bec61c2
commit 882f5e325a

View File

@@ -58,14 +58,12 @@ QByteArray prefjson::getPreferences()
data["temp_path_enabled"] = pref->isTempPathEnabled();
data["temp_path"] = fsutils::toNativePath(pref->getTempPath());
QVariantList l;
foreach (const QString& s, pref->getScanDirs()) {
foreach (const QString& s, pref->getScanDirs())
l << fsutils::toNativePath(s);
}
data["scan_dirs"] = l;
QVariantList var_list;
foreach (bool b, pref->getDownloadInScanDirs()) {
foreach (bool b, pref->getDownloadInScanDirs())
var_list << b;
}
data["download_in_scan_dirs"] = var_list;
data["export_dir_enabled"] = pref->isTorrentExportEnabled();
data["export_dir"] = fsutils::toNativePath(pref->getTorrentExportDir());
@@ -152,11 +150,10 @@ void prefjson::setPreferences(const QString& json)
QString locale = m["locale"].toString();
if (pref->getLocale() != locale) {
QTranslator *translator = new QTranslator;
if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) {
if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale))
qDebug("%s locale recognized, using translation.", qPrintable(locale));
}else{
else
qDebug("%s locale unrecognized, using default (en).", qPrintable(locale));
}
qApp->installTranslator(translator);
pref->setLocale(locale);
@@ -172,9 +169,8 @@ void prefjson::setPreferences(const QString& json)
if (m.contains("scan_dirs") && m.contains("download_in_scan_dirs")) {
QVariantList download_at_path_tmp = m["download_in_scan_dirs"].toList();
QList<bool> download_at_path;
foreach (QVariant var, download_at_path_tmp) {
foreach (QVariant var, download_at_path_tmp)
download_at_path << var.toBool();
}
QStringList old_folders = pref->getScanDirs();
QStringList new_folders = m["scan_dirs"].toStringList();
if (download_at_path.size() == new_folders.size()) {
@@ -182,17 +178,15 @@ void prefjson::setPreferences(const QString& json)
pref->setDownloadInScanDirs(download_at_path);
foreach (const QString &old_folder, old_folders) {
// Update deleted folders
if (!new_folders.contains(old_folder)) {
if (!new_folders.contains(old_folder))
QBtSession::instance()->getScanFoldersModel()->removePath(old_folder);
}
}
int i = 0;
foreach (const QString &new_folder, new_folders) {
qDebug("New watched folder: %s", qPrintable(new_folder));
// Update new folders
if (!old_folders.contains(fsutils::fromNativePath(new_folder))) {
if (!old_folders.contains(fsutils::fromNativePath(new_folder)))
QBtSession::instance()->getScanFoldersModel()->addPath(new_folder, download_at_path.at(i));
}
++i;
}
}
@@ -260,14 +254,12 @@ void prefjson::setPreferences(const QString& json)
pref->setAltGlobalUploadLimit(m["alt_up_limit"].toInt());
if (m.contains("scheduler_enabled"))
pref->setSchedulerEnabled(m["scheduler_enabled"].toBool());
if (m.contains("schedule_from_hour") && m.contains("schedule_from_min")) {
if (m.contains("schedule_from_hour") && m.contains("schedule_from_min"))
pref->setSchedulerStartTime(QTime(m["schedule_from_hour"].toInt(),
m["schedule_from_min"].toInt()));
}
if (m.contains("schedule_to_hour") && m.contains("schedule_to_min")) {
if (m.contains("schedule_to_hour") && m.contains("schedule_to_min"))
pref->setSchedulerEndTime(QTime(m["schedule_to_hour"].toInt(),
m["schedule_to_min"].toInt()));
}
if (m.contains("scheduler_days"))
pref->setSchedulerDays(scheduler_days(m["scheduler_days"].toInt()));
// Bittorrent