diff options
Diffstat (limited to 'PluginRoutingInterfaceCAPI/src-gen/org')
8 files changed, 24 insertions, 25 deletions
diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp index 38cf3c3..637b174 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.cpp @@ -306,23 +306,23 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::peekDomainAs name, std::move(callback)); } -void RoutingControlObserverDBusProxy::registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { - CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Domain_s, std::string, std::string, std::string>, +void RoutingControlObserverDBusProxy::registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { + CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Domain_s, std::string, std::string>, CommonAPI::DBus::DBusSerializableArguments<am_domainID_t, am_Error_e> >::callMethodWithReply( *this, "registerDomain", - "(qsssbbi)sss", - domainData, returnInterface, returnPath, returnBusname, + "(qsssbbi)ss", + domainData, returnBusname, returnInterface, callStatus , domainID, error); } -std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback) { - return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Domain_s, std::string, std::string, std::string>, +std::future<CommonAPI::CallStatus> RoutingControlObserverDBusProxy::registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback) { + return CommonAPI::DBus::DBusProxyHelper<CommonAPI::DBus::DBusSerializableArguments<am_Domain_s, std::string, std::string>, CommonAPI::DBus::DBusSerializableArguments<am_domainID_t, am_Error_e> >::callMethodAsync( *this, "registerDomain", - "(qsssbbi)sss", - domainData, returnInterface, returnPath, returnBusname, + "(qsssbbi)ss", + domainData, returnBusname, returnInterface, std::move(callback)); } void RoutingControlObserverDBusProxy::deregisterDomain(const am_domainID_t& domainID, CommonAPI::CallStatus& callStatus, am_Error_e& error) { diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h index 42e0828..35afdb9 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusProxy.h @@ -96,8 +96,8 @@ class RoutingControlObserverDBusProxy: virtual public RoutingControlObserverProx virtual void peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> peekDomainAsync(const std::string& name, PeekDomainAsyncCallback callback); - virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); - virtual std::future<CommonAPI::CallStatus> registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback); + virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); + virtual std::future<CommonAPI::CallStatus> registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback); virtual void deregisterDomain(const am_domainID_t& domainID, CommonAPI::CallStatus& callStatus, am_Error_e& error); virtual std::future<CommonAPI::CallStatus> deregisterDomainAsync(const am_domainID_t& domainID, DeregisterDomainAsyncCallback callback); diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp index 5f55964..d1cef2e 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverDBusStubAdapter.cpp @@ -129,9 +129,8 @@ const char* RoutingControlObserverDBusStubAdapter::getMethodsDBusIntrospectionXm "</method>\n" "<method name=\"registerDomain\">\n" "<arg name=\"domainData\" type=\"(qsssbbi)\" direction=\"in\" />\n" - "<arg name=\"returnInterface\" type=\"s\" direction=\"in\" />\n" - "<arg name=\"returnPath\" type=\"s\" direction=\"in\" />\n" "<arg name=\"returnBusname\" type=\"s\" direction=\"in\" />\n" + "<arg name=\"returnInterface\" type=\"s\" direction=\"in\" />\n" "<arg name=\"domainID\" type=\"q\" direction=\"out\" />\n" "<arg name=\"error\" type=\"i\" direction=\"out\" />\n" "</method>\n" @@ -354,7 +353,7 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< > peekDomainStubDispatcher(&RoutingControlObserverStub::peekDomain, "qi"); static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< RoutingControlObserverStub, - std::tuple<am_Domain_s, std::string, std::string, std::string>, + std::tuple<am_Domain_s, std::string, std::string>, std::tuple<am_domainID_t, am_Error_e> > registerDomainStubDispatcher(&RoutingControlObserverStub::registerDomain, "qi"); static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< @@ -536,7 +535,7 @@ const org::genivi::am::RoutingControlObserverDBusStubAdapterHelper::StubDispatch { { "ackSourceVolumeTick", "(iq)qn" }, &org::genivi::am::ackSourceVolumeTickStubDispatcher }, { { "ackSinkVolumeTick", "(iq)qn" }, &org::genivi::am::ackSinkVolumeTickStubDispatcher }, { { "peekDomain", "s" }, &org::genivi::am::peekDomainStubDispatcher }, - { { "registerDomain", "(qsssbbi)sss" }, &org::genivi::am::registerDomainStubDispatcher }, + { { "registerDomain", "(qsssbbi)ss" }, &org::genivi::am::registerDomainStubDispatcher }, { { "deregisterDomain", "q" }, &org::genivi::am::deregisterDomainStubDispatcher }, { { "registerGateway", "(qsqqqqqaqaqab)" }, &org::genivi::am::registerGatewayStubDispatcher }, { { "deregisterGateway", "q" }, &org::genivi::am::deregisterGatewayStubDispatcher }, diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h index 421912f..7a22e9d 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxy.h @@ -350,7 +350,7 @@ class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtua * will be set. * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ - virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); + virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error); /** * Calls registerDomain with asynchronous semantics. * @@ -361,7 +361,7 @@ class RoutingControlObserverProxy: virtual public RoutingControlObserver, virtua * The std::future returned by this method will be fulfilled at arrival of the reply. * It will provide the same value for CallStatus as will be handed to the callback. */ - virtual std::future<CommonAPI::CallStatus> registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback); + virtual std::future<CommonAPI::CallStatus> registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback); /** * Calls deregisterDomain with synchronous semantics. @@ -1214,13 +1214,13 @@ std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensi } template <typename ... _AttributeExtensions> -void RoutingControlObserverProxy<_AttributeExtensions...>::registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { - delegate_->registerDomain(domainData, returnInterface, returnPath, returnBusname, callStatus, domainID, error); +void RoutingControlObserverProxy<_AttributeExtensions...>::registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) { + delegate_->registerDomain(domainData, returnBusname, returnInterface, callStatus, domainID, error); } template <typename ... _AttributeExtensions> -std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensions...>::registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback) { - return delegate_->registerDomainAsync(domainData, returnInterface, returnPath, returnBusname, callback); +std::future<CommonAPI::CallStatus> RoutingControlObserverProxy<_AttributeExtensions...>::registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback) { + return delegate_->registerDomainAsync(domainData, returnBusname, returnInterface, callback); } template <typename ... _AttributeExtensions> diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h index 7325057..dd47b17 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverProxyBase.h @@ -141,8 +141,8 @@ virtual void peekDomain(const std::string& name, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> peekDomainAsync(const std::string& name, PeekDomainAsyncCallback callback) = 0; - virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) = 0; - virtual std::future<CommonAPI::CallStatus> registerDomainAsync(const am_Domain_s& domainData, const std::string& returnInterface, const std::string& returnPath, const std::string& returnBusname, RegisterDomainAsyncCallback callback) = 0; + virtual void registerDomain(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, CommonAPI::CallStatus& callStatus, am_domainID_t& domainID, am_Error_e& error) = 0; + virtual std::future<CommonAPI::CallStatus> registerDomainAsync(const am_Domain_s& domainData, const std::string& returnBusname, const std::string& returnInterface, RegisterDomainAsyncCallback callback) = 0; virtual void deregisterDomain(const am_domainID_t& domainID, CommonAPI::CallStatus& callStatus, am_Error_e& error) = 0; virtual std::future<CommonAPI::CallStatus> deregisterDomainAsync(const am_domainID_t& domainID, DeregisterDomainAsyncCallback callback) = 0; diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h index bc767cf..0c27b29 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStub.h @@ -127,7 +127,7 @@ class RoutingControlObserverStub : public CommonAPI::Stub<RoutingControlObserver /// This is the method that will be called on remote calls on the method peekDomain. virtual void peekDomain(std::string name, am_domainID_t& domainID, am_Error_e& error) = 0; /// This is the method that will be called on remote calls on the method registerDomain. - virtual void registerDomain(am_Domain_s domainData, std::string returnInterface, std::string returnPath, std::string returnBusname, am_domainID_t& domainID, am_Error_e& error) = 0; + virtual void registerDomain(am_Domain_s domainData, std::string returnBusname, std::string returnInterface, am_domainID_t& domainID, am_Error_e& error) = 0; /// This is the method that will be called on remote calls on the method deregisterDomain. virtual void deregisterDomain(am_domainID_t domainID, am_Error_e& error) = 0; /// This is the method that will be called on remote calls on the method registerGateway. diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp index 99515c0..7c7c503 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.cpp @@ -126,7 +126,7 @@ void RoutingControlObserverStubDefault::peekDomain(std::string name, am_domainID // No operation in default } -void RoutingControlObserverStubDefault::registerDomain(am_Domain_s domainData, std::string returnInterface, std::string returnPath, std::string returnBusname, am_domainID_t& domainID, am_Error_e& error) { +void RoutingControlObserverStubDefault::registerDomain(am_Domain_s domainData, std::string returnBusname, std::string returnInterface, am_domainID_t& domainID, am_Error_e& error) { // No operation in default } diff --git a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h index 2196e1d..db1c939 100644 --- a/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h +++ b/PluginRoutingInterfaceCAPI/src-gen/org/genivi/am/RoutingControlObserverStubDefault.h @@ -78,7 +78,7 @@ class RoutingControlObserverStubDefault : public RoutingControlObserverStub { virtual void peekDomain(std::string name, am_domainID_t& domainID, am_Error_e& error); - virtual void registerDomain(am_Domain_s domainData, std::string returnInterface, std::string returnPath, std::string returnBusname, am_domainID_t& domainID, am_Error_e& error); + virtual void registerDomain(am_Domain_s domainData, std::string returnBusname, std::string returnInterface, am_domainID_t& domainID, am_Error_e& error); virtual void deregisterDomain(am_domainID_t domainID, am_Error_e& error); |