mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-20 07:27:22 -06:00
Replace deprecated QSignalMapper class
This commit is contained in:
@@ -42,7 +42,6 @@
|
||||
#include <QProcess>
|
||||
#include <QRegularExpression>
|
||||
#include <QShortcut>
|
||||
#include <QSignalMapper>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QStandardItemModel>
|
||||
#include <QTextStream>
|
||||
@@ -91,7 +90,6 @@ namespace
|
||||
SearchWidget::SearchWidget(MainWindow *mainWindow)
|
||||
: QWidget(mainWindow)
|
||||
, m_ui(new Ui::SearchWidget())
|
||||
, m_tabStatusChangedMapper(new QSignalMapper(this))
|
||||
, m_mainWindow(mainWindow)
|
||||
, m_isNewQueryString(false)
|
||||
{
|
||||
@@ -131,9 +129,6 @@ SearchWidget::SearchWidget(MainWindow *mainWindow)
|
||||
connect(m_ui->tabWidget, &QTabWidget::tabCloseRequested, this, &SearchWidget::closeTab);
|
||||
connect(m_ui->tabWidget, &QTabWidget::currentChanged, this, &SearchWidget::tabChanged);
|
||||
|
||||
connect(m_tabStatusChangedMapper, static_cast<void (QSignalMapper::*)(QWidget *)>(&QSignalMapper::mapped)
|
||||
, this, &SearchWidget::tabStatusChanged);
|
||||
|
||||
const auto *searchManager = SearchPluginManager::instance();
|
||||
const auto onPluginChanged = [this]()
|
||||
{
|
||||
@@ -342,9 +337,7 @@ void SearchWidget::on_searchButton_clicked()
|
||||
m_ui->tabWidget->setCurrentWidget(newTab);
|
||||
|
||||
connect(newTab, &SearchJobWidget::resultsCountUpdated, this, &SearchWidget::resultsCountUpdated);
|
||||
connect(newTab, &SearchJobWidget::statusChanged
|
||||
, m_tabStatusChangedMapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
|
||||
m_tabStatusChangedMapper->setMapping(newTab, newTab);
|
||||
connect(newTab, &SearchJobWidget::statusChanged, this, [this, &newTab]() { tabStatusChanged(newTab); });
|
||||
|
||||
m_ui->searchButton->setText(tr("Stop"));
|
||||
m_activeSearchTab = newTab;
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
#include <QWidget>
|
||||
|
||||
class QShortcut;
|
||||
class QSignalMapper;
|
||||
class QTabWidget;
|
||||
|
||||
class MainWindow;
|
||||
@@ -81,7 +80,6 @@ private:
|
||||
QString selectedPlugin() const;
|
||||
|
||||
Ui::SearchWidget *m_ui;
|
||||
QSignalMapper *m_tabStatusChangedMapper;
|
||||
QPointer<SearchJobWidget> m_currentSearchTab; // Selected tab
|
||||
QPointer<SearchJobWidget> m_activeSearchTab; // Tab with running search
|
||||
QList<SearchJobWidget *> m_allTabs; // To store all tabs
|
||||
|
||||
Reference in New Issue
Block a user