From 82086b14ba8014e361bf0e574acdff8cfa9fcbab Mon Sep 17 00:00:00 2001 From: HamletDuFromage <61667930+HamletDuFromage@users.noreply.github.com> Date: Sat, 2 Aug 2025 23:14:46 +0200 Subject: [PATCH] Make setComment declaration and definition order consistent --- src/base/bittorrent/torrentimpl.cpp | 20 ++++++++++---------- src/webui/api/torrentscontroller.cpp | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/base/bittorrent/torrentimpl.cpp b/src/base/bittorrent/torrentimpl.cpp index 037f31dd3..cedc6ef0c 100644 --- a/src/base/bittorrent/torrentimpl.cpp +++ b/src/base/bittorrent/torrentimpl.cpp @@ -443,6 +443,15 @@ QString TorrentImpl::comment() const return m_comment; } +void TorrentImpl::setComment(const QString &comment) +{ + if (m_comment != comment) + { + m_comment = comment; + deferredRequestResumeData(); + } +} + bool TorrentImpl::isPrivate() const { return m_torrentInfo.isPrivate(); @@ -2962,13 +2971,4 @@ QFuture> TorrentImpl::invokeAsync(Func &&func) const }); return future; -} - -void TorrentImpl::setComment(const QString &comment) -{ - if (m_comment != comment) - { - m_comment = comment; - deferredRequestResumeData(); - } -} +} \ No newline at end of file diff --git a/src/webui/api/torrentscontroller.cpp b/src/webui/api/torrentscontroller.cpp index 5a6757b3a..bb210bffd 100644 --- a/src/webui/api/torrentscontroller.cpp +++ b/src/webui/api/torrentscontroller.cpp @@ -1591,6 +1591,19 @@ void TorrentsController::renameAction() setResult(QString()); } +void TorrentsController::setCommentAction() +{ + requireParams({u"hashes"_s, u"comment"_s}); + + const QStringList hashes {params()[u"hashes"_s].split(u'|')}; + const QString comment = params()[u"comment"_s].trimmed(); + + applyToTorrents(hashes, [&comment](BitTorrent::Torrent *const torrent) + { + torrent->setComment(comment); + }); +} + void TorrentsController::setAutoManagementAction() { requireParams({u"hashes"_s, u"enable"_s}); @@ -2143,16 +2156,3 @@ void TorrentsController::onMetadataDownloaded(const BitTorrent::TorrentInfo &inf iter.value().setTorrentInfo(info); } } - -void TorrentsController::setCommentAction() -{ - requireParams({u"hashes"_s, u"comment"_s}); - - const QStringList hashes {params()[u"hashes"_s].split(u'|')}; - const QString comment = params()[u"comment"_s].trimmed(); - - applyToTorrents(hashes, [&comment](BitTorrent::Torrent *const torrent) - { - torrent->setComment(comment); - }); -}