From 3972597163bc9d6f2460d0b3f98a86506d359ec7 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 19 Mar 2021 09:21:10 +0300 Subject: [PATCH 1/4] Include QDesktopWidget header only when needed --- src/gui/utils.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/utils.cpp b/src/gui/utils.cpp index 7bd1f5713..48c391cd0 100644 --- a/src/gui/utils.cpp +++ b/src/gui/utils.cpp @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -49,6 +48,10 @@ #include #include +#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) && defined(Q_OS_WIN) +#include +#endif + #include "base/utils/fs.h" #include "base/utils/version.h" From 8d9b6cca636ef7a1e5ebcb7e6ecf9e431d8ce317 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 19 Mar 2021 13:59:04 +0300 Subject: [PATCH 2/4] Include missing header --- src/gui/mainwindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index e0f3cc117..59992047a 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -30,6 +30,7 @@ #include +#include #include #include #include From 46e6ed480abf7a0aca4c1fe699d71392832a6a5a Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 19 Mar 2021 14:44:52 +0300 Subject: [PATCH 3/4] Use correct return statement --- src/gui/torrentcontentmodelitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/torrentcontentmodelitem.cpp b/src/gui/torrentcontentmodelitem.cpp index 34ebe498c..62731312a 100644 --- a/src/gui/torrentcontentmodelitem.cpp +++ b/src/gui/torrentcontentmodelitem.cpp @@ -142,7 +142,7 @@ QString TorrentContentModelItem::displayData(const int column) const const QString value = (avail >= 1) ? QString::fromLatin1("100") : Utils::String::fromDouble((avail * 100), 1); - return {value + C_THIN_SPACE + QLatin1Char('%')}; + return (value + C_THIN_SPACE + QLatin1Char('%')); } default: Q_ASSERT(false); From 43c8ac0aa1f8c13b8d4b433624c596679083fe3f Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 19 Mar 2021 13:59:59 +0300 Subject: [PATCH 4/4] Don't use deprecated operators --- src/gui/mainwindow.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 59992047a..b663dd34b 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -877,36 +877,36 @@ void MainWindow::createKeyboardShortcuts() m_ui->actionOpen->setShortcut(QKeySequence::Open); m_ui->actionDelete->setShortcut(QKeySequence::Delete); m_ui->actionDelete->setShortcutContext(Qt::WidgetShortcut); // nullify its effect: delete key event is handled by respective widgets, not here - m_ui->actionDownloadFromURL->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_O); - m_ui->actionExit->setShortcut(Qt::CTRL + Qt::Key_Q); + m_ui->actionDownloadFromURL->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_O); + m_ui->actionExit->setShortcut(Qt::CTRL | Qt::Key_Q); #ifdef Q_OS_MACOS m_ui->actionCloseWindow->setShortcut(QKeySequence::Close); #else m_ui->actionCloseWindow->setVisible(false); #endif - const auto *switchTransferShortcut = new QShortcut(Qt::ALT + Qt::Key_1, this); + const auto *switchTransferShortcut = new QShortcut((Qt::ALT | Qt::Key_1), this); connect(switchTransferShortcut, &QShortcut::activated, this, &MainWindow::displayTransferTab); - const auto *switchSearchShortcut = new QShortcut(Qt::ALT + Qt::Key_2, this); + const auto *switchSearchShortcut = new QShortcut((Qt::ALT | Qt::Key_2), this); connect(switchSearchShortcut, &QShortcut::activated, this, qOverload<>(&MainWindow::displaySearchTab)); - const auto *switchRSSShortcut = new QShortcut(Qt::ALT + Qt::Key_3, this); + const auto *switchRSSShortcut = new QShortcut((Qt::ALT | Qt::Key_3), this); connect(switchRSSShortcut, &QShortcut::activated, this, qOverload<>(&MainWindow::displayRSSTab)); - const auto *switchExecutionLogShortcut = new QShortcut(Qt::ALT + Qt::Key_4, this); + const auto *switchExecutionLogShortcut = new QShortcut((Qt::ALT | Qt::Key_4), this); connect(switchExecutionLogShortcut, &QShortcut::activated, this, &MainWindow::displayExecutionLogTab); const auto *switchSearchFilterShortcut = new QShortcut(QKeySequence::Find, m_transferListWidget); connect(switchSearchFilterShortcut, &QShortcut::activated, this, &MainWindow::focusSearchFilter); m_ui->actionDocumentation->setShortcut(QKeySequence::HelpContents); - m_ui->actionOptions->setShortcut(Qt::ALT + Qt::Key_O); - m_ui->actionStatistics->setShortcut(Qt::CTRL + Qt::Key_I); - m_ui->actionStart->setShortcut(Qt::CTRL + Qt::Key_S); - m_ui->actionStartAll->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_S); - m_ui->actionPause->setShortcut(Qt::CTRL + Qt::Key_P); - m_ui->actionPauseAll->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_P); - m_ui->actionBottomQueuePos->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Minus); - m_ui->actionDecreaseQueuePos->setShortcut(Qt::CTRL + Qt::Key_Minus); - m_ui->actionIncreaseQueuePos->setShortcut(Qt::CTRL + Qt::Key_Plus); - m_ui->actionTopQueuePos->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_Plus); + m_ui->actionOptions->setShortcut(Qt::ALT | Qt::Key_O); + m_ui->actionStatistics->setShortcut(Qt::CTRL | Qt::Key_I); + m_ui->actionStart->setShortcut(Qt::CTRL | Qt::Key_S); + m_ui->actionStartAll->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_S); + m_ui->actionPause->setShortcut(Qt::CTRL | Qt::Key_P); + m_ui->actionPauseAll->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_P); + m_ui->actionBottomQueuePos->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_Minus); + m_ui->actionDecreaseQueuePos->setShortcut(Qt::CTRL | Qt::Key_Minus); + m_ui->actionIncreaseQueuePos->setShortcut(Qt::CTRL | Qt::Key_Plus); + m_ui->actionTopQueuePos->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_Plus); #ifdef Q_OS_MACOS m_ui->actionMinimize->setShortcut(Qt::CTRL + Qt::Key_M); addAction(m_ui->actionMinimize);