diff --git a/goldenmaster/counter/olink/olinkcounter.cpp b/goldenmaster/counter/olink/olinkcounter.cpp index 211da25e..bc1696b4 100644 --- a/goldenmaster/counter/olink/olinkcounter.cpp +++ b/goldenmaster/counter/olink/olinkcounter.cpp @@ -123,7 +123,8 @@ QFuture OLinkCounter::incrementAsync(const QVector3D& vec) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkCounter::increment, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(QVector3D()); + resolve->addResult(QVector3D()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "increment"); m_node->invokeRemote(operationId, nlohmann::json::array({vec}), @@ -150,7 +151,8 @@ QFuture OLinkCounter::decrementAsync(const custom_types: if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkCounter::decrement, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(custom_types::Vector3D()); + resolve->addResult(custom_types::Vector3D()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "decrement"); m_node->invokeRemote(operationId, nlohmann::json::array({vec}), diff --git a/goldenmaster/tb_enum/olink/olinkenuminterface.cpp b/goldenmaster/tb_enum/olink/olinkenuminterface.cpp index 7182e593..07d1bee4 100644 --- a/goldenmaster/tb_enum/olink/olinkenuminterface.cpp +++ b/goldenmaster/tb_enum/olink/olinkenuminterface.cpp @@ -183,7 +183,8 @@ QFuture OLinkEnumInterface::func0Async(Enum0::Enum0Enum param0 if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkEnumInterface::func0, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum0::Value0); + resolve->addResult(Enum0::Value0); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func0"); m_node->invokeRemote(operationId, nlohmann::json::array({param0}), @@ -210,7 +211,8 @@ QFuture OLinkEnumInterface::func1Async(Enum1::Enum1Enum param1 if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkEnumInterface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum1::Value1); + resolve->addResult(Enum1::Value1); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), @@ -237,7 +239,8 @@ QFuture OLinkEnumInterface::func2Async(Enum2::Enum2Enum param2 if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkEnumInterface::func2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum2::Value2); + resolve->addResult(Enum2::Value2); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func2"); m_node->invokeRemote(operationId, nlohmann::json::array({param2}), @@ -264,7 +267,8 @@ QFuture OLinkEnumInterface::func3Async(Enum3::Enum3Enum param3 if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkEnumInterface::func3, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum3::Value3); + resolve->addResult(Enum3::Value3); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func3"); m_node->invokeRemote(operationId, nlohmann::json::array({param3}), diff --git a/goldenmaster/tb_names/olink/olinknam_es.cpp b/goldenmaster/tb_names/olink/olinknam_es.cpp index 9b6d8a99..c3e685e6 100644 --- a/goldenmaster/tb_names/olink/olinknam_es.cpp +++ b/goldenmaster/tb_names/olink/olinknam_es.cpp @@ -153,7 +153,8 @@ QFuture OLinkNam_Es::someFunctionAsync(bool SOME_PARAM) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNam_Es::someFunction, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->finish(); + resolve->finish(); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "SOME_FUNCTION"); m_node->invokeRemote(operationId, nlohmann::json::array({SOME_PARAM}), @@ -179,7 +180,8 @@ QFuture OLinkNam_Es::someFunction2Async(bool Some_Param) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNam_Es::someFunction2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->finish(); + resolve->finish(); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "Some_Function2"); m_node->invokeRemote(operationId, nlohmann::json::array({Some_Param}), diff --git a/goldenmaster/tb_same1/olink/olinksameenum1interface.cpp b/goldenmaster/tb_same1/olink/olinksameenum1interface.cpp index 64433bec..fe7778f2 100644 --- a/goldenmaster/tb_same1/olink/olinksameenum1interface.cpp +++ b/goldenmaster/tb_same1/olink/olinksameenum1interface.cpp @@ -93,7 +93,8 @@ QFuture OLinkSameEnum1Interface::func1Async(Enum1::Enum1Enum p if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameEnum1Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum1::Value1); + resolve->addResult(Enum1::Value1); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), diff --git a/goldenmaster/tb_same1/olink/olinksameenum2interface.cpp b/goldenmaster/tb_same1/olink/olinksameenum2interface.cpp index 431ce24d..fa821e71 100644 --- a/goldenmaster/tb_same1/olink/olinksameenum2interface.cpp +++ b/goldenmaster/tb_same1/olink/olinksameenum2interface.cpp @@ -123,7 +123,8 @@ QFuture OLinkSameEnum2Interface::func1Async(Enum1::Enum1Enum p if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameEnum2Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum1::Value1); + resolve->addResult(Enum1::Value1); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), @@ -150,7 +151,8 @@ QFuture OLinkSameEnum2Interface::func2Async(Enum1::Enum1Enum p if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameEnum2Interface::func2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum1::Value1); + resolve->addResult(Enum1::Value1); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func2"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2}), diff --git a/goldenmaster/tb_same1/olink/olinksamestruct1interface.cpp b/goldenmaster/tb_same1/olink/olinksamestruct1interface.cpp index 68fe4bf7..48e90a25 100644 --- a/goldenmaster/tb_same1/olink/olinksamestruct1interface.cpp +++ b/goldenmaster/tb_same1/olink/olinksamestruct1interface.cpp @@ -93,7 +93,8 @@ QFuture OLinkSameStruct1Interface::func1Async(const Struct1& param1) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameStruct1Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Struct1()); + resolve->addResult(Struct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), diff --git a/goldenmaster/tb_same1/olink/olinksamestruct2interface.cpp b/goldenmaster/tb_same1/olink/olinksamestruct2interface.cpp index e002427e..5679f112 100644 --- a/goldenmaster/tb_same1/olink/olinksamestruct2interface.cpp +++ b/goldenmaster/tb_same1/olink/olinksamestruct2interface.cpp @@ -123,7 +123,8 @@ QFuture OLinkSameStruct2Interface::func1Async(const Struct1& param1) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameStruct2Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Struct1()); + resolve->addResult(Struct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), @@ -150,7 +151,8 @@ QFuture OLinkSameStruct2Interface::func2Async(const Struct1& param1, co if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameStruct2Interface::func2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Struct1()); + resolve->addResult(Struct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func2"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2}), diff --git a/goldenmaster/tb_same2/olink/olinksameenum1interface.cpp b/goldenmaster/tb_same2/olink/olinksameenum1interface.cpp index 34b94429..ca7e98e1 100644 --- a/goldenmaster/tb_same2/olink/olinksameenum1interface.cpp +++ b/goldenmaster/tb_same2/olink/olinksameenum1interface.cpp @@ -93,7 +93,8 @@ QFuture OLinkSameEnum1Interface::func1Async(Enum1::Enum1Enum p if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameEnum1Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum1::Value1); + resolve->addResult(Enum1::Value1); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), diff --git a/goldenmaster/tb_same2/olink/olinksameenum2interface.cpp b/goldenmaster/tb_same2/olink/olinksameenum2interface.cpp index 4ace4048..04f37f08 100644 --- a/goldenmaster/tb_same2/olink/olinksameenum2interface.cpp +++ b/goldenmaster/tb_same2/olink/olinksameenum2interface.cpp @@ -123,7 +123,8 @@ QFuture OLinkSameEnum2Interface::func1Async(Enum1::Enum1Enum p if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameEnum2Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum1::Value1); + resolve->addResult(Enum1::Value1); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), @@ -150,7 +151,8 @@ QFuture OLinkSameEnum2Interface::func2Async(Enum1::Enum1Enum p if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameEnum2Interface::func2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Enum1::Value1); + resolve->addResult(Enum1::Value1); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func2"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2}), diff --git a/goldenmaster/tb_same2/olink/olinksamestruct1interface.cpp b/goldenmaster/tb_same2/olink/olinksamestruct1interface.cpp index eede9760..e3d715a7 100644 --- a/goldenmaster/tb_same2/olink/olinksamestruct1interface.cpp +++ b/goldenmaster/tb_same2/olink/olinksamestruct1interface.cpp @@ -93,7 +93,8 @@ QFuture OLinkSameStruct1Interface::func1Async(const Struct1& param1) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameStruct1Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Struct1()); + resolve->addResult(Struct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), diff --git a/goldenmaster/tb_same2/olink/olinksamestruct2interface.cpp b/goldenmaster/tb_same2/olink/olinksamestruct2interface.cpp index 565aad13..b1360f41 100644 --- a/goldenmaster/tb_same2/olink/olinksamestruct2interface.cpp +++ b/goldenmaster/tb_same2/olink/olinksamestruct2interface.cpp @@ -123,7 +123,8 @@ QFuture OLinkSameStruct2Interface::func1Async(const Struct1& param1) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameStruct2Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Struct1()); + resolve->addResult(Struct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), @@ -150,7 +151,8 @@ QFuture OLinkSameStruct2Interface::func2Async(const Struct1& param1, co if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSameStruct2Interface::func2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(Struct1()); + resolve->addResult(Struct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func2"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2}), diff --git a/goldenmaster/tb_simple/olink/olinknopropertiesinterface.cpp b/goldenmaster/tb_simple/olink/olinknopropertiesinterface.cpp index 92f08bc0..6ad4e8e6 100644 --- a/goldenmaster/tb_simple/olink/olinknopropertiesinterface.cpp +++ b/goldenmaster/tb_simple/olink/olinknopropertiesinterface.cpp @@ -65,7 +65,8 @@ QFuture OLinkNoPropertiesInterface::funcVoidAsync() if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNoPropertiesInterface::funcVoid, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->finish(); + resolve->finish(); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcVoid"); m_node->invokeRemote(operationId, nlohmann::json::array({}), @@ -91,7 +92,8 @@ QFuture OLinkNoPropertiesInterface::funcBoolAsync(bool paramBool) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNoPropertiesInterface::funcBool, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(false); + resolve->addResult(false); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcBool"); m_node->invokeRemote(operationId, nlohmann::json::array({paramBool}), diff --git a/goldenmaster/tb_simple/olink/olinknosignalsinterface.cpp b/goldenmaster/tb_simple/olink/olinknosignalsinterface.cpp index 1ee42ae8..2dbe8565 100644 --- a/goldenmaster/tb_simple/olink/olinknosignalsinterface.cpp +++ b/goldenmaster/tb_simple/olink/olinknosignalsinterface.cpp @@ -123,7 +123,8 @@ QFuture OLinkNoSignalsInterface::funcVoidAsync() if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNoSignalsInterface::funcVoid, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->finish(); + resolve->finish(); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcVoid"); m_node->invokeRemote(operationId, nlohmann::json::array({}), @@ -149,7 +150,8 @@ QFuture OLinkNoSignalsInterface::funcBoolAsync(bool paramBool) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNoSignalsInterface::funcBool, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(false); + resolve->addResult(false); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcBool"); m_node->invokeRemote(operationId, nlohmann::json::array({paramBool}), diff --git a/goldenmaster/tb_simple/olink/olinksimplearrayinterface.cpp b/goldenmaster/tb_simple/olink/olinksimplearrayinterface.cpp index f5393c25..0d1d6ee9 100644 --- a/goldenmaster/tb_simple/olink/olinksimplearrayinterface.cpp +++ b/goldenmaster/tb_simple/olink/olinksimplearrayinterface.cpp @@ -333,7 +333,8 @@ QFuture> OLinkSimpleArrayInterface::funcBoolAsync(const QList& if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleArrayInterface::funcBool, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcBool"); m_node->invokeRemote(operationId, nlohmann::json::array({paramBool}), @@ -360,7 +361,8 @@ QFuture> OLinkSimpleArrayInterface::funcIntAsync(const QList& pa if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleArrayInterface::funcInt, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcInt"); m_node->invokeRemote(operationId, nlohmann::json::array({paramInt}), @@ -387,7 +389,8 @@ QFuture> OLinkSimpleArrayInterface::funcInt32Async(const QListaddResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcInt32"); m_node->invokeRemote(operationId, nlohmann::json::array({paramInt32}), @@ -414,7 +417,8 @@ QFuture> OLinkSimpleArrayInterface::funcInt64Async(const QListaddResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcInt64"); m_node->invokeRemote(operationId, nlohmann::json::array({paramInt64}), @@ -441,7 +445,8 @@ QFuture> OLinkSimpleArrayInterface::funcFloatAsync(const QListaddResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcFloat"); m_node->invokeRemote(operationId, nlohmann::json::array({paramFloat}), @@ -468,7 +473,8 @@ QFuture> OLinkSimpleArrayInterface::funcFloat32Async(const QListaddResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcFloat32"); m_node->invokeRemote(operationId, nlohmann::json::array({paramFloat32}), @@ -495,7 +501,8 @@ QFuture> OLinkSimpleArrayInterface::funcFloat64Async(const QListaddResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcFloat64"); m_node->invokeRemote(operationId, nlohmann::json::array({paramFloat}), @@ -522,7 +529,8 @@ QFuture> OLinkSimpleArrayInterface::funcStringAsync(const QListaddResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcString"); m_node->invokeRemote(operationId, nlohmann::json::array({paramString}), diff --git a/goldenmaster/tb_simple/olink/olinksimpleinterface.cpp b/goldenmaster/tb_simple/olink/olinksimpleinterface.cpp index ec6b1833..6b82f0e9 100644 --- a/goldenmaster/tb_simple/olink/olinksimpleinterface.cpp +++ b/goldenmaster/tb_simple/olink/olinksimpleinterface.cpp @@ -303,7 +303,8 @@ QFuture OLinkSimpleInterface::funcNoReturnValueAsync(bool paramBool) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcNoReturnValue, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->finish(); + resolve->finish(); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcNoReturnValue"); m_node->invokeRemote(operationId, nlohmann::json::array({paramBool}), @@ -329,7 +330,8 @@ QFuture OLinkSimpleInterface::funcBoolAsync(bool paramBool) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcBool, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(false); + resolve->addResult(false); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcBool"); m_node->invokeRemote(operationId, nlohmann::json::array({paramBool}), @@ -356,7 +358,8 @@ QFuture OLinkSimpleInterface::funcIntAsync(int paramInt) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcInt, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0); + resolve->addResult(0); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcInt"); m_node->invokeRemote(operationId, nlohmann::json::array({paramInt}), @@ -383,7 +386,8 @@ QFuture OLinkSimpleInterface::funcInt32Async(qint32 paramInt32) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcInt32, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0); + resolve->addResult(0); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcInt32"); m_node->invokeRemote(operationId, nlohmann::json::array({paramInt32}), @@ -410,7 +414,8 @@ QFuture OLinkSimpleInterface::funcInt64Async(qint64 paramInt64) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcInt64, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0LL); + resolve->addResult(0LL); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcInt64"); m_node->invokeRemote(operationId, nlohmann::json::array({paramInt64}), @@ -437,7 +442,8 @@ QFuture OLinkSimpleInterface::funcFloatAsync(qreal paramFloat) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcFloat, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0.0f); + resolve->addResult(0.0f); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcFloat"); m_node->invokeRemote(operationId, nlohmann::json::array({paramFloat}), @@ -464,7 +470,8 @@ QFuture OLinkSimpleInterface::funcFloat32Async(float paramFloat32) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcFloat32, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0.0f); + resolve->addResult(0.0f); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcFloat32"); m_node->invokeRemote(operationId, nlohmann::json::array({paramFloat32}), @@ -491,7 +498,8 @@ QFuture OLinkSimpleInterface::funcFloat64Async(double paramFloat) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcFloat64, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0.0); + resolve->addResult(0.0); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcFloat64"); m_node->invokeRemote(operationId, nlohmann::json::array({paramFloat}), @@ -518,7 +526,8 @@ QFuture OLinkSimpleInterface::funcStringAsync(const QString& paramStrin if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkSimpleInterface::funcString, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(QString()); + resolve->addResult(QString()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcString"); m_node->invokeRemote(operationId, nlohmann::json::array({paramString}), diff --git a/goldenmaster/tb_simple/olink/olinkvoidinterface.cpp b/goldenmaster/tb_simple/olink/olinkvoidinterface.cpp index 61d722e0..b4321203 100644 --- a/goldenmaster/tb_simple/olink/olinkvoidinterface.cpp +++ b/goldenmaster/tb_simple/olink/olinkvoidinterface.cpp @@ -65,7 +65,8 @@ QFuture OLinkVoidInterface::funcVoidAsync() if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkVoidInterface::funcVoid, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->finish(); + resolve->finish(); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcVoid"); m_node->invokeRemote(operationId, nlohmann::json::array({}), diff --git a/goldenmaster/testbed1/olink/olinkstructarrayinterface.cpp b/goldenmaster/testbed1/olink/olinkstructarrayinterface.cpp index 65bf8e2d..7765df10 100644 --- a/goldenmaster/testbed1/olink/olinkstructarrayinterface.cpp +++ b/goldenmaster/testbed1/olink/olinkstructarrayinterface.cpp @@ -183,7 +183,8 @@ QFuture> OLinkStructArrayInterface::funcBoolAsync(const QList< if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkStructArrayInterface::funcBool, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcBool"); m_node->invokeRemote(operationId, nlohmann::json::array({paramBool}), @@ -210,7 +211,8 @@ QFuture> OLinkStructArrayInterface::funcIntAsync(const QListaddResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcInt"); m_node->invokeRemote(operationId, nlohmann::json::array({paramInt}), @@ -237,7 +239,8 @@ QFuture> OLinkStructArrayInterface::funcFloatAsync(const QLis if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkStructArrayInterface::funcFloat, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcFloat"); m_node->invokeRemote(operationId, nlohmann::json::array({paramFloat}), @@ -264,7 +267,8 @@ QFuture> OLinkStructArrayInterface::funcStringAsync(const QL if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkStructArrayInterface::funcString, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(QList()); + resolve->addResult(QList()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcString"); m_node->invokeRemote(operationId, nlohmann::json::array({paramString}), diff --git a/goldenmaster/testbed1/olink/olinkstructinterface.cpp b/goldenmaster/testbed1/olink/olinkstructinterface.cpp index badb7f7a..f6b25504 100644 --- a/goldenmaster/testbed1/olink/olinkstructinterface.cpp +++ b/goldenmaster/testbed1/olink/olinkstructinterface.cpp @@ -183,7 +183,8 @@ QFuture OLinkStructInterface::funcBoolAsync(const StructBool& paramB if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkStructInterface::funcBool, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(StructBool()); + resolve->addResult(StructBool()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcBool"); m_node->invokeRemote(operationId, nlohmann::json::array({paramBool}), @@ -210,7 +211,8 @@ QFuture OLinkStructInterface::funcIntAsync(const StructInt& paramInt) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkStructInterface::funcInt, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(StructInt()); + resolve->addResult(StructInt()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcInt"); m_node->invokeRemote(operationId, nlohmann::json::array({paramInt}), @@ -237,7 +239,8 @@ QFuture OLinkStructInterface::funcFloatAsync(const StructFloat& par if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkStructInterface::funcFloat, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(StructFloat()); + resolve->addResult(StructFloat()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcFloat"); m_node->invokeRemote(operationId, nlohmann::json::array({paramFloat}), @@ -264,7 +267,8 @@ QFuture OLinkStructInterface::funcStringAsync(const StructString& if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkStructInterface::funcString, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(StructString()); + resolve->addResult(StructString()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "funcString"); m_node->invokeRemote(operationId, nlohmann::json::array({paramString}), diff --git a/goldenmaster/testbed2/olink/olinkmanyparaminterface.cpp b/goldenmaster/testbed2/olink/olinkmanyparaminterface.cpp index 1584637f..e8e03efd 100644 --- a/goldenmaster/testbed2/olink/olinkmanyparaminterface.cpp +++ b/goldenmaster/testbed2/olink/olinkmanyparaminterface.cpp @@ -183,7 +183,8 @@ QFuture OLinkManyParamInterface::func1Async(int param1) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkManyParamInterface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0); + resolve->addResult(0); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), @@ -210,7 +211,8 @@ QFuture OLinkManyParamInterface::func2Async(int param1, int param2) if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkManyParamInterface::func2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0); + resolve->addResult(0); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func2"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2}), @@ -237,7 +239,8 @@ QFuture OLinkManyParamInterface::func3Async(int param1, int param2, int par if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkManyParamInterface::func3, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0); + resolve->addResult(0); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func3"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2,param3}), @@ -264,7 +267,8 @@ QFuture OLinkManyParamInterface::func4Async(int param1, int param2, int par if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkManyParamInterface::func4, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(0); + resolve->addResult(0); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func4"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2,param3,param4}), diff --git a/goldenmaster/testbed2/olink/olinknestedstruct1interface.cpp b/goldenmaster/testbed2/olink/olinknestedstruct1interface.cpp index 6a574810..f1062b2a 100644 --- a/goldenmaster/testbed2/olink/olinknestedstruct1interface.cpp +++ b/goldenmaster/testbed2/olink/olinknestedstruct1interface.cpp @@ -93,7 +93,8 @@ QFuture OLinkNestedStruct1Interface::func1Async(const NestedStruc if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNestedStruct1Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(NestedStruct1()); + resolve->addResult(NestedStruct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), diff --git a/goldenmaster/testbed2/olink/olinknestedstruct2interface.cpp b/goldenmaster/testbed2/olink/olinknestedstruct2interface.cpp index efaf2c3f..c5cd90a0 100644 --- a/goldenmaster/testbed2/olink/olinknestedstruct2interface.cpp +++ b/goldenmaster/testbed2/olink/olinknestedstruct2interface.cpp @@ -123,7 +123,8 @@ QFuture OLinkNestedStruct2Interface::func1Async(const NestedStruc if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNestedStruct2Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(NestedStruct1()); + resolve->addResult(NestedStruct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), @@ -150,7 +151,8 @@ QFuture OLinkNestedStruct2Interface::func2Async(const NestedStruc if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNestedStruct2Interface::func2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(NestedStruct1()); + resolve->addResult(NestedStruct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func2"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2}), diff --git a/goldenmaster/testbed2/olink/olinknestedstruct3interface.cpp b/goldenmaster/testbed2/olink/olinknestedstruct3interface.cpp index f029e0bc..547b4dba 100644 --- a/goldenmaster/testbed2/olink/olinknestedstruct3interface.cpp +++ b/goldenmaster/testbed2/olink/olinknestedstruct3interface.cpp @@ -153,7 +153,8 @@ QFuture OLinkNestedStruct3Interface::func1Async(const NestedStruc if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNestedStruct3Interface::func1, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(NestedStruct1()); + resolve->addResult(NestedStruct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func1"); m_node->invokeRemote(operationId, nlohmann::json::array({param1}), @@ -180,7 +181,8 @@ QFuture OLinkNestedStruct3Interface::func2Async(const NestedStruc if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNestedStruct3Interface::func2, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(NestedStruct1()); + resolve->addResult(NestedStruct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func2"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2}), @@ -207,7 +209,8 @@ QFuture OLinkNestedStruct3Interface::func3Async(const NestedStruc if(!m_node) { static auto noConnectionLogMessage = "Cannot request call on service + OLinkNestedStruct3Interface::func3, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); - resolve->addResult(NestedStruct1()); + resolve->addResult(NestedStruct1()); + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "func3"); m_node->invokeRemote(operationId, nlohmann::json::array({param1,param2,param3}), diff --git a/templates/olink/olinkinterface.cpp.tpl b/templates/olink/olinkinterface.cpp.tpl index 8c2d8b26..1623d238 100644 --- a/templates/olink/olinkinterface.cpp.tpl +++ b/templates/olink/olinkinterface.cpp.tpl @@ -105,10 +105,11 @@ QFuture<{{$return}}> {{$class}}::{{camel .Name}}Async({{qtParams "" .Params}}) static auto noConnectionLogMessage = "Cannot request call on service + {{$class}}::{{camel .Name}}, client is not connected. Try reconnecting the client."; AG_LOG_WARNING(noConnectionLogMessage); {{- if .Return.IsVoid }} - resolve->finish(); + resolve->finish(); {{- else }} - resolve->addResult({{qtDefault "" .Return}}); + resolve->addResult({{qtDefault "" .Return}}); {{- end}} + return resolve->future(); } static const auto operationId = ApiGear::ObjectLink::Name::createMemberId(olinkObjectName(), "{{.Name}}"); m_node->invokeRemote(operationId, nlohmann::json::array({