1 files changed, 25 insertions, 22 deletions

diff --git a/examples/network/torrent/mainwindow.cpp b/examples/network/torrent/mainwindow.cpp
index 4d710953a1..9bda5bb05e 100644
--- a/examples/network/torrent/mainwindow.cpp
+++ b/examples/network/torrent/mainwindow.cpp
@@ -26,17 +26,17 @@ protected:
 };
 
 // TorrentViewDelegate is used to draw the progress bars.
-class TorrentViewDelegate : public QItemDelegate
+class TorrentViewDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 public:
-    inline TorrentViewDelegate(MainWindow *mainWindow) : QItemDelegate(mainWindow) {}
+    inline TorrentViewDelegate(MainWindow *mainWindow) : QStyledItemDelegate(mainWindow) {}
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
                const QModelIndex &index ) const override
     {
         if (index.column() != 2) {
-            QItemDelegate::paint(painter, option, index);
+            QStyledItemDelegate::paint(painter, option, index);
             return;
         }
 
@@ -80,19 +80,19 @@ MainWindow::MainWindow(QWidget *parent)
     setCentralWidget(torrentView);
 
     // Set header resize modes and initial section sizes
-    QFontMetrics fm = fontMetrics();
+    const QFontMetrics fm = torrentView->fontMetrics();
     QHeaderView *header = torrentView->header();
     header->resizeSection(0, fm.horizontalAdvance("typical-name-for-a-torrent.torrent"));
-    header->resizeSection(1, fm.horizontalAdvance(headers.at(1) + "  "));
-    header->resizeSection(2, fm.horizontalAdvance(headers.at(2) + "  "));
-    header->resizeSection(3, qMax(fm.horizontalAdvance(headers.at(3) + "  "), fm.horizontalAdvance(" 1234.0 KB/s ")));
-    header->resizeSection(4, qMax(fm.horizontalAdvance(headers.at(4) + "  "), fm.horizontalAdvance(" 1234.0 KB/s ")));
-    header->resizeSection(5, qMax(fm.horizontalAdvance(headers.at(5) + "  "), fm.horizontalAdvance(tr("Downloading") + "  ")));
+    header->resizeSection(1, fm.horizontalAdvance(headers.at(1) + "    "));
+    header->resizeSection(2, fm.horizontalAdvance(headers.at(2) + "    "));
+    header->resizeSection(3, qMax(fm.horizontalAdvance(headers.at(3) + "    "), fm.horizontalAdvance(" 1234.0 KB/s ")));
+    header->resizeSection(4, qMax(fm.horizontalAdvance(headers.at(4) + "    "), fm.horizontalAdvance(" 1234.0 KB/s ")));
+    header->resizeSection(5, qMax(fm.horizontalAdvance(headers.at(5) + "    "), fm.horizontalAdvance(tr("Downloading") + "  ")));
 
     // Create common actions
-    QAction *newTorrentAction = new QAction(QIcon(":/icons/bottom.png"), tr("Add &new torrent"), this);
-    pauseTorrentAction = new QAction(QIcon(":/icons/player_pause.png"), tr("&Pause torrent"), this);
-    removeTorrentAction = new QAction(QIcon(":/icons/player_stop.png"), tr("&Remove torrent"), this);
+    QAction *newTorrentAction = new QAction(QIcon(":/icons/bottom.svg"), tr("Add &new torrent"), this);
+    pauseTorrentAction = new QAction(QIcon(":/icons/player_pause.svg"), tr("&Pause torrent"), this);
+    removeTorrentAction = new QAction(QIcon(":/icons/player_stop.svg"), tr("&Remove torrent"), this);
 
     // File menu
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
@@ -100,12 +100,12 @@ MainWindow::MainWindow(QWidget *parent)
     fileMenu->addAction(pauseTorrentAction);
     fileMenu->addAction(removeTorrentAction);
     fileMenu->addSeparator();
-    fileMenu->addAction(QIcon(":/icons/exit.png"), tr("E&xit"), this, &MainWindow::close);
+    fileMenu->addAction(QIcon(":/icons/exit.svg"), tr("E&xit"), this, &MainWindow::close);
 
     // Help menu
     QMenu *helpMenu = menuBar()->addMenu(tr("&Help"));
-    helpMenu->addAction(tr("&About"), this, &MainWindow::about);
-    helpMenu->addAction(tr("About &Qt"), qApp, QApplication::aboutQt);
+    helpMenu->addAction(QIcon(":/icons/about.svg"), tr("&About"), this, &MainWindow::about);
+    helpMenu->addAction(QIcon(":/icons/about.svg"), tr("About &Qt"), qApp, QApplication::aboutQt);
 
     // Top toolbar
     QToolBar *topBar = new QToolBar(tr("Tools"));
@@ -115,8 +115,8 @@ MainWindow::MainWindow(QWidget *parent)
     topBar->addAction(removeTorrentAction);
     topBar->addAction(pauseTorrentAction);
     topBar->addSeparator();
-    downActionTool = topBar->addAction(QIcon(tr(":/icons/1downarrow.png")), tr("Move down"));
-    upActionTool = topBar->addAction(QIcon(tr(":/icons/1uparrow.png")), tr("Move up"));
+    downActionTool = topBar->addAction(QIcon(tr(":/icons/1downarrow.svg")), tr("Move down"));
+    upActionTool = topBar->addAction(QIcon(tr(":/icons/1uparrow.svg")), tr("Move up"));
 
     // Bottom toolbar
     QToolBar *bottomBar = new QToolBar(tr("Rate control"));
@@ -311,7 +311,7 @@ bool MainWindow::addTorrent(const QString &fileName, const QString &destinationF
                             const QByteArray &resumeState)
 {
     // Check if the torrent is already being downloaded.
-    for (const Job &job : qAsConst(jobs)) {
+    for (const Job &job : std::as_const(jobs)) {
         if (job.torrentFileName == fileName && job.destinationDirectory == destinationFolder) {
             QMessageBox::warning(this, tr("Already downloading"),
                                  tr("The torrent file %1 is "
@@ -462,10 +462,10 @@ void MainWindow::setActionsEnabled()
     pauseTorrentAction->setEnabled(item && pauseEnabled);
 
     if (client && client->state() == TorrentClient::Paused) {
-        pauseTorrentAction->setIcon(QIcon(":/icons/player_play.png"));
+        pauseTorrentAction->setIcon(QIcon(":/icons/player_play.svg"));
         pauseTorrentAction->setText(tr("Resume torrent"));
     } else {
-        pauseTorrentAction->setIcon(QIcon(":/icons/player_pause.png"));
+        pauseTorrentAction->setIcon(QIcon(":/icons/player_pause.svg"));
         pauseTorrentAction->setText(tr("Pause torrent"));
     }
 
@@ -575,7 +575,10 @@ void MainWindow::setDownloadLimit(int value)
 void MainWindow::about()
 {
     QLabel *icon = new QLabel;
-    icon->setPixmap(QPixmap(":/icons/peertopeer.png"));
+    QImage img(":/icons/peertopeer.svg");
+    QPixmap pm;
+    pm.convertFromImage(img);
+    icon->setPixmap(pm);
 
     QLabel *text = new QLabel;
     text->setWordWrap(true);
@@ -644,7 +647,7 @@ void MainWindow::closeEvent(QCloseEvent *)
     // them to signal that they have stopped.
     jobsToStop = 0;
     jobsStopped = 0;
-    for (const Job &job : qAsConst(jobs)) {
+    for (const Job &job : std::as_const(jobs)) {
         ++jobsToStop;
         TorrentClient *client = job.client;
         client->disconnect();