mirror of
https://github.com/transmission/transmission
synced 2024-12-27 18:18:10 +00:00
be74cb6356
* Bump minimum Qt version to 5.6
* Switch from QRegExp to QRegularExpression
While still available, QRegExp has been moved to Qt6::Core5Compat module
and is not part of Qt6::Core.
* Use qIsEffectiveTLD instead of QUrl::topLevelDomain
The latter is not part of Qt6::Core. The former is a private utility in
Qt6::Network; using it for now, until (and if) we switch to something
non-Qt-specific.
* Use QStyle::State_Horizontal state when drawing progress bars
Although available for a long time, this state either didn't apply to
progress bars before Qt 6, or was deduced based on bar size. With Qt 6,
failing to specify it results in bad rendering.
* Don't use QStringRef (and associated methods)
While still available, QStringRef has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core. Related method (e.g.
QString::midRef) have been removed in Qt 6.
* Use Qt::ItemIsAutoTristate instead of Qt::ItemIsTristate
The latter was deprecated and replaced with the former in Qt 5.6.
* Don't use QApplication::globalStrut
This property has been deprecated in Qt 5.15 and removed in Qt 6.
* Use QImage::fromHICON instead of QtWin::fromHICON
WinExtras module (providind the latter helper) has been removed in Qt 6.
* Use QStringDecoder instead of QTextCodec
While still available, QTextCodec has been moved to Qt6::Core5Compat
module and is not part of Qt6::Core.
* Don't forward-declare QStringList
Instead of being a standalone class, its definition has changed to
QList<QString> template specialization in Qt 6.
* Use explicit (since Qt 6) QFileInfo constructor
* Use QDateTime's {to,from}SecsSinceEpoch instead of {to,from}Time_t
The latter was deprecated in Qt 5.8 and removed in Qt 6.
* Don't use QFuture<>'s operator==
It has been removed in Qt 6. Since the original issue this code was
solving was caused by future reuse, just don't reuse futures and create
new finished ones when necessary.
* Use std::vector<> instead of QVector<>
The latter has been changed to a typedef for QList<>, which might not be
what one wants, and which also changed behavior a bit leading to
compilation errors.
* Don't use + for flags, cast to int explicitly
Operator+ for enum values has been deleted in Qt 6, so using operator|
instead. Then, there's no conversion from QFlags<> to QVariant, so need
to cast to int.
* Support Qt 6 in CMake and for MSI packaging
* Remove extra (empty) CMake variable use when constructing Qt target names
* Simplify logic in tr_qt_add_translation CMake helper
Co-authored-by: Charles Kerr <charles@charleskerr.com>
81 lines
2 KiB
C++
81 lines
2 KiB
C++
/*
|
|
* This file Copyright (C) 2016 Mnemosyne LLC
|
|
*
|
|
* It may be used under the GNU GPL versions 2 or 3
|
|
* or any future license endorsed by Mnemosyne LLC.
|
|
*
|
|
*/
|
|
|
|
#include <cassert>
|
|
|
|
#include "RpcQueue.h"
|
|
|
|
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
|
|
RpcQueue::Tag RpcQueue::next_tag = {};
|
|
|
|
RpcQueue::RpcQueue(QObject* parent)
|
|
: QObject(parent)
|
|
, tag_(next_tag++)
|
|
{
|
|
connect(&future_watcher_, &QFutureWatcher<RpcResponse>::finished, this, &RpcQueue::stepFinished);
|
|
}
|
|
|
|
void RpcQueue::stepFinished()
|
|
{
|
|
RpcResponse result;
|
|
|
|
if (future_watcher_.future().isResultReadyAt(0))
|
|
{
|
|
result = future_watcher_.result();
|
|
RpcResponseFuture future = future_watcher_.future();
|
|
|
|
// we can't handle network errors, abort queue and pass the error upwards
|
|
if (result.networkError != QNetworkReply::NoError)
|
|
{
|
|
assert(!result.success);
|
|
|
|
promise_.reportFinished(&result);
|
|
deleteLater();
|
|
return;
|
|
}
|
|
|
|
// call user-handler for ordinary errors
|
|
if (!result.success && next_error_handler_)
|
|
{
|
|
next_error_handler_(future);
|
|
}
|
|
|
|
// run next request, if we have one to run and there was no error (or if we tolerate errors)
|
|
if ((result.success || tolerate_errors_) && !queue_.isEmpty())
|
|
{
|
|
runNext(future);
|
|
return;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
assert(!next_error_handler_);
|
|
assert(queue_.isEmpty());
|
|
|
|
// one way or another, the last step returned nothing.
|
|
// assume it is OK and ensure that we're not going to give an empty response object to any of the next steps.
|
|
result.success = true;
|
|
}
|
|
|
|
promise_.reportFinished(&result);
|
|
deleteLater();
|
|
}
|
|
|
|
void RpcQueue::runNext(RpcResponseFuture const& response)
|
|
{
|
|
assert(!queue_.isEmpty());
|
|
|
|
auto next = queue_.dequeue();
|
|
next_error_handler_ = next.second;
|
|
future_watcher_.setFuture((next.first)(response));
|
|
}
|
|
|
|
void RpcQueue::run()
|
|
{
|
|
runNext(RpcResponseFuture());
|
|
}
|