squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-30 20:28:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate everything to use the new Preferences class and not access directly the qbittorrent.ini file.

Browse Source
This commit is contained in:
sledgehammer999
2014-07-05 15:44:13 +03:00
parent da6ce859c0
commit d8d95d2195
44 changed files with 748 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/dnsupdater.cpp
View File

@@ -43,9 +43,9 @@ DNSUpdater::DNSUpdater(QObject *parent) :
updateCredentials();
// Load saved settings from previous session
QIniSettings settings;
m_lastIPCheckTime = settings.value("DNSUpdater/lastUpdateTime").toDateTime();
m_lastIP = QHostAddress(settings.value("DNSUpdater/lastIP").toString());
const Preferences* const pref = Preferences::instance();
m_lastIPCheckTime = pref->getDNSLastUpd();
m_lastIP = QHostAddress(pref->getDNSLastIP());
// Start IP checking timer
m_ipCheckTimer.setInterval(IP_CHECK_INTERVAL_MS);
@@ -61,9 +61,9 @@ DNSUpdater::DNSUpdater(QObject *parent) :
DNSUpdater::~DNSUpdater() {
// Save lastupdate time and last ip
QIniSettings settings;
settings.setValue("DNSUpdater/lastUpdateTime", m_lastIPCheckTime);
settings.setValue("DNSUpdater/lastIP", m_lastIP.toString());
Preferences* const pref = Preferences::instance();
pref->setDNSLastUpd(m_lastIPCheckTime);
pref->setDNSLastIP(m_lastIP.toString());
}
void DNSUpdater::checkPublicIP()
@@ -234,15 +234,15 @@ void DNSUpdater::processIPUpdateReply(const QString &reply)
void DNSUpdater::updateCredentials()
{
if (m_state == FATAL) return;
Preferences pref;
Preferences* const pref = Preferences::instance();
bool change = false;
// Get DNS service information
if (m_service != pref.getDynDNSService()) {
m_service = pref.getDynDNSService();
if (m_service != pref->getDynDNSService()) {
m_service = pref->getDynDNSService();
change = true;
}
if (m_domain != pref.getDynDomainName()) {
m_domain = pref.getDynDomainName();
if (m_domain != pref->getDynDomainName()) {
m_domain = pref->getDynDomainName();
QRegExp domain_regex("^(?:(?!\\d|-)[a-zA-Z0-9\\-]{1,63}\\.)+[a-zA-Z]{2,}$");
if (domain_regex.indexIn(m_domain) < 0) {
QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: supplied domain name is invalid."),
@@ -254,8 +254,8 @@ void DNSUpdater::updateCredentials()
}
change = true;
}
if (m_username != pref.getDynDNSUsername()) {
m_username = pref.getDynDNSUsername();
if (m_username != pref->getDynDNSUsername()) {
m_username = pref->getDynDNSUsername();
if (m_username.length() < 4) {
QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: supplied username is too short."),
"red");
@@ -266,8 +266,8 @@ void DNSUpdater::updateCredentials()
}
change = true;
}
if (m_password != pref.getDynDNSPassword()) {
m_password = pref.getDynDNSPassword();
if (m_password != pref->getDynDNSPassword()) {
m_password = pref->getDynDNSPassword();
if (m_password.length() < 4) {
QBtSession::instance()->addConsoleMessage(tr("Dynamic DNS error: supplied password is too short."),
"red");