squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-17 22:18:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation in C++23 mode

Browse Source 
This adds c++23 support. In my testing it works for nox and desktop.

PR #23193.
This commit is contained in:
Userdocs
2025-09-07 08:49:50 +01:00
committed by GitHub
parent 93a72673d4
commit 3146a3c2f9
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/bittorrent/torrentdescriptor.cpp
View File

@@ -132,7 +132,7 @@ try
const lt::entry torrentEntry = lt::write_torrent_file(m_ltAddTorrentParams);
const nonstd::expected<void, QString> result = Utils::IO::saveToFile(path, torrentEntry);
if (!result)
return result.get_unexpected();
return nonstd::make_unexpected(result.error());
return {};
}

6
src/base/bittorrent/torrentimpl.cpp
View File

@@ -2780,7 +2780,7 @@ nonstd::expected<QByteArray, QString> TorrentImpl::exportToBuffer() const
{
const nonstd::expected<lt::entry, QString> preparationResult = exportTorrent();
if (!preparationResult)
return preparationResult.get_unexpected();
return nonstd::make_unexpected(preparationResult.error());
// usually torrent size should be smaller than 1 MB,
// however there are >100 MB v2/hybrid torrent files out in the wild
@@ -2794,11 +2794,11 @@ nonstd::expected<void, QString> TorrentImpl::exportToFile(const Path &path) cons
{
const nonstd::expected<lt::entry, QString> preparationResult = exportTorrent();
if (!preparationResult)
return preparationResult.get_unexpected();
return nonstd::make_unexpected(preparationResult.error());
const nonstd::expected<void, QString> saveResult = Utils::IO::saveToFile(path, preparationResult.value());
if (!saveResult)
return saveResult.get_unexpected();
return nonstd::make_unexpected(saveResult.error());
return {};
}

6
src/base/rss/rss_session.cpp
View File

@@ -141,7 +141,7 @@ nonstd::expected<Folder *, QString> Session::addFolder(const QString &path)
{
const nonstd::expected<Folder *, QString> result = prepareItemDest(path);
if (!result)
return result.get_unexpected();
return nonstd::make_unexpected(result.error());
auto *destFolder = result.value();
auto *folder = new Folder(path);
@@ -157,7 +157,7 @@ nonstd::expected<Feed *, QString> Session::addFeed(const QString &url, const QSt
const nonstd::expected<Folder *, QString> result = prepareItemDest(path);
if (!result)
return result.get_unexpected();
return nonstd::make_unexpected(result.error());
auto *destFolder = result.value();
auto *feed = new Feed(this, generateUID(), url, path, refreshInterval);
@@ -225,7 +225,7 @@ nonstd::expected<void, QString> Session::moveItem(Item *item, const QString &des
const nonstd::expected<Folder *, QString> result = prepareItemDest(destPath);
if (!result)
return result.get_unexpected();
return nonstd::make_unexpected(result.error());
auto *destFolder = result.value();
auto *srcFolder = static_cast<Folder *>(m_itemsByPath.value(Item::parentPath(item->path())));