Adds further migration results and moves generated tests in
This commit is contained in:
442 files changed
+17126
-246
No files matched your search
+13
-18
@@ -11,25 +11,20 @@
|
||||
#endif
|
||||
|
||||
#include <Core/core_types.h>
|
||||
#include <DDS/Core/core.hpp>
|
||||
#include <QObject>
|
||||
#include <QPair>
|
||||
#include <QVector>
|
||||
#include <functional>
|
||||
#include <optional>
|
||||
|
||||
// BUILD_RTI wird immer definiert sein (ON oder OFF)
|
||||
// Type alias für FunctionReply - immer Core::FunctionReply verwenden
|
||||
// Bei BUILD_RTI=ON wird in der .cpp auf dds::core::Reference gecastet
|
||||
using FunctionReplyType = Core::FunctionReply;
|
||||
|
||||
namespace LtsUtils
|
||||
{
|
||||
|
||||
template <typename T> dds::core::optional<T> toOptional(T inVal)
|
||||
{
|
||||
return inVal != T() ? dds::core::optional<T>(inVal) : dds::core::optional<T>();
|
||||
}
|
||||
|
||||
template <typename T> dds::core::optional<T> optional()
|
||||
{
|
||||
return dds::core::optional<T>();
|
||||
}
|
||||
|
||||
class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -54,20 +49,20 @@ class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject
|
||||
}
|
||||
|
||||
void addRequest(const std::function<int64_t()>& requestFunction,
|
||||
const std::function<void(const Core::FunctionReply& baseReply)>& baseReplyHandler = nullptr);
|
||||
const std::function<void(const FunctionReplyType& baseReply)>& baseReplyHandler = nullptr);
|
||||
bool startRequests();
|
||||
|
||||
bool
|
||||
startSingleRequest(const std::function<int64_t(void)>& requestFunction,
|
||||
const std::function<void(const Core::FunctionReply& baseReply)>& baseReplyHandler = nullptr);
|
||||
const std::function<void(const FunctionReplyType& baseReply)>& baseReplyHandler = nullptr);
|
||||
|
||||
void startSingleBackgroundRequest(
|
||||
const std::function<int64_t()>& requestFunction,
|
||||
const std::function<void(const Core::FunctionReply& baseReply)>& baseReplyHandler = nullptr);
|
||||
const std::function<void(const FunctionReplyType& baseReply)>& baseReplyHandler = nullptr);
|
||||
|
||||
void startBackgroundRequests();
|
||||
|
||||
bool requestReply(const Core::FunctionReply& baseReply);
|
||||
bool requestReply(const FunctionReplyType& baseReply);
|
||||
bool requestReply(const Core::FunctionReplyObject& replyObject);
|
||||
|
||||
bool hasRequests() const
|
||||
@@ -95,12 +90,12 @@ class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject
|
||||
void failure();
|
||||
|
||||
private:
|
||||
using RequestFunctionContainer = QPair<std::function<int64_t()>, std::function<void(const Core::FunctionReply&)>>;
|
||||
using RequestFunctionContainer = QPair<std::function<int64_t()>, std::function<void(const FunctionReplyType&)>>;
|
||||
|
||||
QVector<RequestFunctionContainer> m_requestFunctions;
|
||||
bool m_failed;
|
||||
int m_repliedId;
|
||||
std::function<void(const Core::FunctionReply&)> m_singleRequestCustomFunctionReply;
|
||||
std::function<void(const FunctionReplyType&)> m_singleRequestCustomFunctionReply;
|
||||
bool m_quiet;
|
||||
bool m_blockingCall;
|
||||
std::function<void(void)> m_successFn;
|
||||
@@ -109,7 +104,7 @@ class LTSUTILSGUIDDS_INTERNAL_EXPORT RequestHelper : public QObject
|
||||
QString m_customWaitMessage;
|
||||
|
||||
void done();
|
||||
bool _requestReply(const Core::FunctionReplyObject& fro, const Core::FunctionReply* baseReply);
|
||||
bool _requestReply(const Core::FunctionReplyObject& fro, const FunctionReplyType* baseReply);
|
||||
|
||||
signals:
|
||||
void signalNextRequest();
|
||||
|
||||
Reference in new issue
Block a user