Merge "Refactoring model-impl.cpp" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-view.cpp

diff --git a/dali-toolkit/internal/text/text-view.cpp b/dali-toolkit/internal/text/text-view.cpp
index 0b81484..334d922 100644 (file)
--- a/dali-toolkit/internal/text/text-view.cpp
+++ b/dali-toolkit/internal/text/text-view.cpp
@@ -575,7 +575,7 @@ Length View::GetGlyphs(GlyphInfo* glyphs,
   return numberOfLaidOutGlyphs;
 }
 
-const Vector4* const View::GetColors() const
+const Vector4* View::GetColors() const
 {
   if(mImpl->mVisualModel)
   {
@@ -585,7 +585,7 @@ const Vector4* const View::GetColors() const
   return NULL;
 }
 
-const ColorIndex* const View::GetColorIndices() const
+const ColorIndex* View::GetColorIndices() const
 {
   if(mImpl->mVisualModel)
   {
@@ -595,7 +595,7 @@ const ColorIndex* const View::GetColorIndices() const
   return NULL;
 }
 
-const Vector4* const View::GetBackgroundColors() const
+const Vector4* View::GetBackgroundColors() const
 {
   if(mImpl->mVisualModel)
   {
@@ -605,7 +605,7 @@ const Vector4* const View::GetBackgroundColors() const
   return nullptr;
 }
 
-const ColorIndex* const View::GetBackgroundColorIndices() const
+const ColorIndex* View::GetBackgroundColorIndices() const
 {
   if(mImpl->mVisualModel)
   {
@@ -615,7 +615,7 @@ const ColorIndex* const View::GetBackgroundColorIndices() const
   return nullptr;
 }
 
-bool const View::IsMarkupBackgroundColorSet() const
+bool View::IsMarkupBackgroundColorSet() const
 {
   if(mImpl->mVisualModel)
   {
@@ -670,7 +670,7 @@ bool View::IsUnderlineEnabled() const
   return false;
 }
 
-bool const View::IsMarkupUnderlineSet() const
+bool View::IsMarkupUnderlineSet() const
 {
   return (GetNumberOfUnderlineRuns() > 0u);
 }
@@ -870,7 +870,7 @@ bool View::IsStrikethroughEnabled() const
   return (mImpl->mVisualModel) ? mImpl->mVisualModel->IsStrikethroughEnabled() : false;
 }
 
-bool const View::IsMarkupStrikethroughSet() const
+bool View::IsMarkupStrikethroughSet() const
 {
   return (GetNumberOfStrikethroughRuns() > 0u);
 }
@@ -917,24 +917,14 @@ const Vector<BoundedParagraphRun>& View::GetBoundedParagraphRuns() const
   return mImpl->mLogicalModel->GetBoundedParagraphRuns();
 }
 
-Length View::GetNumberOfCharacterSpacingGlyphRuns() const
+float View::GetCharacterSpacing() const
 {
-  return (mImpl->mVisualModel) ? mImpl->mVisualModel->GetNumberOfCharacterSpacingGlyphRuns() : 0u;
-}
-
-const Vector<CharacterSpacingGlyphRun>& View::GetCharacterSpacingGlyphRuns() const
-{
-  return (mImpl->mVisualModel) ? mImpl->mVisualModel->GetCharacterSpacingGlyphRuns() : GetEmptyCharacterSpacingGlyphRuns();
-}
-
-const float View::GetCharacterSpacing() const
-{
-  return (mImpl->mVisualModel) ? mImpl->mVisualModel->GetCharacterSpacing() : 0.f;
+  return mImpl->mVisualModel->GetCharacterSpacing();
 }
 
 const Character* View::GetTextBuffer() const
 {
-  return (mImpl->mVisualModel) ? mImpl->mLogicalModel->mText.Begin() : nullptr;
+  return mImpl->mLogicalModel->mText.Begin();
 }
 
 const Vector<CharacterIndex>& View::GetGlyphsToCharacters() const