diff options
author | Shinwoo Kim <cinoo.kim@samsung.com> | 2021-10-15 15:15:30 +0900 |
---|---|---|
committer | Shinwoo Kim <cinoo.kim@samsung.com> | 2021-10-15 15:34:03 +0900 |
commit | 504dba81a2c26909071836286462126975039641 (patch) | |
tree | 8160d295f57d116256228a334dea82fb5bcd9846 /dali/internal/accessibility/bridge | |
parent | ab3864399b34365c352e9f8531c9d4c990d8e32f (diff) | |
download | dali-adaptor-504dba81a2c26909071836286462126975039641.tar.gz dali-adaptor-504dba81a2c26909071836286462126975039641.tar.bz2 dali-adaptor-504dba81a2c26909071836286462126975039641.zip |
[ATSPI] Refactor - Remove duplicate lines
For clean code.
Change-Id: I19615fb3b6f2713b866925957ea9f716dcec5167
Diffstat (limited to 'dali/internal/accessibility/bridge')
-rw-r--r-- | dali/internal/accessibility/bridge/bridge-object.cpp | 49 |
1 files changed, 17 insertions, 32 deletions
diff --git a/dali/internal/accessibility/bridge/bridge-object.cpp b/dali/internal/accessibility/bridge/bridge-object.cpp index 02812c82e..eedc5f7a8 100644 --- a/dali/internal/accessibility/bridge/bridge-object.cpp +++ b/dali/internal/accessibility/bridge/bridge-object.cpp @@ -24,6 +24,15 @@ using namespace Dali::Accessibility; +namespace +{ +inline std::string GetAccessiblePath(Accessible* accessible) +{ + auto address = accessible->GetAddress(); + return address ? ATSPI_PREFIX_PATH + address.GetPath() : ATSPI_NULL_PATH; +} +} // namespace + BridgeObject::BridgeObject() { } @@ -40,11 +49,8 @@ void BridgeObject::EmitActiveDescendantChanged(Accessible* obj, Accessible* chil if(!IsUp()) return; auto index = child->GetIndexInParent(); - auto addr = obj->GetAddress(); - std::string path = addr ? ATSPI_PREFIX_PATH + addr.GetPath() : ATSPI_NULL_PATH; - mDbusServer.emit2<std::string, int, int, DBus::EldbusVariant<Address>, Address>( - path, + GetAccessiblePath(obj), AtspiDbusInterfaceEventObject, "ActiveDescendantChanged", "", @@ -90,11 +96,8 @@ void BridgeObject::Emit(Accessible* obj, Dali::Accessibility::ObjectPropertyChan if(name) { - auto addr = obj->GetAddress(); - std::string path = addr ? ATSPI_PREFIX_PATH + addr.GetPath() : ATSPI_NULL_PATH; - mDbusServer.emit2<std::string, int, int, DBus::EldbusVariant<int>, Address>( - path, + GetAccessiblePath(obj), AtspiDbusInterfaceEventObject, "PropertyChange", name, @@ -211,11 +214,8 @@ void BridgeObject::Emit(Accessible* obj, WindowEvent event, unsigned int detail) if(name) { - auto addr = obj->GetAddress(); - std::string path = addr ? ATSPI_PREFIX_PATH + addr.GetPath() : ATSPI_NULL_PATH; - mDbusServer.emit2<std::string, int, int, DBus::EldbusVariant<int>, Address>( - path, + GetAccessiblePath(obj), AtspiDbusInterfaceEventWindow, name, "", @@ -471,11 +471,8 @@ void BridgeObject::EmitStateChanged(Accessible* obj, State state, int newValue, if(stateName) { - auto addr = obj->GetAddress(); - std::string path = addr ? ATSPI_PREFIX_PATH + addr.GetPath() : ATSPI_NULL_PATH; - mDbusServer.emit2<std::string, int, int, DBus::EldbusVariant<int>, Address>( - path, + GetAccessiblePath(obj), AtspiDbusInterfaceEventObject, "StateChanged", stateName, @@ -490,15 +487,12 @@ void BridgeObject::EmitBoundsChanged(Accessible* obj, Dali::Rect<> rect) { if(!IsBoundsChangedEventAllowed) return; - auto addr = obj->GetAddress(); - std::string path = addr ? ATSPI_PREFIX_PATH + addr.GetPath() : ATSPI_NULL_PATH; - DBus::EldbusVariant<std::tuple<int32_t, int32_t, int32_t, int32_t> > tmp{ std::tuple<int32_t, int32_t, int32_t, int32_t>{rect.x, rect.y, rect.width, rect.height}}; AddFilteredEvent(FilteredEvents::BOUNDS_CHANGED, obj, 1.0f, [=]() { mDbusServer.emit2<std::string, int, int, DBus::EldbusVariant<std::tuple<int32_t, int32_t, int32_t, int32_t> >, Address>( - path, + GetAccessiblePath(obj), AtspiDbusInterfaceEventObject, "BoundsChanged", "", @@ -511,11 +505,8 @@ void BridgeObject::EmitBoundsChanged(Accessible* obj, Dali::Rect<> rect) void BridgeObject::EmitCursorMoved(Accessible* obj, unsigned int cursorPosition) { - auto addr = obj->GetAddress(); - std::string path = addr ? ATSPI_PREFIX_PATH + addr.GetPath() : ATSPI_NULL_PATH; - mDbusServer.emit2<std::string, int, int, DBus::EldbusVariant<int>, Address>( - path, + GetAccessiblePath(obj), AtspiDbusInterfaceEventObject, "TextCaretMoved", "", @@ -548,11 +539,8 @@ void BridgeObject::EmitTextChanged(Accessible* obj, TextChangedState state, unsi if(stateName) { - auto addr = obj->GetAddress(); - std::string path = addr ? ATSPI_PREFIX_PATH + addr.GetPath() : ATSPI_NULL_PATH; - mDbusServer.emit2<std::string, int, int, DBus::EldbusVariant<std::string>, Address>( - path, + GetAccessiblePath(obj), AtspiDbusInterfaceEventObject, "TextChanged", stateName, @@ -565,11 +553,8 @@ void BridgeObject::EmitTextChanged(Accessible* obj, TextChangedState state, unsi void BridgeObject::EmitMovedOutOfScreen(Accessible* obj, ScreenRelativeMoveType type) { - auto addr = obj->GetAddress(); - std::string path = addr ? ATSPI_PREFIX_PATH + addr.GetPath() : ATSPI_NULL_PATH; - mDbusServer.emit2<std::string, int, int, DBus::EldbusVariant<int>, Address>( - path, + GetAccessiblePath(obj), AtspiDbusInterfaceEventObject, "MoveOuted", "", |