projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AT-SPI] Synchronize with AT-SPI cleanup in dali-adaptor
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-label-impl.h
diff --git
a/dali-toolkit/internal/controls/text-controls/text-label-impl.h
b/dali-toolkit/internal/controls/text-controls/text-label-impl.h
index
3f1080c
..
8bedc5b
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
+++ b/
dali-toolkit/internal/controls/text-controls/text-label-impl.h
@@
-243,26
+243,26
@@
protected:
/**
* @brief This structure is to connect TextLabel with Accessible functions.
*/
/**
* @brief This structure is to connect TextLabel with Accessible functions.
*/
- struct AccessibleImpl : public DevelControl::
AccessibleImpl
,
+ struct AccessibleImpl : public DevelControl::
ControlAccessible
,
public virtual Dali::Accessibility::Text,
public virtual Dali::Accessibility::Hypertext
{
public virtual Dali::Accessibility::Text,
public virtual Dali::Accessibility::Hypertext
{
- using DevelControl::
AccessibleImpl::AccessibleImpl
;
+ using DevelControl::
ControlAccessible::ControlAccessible
;
/**
* @copydoc Dali::Accessibility::Text::GetText()
*/
/**
* @copydoc Dali::Accessibility::Text::GetText()
*/
- std::string GetText(size_t startOffset, size_t endOffset) override;
+ std::string GetText(size_t startOffset, size_t endOffset)
const
override;
/**
* @copydoc Dali::Accessibility::Text::GetCharacterCount()
*/
/**
* @copydoc Dali::Accessibility::Text::GetCharacterCount()
*/
- size_t GetCharacterCount() override;
+ size_t GetCharacterCount()
const
override;
/**
* @copydoc Dali::Accessibility::Text::GetCursorOffset()
*/
/**
* @copydoc Dali::Accessibility::Text::GetCursorOffset()
*/
- size_t GetCursorOffset() override;
+ size_t GetCursorOffset()
const
override;
/**
* @copydoc Dali::Accessibility::Text::SetCursorOffset()
/**
* @copydoc Dali::Accessibility::Text::SetCursorOffset()
@@
-272,12
+272,12
@@
protected:
/**
* @copydoc Dali::Accessibility::Text::GetTextAtOffset()
*/
/**
* @copydoc Dali::Accessibility::Text::GetTextAtOffset()
*/
- Accessibility::Range GetTextAtOffset(size_t offset, Accessibility::TextBoundary boundary) override;
+ Accessibility::Range GetTextAtOffset(size_t offset, Accessibility::TextBoundary boundary)
const
override;
/**
* @copydoc Dali::Accessibility::Text::GetRangeOfSelection()
*/
/**
* @copydoc Dali::Accessibility::Text::GetRangeOfSelection()
*/
- Accessibility::Range GetRangeOfSelection(size_t selectionIndex) override;
+ Accessibility::Range GetRangeOfSelection(size_t selectionIndex)
const
override;
/**
* @copydoc Dali::Accessibility::Text::RemoveSelection()
/**
* @copydoc Dali::Accessibility::Text::RemoveSelection()
@@
-292,7
+292,7
@@
protected:
/**
* @copydoc Dali::Accessibility::Text::GetNameRaw()
*/
/**
* @copydoc Dali::Accessibility::Text::GetNameRaw()
*/
- std::string GetNameRaw() override;
+ std::string GetNameRaw()
const
override;
/**
* @copydoc Dali::Accessibility::Text::GetNamePropertyIndex()
/**
* @copydoc Dali::Accessibility::Text::GetNamePropertyIndex()