[network/libktorrent] src: ABI/API break: use enum class for SocketMonitor::GroupType
Jack Hill <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 25ad42f77b6b42e5552f8db79191d56d787413eb by Jack Hill.
Committed on 15/08/2026 at 10:22.
Pushed by jackh into branch 'master'.
ABI/API break: use enum class for SocketMonitor::GroupType
M +4 -4 src/net/socketmonitor.cpp
M +1 -1 src/net/socketmonitor.h
M +8 -8 src/torrent/torrentcontrol.cpp
https://invent.kde.org/network/libktorrent/-/commit/25ad42f77b6b42e5552f8db79191d56d787413eb
diff --git a/src/net/socketmonitor.cpp b/src/net/socketmonitor.cpp
index f2e116bd..241473bb 100644
--- a/src/net/socketmonitor.cpp
+++ b/src/net/socketmonitor.cpp
@@ -173,7 +173,7 @@ Uint32 SocketMonitor::newGroup(GroupType type, Uint32 limit, Uint32 assured_rate
}
const Uint32 gid = d->next_group_id++;
- if (type == UPLOAD_GROUP) {
+ if (type == GroupType::UPLOAD_GROUP) {
d->ut->addGroup(gid, limit, assured_rate);
} else {
d->dt->addGroup(gid, limit, assured_rate);
@@ -189,7 +189,7 @@ void SocketMonitor::setGroupLimit(GroupType type, Uint32 gid, Uint32 limit)
return;
}
- if (type == UPLOAD_GROUP) {
+ if (type == GroupType::UPLOAD_GROUP) {
d->ut->setGroupLimit(gid, limit);
} else {
d->dt->setGroupLimit(gid, limit);
@@ -203,7 +203,7 @@ void SocketMonitor::setGroupAssuredRate(GroupType type, Uint32 gid, Uint32 as)
return;
}
- if (type == UPLOAD_GROUP) {
+ if (type == GroupType::UPLOAD_GROUP) {
d->ut->setGroupAssuredRate(gid, as);
} else {
d->dt->setGroupAssuredRate(gid, as);
@@ -217,7 +217,7 @@ void SocketMonitor::removeGroup(GroupType type, Uint32 gid)
return;
}
- if (type == UPLOAD_GROUP) {
+ if (type == GroupType::UPLOAD_GROUP) {
d->ut->removeGroup(gid);
} else {
d->dt->removeGroup(gid);
diff --git a/src/net/socketmonitor.h b/src/net/socketmonitor.h
index 85136803..f78caeba 100644
--- a/src/net/socketmonitor.h
+++ b/src/net/socketmonitor.h
@@ -71,7 +71,7 @@ public:
* \var DOWNLOAD_GROUP
* Limits download rate.
*/
- enum GroupType {
+ enum class GroupType {
UPLOAD_GROUP,
DOWNLOAD_GROUP,
};
diff --git a/src/torrent/torrentcontrol.cpp b/src/torrent/torrentcontrol.cpp
index 73230ba2..0ecc20f9 100644
--- a/src/torrent/torrentcontrol.cpp
+++ b/src/torrent/torrentcontrol.cpp
@@ -1570,15 +1570,15 @@ void TorrentControl::setUploadProps(Uint32 limit, Uint32 rate)
net::SocketMonitor &smon = net::SocketMonitor::instance();
if (upload_gid) {
if (!limit && !rate) {
- smon.removeGroup(net::SocketMonitor::UPLOAD_GROUP, upload_gid);
+ smon.removeGroup(net::SocketMonitor::GroupType::UPLOAD_GROUP, upload_gid);
upload_gid = 0;
} else {
- smon.setGroupLimit(net::SocketMonitor::UPLOAD_GROUP, upload_gid, limit);
- smon.setGroupAssuredRate(net::SocketMonitor::UPLOAD_GROUP, upload_gid, rate);
+ smon.setGroupLimit(net::SocketMonitor::GroupType::UPLOAD_GROUP, upload_gid, limit);
+ smon.setGroupAssuredRate(net::SocketMonitor::GroupType::UPLOAD_GROUP, upload_gid, rate);
}
} else {
if (limit || rate) {
- upload_gid = smon.newGroup(net::SocketMonitor::UPLOAD_GROUP, limit, rate);
+ upload_gid = smon.newGroup(net::SocketMonitor::GroupType::UPLOAD_GROUP, limit, rate);
}
}
@@ -1591,15 +1591,15 @@ void TorrentControl::setDownloadProps(Uint32 limit, Uint32 rate)
net::SocketMonitor &smon = net::SocketMonitor::instance();
if (download_gid) {
if (!limit && !rate) {
- smon.removeGroup(net::SocketMonitor::DOWNLOAD_GROUP, download_gid);
+ smon.removeGroup(net::SocketMonitor::GroupType::DOWNLOAD_GROUP, download_gid);
download_gid = 0;
} else {
- smon.setGroupLimit(net::SocketMonitor::DOWNLOAD_GROUP, download_gid, limit);
- smon.setGroupAssuredRate(net::SocketMonitor::DOWNLOAD_GROUP, download_gid, rate);
+ smon.setGroupLimit(net::SocketMonitor::GroupType::DOWNLOAD_GROUP, download_gid, limit);
+ smon.setGroupAssuredRate(net::SocketMonitor::GroupType::DOWNLOAD_GROUP, download_gid, rate);
}
} else {
if (limit || rate) {
- download_gid = smon.newGroup(net::SocketMonitor::DOWNLOAD_GROUP, limit, rate);
+ download_gid = smon.newGroup(net::SocketMonitor::GroupType::DOWNLOAD_GROUP, limit, rate);
}
}