Merge pull request #7396 from thalieht/updownratio

Properly pre-select the selected torrent's current ratio limiting options in UpDownRatioDlg

src/gui/rss/htmlbrowser.cpp

@@ -1,18 +1,18 @@
 #include "htmlbrowser.h"
 
-#include <QDebug>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QNetworkDiskCache>
-#include <QStyle>
 #include <QApplication>
-#include <QDir>
 #include <QDateTime>
+#include <QDir>
+#include <QDebug>
+#include <QNetworkDiskCache>
+#include <QNetworkReply>
+#include <QNetworkRequest>
 #include <QScrollBar>
+#include <QStyle>
 
 #include "base/profile.h"
 
-HtmlBrowser::HtmlBrowser(QWidget* parent)
+HtmlBrowser::HtmlBrowser(QWidget *parent)
     : QTextBrowser(parent)
 {
     m_netManager = new QNetworkAccessManager(this);
@@ -31,20 +31,20 @@ HtmlBrowser::~HtmlBrowser()
 
 QVariant HtmlBrowser::loadResource(int type, const QUrl &name)
 {
-    if(type == QTextDocument::ImageResource) {
+    if (type == QTextDocument::ImageResource) {
         QUrl url(name);
-        if(url.scheme().isEmpty())
+        if (url.scheme().isEmpty())
             url.setScheme("http");
 
         QIODevice *dev = m_diskCache->data(url);
-        if(dev != 0) {
+        if (dev != nullptr) {
             qDebug() << "HtmlBrowser::loadResource() cache " << url.toString();
             QByteArray res = dev->readAll();
             delete dev;
             return res;
         }
 
-        if(!m_activeRequests.contains(url)) {
+        if (!m_activeRequests.contains(url)) {
             m_activeRequests.insert(url, true);
             qDebug() << "HtmlBrowser::loadResource() get " << url.toString();
             QNetworkRequest req(url);
@@ -62,7 +62,7 @@ void HtmlBrowser::resourceLoaded(QNetworkReply *reply)
 {
     m_activeRequests.remove(reply->request().url());
 
-    if(reply->error() == QNetworkReply::NoError && reply->size() > 0) {
+    if ((reply->error() == QNetworkReply::NoError) && (reply->size() > 0)) {
         qDebug() << "HtmlBrowser::resourceLoaded() save " << reply->request().url().toString();
     }
     else {
@@ -79,8 +79,8 @@ void HtmlBrowser::resourceLoaded(QNetworkReply *reply)
         metaData.setLastModified(QDateTime::currentDateTime());
         metaData.setExpirationDate(QDateTime::currentDateTime().addDays(1));
         QIODevice *dev = m_diskCache->prepare(metaData);
-        if(!dev)
-            return;
+        if (!dev) return;
+
         QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(32, 32).save(dev, "PNG");
         m_diskCache->insert(dev);
     }

src/gui/rss/htmlbrowser.h

@@ -1,19 +1,19 @@
 #ifndef HTMLBROWSER_H
 #define HTMLBROWSER_H
 
-#include <QTextBrowser>
 #include <QHash>
+#include <QTextBrowser>
 
 class QNetworkAccessManager;
 class QNetworkDiskCache;
 class QNetworkReply;
 
-class HtmlBrowser: public QTextBrowser
+class HtmlBrowser : public QTextBrowser
 {
     Q_OBJECT
 
 public:
-    explicit HtmlBrowser(QWidget* parent = 0);
+    explicit HtmlBrowser(QWidget* parent = nullptr);
     ~HtmlBrowser();
 
     virtual QVariant loadResource(int type, const QUrl &name);