diff --git a/src/webui/httpconnection.cpp b/src/webui/httpconnection.cpp index c60db09de..af1f619f5 100644 --- a/src/webui/httpconnection.cpp +++ b/src/webui/httpconnection.cpp @@ -38,6 +38,7 @@ #include "prefjson.h" #include "qbtsession.h" #include "misc.h" +#include "fs_utils.h" #ifndef DISABLE_GUI #include "iconprovider.h" #endif @@ -155,7 +156,7 @@ void HttpConnection::translateDocument(QString& data) { int i = 0; bool found = true; - const QString locale = Preferences().getLocale(); + const QString locale = Preferences::instance()->getLocale(); bool isTranslationNeeded = !locale.startsWith("en") || locale.startsWith("en_AU") || locale.startsWith("en_GB"); while(i < data.size() && found) { @@ -575,14 +576,14 @@ void HttpConnection::respondCommand(const QString& command) { qlonglong limit = m_parser.post("limit").toLongLong(); if (limit == 0) limit = -1; QBtSession::instance()->setUploadRateLimit(limit); - Preferences().setGlobalUploadLimit(limit/1024.); + Preferences::instance()->setGlobalUploadLimit(limit/1024.); return; } if (command == "setGlobalDlLimit") { qlonglong limit = m_parser.post("limit").toLongLong(); if (limit == 0) limit = -1; QBtSession::instance()->setDownloadRateLimit(limit); - Preferences().setGlobalDownloadLimit(limit/1024.); + Preferences::instance()->setGlobalDownloadLimit(limit/1024.); return; } if (command == "pause") { diff --git a/src/webui/httpserver.cpp b/src/webui/httpserver.cpp index cb115c603..7aadb8905 100644 --- a/src/webui/httpserver.cpp +++ b/src/webui/httpserver.cpp @@ -91,18 +91,18 @@ void HttpServer::resetNbFailedAttemptsForIp(const QString& ip) { HttpServer::HttpServer(QObject* parent) : QTcpServer(parent) { - const Preferences pref; + const Preferences* const pref = Preferences::instance(); - m_username = pref.getWebUiUsername().toUtf8(); - m_passwordSha1 = pref.getWebUiPassword().toUtf8(); - m_localAuthEnabled = pref.isWebUiLocalAuthEnabled(); + m_username = pref->getWebUiUsername().toUtf8(); + m_passwordSha1 = pref->getWebUiPassword().toUtf8(); + m_localAuthEnabled = pref->isWebUiLocalAuthEnabled(); // HTTPS-related #ifndef QT_NO_OPENSSL - m_https = pref.isWebUiHttpsEnabled(); + m_https = pref->isWebUiHttpsEnabled(); if (m_https) { - m_certificate = QSslCertificate(pref.getWebUiHttpsCertificate()); - m_key = QSslKey(pref.getWebUiHttpsKey(), QSsl::Rsa); + m_certificate = QSslCertificate(pref->getWebUiHttpsCertificate()); + m_key = QSslKey(pref->getWebUiHttpsKey(), QSsl::Rsa); } #endif diff --git a/src/webui/prefjson.cpp b/src/webui/prefjson.cpp index cf265de92..750e73d92 100644 --- a/src/webui/prefjson.cpp +++ b/src/webui/prefjson.cpp @@ -32,6 +32,7 @@ #include "preferences.h" #include "qbtsession.h" #include "scannedfoldersmodel.h" +#include "fs_utils.h" #include #ifndef QT_NO_OPENSSL @@ -47,94 +48,94 @@ prefjson::prefjson() QByteArray prefjson::getPreferences() { - const Preferences pref; + const Preferences* const pref = Preferences::instance(); QVariantMap data; // UI - data["locale"] = pref.getLocale(); + data["locale"] = pref->getLocale(); // Downloads - data["save_path"] = fsutils::toNativePath(pref.getSavePath()); - data["temp_path_enabled"] = pref.isTempPathEnabled(); - data["temp_path"] = fsutils::toNativePath(pref.getTempPath()); + data["save_path"] = fsutils::toNativePath(pref->getSavePath()); + 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()); - data["mail_notification_enabled"] = pref.isMailNotificationEnabled(); - data["mail_notification_email"] = pref.getMailNotificationEmail(); - data["mail_notification_smtp"] = pref.getMailNotificationSMTP(); - data["mail_notification_ssl_enabled"] = pref.getMailNotificationSMTPSSL(); - data["mail_notification_auth_enabled"] = pref.getMailNotificationSMTPAuth(); - 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["preallocate_all"] = pref.preAllocateAllFiles(); - data["queueing_enabled"] = pref.isQueueingSystemEnabled(); - data["max_active_downloads"] = pref.getMaxActiveDownloads(); - data["max_active_torrents"] = pref.getMaxActiveTorrents(); - data["max_active_uploads"] = pref.getMaxActiveUploads(); - data["dont_count_slow_torrents"] = pref.ignoreSlowTorrentsForQueueing(); - data["incomplete_files_ext"] = pref.useIncompleteFilesExtension(); + data["export_dir_enabled"] = pref->isTorrentExportEnabled(); + data["export_dir"] = fsutils::toNativePath(pref->getTorrentExportDir()); + data["mail_notification_enabled"] = pref->isMailNotificationEnabled(); + data["mail_notification_email"] = pref->getMailNotificationEmail(); + data["mail_notification_smtp"] = pref->getMailNotificationSMTP(); + data["mail_notification_ssl_enabled"] = pref->getMailNotificationSMTPSSL(); + data["mail_notification_auth_enabled"] = pref->getMailNotificationSMTPAuth(); + 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["preallocate_all"] = pref->preAllocateAllFiles(); + data["queueing_enabled"] = pref->isQueueingSystemEnabled(); + data["max_active_downloads"] = pref->getMaxActiveDownloads(); + data["max_active_torrents"] = pref->getMaxActiveTorrents(); + data["max_active_uploads"] = pref->getMaxActiveUploads(); + data["dont_count_slow_torrents"] = pref->ignoreSlowTorrentsForQueueing(); + data["incomplete_files_ext"] = pref->useIncompleteFilesExtension(); // Connection - data["listen_port"] = pref.getSessionPort(); - data["upnp"] = pref.isUPnPEnabled(); - data["dl_limit"] = pref.getGlobalDownloadLimit(); - data["up_limit"] = pref.getGlobalUploadLimit(); - data["max_connec"] = pref.getMaxConnecs(); - data["max_connec_per_torrent"] = pref.getMaxConnecsPerTorrent(); - data["max_uploads_per_torrent"] = pref.getMaxUploadsPerTorrent(); - data["enable_utp"] = pref.isuTPEnabled(); - data["limit_utp_rate"] = pref.isuTPRateLimited(); - data["limit_tcp_overhead"] = pref.includeOverheadInLimits(); - data["alt_dl_limit"] = pref.getAltGlobalDownloadLimit(); - data["alt_up_limit"] = pref.getAltGlobalUploadLimit(); - data["scheduler_enabled"] = pref.isSchedulerEnabled(); - const QTime start_time = pref.getSchedulerStartTime(); + data["listen_port"] = pref->getSessionPort(); + data["upnp"] = pref->isUPnPEnabled(); + data["dl_limit"] = pref->getGlobalDownloadLimit(); + data["up_limit"] = pref->getGlobalUploadLimit(); + data["max_connec"] = pref->getMaxConnecs(); + data["max_connec_per_torrent"] = pref->getMaxConnecsPerTorrent(); + data["max_uploads_per_torrent"] = pref->getMaxUploadsPerTorrent(); + data["enable_utp"] = pref->isuTPEnabled(); + data["limit_utp_rate"] = pref->isuTPRateLimited(); + data["limit_tcp_overhead"] = pref->includeOverheadInLimits(); + data["alt_dl_limit"] = pref->getAltGlobalDownloadLimit(); + data["alt_up_limit"] = pref->getAltGlobalUploadLimit(); + data["scheduler_enabled"] = pref->isSchedulerEnabled(); + const QTime start_time = pref->getSchedulerStartTime(); data["schedule_from_hour"] = start_time.hour(); data["schedule_from_min"] = start_time.minute(); - const QTime end_time = pref.getSchedulerEndTime(); + const QTime end_time = pref->getSchedulerEndTime(); data["schedule_to_hour"] = end_time.hour(); data["schedule_to_min"] = end_time.minute(); - data["scheduler_days"] = pref.getSchedulerDays(); + data["scheduler_days"] = pref->getSchedulerDays(); // Bittorrent - data["dht"] = pref.isDHTEnabled(); - data["pex"] = pref.isPeXEnabled(); - data["lsd"] = pref.isLSDEnabled(); - data["encryption"] = pref.getEncryptionSetting(); - data["anonymous_mode"] = pref.isAnonymousModeEnabled(); + data["dht"] = pref->isDHTEnabled(); + data["pex"] = pref->isPeXEnabled(); + data["lsd"] = pref->isLSDEnabled(); + data["encryption"] = pref->getEncryptionSetting(); + data["anonymous_mode"] = pref->isAnonymousModeEnabled(); // Proxy - data["proxy_type"] = pref.getProxyType(); - data["proxy_ip"] = pref.getProxyIp(); - data["proxy_port"] = pref.getProxyPort(); - data["proxy_peer_connections"] = pref.proxyPeerConnections(); - data["proxy_auth_enabled"] = pref.isProxyAuthEnabled(); - data["proxy_username"] = pref.getProxyUsername(); - data["proxy_password"] = pref.getProxyPassword(); + data["proxy_type"] = pref->getProxyType(); + data["proxy_ip"] = pref->getProxyIp(); + data["proxy_port"] = pref->getProxyPort(); + data["proxy_peer_connections"] = pref->proxyPeerConnections(); + data["proxy_auth_enabled"] = pref->isProxyAuthEnabled(); + data["proxy_username"] = pref->getProxyUsername(); + data["proxy_password"] = pref->getProxyPassword(); // IP Filter - data["ip_filter_enabled"] = pref.isFilteringEnabled(); - data["ip_filter_path"] = fsutils::toNativePath(pref.getFilter()); + data["ip_filter_enabled"] = pref->isFilteringEnabled(); + data["ip_filter_path"] = fsutils::toNativePath(pref->getFilter()); // Web UI - data["web_ui_port"] = pref.getWebUiPort(); - data["web_ui_username"] = pref.getWebUiUsername(); - data["web_ui_password"] = pref.getWebUiPassword(); - data["bypass_local_auth"] = !pref.isWebUiLocalAuthEnabled(); - data["use_https"] = pref.isWebUiHttpsEnabled(); - data["ssl_key"] = QString::fromLatin1(pref.getWebUiHttpsKey()); - data["ssl_cert"] = QString::fromLatin1(pref.getWebUiHttpsCertificate()); + data["web_ui_port"] = pref->getWebUiPort(); + data["web_ui_username"] = pref->getWebUiUsername(); + data["web_ui_password"] = pref->getWebUiPassword(); + data["bypass_local_auth"] = !pref->isWebUiLocalAuthEnabled(); + data["use_https"] = pref->isWebUiHttpsEnabled(); + data["ssl_key"] = QString::fromLatin1(pref->getWebUiHttpsKey()); + data["ssl_cert"] = QString::fromLatin1(pref->getWebUiHttpsCertificate()); // DynDns - data["dyndns_enabled"] = pref.isDynDNSEnabled(); - data["dyndns_service"] = pref.getDynDNSService(); - data["dyndns_username"] = pref.getDynDNSUsername(); - data["dyndns_password"] = pref.getDynDNSPassword(); - data["dyndns_domain"] = pref.getDynDomainName(); + data["dyndns_enabled"] = pref->isDynDNSEnabled(); + data["dyndns_service"] = pref->getDynDNSService(); + data["dyndns_username"] = pref->getDynDNSUsername(); + data["dyndns_password"] = pref->getDynDNSPassword(); + data["dyndns_domain"] = pref->getDynDomainName(); return json::toJson(data); } @@ -144,10 +145,10 @@ void prefjson::setPreferences(const QString& json) const QVariantMap m = json::fromJson(json).toMap(); // UI - Preferences pref; + Preferences* const pref = Preferences::instance(); if (m.contains("locale")) { QString locale = m["locale"].toString(); - if (pref.getLocale() != locale) { + if (pref->getLocale() != locale) { QTranslator *translator = new QTranslator; if (translator->load(QString::fromUtf8(":/lang/qbittorrent_") + locale)) { qDebug("%s locale recognized, using translation.", qPrintable(locale)); @@ -156,27 +157,27 @@ void prefjson::setPreferences(const QString& json) } qApp->installTranslator(translator); - pref.setLocale(locale); + pref->setLocale(locale); } } // Downloads if (m.contains("save_path")) - pref.setSavePath(m["save_path"].toString()); + pref->setSavePath(m["save_path"].toString()); if (m.contains("temp_path_enabled")) - pref.setTempPathEnabled(m["temp_path_enabled"].toBool()); + pref->setTempPathEnabled(m["temp_path_enabled"].toBool()); if (m.contains("temp_path")) - pref.setTempPath(m["temp_path"].toString()); + pref->setTempPath(m["temp_path"].toString()); if (m.contains("scan_dirs") && m.contains("download_in_scan_dirs")) { QVariantList download_at_path_tmp = m["download_in_scan_dirs"].toList(); QList download_at_path; foreach (QVariant var, download_at_path_tmp) { download_at_path << var.toBool(); } - QStringList old_folders = pref.getScanDirs(); + QStringList old_folders = pref->getScanDirs(); QStringList new_folders = m["scan_dirs"].toStringList(); if (download_at_path.size() == new_folders.size()) { - pref.setScanDirs(new_folders); - pref.setDownloadInScanDirs(download_at_path); + pref->setScanDirs(new_folders); + pref->setDownloadInScanDirs(download_at_path); foreach (const QString &old_folder, old_folders) { // Update deleted folders if (!new_folders.contains(old_folder)) { @@ -195,142 +196,142 @@ void prefjson::setPreferences(const QString& json) } } if (m.contains("export_dir")) - pref.setTorrentExportDir(m["export_dir"].toString()); + pref->setTorrentExportDir(m["export_dir"].toString()); if (m.contains("mail_notification_enabled")) - pref.setMailNotificationEnabled(m["mail_notification_enabled"].toBool()); + pref->setMailNotificationEnabled(m["mail_notification_enabled"].toBool()); if (m.contains("mail_notification_email")) - pref.setMailNotificationEmail(m["mail_notification_email"].toString()); + pref->setMailNotificationEmail(m["mail_notification_email"].toString()); if (m.contains("mail_notification_smtp")) - pref.setMailNotificationSMTP(m["mail_notification_smtp"].toString()); + pref->setMailNotificationSMTP(m["mail_notification_smtp"].toString()); if (m.contains("mail_notification_ssl_enabled")) - pref.setMailNotificationSMTPSSL(m["mail_notification_ssl_enabled"].toBool()); + pref->setMailNotificationSMTPSSL(m["mail_notification_ssl_enabled"].toBool()); if (m.contains("mail_notification_auth_enabled")) - pref.setMailNotificationSMTPAuth(m["mail_notification_auth_enabled"].toBool()); + pref->setMailNotificationSMTPAuth(m["mail_notification_auth_enabled"].toBool()); if (m.contains("mail_notification_username")) - pref.setMailNotificationSMTPUsername(m["mail_notification_username"].toString()); + pref->setMailNotificationSMTPUsername(m["mail_notification_username"].toString()); if (m.contains("mail_notification_password")) - pref.setMailNotificationSMTPPassword(m["mail_notification_password"].toString()); + pref->setMailNotificationSMTPPassword(m["mail_notification_password"].toString()); if (m.contains("autorun_enabled")) - pref.setAutoRunEnabled(m["autorun_enabled"].toBool()); + pref->setAutoRunEnabled(m["autorun_enabled"].toBool()); if (m.contains("autorun_program")) - pref.setAutoRunProgram(m["autorun_program"].toString()); + pref->setAutoRunProgram(m["autorun_program"].toString()); if (m.contains("preallocate_all")) - pref.preAllocateAllFiles(m["preallocate_all"].toBool()); + pref->preAllocateAllFiles(m["preallocate_all"].toBool()); if (m.contains("queueing_enabled")) - pref.setQueueingSystemEnabled(m["queueing_enabled"].toBool()); + pref->setQueueingSystemEnabled(m["queueing_enabled"].toBool()); if (m.contains("max_active_downloads")) - pref.setMaxActiveDownloads(m["max_active_downloads"].toInt()); + pref->setMaxActiveDownloads(m["max_active_downloads"].toInt()); if (m.contains("max_active_torrents")) - pref.setMaxActiveTorrents(m["max_active_torrents"].toInt()); + pref->setMaxActiveTorrents(m["max_active_torrents"].toInt()); if (m.contains("max_active_uploads")) - pref.setMaxActiveUploads(m["max_active_uploads"].toInt()); + pref->setMaxActiveUploads(m["max_active_uploads"].toInt()); if (m.contains("dont_count_slow_torrents")) - pref.setIgnoreSlowTorrentsForQueueing(m["dont_count_slow_torrents"].toBool()); + pref->setIgnoreSlowTorrentsForQueueing(m["dont_count_slow_torrents"].toBool()); if (m.contains("incomplete_files_ext")) - pref.useIncompleteFilesExtension(m["incomplete_files_ext"].toBool()); + pref->useIncompleteFilesExtension(m["incomplete_files_ext"].toBool()); // Connection if (m.contains("listen_port")) - pref.setSessionPort(m["listen_port"].toInt()); + pref->setSessionPort(m["listen_port"].toInt()); if (m.contains("upnp")) - pref.setUPnPEnabled(m["upnp"].toBool()); + pref->setUPnPEnabled(m["upnp"].toBool()); if (m.contains("dl_limit")) - pref.setGlobalDownloadLimit(m["dl_limit"].toInt()); + pref->setGlobalDownloadLimit(m["dl_limit"].toInt()); if (m.contains("up_limit")) - pref.setGlobalUploadLimit(m["up_limit"].toInt()); + pref->setGlobalUploadLimit(m["up_limit"].toInt()); if (m.contains("max_connec")) - pref.setMaxConnecs(m["max_connec"].toInt()); + pref->setMaxConnecs(m["max_connec"].toInt()); if (m.contains("max_connec_per_torrent")) - pref.setMaxConnecsPerTorrent(m["max_connec_per_torrent"].toInt()); + pref->setMaxConnecsPerTorrent(m["max_connec_per_torrent"].toInt()); if (m.contains("max_uploads_per_torrent")) - pref.setMaxUploadsPerTorrent(m["max_uploads_per_torrent"].toInt()); + pref->setMaxUploadsPerTorrent(m["max_uploads_per_torrent"].toInt()); if (m.contains("enable_utp")) - pref.setuTPEnabled(m["enable_utp"].toBool()); + pref->setuTPEnabled(m["enable_utp"].toBool()); if (m.contains("limit_utp_rate")) - pref.setuTPRateLimited(m["limit_utp_rate"].toBool()); + pref->setuTPRateLimited(m["limit_utp_rate"].toBool()); if (m.contains("limit_tcp_overhead")) - pref.includeOverheadInLimits(m["limit_tcp_overhead"].toBool()); + pref->includeOverheadInLimits(m["limit_tcp_overhead"].toBool()); if (m.contains("alt_dl_limit")) - pref.setAltGlobalDownloadLimit(m["alt_dl_limit"].toInt()); + pref->setAltGlobalDownloadLimit(m["alt_dl_limit"].toInt()); if (m.contains("alt_up_limit")) - pref.setAltGlobalUploadLimit(m["alt_up_limit"].toInt()); + pref->setAltGlobalUploadLimit(m["alt_up_limit"].toInt()); if (m.contains("scheduler_enabled")) - pref.setSchedulerEnabled(m["scheduler_enabled"].toBool()); + pref->setSchedulerEnabled(m["scheduler_enabled"].toBool()); if (m.contains("schedule_from_hour") && m.contains("schedule_from_min")) { - pref.setSchedulerStartTime(QTime(m["schedule_from_hour"].toInt(), + pref->setSchedulerStartTime(QTime(m["schedule_from_hour"].toInt(), m["schedule_from_min"].toInt())); } if (m.contains("schedule_to_hour") && m.contains("schedule_to_min")) { - pref.setSchedulerEndTime(QTime(m["schedule_to_hour"].toInt(), + 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())); + pref->setSchedulerDays(scheduler_days(m["scheduler_days"].toInt())); // Bittorrent if (m.contains("dht")) - pref.setDHTEnabled(m["dht"].toBool()); + pref->setDHTEnabled(m["dht"].toBool()); if (m.contains("pex")) - pref.setPeXEnabled(m["pex"].toBool()); + pref->setPeXEnabled(m["pex"].toBool()); qDebug("Pex support: %d", (int)m["pex"].toBool()); if (m.contains("lsd")) - pref.setLSDEnabled(m["lsd"].toBool()); + pref->setLSDEnabled(m["lsd"].toBool()); if (m.contains("encryption")) - pref.setEncryptionSetting(m["encryption"].toInt()); + pref->setEncryptionSetting(m["encryption"].toInt()); if (m.contains("anonymous_mode")) - pref.enableAnonymousMode(m["anonymous_mode"].toBool()); + pref->enableAnonymousMode(m["anonymous_mode"].toBool()); // Proxy if (m.contains("proxy_type")) - pref.setProxyType(m["proxy_type"].toInt()); + pref->setProxyType(m["proxy_type"].toInt()); if (m.contains("proxy_ip")) - pref.setProxyIp(m["proxy_ip"].toString()); + pref->setProxyIp(m["proxy_ip"].toString()); if (m.contains("proxy_port")) - pref.setProxyPort(m["proxy_port"].toUInt()); + pref->setProxyPort(m["proxy_port"].toUInt()); if (m.contains("proxy_peer_connections")) - pref.setProxyPeerConnections(m["proxy_peer_connections"].toBool()); + pref->setProxyPeerConnections(m["proxy_peer_connections"].toBool()); if (m.contains("proxy_auth_enabled")) - pref.setProxyAuthEnabled(m["proxy_auth_enabled"].toBool()); + pref->setProxyAuthEnabled(m["proxy_auth_enabled"].toBool()); if (m.contains("proxy_username")) - pref.setProxyUsername(m["proxy_username"].toString()); + pref->setProxyUsername(m["proxy_username"].toString()); if (m.contains("proxy_password")) - pref.setProxyPassword(m["proxy_password"].toString()); + pref->setProxyPassword(m["proxy_password"].toString()); // IP Filter if (m.contains("ip_filter_enabled")) - pref.setFilteringEnabled(m["ip_filter_enabled"].toBool()); + pref->setFilteringEnabled(m["ip_filter_enabled"].toBool()); if (m.contains("ip_filter_path")) - pref.setFilter(m["ip_filter_path"].toString()); + pref->setFilter(m["ip_filter_path"].toString()); // Web UI if (m.contains("web_ui_port")) - pref.setWebUiPort(m["web_ui_port"].toUInt()); + pref->setWebUiPort(m["web_ui_port"].toUInt()); if (m.contains("web_ui_username")) - pref.setWebUiUsername(m["web_ui_username"].toString()); + pref->setWebUiUsername(m["web_ui_username"].toString()); if (m.contains("web_ui_password")) - pref.setWebUiPassword(m["web_ui_password"].toString()); + pref->setWebUiPassword(m["web_ui_password"].toString()); if (m.contains("bypass_local_auth")) - pref.setWebUiLocalAuthEnabled(!m["bypass_local_auth"].toBool()); + pref->setWebUiLocalAuthEnabled(!m["bypass_local_auth"].toBool()); if (m.contains("use_https")) - pref.setWebUiHttpsEnabled(m["use_https"].toBool()); + pref->setWebUiHttpsEnabled(m["use_https"].toBool()); #ifndef QT_NO_OPENSSL if (m.contains("ssl_key")) { QByteArray raw_key = m["ssl_key"].toString().toLatin1(); if (!QSslKey(raw_key, QSsl::Rsa).isNull()) - pref.setWebUiHttpsKey(raw_key); + pref->setWebUiHttpsKey(raw_key); } if (m.contains("ssl_cert")) { QByteArray raw_cert = m["ssl_cert"].toString().toLatin1(); if (!QSslCertificate(raw_cert).isNull()) - pref.setWebUiHttpsCertificate(raw_cert); + pref->setWebUiHttpsCertificate(raw_cert); } #endif // Dyndns if (m.contains("dyndns_enabled")) - pref.setDynDNSEnabled(m["dyndns_enabled"].toBool()); + pref->setDynDNSEnabled(m["dyndns_enabled"].toBool()); if (m.contains("dyndns_service")) - pref.setDynDNSService(m["dyndns_service"].toInt()); + pref->setDynDNSService(m["dyndns_service"].toInt()); if (m.contains("dyndns_username")) - pref.setDynDNSUsername(m["dyndns_username"].toString()); + pref->setDynDNSUsername(m["dyndns_username"].toString()); if (m.contains("dyndns_password")) - pref.setDynDNSPassword(m["dyndns_password"].toString()); + pref->setDynDNSPassword(m["dyndns_password"].toString()); if (m.contains("dyndns_domain")) - pref.setDynDomainName(m["dyndns_domain"].toString()); + pref->setDynDomainName(m["dyndns_domain"].toString()); // Reload preferences QBtSession::instance()->configureSession(); }