From cbd65ae8b1f16ac639e725aa40751fb894cebaa9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 4 Mar 2025 17:28:33 -0600 Subject: [PATCH] refactor: fix modernize-use-nodiscard warnings by adding [[nodiscard]] (#7351) --- libtransmission/benc.h | 8 ++++---- qt/AddData.h | 8 ++++---- qt/DBusInteropHelper.h | 4 ++-- qt/FileTreeDelegate.h | 2 +- qt/FileTreeModel.h | 22 +++++++++++----------- qt/FileTreeView.h | 2 +- qt/FilterBarComboBox.h | 6 +++--- qt/FilterBarComboBoxDelegate.h | 2 +- qt/Filters.h | 4 ++-- qt/IconToolButton.h | 2 +- qt/InteropHelper.h | 4 ++-- qt/InteropObject.h | 4 ++-- qt/MainWindow.h | 6 +++--- qt/MakeDialog.h | 2 +- qt/PathButton.h | 6 +++--- qt/Torrent.h | 2 +- qt/TorrentFilter.h | 4 ++-- qt/TrackerDelegate.h | 6 +++--- qt/TrackerModel.h | 6 +++--- qt/TrackerModelFilter.h | 2 +- qt/WatchDir.h | 2 +- tests/libtransmission/test-fixtures.h | 6 +++--- 22 files changed, 55 insertions(+), 55 deletions(-) diff --git a/libtransmission/benc.h b/libtransmission/benc.h index d61b1becb..196fcbabe 100644 --- a/libtransmission/benc.h +++ b/libtransmission/benc.h @@ -119,17 +119,17 @@ struct BasicHandler : public Handler return true; } - constexpr auto key(size_t i) const + [[nodiscard]] constexpr auto key(size_t i) const { return keys_[i]; } - constexpr auto depth() const + [[nodiscard]] constexpr auto depth() const { return depth_; } - constexpr auto currentKey() const + [[nodiscard]] constexpr auto currentKey() const { return key(depth()); } @@ -225,7 +225,7 @@ struct ParserStack return depth > 0 && stack[depth].parent_type == ParentType::Dict && (stack[depth].n_children_walked % 2) == 0; } - constexpr std::optional parentType() const + [[nodiscard]] constexpr std::optional parentType() const { if (depth == 0) { diff --git a/qt/AddData.h b/qt/AddData.h index 25fff6738..5f0c1eff1 100644 --- a/qt/AddData.h +++ b/qt/AddData.h @@ -40,9 +40,9 @@ public: int set(QString const&); - QByteArray toBase64() const; - QString readableName() const; - QString readableShortName() const; + [[nodiscard]] QByteArray toBase64() const; + [[nodiscard]] QString readableName() const; + [[nodiscard]] QString readableShortName() const; void disposeSourceFile() const; @@ -51,7 +51,7 @@ public: disposal_ = disposal; } - constexpr auto& fileDisposal() const noexcept + [[nodiscard]] constexpr auto& fileDisposal() const noexcept { return disposal_; } diff --git a/qt/DBusInteropHelper.h b/qt/DBusInteropHelper.h index bdf9197d7..2ea2c70d1 100644 --- a/qt/DBusInteropHelper.h +++ b/qt/DBusInteropHelper.h @@ -14,9 +14,9 @@ class DBusInteropHelper public: DBusInteropHelper() = default; - bool isConnected() const; + [[nodiscard]] bool isConnected() const; - QVariant addMetainfo(QString const& metainfo) const; + [[nodiscard]] QVariant addMetainfo(QString const& metainfo) const; static void registerObject(QObject* parent); }; diff --git a/qt/FileTreeDelegate.h b/qt/FileTreeDelegate.h index 3720363ea..3e84ad2af 100644 --- a/qt/FileTreeDelegate.h +++ b/qt/FileTreeDelegate.h @@ -22,6 +22,6 @@ public: FileTreeDelegate& operator=(FileTreeDelegate const&) = delete; // QAbstractItemDelegate - QSize sizeHint(QStyleOptionViewItem const&, QModelIndex const&) const override; + [[nodiscard]] QSize sizeHint(QStyleOptionViewItem const&, QModelIndex const&) const override; void paint(QPainter*, QStyleOptionViewItem const&, QModelIndex const&) const override; }; diff --git a/qt/FileTreeModel.h b/qt/FileTreeModel.h index c780faa67..767157514 100644 --- a/qt/FileTreeModel.h +++ b/qt/FileTreeModel.h @@ -67,16 +67,16 @@ public: void setWanted(QModelIndexList const& indices, bool wanted); void setPriority(QModelIndexList const& indices, int priority); - QModelIndex parent(QModelIndex const& child, int column) const; + [[nodiscard]] QModelIndex parent(QModelIndex const& child, int column) const; // QAbstractItemModel - QVariant data(QModelIndex const& index, int role = Qt::DisplayRole) const override; - Qt::ItemFlags flags(QModelIndex const& index) const override; - QVariant headerData(int column, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - QModelIndex index(int row, int column, QModelIndex const& parent = {}) const override; - QModelIndex parent(QModelIndex const& child) const override; - int rowCount(QModelIndex const& parent = {}) const override; - int columnCount(QModelIndex const& parent = {}) const override; + [[nodiscard]] QVariant data(QModelIndex const& index, int role = Qt::DisplayRole) const override; + [[nodiscard]] Qt::ItemFlags flags(QModelIndex const& index) const override; + [[nodiscard]] QVariant headerData(int column, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + [[nodiscard]] QModelIndex index(int row, int column, QModelIndex const& parent = {}) const override; + [[nodiscard]] QModelIndex parent(QModelIndex const& child) const override; + [[nodiscard]] int rowCount(QModelIndex const& parent = {}) const override; + [[nodiscard]] int columnCount(QModelIndex const& parent = {}) const override; bool setData(QModelIndex const& index, QVariant const& value, int role = Qt::EditRole) override; signals: @@ -94,9 +94,9 @@ private: int last_column, std::set* visited_parent_indices = nullptr); void emitSubtreeChanged(QModelIndex const&, int first_column, int last_column); - FileTreeItem* findItemForFileIndex(int file_index) const; - FileTreeItem* itemFromIndex(QModelIndex const&) const; - QModelIndexList getOrphanIndices(QModelIndexList const& indices) const; + [[nodiscard]] FileTreeItem* findItemForFileIndex(int file_index) const; + [[nodiscard]] FileTreeItem* itemFromIndex(QModelIndex const&) const; + [[nodiscard]] QModelIndexList getOrphanIndices(QModelIndexList const& indices) const; std::map index_cache_; std::unique_ptr root_item_; diff --git a/qt/FileTreeView.h b/qt/FileTreeView.h index 87924caa8..6e93f128d 100644 --- a/qt/FileTreeView.h +++ b/qt/FileTreeView.h @@ -63,7 +63,7 @@ private slots: private: void initContextMenu(); - QModelIndexList selectedSourceRows(int column = 0) const; + [[nodiscard]] QModelIndexList selectedSourceRows(int column = 0) const; static Qt::CheckState getCumulativeCheckState(QModelIndexList const& indices); diff --git a/qt/FilterBarComboBox.h b/qt/FilterBarComboBox.h index 24acc8e52..d12932000 100644 --- a/qt/FilterBarComboBox.h +++ b/qt/FilterBarComboBox.h @@ -26,13 +26,13 @@ public: FilterBarComboBox& operator=(FilterBarComboBox const&) = delete; // QWidget - QSize minimumSizeHint() const override; - QSize sizeHint() const override; + [[nodiscard]] QSize minimumSizeHint() const override; + [[nodiscard]] QSize sizeHint() const override; protected: // QWidget void paintEvent(QPaintEvent* e) override; private: - QSize calculateSize(QSize const& text_size, QSize const& count_size) const; + [[nodiscard]] QSize calculateSize(QSize const& text_size, QSize const& count_size) const; }; diff --git a/qt/FilterBarComboBoxDelegate.h b/qt/FilterBarComboBoxDelegate.h index 7023aaf85..fd3f10ede 100644 --- a/qt/FilterBarComboBoxDelegate.h +++ b/qt/FilterBarComboBoxDelegate.h @@ -27,7 +27,7 @@ public: protected: // QAbstractItemDelegate void paint(QPainter*, QStyleOptionViewItem const&, QModelIndex const&) const override; - QSize sizeHint(QStyleOptionViewItem const&, QModelIndex const&) const override; + [[nodiscard]] QSize sizeHint(QStyleOptionViewItem const&, QModelIndex const&) const override; private: QComboBox* const combo_ = {}; diff --git a/qt/Filters.h b/qt/Filters.h index 08a916293..cdb250819 100644 --- a/qt/Filters.h +++ b/qt/Filters.h @@ -30,7 +30,7 @@ public: { } - int mode() const + [[nodiscard]] int mode() const { return mode_; } @@ -47,7 +47,7 @@ public: static bool test(Torrent const& tor, int mode); - bool test(Torrent const& tor) const + [[nodiscard]] bool test(Torrent const& tor) const { return test(tor, mode()); } diff --git a/qt/IconToolButton.h b/qt/IconToolButton.h index 1ab3705e4..e38a1fad3 100644 --- a/qt/IconToolButton.h +++ b/qt/IconToolButton.h @@ -19,7 +19,7 @@ public: IconToolButton& operator=(IconToolButton const&) = delete; // QWidget - QSize sizeHint() const override; + [[nodiscard]] QSize sizeHint() const override; protected: // QWidget diff --git a/qt/InteropHelper.h b/qt/InteropHelper.h index c8104ef58..971a19ec9 100644 --- a/qt/InteropHelper.h +++ b/qt/InteropHelper.h @@ -17,9 +17,9 @@ class QString; class InteropHelper { public: - bool isConnected() const; + [[nodiscard]] bool isConnected() const; - bool addMetainfo(QString const& metainfo) const; + [[nodiscard]] bool addMetainfo(QString const& metainfo) const; static void initialize(); static void registerObject(QObject* parent); diff --git a/qt/InteropObject.h b/qt/InteropObject.h index 76466f3b6..d62e07b58 100644 --- a/qt/InteropObject.h +++ b/qt/InteropObject.h @@ -31,6 +31,6 @@ public: InteropObject(InteropObject const&) = delete; public slots: - bool PresentWindow() const; - bool AddMetainfo(QString const& metainfo) const; + [[nodiscard]] bool PresentWindow() const; + [[nodiscard]] bool AddMetainfo(QString const& metainfo) const; }; diff --git a/qt/MainWindow.h b/qt/MainWindow.h index 772cebe87..f55dabdf9 100644 --- a/qt/MainWindow.h +++ b/qt/MainWindow.h @@ -124,9 +124,9 @@ private slots: void trayActivated(QSystemTrayIcon::ActivationReason); private: - QIcon addEmblem(QIcon icon, QStringList const& emblem_names) const; + [[nodiscard]] QIcon addEmblem(QIcon icon, QStringList const& emblem_names) const; - torrent_ids_t getSelectedTorrents(bool with_metadata_only = false) const; + [[nodiscard]] torrent_ids_t getSelectedTorrents(bool with_metadata_only = false) const; void updateNetworkIcon(); QMenu* createOptionsMenu(); @@ -194,7 +194,7 @@ private: size_t peers_sending = 0; size_t peers_receiving = 0; }; - TransferStats getTransferStats() const; + [[nodiscard]] TransferStats getTransferStats() const; enum { diff --git a/qt/MakeDialog.h b/qt/MakeDialog.h index 0cd71d7b2..765328fa8 100644 --- a/qt/MakeDialog.h +++ b/qt/MakeDialog.h @@ -37,7 +37,7 @@ private slots: void onPieceSizeUpdated(int); private: - QString getSource() const; + [[nodiscard]] QString getSource() const; void updatePiecesLabel(); Session& session_; diff --git a/qt/PathButton.h b/qt/PathButton.h index bf7143733..b553865e8 100644 --- a/qt/PathButton.h +++ b/qt/PathButton.h @@ -36,7 +36,7 @@ public: } // QWidget - QSize sizeHint() const override; + [[nodiscard]] QSize sizeHint() const override; signals: void pathChanged(QString const& path); @@ -52,8 +52,8 @@ private slots: private: void updateAppearance(); - bool isDirMode() const; - QString effectiveTitle() const; + [[nodiscard]] bool isDirMode() const; + [[nodiscard]] QString effectiveTitle() const; QString name_filter_; QString path_; diff --git a/qt/Torrent.h b/qt/Torrent.h index 600dab379..0c48b5cb4 100644 --- a/qt/Torrent.h +++ b/qt/Torrent.h @@ -59,7 +59,7 @@ using PeerList = std::vector; struct TrackerStat { - QPixmap getFavicon() const; + [[nodiscard]] QPixmap getFavicon() const; bool has_announced; bool has_scraped; diff --git a/qt/TorrentFilter.h b/qt/TorrentFilter.h index 562b1a62b..41df2b614 100644 --- a/qt/TorrentFilter.h +++ b/qt/TorrentFilter.h @@ -40,8 +40,8 @@ public: protected: // QSortFilterProxyModel - bool filterAcceptsRow(int, QModelIndex const&) const override; - bool lessThan(QModelIndex const&, QModelIndex const&) const override; + [[nodiscard]] bool filterAcceptsRow(int, QModelIndex const&) const override; + [[nodiscard]] bool lessThan(QModelIndex const&, QModelIndex const&) const override; private slots: void onPrefChanged(int key); diff --git a/qt/TrackerDelegate.h b/qt/TrackerDelegate.h index 2eafbc533..e84f79782 100644 --- a/qt/TrackerDelegate.h +++ b/qt/TrackerDelegate.h @@ -29,13 +29,13 @@ public: void setShowMore(bool b); // QAbstractItemDelegate - QSize sizeHint(QStyleOptionViewItem const& option, QModelIndex const& index) const override; + [[nodiscard]] QSize sizeHint(QStyleOptionViewItem const& option, QModelIndex const& index) const override; void paint(QPainter* painter, QStyleOptionViewItem const& option, QModelIndex const& index) const override; protected: - QString getText(TrackerInfo const&) const; + [[nodiscard]] QString getText(TrackerInfo const&) const; - QSize sizeHint(QStyleOptionViewItem const&, TrackerInfo const&) const; + [[nodiscard]] QSize sizeHint(QStyleOptionViewItem const&, TrackerInfo const&) const; void drawTracker(QPainter*, QStyleOptionViewItem const&, TrackerInfo const&) const; private: diff --git a/qt/TrackerModel.h b/qt/TrackerModel.h index afba8314e..b937dde37 100644 --- a/qt/TrackerModel.h +++ b/qt/TrackerModel.h @@ -39,11 +39,11 @@ public: TrackerModel& operator=(TrackerModel const&) = delete; void refresh(TorrentModel const&, torrent_ids_t const& ids); - int find(int torrent_id, QString const& url) const; + [[nodiscard]] int find(int torrent_id, QString const& url) const; // QAbstractItemModel - int rowCount(QModelIndex const& parent = QModelIndex{}) const override; - QVariant data(QModelIndex const& index, int role = Qt::DisplayRole) const override; + [[nodiscard]] int rowCount(QModelIndex const& parent = QModelIndex{}) const override; + [[nodiscard]] QVariant data(QModelIndex const& index, int role = Qt::DisplayRole) const override; private: using rows_t = std::vector; diff --git a/qt/TrackerModelFilter.h b/qt/TrackerModelFilter.h index 55251c399..cb2ce3b32 100644 --- a/qt/TrackerModelFilter.h +++ b/qt/TrackerModelFilter.h @@ -27,7 +27,7 @@ public: protected: // QSortFilterProxyModel - bool filterAcceptsRow(int source_row, QModelIndex const& source_parent) const override; + [[nodiscard]] bool filterAcceptsRow(int source_row, QModelIndex const& source_parent) const override; private: bool show_backups_ = {}; diff --git a/qt/WatchDir.h b/qt/WatchDir.h index d764c1f3b..25315700e 100644 --- a/qt/WatchDir.h +++ b/qt/WatchDir.h @@ -44,7 +44,7 @@ private: Error }; - AddResult metainfoTest(QString const& filename) const; + [[nodiscard]] AddResult metainfoTest(QString const& filename) const; TorrentModel const& model_; diff --git a/tests/libtransmission/test-fixtures.h b/tests/libtransmission/test-fixtures.h index a2e6ea979..2544305e9 100644 --- a/tests/libtransmission/test-fixtures.h +++ b/tests/libtransmission/test-fixtures.h @@ -135,7 +135,7 @@ public: rimraf(sandbox_dir_); } - std::string const& path() const + [[nodiscard]] constexpr std::string const& path() const { return sandbox_dir_; } @@ -183,12 +183,12 @@ private: class SandboxedTest : public ::testing::Test { protected: - std::string sandboxDir() const + [[nodiscard]] std::string sandboxDir() const { return sandbox_.path(); } - auto currentTestName() const + [[nodiscard]] auto currentTestName() const { auto const* i = ::testing::UnitTest::GetInstance()->current_test_info(); auto child = std::string(i->test_suite_name());