From 9f4609c99a5ed97a5f92b413eb5bb144a2e6b0c0 Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Mon, 15 Apr 2024 13:23:21 +0900 Subject: [PATCH] Remove BaseHandle / BaseObject TypeTraits is trivialgit Since Dali::Vector doesn't call destructor, BaseHandle / BaseObject shoudl 'not' be used as Dali::Vector. To avoid some memory leak mistake, let we remove some mis implementations Change-Id: I001993d10812bddc0beb888d41e6bc316301484b Signed-off-by: Eunki, Hong --- dali-toolkit/devel-api/text/range.h | 12 +----------- dali-toolkit/devel-api/text/spans/base-span.h | 12 +----------- .../internal/text/spannable/span-ranges-container-impl.h | 12 +----------- dali-toolkit/internal/text/spannable/spannable-impl.h | 12 +----------- dali-toolkit/internal/text/spannable/spannable-string-impl.h | 12 +----------- dali-toolkit/internal/text/spannable/spanned-impl.h | 12 +----------- dali-toolkit/internal/text/spannable/spans/base-span-impl.h | 12 +----------- .../internal/text/string-text/character-sequence-impl.h | 12 +----------- dali-toolkit/internal/text/string-text/range-impl.h | 12 +----------- 9 files changed, 9 insertions(+), 99 deletions(-) diff --git a/dali-toolkit/devel-api/text/range.h b/dali-toolkit/devel-api/text/range.h index 14538fd..2a43766 100644 --- a/dali-toolkit/devel-api/text/range.h +++ b/dali-toolkit/devel-api/text/range.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_RANGE_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -144,16 +144,6 @@ public: //Methods } // namespace Toolkit -// Allow Range to be treated as a POD type -template<> -struct TypeTraits : public BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_TEXT_RANGE_H diff --git a/dali-toolkit/devel-api/text/spans/base-span.h b/dali-toolkit/devel-api/text/spans/base-span.h index e3f7f29..5769965 100644 --- a/dali-toolkit/devel-api/text/spans/base-span.h +++ b/dali-toolkit/devel-api/text/spans/base-span.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_BASE_SPAN_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -122,16 +122,6 @@ public: // Not intended for application developers } // namespace Toolkit -// Allow BaseSpan to be treated as a POD type -template<> -struct TypeTraits : public BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_TEXT_BASE_SPAN_H diff --git a/dali-toolkit/internal/text/spannable/span-ranges-container-impl.h b/dali-toolkit/internal/text/spannable/span-ranges-container-impl.h index f89846e..ffbef1e 100644 --- a/dali-toolkit/internal/text/spannable/span-ranges-container-impl.h +++ b/dali-toolkit/internal/text/spannable/span-ranges-container-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_SPANS_CONTAINER_IMPL_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -121,16 +121,6 @@ private: } // namespace Toolkit -// Allow SpanRangesContainer to be treated as a POD type -template<> -struct TypeTraits : public Dali::BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_INTERNAL_TEXT_SPANS_CONTAINER_IMPL_H diff --git a/dali-toolkit/internal/text/spannable/spannable-impl.h b/dali-toolkit/internal/text/spannable/spannable-impl.h index 0b56043..40b388a 100644 --- a/dali-toolkit/internal/text/spannable/spannable-impl.h +++ b/dali-toolkit/internal/text/spannable/spannable-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_IMPL_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -102,16 +102,6 @@ inline const Internal::Spannable& GetImplementation(const Dali::Toolkit::Text::S } // namespace Toolkit -// Allow Spannable to be treated as a POD type -template<> -struct TypeTraits : public Dali::BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_IMPL_H diff --git a/dali-toolkit/internal/text/spannable/spannable-string-impl.h b/dali-toolkit/internal/text/spannable/spannable-string-impl.h index 5ecb823..5dccab4 100644 --- a/dali-toolkit/internal/text/spannable/spannable-string-impl.h +++ b/dali-toolkit/internal/text/spannable/spannable-string-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_STRING_IMPL_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -144,16 +144,6 @@ inline const Internal::SpannableString& GetImplementation(const Dali::Toolkit::T } // namespace Toolkit -// Allow SpannableString to be treated as a POD type -template<> -struct TypeTraits : public Dali::BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_INTERNAL_TEXT_SPANNABLE_STRING_IMPL_H diff --git a/dali-toolkit/internal/text/spannable/spanned-impl.h b/dali-toolkit/internal/text/spannable/spanned-impl.h index 4e5a8c7..e6c18cd 100644 --- a/dali-toolkit/internal/text/spannable/spanned-impl.h +++ b/dali-toolkit/internal/text/spannable/spanned-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_SPANNED_IMPL_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -103,16 +103,6 @@ inline const Internal::Spanned& GetImplementation(const Dali::Toolkit::Text::Spa } // namespace Toolkit -// Allow Spanned to be treated as a POD type -template<> -struct TypeTraits : public Dali::BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_INTERNAL_TEXT_SPANNED_IMPL_H 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 5f01524..cd2f850 100644 --- a/dali-toolkit/internal/text/spannable/spans/base-span-impl.h +++ b/dali-toolkit/internal/text/spannable/spans/base-span-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_BASE_SPAN_IMPL_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -116,16 +116,6 @@ inline const Internal::BaseSpan& GetImplementation(const Dali::Toolkit::Text::Ba } // namespace Toolkit -// Allow BaseSpan to be treated as a POD type -template<> -struct TypeTraits : public Dali::BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_INTERNAL_TEXT_BASE_SPAN_IMPL_H diff --git a/dali-toolkit/internal/text/string-text/character-sequence-impl.h b/dali-toolkit/internal/text/string-text/character-sequence-impl.h index d04883b..27312b7 100644 --- a/dali-toolkit/internal/text/string-text/character-sequence-impl.h +++ b/dali-toolkit/internal/text/string-text/character-sequence-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_CHARACTER_SEQUENCE_IMPL_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -109,16 +109,6 @@ inline const Internal::CharacterSequence& GetImplementation(const Dali::Toolkit: } // namespace Toolkit -// Allow AbstractStyleSpan to be treated as a POD type -template<> -struct TypeTraits : public Dali::BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_INTERNAL_TEXT_CHARACTER_SEQUENCE_IMPL_H diff --git a/dali-toolkit/internal/text/string-text/range-impl.h b/dali-toolkit/internal/text/string-text/range-impl.h index 8b0f0d2..b4e6c1a 100644 --- a/dali-toolkit/internal/text/string-text/range-impl.h +++ b/dali-toolkit/internal/text/string-text/range-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_RANGE_IMPL_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2024 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -126,16 +126,6 @@ inline const Internal::Range& GetImplementation(const Dali::Toolkit::Text::Range } // namespace Toolkit -// Allow Range to be treated as a POD type -template<> -struct TypeTraits : public Dali::BasicTypes -{ - enum - { - IS_TRIVIAL_TYPE = true - }; -}; - } // namespace Dali #endif // DALI_TOOLKIT_INTERNAL_TEXT_RANGE_IMPL_H -- 2.7.4