mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-04 10:38:13 +00:00
Code Issues Releases Wiki Activity

refactor: make accessor functions constexpr (#3276)

Browse source
This commit is contained in:
Charles Kerr 2022-06-12 22:59:30 -05:00 • committed by GitHub
parent dd85cd20bd
commit bf1d668f9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 143 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qt/FileTreeItem.h
View file

@ -43,24 +43,24 @@ public:
return children_.at(row);
}
int childCount() const
[[nodiscard]] int childCount() const noexcept
{
return children_.size();
return std::size(children_);
}
FileTreeItem* parent()
[[nodiscard]] auto* parent() noexcept
{
return parent_;
}
FileTreeItem const* parent() const
[[nodiscard]] auto const* parent() const noexcept
{
return parent_;
}
int row() const;
QString const& name() const
[[nodiscard]] constexpr auto const& name() const noexcept
{
return name_;
}
@ -70,12 +70,12 @@ public:
void setSubtreeWanted(bool, QSet<int>& file_ids);
void setSubtreePriority(int priority, QSet<int>& file_ids);
int fileIndex() const
[[nodiscard]] constexpr auto fileIndex() const noexcept
{
return file_index_;
}
uint64_t totalSize() const
[[nodiscard]] constexpr auto totalSize() const noexcept
{
return total_size_;
}

6
qt/Filters.h
View file

@ -75,12 +75,12 @@ public:
NUM_MODES
};
explicit SortMode(int mode = SORT_BY_ID)
: mode_(mode)
explicit SortMode(int mode = SORT_BY_ID) noexcept
: mode_{ mode }
{
}
int mode() const
[[nodiscard]] constexpr auto mode() const noexcept
{
return mode_;
}

4
qt/IconCache.h
View file

@ -30,12 +30,12 @@ class IconCache
public:
static IconCache& get();
QIcon folderIcon() const
[[nodiscard]] constexpr auto const& folderIcon() const noexcept
{
return folder_icon_;
}
QIcon fileIcon() const
[[nodiscard]] constexpr auto const& fileIcon() const noexcept
{
return file_icon_;
}

2
qt/MainWindow.h
View file

@ -55,7 +55,7 @@ class MainWindow : public QMainWindow
public:
MainWindow(Session&, Prefs&, TorrentModel&, bool minimized);
QSystemTrayIcon& trayIcon()
[[nodiscard]] constexpr QSystemTrayIcon& trayIcon() noexcept
{
return tray_icon_;
}

10
qt/Prefs.h
View file

@ -136,27 +136,27 @@ public:
explicit Prefs(QString config_dir);
~Prefs() override;
bool isCore(int key) const
[[nodiscard]] constexpr auto isCore(int key) const noexcept
{
return FIRST_CORE_PREF <= key && key <= LAST_CORE_PREF;
}
bool isClient(int key) const
[[nodiscard]] constexpr auto isClient(int key) const noexcept
{
return !isCore(key);
}
tr_quark getKey(int i) const
[[nodiscard]] constexpr auto getKey(int i) const noexcept
{
return Items[i].key;
}
int type(int i) const
[[nodiscard]] constexpr auto type(int i) const noexcept
{
return Items[i].type;
}
QVariant const& variant(int i) const
[[nodiscard]] constexpr auto const& variant(int i) const noexcept
{
return values_[i];
}

2
qt/RpcQueue.h
View file

@ -50,7 +50,7 @@ public:
using Tag = uint64_t;
Tag tag() const
[[nodiscard]] constexpr auto tag() const noexcept
{
return tag_;
}

8
qt/Session.h
View file

@ -49,22 +49,22 @@ public:
return rpc_.url();
}
tr_session_stats const& getStats() const
[[nodiscard]] constexpr auto const& getStats() const noexcept
{
return stats_;
}
tr_session_stats const& getCumulativeStats() const
[[nodiscard]] constexpr auto const& getCumulativeStats() const noexcept
{
return cumulative_stats_;
}
QString const& sessionVersion() const
[[nodiscard]] constexpr auto const& sessionVersion() const noexcept
{
return session_version_;
}
int64_t blocklistSize() const
[[nodiscard]] constexpr auto blocklistSize() const noexcept
{
return blocklist_size_;
}

20
qt/Speed.h
View file

