Merge pull request #10835 from Chocobo1/exec

Avoid creating unnecessary event loops

src/gui/optionsdialog.cpp

@@ -1754,14 +1754,16 @@ bool OptionsDialog::isAlternativeWebUIPathValid()
 
 void OptionsDialog::on_banListButton_clicked()
 {
-    // call dialog window
+    auto dialog = new BanListOptionsDialog(this);
-    if (BanListOptionsDialog(this).exec() == QDialog::Accepted)
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
-        enableApplyButton();
+    connect(dialog, &QDialog::accepted, this, &OptionsDialog::enableApplyButton);
+    dialog->open();
 }
 
 void OptionsDialog::on_IPSubnetWhitelistButton_clicked()
 {
-    // call dialog window
+    auto dialog = new IPSubnetWhitelistOptionsDialog(this);
-    if (IPSubnetWhitelistOptionsDialog(this).exec() == QDialog::Accepted)
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
-        enableApplyButton();
+    connect(dialog, &QDialog::accepted, this, &OptionsDialog::enableApplyButton);
+    dialog->open();
 }

src/gui/search/searchjobwidget.cpp

@@ -405,39 +405,44 @@ void SearchJobWidget::saveSettings() const
     Preferences::instance()->setSearchTabHeaderState(header()->saveState());
 }
 
