Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227

3 files changed, 29 insertions, 15 deletions

diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp
index 39ffb3cc87..c7bf0c0dff 100644
--- a/examples/network/http/httpwindow.cpp
+++ b/examples/network/http/httpwindow.cpp
@@ -48,13 +48,14 @@
 **
 ****************************************************************************/
 
+#include "httpwindow.h"
+
+#include "ui_authenticationdialog.h"
+
 #include <QtWidgets>
 #include <QtNetwork>
 #include <QUrl>
 
-#include "httpwindow.h"
-#include "ui_authenticationdialog.h"
-
 #if QT_CONFIG(ssl)
 const char defaultUrl[] = "https://www.qt.io/";
 #else
@@ -74,6 +75,10 @@ ProgressDialog::ProgressDialog(const QUrl &url, QWidget *parent)
     setMinimumSize(QSize(400, 75));
 }
 
+ProgressDialog::~ProgressDialog()
+{
+}
+
 void ProgressDialog::networkReplyProgress(qint64 bytesRead, qint64 totalBytes)
 {
     setMaximum(totalBytes);
@@ -137,6 +142,10 @@ HttpWindow::HttpWindow(QWidget *parent)
     urlLineEdit->setFocus();
 }
 
+HttpWindow::~HttpWindow()
+{
+}
+
 void HttpWindow::startRequest(const QUrl &requestedUrl)
 {
     url = requestedUrl;
@@ -204,9 +213,9 @@ void HttpWindow::downloadFile()
     startRequest(newUrl);
 }
 
-QFile *HttpWindow::openFileForWrite(const QString &fileName)
+std::unique_ptr<QFile> HttpWindow::openFileForWrite(const QString &fileName)
 {
-    QScopedPointer<QFile> file(new QFile(fileName));
+    std::unique_ptr<QFile> file(new QFile(fileName));
     if (!file->open(QIODevice::WriteOnly)) {
         QMessageBox::information(this, tr("Error"),
                                  tr("Unable to save the file %1: %2.")
@@ -214,7 +223,7 @@ QFile *HttpWindow::openFileForWrite(const QString &fileName)
                                       file->errorString()));
         return nullptr;
     }
-    return file.take();
+    return file;
 }
 
 void HttpWindow::cancelDownload()
@@ -231,8 +240,7 @@ void HttpWindow::httpFinished()
     if (file) {
         fi.setFile(file->fileName());
         file->close();
-        delete file;
-        file = nullptr;
+        file.reset();
     }
 
     if (httpRequestAborted) {
diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h
index 20ad2bb4da..f7bd0047de 100644
--- a/examples/network/http/httpwindow.h
+++ b/examples/network/http/httpwindow.h
@@ -55,6 +55,8 @@
 #include <QNetworkAccessManager>
 #include <QUrl>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 class QFile;
 class QLabel;
@@ -72,6 +74,7 @@ class ProgressDialog : public QProgressDialog {
 
 public:
     explicit ProgressDialog(const QUrl &url, QWidget *parent = nullptr);
+    ~ProgressDialog();
 
 public slots:
    void networkReplyProgress(qint64 bytesRead, qint64 totalBytes);
@@ -83,6 +86,7 @@ class HttpWindow : public QDialog
 
 public:
     explicit HttpWindow(QWidget *parent = nullptr);
+    ~HttpWindow();
 
     void startRequest(const QUrl &requestedUrl);
 
@@ -98,7 +102,7 @@ private slots:
 #endif
 
 private:
-    QFile *openFileForWrite(const QString &fileName);
+    std::unique_ptr<QFile> openFileForWrite(const QString &fileName);
 
     QLabel *statusLabel;
     QLineEdit *urlLineEdit;
@@ -110,7 +114,7 @@ private:
     QUrl url;
     QNetworkAccessManager qnam;
     QNetworkReply *reply;
-    QFile *file;
+    std::unique_ptr<QFile> file;
     bool httpRequestAborted;
 };
 
diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp
index b4cbbb7a45..bddf3caa1a 100644
--- a/examples/network/torrent/torrentclient.cpp
+++ b/examples/network/torrent/torrentclient.cpp
@@ -874,8 +874,7 @@ void TorrentClient::removeClient()
     // Remove the client from RateController and all structures.
     RateController::instance()->removeSocket(client);
     d->connections.removeAll(client);
-    QMultiMap<PeerWireClient *, TorrentPiece *>::Iterator it = d->payloads.find(client);
-    while (it != d->payloads.end() && it.key() == client) {
+    for (auto it = d->payloads.find(client); it != d->payloads.end() && it.key() == client; /*erasing*/) {
         TorrentPiece *piece = it.value();
         piece->inProgress = false;
         piece->requestedBlocks.fill(false);
@@ -883,9 +882,12 @@ void TorrentClient::removeClient()
     }
 
     // Remove pending read requests.
-    QMapIterator<int, PeerWireClient *> it2(d->readIds);
-    while (it2.findNext(client))
-        d->readIds.remove(it2.key());
+    for (auto it = d->readIds.begin(), end = d->readIds.end(); it != end; /*erasing*/) {
+        if (it.value() == client)
+            it = d->readIds.erase(it);
+        else
+            ++it;
+    }
 
     // Delete the client later.
     disconnect(client, SIGNAL(disconnected()), this, SLOT(removeClient()));