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

Move utilities to core/utils folder.

Browse source 
Also move the names to Utils namespace.
This commit is contained in:
Vladimir Golovnev (Glassez) 2015-05-06 14:53:27 +03:00
parent 427688cb34
commit 191cdc2849
67 changed files with 1172 additions and 1135 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/webui/prefjson.cpp
View file

@ -31,7 +31,7 @@
#include "prefjson.h"
#include "core/preferences.h"
#include "core/scanfoldersmodel.h"
#include "core/fs_utils.h"
#include "core/utils/fs.h"
#ifndef QT_NO_OPENSSL
#include <QSslCertificate>
@ -53,12 +53,12 @@ QByteArray prefjson::getPreferences()
// UI
data["locale"] = pref->getLocale();
// Downloads
data["save_path"] = fsutils::toNativePath(pref->getSavePath());
data["save_path"] = Utils::Fs::toNativePath(pref->getSavePath());
data["temp_path_enabled"] = pref->isTempPathEnabled();
data["temp_path"] = fsutils::toNativePath(pref->getTempPath());
data["temp_path"] = Utils::Fs::toNativePath(pref->getTempPath());
QVariantList l;
foreach (const QString& s, pref->getScanDirs()) {
l << fsutils::toNativePath(s);
l << Utils::Fs::toNativePath(s);
}
data["scan_dirs"] = l;
QVariantList var_list;
@ -67,7 +67,7 @@ QByteArray prefjson::getPreferences()
}
data["download_in_scan_dirs"] = var_list;
data["export_dir_enabled"] = pref->isTorrentExportEnabled();
data["export_dir"] = fsutils::toNativePath(pref->getTorrentExportDir());
data["export_dir"] = Utils::Fs::toNativePath(pref->getTorrentExportDir());
data["mail_notification_enabled"] = pref->isMailNotificationEnabled();
data["mail_notification_email"] = pref->getMailNotificationEmail();
data["mail_notification_smtp"] = pref->getMailNotificationSMTP();
@ -76,7 +76,7 @@ QByteArray prefjson::getPreferences()
data["mail_notification_username"] = pref->getMailNotificationSMTPUsername();
data["mail_notification_password"] = pref->getMailNotificationSMTPPassword();
data["autorun_enabled"] = pref->isAutoRunEnabled();
data["autorun_program"] = fsutils::toNativePath(pref->getAutoRunProgram());
data["autorun_program"] = Utils::Fs::toNativePath(pref->getAutoRunProgram());
data["preallocate_all"] = pref->preAllocateAllFiles();
data["queueing_enabled"] = pref->isQueueingSystemEnabled();
data["max_active_downloads"] = pref->getMaxActiveDownloads();
@ -122,7 +122,7 @@ QByteArray prefjson::getPreferences()
data["proxy_password"] = pref->getProxyPassword();
// IP Filter
data["ip_filter_enabled"] = pref->isFilteringEnabled();
data["ip_filter_path"] = fsutils::toNativePath(pref->getFilter());
data["ip_filter_path"] = Utils::Fs::toNativePath(pref->getFilter());
// Web UI
data["web_ui_port"] = pref->getWebUiPort();
data["web_ui_username"] = pref->getWebUiUsername();
@ -189,7 +189,7 @@ void prefjson::setPreferences(const QString& json)
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(Utils::Fs::fromNativePath(new_folder))) {
ScanFoldersModel::instance()->addPath(new_folder, download_at_path.at(i));
}
++i;