From cf25ed3d80742b417f72eee60fc2a3377a0de45c Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Wed, 13 Jan 2016 19:12:31 +0300 Subject: [PATCH 1/3] Fix reconfigure additional trackers Replace wrong QList::empty() call with QList::clear() --- src/base/bittorrent/session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/bittorrent/session.cpp b/src/base/bittorrent/session.cpp index aeaf4dde8..a4bb4b64f 100644 --- a/src/base/bittorrent/session.cpp +++ b/src/base/bittorrent/session.cpp @@ -576,7 +576,7 @@ void Session::configure() m_nativeSession->set_pe_settings(encryptionSettings); // * Add trackers - m_additionalTrackers.empty(); + m_additionalTrackers.clear(); if (pref->isAddTrackersEnabled()) { foreach (QString tracker, pref->getTrackersList().split("\n")) { tracker = tracker.trimmed(); From 4965704b1025a8029a2fe98ce099dec173525d21 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Wed, 13 Jan 2016 19:36:02 +0300 Subject: [PATCH 2/3] Fix NetworkCookieJar::deleteCookie() behavior to match Qt5 one --- src/base/net/downloadmanager.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/base/net/downloadmanager.cpp b/src/base/net/downloadmanager.cpp index fa8288f88..408733394 100644 --- a/src/base/net/downloadmanager.cpp +++ b/src/base/net/downloadmanager.cpp @@ -79,8 +79,19 @@ namespace virtual bool deleteCookie(const QNetworkCookie &cookie) { auto myCookies = allCookies(); - myCookies.removeAll(cookie); - setAllCookies(myCookies); + + QList::Iterator it; + for (it = myCookies.begin(); it != myCookies.end(); ++it) { + if ((it->name() == cookie.name()) + && (it->domain() == cookie.domain()) + && (it->path() == cookie.path())) { + myCookies.erase(it); + setAllCookies(myCookies); + return true; + } + } + + return false; } #endif From c6ca877b72bb372fb6a29bb732999bb2063ab2e6 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Wed, 13 Jan 2016 19:42:58 +0300 Subject: [PATCH 3/3] Fix unitialized scalar fields --- src/base/rss/rssdownloadrule.cpp | 1 + src/gui/search/searchwidget.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/base/rss/rssdownloadrule.cpp b/src/base/rss/rssdownloadrule.cpp index a7ef0bb2d..b3a505b46 100644 --- a/src/base/rss/rssdownloadrule.cpp +++ b/src/base/rss/rssdownloadrule.cpp @@ -44,6 +44,7 @@ DownloadRule::DownloadRule() : m_enabled(false) , m_useRegex(false) , m_apstate(USE_GLOBAL) + , m_ignoreDays(0) { } diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp index e7e403933..465ac2d53 100644 --- a/src/gui/search/searchwidget.cpp +++ b/src/gui/search/searchwidget.cpp @@ -72,6 +72,9 @@ SearchWidget::SearchWidget(MainWindow *mainWindow) : QWidget(mainWindow) , m_mainWindow(mainWindow) + , m_isNewQueryString(false) + , m_noSearchResults(true) + , m_nbSearchResults(0) { setupUi(this);