2022-01-20 18:27:56 +00:00
|
|
|
// This file Copyright © 2016-2022 Mnemosyne LLC.
|
2022-08-08 18:05:39 +00:00
|
|
|
// It may be used under GPLv2 (SPDX: GPL-2.0-only), GPLv3 (SPDX: GPL-3.0-only),
|
2022-01-20 18:27:56 +00:00
|
|
|
// or any future license endorsed by Mnemosyne LLC.
|
|
|
|
// License text can be found in the licenses/ folder.
|
2016-04-19 20:41:59 +00:00
|
|
|
|
|
|
|
#pragma once
|
|
|
|
|
2020-07-29 16:56:23 +00:00
|
|
|
#include <cstdint>
|
2016-04-19 20:41:59 +00:00
|
|
|
#include <functional>
|
|
|
|
#include <type_traits>
|
|
|
|
|
|
|
|
#include <QFutureInterface>
|
|
|
|
#include <QFutureWatcher>
|
|
|
|
#include <QObject>
|
|
|
|
#include <QPair>
|
|
|
|
#include <QQueue>
|
|
|
|
|
2021-12-14 08:43:27 +00:00
|
|
|
#include <libtransmission/tr-macros.h>
|
|
|
|
|
2016-04-19 20:41:59 +00:00
|
|
|
#include "RpcClient.h"
|
|
|
|
|
2017-04-19 12:04:45 +00:00
|
|
|
class RpcQueue : public QObject
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
|
|
|
Q_OBJECT
|
2020-08-11 18:11:55 +00:00
|
|
|
TR_DISABLE_COPY_MOVE(RpcQueue)
|
2016-04-19 20:41:59 +00:00
|
|
|
|
2017-04-19 12:04:45 +00:00
|
|
|
public:
|
|
|
|
explicit RpcQueue(QObject* parent = nullptr);
|
2016-04-19 20:41:59 +00:00
|
|
|
|
2020-05-27 21:53:12 +00:00
|
|
|
void setTolerateErrors(bool tolerate_errors = true)
|
2017-04-19 12:04:45 +00:00
|
|
|
{
|
2020-05-27 21:53:12 +00:00
|
|
|
tolerate_errors_ = tolerate_errors;
|
2017-04-19 12:04:45 +00:00
|
|
|
}
|
2016-04-19 20:41:59 +00:00
|
|
|
|
2017-04-19 12:04:45 +00:00
|
|
|
template<typename Func>
|
|
|
|
void add(Func func)
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
2020-05-27 21:53:12 +00:00
|
|
|
queue_.enqueue(qMakePair(normalizeFunc(func), ErrorHandlerFunction()));
|
2016-04-19 20:41:59 +00:00
|
|
|
}
|
|
|
|
|
2017-04-19 12:04:45 +00:00
|
|
|
template<typename Func, typename ErrorHandler>
|
2020-05-27 21:53:12 +00:00
|
|
|
void add(Func func, ErrorHandler error_handler)
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
2020-05-27 21:53:12 +00:00
|
|
|
queue_.enqueue(qMakePair(normalizeFunc(func), normalizeErrorHandler(error_handler)));
|
2016-04-19 20:41:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// The first function in queue is ran synchronously
|
|
|
|
// (hence it may be e. g. a lambda capturing local variables by reference).
|
2017-04-19 12:04:45 +00:00
|
|
|
void run();
|
2016-04-19 20:41:59 +00:00
|
|
|
|
2020-07-29 16:56:23 +00:00
|
|
|
using Tag = uint64_t;
|
2021-08-15 09:41:48 +00:00
|
|
|
|
2022-06-13 03:59:30 +00:00
|
|
|
[[nodiscard]] constexpr auto tag() const noexcept
|
2021-08-15 09:41:48 +00:00
|
|
|
{
|
|
|
|
return tag_;
|
|
|
|
}
|
2020-07-29 16:56:23 +00:00
|
|
|
|
2017-04-19 12:04:45 +00:00
|
|
|
private:
|
2016-04-19 20:41:59 +00:00
|
|
|
// Internally queued function. Takes the last response future, makes a
|
|
|
|
// request and returns a new response future.
|
2020-05-20 01:32:51 +00:00
|
|
|
using QueuedFunction = std::function<RpcResponseFuture(RpcResponseFuture const&)>;
|
2016-04-19 20:41:59 +00:00
|
|
|
|
|
|
|
// Internally stored error handler function. Takes the last response future and returns nothing.
|
2021-08-15 09:41:48 +00:00
|
|
|
using ErrorHandlerFunction = std::function<void(RpcResponseFuture const&)>;
|
2016-04-19 20:41:59 +00:00
|
|
|
|
2017-04-20 16:02:19 +00:00
|
|
|
void runNext(RpcResponseFuture const& response);
|
2016-04-19 20:41:59 +00:00
|
|
|
|
|
|
|
// These overloads convert various forms of input closures to what we store internally.
|
|
|
|
|
|
|
|
// normal closure, takes response and returns new future
|
2021-08-15 09:41:48 +00:00
|
|
|
template<
|
|
|
|
typename Func,
|
2022-01-24 00:53:35 +00:00
|
|
|
typename std::enable_if_t<std::is_same_v<typename std::invoke_result_t<Func, RpcResponse const&>, RpcResponseFuture>>* =
|
|
|
|
nullptr>
|
2020-11-09 03:31:02 +00:00
|
|
|
QueuedFunction normalizeFunc(Func const& func) const
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
2017-04-20 16:02:19 +00:00
|
|
|
return [func](RpcResponseFuture const& r)
|
2021-08-15 09:41:48 +00:00
|
|
|
{
|
|
|
|
return func(r.result());
|
|
|
|
};
|
2016-04-19 20:41:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// closure without argument (first step), takes nothing and returns new future
|
2021-08-15 09:41:48 +00:00
|
|
|
template<
|
|
|
|
typename Func,
|
2022-01-24 00:53:35 +00:00
|
|
|
typename std::enable_if_t<std::is_same_v<typename std::invoke_result_t<Func>, RpcResponseFuture>>* = nullptr>
|
2020-11-09 03:31:02 +00:00
|
|
|
QueuedFunction normalizeFunc(Func const& func) const
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
2017-04-20 16:02:19 +00:00
|
|
|
return [func](RpcResponseFuture const&)
|
2021-08-15 09:41:48 +00:00
|
|
|
{
|
|
|
|
return func();
|
|
|
|
};
|
2016-04-19 20:41:59 +00:00
|
|
|
}
|
|
|
|
|
Qt 6 support (#2069)
* 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>
2021-11-03 21:20:11 +00:00
|
|
|
// closure without return value ("auxiliary"), takes response and returns nothing
|
2021-08-15 09:41:48 +00:00
|
|
|
template<
|
|
|
|
typename Func,
|
2022-01-24 00:53:35 +00:00
|
|
|
typename std::enable_if_t<std::is_same_v<typename std::invoke_result_t<Func, RpcResponse const&>, void>>* = nullptr>
|
2020-11-09 03:31:02 +00:00
|
|
|
QueuedFunction normalizeFunc(Func const& func) const
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
2017-04-20 16:02:19 +00:00
|
|
|
return [func](RpcResponseFuture const& r)
|
2021-08-15 09:41:48 +00:00
|
|
|
{
|
|
|
|
func(r.result());
|
Qt 6 support (#2069)
* 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>
2021-11-03 21:20:11 +00:00
|
|
|
return createFinishedFuture();
|
2021-08-15 09:41:48 +00:00
|
|
|
};
|
2016-04-19 20:41:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// closure without argument and return value, takes nothing and returns nothing -- next function will also get nothing
|
2022-01-24 00:53:35 +00:00
|
|
|
template<typename Func, typename std::enable_if_t<std::is_same_v<typename std::invoke_result_t<Func>, void>>* = nullptr>
|
2020-11-09 03:31:02 +00:00
|
|
|
QueuedFunction normalizeFunc(Func const& func) const
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
Qt 6 support (#2069)
* 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>
2021-11-03 21:20:11 +00:00
|
|
|
return [func](RpcResponseFuture const&)
|
2021-08-15 09:41:48 +00:00
|
|
|
{
|
|
|
|
func();
|
Qt 6 support (#2069)
* 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>
2021-11-03 21:20:11 +00:00
|
|
|
return createFinishedFuture();
|
2021-08-15 09:41:48 +00:00
|
|
|
};
|
2016-04-19 20:41:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// normal error handler, takes last response
|
2021-08-15 09:41:48 +00:00
|
|
|
template<
|
|
|
|
typename Func,
|
2022-01-24 00:53:35 +00:00
|
|
|
typename std::enable_if_t<std::is_same_v<typename std::invoke_result_t<Func, RpcResponse const&>, void>>* = nullptr>
|
2020-11-09 03:31:02 +00:00
|
|
|
ErrorHandlerFunction normalizeErrorHandler(Func const& func) const
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
2017-04-20 16:02:19 +00:00
|
|
|
return [func](RpcResponseFuture const& r)
|
2021-08-15 09:41:48 +00:00
|
|
|
{
|
|
|
|
func(r.result());
|
|
|
|
};
|
2016-04-19 20:41:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// error handler without an argument, takes nothing
|
2022-01-24 00:53:35 +00:00
|
|
|
template<typename Func, typename std::enable_if_t<std::is_same_v<typename std::invoke_result_t<Func>, void>>* = nullptr>
|
2020-11-09 03:31:02 +00:00
|
|
|
ErrorHandlerFunction normalizeErrorHandler(Func const& func) const
|
2016-04-19 20:41:59 +00:00
|
|
|
{
|
fix: gcc warnings in libtransmission/ and utils/ (#843)
* fix: __attribute__(__printf__) warnings
* fix: implicit fallthrough warning
* fixup! fix: implicit fallthrough warning
* fix: disable warnings for 3rd party code
Since we want to leave upstream code as-is
* fixup! fix: disable warnings for 3rd party code
* fixup! fix: disable warnings for 3rd party code
* silence spurious alignment warning
Xrefs
Discussion: https://stackoverflow.com/a/35554349
Macro inspiration: https://pagure.io/SSSD/sssd/blob/90ac46f71068d131391492360a8553bdd005b5a7/f/src/util/util_safealign.h#_35
* fixup! fix: disable warnings for 3rd party code
* fixup! fix: implicit fallthrough warning
* make uncrustify happy
* remove uncrustify-test.sh
that's probably off-topic for this PR
* fixup! fix: __attribute__(__printf__) warnings
* Update libtransmission/CMakeLists.txt
Co-Authored-By: ckerr <ckerr@github.com>
* fixup! silence spurious alignment warning
* use -w for DISABLE_WARNINGS in Clang
* refactor: fix libtransmission deprecation warnings
* fix: pthread_create's start_routine's return value
This was defined as `void` on non-Windows but should have been `void*`
* chore: uncrustify
* fix: add DISABLE_WARNINGS option for SunPro Studio
* fix "unused in lambda capture" warnings by clang++
* fix 'increases required alignment' warning
Caused from storing int16_t's in a char array.
* fix net.c 'increases required alignment' warning
The code passes in a `struct sockaddr_storage*` which is a padded struct
large enough for the necessary alignment. Unfortunately it was recast as
a `struct sockaddr*` which has less padding and a smaller alignment. The
warning occrred because of these differing alignments.
* make building quieter so warnings are more visible
* fixup! fix 'increases required alignment' warning
* Fix -Wcast-function-type warnings in GTK+ app code
https://gitlab.gnome.org/GNOME/gnome-terminal/issues/96 talks about both
the issue and its solution.
GCC 8's -Wcast-function-type, enabled by -Wextra, is problematic in glib
applications because it's idiomatic there to recast function signatures,
e.g. `g_slist_free(list, (GFunc)g_free, NULL);`.
Disabling the warning with pragmas causes "unrecognized pragma" warnings
on clang and older versions of gcc, and disabling the warning could miss
actual bugs. GCC defines `void (*)(void)` as a special case that matches
anything so we can silence warnings by double-casting through GCallback.
In the previous example, the warning is silenced by changing the code to
read `g_slist_free(list, (GFunc)(GCallback)g_free, NULL);`).
* fixup! fix "unused in lambda capture" warnings by clang++
* fixup! fix "unused in lambda capture" warnings by clang++
* fix two more libtransmission compiler warnings
* fix: in watchdir, use TR_ENABLE_ASSERTS not NDEBUG
2019-11-06 17:27:03 +00:00
|
|
|
return [func](RpcResponseFuture const&)
|
2021-08-15 09:41:48 +00:00
|
|
|
{
|
|
|
|
func();
|
|
|
|
};
|
2016-04-19 20:41:59 +00:00
|
|
|
}
|
|
|
|
|
Qt 6 support (#2069)
* 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>
2021-11-03 21:20:11 +00:00
|
|
|
static RpcResponseFuture createFinishedFuture()
|
|
|
|
{
|
|
|
|
QFutureInterface<RpcResponse> promise;
|
|
|
|
promise.reportStarted();
|
|
|
|
promise.reportFinished();
|
|
|
|
return promise.future();
|
|
|
|
}
|
|
|
|
|
2020-07-29 16:56:23 +00:00
|
|
|
Tag const tag_;
|
2020-09-09 14:24:39 +00:00
|
|
|
static Tag next_tag;
|
2020-05-27 21:53:12 +00:00
|
|
|
bool tolerate_errors_ = {};
|
|
|
|
QFutureInterface<RpcResponse> promise_;
|
|
|
|
QQueue<QPair<QueuedFunction, ErrorHandlerFunction>> queue_;
|
|
|
|
ErrorHandlerFunction next_error_handler_;
|
|
|
|
QFutureWatcher<RpcResponse> future_watcher_;
|
2020-11-02 01:13:32 +00:00
|
|
|
|
|
|
|
private slots:
|
|
|
|
void stepFinished();
|
2016-04-19 20:41:59 +00:00
|
|
|
};
|