diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp index c20ee949d..cf86b1dbd 100644 --- a/src/gui/addnewtorrentdialog.cpp +++ b/src/gui/addnewtorrentdialog.cpp @@ -661,7 +661,7 @@ void AddNewTorrentDialog::populateSavePaths() m_ui->groupBoxDownloadPath->blockSignals(false); } -void AddNewTorrentDialog::displayContentTreeMenu(const QPoint &) +void AddNewTorrentDialog::displayContentTreeMenu() { const QModelIndexList selectedRows = m_ui->contentTreeView->selectionModel()->selectedRows(0); diff --git a/src/gui/addnewtorrentdialog.h b/src/gui/addnewtorrentdialog.h index 570d6db69..7550b20db 100644 --- a/src/gui/addnewtorrentdialog.h +++ b/src/gui/addnewtorrentdialog.h @@ -78,7 +78,7 @@ public: static void show(const QString &source, QWidget *parent); private slots: - void displayContentTreeMenu(const QPoint &); + void displayContentTreeMenu(); void displayColumnHeaderMenu(); void updateDiskSpaceLabel(); void onSavePathChanged(const QString &newPath); diff --git a/src/gui/categoryfilterwidget.cpp b/src/gui/categoryfilterwidget.cpp index ed2a8e34d..396f2c458 100644 --- a/src/gui/categoryfilterwidget.cpp +++ b/src/gui/categoryfilterwidget.cpp @@ -104,7 +104,7 @@ void CategoryFilterWidget::onCurrentRowChanged(const QModelIndex ¤t, const emit categoryChanged(getCategoryFilter(static_cast(model()), current)); } -void CategoryFilterWidget::showMenu(const QPoint &) +void CategoryFilterWidget::showMenu() { QMenu *menu = new QMenu(this); menu->setAttribute(Qt::WA_DeleteOnClose); diff --git a/src/gui/categoryfilterwidget.h b/src/gui/categoryfilterwidget.h index 161fce968..6ca759b95 100644 --- a/src/gui/categoryfilterwidget.h +++ b/src/gui/categoryfilterwidget.h @@ -48,7 +48,7 @@ signals: private slots: void onCurrentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); - void showMenu(const QPoint &); + void showMenu(); void callUpdateGeometry(); void addCategory(); void addSubcategory(); diff --git a/src/gui/executionlogwidget.cpp b/src/gui/executionlogwidget.cpp index 1e21f7bea..25f42959d 100644 --- a/src/gui/executionlogwidget.cpp +++ b/src/gui/executionlogwidget.cpp @@ -50,18 +50,18 @@ ExecutionLogWidget::ExecutionLogWidget(const Log::MsgTypes types, QWidget *paren LogListView *messageView = new LogListView(this); messageView->setModel(m_messageFilterModel); messageView->setContextMenuPolicy(Qt::CustomContextMenu); - connect(messageView, &LogListView::customContextMenuRequested, this, [this, messageView, messageModel](const QPoint &pos) + connect(messageView, &LogListView::customContextMenuRequested, this, [this, messageView, messageModel]() { - displayContextMenu(pos, messageView, messageModel); + displayContextMenu(messageView, messageModel); }); LogPeerModel *peerModel = new LogPeerModel(this); LogListView *peerView = new LogListView(this); peerView->setModel(peerModel); peerView->setContextMenuPolicy(Qt::CustomContextMenu); - connect(peerView, &LogListView::customContextMenuRequested, this, [this, peerView, peerModel](const QPoint &pos) + connect(peerView, &LogListView::customContextMenuRequested, this, [this, peerView, peerModel]() { - displayContextMenu(pos, peerView, peerModel); + displayContextMenu(peerView, peerModel); }); m_ui->tabGeneral->layout()->addWidget(messageView); @@ -83,7 +83,7 @@ void ExecutionLogWidget::setMessageTypes(const Log::MsgTypes types) m_messageFilterModel->setMessageTypes(types); } -void ExecutionLogWidget::displayContextMenu(const QPoint &pos, const LogListView *view, const BaseLogModel *model) const +void ExecutionLogWidget::displayContextMenu(const LogListView *view, const BaseLogModel *model) const { QMenu *menu = new QMenu; menu->setAttribute(Qt::WA_DeleteOnClose); @@ -98,5 +98,5 @@ void ExecutionLogWidget::displayContextMenu(const QPoint &pos, const LogListView menu->addAction(UIThemeManager::instance()->getIcon("edit-clear"), tr("Clear") , model, &BaseLogModel::reset); - menu->popup(view->mapToGlobal(pos)); + menu->popup(QCursor::pos()); } diff --git a/src/gui/executionlogwidget.h b/src/gui/executionlogwidget.h index 23c92c4eb..e22d136f6 100644 --- a/src/gui/executionlogwidget.h +++ b/src/gui/executionlogwidget.h @@ -52,7 +52,7 @@ public: void setMessageTypes(Log::MsgTypes types); private: - void displayContextMenu(const QPoint &pos, const LogListView *view, const BaseLogModel *model) const; + void displayContextMenu(const LogListView *view, const BaseLogModel *model) const; Ui::ExecutionLogWidget *m_ui; LogFilterModel *m_messageFilterModel; diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index ab8f34c2d..00eaf82f9 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -602,9 +602,9 @@ void MainWindow::manageCookies() cookieDialog->open(); } -void MainWindow::toolbarMenuRequested(const QPoint &point) +void MainWindow::toolbarMenuRequested() { - m_toolbarMenu->popup(m_ui->toolBar->mapToGlobal(point)); + m_toolbarMenu->popup(QCursor::pos()); } void MainWindow::toolbarIconsOnly() @@ -709,7 +709,7 @@ void MainWindow::displayRSSTab(bool enable) } } -void MainWindow::showFilterContextMenu(const QPoint &) +void MainWindow::showFilterContextMenu() { const Preferences *pref = Preferences::instance(); diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 48c27a8d6..907122221 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -112,7 +112,7 @@ signals: void systemTrayIconCreated(); private slots: - void showFilterContextMenu(const QPoint &); + void showFilterContextMenu(); void balloonClicked(); void writeSettings(); void readSettings(); @@ -181,7 +181,7 @@ private slots: // Check for unpaused downloading or seeding torrents and prevent system suspend/sleep according to preferences void updatePowerManagementState(); - void toolbarMenuRequested(const QPoint &point); + void toolbarMenuRequested(); void toolbarIconsOnly(); void toolbarTextOnly(); void toolbarTextBeside(); diff --git a/src/gui/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp index bd6cdb6aa..eb15b6bab 100644 --- a/src/gui/properties/peerlistwidget.cpp +++ b/src/gui/properties/peerlistwidget.cpp @@ -259,7 +259,7 @@ void PeerListWidget::updatePeerCountryResolutionState() } } -void PeerListWidget::showPeerListMenu(const QPoint &) +void PeerListWidget::showPeerListMenu() { BitTorrent::Torrent *torrent = m_properties->getCurrentTorrent(); if (!torrent) return; diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h index 657daa86c..44d3b6126 100644 --- a/src/gui/properties/peerlistwidget.h +++ b/src/gui/properties/peerlistwidget.h @@ -89,7 +89,7 @@ private slots: void loadSettings(); void saveSettings() const; void displayColumnHeaderMenu(); - void showPeerListMenu(const QPoint &); + void showPeerListMenu(); void banSelectedPeers(); void copySelectedPeers(); void handleSortColumnChanged(int col); diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 8bc65e324..35d3fd234 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -635,7 +635,7 @@ void PropertiesWidget::openParentFolder(const QModelIndex &index) const #endif } -void PropertiesWidget::displayFilesListMenu(const QPoint &) +void PropertiesWidget::displayFilesListMenu() { if (!m_torrent) return; @@ -742,7 +742,7 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &) menu->popup(QCursor::pos()); } -void PropertiesWidget::displayWebSeedListMenu(const QPoint &) +void PropertiesWidget::displayWebSeedListMenu() { if (!m_torrent) return; diff --git a/src/gui/properties/propertieswidget.h b/src/gui/properties/propertieswidget.h index ec9ce61ce..7c2d00dde 100644 --- a/src/gui/properties/propertieswidget.h +++ b/src/gui/properties/propertieswidget.h @@ -91,8 +91,8 @@ protected slots: void deleteSelectedUrlSeeds(); void copySelectedWebSeedsToClipboard() const; void editWebSeed(); - void displayFilesListMenu(const QPoint &); - void displayWebSeedListMenu(const QPoint &); + void displayFilesListMenu(); + void displayWebSeedListMenu(); void filteredFilesChanged(); void showPiecesDownloaded(bool show); void showPiecesAvailability(bool show); diff --git a/src/gui/properties/trackerlistwidget.cpp b/src/gui/properties/trackerlistwidget.cpp index 9f7e256c1..e700da7dc 100644 --- a/src/gui/properties/trackerlistwidget.cpp +++ b/src/gui/properties/trackerlistwidget.cpp @@ -575,7 +575,7 @@ void TrackerListWidget::reannounceSelected() loadTrackers(); } -void TrackerListWidget::showTrackerListMenu(const QPoint &) +void TrackerListWidget::showTrackerListMenu() { BitTorrent::Torrent *const torrent = m_properties->getCurrentTorrent(); if (!torrent) return; diff --git a/src/gui/properties/trackerlistwidget.h b/src/gui/properties/trackerlistwidget.h index 2165e63f4..618607214 100644 --- a/src/gui/properties/trackerlistwidget.h +++ b/src/gui/properties/trackerlistwidget.h @@ -75,7 +75,7 @@ public slots: void reannounceSelected(); void deleteSelectedTrackers(); void editSelectedTracker(); - void showTrackerListMenu(const QPoint &); + void showTrackerListMenu(); void loadSettings(); void saveSettings() const; diff --git a/src/gui/rss/rsswidget.cpp b/src/gui/rss/rsswidget.cpp index 6e0c6e767..68179fbcd 100644 --- a/src/gui/rss/rsswidget.cpp +++ b/src/gui/rss/rsswidget.cpp @@ -192,7 +192,7 @@ void RSSWidget::displayRSSListMenu(const QPoint &pos) menu->popup(QCursor::pos()); } -void RSSWidget::displayItemsListMenu(const QPoint &) +void RSSWidget::displayItemsListMenu() { bool hasTorrent = false; bool hasLink = false; diff --git a/src/gui/rss/rsswidget.h b/src/gui/rss/rsswidget.h index 229bd51de..01beebf81 100644 --- a/src/gui/rss/rsswidget.h +++ b/src/gui/rss/rsswidget.h @@ -62,8 +62,8 @@ private slots: void on_newFeedButton_clicked(); void refreshAllFeeds(); void on_markReadButton_clicked(); - void displayRSSListMenu(const QPoint &); - void displayItemsListMenu(const QPoint &); + void displayRSSListMenu(const QPoint &pos); + void displayItemsListMenu(); void renameSelectedRSSItem(); void refreshSelectedItems(); void copySelectedFeedsURL(); diff --git a/src/gui/search/pluginselectdialog.cpp b/src/gui/search/pluginselectdialog.cpp index 9ab36b187..b7fa25cf3 100644 --- a/src/gui/search/pluginselectdialog.cpp +++ b/src/gui/search/pluginselectdialog.cpp @@ -174,7 +174,7 @@ void PluginSelectDialog::togglePluginState(QTreeWidgetItem *item, int) } } -void PluginSelectDialog::displayContextMenu(const QPoint &) +void PluginSelectDialog::displayContextMenu() { // Enable/disable pause/start action given the DL state const QList items = m_ui->pluginsTree->selectedItems(); diff --git a/src/gui/search/pluginselectdialog.h b/src/gui/search/pluginselectdialog.h index d5109f4d2..1ff280a13 100644 --- a/src/gui/search/pluginselectdialog.h +++ b/src/gui/search/pluginselectdialog.h @@ -71,7 +71,7 @@ private slots: void on_closeButton_clicked(); void togglePluginState(QTreeWidgetItem*, int); void setRowColor(int row, const QString &color); - void displayContextMenu(const QPoint &); + void displayContextMenu(); void enableSelection(bool enable); void askForLocalPlugin(); void askForPluginUrl(); diff --git a/src/gui/search/searchjobwidget.cpp b/src/gui/search/searchjobwidget.cpp index f7e640c81..d65689ab0 100644 --- a/src/gui/search/searchjobwidget.cpp +++ b/src/gui/search/searchjobwidget.cpp @@ -375,7 +375,7 @@ void SearchJobWidget::filterSearchResults(const QString &name) updateResultsCount(); } -void SearchJobWidget::showFilterContextMenu(const QPoint &) +void SearchJobWidget::showFilterContextMenu() { const Preferences *pref = Preferences::instance(); diff --git a/src/gui/search/searchjobwidget.h b/src/gui/search/searchjobwidget.h index 0f3115ca9..61052168d 100644 --- a/src/gui/search/searchjobwidget.h +++ b/src/gui/search/searchjobwidget.h @@ -103,7 +103,7 @@ private: void saveSettings() const; void updateFilter(); void filterSearchResults(const QString &name); - void showFilterContextMenu(const QPoint &); + void showFilterContextMenu(); void contextMenuEvent(QContextMenuEvent *event) override; void onItemDoubleClicked(const QModelIndex &index); void searchFinished(bool cancelled); diff --git a/src/gui/tagfilterwidget.cpp b/src/gui/tagfilterwidget.cpp index ab14e45cc..075ab1346 100644 --- a/src/gui/tagfilterwidget.cpp +++ b/src/gui/tagfilterwidget.cpp @@ -102,7 +102,7 @@ void TagFilterWidget::onCurrentRowChanged(const QModelIndex ¤t, const QMod emit tagChanged(getTagFilter(static_cast(model()), current)); } -void TagFilterWidget::showMenu(QPoint) +void TagFilterWidget::showMenu() { QMenu *menu = new QMenu(this); menu->setAttribute(Qt::WA_DeleteOnClose); diff --git a/src/gui/tagfilterwidget.h b/src/gui/tagfilterwidget.h index 55a5f1364..6689f4b39 100644 --- a/src/gui/tagfilterwidget.h +++ b/src/gui/tagfilterwidget.h @@ -47,7 +47,7 @@ signals: private slots: void onCurrentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); - void showMenu(QPoint); + void showMenu(); void callUpdateGeometry(); void addTag(); void removeTag(); diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 042e955b2..3d51ec170 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -286,7 +286,7 @@ void StatusFilterWidget::updateTorrentNumbers() item(TorrentFilter::Errored)->setData(Qt::DisplayRole, tr("Errored (%1)").arg(nbErrored)); } -void StatusFilterWidget::showMenu(const QPoint &) {} +void StatusFilterWidget::showMenu() {} void StatusFilterWidget::applyFilter(int row) { @@ -558,7 +558,7 @@ void TrackerFiltersList::handleFavicoDownloadFinished(const Net::DownloadResult } } -void TrackerFiltersList::showMenu(const QPoint &) +void TrackerFiltersList::showMenu() { QMenu *menu = new QMenu(this); menu->setAttribute(Qt::WA_DeleteOnClose); diff --git a/src/gui/transferlistfilterswidget.h b/src/gui/transferlistfilterswidget.h index 0a0f39491..2fef31aad 100644 --- a/src/gui/transferlistfilterswidget.h +++ b/src/gui/transferlistfilterswidget.h @@ -68,7 +68,7 @@ protected: TransferListWidget *transferList; private slots: - virtual void showMenu(const QPoint &) = 0; + virtual void showMenu() = 0; virtual void applyFilter(int row) = 0; virtual void handleNewTorrent(BitTorrent::Torrent *const) = 0; virtual void torrentAboutToBeDeleted(BitTorrent::Torrent *const) = 0; @@ -89,7 +89,7 @@ private slots: private: // These 4 methods are virtual slots in the base class. // No need to redeclare them here as slots. - void showMenu(const QPoint &) override; + void showMenu() override; void applyFilter(int row) override; void handleNewTorrent(BitTorrent::Torrent *const) override; void torrentAboutToBeDeleted(BitTorrent::Torrent *const) override; @@ -121,7 +121,7 @@ private slots: private: // These 4 methods are virtual slots in the base class. // No need to redeclare them here as slots. - void showMenu(const QPoint &) override; + void showMenu() override; void applyFilter(int row) override; void handleNewTorrent(BitTorrent::Torrent *const torrent) override; void torrentAboutToBeDeleted(BitTorrent::Torrent *const torrent) override; diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index d668c833d..1ed54974f 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -845,7 +845,7 @@ void TransferListWidget::clearSelectionTags() applyToSelectedTorrents([](BitTorrent::Torrent *const torrent) { torrent->removeAllTags(); }); } -void TransferListWidget::displayListMenu(const QPoint &) +void TransferListWidget::displayListMenu() { const QModelIndexList selectedIndexes = selectionModel()->selectedRows(); if (selectedIndexes.isEmpty()) return; diff --git a/src/gui/transferlistwidget.h b/src/gui/transferlistwidget.h index 47bda71d8..4db8bb725 100644 --- a/src/gui/transferlistwidget.h +++ b/src/gui/transferlistwidget.h @@ -105,7 +105,7 @@ signals: private slots: void torrentDoubleClicked(); - void displayListMenu(const QPoint &); + void displayListMenu(); void displayColumnHeaderMenu(); void currentChanged(const QModelIndex ¤t, const QModelIndex&) override; void setSelectedTorrentsSuperSeeding(bool enabled) const;