X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Faccessibility%2Fbridge%2Fbridge-text.cpp;h=1ba0073e6c9a36d8a9447d1e6611b9552eb8ccf9;hb=93f74934da0d7ea8deac16eb3e23b35b0d684087;hp=d71a723676785ef29e71074c84763fc70827eb61;hpb=0f1c43f2401f83a2372da6f19363c5d002811eae;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/accessibility/bridge/bridge-text.cpp b/dali/internal/accessibility/bridge/bridge-text.cpp index d71a723..1ba0073 100644 --- a/dali/internal/accessibility/bridge/bridge-text.cpp +++ b/dali/internal/accessibility/bridge/bridge-text.cpp @@ -38,19 +38,19 @@ void BridgeText::RegisterInterfaces() AddFunctionToInterface(desc, "GetSelection", &BridgeText::GetRangeOfSelection); AddFunctionToInterface(desc, "SetSelection", &BridgeText::SetRangeOfSelection); AddFunctionToInterface(desc, "RemoveSelection", &BridgeText::RemoveSelection); - dbusServer.addInterface("/", desc, true); + mDbusServer.addInterface("/", desc, true); } Text* BridgeText::FindSelf() const { auto self = BridgeBase::FindSelf(); assert(self); - auto textObject = dynamic_cast(self); - if(!textObject) + auto textInterface = dynamic_cast(self); + if(!textInterface) { throw std::domain_error{"Object " + self->GetAddress().ToString() + " doesn't have Text interface"}; } - return textObject; + return textInterface; } DBus::ValueOrError BridgeText::GetText(int startOffset, int endOffset) @@ -79,18 +79,18 @@ DBus::ValueOrError BridgeText::GetTextAtOffset(int32_t of return {range.content, static_cast(range.startOffset), static_cast(range.endOffset)}; } -DBus::ValueOrError BridgeText::GetRangeOfSelection(int32_t selectionNum) +DBus::ValueOrError BridgeText::GetRangeOfSelection(int32_t selectionIndex) { - auto range = FindSelf()->GetRangeOfSelection(selectionNum); + auto range = FindSelf()->GetRangeOfSelection(selectionIndex); return {static_cast(range.startOffset), static_cast(range.endOffset)}; } -DBus::ValueOrError BridgeText::RemoveSelection(int32_t selectionNum) +DBus::ValueOrError BridgeText::RemoveSelection(int32_t selectionIndex) { - return FindSelf()->RemoveSelection(selectionNum); + return FindSelf()->RemoveSelection(selectionIndex); } -DBus::ValueOrError BridgeText::SetRangeOfSelection(int32_t selectionNum, int32_t startOffset, int32_t endOffset) +DBus::ValueOrError BridgeText::SetRangeOfSelection(int32_t selectionIndex, int32_t startOffset, int32_t endOffset) { - return FindSelf()->SetRangeOfSelection(selectionNum, startOffset, endOffset); + return FindSelf()->SetRangeOfSelection(selectionIndex, startOffset, endOffset); }