@ -12,56 +12,56 @@ public:
double getKBps() const;
[[nodiscard]] int getBps() const
[[nodiscard]] auto constexpr getBps() const noexcept
{
return bytes_per_second_;
}
[[nodiscard]] bool isZero() const
[[nodiscard]] auto constexpr isZero() const noexcept
{
return bytes_per_second_ == 0;
}
static Speed fromKBps(double KBps);
static Speed fromBps(int Bps)
[[nodiscard]] static constexpr Speed fromBps(int Bps) noexcept
{
return Speed{ Bps };
}
void setBps(int Bps)
void constexpr setBps(int Bps) noexcept
{
bytes_per_second_ = Bps;
}
Speed& operator+=(Speed const& that)
constexpr Speed& operator+=(Speed const& that) noexcept
{
bytes_per_second_ += that.bytes_per_second_;
return *this;
}
[[nodiscard]] Speed operator+(Speed const& that) const
[[nodiscard]] auto constexpr operator+(Speed const& that) const noexcept
{
return Speed{ getBps() + that.getBps() };
}
[[nodiscard]] bool operator<(Speed const& that) const
[[nodiscard]] auto constexpr operator<(Speed const& that) const noexcept
{
return getBps() < that.getBps();
}
[[nodiscard]] bool operator==(Speed const& that) const
[[nodiscard]] auto constexpr operator==(Speed const& that) const noexcept
{
return getBps() == that.getBps();
}
[[nodiscard]] bool operator!=(Speed const& that) const
[[nodiscard]] auto constexpr operator!=(Speed const& that) const noexcept
{
return getBps() != that.getBps();
}
private:
explicit Speed(int bytes_per_second)
explicit constexpr Speed(int bytes_per_second) noexcept
: bytes_per_second_{ bytes_per_second }
{
}

218
qt/Torrent.h
View file