-void SearchJobWidget::displayToggleColumnsMenu(const QPoint&)
+void SearchJobWidget::displayToggleColumnsMenu(const QPoint &)
 {
-    QMenu hideshowColumn(this);
+    auto menu = new QMenu(this);
-    hideshowColumn.setTitle(tr("Column visibility"));
+    menu->setAttribute(Qt::WA_DeleteOnClose);
-    QList<QAction*> actions;
+    menu->setTitle(tr("Column visibility"));
+
     for (int i = 0; i < SearchSortModel::DL_LINK; ++i) {
-        QAction *myAct = hideshowColumn.addAction(m_searchListModel->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
+        QAction *myAct = menu->addAction(m_searchListModel->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
         myAct->setCheckable(true);
         myAct->setChecked(!m_ui->resultsBrowser->isColumnHidden(i));
-        actions.append(myAct);
+        myAct->setData(i);
     }
-    int visibleCols = 0;
-    for (int i = 0; i < SearchSortModel::DL_LINK; ++i) {
-        if (!m_ui->resultsBrowser->isColumnHidden(i))
-            ++visibleCols;
 
-        if (visibleCols > 1)
+    connect(menu, &QMenu::triggered, this, [this](const QAction *action)
-            break;
+    {
-    }
+        int visibleCols = 0;
+        for (int i = 0; i < SearchSortModel::DL_LINK; ++i) {
+            if (!m_ui->resultsBrowser->isColumnHidden(i))
+                ++visibleCols;
+
+            if (visibleCols > 1)
+                break;
+        }
+
+        const int col = action->data().toInt();
 
-    // Call menu
-    QAction *act = hideshowColumn.exec(QCursor::pos());
-    if (act) {
-        int col = actions.indexOf(act);
-        Q_ASSERT(col >= 0);
-        Q_ASSERT(visibleCols > 0);
         if ((!m_ui->resultsBrowser->isColumnHidden(col)) && (visibleCols == 1))
             return;
+
         m_ui->resultsBrowser->setColumnHidden(col, !m_ui->resultsBrowser->isColumnHidden(col));
+
         if ((!m_ui->resultsBrowser->isColumnHidden(col)) && (m_ui->resultsBrowser->columnWidth(col) <= 5))
             m_ui->resultsBrowser->resizeColumnToContents(col);
+
         saveSettings();
-    }
+    });
+
+    menu->popup(QCursor::pos());
 }
 
 void SearchJobWidget::searchFinished(bool cancelled)

src/gui/search/searchjobwidget.h

@@ -99,7 +99,7 @@ private:
     void updateFilter();
     void filterSearchResults(const QString &name);
     void showFilterContextMenu(const QPoint &);
-    void displayToggleColumnsMenu(const QPoint&);
+    void displayToggleColumnsMenu(const QPoint &);
     void onItemDoubleClicked(const QModelIndex &index);
     void searchFinished(bool cancelled);
     void searchFailed();

src/gui/torrentcategorydialog.cpp

@@ -89,13 +89,16 @@ void TorrentCategoryDialog::editCategory(QWidget *parent, const QString &categor
 
     Q_ASSERT(Session::instance()->categories().contains(categoryName));
 
-    TorrentCategoryDialog dialog(parent);
+    auto dialog = new TorrentCategoryDialog(parent);
-    dialog.setCategoryNameEditable(false);
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog.setCategoryName(categoryName);
+    dialog->setCategoryNameEditable(false);
-    dialog.setSavePath(Session::instance()->categories()[categoryName]);
+    dialog->setCategoryName(categoryName);
-    if (dialog.exec() == TorrentCategoryDialog::Accepted) {
+    dialog->setSavePath(Session::instance()->categories()[categoryName]);
-        Session::instance()->editCategory(categoryName, dialog.savePath());
+    connect(dialog, &TorrentCategoryDialog::accepted, parent, [dialog, categoryName]()
-    }
+    {
+        Session::instance()->editCategory(categoryName, dialog->savePath());
+    });
+    dialog->open();
 }
 
 void TorrentCategoryDialog::setCategoryNameEditable(bool editable)

src/gui/transferlistwidget.cpp

@@ -688,17 +688,22 @@ void TransferListWidget::setMaxRatioSelectedTorrents()
         useGlobalValue = (torrents[0]->ratioLimit() == BitTorrent::TorrentHandle::USE_GLOBAL_RATIO)
                 && (torrents[0]->seedingTimeLimit() == BitTorrent::TorrentHandle::USE_GLOBAL_SEEDING_TIME);
 
-    UpDownRatioDialog dlg(useGlobalValue, currentMaxRatio, BitTorrent::TorrentHandle::MAX_RATIO,
+    auto dialog = new UpDownRatioDialog(useGlobalValue, currentMaxRatio, BitTorrent::TorrentHandle::MAX_RATIO,
                        currentMaxSeedingTime, BitTorrent::TorrentHandle::MAX_SEEDING_TIME, this);
-    if (dlg.exec() != QDialog::Accepted) return;
+    dialog->setAttribute(Qt::WA_DeleteOnClose);
-
+    connect(dialog, &QDialog::accepted, this, [this, dialog, torrents]()
-    for (BitTorrent::TorrentHandle *const torrent : torrents) {
+    {
-        qreal ratio = (dlg.useDefault() ? BitTorrent::TorrentHandle::USE_GLOBAL_RATIO : dlg.ratio());
+        for (BitTorrent::TorrentHandle *const torrent : torrents) {
-        torrent->setRatioLimit(ratio);
+            const qreal ratio = (dialog->useDefault()
-
+                ? BitTorrent::TorrentHandle::USE_GLOBAL_RATIO : dialog->ratio());
-        int seedingTime = (dlg.useDefault() ? BitTorrent::TorrentHandle::USE_GLOBAL_SEEDING_TIME : dlg.seedingTime());
+            torrent->setRatioLimit(ratio);
-        torrent->setSeedingTimeLimit(seedingTime);
+
-    }
+            const int seedingTime = (dialog->useDefault()
+                ? BitTorrent::TorrentHandle::USE_GLOBAL_SEEDING_TIME : dialog->seedingTime());
+            torrent->setSeedingTimeLimit(seedingTime);
+        }
+    });
+    dialog->open();
 }
 
 void TransferListWidget::recheckSelectedTorrents()
@@ -721,41 +726,45 @@ void TransferListWidget::reannounceSelectedTorrents()
 // hide/show columns menu
 void TransferListWidget::displayDLHoSMenu(const QPoint&)
 {
-    QMenu hideshowColumn(this);
+    auto menu = new QMenu(this);
-    hideshowColumn.setTitle(tr("Column visibility"));
+    menu->setAttribute(Qt::WA_DeleteOnClose);
-    QList<QAction*> actions;
+    menu->setTitle(tr("Column visibility"));
+
     for (int i = 0; i < m_listModel->columnCount(); ++i) {
-        if (!BitTorrent::Session::instance()->isQueueingSystemEnabled() && (i == TransferListModel::TR_PRIORITY)) {
+        if (!BitTorrent::Session::instance()->isQueueingSystemEnabled() && (i == TransferListModel::TR_PRIORITY))
-            actions.append(nullptr);
             continue;
-        }
+
-        QAction *myAct = hideshowColumn.addAction(m_listModel->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
+        QAction *myAct = menu->addAction(m_listModel->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
         myAct->setCheckable(true);
         myAct->setChecked(!isColumnHidden(i));
-        actions.append(myAct);
+        myAct->setData(i);
     }
-    int visibleCols = 0;
-    for (int i = 0; i < TransferListModel::NB_COLUMNS; ++i) {
-        if (!isColumnHidden(i))
-            ++visibleCols;
 
-        if (visibleCols > 1)
+    connect(menu, &QMenu::triggered, this, [this](const QAction *action)
-            break;
+    {
-    }
+        int visibleCols = 0;
+        for (int i = 0; i < TransferListModel::NB_COLUMNS; ++i) {
+            if (!isColumnHidden(i))
+                ++visibleCols;
+
+            if (visibleCols > 1)
+                break;
+        }
+
+        const int col = action->data().toInt();
 
-    // Call menu
-    QAction *act = hideshowColumn.exec(QCursor::pos());
-    if (act) {
-        int col = actions.indexOf(act);
-        Q_ASSERT(col >= 0);
-        Q_ASSERT(visibleCols > 0);
         if (!isColumnHidden(col) && visibleCols == 1)
             return;
+
         setColumnHidden(col, !isColumnHidden(col));
+
         if (!isColumnHidden(col) && columnWidth(col) <= 5)
             resizeColumnToContents(col);
+
         saveSettings();
-    }
+    });
+
+    menu->popup(QCursor::pos());
 }
 
 void TransferListWidget::toggleSelectedTorrentsSuperSeeding() const