From: Youngsun Suh Date: Tue, 8 Oct 2024 13:34:35 +0000 (+0900) Subject: Revert "[Tizen] Add UTC for includeHidden flag" X-Git-Tag: accepted/tizen/7.0/unified/20241009.124228^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F318809%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[Tizen] Add UTC for includeHidden flag" This reverts commit e361b406607b5f01ba9d684a7dcb43b7f1c2f450. Revert "[Tizen] Backport accessible lifecycle refactoring" This reverts commit 33d52fb8824e9890deba06c42f660e8d3a3c2d89. Change-Id: Ib23f531c7c4160b79020b021ba69f7f428515c2c --- diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp index c2c03bf86d..98c29513b9 100644 --- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.cpp @@ -305,19 +305,6 @@ std::string TestGetActionDescription(const Address& adr, size_t index) return std::move(std::get<0>(chs)); } -bool TestGetIncludeHidden(const Address& adr) -{ - auto dbus = static_cast(DBusWrapper::Installed()); - auto result = dbus->fromTestCall(adr.GetPath(), "org.a11y.atspi.Application", "GetIncludeHidden", std::tuple<>()); - return std::move(std::get<0>(result)); -} - -void TestSetIncludeHidden(const Address& adr, bool includeHidden) -{ - auto dbus = static_cast(DBusWrapper::Installed()); - dbus->voidTestCall(adr.GetPath(), "org.a11y.atspi.Application", "SetIncludeHidden", std::tuple(includeHidden)); -} - void TestResetMoveOutedCalled() { gMoveOutedCalled = false; diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h index ebbcbeb7d7..c00ec49b4f 100644 --- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/accessibility-test-utils.h @@ -43,8 +43,6 @@ bool T bool TestStateChangedCalled(); bool TestStateChangedResult(const std::string_view& expectedState, int expectedValue); void TestResetStateChangedResult(); -bool TestGetIncludeHidden(const Address& adr); -void TestSetIncludeHidden(const Address& adr, bool includeHidden); } // namespace Accessibility } // namespace Dali diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h index 0349dcd263..d3f4e255c6 100644 --- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dbus-wrapper.h @@ -18,14 +18,13 @@ */ // EXTERNAL INCLUDES +#include #include #include #include #include -#include -#include #include -#include +#include #include #include #include @@ -33,6 +32,7 @@ #include #include #include +#include // INTERNAL INCLUDES //#include @@ -43,11 +43,9 @@ #define ATSPI_PREFIX_PATH "/org/a11y/atspi/accessible/" #define ATSPI_NULL_PATH "/org/a11y/atspi/null" + //// BART QUICK HACK -#define bart_assert(x) \ - do \ - { \ - } while(0) +#define bart_assert(x) do{}while(0) struct _Eina_Value; @@ -68,864 +66,569 @@ struct DBusWrapper }; #define DEFINE_TYPE(name, eldbus_name, unref_call) \ - struct name \ - { \ - virtual ~name() = default; \ - }; \ - using name##Ptr = std::shared_ptr; \ - using name##WeakPtr = std::weak_ptr; + struct name { virtual ~name() = default; }; \ + using name ## Ptr = std::shared_ptr; \ + using name ## WeakPtr = std::weak_ptr; \ DEFINE_TYPE(Connection, Eldbus_Connection, ) - DEFINE_TYPE(MessageIter, Eldbus_Message_Iter, eldbus_message_iter_container_close(Value)) - DEFINE_TYPE(Message, Eldbus_Message, eldbus_message_unref(Value)) - DEFINE_TYPE(Proxy, Eldbus_Proxy, eldbus_proxy_unref(Value)) - DEFINE_TYPE(Object, Eldbus_Object, eldbus_object_unref(Value)) + DEFINE_TYPE(MessageIter, Eldbus_Message_Iter, eldbus_message_iter_container_close( Value )) + DEFINE_TYPE(Message, Eldbus_Message, eldbus_message_unref( Value )) + DEFINE_TYPE(Proxy, Eldbus_Proxy, eldbus_proxy_unref( Value )) + DEFINE_TYPE(Object, Eldbus_Object, eldbus_object_unref( Value )) DEFINE_TYPE(Pending, Eldbus_Pending, ) DEFINE_TYPE(EventPropertyChanged, Eldbus_Proxy_Event_Property_Changed, ) #undef DEFINE_TYPE - virtual ConnectionPtr eldbus_address_connection_get_impl(const std::string& addr) = 0; + virtual ConnectionPtr eldbus_address_connection_get_impl(const std::string &addr) = 0; -#define eldbus_message_iter_arguments_append_impl_basic_impl(type_set, type_get, sig) \ - virtual void eldbus_message_iter_arguments_append_impl(const MessageIterPtr& it, type_set src) = 0; \ - virtual bool eldbus_message_iter_get_and_next_impl(const MessageIterPtr& it, type_get& dst) = 0; +#define eldbus_message_iter_arguments_append_impl_basic_impl(type_set, type_get, sig) \ + virtual void eldbus_message_iter_arguments_append_impl(const MessageIterPtr &it, type_set src) = 0; \ + virtual bool eldbus_message_iter_get_and_next_impl(const MessageIterPtr &it, type_get &dst) = 0; #define eldbus_message_iter_arguments_append_impl_basic(type, sig) \ eldbus_message_iter_arguments_append_impl_basic_impl(type, type, sig) eldbus_message_iter_arguments_append_impl_basic(uint8_t, y) - eldbus_message_iter_arguments_append_impl_basic(uint16_t, q) - eldbus_message_iter_arguments_append_impl_basic(uint32_t, u) - eldbus_message_iter_arguments_append_impl_basic(uint64_t, t) - eldbus_message_iter_arguments_append_impl_basic(int16_t, n) - eldbus_message_iter_arguments_append_impl_basic(int32_t, i) - eldbus_message_iter_arguments_append_impl_basic(int64_t, x) - eldbus_message_iter_arguments_append_impl_basic(double, d) - eldbus_message_iter_arguments_append_impl_basic(bool, b) - eldbus_message_iter_arguments_append_impl_basic_impl(const std::string&, std::string, s) - eldbus_message_iter_arguments_append_impl_basic_impl(const ObjectPath&, ObjectPath, o) + eldbus_message_iter_arguments_append_impl_basic(uint16_t, q) + eldbus_message_iter_arguments_append_impl_basic(uint32_t, u) + eldbus_message_iter_arguments_append_impl_basic(uint64_t, t) + eldbus_message_iter_arguments_append_impl_basic(int16_t, n) + eldbus_message_iter_arguments_append_impl_basic(int32_t, i) + eldbus_message_iter_arguments_append_impl_basic(int64_t, x) + eldbus_message_iter_arguments_append_impl_basic(double, d) + eldbus_message_iter_arguments_append_impl_basic(bool, b) + eldbus_message_iter_arguments_append_impl_basic_impl(const std::string &, std::string, s) + eldbus_message_iter_arguments_append_impl_basic_impl(const ObjectPath &, ObjectPath, o) #undef eldbus_message_iter_arguments_append_impl_basic #undef eldbus_message_iter_arguments_append_impl_basic_impl - virtual MessageIterPtr eldbus_message_iter_container_new_impl(const MessageIterPtr& it, int type, const std::string& sig) = 0; - virtual MessageIterPtr eldbus_message_iter_get_and_next_by_type_impl(const MessageIterPtr& it, int type) = 0; - virtual MessageIterPtr eldbus_message_iter_get_impl(const MessagePtr& it, bool write) = 0; - virtual MessagePtr eldbus_proxy_method_call_new_impl(const ProxyPtr& proxy, const std::string& funcName) = 0; - virtual MessagePtr eldbus_proxy_send_and_block_impl(const ProxyPtr& proxy, const MessagePtr& msg) = 0; - virtual bool eldbus_message_error_get_impl(const MessagePtr& msg, std::string& name, std::string& text) = 0; - virtual std::string eldbus_message_signature_get_impl(const MessagePtr& msg) = 0; - - using SendCallback = std::function; - virtual PendingPtr eldbus_proxy_send_impl(const ProxyPtr& proxy, const MessagePtr& msg, const SendCallback& callback) = 0; - virtual std::string eldbus_proxy_interface_get_impl(const ProxyPtr&) = 0; - virtual void eldbus_proxy_signal_handler_add_impl(const ProxyPtr& proxy, const std::string& member, const std::function& cb) = 0; - virtual std::string eldbus_message_iter_signature_get_impl(const MessageIterPtr& iter) = 0; - virtual MessagePtr eldbus_message_method_return_new_impl(const MessagePtr& msg) = 0; - virtual MessagePtr eldbus_message_error_new_impl(const MessagePtr& msg, const std::string& err, const std::string& txt) = 0; - virtual PendingPtr eldbus_connection_send_impl(const ConnectionPtr& conn, const MessagePtr& msg) = 0; - virtual MessagePtr eldbus_message_signal_new_impl(const std::string& path, const std::string& iface, const std::string& name) = 0; - virtual MessagePtr eldbus_message_ref_impl(const MessagePtr& msg) = 0; - virtual ConnectionPtr eldbus_connection_get_impl(ConnectionType type) = 0; - virtual std::string eldbus_connection_unique_name_get_impl(const ConnectionPtr& conn) = 0; - virtual ObjectPtr eldbus_object_get_impl(const ConnectionPtr& conn, const std::string& bus, const std::string& path) = 0; - virtual ProxyPtr eldbus_proxy_get_impl(const ObjectPtr& obj, const std::string& interface) = 0; - virtual ProxyPtr eldbus_proxy_copy_impl(const ProxyPtr& ptr) = 0; - virtual void eldbus_name_request_impl(const ConnectionPtr&, const std::string&) - { - } // no-op - virtual void eldbus_name_release_impl(const ConnectionPtr&, const std::string&) - { - } // no-op + virtual MessageIterPtr eldbus_message_iter_container_new_impl(const MessageIterPtr &it, int type, const std::string &sig) = 0; + virtual MessageIterPtr eldbus_message_iter_get_and_next_by_type_impl(const MessageIterPtr &it, int type) = 0; + virtual MessageIterPtr eldbus_message_iter_get_impl(const MessagePtr &it, bool write) = 0; + virtual MessagePtr eldbus_proxy_method_call_new_impl(const ProxyPtr &proxy, const std::string &funcName) = 0; + virtual MessagePtr eldbus_proxy_send_and_block_impl(const ProxyPtr &proxy, const MessagePtr &msg) = 0; + virtual bool eldbus_message_error_get_impl(const MessagePtr &msg, std::string &name, std::string &text) = 0; + virtual std::string eldbus_message_signature_get_impl(const MessagePtr &msg) = 0; + + using SendCallback = std::function; + virtual PendingPtr eldbus_proxy_send_impl(const ProxyPtr &proxy, const MessagePtr &msg, const SendCallback &callback) = 0; + virtual std::string eldbus_proxy_interface_get_impl(const ProxyPtr &) = 0; + virtual void eldbus_proxy_signal_handler_add_impl(const ProxyPtr &proxy, const std::string &member, const std::function &cb) = 0; + virtual std::string eldbus_message_iter_signature_get_impl(const MessageIterPtr &iter) = 0; + virtual MessagePtr eldbus_message_method_return_new_impl( const MessagePtr &msg) = 0; + virtual MessagePtr eldbus_message_error_new_impl( const MessagePtr &msg, const std::string &err, const std::string &txt ) = 0; + virtual PendingPtr eldbus_connection_send_impl(const ConnectionPtr &conn, const MessagePtr &msg) = 0; + virtual MessagePtr eldbus_message_signal_new_impl(const std::string &path, const std::string &iface, const std::string &name) = 0; + virtual MessagePtr eldbus_message_ref_impl(const MessagePtr &msg) = 0; + virtual ConnectionPtr eldbus_connection_get_impl(ConnectionType type) = 0; + virtual std::string eldbus_connection_unique_name_get_impl(const ConnectionPtr &conn) = 0; + virtual ObjectPtr eldbus_object_get_impl( const ConnectionPtr &conn, const std::string &bus, const std::string &path ) = 0; + virtual ProxyPtr eldbus_proxy_get_impl( const ObjectPtr &obj, const std::string &interface ) = 0; + virtual ProxyPtr eldbus_proxy_copy_impl( const ProxyPtr &ptr) = 0; + virtual void eldbus_name_request_impl(const ConnectionPtr&, const std::string&) {} // no-op + virtual void eldbus_name_release_impl(const ConnectionPtr&, const std::string&) {} // no-op class StringStorage { public: struct char_ptr_deleter { - void operator()(char* p) + void operator()( char* p ) { - free(p); + free( p ); } }; - std::vector> storage; + std::vector< std::unique_ptr< char, char_ptr_deleter > > storage; - const char* add(const char* txt) + const char* add( const char* txt ) { - auto ptr = strdup(txt); - storage.push_back(std::unique_ptr(ptr)); + auto ptr = strdup( txt ); + storage.push_back( std::unique_ptr< char, char_ptr_deleter >( ptr ) ); return storage.back().get(); } - const char* add(const std::string& txt) + const char* add( const std::string& txt ) { - return add(txt.c_str()); + return add( txt.c_str() ); } }; struct CallId { - static std::atomic LastId; - unsigned int id = ++LastId; + static std::atomic< unsigned int > LastId; + unsigned int id = ++LastId; }; struct MethodInfo { - CallId id; - std::string memberName; - std::vector> in, out; // _Eldbus_Arg_Info - std::function callback; + CallId id; + std::string memberName; + std::vector< std::pair > in, out; // _Eldbus_Arg_Info + std::function< DBusWrapper::MessagePtr( const DBusWrapper::MessagePtr &msg ) > callback; }; struct SignalInfo { - CallId id; - std::string memberName; - std::vector> args; - unsigned int uniqueId; + CallId id; + std::string memberName; + std::vector< std::pair > args; + unsigned int uniqueId; }; struct PropertyInfo { - CallId setterId, getterId; - std::string memberName, typeSignature; - std::function getCallback, setCallback; + CallId setterId, getterId; + std::string memberName, typeSignature; + std::function< std::string( const DBusWrapper::MessagePtr &src, const DBusWrapper::MessageIterPtr &dst ) > getCallback, setCallback; }; struct SignalId { CallId id; SignalId() = default; - SignalId(CallId id) - : id(id) - { - } + SignalId( CallId id ) : id( id ) {} }; - virtual void add_interface_impl(bool fallback, const std::string& pathName, const ConnectionPtr& connection, std::vector>& destructors, const std::string& interfaceName, std::vector& dscrMethods, std::vector& dscrProperties, std::vector& dscrSignals) = 0; - virtual void add_property_changed_event_listener_impl(const ProxyPtr& proxy, const std::string& interface, const std::string& name, std::function cb) = 0; - static DBusWrapper* Installed(); - static void Install(std::unique_ptr); + virtual void add_interface_impl( bool fallback, const std::string& pathName, + const ConnectionPtr &connection, + std::vector> &destructors, + const std::string& interfaceName, + std::vector< MethodInfo >& dscrMethods, + std::vector< PropertyInfo >& dscrProperties, + std::vector< SignalInfo >& dscrSignals ) = 0; + virtual void add_property_changed_event_listener_impl( const ProxyPtr &proxy, const std::string &interface, const std::string &name, std::function< void( const _Eina_Value * ) > cb) = 0; + static DBusWrapper *Installed(); + static void Install(std::unique_ptr); StringStorage Strings; }; -namespace detail -{ -enum class MethodType -{ - Method, - Getter, - Setter -}; +namespace detail { + enum class MethodType { + Method, Getter, Setter + }; } -namespace std -{ -template<> -struct hash> -{ - size_t operator()(const std::tuple& a) const - { - auto a1 = std::hash()(std::get<0>(a)); - auto a2 = std::hash()(std::get<1>(a)); - auto a3 = std::hash()(std::get<2>(a)); - size_t v = a1; - v = (v * 11400714819323198485llu) + a2; - v = (v * 11400714819323198485llu) + a3; - return v; - } -}; -template<> -struct hash> -{ - size_t operator()(const std::tuple& a) const - { - auto a1 = std::hash()(std::get<0>(a)); - auto a2 = std::hash()(std::get<1>(a)); - auto a3 = std::hash()(std::get<2>(a)); - auto a4 = static_cast(std::get<3>(a)); - size_t v = a1; - v = (v * 11400714819323198485llu) + a2; - v = (v * 11400714819323198485llu) + a3; - v = (v * 11400714819323198485llu) + a4; - return v; - } -}; -template<> -struct hash> -{ - size_t operator()(const std::tuple& a) const - { - auto a1 = std::hash()(std::get<0>(a)); - auto a2 = std::hash()(std::get<1>(a)); - auto a3 = std::get<2>(a); - size_t v = a1; - v = (v * 11400714819323198485llu) + a2; - v = (v * 11400714819323198485llu) + a3; - return v; - } -}; -} // namespace std -namespace detail -{ -template -struct DBusSigImpl -{ - enum - { - value = 0, - end = 0 +namespace std { + template <> struct hash> { + size_t operator () (const std::tuple &a) const { + auto a1 = std::hash()(std::get<0>(a)); + auto a2 = std::hash()(std::get<1>(a)); + auto a3 = std::hash()(std::get<2>(a)); + size_t v = a1; + v = (v * 11400714819323198485llu) + a2; + v = (v * 11400714819323198485llu) + a3; + return v; + } }; -}; -template -struct DBusSig -{ - enum - { - value = DBusSigImpl::type>::value, - end = DBusSigImpl::type>::end + template <> struct hash> { + size_t operator () (const std::tuple &a) const { + auto a1 = std::hash()(std::get<0>(a)); + auto a2 = std::hash()(std::get<1>(a)); + auto a3 = std::hash()(std::get<2>(a)); + auto a4 = static_cast(std::get<3>(a)); + size_t v = a1; + v = (v * 11400714819323198485llu) + a2; + v = (v * 11400714819323198485llu) + a3; + v = (v * 11400714819323198485llu) + a4; + return v; + } }; -}; -template -struct IndexFromTypeTupleImpl -{ - enum - { - value = std::is_same::type>::type, Q>::value ? I : IndexFromTypeTupleImpl::value + template <> struct hash> { + size_t operator () (const std::tuple &a) const { + auto a1 = std::hash()(std::get<0>(a)); + auto a2 = std::hash()(std::get<1>(a)); + auto a3 = std::get<2>(a); + size_t v = a1; + v = (v * 11400714819323198485llu) + a2; + v = (v * 11400714819323198485llu) + a3; + return v; + } }; -}; -template -struct IndexFromTypeTupleImpl -{ - enum - { - value = S +} +namespace detail { + template struct DBusSigImpl { enum { value = 0, end = 0 }; }; + template struct DBusSig { enum { value = DBusSigImpl::type>::value, end = DBusSigImpl::type>::end }; }; + template struct IndexFromTypeTupleImpl { + enum { value = std::is_same::type>::type, Q>::value ? I : IndexFromTypeTupleImpl::value }; }; -}; -template -struct IndexFromTypeTuple -{ - enum - { - value = IndexFromTypeTupleImpl::type, 0, std::tuple_size::value>::value + template struct IndexFromTypeTupleImpl { enum { value = S }; }; + template struct IndexFromTypeTuple { + enum { value = IndexFromTypeTupleImpl::type, 0, std::tuple_size::value>::value }; }; -}; -template -struct Encoder; -template -struct EncoderTuple; -} // namespace detail + template struct Encoder; + template struct EncoderTuple; +} struct TestDBusWrapper : public DBusWrapper { using MethodType = detail::MethodType; - ConnectionPtr connection; + ConnectionPtr connection; std::unordered_map, std::function> testMethods; std::unordered_map, std::function> daliMethods; - std::unordered_map, std::string> daliSignalsMap; - std::unordered_map, std::function> daliSignals; - std::unordered_map, std::function> propertyChangeListeners; + std::unordered_map, std::string> daliSignalsMap; + std::unordered_map, std::function> daliSignals; + std::unordered_map, std::function> propertyChangeListeners; std::vector> asyncCalls; - template - struct Variant - { + template struct Variant { T value; Variant() = default; - Variant(T t) - : value(std::move(t)) - { - } + Variant(T t) : value(std::move(t)) { } }; - template - void Encode(const MessagePtr& m, const std::tuple& args) - { + template void Encode(const MessagePtr &m, const std::tuple &args) { auto iter = eldbus_message_iter_get_impl(m, true); detail::EncoderTuple<0, sizeof...(ARGS), ARGS...>::encode(*this, iter, args); } - template - void Decode(const MessagePtr& m, std::tuple& args) - { + template void Decode(const MessagePtr &m, std::tuple &args) { auto iter = eldbus_message_iter_get_impl(m, false); detail::EncoderTuple<0, sizeof...(ARGS), ARGS...>::decode(*this, args, iter); } - MessagePtr newMessage(const std::string& path, const std::string& interface, const std::string& name, bool reply); - MessagePtr newReplyMessage(const MessagePtr& m); + MessagePtr newMessage(const std::string &path, const std::string &interface, const std::string &name, bool reply); + MessagePtr newReplyMessage(const MessagePtr &m); - template - void fromTestEmitSignal(std::string path, const std::string& interface, const std::string& name, const std::tuple& args) - { - if(path.empty()) throw error{}; - if(path[0] != '/') path = "/org/a11y/atspi/accessible/" + path; + template void fromTestEmitSignal(std::string path, const std::string &interface, const std::string &name, const std::tuple &args) { + if (path.empty()) throw error{}; + if (path[0] != '/') path = "/org/a11y/atspi/accessible/" + path; auto msg = newMessage(path, interface, name, false); Encode(msg, args); - auto it = daliSignals.find(std::tuple{path, interface, name}); - if(it == daliSignals.end()) throw error{}; + auto it = daliSignals.find(std::tuple{ path, interface, name }); + if (it == daliSignals.end()) throw error{}; it->second(msg); } static std::shared_ptr<_Eina_Value> createEinaValue(bool); - template - void fromTestChangeProperty(std::string path, const std::string& interface, const std::string& name, T new_value) - { + template void fromTestChangeProperty(std::string path, const std::string &interface, const std::string &name, T new_value) { auto v = createEinaValue(new_value); - if(path.empty()) throw error{}; - if(path[0] != '/') path = "/org/a11y/atspi/accessible/" + path; - auto it = propertyChangeListeners.find(std::tuple{path, interface, name}); - if(it == propertyChangeListeners.end()) throw error{}; + if (path.empty()) throw error{}; + if (path[0] != '/') path = "/org/a11y/atspi/accessible/" + path; + auto it = propertyChangeListeners.find(std::tuple{ path, interface, name }); + if (it == propertyChangeListeners.end()) throw error{}; it->second(v.get()); } - template - std::tuple fromTestCall(const std::string& path, const std::string& interface, const std::string& name, const std::tuple& args) - { + template std::tuple fromTestCall(const std::string &path, const std::string &interface, const std::string &name, const std::tuple &args) { auto msg = newMessage(path, interface, name, false); Encode(msg, args); - auto res = call(daliMethods, "daliMethods", msg, MethodType::Method); + auto res = call(daliMethods, "daliMethods", msg, MethodType::Method); std::string a, b; - if(eldbus_message_error_get_impl(res, a, b)) throw error{} << "call to " << path << " " << interface << " " << name << " failed: " << a << ": " << b; + if (eldbus_message_error_get_impl(res, a, b)) throw error{} << "call to " << path << " " << interface << " " << name << " failed: " << a << ": " << b; std::tuple tmp; Decode(res, tmp); return tmp; } - template - T fromTestGet(const std::string& path, const std::string& interface, const std::string& name) - { - auto msg = newMessage(path, interface, name, false); - auto res = call(daliMethods, "daliMethods", msg, MethodType::Getter); + template T fromTestGet(const std::string &path, const std::string &interface, const std::string &name) { + auto msg = newMessage(path, interface, name, false); + auto res = call(daliMethods, "daliMethods", msg, MethodType::Getter); std::string a, b; - if(eldbus_message_error_get_impl(res, a, b)) throw error{} << "call to " << path << " " << interface << " " << name << " failed: " << a << ": " << b; + if (eldbus_message_error_get_impl(res, a, b)) throw error{} << "call to " << path << " " << interface << " " << name << " failed: " << a << ": " << b; std::tuple tmp; Decode(res, tmp); return std::move(std::get<0>(tmp)); } - template - std::tuple fromTestSet(const std::string& path, const std::string& interface, const std::string& name, const T& arg) - { + template std::tuple fromTestSet(const std::string &path, const std::string &interface, const std::string &name, const T &arg) { auto msg = newMessage(path, interface, name, false); - Encode(msg, TestDBusWrapper::Variant{arg}); - auto res = call(daliMethods, "daliMethods", msg, MethodType::Setter); + Encode(msg, TestDBusWrapper::Variant{ arg }); + auto res = call(daliMethods, "daliMethods", msg, MethodType::Setter); std::string a, b; - if(eldbus_message_error_get_impl(res, a, b)) throw error{} << "call to " << path << " " << interface << " " << name << " failed: " << a << ": " << b; + if (eldbus_message_error_get_impl(res, a, b)) throw error{} << "call to " << path << " " << interface << " " << name << " failed: " << a << ": " << b; std::tuple tmp; Decode(res, tmp); return tmp; } - template - void voidTestCall(const std::string& path, const std::string& interface, const std::string& name, const std::tuple& args) - { - auto msg = newMessage(path, interface, name, false); - Encode(msg, args); - auto res = call(daliMethods, "daliMethods", msg, MethodType::Method); - std::string a, b; - if(eldbus_message_error_get_impl(res, a, b)) throw error{} << "call to " << path << " " << interface << " " << name << " failed: " << a << ": " << b; - } TestDBusWrapper(); ~TestDBusWrapper(); - class error : public std::exception - { + class error : public std::exception { std::shared_ptr temp = std::make_shared(); - mutable std::string text; - + mutable std::string text; public: error() = default; - template - error& operator<<(T&& t) - { + template error &operator << (T &&t) { *temp << std::forward(t); return *this; } - const char* what() const noexcept override - { + const char *what() const noexcept override { text = temp->str(); return text.c_str(); } }; -#define DEFINE_TYPE(name) \ - struct name##Impl; \ - static name##Impl* get(const name##Ptr&); + #define DEFINE_TYPE(name) struct name ## Impl; static name ## Impl *get(const name ## Ptr &); DEFINE_TYPE(Connection) DEFINE_TYPE(Proxy) DEFINE_TYPE(Object) DEFINE_TYPE(Message) DEFINE_TYPE(MessageIter) -#undef DEFINE_TYPE + #undef DEFINE_TYPE class Element; - using ElementList = std::list; - using ElementMap = std::map; + using ElementList = std::list; + using ElementMap = std::map; using ElementTuple = std::tuple< - uint8_t, - uint16_t, - uint32_t, - uint64_t, - int16_t, - int32_t, - int64_t, - double, - bool, - std::string, - ObjectPath, - ElementList>; - - class Element - { + uint8_t, uint16_t, uint32_t, uint64_t, int16_t, int32_t, int64_t, double, bool, std::string, ObjectPath, + ElementList + >; + + class Element { ElementTuple data; - char signature_ = 0, end_ = 0, index_ = 0; - template - void set(T&& t, char signature = detail::DBusSig::value) - { + char signature_ = 0, end_ = 0, index_ = 0; + template void set(T &&t, char signature = detail::DBusSig::value) { signature_ = signature; - end_ = detail::DBusSig::end; - index_ = static_cast(detail::IndexFromTypeTuple::value); - get() = std::forward(t); + end_ = detail::DBusSig::end; + index_ = static_cast(detail::IndexFromTypeTuple::value); + get() = std::forward(t); } - public: - template - Element(T&& t, typename std::enable_if::value != 0>::type* = nullptr) - { - set(std::forward(t)); - } - Element(ElementList t, int signature) - { - set(std::move(t), static_cast(signature)); - } - - char signature() const - { - return signature_; - } - char end() const - { - return end_; - } - char index() const - { - return index_; - } - bool isContainer() const - { - return index_ == detail::IndexFromTypeTuple::value; - } - template::value != 0>::type> - bool is() const - { - return index_ == detail::IndexFromTypeTuple::value; - } - template::value != 0>::type> - const T& get() const - { - if(!is()) throw error{}; - return std::get::value>(data); - } - template::value != 0>::type> - T& get() - { - if(!is()) throw error{}; - return std::get::value>(data); - } + template Element(T &&t, typename std::enable_if::value != 0>::type* = nullptr) { set(std::forward(t)); } + Element(ElementList t, int signature) { set(std::move(t), static_cast(signature)); } + + char signature() const { return signature_; } + char end() const { return end_; } + char index() const { return index_; } + bool isContainer() const { return index_ == detail::IndexFromTypeTuple::value; } + template ::value != 0>::type> + bool is() const { return index_ == detail::IndexFromTypeTuple::value; } + template ::value != 0>::type> + const T &get() const { if (!is()) throw error{}; return std::get::value>(data); } + template ::value != 0>::type> + T &get() { if (!is()) throw error{}; return std::get::value>(data); } }; - ConnectionPtr eldbus_address_connection_get_impl(const std::string& addr) override; + ConnectionPtr eldbus_address_connection_get_impl(const std::string &addr) override; -#define eldbus_message_iter_arguments_append_impl_basic_impl(type_set, type_get, sig) \ - void eldbus_message_iter_arguments_append_impl(const MessageIterPtr& it, type_set src) override; \ - bool eldbus_message_iter_get_and_next_impl(const MessageIterPtr& it, type_get& dst) override; +#define eldbus_message_iter_arguments_append_impl_basic_impl(type_set, type_get, sig) \ + void eldbus_message_iter_arguments_append_impl(const MessageIterPtr &it, type_set src) override; \ + bool eldbus_message_iter_get_and_next_impl(const MessageIterPtr &it, type_get &dst) override; #define eldbus_message_iter_arguments_append_impl_basic(type, sig) \ eldbus_message_iter_arguments_append_impl_basic_impl(type, type, sig) eldbus_message_iter_arguments_append_impl_basic(uint8_t, y) - eldbus_message_iter_arguments_append_impl_basic(uint16_t, q) - eldbus_message_iter_arguments_append_impl_basic(uint32_t, u) - eldbus_message_iter_arguments_append_impl_basic(uint64_t, t) - eldbus_message_iter_arguments_append_impl_basic(int16_t, n) - eldbus_message_iter_arguments_append_impl_basic(int32_t, i) - eldbus_message_iter_arguments_append_impl_basic(int64_t, x) - eldbus_message_iter_arguments_append_impl_basic(double, d) - eldbus_message_iter_arguments_append_impl_basic(bool, b) - eldbus_message_iter_arguments_append_impl_basic_impl(const std::string&, std::string, s) - eldbus_message_iter_arguments_append_impl_basic_impl(const ObjectPath&, ObjectPath, o) + eldbus_message_iter_arguments_append_impl_basic(uint16_t, q) + eldbus_message_iter_arguments_append_impl_basic(uint32_t, u) + eldbus_message_iter_arguments_append_impl_basic(uint64_t, t) + eldbus_message_iter_arguments_append_impl_basic(int16_t, n) + eldbus_message_iter_arguments_append_impl_basic(int32_t, i) + eldbus_message_iter_arguments_append_impl_basic(int64_t, x) + eldbus_message_iter_arguments_append_impl_basic(double, d) + eldbus_message_iter_arguments_append_impl_basic(bool, b) + eldbus_message_iter_arguments_append_impl_basic_impl(const std::string &, std::string, s) + eldbus_message_iter_arguments_append_impl_basic_impl(const ObjectPath &, ObjectPath, o) #undef eldbus_message_iter_arguments_append_impl_basic #undef eldbus_message_iter_arguments_append_impl_basic_impl - MessageIterPtr eldbus_message_iter_container_new_impl(const MessageIterPtr& it, int type, const std::string& sig) override; - MessageIterPtr eldbus_message_iter_get_and_next_by_type_impl(const MessageIterPtr& it, int type) override; - MessageIterPtr eldbus_message_iter_get_impl(const MessagePtr& it, bool write) override; - MessagePtr eldbus_proxy_method_call_new_impl(const ProxyPtr& proxy, const std::string& funcName) override; - MessagePtr eldbus_proxy_send_and_block_impl(const ProxyPtr& proxy, const MessagePtr& msg) override; - bool eldbus_message_error_get_impl(const MessagePtr& msg, std::string& name, std::string& text) override; - std::string eldbus_message_signature_get_impl(const MessagePtr& msg) override; - PendingPtr eldbus_proxy_send_impl(const ProxyPtr& proxy, const MessagePtr& msg, const SendCallback& callback) override; - std::string eldbus_proxy_interface_get_impl(const ProxyPtr&) override; - void eldbus_proxy_signal_handler_add_impl(const ProxyPtr& proxy, const std::string& member, const std::function& cb) override; - std::string eldbus_message_iter_signature_get_impl(const MessageIterPtr& iter) override; - MessagePtr eldbus_message_method_return_new_impl(const MessagePtr& msg) override; - MessagePtr eldbus_message_error_new_impl(const MessagePtr& msg, const std::string& err, const std::string& txt) override; - PendingPtr eldbus_connection_send_impl(const ConnectionPtr& conn, const MessagePtr& msg) override; - MessagePtr eldbus_message_signal_new_impl(const std::string& path, const std::string& iface, const std::string& name) override; - MessagePtr eldbus_message_ref_impl(const MessagePtr& msg) override; - ConnectionPtr eldbus_connection_get_impl(ConnectionType type) override; - std::string eldbus_connection_unique_name_get_impl(const ConnectionPtr& conn) override; - ObjectPtr eldbus_object_get_impl(const ConnectionPtr& conn, const std::string& bus, const std::string& path) override; - ProxyPtr eldbus_proxy_get_impl(const ObjectPtr& obj, const std::string& interface) override; - ProxyPtr eldbus_proxy_copy_impl(const ProxyPtr& ptr) override; - void add_property_changed_event_listener_impl(const ProxyPtr& proxy, const std::string& interface, const std::string& name, std::function cb) override; - void add_interface_impl(bool fallback, const std::string& pathName, const ConnectionPtr& connection, std::vector>& destructors, const std::string& interfaceName, std::vector& dscrMethods, std::vector& dscrProperties, std::vector& dscrSignals) override; - static bool completed(const MessageIterPtr& iter); - + MessageIterPtr eldbus_message_iter_container_new_impl(const MessageIterPtr &it, int type, const std::string &sig) override; + MessageIterPtr eldbus_message_iter_get_and_next_by_type_impl(const MessageIterPtr &it, int type) override; + MessageIterPtr eldbus_message_iter_get_impl(const MessagePtr &it, bool write) override; + MessagePtr eldbus_proxy_method_call_new_impl(const ProxyPtr &proxy, const std::string &funcName) override; + MessagePtr eldbus_proxy_send_and_block_impl(const ProxyPtr &proxy, const MessagePtr &msg) override; + bool eldbus_message_error_get_impl(const MessagePtr &msg, std::string &name, std::string &text) override; + std::string eldbus_message_signature_get_impl(const MessagePtr &msg) override; + PendingPtr eldbus_proxy_send_impl(const ProxyPtr &proxy, const MessagePtr &msg, const SendCallback &callback) override; + std::string eldbus_proxy_interface_get_impl(const ProxyPtr &) override; + void eldbus_proxy_signal_handler_add_impl(const ProxyPtr &proxy, const std::string &member, const std::function &cb) override; + std::string eldbus_message_iter_signature_get_impl(const MessageIterPtr &iter) override; + MessagePtr eldbus_message_method_return_new_impl( const MessagePtr &msg) override; + MessagePtr eldbus_message_error_new_impl( const MessagePtr &msg, const std::string &err, const std::string &txt ) override; + PendingPtr eldbus_connection_send_impl(const ConnectionPtr &conn, const MessagePtr &msg) override; + MessagePtr eldbus_message_signal_new_impl(const std::string &path, const std::string &iface, const std::string &name) override; + MessagePtr eldbus_message_ref_impl(const MessagePtr &msg) override; + ConnectionPtr eldbus_connection_get_impl(ConnectionType type) override; + std::string eldbus_connection_unique_name_get_impl(const ConnectionPtr &conn) override; + ObjectPtr eldbus_object_get_impl( const ConnectionPtr &conn, const std::string &bus, const std::string &path ) override; + ProxyPtr eldbus_proxy_get_impl( const ObjectPtr &obj, const std::string &interface ) override; + ProxyPtr eldbus_proxy_copy_impl( const ProxyPtr &ptr) override; + void add_property_changed_event_listener_impl( const ProxyPtr &proxy, const std::string &interface, const std::string &name, std::function< void( const _Eina_Value * ) > cb) override; + void add_interface_impl( bool fallback, const std::string& pathName, + const ConnectionPtr &connection, + std::vector> &destructors, + const std::string& interfaceName, + std::vector< MethodInfo >& dscrMethods, + std::vector< PropertyInfo >& dscrProperties, + std::vector< SignalInfo >& dscrSignals ) override; + static bool completed(const MessageIterPtr &iter); private: - MessagePtr call(std::unordered_map, std::function>& mp, const std::string& name, const MessagePtr& msg, MethodType type); -}; - -namespace detail -{ -template<> -struct DBusSigImpl -{ - enum - { - value = 'y', - end = 0 - }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 'q', - end = 0 + MessagePtr call(std::unordered_map, std::function> &mp, const std::string &name, const MessagePtr &msg, MethodType type); +}; + +namespace detail { + template <> struct DBusSigImpl { enum { value = 'y', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 'q', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 'u', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 't', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 'n', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 'i', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 'x', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 'd', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 'b', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 's', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = 'o', end = 0 }; }; + template <> struct DBusSigImpl { enum { value = '(', end = ')' }; }; + template <> struct DBusSigImpl { enum { value = '{', end = '}' }; }; + + template struct Encoder { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const T &src) { + w.eldbus_message_iter_arguments_append_impl(tgt, src); + } + static void decode(TestDBusWrapper &w, T &tgt, const TestDBusWrapper::MessageIterPtr &src) { + if (!w.eldbus_message_iter_get_and_next_impl(src, tgt)) throw TestDBusWrapper::error{}; + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 'u', - end = 0 + template struct Encoder::value>::type> { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const T &src) { + Encoder::type>::encode(w, tgt, static_cast::type>(src)); + } + static void decode(TestDBusWrapper &w, T &tgt, const TestDBusWrapper::MessageIterPtr &src) { + typename std::underlying_type::type v = 0; + Encoder::type>::decode(w, v, src); + tgt = static_cast(v); + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 't', - end = 0 + template struct Encoder { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const T &src) { + Encoder::encode(w, tgt, src); + } + static void decode(TestDBusWrapper &w, T &tgt, const TestDBusWrapper::MessageIterPtr &src) { + Encoder::decode(w, tgt, src); + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 'n', - end = 0 + template struct Encoder { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const T &src) { + Encoder::encode(w, tgt, src); + } + static void decode(TestDBusWrapper &w, T &tgt, const TestDBusWrapper::MessageIterPtr &src) { + Encoder::decode(w, tgt, src); + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 'i', - end = 0 + template struct Encoder { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const T &src) { + Encoder::encode(w, tgt, src); + } + static void decode(TestDBusWrapper &w, T &tgt, const TestDBusWrapper::MessageIterPtr &src) { + Encoder::decode(w, tgt, src); + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 'x', - end = 0 + template struct EncoderTuple { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const std::tuple &src) { + Encoder>::type>::encode(w, tgt, std::get(src)); + EncoderTuple::encode(w, tgt, src); + } + static void decode(TestDBusWrapper &w, std::tuple &tgt, const TestDBusWrapper::MessageIterPtr &src) { + Encoder>::type>::decode(w, std::get(tgt), src); + EncoderTuple::decode(w, tgt, src); + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 'd', - end = 0 + template struct EncoderTuple { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const std::tuple &src) { } + static void decode(TestDBusWrapper &w, std::tuple &tgt, const TestDBusWrapper::MessageIterPtr &src) { } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 'b', - end = 0 + template struct Encoder> { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const std::tuple &src) { + auto var = w.eldbus_message_iter_container_new_impl( tgt, 'r', ""); + EncoderTuple<0, sizeof...(ARGS), ARGS...>::encode(w, var, src); + } + static void decode(TestDBusWrapper &w, std::tuple &tgt, const TestDBusWrapper::MessageIterPtr &src) { + auto s = w.eldbus_message_iter_get_and_next_by_type_impl( src, 'r' ); + if( !s ) throw TestDBusWrapper::error{}; + EncoderTuple<0, sizeof...(ARGS), ARGS...>::decode(w, tgt, s); + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 's', - end = 0 + template struct Encoder> { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const std::pair &src, char type = 'r') { + auto var = w.eldbus_message_iter_container_new_impl( tgt, type, ""); + Encoder::encode(w, var, src.first); + Encoder::encode(w, var, src.second); + } + static void decode(TestDBusWrapper &w, std::pair &tgt, const TestDBusWrapper::MessageIterPtr &src, char type = 'r') { + auto s = w.eldbus_message_iter_get_and_next_by_type_impl( src, type ); + if( !s ) throw TestDBusWrapper::error{}; + Encoder::decode(w, tgt.first, s); + Encoder::decode(w, tgt.second, s); + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = 'o', - end = 0 + template struct Encoder> { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const TestDBusWrapper::Variant &src) { + //w.eldbus_message_iter_arguments_append_impl(tgt, src); + auto var = w.eldbus_message_iter_container_new_impl( tgt, 'v', ""); + Encoder::encode(w, var, src.value); + } + static void decode(TestDBusWrapper &w, TestDBusWrapper::Variant &tgt, const TestDBusWrapper::MessageIterPtr &src) { + auto s = w.eldbus_message_iter_get_and_next_by_type_impl( src, 'v' ); + if( !s ) throw TestDBusWrapper::error{}; + Encoder::decode(w, tgt.value, s); + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = '(', - end = ')' + template struct Encoder> { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const std::vector &src) { + auto var = w.eldbus_message_iter_container_new_impl( tgt, 'a', ""); + for(auto &q : src) + Encoder::encode(w, var, q); + } + static void decode(TestDBusWrapper &w, std::vector &tgt, const TestDBusWrapper::MessageIterPtr &src) { + auto s = w.eldbus_message_iter_get_and_next_by_type_impl( src, 'a' ); + if( !s ) throw TestDBusWrapper::error{}; + while(!TestDBusWrapper::completed(s)) { + tgt.push_back({}); + Encoder::decode(w, tgt.back(), s); + } + } }; -}; -template<> -struct DBusSigImpl -{ - enum - { - value = '{', - end = '}' + template struct Encoder> { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const std::unordered_map &src) { + auto var = w.eldbus_message_iter_container_new_impl( tgt, 'a', ""); + for(auto &q : src){ + Encoder::value_type>::encode(w, var, q, 'e'); + } + } + static void decode(TestDBusWrapper &w, std::unordered_map &tgt, const TestDBusWrapper::MessageIterPtr &src) { + auto s = w.eldbus_message_iter_get_and_next_by_type_impl( src, 'a' ); + if( !s ) throw TestDBusWrapper::error{}; + while(!TestDBusWrapper::completed(s)) { + std::pair tmp; + Encoder>::decode(w, tmp, s, 'e'); + tgt.insert(std::move(tmp)); + } + } }; -}; - -template -struct Encoder -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const T& src) - { - w.eldbus_message_iter_arguments_append_impl(tgt, src); - } - static void decode(TestDBusWrapper& w, T& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - if(!w.eldbus_message_iter_get_and_next_impl(src, tgt)) throw TestDBusWrapper::error{}; - } -}; -template -struct Encoder::value>::type> -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const T& src) - { - Encoder::type>::encode(w, tgt, static_cast::type>(src)); - } - static void decode(TestDBusWrapper& w, T& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - typename std::underlying_type::type v = 0; - Encoder::type>::decode(w, v, src); - tgt = static_cast(v); - } -}; -template -struct Encoder -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const T& src) - { - Encoder::encode(w, tgt, src); - } - static void decode(TestDBusWrapper& w, T& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - Encoder::decode(w, tgt, src); - } -}; -template -struct Encoder -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const T& src) - { - Encoder::encode(w, tgt, src); - } - static void decode(TestDBusWrapper& w, T& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - Encoder::decode(w, tgt, src); - } -}; -template -struct Encoder -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const T& src) - { - Encoder::encode(w, tgt, src); - } - static void decode(TestDBusWrapper& w, T& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - Encoder::decode(w, tgt, src); - } -}; -template -struct EncoderTuple -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const std::tuple& src) - { - Encoder>::type>::encode(w, tgt, std::get(src)); - EncoderTuple::encode(w, tgt, src); - } - static void decode(TestDBusWrapper& w, std::tuple& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - Encoder>::type>::decode(w, std::get(tgt), src); - EncoderTuple::decode(w, tgt, src); - } -}; -template -struct EncoderTuple -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const std::tuple& src) - { - } - static void decode(TestDBusWrapper& w, std::tuple& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - } -}; -template -struct Encoder> -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const std::tuple& src) - { - auto var = w.eldbus_message_iter_container_new_impl(tgt, 'r', ""); - EncoderTuple<0, sizeof...(ARGS), ARGS...>::encode(w, var, src); - } - static void decode(TestDBusWrapper& w, std::tuple& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - auto s = w.eldbus_message_iter_get_and_next_by_type_impl(src, 'r'); - if(!s) throw TestDBusWrapper::error{}; - EncoderTuple<0, sizeof...(ARGS), ARGS...>::decode(w, tgt, s); - } -}; -template -struct Encoder> -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const std::pair& src, char type = 'r') - { - auto var = w.eldbus_message_iter_container_new_impl(tgt, type, ""); - Encoder::encode(w, var, src.first); - Encoder::encode(w, var, src.second); - } - static void decode(TestDBusWrapper& w, std::pair& tgt, const TestDBusWrapper::MessageIterPtr& src, char type = 'r') - { - auto s = w.eldbus_message_iter_get_and_next_by_type_impl(src, type); - if(!s) throw TestDBusWrapper::error{}; - Encoder::decode(w, tgt.first, s); - Encoder::decode(w, tgt.second, s); - } -}; -template -struct Encoder> -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const TestDBusWrapper::Variant& src) - { - //w.eldbus_message_iter_arguments_append_impl(tgt, src); - auto var = w.eldbus_message_iter_container_new_impl(tgt, 'v', ""); - Encoder::encode(w, var, src.value); - } - static void decode(TestDBusWrapper& w, TestDBusWrapper::Variant& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - auto s = w.eldbus_message_iter_get_and_next_by_type_impl(src, 'v'); - if(!s) throw TestDBusWrapper::error{}; - Encoder::decode(w, tgt.value, s); - } -}; -template -struct Encoder> -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const std::vector& src) - { - auto var = w.eldbus_message_iter_container_new_impl(tgt, 'a', ""); - for(auto& q : src) - Encoder::encode(w, var, q); - } - static void decode(TestDBusWrapper& w, std::vector& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - auto s = w.eldbus_message_iter_get_and_next_by_type_impl(src, 'a'); - if(!s) throw TestDBusWrapper::error{}; - while(!TestDBusWrapper::completed(s)) - { - tgt.push_back({}); - Encoder::decode(w, tgt.back(), s); + template struct Encoder> { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const std::array &src) { + auto var = w.eldbus_message_iter_container_new_impl( tgt, 'a', ""); + for(auto &q : src) + Encoder::encode(w, var, q); } - } -}; -template -struct Encoder> -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const std::unordered_map& src) - { - auto var = w.eldbus_message_iter_container_new_impl(tgt, 'a', ""); - for(auto& q : src) - { - Encoder::value_type>::encode(w, var, q, 'e'); + static void decode(TestDBusWrapper &w, std::array &tgt, const TestDBusWrapper::MessageIterPtr &src) { + auto s = w.eldbus_message_iter_get_and_next_by_type_impl( src, 'a' ); + if( !s ) throw TestDBusWrapper::error{}; + size_t i = 0; + while(!TestDBusWrapper::completed(s)) { + if(i >= tgt.size()) throw TestDBusWrapper::error{}; + Encoder::decode(w, tgt[i], s); + ++i; + } + if( i!=tgt.size()) throw TestDBusWrapper::error{}; } - } - static void decode(TestDBusWrapper& w, std::unordered_map& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - auto s = w.eldbus_message_iter_get_and_next_by_type_impl(src, 'a'); - if(!s) throw TestDBusWrapper::error{}; - while(!TestDBusWrapper::completed(s)) - { - std::pair tmp; - Encoder>::decode(w, tmp, s, 'e'); - tgt.insert(std::move(tmp)); + }; + template <> struct Encoder { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const Dali::Accessibility::Address &src) { + Encoder>::encode(w, tgt,std::tuple { + src.GetBus(), ObjectPath{ "/org/a11y/atspi/accessible/" + src.GetPath() } } + ); } - } -}; -template -struct Encoder> -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const std::array& src) - { - auto var = w.eldbus_message_iter_container_new_impl(tgt, 'a', ""); - for(auto& q : src) - Encoder::encode(w, var, q); - } - static void decode(TestDBusWrapper& w, std::array& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - auto s = w.eldbus_message_iter_get_and_next_by_type_impl(src, 'a'); - if(!s) throw TestDBusWrapper::error{}; - size_t i = 0; - while(!TestDBusWrapper::completed(s)) - { - if(i >= tgt.size()) throw TestDBusWrapper::error{}; - Encoder::decode(w, tgt[i], s); - ++i; + static void decode(TestDBusWrapper &w, Dali::Accessibility::Address &tgt, const TestDBusWrapper::MessageIterPtr &src) { + std::tuple tmp; + Encoder>::decode(w, tmp, src); + static const size_t prefixSize = std::string{ "/org/a11y/atspi/accessible/" }.size(); + tgt = { std::move(std::get<0>(tmp)), std::get<1>(tmp).value.substr(prefixSize) }; } - if(i != tgt.size()) throw TestDBusWrapper::error{}; - } -}; -template<> -struct Encoder -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const Dali::Accessibility::Address& src) - { - Encoder>::encode(w, tgt, std::tuple{src.GetBus(), ObjectPath{"/org/a11y/atspi/accessible/" + src.GetPath()}}); - } - static void decode(TestDBusWrapper& w, Dali::Accessibility::Address& tgt, const TestDBusWrapper::MessageIterPtr& src) - { - std::tuple tmp; - Encoder>::decode(w, tmp, src); - static const size_t prefixSize = std::string{"/org/a11y/atspi/accessible/"}.size(); - tgt = {std::move(std::get<0>(tmp)), std::get<1>(tmp).value.substr(prefixSize)}; - } -}; -template<> -struct Encoder -{ - static void encode(TestDBusWrapper& w, const TestDBusWrapper::MessageIterPtr& tgt, const char* src) - { - Encoder::encode(w, tgt, src); - } -}; -} // namespace detail + }; + template <> struct Encoder { + static void encode(TestDBusWrapper &w, const TestDBusWrapper::MessageIterPtr &tgt, const char *src) { + Encoder::encode(w, tgt, src); + } + }; +} /// \endcond -#define DBUS_DEBUG(...) \ - do \ - { \ - DBus::debugPrint(__FILE__, __LINE__, __VA_ARGS__); \ - } while(0) +#define DBUS_DEBUG( ... ) \ + do \ + { \ + DBus::debugPrint( __FILE__, __LINE__, __VA_ARGS__ ); \ + } while( 0 ) #define DBUS_W DBusWrapper::Installed() @@ -978,7 +681,7 @@ class DBusInterfaceDescription; /** * @brief Formats debug message and calls debug printer (if any) with it */ -void debugPrint(const char* file, size_t line, const char* format, ...); +void debugPrint( const char* file, size_t line, const char* format, ... ); /** * @brief Sets debug printer callback, which will be called with debug messages @@ -987,17 +690,16 @@ void debugPrint(const char* file, size_t line, const char* format, ...); * is pointer to text, second it's length. Text is ended with 0 (not counted towards it's size), * user can safely printf it. */ -void setDebugPrinter(std::function); +void setDebugPrinter( std::function< void( const char*, size_t ) > ); struct Error { std::string message; Error() = default; - Error(std::string msg) - : message(std::move(msg)) + Error( std::string msg ) : message( std::move( msg ) ) { - bart_assert(!message.empty()); + bart_assert( !message.empty() ); } }; @@ -1020,7 +722,7 @@ struct Success * Both mean the same - ValueOrError containing no real data and being a marker, * wherever operation successed or failed and containing possible error message. */ -template +template < typename... ARGS > class ValueOrError { public: @@ -1034,28 +736,21 @@ public: * * This will be initialized as success with passed in values. */ - ValueOrError(ARGS... t) - : value(std::move(t)...) - { - } + ValueOrError( ARGS... t ) : value( std::move( t )... ) {} /** * @brief Alternative Value constructor. * * This will be initialized as success with passed in values. */ - ValueOrError(std::tuple t) - : value(std::move(t)) - { - } + ValueOrError( std::tuple< ARGS... > t ) : value( std::move( t ) ) {} /** * @brief Error constructor. This will be initialized as failure with given error message. */ - ValueOrError(Error e) - : error(std::move(e)) + ValueOrError( Error e ) : error( std::move( e ) ) { - bart_assert(!error.message.empty()); + bart_assert( !error.message.empty() ); } /** @@ -1087,9 +782,9 @@ public: * User can modify (or move) data safely. * Only callable, if operation actually successed, otherwise will bart_assert. */ - std::tuple& getValues() + std::tuple< ARGS... >& getValues() { - bart_assert(*this); + bart_assert( *this ); return value; } @@ -1099,32 +794,29 @@ public: * Returns const reference to the internal tuple containing held data. * Only callable, if operation actually successed, otherwise will bart_assert. */ - const std::tuple& getValues() const + const std::tuple< ARGS... >& getValues() const { - bart_assert(*this); + bart_assert( *this ); return value; } protected: /// \cond - std::tuple value; - Error error; + std::tuple< ARGS... > value; + Error error; /// \endcond }; /// \cond -template<> +template <> class ValueOrError<> { public: ValueOrError() = default; - ValueOrError(std::tuple<> t) - { - } - ValueOrError(Error e) - : error(std::move(e)) + ValueOrError( std::tuple<> t ) {} + ValueOrError( Error e ) : error( std::move( e ) ) { - bart_assert(!error.message.empty()); + bart_assert( !error.message.empty() ); } explicit operator bool() const @@ -1137,13 +829,13 @@ public: } std::tuple<>& getValues() { - bart_assert(*this); + bart_assert( *this ); static std::tuple<> t; return t; } std::tuple<> getValues() const { - bart_assert(*this); + bart_assert( *this ); return {}; } @@ -1151,18 +843,15 @@ protected: Error error; }; -template<> -class ValueOrError +template <> +class ValueOrError< void > { public: ValueOrError() = default; - ValueOrError(Success) - { - } - ValueOrError(Error e) - : error(std::move(e)) + ValueOrError( Success ) {} + ValueOrError( Error e ) : error( std::move( e ) ) { - bart_assert(!error.message.empty()); + bart_assert( !error.message.empty() ); } explicit operator bool() const @@ -1175,13 +864,13 @@ public: } std::tuple<>& getValues() { - bart_assert(*this); + bart_assert( *this ); static std::tuple<> t; return t; } std::tuple<> getValues() const { - bart_assert(*this); + bart_assert( *this ); return {}; } @@ -1202,7 +891,7 @@ using ObjectPath = ObjectPath; * as return data in variant. So for example user can't specify method call, which on return * expects DBUS variant holding either string or int. */ -template +template < typename A > struct EldbusVariant { A value; @@ -1214,27 +903,27 @@ struct EldbusVariant namespace detail { /// \cond -template +template < typename T, typename = void > struct signature; -template -struct signature>; -template -struct signature>; -template -struct signature>; -template -struct signature>; -template -struct signature>; -template -struct signature>; +template < typename... ARGS > +struct signature< std::tuple< ARGS... > >; +template < typename A, typename B > +struct signature< std::pair< A, B > >; +template < typename A > +struct signature< std::vector< A > >; +template < typename A, size_t N > +struct signature< std::array< A, N > >; +template < typename A, typename B > +struct signature< std::unordered_map< A, B > >; +template < typename A, typename B > +struct signature< std::map< A, B > >; /// \endcond /** * @brief Signature class for marshalling uint8 type. */ -template<> -struct signature +template <> +struct signature< uint8_t > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1255,7 +944,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, uint8_t v) + static void set( const DBusWrapper::MessageIterPtr &iter, uint8_t v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1263,7 +952,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, uint8_t& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, uint8_t& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1272,8 +961,8 @@ struct signature /** * @brief Signature class for marshalling uint16 type. */ -template<> -struct signature +template <> +struct signature< uint16_t > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1294,7 +983,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, uint16_t v) + static void set( const DBusWrapper::MessageIterPtr &iter, uint16_t v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1302,7 +991,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, uint16_t& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, uint16_t& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1311,8 +1000,8 @@ struct signature /** * @brief Signature class for marshalling uint32 type. */ -template<> -struct signature +template <> +struct signature< uint32_t > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1333,7 +1022,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, uint32_t v) + static void set( const DBusWrapper::MessageIterPtr &iter, uint32_t v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1341,7 +1030,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, uint32_t& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, uint32_t& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1350,8 +1039,8 @@ struct signature /** * @brief Signature class for marshalling uint64 type. */ -template<> -struct signature +template <> +struct signature< uint64_t > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1372,7 +1061,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, uint64_t v) + static void set( const DBusWrapper::MessageIterPtr &iter, uint64_t v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1380,7 +1069,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, uint64_t& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, uint64_t& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1389,8 +1078,8 @@ struct signature /** * @brief Signature class for marshalling int16 type. */ -template<> -struct signature +template <> +struct signature< int16_t > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1411,7 +1100,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, int16_t v) + static void set( const DBusWrapper::MessageIterPtr &iter, int16_t v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1419,7 +1108,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, int16_t& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, int16_t& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1428,8 +1117,8 @@ struct signature /** * @brief Signature class for marshalling int32 type. */ -template<> -struct signature +template <> +struct signature< int32_t > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1450,7 +1139,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, int32_t v) + static void set( const DBusWrapper::MessageIterPtr &iter, int32_t v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1458,7 +1147,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, int32_t& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, int32_t& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1467,8 +1156,8 @@ struct signature /** * @brief Signature class for marshalling int64 type. */ -template<> -struct signature +template <> +struct signature< int64_t > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1489,7 +1178,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, int64_t v) + static void set( const DBusWrapper::MessageIterPtr &iter, int64_t v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1497,7 +1186,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, int64_t& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, int64_t& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1506,8 +1195,8 @@ struct signature /** * @brief Signature class for marshalling double type. */ -template<> -struct signature +template <> +struct signature< double > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1528,7 +1217,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, double v) + static void set( const DBusWrapper::MessageIterPtr &iter, double v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1536,7 +1225,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, double& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, double& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1544,11 +1233,11 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, float& v2) + static bool get( const DBusWrapper::MessageIterPtr &iter, float& v2 ) { double v = 0; - auto r = DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); - v2 = static_cast(v); + auto r = DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); + v2 = static_cast< float >( v ); return r; } }; @@ -1556,8 +1245,8 @@ struct signature /** * @brief Signature class for marshalling float type. */ -template<> -struct signature +template <> +struct signature< float > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1578,7 +1267,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, float v) + static void set( const DBusWrapper::MessageIterPtr &iter, float v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1586,7 +1275,7 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, double& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, double& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1594,11 +1283,11 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, float& v2) + static bool get( const DBusWrapper::MessageIterPtr &iter, float& v2 ) { double v = 0; - auto r = DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); - v2 = static_cast(v); + auto r = DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); + v2 = static_cast< float >( v ); return r; } }; @@ -1606,8 +1295,8 @@ struct signature /** * @brief Signature class for marshalling boolean type. */ -template<> -struct signature +template <> +struct signature< bool > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1628,7 +1317,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, bool v) + static void set( const DBusWrapper::MessageIterPtr &iter, bool v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1636,14 +1325,14 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, bool& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, bool& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } }; -template -struct signature::value, void>::type> +template < typename T > +struct signature< T, typename std::enable_if< std::is_enum< T >::value, void >::type > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1664,21 +1353,21 @@ struct signature::value, void>::type> /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, T v) + static void set( const DBusWrapper::MessageIterPtr &iter, T v ) { - signature::type>::set(iter, static_cast(v)); + signature::type>::set(iter, static_cast< int64_t >( v )); } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, T& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, T& v ) { typename std::underlying_type::type q = 0; - if(!signature::type>::get(iter, q)) + if (!signature::type>::get(iter, q)) return false; - v = static_cast(q); + v = static_cast< T >( q ); return true; } }; @@ -1689,8 +1378,8 @@ struct signature::value, void>::type> * Both (const) char * and std::string types are accepted as value to send. * Only std::string is accepted as value to receive. */ -template<> -struct signature +template <> +struct signature< std::string > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1711,30 +1400,30 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::string& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::string& v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } - // /** - // * @brief Marshals value v as marshalled type into message - // */ - // static void set( const DBusWrapper::MessageIterPtr &iter, const char* v ) - // { - // DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); - // } +// /** +// * @brief Marshals value v as marshalled type into message +// */ +// static void set( const DBusWrapper::MessageIterPtr &iter, const char* v ) +// { +// DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); +// } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::string& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::string& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } }; -template<> -struct signature +template <> +struct signature< ObjectPath > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1755,15 +1444,15 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::string& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::string& v ) { - DBUS_W->eldbus_message_iter_arguments_append_impl(iter, ObjectPath{v}); + DBUS_W->eldbus_message_iter_arguments_append_impl(iter, ObjectPath{ v }); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const ObjectPath& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const ObjectPath& v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1771,15 +1460,15 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const char* v) + static void set( const DBusWrapper::MessageIterPtr &iter, const char* v ) { - DBUS_W->eldbus_message_iter_arguments_append_impl(iter, ObjectPath{v}); + DBUS_W->eldbus_message_iter_arguments_append_impl(iter, ObjectPath{ v }); } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, ObjectPath& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, ObjectPath& v ) { return DBUS_W->eldbus_message_iter_get_and_next_impl(iter, v); } @@ -1787,10 +1476,10 @@ struct signature /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::string& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::string& v ) { ObjectPath q; - if(!DBUS_W->eldbus_message_iter_get_and_next_impl(iter, q)) return false; + if (!DBUS_W->eldbus_message_iter_get_and_next_impl(iter, q)) return false; v = std::move(q.value); return true; } @@ -1802,8 +1491,8 @@ struct signature * Both (const) char * and std::string types are accepted as value to send. * You can't use (const) char * variable type to receive value. */ -template<> -struct signature +template <> +struct signature< char* > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1824,7 +1513,7 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::string& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::string& v ) { DBUS_W->eldbus_message_iter_arguments_append_impl(iter, v); } @@ -1832,21 +1521,21 @@ struct signature /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const char* v) + static void set( const DBusWrapper::MessageIterPtr &iter, const char* v ) { - DBUS_W->eldbus_message_iter_arguments_append_impl(iter, std::string{v}); + DBUS_W->eldbus_message_iter_arguments_append_impl(iter, std::string{ v }); } }; /// \cond -template +template < size_t INDEX, typename A, typename... ARGS > struct signature_tuple_element_type_helper { - using type = typename signature_tuple_element_type_helper::type; + using type = typename signature_tuple_element_type_helper< INDEX - 1, ARGS... >::type; }; -template -struct signature_tuple_element_type_helper<0, A, ARGS...> +template < typename A, typename... ARGS > +struct signature_tuple_element_type_helper< 0, A, ARGS... > { using type = A; }; @@ -1859,19 +1548,19 @@ struct signature_tuple_element_type_helper<0, A, ARGS...> * and incrementing. This class recursively calls itself with increasing INDEX value * until INDEX is equal to SIZE, where recursive calling ends. */ -template +template < size_t INDEX, size_t SIZE, typename... ARGS > struct signature_tuple_helper { - using current_type = typename signature_tuple_element_type_helper::type; + using current_type = typename signature_tuple_element_type_helper< INDEX, ARGS... >::type; /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - if(INDEX + 1 >= SIZE) - return signature::name(); - return signature::name() + ", " + signature_tuple_helper::name(); + if( INDEX + 1 >= SIZE ) + return signature< current_type >::name(); + return signature< current_type >::name() + ", " + signature_tuple_helper< INDEX + 1, SIZE, ARGS... >::name(); } /** @@ -1879,25 +1568,25 @@ struct signature_tuple_helper */ static std::string sig() { - return signature::sig() + signature_tuple_helper::sig(); + return signature< current_type >::sig() + signature_tuple_helper< INDEX + 1, SIZE, ARGS... >::sig(); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::tuple& args) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::tuple< ARGS... >& args ) { - signature::set(iter, std::get(args)); - signature_tuple_helper::set(iter, args); + signature< current_type >::set( iter, std::get< INDEX >( args ) ); + signature_tuple_helper< INDEX + 1, SIZE, ARGS... >::set( iter, args ); } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::tuple& args) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::tuple< ARGS... >& args ) { - return signature::get(iter, std::get(args)) && - signature_tuple_helper::get(iter, args); + return signature< current_type >::get( iter, std::get< INDEX >( args ) ) && + signature_tuple_helper< INDEX + 1, SIZE, ARGS... >::get( iter, args ); } }; @@ -1907,8 +1596,8 @@ struct signature_tuple_helper * This class marks end of the tuple marshalling. Members of this class are called * when INDEX value is equal to SIZE. */ -template -struct signature_tuple_helper +template < size_t SIZE, typename... ARGS > +struct signature_tuple_helper< SIZE, SIZE, ARGS... > { /** * @brief Returns name of type marshalled, for informative purposes @@ -1929,14 +1618,14 @@ struct signature_tuple_helper /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::tuple& args) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::tuple< ARGS... >& args ) { } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::tuple& args) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::tuple< ARGS... >& args ) { return true; } @@ -1948,15 +1637,15 @@ struct signature_tuple_helper * This class marshalls tuple of values. This represents * DBUS struct typle, encoded with character 'r' */ -template -struct signature> +template < typename... ARGS > +struct signature< std::tuple< ARGS... > > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "tuple<" + signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::name() + ">"; + return "tuple<" + signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::name() + ">"; } /** @@ -1964,26 +1653,26 @@ struct signature> */ static std::string sig() { - return "(" + signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::sig() + ")"; + return "(" + signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::sig() + ")"; } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::tuple& args) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::tuple< ARGS... >& args ) { - auto entry = DBUS_W->eldbus_message_iter_container_new_impl(iter, 'r', ""); - signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::set(entry, args); + auto entry = DBUS_W->eldbus_message_iter_container_new_impl( iter, 'r', ""); + signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::set( entry, args ); } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::tuple& args) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::tuple< ARGS... >& args ) { - auto entry = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl(iter, 'r'); - if(!entry) return false; - return signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::get(entry, args); + auto entry = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl( iter, 'r' ); + if (!entry) return false; + return signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::get( entry, args ); } }; @@ -1998,15 +1687,15 @@ struct signature> * or * \code{.cpp} ValueOrError>> \endcode */ -template -struct signature> +template < typename... ARGS > +struct signature< ValueOrError< ARGS... > > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "ValueOrError<" + signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::name() + ">"; + return "ValueOrError<" + signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::name() + ">"; } /** @@ -2014,31 +1703,31 @@ struct signature> */ static std::string sig() { - return signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::sig(); + return signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::sig(); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const ValueOrError& args) + static void set( const DBusWrapper::MessageIterPtr &iter, const ValueOrError< ARGS... >& args ) { - signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::set(iter, args.getValues()); + signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::set( iter, args.getValues() ); } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, ValueOrError& args) + static bool get( const DBusWrapper::MessageIterPtr &iter, ValueOrError< ARGS... >& args ) { - return signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::get(iter, args.getValues()); + return signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::get( iter, args.getValues() ); } }; /** * @brief Signature class for marshalling ValueOrError type */ -template<> -struct signature> +template <> +struct signature< ValueOrError< void > > { /** * @brief Returns name of type marshalled, for informative purposes @@ -2059,14 +1748,14 @@ struct signature> /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const ValueOrError& args) + static void set( const DBusWrapper::MessageIterPtr &iter, const ValueOrError< void >& args ) { } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, ValueOrError& args) + static bool get( const DBusWrapper::MessageIterPtr &iter, ValueOrError< void >& args ) { return true; } @@ -2075,8 +1764,8 @@ struct signature> /** * @brief Signature class for marshalling ValueOrError<> type */ -template<> -struct signature> +template <> +struct signature< ValueOrError<> > { /** * @brief Returns name of type marshalled, for informative purposes @@ -2097,14 +1786,14 @@ struct signature> /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const ValueOrError<>& args) + static void set( const DBusWrapper::MessageIterPtr &iter, const ValueOrError<>& args ) { } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, ValueOrError<>& args) + static bool get( const DBusWrapper::MessageIterPtr &iter, ValueOrError<>& args ) { return true; } @@ -2113,15 +1802,15 @@ struct signature> /** * @brief Signature class for marshalling pair of types */ -template -struct signature> +template < typename A, typename B > +struct signature< std::pair< A, B > > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "pair<" + signature_tuple_helper<0, 2, A, B>::name() + ">"; + return "pair<" + signature_tuple_helper< 0, 2, A, B >::name() + ">"; } /** @@ -2129,36 +1818,35 @@ struct signature> */ static std::string sig() { - return "(" + signature_tuple_helper<0, 2, A, B>::sig() + ")"; + return "(" + signature_tuple_helper< 0, 2, A, B >::sig() + ")"; } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::pair& ab, bool dictionary = false) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::pair< A, B >& ab, bool dictionary = false ) { - auto entry = DBUS_W->eldbus_message_iter_container_new_impl(iter, dictionary ? 'e' : 'r', ""); - signature_tuple_helper<0, 2, A, B>::set(entry, ab); + auto entry = DBUS_W->eldbus_message_iter_container_new_impl( iter, dictionary ? 'e' : 'r', ""); + signature_tuple_helper< 0, 2, A, B >::set( entry, ab ); } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::pair& ab) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::pair< A, B >& ab ) { - auto entry = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl(iter, 'r'); - if(!entry) - { - entry = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl(iter, '{'); - if(!entry) return false; + auto entry = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl( iter, 'r' ); + if (!entry) { + entry = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl( iter, '{' ); + if (!entry) return false; } - std::tuple ab_tmp; - auto z = signature_tuple_helper<0, 2, A, B>::get(entry, ab_tmp); - if(z) + std::tuple< A, B > ab_tmp; + auto z = signature_tuple_helper< 0, 2, A, B >::get( entry, ab_tmp ); + if( z ) { - ab.first = std::move(std::get<0>(ab_tmp)); - ab.second = std::move(std::get<1>(ab_tmp)); + ab.first = std::move( std::get< 0 >( ab_tmp ) ); + ab.second = std::move( std::get< 1 >( ab_tmp ) ); } return z; } @@ -2169,15 +1857,15 @@ struct signature> * * This marshals container's content as DBUS a ascii character type code. */ -template -struct signature> +template < typename A > +struct signature< std::vector< A > > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "vector<" + signature::name() + ">"; + return "vector<" + signature< A >::name() + ">"; } /** @@ -2185,33 +1873,33 @@ struct signature> */ static std::string sig() { - return "a" + signature::sig(); + return "a" + signature< A >::sig(); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::vector& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::vector< A >& v ) { - auto lst = DBUS_W->eldbus_message_iter_container_new_impl(iter, 'a', signature::sig()); - bart_assert(lst); - for(auto& a : v) + auto lst = DBUS_W->eldbus_message_iter_container_new_impl( iter, 'a', signature< A >::sig()); + bart_assert( lst ); + for( auto& a : v ) { - signature::set(lst, a); + signature< A >::set( lst, a ); } } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::vector& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::vector< A >& v ) { - auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl(iter, 'a'); - if(!s) return false; + auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl( iter, 'a' ); + if (!s) return false; v.clear(); A a; - while(signature::get(s, a)) - v.push_back(std::move(a)); + while( signature< A >::get( s, a ) ) + v.push_back( std::move( a ) ); return true; } @@ -2222,15 +1910,15 @@ struct signature> * * This marshals container's content as DBUS a ascii character type code. */ -template -struct signature> +template < typename A, size_t N > +struct signature< std::array< A, N > > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "array<" + signature::name() + ", " + std::to_string(N) + ">"; + return "array<" + signature< A >::name() + ", " + std::to_string( N ) + ">"; } /** @@ -2238,33 +1926,33 @@ struct signature> */ static std::string sig() { - return "a" + signature::sig(); + return "a" + signature< A >::sig(); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::array& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::array< A, N >& v ) { - auto lst = DBUS_W->eldbus_message_iter_container_new_impl(iter, 'a', signature::sig()); - bart_assert(lst); - for(auto& a : v) + auto lst = DBUS_W->eldbus_message_iter_container_new_impl( iter, 'a', signature< A >::sig()); + bart_assert( lst ); + for( auto& a : v ) { - signature::set(lst, a); + signature< A >::set( lst, a ); } } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::array& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::array< A, N >& v ) { - auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl(iter, 'a'); - if(!s) + auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl( iter, 'a' ); + if ( !s ) return false; - for(auto& a : v) + for( auto& a : v ) { - if(!signature::get(s, a)) + if( !signature< A >::get( s, a ) ) return false; } return true; @@ -2276,15 +1964,15 @@ struct signature> * * This marshals variant's content as DBUS v ascii character type code. */ -template -struct signature> +template < typename A > +struct signature< EldbusVariant< A > > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "variant<" + signature::name() + ">"; + return "variant<" + signature< A >::name() + ">"; } /** @@ -2298,29 +1986,29 @@ struct signature> /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const EldbusVariant& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const EldbusVariant< A >& v ) { - set(iter, v.value); + set( iter, v.value ); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const A& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const A& v ) { - auto var = DBUS_W->eldbus_message_iter_container_new_impl(iter, 'v', signature::sig()); - signature::set(var, v); + auto var = DBUS_W->eldbus_message_iter_container_new_impl( iter, 'v', signature< A >::sig()); + signature< A >::set( var, v ); } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, EldbusVariant& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, EldbusVariant< A >& v ) { - auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl(iter, 'v'); - if(!s) + auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl( iter, 'v' ); + if( !s ) return false; - return signature::get(s, v.value); + return signature< A >::get( s, v.value ); } }; @@ -2334,15 +2022,15 @@ struct signature> * User can receive such values as std::vector of std::pair values. * Order of such values is unspecified. */ -template -struct signature> +template < typename A, typename B > +struct signature< std::unordered_map< A, B > > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "unordered_map<" + signature::name() + ", " + signature::name() + ">"; + return "unordered_map<" + signature< A >::name() + ", " + signature< B >::name() + ">"; } /** @@ -2350,35 +2038,35 @@ struct signature> */ static std::string sig() { - return "a{" + signature_tuple_helper<0, 2, A, B>::sig() + "}"; + return "a{" + signature_tuple_helper< 0, 2, A, B >::sig() + "}"; } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::unordered_map& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::unordered_map< A, B >& v ) { - auto sig = "{" + signature_tuple_helper<0, 2, A, B>::sig() + "}"; - auto lst = DBUS_W->eldbus_message_iter_container_new_impl(iter, 'a', sig); - bart_assert(lst); - for(auto& a : v) + auto sig = "{" + signature_tuple_helper< 0, 2, A, B >::sig() + "}"; + auto lst = DBUS_W->eldbus_message_iter_container_new_impl( iter, 'a', sig); + bart_assert( lst ); + for( auto& a : v ) { - signature>::set(lst, a, true); + signature< std::pair< A, B > >::set( lst, a, true ); } } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::unordered_map& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::unordered_map< A, B >& v ) { - auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl(iter, 'a'); + auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl( iter, 'a' ); v.clear(); - if(!s) + if( !s ) return false; - std::pair a; - while(signature>::get(s, a)) - v.insert(std::move(a)); + std::pair< A, B > a; + while( signature< std::pair< A, B > >::get( s, a ) ) + v.insert( std::move( a ) ); return true; } }; @@ -2393,15 +2081,15 @@ struct signature> * User can receive such values as std::vector of std::pair values. * Order of such values is unspecified. */ -template -struct signature> +template < typename A, typename B > +struct signature< std::map< A, B > > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "map<" + signature::name() + ", " + signature::name() + ">"; + return "map<" + signature< A >::name() + ", " + signature< B >::name() + ">"; } /** @@ -2409,34 +2097,34 @@ struct signature> */ static std::string sig() { - return "a{" + signature_tuple_helper<0, 2, A, B>::sig() + "}"; + return "a{" + signature_tuple_helper< 0, 2, A, B >::sig() + "}"; } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const std::map& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const std::map< A, B >& v ) { - auto sig = "{" + signature_tuple_helper<0, 2, A, B>::sig() + "}"; - auto lst = DBUS_W->eldbus_message_iter_container_new_impl(iter, 'a', sig); - bart_assert(lst); - for(auto& a : v) + auto sig = "{" + signature_tuple_helper< 0, 2, A, B >::sig() + "}"; + auto lst = DBUS_W->eldbus_message_iter_container_new_impl( iter, 'a', sig); + bart_assert( lst ); + for( auto& a : v ) { - signature>::set(lst, a, true); + signature< std::pair< A, B > >::set( lst, a, true ); } } /** * @brief Marshals value from marshalled type into variable v */ - static bool get(const DBusWrapper::MessageIterPtr& iter, std::map& v) + static bool get( const DBusWrapper::MessageIterPtr &iter, std::map< A, B >& v ) { - auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl(iter, 'a'); - if(!s) + auto s = DBUS_W->eldbus_message_iter_get_and_next_by_type_impl( iter, 'a' ); + if( !s ) return false; - std::pair a; - while(signature>::get(s, a)) - v.insert(std::move(a)); + std::pair< A, B > a; + while( signature< std::pair< A, B > >::get( s, a ) ) + v.insert( std::move( a ) ); return true; } }; @@ -2444,15 +2132,15 @@ struct signature> /** * @brief Signature helper class for marshalling const reference types */ -template -struct signature +template < typename A > +struct signature< const A& > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "const " + signature::name() + "&"; + return "const " + signature< A >::name() + "&"; } /** @@ -2460,38 +2148,38 @@ struct signature */ static std::string sig() { - return signature::sig(); + return signature< A >::sig(); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const A& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const A& v ) { - signature::set(iter, v); + signature< A >::set( iter, v ); } /** * @brief Marshals value from marshalled type into variable v */ - static void get(const DBusWrapper::MessageIterPtr& iter, A& v) + static void get( const DBusWrapper::MessageIterPtr &iter, A& v ) { - signature::get(iter, v); + signature< A >::get( iter, v ); } }; /** * @brief Signature helper class for marshalling reference types */ -template -struct signature +template < typename A > +struct signature< A& > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return signature::name() + "&"; + return signature< A >::name() + "&"; } /** @@ -2499,38 +2187,38 @@ struct signature */ static std::string sig() { - return signature::sig(); + return signature< A >::sig(); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const A& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const A& v ) { - signature::set(iter, v); + signature< A >::set( iter, v ); } /** * @brief Marshals value from marshalled type into variable v */ - static void get(const DBusWrapper::MessageIterPtr& iter, A& v) + static void get( const DBusWrapper::MessageIterPtr &iter, A& v ) { - signature::get(iter, v); + signature< A >::get( iter, v ); } }; /** * @brief Signature helper class for marshalling const types */ -template -struct signature +template < typename A > +struct signature< const A > { /** * @brief Returns name of type marshalled, for informative purposes */ static std::string name() { - return "const " + signature::name(); + return "const " + signature< A >::name(); } /** @@ -2538,380 +2226,384 @@ struct signature */ static std::string sig() { - return signature::sig(); + return signature< A >::sig(); } /** * @brief Marshals value v as marshalled type into message */ - static void set(const DBusWrapper::MessageIterPtr& iter, const A& v) + static void set( const DBusWrapper::MessageIterPtr &iter, const A& v ) { - signature::set(iter, v); + signature< A >::set( iter, v ); } /** * @brief Marshals value from marshalled type into variable v */ - static void get(const DBusWrapper::MessageIterPtr& iter, A& v) + static void get( const DBusWrapper::MessageIterPtr &iter, A& v ) { - signature::get(iter, v); + signature< A >::get( iter, v ); } }; /// \cond using CallId = DBusWrapper::CallId; -template -ValueType unpackValues(CallId callId, const DBusWrapper::MessagePtr& msg) +template < typename ValueType > +ValueType unpackValues( CallId callId, const DBusWrapper::MessagePtr &msg ) { - auto iter = DBUS_W->eldbus_message_iter_get_impl(msg, false); + auto iter = DBUS_W->eldbus_message_iter_get_impl( msg, false ); ValueType r; - if(iter) + if( iter ) { - if(!signature::get(iter, r)) + if( !signature< ValueType >::get( iter, r ) ) { - DBUS_DEBUG("ValueType is %s", signature::name().c_str()); - r = Error{"call " + std::to_string(callId.id) + ": failed to unpack values, got signature '" + - DBUS_W->eldbus_message_signature_get_impl(msg) + "', expected '" + signature::sig() + "'"}; + DBUS_DEBUG( "ValueType is %s", signature< ValueType >::name().c_str() ); + r = Error{"call " + std::to_string( callId.id ) + ": failed to unpack values, got signature '" + + DBUS_W->eldbus_message_signature_get_impl( msg ) + "', expected '" + signature< ValueType >::sig() + "'"}; } } else { - r = Error{"call " + std::to_string(callId.id) + ": failed to get iterator"}; + r = Error{"call " + std::to_string( callId.id ) + ": failed to get iterator"}; } return r; } -inline void packValues_helper(const DBusWrapper::MessageIterPtr&) -{ -} +inline void packValues_helper( const DBusWrapper::MessageIterPtr& ) {} -template -void packValues_helper(const DBusWrapper::MessageIterPtr& iter, A&& a, ARGS&&... r) +template < typename A, typename... ARGS > +void packValues_helper( const DBusWrapper::MessageIterPtr &iter, A&& a, ARGS&&... r ) { - signature::set(iter, std::forward(a)); - packValues_helper(iter, std::forward(r)...); + signature< A >::set( iter, std::forward< A >( a ) ); + packValues_helper( iter, std::forward< ARGS >( r )... ); } -template -void packValues(CallId callId, const DBusWrapper::MessagePtr& msg, ARGS&&... r) +template < typename... ARGS > +void packValues( CallId callId, const DBusWrapper::MessagePtr &msg, ARGS&&... r ) { - auto iter = DBUS_W->eldbus_message_iter_get_impl(msg, true); - packValues_helper(iter, std::forward(r)...); + auto iter = DBUS_W->eldbus_message_iter_get_impl( msg, true ); + packValues_helper( iter, std::forward< ARGS >( r )... ); } -template +template < typename > struct ReturnType; -template -struct ReturnType +template < typename R, typename... ARGS > +struct ReturnType< R( ARGS... ) > { using type = R; }; -template -struct ReturnType> +template < typename R, typename... ARGS > +struct ReturnType< std::function< R( ARGS... ) > > { using type = R; }; -template +template < int... > struct sequence { }; -template -struct sequence_gen : sequence_gen +template < int N, int... S > +struct sequence_gen : sequence_gen< N - 1, N - 1, S... > { }; -template -struct sequence_gen<0, S...> +template < int... S > +struct sequence_gen< 0, S... > { - typedef sequence type; + typedef sequence< S... > type; }; -template +template < typename C, typename... ARGS > struct apply_helper { - const std::function& c; - const std::tuple& args; + const std::function< C >& c; + const std::tuple< ARGS... >& args; - template - auto apply_2(sequence) const -> decltype(c(std::get(args)...)) + template < int... S > + auto apply_2( sequence< S... > ) const -> decltype( c( std::get< S >( args )... ) ) { - return c(std::get(args)...); + return c( std::get< S >( args )... ); } - auto apply_1() const -> decltype(apply_2(typename sequence_gen::type())) + auto apply_1() const -> decltype( apply_2( typename sequence_gen< sizeof...( ARGS ) >::type() ) ) { - return apply_2(typename sequence_gen::type()); + return apply_2( typename sequence_gen< sizeof...( ARGS ) >::type() ); } }; -template +template < typename C, typename A, typename... ARGS > struct apply_helper_2 { - const std::function& c; - const A& a; - const std::tuple& args; + const std::function< C >& c; + const A& a; + const std::tuple< ARGS... >& args; - template - auto apply_2(sequence) const -> decltype(c(a, std::get(args)...)) + template < int... S > + auto apply_2( sequence< S... > ) const -> decltype( c( a, std::get< S >( args )... ) ) { - return c(a, std::get(args)...); + return c( a, std::get< S >( args )... ); } - auto apply_1() const -> decltype(apply_2(typename sequence_gen::type())) + auto apply_1() const -> decltype( apply_2( typename sequence_gen< sizeof...( ARGS ) >::type() ) ) { - return apply_2(typename sequence_gen::type()); + return apply_2( typename sequence_gen< sizeof...( ARGS ) >::type() ); } }; -template -auto apply(const std::function& c, const std::tuple& args) -> typename ReturnType::type +template < typename C, typename... ARGS > +auto apply( const std::function< C >& c, const std::tuple< ARGS... >& args ) -> typename ReturnType< C >::type { - apply_helper ah{c, args}; + apply_helper< C, ARGS... > ah{c, args}; return ah.apply_1(); } -template -auto apply(const std::function& c, const D& d, const std::tuple& args) -> typename ReturnType::type +template < typename C, typename D, typename... ARGS > +auto apply( const std::function< C >& c, const D& d, const std::tuple< ARGS... >& args ) -> typename ReturnType< C >::type { - apply_helper_2 ah{c, d, args}; + apply_helper_2< C, D, ARGS... > ah{c, d, args}; return ah.apply_1(); } struct ConnectionState { DBusWrapper::ConnectionPtr connection; - DBusWrapper::ObjectPtr object; - DBusWrapper::ProxyPtr proxy, propertiesProxy; + DBusWrapper::ObjectPtr object; + DBusWrapper::ProxyPtr proxy, propertiesProxy; }; -template -RETTYPE call(CallId callId, const ConnectionState& connectionState, bool property, const std::string& funcName, const ARGS&... args) +template < typename RETTYPE, typename... ARGS > +RETTYPE call( CallId callId, const ConnectionState& connectionState, bool property, const std::string& funcName, const ARGS&... args ) { - const auto& proxy = property ? connectionState.propertiesProxy : connectionState.proxy; - if(!proxy) + const auto &proxy = property ? connectionState.propertiesProxy : connectionState.proxy; + if( !proxy ) { - DBUS_DEBUG("call %d: not initialized", callId.id); + DBUS_DEBUG( "call %d: not initialized", callId.id ); return Error{"not initialized"}; } - DBUS_DEBUG("call %d: calling '%s'", callId.id, funcName.c_str()); + DBUS_DEBUG( "call %d: calling '%s'", callId.id, funcName.c_str() ); auto msg = DBUS_W->eldbus_proxy_method_call_new_impl(proxy, funcName); - if(!msg) + if( !msg ) { - DBUS_DEBUG("call %d: failed", callId.id); + DBUS_DEBUG( "call %d: failed", callId.id ); return Error{"failed to create message"}; } - detail::packValues(callId, msg, args...); - auto reply = DBUS_W->eldbus_proxy_send_and_block_impl(proxy, msg); - DBUS_DEBUG("call %d: calling '%s' done", callId.id, funcName.c_str()); - if(!reply) + detail::packValues( callId, msg, args... ); + auto reply = DBUS_W->eldbus_proxy_send_and_block_impl( proxy, msg ); + DBUS_DEBUG( "call %d: calling '%s' done", callId.id, funcName.c_str() ); + if( !reply ) { - DBUS_DEBUG("call %d: failed", callId.id); + DBUS_DEBUG( "call %d: failed", callId.id ); return Error{"eldbus returned null as reply"}; } std::string errname, errmsg; - if(DBUS_W->eldbus_message_error_get_impl(reply, errname, errmsg)) + if( DBUS_W->eldbus_message_error_get_impl( reply, errname, errmsg ) ) { - DBUS_DEBUG("call %d: %s: %s", callId.id, errname.c_str(), errmsg.c_str()); + DBUS_DEBUG( "call %d: %s: %s", callId.id, errname.c_str(), errmsg.c_str() ); return Error{errname + ": " + errmsg}; } - DBUS_DEBUG("call %d: got reply with signature '%s'", callId.id, DBUS_W->eldbus_message_signature_get_impl(reply).c_str()); - return detail::unpackValues(callId, reply); + DBUS_DEBUG( "call %d: got reply with signature '%s'", callId.id, + DBUS_W->eldbus_message_signature_get_impl( reply ).c_str() ); + return detail::unpackValues< RETTYPE >( callId, reply ); } -template -void asyncCall(CallId callId, const ConnectionState& connectionState, bool property, const std::string& funcName, std::function callback, const ARGS&... args) +template < typename RETTYPE, typename... ARGS > +void asyncCall( CallId callId, const ConnectionState &connectionState, + bool property, const std::string& funcName, + std::function< void( RETTYPE ) > callback, const ARGS&... args ) { - const auto& proxy = property ? connectionState.propertiesProxy : connectionState.proxy; - if(!proxy) + const auto &proxy = property ? connectionState.propertiesProxy : connectionState.proxy; + if( !proxy ) { - DBUS_DEBUG("call %d: not initialized", callId.id); - callback(Error{"not initialized"}); + DBUS_DEBUG( "call %d: not initialized", callId.id ); + callback( Error{"not initialized"} ); return; } - auto msg = DBUS_W->eldbus_proxy_method_call_new_impl(proxy, funcName); - if(!msg) + auto msg = DBUS_W->eldbus_proxy_method_call_new_impl( proxy, funcName ); + if( !msg ) { - DBUS_DEBUG("call %d: failed", callId.id); - callback(Error{"failed to create message"}); + DBUS_DEBUG( "call %d: failed", callId.id ); + callback( Error{"failed to create message"} ); return; } - detail::packValues(callId, msg, args...); - auto pending = DBUS_W->eldbus_proxy_send_impl(proxy, msg, [callback, callId, proxy](const DBusWrapper::MessagePtr& reply) { - DBUS_DEBUG("call %d: calling done", callId.id); - if(!reply) - { - DBUS_DEBUG("call %d: failed", callId.id); - callback(Error{"eldbus returned null as reply"}); - } - else - { - std::string errname, errmsg; - if(DBUS_W->eldbus_message_error_get_impl(reply, errname, errmsg)) - { - DBUS_DEBUG("call %d: %s: %s", callId.id, errname.c_str(), errmsg.c_str()); - callback(Error{errname + ": " + errmsg}); - } - else - { - DBUS_DEBUG("call %d: got reply with signature '%s'", callId.id, DBUS_W->eldbus_message_signature_get_impl(reply).c_str()); - callback(detail::unpackValues(callId, reply)); + detail::packValues( callId, msg, args... ); + auto pending = DBUS_W->eldbus_proxy_send_impl( proxy, msg, [callback, callId, proxy]( const DBusWrapper::MessagePtr &reply ) { + DBUS_DEBUG( "call %d: calling done", callId.id ); + if( !reply ) + { + DBUS_DEBUG( "call %d: failed", callId.id ); + callback( Error{"eldbus returned null as reply"} ); + } + else + { + std::string errname, errmsg; + if( DBUS_W->eldbus_message_error_get_impl( reply, errname, errmsg ) ) + { + DBUS_DEBUG( "call %d: %s: %s", callId.id, errname.c_str(), errmsg.c_str() ); + callback( Error{errname + ": " + errmsg} ); + } + else + { + DBUS_DEBUG( "call %d: got reply with signature '%s'", callId.id, + DBUS_W->eldbus_message_signature_get_impl( reply ).c_str() ); + callback( detail::unpackValues< RETTYPE >( callId, reply ) ); + } + } } - } - }); - if(pending) + ); + if( pending ) { - DBUS_DEBUG("call %d: call sent", callId.id); + DBUS_DEBUG( "call %d: call sent", callId.id ); } else { - DBUS_DEBUG("call %d: failed to send call", callId.id); - callback(Error{"failed to send call"}); + DBUS_DEBUG( "call %d: failed to send call", callId.id ); + callback( Error{"failed to send call"} ); } } -inline void displayDebugCallInfo(CallId callId, const std::string& funcName, const std::string& info, const std::string& interfaceName) +inline void displayDebugCallInfo( CallId callId, const std::string& funcName, const std::string& info, const std::string& interfaceName ) { - DBUS_DEBUG("call %d: %s iname = %s fname = %s", callId.id, info.c_str(), interfaceName.c_str(), funcName.c_str()); + DBUS_DEBUG( "call %d: %s iname = %s fname = %s", callId.id, info.c_str(), interfaceName.c_str(), funcName.c_str() ); } -inline void displayDebugCallInfoSignal(CallId callId, const std::string& funcName, const std::string& info, const std::string& interfaceName) +inline void displayDebugCallInfoSignal( CallId callId, const std::string& funcName, const std::string& info, const std::string& interfaceName ) { - DBUS_DEBUG("call %d: %s signal iname = %s fname = %s", callId.id, info.c_str(), interfaceName.c_str(), funcName.c_str()); + DBUS_DEBUG( "call %d: %s signal iname = %s fname = %s", callId.id, info.c_str(), interfaceName.c_str(), funcName.c_str() ); } -inline void displayDebugCallInfoProperty(CallId callId, const std::string& funcName, std::string info, const std::string& interfaceName, const std::string& propertyName) +inline void displayDebugCallInfoProperty( CallId callId, const std::string& funcName, std::string info, const std::string& interfaceName, + const std::string& propertyName ) { - DBUS_DEBUG("call %d: %s iname = %s pname = %s", callId.id, info.c_str(), interfaceName.c_str(), propertyName.c_str()); + DBUS_DEBUG( "call %d: %s iname = %s pname = %s", callId.id, info.c_str(), interfaceName.c_str(), propertyName.c_str() ); } using StringStorage = DBusWrapper::StringStorage; -template +template < typename A, typename... ARGS > struct EldbusArgGenerator_Helper { - static void add(std::vector>& r) + static void add( std::vector< std::pair >& r ) { - auto s = r.size(); - auto sig = signature::sig(); - bart_assert(!sig.empty()); - auto name = "p" + std::to_string(s + 1); - r.push_back({std::move(sig), std::move(name)}); - EldbusArgGenerator_Helper::add(r); + auto s = r.size(); + auto sig = signature< A >::sig(); + bart_assert( !sig.empty() ); + auto name = "p" + std::to_string( s + 1 ); + r.push_back({ std::move(sig), std::move(name) }); + EldbusArgGenerator_Helper::add( r ); } }; -template<> -struct EldbusArgGenerator_Helper +template <> +struct EldbusArgGenerator_Helper< void > { - static void add(std::vector>&) + static void add( std::vector< std::pair >& ) { } }; -template<> -struct EldbusArgGenerator_Helper, void> +template <> +struct EldbusArgGenerator_Helper< ValueOrError< void >, void > { - static void add(std::vector>&) + static void add( std::vector< std::pair >& ) { } }; -template<> -struct EldbusArgGenerator_Helper, void> +template <> +struct EldbusArgGenerator_Helper< ValueOrError<>, void > { - static void add(std::vector>&) + static void add( std::vector< std::pair >& ) { } }; -template -struct EldbusArgGenerator_Helper> +template < typename... ARGS > +struct EldbusArgGenerator_Helper< std::tuple< ARGS... > > { - static void add(std::vector>& r) + static void add( std::vector< std::pair >& r ) { - EldbusArgGenerator_Helper::add(r); + EldbusArgGenerator_Helper< ARGS..., void >::add( r ); } }; -template +template < typename RetType > struct dbus_interface_return_type_traits { - using type = ValueOrError; + using type = ValueOrError< RetType >; }; -template -struct dbus_interface_return_type_traits> +template < typename... ARGS > +struct dbus_interface_return_type_traits< ValueOrError< ARGS... > > { - using type = ValueOrError; + using type = ValueOrError< ARGS... >; }; -template +template < typename T > struct dbus_interface_traits; -template -struct dbus_interface_traits +template < typename RetType, typename... ARGS > +struct dbus_interface_traits< RetType( ARGS... ) > { - using Ret = typename dbus_interface_return_type_traits::type; - using SyncCB = std::function; - using AsyncCB = std::function, ARGS...)>; - using VEArgs = ValueOrError; + using Ret = typename dbus_interface_return_type_traits< RetType >::type; + using SyncCB = std::function< Ret( ARGS... ) >; + using AsyncCB = std::function< void( std::function< void( Ret ) >, ARGS... ) >; + using VEArgs = ValueOrError< ARGS... >; }; -template +template < typename T > struct EldbusArgGenerator_Args; -template -struct EldbusArgGenerator_Args +template < typename RetType, typename... ARGS > +struct EldbusArgGenerator_Args< RetType( ARGS... ) > { static std::string name() { - return signature_tuple_helper<0, sizeof...(ARGS), ARGS...>::name(); + return signature_tuple_helper< 0, sizeof...( ARGS ), ARGS... >::name(); } - static std::vector> get() + static std::vector< std::pair > get() { - std::vector> tmp; - EldbusArgGenerator_Helper::add(tmp); + std::vector< std::pair > tmp; + EldbusArgGenerator_Helper< ARGS..., void >::add( tmp ); return tmp; } }; -template +template < typename T > struct EldbusArgGenerator_ReturnType; -template -struct EldbusArgGenerator_ReturnType +template < typename RetType, typename... ARGS > +struct EldbusArgGenerator_ReturnType< RetType( ARGS... ) > { static std::string name() { - return signature::name(); + return signature< RetType >::name(); } - static std::vector> get() + static std::vector< std::pair > get( ) { - std::vector> tmp; - EldbusArgGenerator_Helper::add(tmp); + std::vector< std::pair > tmp; + EldbusArgGenerator_Helper< RetType, void >::add( tmp ); return tmp; } }; -template +template < typename T > struct EldbusArgGenerator_ReturnType; -template -struct EldbusArgGenerator_ReturnType +template < typename... ARGS > +struct EldbusArgGenerator_ReturnType< void( ARGS... ) > { static std::string name() { return ""; } - static std::vector> get() + static std::vector< std::pair > get( ) { return {}; } }; /// \endcond -} // namespace detail +} using ConnectionType = DBusWrapper::ConnectionType; @@ -2943,7 +2635,8 @@ public: * @param path_name object's path * @param interface_name interface name */ - DBusClient(std::string busName_, std::string pathName_, std::string interfaceName_, ConnectionType tp); + DBusClient( std::string busName_, std::string pathName_, std::string interfaceName_, + ConnectionType tp ); /** * @brief Connects to dbus using connection conn @@ -2953,7 +2646,8 @@ public: * @param interface_name interface name * @param conn connection object from getDBusConnectionByType call */ - DBusClient(std::string busName_, std::string pathName_, std::string interfaceName_, const DBusWrapper::ConnectionPtr& conn = {}); + DBusClient( std::string busName_, std::string pathName_, std::string interfaceName_, + const DBusWrapper::ConnectionPtr &conn = {} ); /** * @brief Destructor object. @@ -2962,12 +2656,12 @@ public: * All asynchronous calls will be cancelled, their callback's will be called * with failure message. */ - ~DBusClient() = default; - DBusClient(const DBusClient&) = delete; - DBusClient(DBusClient&&) = default; + ~DBusClient() = default; + DBusClient( const DBusClient& ) = delete; + DBusClient( DBusClient&& ) = default; - DBusClient& operator=(DBusClient&&) = default; - DBusClient& operator=(const DBusClient&) = delete; + DBusClient& operator=( DBusClient&& ) = default; + DBusClient& operator=( const DBusClient& ) = delete; /** * @brief bool operator @@ -2976,7 +2670,7 @@ public: */ explicit operator bool() const { - return bool(connectionState->proxy); + return bool( connectionState->proxy ); } /** @@ -2989,15 +2683,15 @@ public: * defines method, which takes two arguments (two floats) and return * single value of type int. */ - template + template < typename T > struct Method { /// \cond - using RetType = typename detail::dbus_interface_traits::Ret; - const detail::ConnectionState& connectionState; - std::string funcName; - std::string info; - std::shared_ptr connectionInfo; + using RetType = typename detail::dbus_interface_traits< T >::Ret; + const detail::ConnectionState &connectionState; + std::string funcName; + std::string info; + std::shared_ptr< ConnectionInfo > connectionInfo; /// \endcond /** @@ -3008,12 +2702,12 @@ public: * * @param args arguments to pass to the method */ - template - RetType call(const ARGS&... args) + template < typename... ARGS > + RetType call( const ARGS&... args ) { detail::CallId callId; - detail::displayDebugCallInfo(callId, funcName, info, connectionInfo->interfaceName); - return detail::call(callId, connectionState, false, funcName, args...); + detail::displayDebugCallInfo( callId, funcName, info, connectionInfo->interfaceName ); + return detail::call< RetType >( callId, connectionState, false, funcName, args... ); } /** @@ -3024,12 +2718,12 @@ public: * @param callback callback functor, which will be called with return value(s) or error message * @param args arguments to pass to the method */ - template - void asyncCall(std::function callback, const ARGS&... args) + template < typename... ARGS > + void asyncCall( std::function< void( RetType ) > callback, const ARGS&... args ) { detail::CallId callId; - detail::displayDebugCallInfo(callId, funcName, info, connectionInfo->interfaceName); - detail::asyncCall(callId, connectionState, false, funcName, std::move(callback), args...); + detail::displayDebugCallInfo( callId, funcName, info, connectionInfo->interfaceName ); + detail::asyncCall< RetType >( callId, connectionState, false, funcName, std::move( callback ), args... ); } }; @@ -3040,16 +2734,16 @@ public: * Note, that library automatically wraps both sent and received value into * DBUS's wrapper type. */ - template + template < typename T > struct Property { /// \cond - using RetType = typename detail::dbus_interface_return_type_traits::type; - using VariantRetType = typename detail::dbus_interface_return_type_traits>::type; - const detail::ConnectionState& connectionState; - std::string propName; - std::string info; - std::shared_ptr connectionInfo; + using RetType = typename detail::dbus_interface_return_type_traits< T >::type; + using VariantRetType = typename detail::dbus_interface_return_type_traits< EldbusVariant< T > >::type; + const detail::ConnectionState &connectionState; + std::string propName; + std::string info; + std::shared_ptr< ConnectionInfo > connectionInfo; /// \endcond /** @@ -3061,11 +2755,11 @@ public: RetType get() { detail::CallId callId; - detail::displayDebugCallInfoProperty(callId, "Get", info, connectionInfo->interfaceName, propName); - auto z = detail::call(callId, connectionState, true, "Get", connectionInfo->interfaceName, propName); - if(!z) + detail::displayDebugCallInfoProperty( callId, "Get", info, connectionInfo->interfaceName, propName ); + auto z = detail::call< VariantRetType >( callId, connectionState, true, "Get", connectionInfo->interfaceName, propName ); + if( !z ) return z.getError(); - return {std::get<0>(z.getValues()).value}; + return {std::get< 0 >( z.getValues() ).value}; } /** @@ -3075,17 +2769,17 @@ public: * * @param callback callback functor, which will be called with return value(s) or error message */ - void asyncGet(std::function callback) + void asyncGet( std::function< void( RetType ) > callback ) { detail::CallId callId; - detail::displayDebugCallInfoProperty(callId, "Get", info, connectionInfo->interfaceName, propName); - auto cc = [callback](VariantRetType reply) { - if(reply) - callback(std::move(std::get<0>(reply.getValues()).value)); + detail::displayDebugCallInfoProperty( callId, "Get", info, connectionInfo->interfaceName, propName ); + auto cc = [callback]( VariantRetType reply ) { + if( reply ) + callback( std::move( std::get< 0 >( reply.getValues() ).value ) ); else - callback(reply.getError()); + callback( reply.getError() ); }; - detail::asyncCall(callId, connectionState, true, "Get", std::move(cc), connectionInfo->interfaceName, propName); + detail::asyncCall< VariantRetType >( callId, connectionState, true, "Get", std::move( cc ), connectionInfo->interfaceName, propName ); } /** @@ -3094,12 +2788,12 @@ public: * The function returns ValueOrError object, with * possible error message. */ - ValueOrError set(const T& r) + ValueOrError< void > set( const T& r ) { detail::CallId callId; - detail::displayDebugCallInfoProperty(callId, "Set", info, connectionInfo->interfaceName, propName); - EldbusVariant variantValue{std::move(r)}; - return detail::call>(callId, connectionState, true, "Set", connectionInfo->interfaceName, propName, variantValue); + detail::displayDebugCallInfoProperty( callId, "Set", info, connectionInfo->interfaceName, propName ); + EldbusVariant< T > variantValue{std::move( r )}; + return detail::call< ValueOrError< void > >( callId, connectionState, true, "Set", connectionInfo->interfaceName, propName, variantValue ); } /** @@ -3109,12 +2803,12 @@ public: * * @param callback callback functor, which will be called with return value(s) or error message */ - void asyncSet(std::function)> callback, const T& r) + void asyncSet( std::function< void( ValueOrError< void > ) > callback, const T& r ) { detail::CallId callId; - detail::displayDebugCallInfoProperty(callId, "Set", info, connectionInfo->interfaceName, propName); - EldbusVariant variantValue{std::move(r)}; - detail::asyncCall>(callId, connectionState, true, "Set", std::move(callback), connectionInfo->interfaceName, propName, variantValue); + detail::displayDebugCallInfoProperty( callId, "Set", info, connectionInfo->interfaceName, propName ); + EldbusVariant< T > variantValue{std::move( r )}; + detail::asyncCall< ValueOrError< void > >( callId, connectionState, true, "Set", std::move( callback ), connectionInfo->interfaceName, propName, variantValue ); } }; @@ -3125,10 +2819,10 @@ public: * * @param propName property name to set and / or query */ - template - Property property(std::string propName) + template < typename PropertyType > + Property< PropertyType > property( std::string propName ) { - return Property{*connectionState, std::move(propName), info, connectionInfo}; + return Property< PropertyType >{*connectionState, std::move( propName ), info, connectionInfo}; } /** @@ -3138,10 +2832,10 @@ public: * * @param funcName function name to call */ - template - Method method(std::string funcName) + template < typename MethodType > + Method< MethodType > method( std::string funcName ) { - return Method{*connectionState, std::move(funcName), info, connectionInfo}; + return Method< MethodType >{*connectionState, std::move( funcName ), info, connectionInfo}; } /** @@ -3151,21 +2845,22 @@ public: * Note, that template type V must match expected type, otherwise undefined behavior will occur, * there's no check for this. */ - template - void addPropertyChangedEvent(std::string propertyName, std::function callback) + template < typename V > + void addPropertyChangedEvent( std::string propertyName, std::function< void( V ) > callback ) { detail::CallId callId; - detail::displayDebugCallInfoSignal(callId, propertyName, info, connectionInfo->interfaceName); - DBUS_DEBUG("call %d: adding property", callId.id); - auto& cI = this->connectionInfo; - DBUS_W->add_property_changed_event_listener_impl(connectionState->proxy, cI->interfaceName, propertyName, [callback](const _Eina_Value* newValue) { + detail::displayDebugCallInfoSignal( callId, propertyName, info, connectionInfo->interfaceName ); + DBUS_DEBUG( "call %d: adding property", callId.id ); + auto &cI = this->connectionInfo; + DBUS_W->add_property_changed_event_listener_impl(connectionState->proxy, cI->interfaceName, propertyName, + [callback]( const _Eina_Value *newValue ) { V val = 0; - if(!getFromEinaValue(newValue, &val)) + if( !getFromEinaValue( newValue, &val ) ) { - DBUS_DEBUG("unable to get property's value"); + DBUS_DEBUG( "unable to get property's value" ); return; } - callback(val); + callback( val ); }); } @@ -3179,45 +2874,46 @@ public: * @param signalName name of the signal to register * @param callback callback to call */ - template - void addSignal(std::string signalName, std::function callback) + template < typename SignalType > + void addSignal( std::string signalName, std::function< SignalType > callback ) { detail::CallId callId; - detail::displayDebugCallInfoSignal(callId, signalName, info, connectionInfo->interfaceName); - DBUS_W->eldbus_proxy_signal_handler_add_impl(connectionState->proxy, signalName, [callId, callback, signalName](const DBusWrapper::MessagePtr& msg) -> void { - std::string errname, aux; - if(DBUS_W->eldbus_message_error_get_impl(msg, errname, aux)) - { - DBUS_DEBUG("call %d: Eldbus error: %s %s", callId.id, errname.c_str(), aux.c_str()); - return; - } - DBUS_DEBUG("call %d: received signal with signature '%s'", callId.id, DBUS_W->eldbus_message_signature_get_impl(msg).c_str()); - using ParamsType = typename detail::dbus_interface_traits::VEArgs; - auto params = detail::unpackValues(callId, msg); - if(!params) - { - DBUS_DEBUG("call %d: failed: %s", callId.id, params.getError().message.c_str()); - return; - } - try - { - detail::apply(callback, params.getValues()); - } - catch(...) - { - DBUS_DEBUG("unhandled exception"); - bart_assert(0); - } - }); + detail::displayDebugCallInfoSignal( callId, signalName, info, connectionInfo->interfaceName ); + DBUS_W->eldbus_proxy_signal_handler_add_impl( connectionState->proxy, signalName, + [callId, callback, signalName]( const DBusWrapper::MessagePtr &msg ) -> void { + std::string errname, aux; + if( DBUS_W->eldbus_message_error_get_impl( msg, errname, aux ) ) + { + DBUS_DEBUG( "call %d: Eldbus error: %s %s", callId.id, errname.c_str(), aux.c_str() ); + return; + } + DBUS_DEBUG( "call %d: received signal with signature '%s'", callId.id, DBUS_W->eldbus_message_signature_get_impl( msg ).c_str() ); + using ParamsType = typename detail::dbus_interface_traits< SignalType >::VEArgs; + auto params = detail::unpackValues< ParamsType >( callId, msg ); + if( !params ) + { + DBUS_DEBUG( "call %d: failed: %s", callId.id, params.getError().message.c_str() ); + return; + } + try + { + detail::apply( callback, params.getValues() ); + } + catch( ... ) + { + DBUS_DEBUG( "unhandled exception" ); + bart_assert( 0 ); + } + }); } private: /// \cond - std::unique_ptr connectionState{new detail::ConnectionState}; - std::string info; - std::shared_ptr connectionInfo; + std::unique_ptr connectionState{ new detail::ConnectionState }; + std::string info; + std::shared_ptr< ConnectionInfo > connectionInfo; - static bool getFromEinaValue(const _Eina_Value* v, void* dst); + static bool getFromEinaValue(const _Eina_Value *v, void *dst); /// \endcond }; @@ -3231,10 +2927,10 @@ class DBusInterfaceDescription public: /// \cond - using MethodInfo = DBusWrapper::MethodInfo; - using SignalInfo = DBusWrapper::SignalInfo; + using MethodInfo = DBusWrapper::MethodInfo; + using SignalInfo = DBusWrapper::SignalInfo; using PropertyInfo = DBusWrapper::PropertyInfo; - using SignalId = DBusWrapper::SignalId; + using SignalId = DBusWrapper::SignalId; /// \endcond /** @@ -3242,7 +2938,7 @@ public: * * @param interfaceName name of the interface */ - DBusInterfaceDescription(std::string interfaceName); + DBusInterfaceDescription( std::string interfaceName ); /** * @brief adds new, synchronous method to the interface @@ -3262,19 +2958,21 @@ public: * @param memberName name of the method * @param callback functor, which will be called */ - template - void addMethod(const std::string& memberName, typename detail::dbus_interface_traits::SyncCB callback) + template < typename T > + void addMethod( const std::string& memberName, typename detail::dbus_interface_traits< T >::SyncCB callback ) { detail::CallId callId; - MethodInfo mi; - methods.push_back(std::move(mi)); - auto& z = methods.back(); - z.in = detail::EldbusArgGenerator_Args::get(); - z.out = detail::EldbusArgGenerator_ReturnType::get(); + MethodInfo mi; + methods.push_back( std::move( mi ) ); + auto& z = methods.back(); + z.in = detail::EldbusArgGenerator_Args< T >::get( ); + z.out = detail::EldbusArgGenerator_ReturnType< T >::get( ); z.memberName = memberName; - DBUS_DEBUG("call %d: method %s, in %s, out %s", callId.id, memberName.c_str(), detail::EldbusArgGenerator_Args::name().c_str(), detail::EldbusArgGenerator_ReturnType::name().c_str()); - z.callback = construct(callId, callback); - z.id = callId; + DBUS_DEBUG( "call %d: method %s, in %s, out %s", callId.id, memberName.c_str(), + detail::EldbusArgGenerator_Args< T >::name().c_str(), + detail::EldbusArgGenerator_ReturnType< T >::name().c_str() ); + z.callback = construct< T >( callId, callback ); + z.id = callId; } /** @@ -3293,74 +2991,75 @@ public: * @param getter functor, which will be called when property is being read * @param setter functor, which will be called when property is being set */ - template - void addProperty(const std::string& memberName, std::function()> getter, std::function(T)> setter) + template < typename T > + void addProperty( const std::string& memberName, std::function< ValueOrError< T >() > getter, std::function< ValueOrError< void >( T ) > setter ) { - properties.push_back({}); - auto& z = properties.back(); - z.memberName = memberName; - z.typeSignature = detail::signature::sig(); - if(getter) + properties.push_back( {} ); + auto& z = properties.back(); + z.memberName = memberName; + z.typeSignature = detail::signature< T >::sig(); + if( getter ) { detail::CallId getterId; z.getterId = getterId; - DBUS_DEBUG("call %d: property %s (get) type %s", getterId.id, memberName.c_str(), detail::signature::name().c_str()); - z.getCallback = [=](const DBusWrapper::MessagePtr& src, const DBusWrapper::MessageIterPtr& dst) -> std::string { + DBUS_DEBUG( "call %d: property %s (get) type %s", getterId.id, memberName.c_str(), detail::signature< T >::name().c_str() ); + z.getCallback = [=]( const DBusWrapper::MessagePtr &src, const DBusWrapper::MessageIterPtr &dst ) -> std::string { try { - auto v = detail::apply(getter, std::tuple<>{}); - if(v) + auto v = detail::apply( getter, std::tuple<>{} ); + if( v ) { - detail::signature::set(dst, std::get<0>(v.getValues())); - DBUS_DEBUG("call %d: success", getterId.id); + detail::signature< T >::set( dst, std::get< 0 >( v.getValues() ) ); + DBUS_DEBUG( "call %d: success", getterId.id ); return ""; } - DBUS_DEBUG("call %d: failed: %s", getterId.id, v.getError().message.c_str()); + DBUS_DEBUG( "call %d: failed: %s", getterId.id, v.getError().message.c_str() ); return v.getError().message; } - catch(std::exception& e) + catch( std::exception& e ) { - return std::string("unhandled exception (") + e.what() + ")"; + return std::string( "unhandled exception (" ) + e.what() + ")"; } - catch(...) + catch( ... ) { return "unhandled exception"; } }; } - if(setter) + if( setter ) { detail::CallId setterId; z.setterId = setterId; - DBUS_DEBUG("call %d: property %s (set) type %s", setterId.id, memberName.c_str(), detail::signature::name().c_str()); - z.setCallback = [=](const DBusWrapper::MessagePtr& src, const DBusWrapper::MessageIterPtr& src_iter) -> std::string { - std::tuple value; - auto src_signature = DBUS_W->eldbus_message_iter_signature_get_impl(src_iter); - if(detail::signature::get(src_iter, std::get<0>(value))) + DBUS_DEBUG( "call %d: property %s (set) type %s", setterId.id, memberName.c_str(), detail::signature< T >::name().c_str() ); + z.setCallback = [=]( const DBusWrapper::MessagePtr &src, const DBusWrapper::MessageIterPtr &src_iter ) -> std::string { + std::tuple< T > value; + auto src_signature = DBUS_W->eldbus_message_iter_signature_get_impl( src_iter ); + if( detail::signature< T >::get( src_iter, std::get< 0 >( value ) ) ) { try { - auto v = detail::apply(setter, std::move(value)); - if(v) + auto v = detail::apply( setter, std::move( value ) ); + if( v ) { - DBUS_DEBUG("call %d: success", setterId.id); + DBUS_DEBUG( "call %d: success", setterId.id ); return ""; } - DBUS_DEBUG("call %d: failed: %s", setterId.id, v.getError().message.c_str()); + DBUS_DEBUG( "call %d: failed: %s", setterId.id, v.getError().message.c_str() ); return v.getError().message; } - catch(std::exception& e) + catch( std::exception& e ) { - return std::string("unhandled exception (") + e.what() + ")"; + return std::string( "unhandled exception (" ) + e.what() + ")"; } - catch(...) + catch( ... ) { return "unhandled exception"; } } - DBUS_DEBUG("call %d: failed to unpack values, got signature '%s', expected '%s'", setterId.id, src_signature.c_str(), detail::signature::sig().c_str()); - return "call " + std::to_string(setterId.id) + ": failed to unpack values, got signature '" + - src_signature + "', expected '" + detail::signature::sig() + "'"; + DBUS_DEBUG( "call %d: failed to unpack values, got signature '%s', expected '%s'", setterId.id, + src_signature.c_str(), detail::signature< T >::sig().c_str() ); + return "call " + std::to_string( setterId.id ) + ": failed to unpack values, got signature '" + + src_signature + "', expected '" + detail::signature< T >::sig() + "'"; }; } } @@ -3372,71 +3071,71 @@ public: * * @param memberName name of the method */ - template - SignalId addSignal(const std::string& memberName) + template < typename... ARGS > + SignalId addSignal( const std::string& memberName ) { detail::CallId callId; - signals.push_back({}); - auto& z = signals.back(); + signals.push_back( {} ); + auto& z = signals.back(); z.memberName = memberName; - z.args = detail::EldbusArgGenerator_Args::get(DBUS_W->Strings); - z.id = callId; - DBUS_DEBUG("call %d: signal %s", callId.id, memberName.c_str()); + z.args = detail::EldbusArgGenerator_Args< void( ARGS... ) >::get( DBUS_W->Strings ); + z.id = callId; + DBUS_DEBUG( "call %d: signal %s", callId.id, memberName.c_str() ); return SignalId{callId}; } private: /// \cond - std::vector methods; - std::vector properties; - std::vector signals; - std::string interfaceName; - - template - std::function construct(detail::CallId callId, - typename detail::dbus_interface_traits::SyncCB callback) - { - using VEArgs = typename detail::dbus_interface_traits::VEArgs; - return [=](const DBusWrapper::MessagePtr& msg) -> DBusWrapper::MessagePtr { - DBUS_DEBUG("call %d: entering", callId.id); - DBusWrapper::MessagePtr ret = {}; - auto args = detail::unpackValues(callId, msg); - if(args) + std::vector< MethodInfo > methods; + std::vector< PropertyInfo > properties; + std::vector< SignalInfo > signals; + std::string interfaceName; + + template < typename T > + std::function< DBusWrapper::MessagePtr( const DBusWrapper::MessagePtr &msg ) > construct( detail::CallId callId, + typename detail::dbus_interface_traits< T >::SyncCB callback ) + { + using VEArgs = typename detail::dbus_interface_traits< T >::VEArgs; + return [=]( const DBusWrapper::MessagePtr &msg ) -> DBusWrapper::MessagePtr { + DBUS_DEBUG( "call %d: entering", callId.id ); + DBusWrapper::MessagePtr ret = {}; + auto args = detail::unpackValues< VEArgs >( callId, msg ); + if( args ) { try { - auto v = detail::apply(callback, std::move(args.getValues())); - if(v) + auto v = detail::apply( callback, std::move( args.getValues() ) ); + if( v ) { - DBUS_DEBUG("call %d: success", callId.id); - ret = DBUS_W->eldbus_message_method_return_new_impl(msg); - detail::packValues(callId, ret, v); + DBUS_DEBUG( "call %d: success", callId.id ); + ret = DBUS_W->eldbus_message_method_return_new_impl( msg ); + detail::packValues( callId, ret, v ); } else { - DBUS_DEBUG("call %d: failed: %s", callId.id, v.getError().message.c_str()); - ret = DBUS_W->eldbus_message_error_new_impl(msg, "org.freedesktop.DBus.Error.Failed", v.getError().message); + DBUS_DEBUG( "call %d: failed: %s", callId.id, v.getError().message.c_str() ); + ret = DBUS_W->eldbus_message_error_new_impl( msg, "org.freedesktop.DBus.Error.Failed", v.getError().message ); } } - catch(std::exception& e) + catch( std::exception& e ) { - auto txt = std::string("unhandled exception (") + e.what() + ")"; - DBUS_DEBUG("call %d: failed: %s", callId.id, txt.c_str()); - ret = DBUS_W->eldbus_message_error_new_impl(msg, "org.freedesktop.DBus.Error.Failed", txt); + auto txt = std::string( "unhandled exception (" ) + e.what() + ")"; + DBUS_DEBUG( "call %d: failed: %s", callId.id, txt.c_str() ); + ret = DBUS_W->eldbus_message_error_new_impl( msg, "org.freedesktop.DBus.Error.Failed", txt ); } - catch(...) + catch( ... ) { - DBUS_DEBUG("call %d: failed: %s", callId.id, "unhandled exception"); - ret = DBUS_W->eldbus_message_error_new_impl(msg, "org.freedesktop.DBus.Error.Failed", "unhandled exception"); + DBUS_DEBUG( "call %d: failed: %s", callId.id, "unhandled exception" ); + ret = DBUS_W->eldbus_message_error_new_impl( msg, "org.freedesktop.DBus.Error.Failed", "unhandled exception" ); } } else { std::ostringstream err; - err << "expected signature '" << detail::signature::sig() << "', got '" << DBUS_W->eldbus_message_signature_get_impl(msg) << "'"; + err << "expected signature '" << detail::signature< VEArgs >::sig() << "', got '" << DBUS_W->eldbus_message_signature_get_impl( msg ) << "'"; auto str = err.str(); - DBUS_DEBUG("call %d: failed: %s", callId.id, str.c_str()); - ret = DBUS_W->eldbus_message_error_new_impl(msg, "org.freedesktop.DBus.Error.InvalidArgs", str); + DBUS_DEBUG( "call %d: failed: %s", callId.id, str.c_str() ); + ret = DBUS_W->eldbus_message_error_new_impl( msg, "org.freedesktop.DBus.Error.InvalidArgs", str ); } return ret; }; @@ -3462,12 +3161,12 @@ public: /** * @brief Constructs dbus server on either system or user dbus connection. */ - DBusServer(ConnectionType tp); + DBusServer( ConnectionType tp ); /** * @brief Constructs dbus server on connection from getDBusConnectionByType */ - DBusServer(const DBusWrapper::ConnectionPtr& conn); + DBusServer( const DBusWrapper::ConnectionPtr &conn ); /** * @brief Destructor @@ -3477,11 +3176,11 @@ public: */ ~DBusServer() = default; - DBusServer(const DBusServer&) = delete; - DBusServer(DBusServer&&) = default; + DBusServer( const DBusServer& ) = delete; + DBusServer( DBusServer&& ) = default; - DBusServer& operator=(DBusServer&&) = default; - DBusServer& operator=(const DBusServer&) = delete; + DBusServer& operator=( DBusServer&& ) = default; + DBusServer& operator=( const DBusServer& ) = delete; /** * @brief Registers interface on given path name @@ -3490,7 +3189,7 @@ public: * @param dscr * @param fallback */ - void addInterface(const std::string& pathName, DBusInterfaceDescription& dscr, bool fallback = false); + void addInterface( const std::string& pathName, DBusInterfaceDescription& dscr, bool fallback = false ); /** * @brief Gets bus name of the current connection (must be connected) @@ -3512,13 +3211,14 @@ public: * @param signal identifier of the signal * @param args values to emit */ - template - void emit2(const std::string& path, const std::string& interfaceName, const std::string& signalName, const ARGS&... args) + template < typename... ARGS > + void emit2( const std::string& path, const std::string& interfaceName, + const std::string& signalName, const ARGS&... args ) { - auto msg = DBUS_W->eldbus_message_signal_new_impl(path, interfaceName, signalName); + auto msg = DBUS_W->eldbus_message_signal_new_impl( path, interfaceName, signalName ); detail::CallId id; - detail::packValues(id, msg, args...); - DBUS_W->eldbus_connection_send_impl(connection, msg); + detail::packValues( id, msg, args... ); + DBUS_W->eldbus_connection_send_impl( connection, msg ); } /** @@ -3542,10 +3242,7 @@ public: * }; * \endcode */ - static std::string getCurrentObjectPath() - { - return currentObjectPath; - } + static std::string getCurrentObjectPath() { return currentObjectPath; } /** * @brief Returns current connection object, when handling call to property / method @@ -3568,73 +3265,68 @@ public: * }; * \endcode */ - static const DBusWrapper::ConnectionPtr& getCurrentConnection() - { - return currentConnection; - } + static const DBusWrapper::ConnectionPtr &getCurrentConnection() { return currentConnection; } /// \cond class CurrentObjectSetter { public: - CurrentObjectSetter(DBusWrapper::ConnectionPtr con, std::string path) + CurrentObjectSetter( DBusWrapper::ConnectionPtr con, std::string path ) { currentObjectPath = std::move(path); - currentConnection = std::move(con); + currentConnection = std::move( con ); } ~CurrentObjectSetter() { currentObjectPath = ""; currentConnection = {}; } - CurrentObjectSetter(const CurrentObjectSetter&) = delete; - CurrentObjectSetter(CurrentObjectSetter&&) = delete; - void operator=(const CurrentObjectSetter&) = delete; - void operator=(CurrentObjectSetter&&) = delete; + CurrentObjectSetter( const CurrentObjectSetter& ) = delete; + CurrentObjectSetter( CurrentObjectSetter&& ) = delete; + void operator=( const CurrentObjectSetter& ) = delete; + void operator=( CurrentObjectSetter&& ) = delete; }; /// \endcond private: /// \cond DBusWrapper::ConnectionPtr connection; - struct DestructorObject - { + struct DestructorObject { std::vector> destructors; - ~DestructorObject() - { - for(auto& a : destructors) a(); + ~DestructorObject() { + for(auto &a : destructors) a(); } }; - std::unique_ptr destructorObject{new DestructorObject()}; - static thread_local std::string currentObjectPath; + std::unique_ptr destructorObject { new DestructorObject() }; + static thread_local std::string currentObjectPath; static thread_local DBusWrapper::ConnectionPtr currentConnection; /// \endcond }; /// \cond -DBusWrapper::ConnectionPtr getDBusConnectionByType(ConnectionType tp); -DBusWrapper::ConnectionPtr getDBusConnectionByName(const std::string& name); -std::string getConnectionName(const DBusWrapper::ConnectionPtr&); +DBusWrapper::ConnectionPtr getDBusConnectionByType( ConnectionType tp ); +DBusWrapper::ConnectionPtr getDBusConnectionByName( const std::string& name ); +std::string getConnectionName( const DBusWrapper::ConnectionPtr& ); /// \endcond -} // namespace DBus +} /// \cond namespace std { -template -inline auto get(DBus::ValueOrError& v) -> decltype(std::get(v.getValues()))& +template < size_t INDEX, typename... ARGS > +inline auto get( DBus::ValueOrError< ARGS... >& v ) -> decltype( std::get< INDEX >( v.getValues() ) ) & { - return std::get(v.getValues()); + return std::get< INDEX >( v.getValues() ); } -template -inline auto get(const DBus::ValueOrError& v) -> decltype(std::get(v.getValues())) +template < size_t INDEX, typename... ARGS > +inline auto get( const DBus::ValueOrError< ARGS... >& v ) -> decltype( std::get< INDEX >( v.getValues() ) ) { - return std::get(v.getValues()); + return std::get< INDEX >( v.getValues() ); +} } -} // namespace std /// \endcond #endif // DALI_INTERNAL_ACCESSIBILITY_BRIDGE_DBUS_H diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp index 44b66c950b..ca03384207 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp @@ -1955,82 +1955,5 @@ int UtcDaliEmitAccessibilityStateChanged(void) DALI_TEST_CHECK(Dali::Accessibility::TestStateChangedResult("showing", 1)); DALI_TEST_CHECK(Accessibility::Bridge::GetCurrentBridge()->GetDefaultLabel(rootAccessible) != buttonAccessible); - Dali::Accessibility::TestEnableSC(false); - - END_TEST; -} - -int UtcDaliAccessibleRemovalOnActorDestoyed(void) -{ - ToolkitTestApplication application; - - Dali::Accessibility::TestEnableSC(true); - - auto layer = Layer::New(); - - auto control = Control::New(); - - std::weak_ptr layerAccessible = Accessibility::Accessible::GetOwningPtr(layer); // AdaptorAccessible - std::weak_ptr controlAccessible = Accessibility::Accessible::GetOwningPtr(control); // ControlAccessible - DALI_TEST_CHECK(layerAccessible.lock()); - DALI_TEST_CHECK(controlAccessible.lock()); - - // Test Getting already added accessible from the map - DALI_TEST_CHECK(!layerAccessible.expired()); - DALI_TEST_CHECK(!controlAccessible.expired()); - DALI_TEST_CHECK(Accessibility::Accessible::Get(layer) == layerAccessible.lock().get()); - DALI_TEST_CHECK(Accessibility::Accessible::Get(control) == controlAccessible.lock().get()); - - // Test ControlAccessible Removal - control.Reset(); - DALI_TEST_CHECK(controlAccessible.expired()); - DALI_TEST_CHECK(Accessibility::Accessible::Get(control) == nullptr); - - // Test AdaptorAccessible Removal - layer.Reset(); - DALI_TEST_CHECK(layerAccessible.expired()); - DALI_TEST_CHECK(Accessibility::Accessible::Get(layer) == nullptr); - - Dali::Accessibility::TestEnableSC(false); - - END_TEST; -} - -int UtcDaliIncludeHidden(void) -{ - ToolkitTestApplication application; - - Dali::Accessibility::TestEnableSC(true); - - auto root = Layer::New(); - auto control = Control::New(); - auto hiddenControl = Control::New(); - hiddenControl.SetProperty(DevelControl::Property::ACCESSIBILITY_HIDDEN, true); - - application.GetScene().Add(root); - root.Add(control); - root.Add(hiddenControl); - - auto appAccessible = Accessibility::Bridge::GetCurrentBridge()->GetApplication(); - DALI_TEST_CHECK(appAccessible); - - auto rootAccessible = Accessibility::Accessible::Get(root); - DALI_TEST_CHECK(rootAccessible); - - auto appAddress = appAccessible->GetAddress(); - - DALI_TEST_CHECK(!TestGetIncludeHidden(appAddress)); - DALI_TEST_CHECK(rootAccessible->GetChildCount() == 1); // hidden control is excluded by default - - TestSetIncludeHidden(appAddress, true); - DALI_TEST_CHECK(TestGetIncludeHidden(appAddress)); - DALI_TEST_CHECK(rootAccessible->GetChildCount() == 2); // hidden control is included after setting includeHidden to true - - TestSetIncludeHidden(appAddress, false); - DALI_TEST_CHECK(!TestGetIncludeHidden(appAddress)); - DALI_TEST_CHECK(rootAccessible->GetChildCount() == 1); // hidden control is excluded after setting includeHidden to false - - Dali::Accessibility::TestEnableSC(false); - END_TEST; } diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp index 3d2d040e1d..07b1013af9 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.cpp @@ -52,6 +52,7 @@ ToolkitTestApplication::ToolkitTestApplication(size_t surfaceWidth, size_t surfa // Core needs to be initialized next before we start the adaptor InitializeCore(); + Accessibility::Accessible::SetObjectRegistry(mCore->GetObjectRegistry()); // This will also emit the window created signals AdaptorImpl::GetImpl(*mAdaptor).Start(*mMainWindow); diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp index 07418d437a..d80f3d95c4 100644 --- a/dali-toolkit/devel-api/controls/control-devel.cpp +++ b/dali-toolkit/devel-api/controls/control-devel.cpp @@ -39,14 +39,14 @@ Dali::Toolkit::Internal::Control::Impl& GetControlImplementation(Dali::Toolkit:: Dali::Toolkit::DevelControl::ControlAccessible* GetControlAccessible(Dali::Toolkit::Control control) { - auto controlAccessible = GetControlImplementation(control).GetAccessibleObject(); + auto* controlAccessible = GetControlImplementation(control).GetAccessibleObject(); if(DALI_UNLIKELY(!controlAccessible)) { DALI_LOG_ERROR("Accessibility API used on Control without an Accessible"); } - return controlAccessible.get(); + return controlAccessible; } } // unnamed namespace @@ -294,7 +294,7 @@ Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Toolkit::C bool ClearAccessibilityHighlight(Toolkit::Control control) { - auto controlAccessible = GetControlImplementation(control).GetAccessibleObject(); + auto* controlAccessible = GetControlAccessible(control); if(DALI_LIKELY(controlAccessible)) { return controlAccessible->ClearHighlight(); @@ -304,7 +304,7 @@ bool ClearAccessibilityHighlight(Toolkit::Control control) bool GrabAccessibilityHighlight(Toolkit::Control control) { - auto controlAccessible = GetControlImplementation(control).GetAccessibleObject(); + auto* controlAccessible = GetControlAccessible(control); if(DALI_LIKELY(controlAccessible)) { return controlAccessible->GrabHighlight(); @@ -314,7 +314,7 @@ bool GrabAccessibilityHighlight(Toolkit::Control control) Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control) { - auto controlAccessible = GetControlImplementation(control).GetAccessibleObject(); + auto* controlAccessible = GetControlAccessible(control); if(DALI_LIKELY(controlAccessible)) { return controlAccessible->GetStates(); @@ -324,7 +324,7 @@ Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control) void NotifyAccessibilityStateChange(Toolkit::Control control, Dali::Accessibility::States states, bool recurse) { - auto controlAccessible = GetControlImplementation(control).GetAccessibleObject(); + auto* controlAccessible = GetControlAccessible(control); if(DALI_LIKELY(controlAccessible)) { controlAccessible->NotifyAccessibilityStateChange(std::move(states), recurse); @@ -348,7 +348,7 @@ bool IsCreateAccessibleEnabled(Toolkit::Control control) void EmitAccessibilityStateChanged(Dali::Actor actor, Accessibility::State state, int newValue) { - auto accessible = Accessibility::Accessible::GetOwningPtr(actor); + auto accessible = Accessibility::Accessible::Get(actor); if(DALI_LIKELY(accessible)) { auto control = Toolkit::Control::DownCast(actor); diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp index 89a0ee0908..574ef08081 100644 --- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -101,7 +101,7 @@ void CheckBoxButton::OnStateChange(State newState) // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used if((Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE)) { - auto accessible = GetAccessibleObject(); + auto* accessible = GetAccessibleObject(); if(DALI_LIKELY(accessible)) { accessible->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0); diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index 00b45462f4..dea0ee0393 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -209,7 +209,7 @@ void PushButton::OnStateChange(State newState) // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used if((Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE)) { - auto accessible = GetAccessibleObject(); + auto* accessible = GetAccessibleObject(); if(DALI_LIKELY(accessible)) { accessible->EmitStateChanged(Dali::Accessibility::State::PRESSED, newState == SELECTED_STATE ? 1 : 0, 0); diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp index 1aef5f0b9b..9aace1a7d7 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.cpp @@ -109,7 +109,7 @@ void RadioButton::OnStateChange(State newState) // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used if((Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE)) { - auto accessible = GetAccessibleObject(); + auto* accessible = GetAccessibleObject(); if(DALI_LIKELY(accessible)) { accessible->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0); diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp index 3c08e30499..de6cbceb4f 100644 --- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.cpp @@ -404,7 +404,7 @@ void ToggleButton::OnStateChange(State newState) // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used if((Self() == Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor()) && (newState == SELECTED_STATE || newState == UNSELECTED_STATE)) { - auto accessible = GetAccessibleObject(); + auto* accessible = GetAccessibleObject(); if(DALI_LIKELY(accessible)) { accessible->EmitStateChanged(Dali::Accessibility::State::CHECKED, mCurrentToggleIndex ? 1 : 0, 0); diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index 32e5814928..ecb16e25b2 100644 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -507,6 +507,19 @@ static bool IsShowingGeometryOnScreen(Dali::Rect<> rect) return rect.width > 0 && rect.height > 0; } +Dali::Accessibility::Accessible* ExternalAccessibleGetter(Dali::Actor actor) +{ + auto control = Toolkit::Control::DownCast(actor); + if(!control) + { + return nullptr; + } + + auto& controlImpl = Toolkit::Internal::GetImplementation(control); + + return controlImpl.GetAccessibleObject(); +} + } // unnamed namespace // clang-format off @@ -578,21 +591,7 @@ Control::Impl::Impl(Control& controlImpl) mNeedToEmitResourceReady(false), mDispatchKeyEvents(true) { - Accessibility::Accessible::RegisterExternalAccessibleGetter([](Dali::Actor actor) -> std::pair, bool> { - auto control = Toolkit::Control::DownCast(actor); - if(!control) - { - return {nullptr, true}; - } - - auto& controlImpl = Toolkit::Internal::GetImplementation(control); - if(controlImpl.mImpl->IsCreateAccessibleEnabled()) - { - return {std::shared_ptr(controlImpl.CreateAccessibleObject()), true}; - } - - return {nullptr, false}; - }); + Dali::Accessibility::Accessible::RegisterExternalAccessibleGetter(&ExternalAccessibleGetter); mAccessibilityProps.states[DevelControl::AccessibilityState::ENABLED] = true; } @@ -635,7 +634,7 @@ void Control::Impl::CheckHighlightedObjectGeometry() { auto lastPosition = accessible->GetLastPosition(); auto accessibleRect = accessible->GetExtents(Dali::Accessibility::CoordinateType::WINDOW); - auto rect = GetShowingGeometry(accessibleRect, accessible.get()); + auto rect = GetShowingGeometry(accessibleRect, accessible); switch(mAccessibilityLastScreenRelativeMoveType) { @@ -1477,7 +1476,7 @@ void Control::Impl::SetProperty(BaseObject* object, Property::Index index, const { controlImpl.mImpl->mAccessibilityProps.isHidden = hidden; - auto accessible = controlImpl.GetAccessibleObject(); + auto* accessible = controlImpl.GetAccessibleObject(); if(DALI_LIKELY(accessible)) { auto* parent = dynamic_cast(accessible->GetParent()); @@ -2179,14 +2178,19 @@ void Control::Impl::OnIdleCallback() mIdleCallback = nullptr; } -std::shared_ptr Control::Impl::GetAccessibleObject() +Toolkit::DevelControl::ControlAccessible* Control::Impl::GetAccessibleObject() { - return std::dynamic_pointer_cast(Accessibility::Accessible::GetOwningPtr(mControlImpl.Self())); + if(mAccessibleCreatable && !mAccessibleObject) + { + mAccessibleObject.reset(mControlImpl.CreateAccessibleObject()); + } + + return mAccessibleObject.get(); } bool Control::Impl::IsAccessibleCreated() const { - return !!Accessibility::Bridge::GetCurrentBridge()->GetAccessible(mControlImpl.Self()); + return !!mAccessibleObject; } void Control::Impl::EnableCreateAccessible(bool enable) diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h index c80d7e0d61..edbd0ddbab 100644 --- a/dali-toolkit/internal/controls/control/control-data-impl.h +++ b/dali-toolkit/internal/controls/control/control-data-impl.h @@ -413,7 +413,7 @@ public: /** * @copydoc Dali::Toolkit::Internal::Control::GetAccessibleObject() */ - std::shared_ptr GetAccessibleObject(); + Toolkit::DevelControl::ControlAccessible* GetAccessibleObject(); /** * @copydoc Dali::Toolkit::DevelControl::IsAccessibleCreated() @@ -566,7 +566,8 @@ public: bool isModal{false}; } mAccessibilityProps; - bool mAccessibleCreatable = true; + bool mAccessibleCreatable = true; + std::unique_ptr mAccessibleObject; // Gesture Detection PinchGestureDetector mPinchGestureDetector; diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index c4a6dbabd4..60aaa289a1 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,8 +37,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -173,7 +173,7 @@ void Control::SetResourceReady(bool relayoutRequest) controlDataImpl.ResourceReady(relayoutRequest); } -std::shared_ptr Control::GetAccessibleObject() +Toolkit::DevelControl::ControlAccessible* Control::GetAccessibleObject() { return mImpl->GetAccessibleObject(); } @@ -513,7 +513,7 @@ void Control::EmitKeyInputFocusSignal(bool focusGained) auto parent = accessible->GetParent(); if(parent && !accessible->GetStates()[Dali::Accessibility::State::MANAGES_DESCENDANTS]) { - parent->EmitActiveDescendantChanged(accessible.get()); + parent->EmitActiveDescendantChanged(accessible); } } } @@ -596,7 +596,7 @@ void Control::OnPropertySet(Property::Index index, const Property::Value& proper } case Actor::Property::VISIBLE: { - auto accessible = GetAccessibleObject(); + auto* accessible = GetAccessibleObject(); if(DALI_LIKELY(accessible)) { accessible->EmitVisible(Self().GetProperty(Actor::Property::VISIBLE)); @@ -606,7 +606,7 @@ void Control::OnPropertySet(Property::Index index, const Property::Value& proper case DevelActor::Property::USER_INTERACTION_ENABLED: { const bool enabled = propertyValue.Get(); - if(!enabled && Self() == Dali::Toolkit::KeyboardFocusManager::Get().GetCurrentFocusActor()) + if (!enabled && Self() == Dali::Toolkit::KeyboardFocusManager::Get().GetCurrentFocusActor()) { Dali::Toolkit::KeyboardFocusManager::Get().ClearFocus(); } @@ -750,7 +750,8 @@ void Control::SignalDisconnected(SlotObserver* slotObserver, CallbackBase* callb mImpl->SignalDisconnected(slotObserver, callback); } -void Control::MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali::Property::Map& destinationPropertyMap, Dali::Toolkit::Control source, Dali::Toolkit::Control destination, Dali::Property::Index visualIndex) +void Control::MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali::Property::Map& destinationPropertyMap, + Dali::Toolkit::Control source, Dali::Toolkit::Control destination, Dali::Property::Index visualIndex) { sourcePropertyMap.Clear(); destinationPropertyMap.Clear(); @@ -769,7 +770,8 @@ void Control::MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali: sourceVisual.CreatePropertyMap(sourceMap); destinationVisual.CreatePropertyMap(destinationMap); - static auto findValueVector4 = [](const Property::Map& map, Property::Index index, const Vector4& defaultValue = Vector4()) -> Vector4 { + static auto findValueVector4 = [](const Property::Map& map, Property::Index index, const Vector4& defaultValue = Vector4()) -> Vector4 + { Property::Value* propertyValue = map.Find(index); if(propertyValue) { @@ -778,7 +780,8 @@ void Control::MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali: return defaultValue; }; - static auto findValueFloat = [](const Property::Map& map, Property::Index index, const float& defaultValue = 0.0f) -> float { + static auto findValueFloat = [](const Property::Map& map, Property::Index index, const float& defaultValue = 0.0f) -> float + { Property::Value* propertyValue = map.Find(index); if(propertyValue) { diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 9e0439e876..b7d3c2ef68 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_CONTROL_IMPL_H /* - * Copyright (c) 2024 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,6 +51,7 @@ class ControlAccessible; namespace Internal { + /** * @brief This is the internal base class for all controls. * @@ -131,7 +132,7 @@ public: * * @see CreateAccessibleObject() */ - std::shared_ptr GetAccessibleObject(); + Toolkit::DevelControl::ControlAccessible* GetAccessibleObject(); // Gesture Detection @@ -277,6 +278,7 @@ public: DALI_INTERNAL void KeyboardEnter(); /// @endcond + // Signals /** @@ -405,6 +407,7 @@ protected: // From CustomActorImpl void OnLayoutNegotiated(float size, Dimension::Type dimension) override; public: // Helpers for deriving classes + /** * @brief Flags for the constructor. * @SINCE_1_0.0 @@ -686,7 +689,8 @@ public: // API for derived classes to override * @param[in] destination Destination control of the animation. * @param[in] visualIndex Property::Index to make animation. */ - void MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali::Property::Map& destinationPropertyMap, Dali::Toolkit::Control source, Dali::Toolkit::Control destination, Dali::Property::Index visualIndex); + void MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali::Property::Map& destinationPropertyMap, + Dali::Toolkit::Control source, Dali::Toolkit::Control destination, Dali::Property::Index visualIndex); /** * @brief Retrieves source and destination visual properties for the Transition of this Control.