From 64cbda8b449c9095e967c6acf065fcaed8394d35 Mon Sep 17 00:00:00 2001 From: Eunki Hong Date: Wed, 18 Jan 2023 05:42:41 +0900 Subject: [PATCH] Fix doxygen error + Minor coverity issue resolve Due to the unknown issue, If we set SpanType::Value as enum class + If we return const Value, doxygen compiled failed at Accessibility::Value. Error message : Configuration file '/home/leaf/work/dali-toolkit/build/tizen/docs/dali.doxy' updated. /home/leaf/work/dali-env/opt/include/dali/devel-api/atspi-interfaces/value.h:88: warning: no matching file member found for Value * Dali::Accessibility::Value::DownCast(Accessible *obj) Possible candidates: 'T DownCast(BaseHandle handle)' at line 275 of file /home/leaf/work/dali-env/opt/include/dali/public-api/object/base-handle.h 'Application DownCast(Dali::RefObject *refObject)' at line 83 of file /home/leaf/work/dali-env/opt/include/dali/devel-api/adaptor-framework/application-devel.h Since human cannot read this error, just avoid it. + Due to the doxygen make trouble since const value return, I also try to remove all const return keyword that coverity issue will be occured.. TODO : Should FontSpan::GetFamilyName return const std::string& instead of const std::string? That API is also kind of meanless const keyword btw. See https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-toolkit/+/282555/ 's case 4. Change-Id: I6e087e66a3de3ee4a5981bdc540616910ab04b6e Signed-off-by: Eunki Hong --- dali-toolkit/devel-api/text/spans/background-color-span.cpp | 2 +- dali-toolkit/devel-api/text/spans/background-color-span.h | 2 +- dali-toolkit/devel-api/text/spans/base-span.cpp | 2 +- dali-toolkit/devel-api/text/spans/base-span.h | 2 +- dali-toolkit/devel-api/text/spans/character-spacing-span.cpp | 2 +- dali-toolkit/devel-api/text/spans/character-spacing-span.h | 2 +- dali-toolkit/devel-api/text/spans/font-span.cpp | 8 ++++---- dali-toolkit/devel-api/text/spans/font-span.h | 8 ++++---- dali-toolkit/devel-api/text/spans/foreground-color-span.cpp | 2 +- dali-toolkit/devel-api/text/spans/foreground-color-span.h | 2 +- dali-toolkit/devel-api/text/spans/span-enumerations.h | 3 +-- dali-toolkit/devel-api/text/spans/strikethrough-span.cpp | 4 ++-- dali-toolkit/devel-api/text/spans/strikethrough-span.h | 4 ++-- dali-toolkit/devel-api/text/spans/underline-span.cpp | 10 +++++----- dali-toolkit/devel-api/text/spans/underline-span.h | 10 +++++----- dali-toolkit/internal/text/controller/text-controller.h | 2 +- .../text/spannable/spans/background-color-span-impl.cpp | 2 +- .../internal/text/spannable/spans/background-color-span-impl.h | 2 +- dali-toolkit/internal/text/spannable/spans/base-span-impl.cpp | 2 +- dali-toolkit/internal/text/spannable/spans/base-span-impl.h | 2 +- .../text/spannable/spans/character-spacing-span-impl.cpp | 2 +- .../text/spannable/spans/character-spacing-span-impl.h | 2 +- dali-toolkit/internal/text/spannable/spans/font-span-impl.cpp | 8 ++++---- dali-toolkit/internal/text/spannable/spans/font-span-impl.h | 8 ++++---- .../text/spannable/spans/foreground-color-span-impl.cpp | 2 +- .../internal/text/spannable/spans/foreground-color-span-impl.h | 2 +- .../internal/text/spannable/spans/strikethrough-span-impl.cpp | 4 ++-- .../internal/text/spannable/spans/strikethrough-span-impl.h | 4 ++-- .../internal/text/spannable/spans/underline-span-impl.cpp | 10 +++++----- .../internal/text/spannable/spans/underline-span-impl.h | 10 +++++----- 30 files changed, 62 insertions(+), 63 deletions(-) diff --git a/dali-toolkit/devel-api/text/spans/background-color-span.cpp b/dali-toolkit/devel-api/text/spans/background-color-span.cpp index 30972d5..c7a5d04 100644 --- a/dali-toolkit/devel-api/text/spans/background-color-span.cpp +++ b/dali-toolkit/devel-api/text/spans/background-color-span.cpp @@ -50,7 +50,7 @@ BackgroundColorSpan& BackgroundColorSpan::operator=(BackgroundColorSpan&& rhs) = BackgroundColorSpan::~BackgroundColorSpan() = default; //Methods -const Vector4 BackgroundColorSpan::GetBackgroundColor() const +Vector4 BackgroundColorSpan::GetBackgroundColor() const { return GetImplementation(*this).GetBackgroundColor(); } diff --git a/dali-toolkit/devel-api/text/spans/background-color-span.h b/dali-toolkit/devel-api/text/spans/background-color-span.h index 951692c..10c56dd 100644 --- a/dali-toolkit/devel-api/text/spans/background-color-span.h +++ b/dali-toolkit/devel-api/text/spans/background-color-span.h @@ -101,7 +101,7 @@ public: //Methods * * @return A background-color value. */ - const Vector4 GetBackgroundColor() const; + Vector4 GetBackgroundColor() const; /** * @brief Retrieve whether the background-color is defined. diff --git a/dali-toolkit/devel-api/text/spans/base-span.cpp b/dali-toolkit/devel-api/text/spans/base-span.cpp index 47b09a1..0781390 100644 --- a/dali-toolkit/devel-api/text/spans/base-span.cpp +++ b/dali-toolkit/devel-api/text/spans/base-span.cpp @@ -49,7 +49,7 @@ BaseSpan BaseSpan::DownCast(BaseHandle handle) return BaseSpan(dynamic_cast(handle.GetObjectPtr())); } -const Dali::Toolkit::Text::SpanType::Value BaseSpan::GetSpanType() const +Dali::Toolkit::Text::SpanType::Value BaseSpan::GetSpanType() const { return GetImplementation(*this).GetSpanType(); } diff --git a/dali-toolkit/devel-api/text/spans/base-span.h b/dali-toolkit/devel-api/text/spans/base-span.h index 8757820..e3f7f29 100644 --- a/dali-toolkit/devel-api/text/spans/base-span.h +++ b/dali-toolkit/devel-api/text/spans/base-span.h @@ -96,7 +96,7 @@ public: * * @return A span type value. */ - const Dali::Toolkit::Text::SpanType::Value GetSpanType() const; + Dali::Toolkit::Text::SpanType::Value GetSpanType() const; /** * @brief Downcasts to a BaseSpan handle. diff --git a/dali-toolkit/devel-api/text/spans/character-spacing-span.cpp b/dali-toolkit/devel-api/text/spans/character-spacing-span.cpp index 2383140..1e8b306 100644 --- a/dali-toolkit/devel-api/text/spans/character-spacing-span.cpp +++ b/dali-toolkit/devel-api/text/spans/character-spacing-span.cpp @@ -50,7 +50,7 @@ CharacterSpacingSpan& CharacterSpacingSpan::operator=(CharacterSpacingSpan&& rhs CharacterSpacingSpan::~CharacterSpacingSpan() = default; //Methods -const float CharacterSpacingSpan::GetCharacterSpacing() const +float CharacterSpacingSpan::GetCharacterSpacing() const { return GetImplementation(*this).GetCharacterSpacing(); } diff --git a/dali-toolkit/devel-api/text/spans/character-spacing-span.h b/dali-toolkit/devel-api/text/spans/character-spacing-span.h index 8d59b3f..768f0cf 100644 --- a/dali-toolkit/devel-api/text/spans/character-spacing-span.h +++ b/dali-toolkit/devel-api/text/spans/character-spacing-span.h @@ -100,7 +100,7 @@ public: //Methods * * @return A CharacterSpacing value. */ - const float GetCharacterSpacing() const; + float GetCharacterSpacing() const; /** * @brief Retrieve whether the CharacterSpacing is defined. diff --git a/dali-toolkit/devel-api/text/spans/font-span.cpp b/dali-toolkit/devel-api/text/spans/font-span.cpp index a0eb945..6300224 100644 --- a/dali-toolkit/devel-api/text/spans/font-span.cpp +++ b/dali-toolkit/devel-api/text/spans/font-span.cpp @@ -64,7 +64,7 @@ bool FontSpan::IsFamilyNameDefined() const return GetImplementation(*this).IsFamilyNameDefined(); } -const Dali::TextAbstraction::FontWeight::Type FontSpan::GetWeight() const +Dali::TextAbstraction::FontWeight::Type FontSpan::GetWeight() const { return GetImplementation(*this).GetWeight(); } @@ -74,7 +74,7 @@ bool FontSpan::IsWeightDefined() const return GetImplementation(*this).IsWeightDefined(); } -const Dali::TextAbstraction::FontWidth::Type FontSpan::GetWidth() const +Dali::TextAbstraction::FontWidth::Type FontSpan::GetWidth() const { return GetImplementation(*this).GetWidth(); } @@ -84,7 +84,7 @@ bool FontSpan::IsWidthDefined() const return GetImplementation(*this).IsWidthDefined(); } -const Dali::TextAbstraction::FontSlant::Type FontSpan::GetSlant() const +Dali::TextAbstraction::FontSlant::Type FontSpan::GetSlant() const { return GetImplementation(*this).GetSlant(); } @@ -94,7 +94,7 @@ bool FontSpan::IsSlantDefined() const return GetImplementation(*this).IsSlantDefined(); } -const float FontSpan::GetSize() const +float FontSpan::GetSize() const { return GetImplementation(*this).GetSize(); } diff --git a/dali-toolkit/devel-api/text/spans/font-span.h b/dali-toolkit/devel-api/text/spans/font-span.h index 6a98c5d..7b241ed 100644 --- a/dali-toolkit/devel-api/text/spans/font-span.h +++ b/dali-toolkit/devel-api/text/spans/font-span.h @@ -118,28 +118,28 @@ public: //Methods * * @return A font weight value. */ - const Dali::TextAbstraction::FontWeight::Type GetWeight() const; + Dali::TextAbstraction::FontWeight::Type GetWeight() const; /** * @brief Retrive the font width. * * @return A font width value. */ - const Dali::TextAbstraction::FontWidth::Type GetWidth() const; + Dali::TextAbstraction::FontWidth::Type GetWidth() const; /** * @brief Retrive the font slant. * * @return A font slant value. */ - const Dali::TextAbstraction::FontSlant::Type GetSlant() const; + Dali::TextAbstraction::FontSlant::Type GetSlant() const; /** * @brief Retrive the font size. * * @return A font size value. */ - const float GetSize() const; + float GetSize() const; /** * @brief Retrieve whether the font family name is defined. diff --git a/dali-toolkit/devel-api/text/spans/foreground-color-span.cpp b/dali-toolkit/devel-api/text/spans/foreground-color-span.cpp index a774737..8c2b395 100644 --- a/dali-toolkit/devel-api/text/spans/foreground-color-span.cpp +++ b/dali-toolkit/devel-api/text/spans/foreground-color-span.cpp @@ -50,7 +50,7 @@ ForegroundColorSpan& ForegroundColorSpan::operator=(ForegroundColorSpan&& rhs) = ForegroundColorSpan::~ForegroundColorSpan() = default; //Methods -const Vector4 ForegroundColorSpan::GetForegroundColor() const +Vector4 ForegroundColorSpan::GetForegroundColor() const { return GetImplementation(*this).GetForegroundColor(); } diff --git a/dali-toolkit/devel-api/text/spans/foreground-color-span.h b/dali-toolkit/devel-api/text/spans/foreground-color-span.h index f6f8c37..f1e042b 100644 --- a/dali-toolkit/devel-api/text/spans/foreground-color-span.h +++ b/dali-toolkit/devel-api/text/spans/foreground-color-span.h @@ -101,7 +101,7 @@ public: //Methods * * @return A foreground-color value. */ - const Vector4 GetForegroundColor() const; + Vector4 GetForegroundColor() const; /** * @brief Retrieve whether the foreground-color is defined. diff --git a/dali-toolkit/devel-api/text/spans/span-enumerations.h b/dali-toolkit/devel-api/text/spans/span-enumerations.h index 37a2bca..d77c265 100644 --- a/dali-toolkit/devel-api/text/spans/span-enumerations.h +++ b/dali-toolkit/devel-api/text/spans/span-enumerations.h @@ -32,7 +32,7 @@ namespace SpanType /** * @brief Enumeration for type of the span. */ -enum class Value : uint8_t +enum Value : uint8_t { BASE = 0, FOREGROUND_COLOR, @@ -43,7 +43,6 @@ enum class Value : uint8_t UNDERLINE, STRIKETHROUGH, CHARACTER_SPACING - }; } // namespace SpanType diff --git a/dali-toolkit/devel-api/text/spans/strikethrough-span.cpp b/dali-toolkit/devel-api/text/spans/strikethrough-span.cpp index 3d04a54..ab43367 100644 --- a/dali-toolkit/devel-api/text/spans/strikethrough-span.cpp +++ b/dali-toolkit/devel-api/text/spans/strikethrough-span.cpp @@ -50,7 +50,7 @@ StrikethroughSpan& StrikethroughSpan::operator=(StrikethroughSpan&& rhs) = defau StrikethroughSpan::~StrikethroughSpan() = default; //Methods -const Vector4 StrikethroughSpan::GetColor() const +Vector4 StrikethroughSpan::GetColor() const { return GetImplementation(*this).GetColor(); } @@ -60,7 +60,7 @@ bool StrikethroughSpan::IsColorDefined() const return GetImplementation(*this).IsColorDefined(); } -const float StrikethroughSpan::GetHeight() const +float StrikethroughSpan::GetHeight() const { return GetImplementation(*this).GetHeight(); } diff --git a/dali-toolkit/devel-api/text/spans/strikethrough-span.h b/dali-toolkit/devel-api/text/spans/strikethrough-span.h index de12289..b5f9b7f 100644 --- a/dali-toolkit/devel-api/text/spans/strikethrough-span.h +++ b/dali-toolkit/devel-api/text/spans/strikethrough-span.h @@ -113,7 +113,7 @@ public: //Methods * * @return A color value. */ - const Vector4 GetColor() const; + Vector4 GetColor() const; /** * @brief Retrieve whether the color is defined. @@ -127,7 +127,7 @@ public: //Methods * * @return A height value. */ - const float GetHeight() const; + float GetHeight() const; /** * @brief Retrieve whether the height is defined. diff --git a/dali-toolkit/devel-api/text/spans/underline-span.cpp b/dali-toolkit/devel-api/text/spans/underline-span.cpp index 4760ed1..4eed79e 100644 --- a/dali-toolkit/devel-api/text/spans/underline-span.cpp +++ b/dali-toolkit/devel-api/text/spans/underline-span.cpp @@ -66,7 +66,7 @@ UnderlineSpan::~UnderlineSpan() = default; //Methods -const Text::Underline::Type UnderlineSpan::GetType() const +Text::Underline::Type UnderlineSpan::GetType() const { return GetImplementation(*this).GetType(); } @@ -76,7 +76,7 @@ bool UnderlineSpan::IsTypeDefined() const return GetImplementation(*this).IsTypeDefined(); } -const Vector4 UnderlineSpan::GetColor() const +Vector4 UnderlineSpan::GetColor() const { return GetImplementation(*this).GetColor(); } @@ -86,7 +86,7 @@ bool UnderlineSpan::IsColorDefined() const return GetImplementation(*this).IsColorDefined(); } -const float UnderlineSpan::GetHeight() const +float UnderlineSpan::GetHeight() const { return GetImplementation(*this).GetHeight(); } @@ -96,7 +96,7 @@ bool UnderlineSpan::IsHeightDefined() const return GetImplementation(*this).IsHeightDefined(); } -const float UnderlineSpan::GetDashGap() const +float UnderlineSpan::GetDashGap() const { return GetImplementation(*this).GetDashGap(); } @@ -106,7 +106,7 @@ bool UnderlineSpan::IsDashGapDefined() const return GetImplementation(*this).IsDashGapDefined(); } -const float UnderlineSpan::GetDashWidth() const +float UnderlineSpan::GetDashWidth() const { return GetImplementation(*this).GetDashWidth(); } diff --git a/dali-toolkit/devel-api/text/spans/underline-span.h b/dali-toolkit/devel-api/text/spans/underline-span.h index d233c73..4c504d9 100644 --- a/dali-toolkit/devel-api/text/spans/underline-span.h +++ b/dali-toolkit/devel-api/text/spans/underline-span.h @@ -133,7 +133,7 @@ public: //Methods * * @return A type value. */ - const Text::Underline::Type GetType() const; + Text::Underline::Type GetType() const; /** * @brief Retrieve whether the type is defined. @@ -147,7 +147,7 @@ public: //Methods * * @return A color value. */ - const Vector4 GetColor() const; + Vector4 GetColor() const; /** * @brief Retrieve whether the color is defined. @@ -161,7 +161,7 @@ public: //Methods * * @return A height value. */ - const float GetHeight() const; + float GetHeight() const; /** * @brief Retrieve whether the height is defined. @@ -175,7 +175,7 @@ public: //Methods * * @return A dash-gap value. */ - const float GetDashGap() const; + float GetDashGap() const; /** * @brief Retrieve whether the dash-gap is defined. @@ -189,7 +189,7 @@ public: //Methods * * @return A dash-width value. */ - const float GetDashWidth() const; + float GetDashWidth() const; /** * @brief Retrieve whether the dash-width is defined. diff --git a/dali-toolkit/internal/text/controller/text-controller.h b/dali-toolkit/internal/text/controller/text-controller.h index fce3e3b..0a1b057 100644 --- a/dali-toolkit/internal/text/controller/text-controller.h +++ b/dali-toolkit/internal/text/controller/text-controller.h @@ -2106,7 +2106,7 @@ private: struct TextUpdater; struct SpannableHandler; - std::unique_ptr mImpl; + std::unique_ptr mImpl{nullptr}; }; } // namespace Dali::Toolkit::Text diff --git a/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.cpp index 1bdf94f..26d33a6 100644 --- a/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.cpp +++ b/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.cpp @@ -56,7 +56,7 @@ Dali::Toolkit::Text::BackgroundColorSpan BackgroundColorSpan::New(const Vector4 } //Methods -const Vector4 BackgroundColorSpan::GetBackgroundColor() const +Vector4 BackgroundColorSpan::GetBackgroundColor() const { return mImpl->mBackgroundColor; } diff --git a/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h b/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h index f94bae0..d39bc1c 100644 --- a/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h +++ b/dali-toolkit/internal/text/spannable/spans/background-color-span-impl.h @@ -77,7 +77,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::BackgroundColorSpan::GetBackgroundColor() */ - const Vector4 GetBackgroundColor() const; + Vector4 GetBackgroundColor() const; /** * @copydoc Dali::Toolkit::Text::BackgroundColorSpan::IsBackgroundColorDefined() diff --git a/dali-toolkit/internal/text/spannable/spans/base-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/base-span-impl.cpp index 5c1897d..3e1fb35 100644 --- a/dali-toolkit/internal/text/spannable/spans/base-span-impl.cpp +++ b/dali-toolkit/internal/text/spannable/spans/base-span-impl.cpp @@ -41,7 +41,7 @@ BaseSpan::~BaseSpan() { } -const Dali::Toolkit::Text::SpanType::Value BaseSpan::GetSpanType() const +Dali::Toolkit::Text::SpanType::Value BaseSpan::GetSpanType() const { return mImpl->mSpanTypeValue; } diff --git a/dali-toolkit/internal/text/spannable/spans/base-span-impl.h b/dali-toolkit/internal/text/spannable/spans/base-span-impl.h index 8317e0a..5f01524 100644 --- a/dali-toolkit/internal/text/spannable/spans/base-span-impl.h +++ b/dali-toolkit/internal/text/spannable/spans/base-span-impl.h @@ -72,7 +72,7 @@ public: * @copydoc Dali::Toolkit::Text::SpanType::Value GetSpanType */ - const Dali::Toolkit::Text::SpanType::Value GetSpanType() const; + Dali::Toolkit::Text::SpanType::Value GetSpanType() const; public: //Methods for internal only /** diff --git a/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.cpp index 484b4b4..aacf892 100644 --- a/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.cpp +++ b/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.cpp @@ -57,7 +57,7 @@ Dali::Toolkit::Text::CharacterSpacingSpan CharacterSpacingSpan::New(const float& } //Methods -const float CharacterSpacingSpan::GetCharacterSpacing() const +float CharacterSpacingSpan::GetCharacterSpacing() const { return mImpl->mCharacterSpacing; } diff --git a/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h b/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h index 4aa8adc..c3446f0 100644 --- a/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h +++ b/dali-toolkit/internal/text/spannable/spans/character-spacing-span-impl.h @@ -70,7 +70,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::CharacterSpacingSpan::GetCharacterSpacing() */ - const float GetCharacterSpacing() const; + float GetCharacterSpacing() const; /** * @copydoc Dali::Toolkit::Text::CharacterSpacingSpan::IsCharacterSpacingDefined() diff --git a/dali-toolkit/internal/text/spannable/spans/font-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/font-span-impl.cpp index 4a7811f..66212ad 100644 --- a/dali-toolkit/internal/text/spannable/spans/font-span-impl.cpp +++ b/dali-toolkit/internal/text/spannable/spans/font-span-impl.cpp @@ -100,7 +100,7 @@ void FontSpan::SetFamilyName(const std::string& familyName) mImpl->mFamilyNameDefined = true; } -const Dali::TextAbstraction::FontWeight::Type FontSpan::GetWeight() const +Dali::TextAbstraction::FontWeight::Type FontSpan::GetWeight() const { return mImpl->mWeight; } @@ -116,7 +116,7 @@ void FontSpan::SetWeight(const Dali::TextAbstraction::FontWeight::Type& weight) mImpl->mWeightDefined = true; } -const Dali::TextAbstraction::FontWidth::Type FontSpan::GetWidth() const +Dali::TextAbstraction::FontWidth::Type FontSpan::GetWidth() const { return mImpl->mWidth; } @@ -132,7 +132,7 @@ void FontSpan::SetWidth(const Dali::TextAbstraction::FontWidth::Type& width) mImpl->mWidthDefined = true; } -const Dali::TextAbstraction::FontSlant::Type FontSpan::GetSlant() const +Dali::TextAbstraction::FontSlant::Type FontSpan::GetSlant() const { return mImpl->mSlant; } @@ -148,7 +148,7 @@ void FontSpan::SetSlant(const Dali::TextAbstraction::FontSlant::Type& slant) mImpl->mSlantDefined = true; } -const float FontSpan::GetSize() const +float FontSpan::GetSize() const { return mImpl->mSize; } diff --git a/dali-toolkit/internal/text/spannable/spans/font-span-impl.h b/dali-toolkit/internal/text/spannable/spans/font-span-impl.h index 30306cd..56ab9d2 100644 --- a/dali-toolkit/internal/text/spannable/spans/font-span-impl.h +++ b/dali-toolkit/internal/text/spannable/spans/font-span-impl.h @@ -85,7 +85,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::FontSpan::GetWeight() */ - const Dali::TextAbstraction::FontWeight::Type GetWeight() const; + Dali::TextAbstraction::FontWeight::Type GetWeight() const; /** * @copydoc Dali::Toolkit::Text::FontSpan::IsWeightDefined() @@ -95,7 +95,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::FontSpan::GetWidth() */ - const Dali::TextAbstraction::FontWidth::Type GetWidth() const; + Dali::TextAbstraction::FontWidth::Type GetWidth() const; /** * @copydoc Dali::Toolkit::Text::FontSpan::IsWidthDefined() @@ -105,7 +105,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::FontSpan::GetSlant() */ - const Dali::TextAbstraction::FontSlant::Type GetSlant() const; + Dali::TextAbstraction::FontSlant::Type GetSlant() const; /** * @copydoc Dali::Toolkit::Text::FontSpan::IsSlantDefined() @@ -115,7 +115,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::FontSpan::GetSize() */ - const float GetSize() const; + float GetSize() const; /** * @copydoc Dali::Toolkit::Text::FontSpan::IsSizeDefined() diff --git a/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.cpp index fa00d45..9e0ab32 100644 --- a/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.cpp +++ b/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.cpp @@ -57,7 +57,7 @@ Dali::Toolkit::Text::ForegroundColorSpan ForegroundColorSpan::New(Vector4 color) } //Methods -const Vector4 ForegroundColorSpan::GetForegroundColor() const +Vector4 ForegroundColorSpan::GetForegroundColor() const { return mImpl->mForegroundColor; } diff --git a/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h b/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h index 09f226a..b75a5aa 100644 --- a/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h +++ b/dali-toolkit/internal/text/spannable/spans/foreground-color-span-impl.h @@ -70,7 +70,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::ForegroundColorSpan::GetForegroundColor() */ - const Vector4 GetForegroundColor() const; + Vector4 GetForegroundColor() const; /** * @copydoc Dali::Toolkit::Text::ForegroundColorSpan::IsForegroundColorDefined() diff --git a/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.cpp index c589cf2..7cca940 100644 --- a/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.cpp +++ b/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.cpp @@ -63,7 +63,7 @@ Dali::Toolkit::Text::StrikethroughSpan StrikethroughSpan::New(Vector4 color, flo } //Methods -const Vector4 StrikethroughSpan::GetColor() const +Vector4 StrikethroughSpan::GetColor() const { return mImpl->mStrikethroughProperties.color; } @@ -79,7 +79,7 @@ void StrikethroughSpan::SetColor(const Vector4& color) mImpl->mStrikethroughProperties.colorDefined = true; } -const float StrikethroughSpan::GetHeight() const +float StrikethroughSpan::GetHeight() const { return mImpl->mStrikethroughProperties.height; } diff --git a/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h b/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h index 6c51171..def7fa9 100644 --- a/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h +++ b/dali-toolkit/internal/text/spannable/spans/strikethrough-span-impl.h @@ -83,7 +83,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::StrikethroughSpan::GetColor() */ - const Vector4 GetColor() const; + Vector4 GetColor() const; /** * @copydoc Dali::Toolkit::Text::StrikethroughSpan::IsColorDefined() @@ -93,7 +93,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::StrikethroughSpan::GetHeight() */ - const float GetHeight() const; + float GetHeight() const; /** * @copydoc Dali::Toolkit::Text::StrikethroughSpan::IsHeightDefined() diff --git a/dali-toolkit/internal/text/spannable/spans/underline-span-impl.cpp b/dali-toolkit/internal/text/spannable/spans/underline-span-impl.cpp index 9124e02..841c5ea 100644 --- a/dali-toolkit/internal/text/spannable/spans/underline-span-impl.cpp +++ b/dali-toolkit/internal/text/spannable/spans/underline-span-impl.cpp @@ -94,7 +94,7 @@ Dali::Toolkit::Text::UnderlineSpan UnderlineSpan::NewDouble(Vector4 color, float //Methods -const Text::Underline::Type UnderlineSpan::GetType() const +Text::Underline::Type UnderlineSpan::GetType() const { return mImpl->mUnderlineProperties.type; } @@ -110,7 +110,7 @@ void UnderlineSpan::SetType(const Text::Underline::Type& type) mImpl->mUnderlineProperties.typeDefined = true; } -const Vector4 UnderlineSpan::GetColor() const +Vector4 UnderlineSpan::GetColor() const { return mImpl->mUnderlineProperties.color; } @@ -126,7 +126,7 @@ void UnderlineSpan::SetColor(const Vector4& color) mImpl->mUnderlineProperties.colorDefined = true; } -const float UnderlineSpan::GetHeight() const +float UnderlineSpan::GetHeight() const { return mImpl->mUnderlineProperties.height; } @@ -142,7 +142,7 @@ void UnderlineSpan::SetHeight(const float& height) mImpl->mUnderlineProperties.heightDefined = true; } -const float UnderlineSpan::GetDashGap() const +float UnderlineSpan::GetDashGap() const { return mImpl->mUnderlineProperties.dashGap; } @@ -158,7 +158,7 @@ void UnderlineSpan::SetDashGap(const float& dashGap) mImpl->mUnderlineProperties.dashGapDefined = true; } -const float UnderlineSpan::GetDashWidth() const +float UnderlineSpan::GetDashWidth() const { return mImpl->mUnderlineProperties.dashWidth; } diff --git a/dali-toolkit/internal/text/spannable/spans/underline-span-impl.h b/dali-toolkit/internal/text/spannable/spans/underline-span-impl.h index 9761979..023e3d4 100644 --- a/dali-toolkit/internal/text/spannable/spans/underline-span-impl.h +++ b/dali-toolkit/internal/text/spannable/spans/underline-span-impl.h @@ -103,7 +103,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetType() */ - const Text::Underline::Type GetType() const; + Text::Underline::Type GetType() const; /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsTypeDefined() @@ -113,7 +113,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetColor() */ - const Vector4 GetColor() const; + Vector4 GetColor() const; /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsColorDefined() @@ -123,7 +123,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetHeight() */ - const float GetHeight() const; + float GetHeight() const; /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsHeightDefined() @@ -133,7 +133,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetDashGap() */ - const float GetDashGap() const; + float GetDashGap() const; /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsDashGapDefined() @@ -143,7 +143,7 @@ public: //Methods /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::GetDashWidth() */ - const float GetDashWidth() const; + float GetDashWidth() const; /** * @copydoc Dali::Toolkit::Text::UnderlineSpan::IsDashWidthDefined() -- 2.7.4