Skip to content

fix(olink): add misssing return #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dorotaphanSiili wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(olink): add misssing return #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions goldenmaster/counter/olink/olinkcounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ QFuture<QVector3D> 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}),
Expand All @@ -150,7 +151,8 @@ QFuture<custom_types::Vector3D> 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}),
Expand Down
12 changes: 8 additions & 4 deletions goldenmaster/tb_enum/olink/olinkenuminterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ QFuture<Enum0::Enum0Enum> 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}),
Expand All @@ -210,7 +211,8 @@ QFuture<Enum1::Enum1Enum> 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}),
Expand All @@ -237,7 +239,8 @@ QFuture<Enum2::Enum2Enum> 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}),
Expand All @@ -264,7 +267,8 @@ QFuture<Enum3::Enum3Enum> 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}),
Expand Down
6 changes: 4 additions & 2 deletions goldenmaster/tb_names/olink/olinknam_es.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,8 @@ QFuture<void> 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}),
Expand All @@ -179,7 +180,8 @@ QFuture<void> 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}),
Expand Down
3 changes: 2 additions & 1 deletion goldenmaster/tb_same1/olink/olinksameenum1interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ QFuture<Enum1::Enum1Enum> 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}),
Expand Down
6 changes: 4 additions & 2 deletions goldenmaster/tb_same1/olink/olinksameenum2interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ QFuture<Enum1::Enum1Enum> 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}),
Expand All @@ -150,7 +151,8 @@ QFuture<Enum1::Enum1Enum> 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}),
Expand Down
3 changes: 2 additions & 1 deletion goldenmaster/tb_same1/olink/olinksamestruct1interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ QFuture<Struct1> 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}),
Expand Down
6 changes: 4 additions & 2 deletions goldenmaster/tb_same1/olink/olinksamestruct2interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ QFuture<Struct1> 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}),
Expand All @@ -150,7 +151,8 @@ QFuture<Struct1> 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}),
Expand Down
3 changes: 2 additions & 1 deletion goldenmaster/tb_same2/olink/olinksameenum1interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ QFuture<Enum1::Enum1Enum> 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}),
Expand Down
6 changes: 4 additions & 2 deletions goldenmaster/tb_same2/olink/olinksameenum2interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ QFuture<Enum1::Enum1Enum> 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}),
Expand All @@ -150,7 +151,8 @@ QFuture<Enum1::Enum1Enum> 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}),
Expand Down
3 changes: 2 additions & 1 deletion goldenmaster/tb_same2/olink/olinksamestruct1interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ QFuture<Struct1> 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}),
Expand Down
6 changes: 4 additions & 2 deletions goldenmaster/tb_same2/olink/olinksamestruct2interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ QFuture<Struct1> 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}),
Expand All @@ -150,7 +151,8 @@ QFuture<Struct1> 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}),
Expand Down
6 changes: 4 additions & 2 deletions goldenmaster/tb_simple/olink/olinknopropertiesinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ QFuture<void> 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({}),
Expand All @@ -91,7 +92,8 @@ QFuture<bool> 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}),
Expand Down
6 changes: 4 additions & 2 deletions goldenmaster/tb_simple/olink/olinknosignalsinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ QFuture<void> 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({}),
Expand All @@ -149,7 +150,8 @@ QFuture<bool> 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}),
Expand Down
Loading
Loading