@ -137,17 +137,17 @@ public:
}
}
bool operator==(TorrentHash const& that) const
[[nodiscard]] auto operator==(TorrentHash const& that) const
{
return data_ == that.data_;
}
bool operator!=(TorrentHash const& that) const
[[nodiscard]] auto operator!=(TorrentHash const& that) const
{
return data_ != that.data_;
}
bool operator<(TorrentHash const& that) const
[[nodiscard]] auto operator<(TorrentHash const& that) const
{
return data_ < that.data_;
}
@ -166,17 +166,17 @@ class Torrent : public QObject
public:
Torrent(Prefs const&, int id);
int getBandwidthPriority() const
[[nodiscard]] constexpr auto getBandwidthPriority() const noexcept
{
return bandwidth_priority_;
}
int id() const
[[nodiscard]] constexpr auto id() const noexcept
{
return id_;
}
QString const& name() const
[[nodiscard]] constexpr auto const& name() const noexcept
{
return name_;
}
@ -186,106 +186,121 @@ public:
return !name_.isEmpty();
}
QString const& creator() const
[[nodiscard]] constexpr auto const& creator() const noexcept
{
return creator_;
}
QString const& comment() const
[[nodiscard]] constexpr auto const& comment() const noexcept
{
return comment_;
}
QString const& getPath() const
[[nodiscard]] constexpr auto const& getPath() const noexcept
{
return download_dir_;
}
QString getError() const;
QString trackerList() const
[[nodiscard]] constexpr auto const& trackerList() const noexcept
{
return tracker_list_;
}
TorrentHash const& hash() const
[[nodiscard]] constexpr auto const& hash() const noexcept
{
return hash_;
}
bool hasError() const
[[nodiscard]] constexpr auto hasError() const noexcept
{
return error_ != TR_STAT_OK;
}
bool isDone() const
[[nodiscard]] constexpr auto leftUntilDone() const noexcept
{
return left_until_done_;
}
[[nodiscard]] constexpr auto isDone() const noexcept
{
return leftUntilDone() == 0;
}
bool isSeed() const
[[nodiscard]] constexpr auto haveVerified() const noexcept
{
return have_verified_;
}
[[nodiscard]] constexpr auto totalSize() const noexcept
{
return total_size_;
}
[[nodiscard]] constexpr auto isSeed() const noexcept
{
return haveVerified() >= totalSize();
}
bool isPrivate() const
[[nodiscard]] constexpr auto isPrivate() const noexcept
{
return is_private_;
}
std::optional<double> getSeedRatioLimit() const;
uint64_t haveVerified() const
{
return have_verified_;
}
uint64_t haveUnverified() const
[[nodiscard]] constexpr auto haveUnverified() const noexcept
{
return have_unchecked_;
}
uint64_t desiredAvailable() const
[[nodiscard]] constexpr auto desiredAvailable() const noexcept
{
return desired_available_;
}
uint64_t haveTotal() const
[[nodiscard]] constexpr auto haveTotal() const noexcept
{
return haveVerified() + haveUnverified();
}
uint64_t totalSize() const
{
return total_size_;
}
uint64_t sizeWhenDone() const
[[nodiscard]] constexpr auto sizeWhenDone() const noexcept
{
return size_when_done_;
}
uint64_t leftUntilDone() const
{
return left_until_done_;
}
uint64_t pieceSize() const
[[nodiscard]] constexpr auto pieceSize() const noexcept
{
return piece_size_;
}
bool hasMetadata() const
[[nodiscard]] constexpr auto metadataPercentDone() const noexcept
{
return metadata_percent_complete_;
}
[[nodiscard]] constexpr auto hasMetadata() const noexcept
{
return metadataPercentDone() >= 1.0;
}
int pieceCount() const
[[nodiscard]] constexpr auto pieceCount() const noexcept
{
return piece_count_;
}
double ratio() const
[[nodiscard]] constexpr auto downloadedEver() const noexcept
{
return downloaded_ever_;
}
[[nodiscard]] constexpr auto uploadedEver() const noexcept
{
return uploaded_ever_;
}
[[nodiscard]] constexpr auto ratio() const noexcept
{
auto const u = uploadedEver();
auto const d = downloadedEver();
@ -293,34 +308,19 @@ public:
return double(u) / (d ? d : t);
}
double percentComplete() const
[[nodiscard]] constexpr double percentComplete() const noexcept
{
return totalSize() != 0 ? haveTotal() / static_cast<double>(totalSize()) : 0;
}
double percentDone() const
[[nodiscard]] constexpr double percentDone() const noexcept
{
auto const l = leftUntilDone();
auto const s = sizeWhenDone();
return s ? static_cast<double>(s - l) / static_cast<double>(s) : 0.0;
}
double metadataPercentDone() const
{
return metadata_percent_complete_;
}
uint64_t downloadedEver() const
{
return downloaded_ever_;
}
uint64_t uploadedEver() const
{
return uploaded_ever_;
}
uint64_t failedEver() const
[[nodiscard]] constexpr auto failedEver() const noexcept
{
return failed_ever_;
}
@ -329,235 +329,235 @@ public:
int compareRatio(Torrent const&) const;
int compareETA(Torrent const&) const;
bool hasETA() const
{
return getETA() >= 0;
}
int getETA() const
[[nodiscard]] constexpr auto getETA() const noexcept
{
return eta_;
}
time_t lastActivity() const
[[nodiscard]] constexpr auto hasETA() const noexcept
{
return getETA() >= 0;
}
[[nodiscard]] constexpr auto lastActivity() const noexcept
{
return activity_date_;
}
time_t lastStarted() const
[[nodiscard]] constexpr auto lastStarted() const noexcept
{
return start_date_;
}
time_t dateAdded() const
[[nodiscard]] constexpr auto dateAdded() const noexcept
{
return added_date_;
}
time_t dateCreated() const
[[nodiscard]] constexpr auto dateCreated() const noexcept
{
return date_created_;
}
time_t dateEdited() const
[[nodiscard]] constexpr auto dateEdited() const noexcept
{
return edit_date_;
}
time_t manualAnnounceTime() const
[[nodiscard]] constexpr auto manualAnnounceTime() const noexcept
{
return manual_announce_time_;
}
bool canManualAnnounceAt(time_t t) const
{
return isReadyToTransfer() && (manualAnnounceTime() <= t);
}
int peersWeAreDownloadingFrom() const
[[nodiscard]] constexpr auto peersWeAreDownloadingFrom() const noexcept
{
return peers_sending_to_us_;
}
int webseedsWeAreDownloadingFrom() const
[[nodiscard]] constexpr auto webseedsWeAreDownloadingFrom() const noexcept
{
return webseeds_sending_to_us_;
}
int peersWeAreUploadingTo() const
[[nodiscard]] constexpr auto peersWeAreUploadingTo() const noexcept
{
return peers_getting_from_us_;
}
bool isUploading() const
[[nodiscard]] constexpr auto isUploading() const noexcept
{
return peersWeAreUploadingTo() > 0;
}
int connectedPeers() const
[[nodiscard]] constexpr auto connectedPeers() const noexcept
{
return peers_connected_;
}
int connectedPeersAndWebseeds() const
[[nodiscard]] constexpr auto connectedPeersAndWebseeds() const noexcept
{
return connectedPeers() + webseedsWeAreDownloadingFrom();
}
Speed const& downloadSpeed() const
[[nodiscard]] constexpr auto const& downloadSpeed() const noexcept
{
return download_speed_;
}
Speed const& uploadSpeed() const
[[nodiscard]] constexpr auto const& uploadSpeed() const noexcept
{
return upload_speed_;
}
double getVerifyProgress() const
[[nodiscard]] constexpr auto getVerifyProgress() const noexcept
{
return recheck_progress_;
}
bool includesTracker(QString const& sitename) const;
std::vector<QString> const& sitenames() const
[[nodiscard]] constexpr auto const& sitenames() const noexcept
{
return sitenames_;
}
Speed uploadLimit() const
[[nodiscard]] Speed uploadLimit() const
{
return Speed::fromKBps(upload_limit_);
}
Speed downloadLimit() const
[[nodiscard]] Speed downloadLimit() const
{
return Speed::fromKBps(download_limit_);
}
bool uploadIsLimited() const
[[nodiscard]] constexpr auto uploadIsLimited() const noexcept
{
return upload_limited_;
}
bool downloadIsLimited() const
[[nodiscard]] constexpr auto downloadIsLimited() const noexcept
{
return download_limited_;
}
bool honorsSessionLimits() const
[[nodiscard]] constexpr auto honorsSessionLimits() const noexcept
{
return honors_session_limits_;
}
int peerLimit() const
[[nodiscard]] constexpr auto peerLimit() const noexcept
{
return peer_limit_;
}
double seedRatioLimit() const
[[nodiscard]] constexpr auto seedRatioLimit() const noexcept
{
return seed_ratio_limit_;
}
tr_ratiolimit seedRatioMode() const
[[nodiscard]] constexpr auto seedRatioMode() const noexcept
{
return static_cast<tr_ratiolimit>(seed_ratio_mode_);
}
int seedIdleLimit() const
[[nodiscard]] constexpr auto seedIdleLimit() const noexcept
{
return seed_idle_limit_;
}
tr_idlelimit seedIdleMode() const
[[nodiscard]] constexpr auto seedIdleMode() const noexcept
{
return static_cast<tr_idlelimit>(seed_idle_mode_);
}
TrackerStatsList const& trackerStats() const
[[nodiscard]] constexpr auto const& trackerStats() const noexcept
{
return tracker_stats_;
}
PeerList const& peers() const
[[nodiscard]] constexpr auto const& peers() const noexcept
{
return peers_;
}
FileList const& files() const
[[nodiscard]] constexpr auto const& files() const noexcept
{
return files_;
}
int queuePosition() const
[[nodiscard]] auto constexpr queuePosition() const noexcept
{
return queue_position_;
}
bool isStalled() const
[[nodiscard]] auto constexpr isStalled() const noexcept
{
return is_stalled_;
}
QString activityString() const;
tr_torrent_activity getActivity() const
[[nodiscard]] auto constexpr getActivity() const noexcept
{
return static_cast<tr_torrent_activity>(status_);
}
bool isFinished() const
[[nodiscard]] auto constexpr isFinished() const noexcept
{
return is_finished_;
}
bool isPaused() const
[[nodiscard]] auto constexpr isPaused() const noexcept
{
return getActivity() == TR_STATUS_STOPPED;
}
bool isWaitingToVerify() const
[[nodiscard]] auto constexpr isWaitingToVerify() const noexcept
{
return getActivity() == TR_STATUS_CHECK_WAIT;
}
bool isVerifying() const
[[nodiscard]] auto constexpr isVerifying() const noexcept
{
return getActivity() == TR_STATUS_CHECK;
}
bool isDownloading() const
[[nodiscard]] auto constexpr isDownloading() const noexcept
{
return getActivity() == TR_STATUS_DOWNLOAD;
}
bool isWaitingToDownload() const
[[nodiscard]] auto constexpr isWaitingToDownload() const noexcept
{
return getActivity() == TR_STATUS_DOWNLOAD_WAIT;
}
bool isSeeding() const
[[nodiscard]] auto constexpr isSeeding() const noexcept
{
return getActivity() == TR_STATUS_SEED;
}
bool isWaitingToSeed() const
[[nodiscard]] auto constexpr isWaitingToSeed() const noexcept
{
return getActivity() == TR_STATUS_SEED_WAIT;
}
bool isReadyToTransfer() const
[[nodiscard]] auto constexpr isReadyToTransfer() const noexcept
{
return getActivity() == TR_STATUS_DOWNLOAD || getActivity() == TR_STATUS_SEED;
}
bool isQueued() const
[[nodiscard]] auto constexpr isQueued() const noexcept
{
return isWaitingToDownload() || isWaitingToSeed();
}
[[nodiscard]] auto constexpr canManualAnnounceAt(time_t t) const noexcept
{
return isReadyToTransfer() && (manualAnnounceTime() <= t);
}
QIcon getMimeTypeIcon() const;
enum Field

2
qt/TrackerModelFilter.h
View file

@ -19,7 +19,7 @@ public:
void setShowBackupTrackers(bool);
bool showBackupTrackers() const
[[nodiscard]] constexpr auto showBackupTrackers() const noexcept
{
return show_backups_;
}