From: Heeyong Song Date: Tue, 29 Jan 2019 07:38:50 +0000 (+0000) Subject: Merge "(AnimatedVectorImageVisual) Change renderer on stage again" into devel/master X-Git-Tag: dali_1.4.5~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7c1ca2d9ab3bc63f3dc164c4f5d4ea0d8bf5ba3e;hp=cb624d6e60bfb8032e81f8adc71e14ebedc7e260 Merge "(AnimatedVectorImageVisual) Change renderer on stage again" into devel/master --- diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-DebugRendering.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-DebugRendering.cpp index 0cc5c2d..71641fb 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-DebugRendering.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-DebugRendering.cpp @@ -41,7 +41,10 @@ const std::string DEFAULT_FONT_DIR( "/resources/fonts" ); void TestDebugVisual( Visual::Base& visual, Visual::Type actualType, Vector2 expectedNaturalSize ) { - DALI_TEST_CHECK( &typeid( Toolkit::Internal::WireframeVisual ) == &typeid( GetImplementation(visual) ) ); + { + auto& impl = GetImplementation( visual ); + DALI_TEST_CHECK( &typeid( Toolkit::Internal::WireframeVisual ) == &typeid( impl ) ); + } Vector2 naturalSize; visual.GetNaturalSize( naturalSize ); @@ -177,7 +180,10 @@ int UtcDaliDebugRenderingGetVisual1(void) Visual::Base textVisual = factory.CreateVisual( propertyMap7 ); DALI_TEST_CHECK( textVisual ); - DALI_TEST_CHECK( &typeid( Toolkit::Internal::WireframeVisual ) == &typeid( GetImplementation(textVisual) ) ); + { + auto&& impl = GetImplementation( textVisual ); + DALI_TEST_CHECK( &typeid( Toolkit::Internal::WireframeVisual ) == &typeid( impl ) ); + } Vector2 naturalSize; textVisual.GetNaturalSize( naturalSize ); diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp index c87af41..92be479 100755 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Controller.cpp @@ -35,7 +35,6 @@ using namespace Text; namespace { -const char* const OPTION_SELECT_WORD("option-select_word"); // "Select Word" popup option. const char* const OPTION_SELECT_ALL("option-select_all"); // "Select All" popup option. const char* const OPTION_CUT("optionCut"); // "Cut" popup option. const char* const OPTION_COPY("optionCopy"); // "Copy" popup option. diff --git a/automated-tests/src/dali-toolkit/custom-layout-impl.h b/automated-tests/src/dali-toolkit/custom-layout-impl.h index 06c67e0..375b491 100644 --- a/automated-tests/src/dali-toolkit/custom-layout-impl.h +++ b/automated-tests/src/dali-toolkit/custom-layout-impl.h @@ -2,7 +2,7 @@ #define TEST_INTERNAL_CUSTOM_LAYOUT_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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,6 +109,8 @@ private: */ void MeasureChildren( Dali::Toolkit::Internal::LayoutItemPtr childLayout, MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec, LayoutLength resultingWidth, LayoutLength resultingHeight ); + using Dali::Toolkit::Internal::LayoutGroup::MeasureChildren; ///< To tell the compiler that we really do want to overload MeasureChildren in this class & were not trying to override it + private: int mBehaviourFlags; // flags to alter behaviour of this custom layout diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp index bef3271..5b478ba 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-text-abstraction.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -101,8 +101,7 @@ class FontClient : public BaseObject { public: FontClient() - : mDpiHorizontal( 0 ), - mDpiVertical( 0 ) + : mGlyphInfo() { } @@ -163,8 +162,6 @@ public: const GlyphInfo& GetEllipsisGlyph( PointSize26Dot6 pointSize ){return mGlyphInfo;} bool IsColorGlyph( FontId fontId, GlyphIndex glyphIndex ){return false;} private: - unsigned int mDpiHorizontal; - unsigned int mDpiVertical; GlyphInfo mGlyphInfo; }; // class FontClient @@ -172,8 +169,11 @@ private: class Shaping : public BaseObject { public: - Shaping() : mText(NULL) - {} + Shaping() + : mText( NULL ), + mNumChars( 0 ) + { + } ~Shaping() { @@ -255,13 +255,6 @@ inline static TextAbstraction::Internal::FontClient& GetImplementation(TextAbstr return static_cast(handle); } -inline static const TextAbstraction::Internal::FontClient& GetImplementation(const TextAbstraction::FontClient& fontClient) -{ - DALI_ASSERT_ALWAYS( fontClient && "fontClient handle is empty" ); - const BaseObject& handle = fontClient.GetBaseObject(); - return static_cast(handle); -} - inline static TextAbstraction::Internal::Shaping& GetImplementation(TextAbstraction::Shaping& shaping) { DALI_ASSERT_ALWAYS( shaping && "shaping handle is empty" ); @@ -269,13 +262,6 @@ inline static TextAbstraction::Internal::Shaping& GetImplementation(TextAbstract return static_cast(handle); } -inline static const TextAbstraction::Internal::Shaping& GetImplementation(const TextAbstraction::Shaping& shaping) -{ - DALI_ASSERT_ALWAYS( shaping && "shaping handle is empty" ); - const BaseObject& handle = shaping.GetBaseObject(); - return static_cast(handle); -} - //////////////////////////////////////////////////////////////////////////////// /******************************************************************************/ diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp index 52e2d41..b79213d 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-video-player.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -34,11 +34,15 @@ class VideoPlayer: public Dali::BaseObject public: VideoPlayer() + : mUrl(), + mVolumeLeft( 0.0f ), + mVolumeRight( 0.0f ), + mFinishedSignal(), + mMuted( false ), + mLooping( false), + mPlayPosition( 0 ), + mDisplyMode( Dali::VideoPlayerPlugin::DisplayMode::DST_ROI ) { - mMuted = false; - mLooping = false; - mPlayPosition = 0; - mDisplyMode = Dali::VideoPlayerPlugin::DisplayMode::DST_ROI; } void SetMuted( bool muted ) @@ -84,9 +88,9 @@ public: return mDisplyMode; } - void SetDisplayMode( Dali::VideoPlayerPlugin::DisplayMode::Type mDisplyMode ) + void SetDisplayMode( Dali::VideoPlayerPlugin::DisplayMode::Type mode ) { - mDisplyMode = mDisplyMode; + mDisplyMode = mode; } diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp index e9c092d..73067bb 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -48,8 +48,6 @@ namespace static bool gIsCalledButtonCallback = false; static bool gIsCalledChildButtonCallback = false; -const int RENDER_FRAME_INTERVAL = 16; - static bool ButtonCallback( Button button ) { gIsCalledButtonCallback = true; @@ -1141,4 +1139,4 @@ int UtcDaliButtonMultiTouch(void) DALI_TEST_EQUALS( gIsCalledButtonCallback, true, TEST_LOCATION ); END_TEST; -} \ No newline at end of file +} diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp index cc1a62e..8e1673e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -78,9 +78,11 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper mDaliProperty( Property::INVALID_INDEX ), mSizeSet( Vector3::ZERO ), mTargetSize( Vector3::ZERO ), - mNego( nego ) + mNego( nego ), + mDepth( 0u ) { } + /** * Destructor */ @@ -95,6 +97,7 @@ struct TestCustomControl : public Toolkit::Internal::ControlWrapper OnInitialize( name ); } + using Control::OnInitialize; ///< To tell the compiler that we really do want to overload OnInitialize in this class & were not trying to override it virtual void OnInitialize( const char* name ) {} // From Toolkit::Internal::ControlWrapper diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp index 85ba766..f7d5908 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -185,9 +185,8 @@ class TestPageFactory : public PageFactory { public: - TestPageFactory(ToolkitTestApplication& application, bool returnValidTexture = true ) - : mApplication( application ), - mValidTexture( returnValidTexture ) + TestPageFactory( bool returnValidTexture = true ) + : mValidTexture( returnValidTexture ) { mTotalPageNumber = TOTAL_PAGE_NUMBER; } @@ -216,7 +215,6 @@ public: } private: - ToolkitTestApplication& mApplication; unsigned int mTotalPageNumber; bool mValidTexture; }; @@ -244,7 +242,7 @@ int UtcDaliPageTurnPortraitViewNew(void) DALI_TEST_CHECK( !portraitView ); // Test object creation - TestPageFactory factory(application); + TestPageFactory factory; portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE ); DALI_TEST_CHECK( portraitView ); @@ -255,7 +253,7 @@ int UtcDaliPageTurnPortraitViewNew(void) gObjectCreatedCallBackCalled = false; registry.ObjectCreatedSignal().Connect( &TestCallback ); { - TestPageFactory factory(application); + TestPageFactory factory; PageTurnView portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE ); } DALI_TEST_CHECK( gObjectCreatedCallBackCalled ); @@ -284,7 +282,7 @@ int UtcDaliPageTurnLandscapeViewNew(void) DALI_TEST_CHECK( !landscapeView ); // Test object creation - TestPageFactory factory(application); + TestPageFactory factory; landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE ); DALI_TEST_CHECK( landscapeView ); @@ -295,7 +293,7 @@ int UtcDaliPageTurnLandscapeViewNew(void) gObjectCreatedCallBackCalled = false; registry.ObjectCreatedSignal().Connect( &TestCallback ); { - TestPageFactory factory(application); + TestPageFactory factory; PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE ); } DALI_TEST_CHECK( gObjectCreatedCallBackCalled ); @@ -324,7 +322,7 @@ int UtcDaliPageTurnPortraitViewCopyConstructorAndAssignment(void) DALI_TEST_CHECK( !portraitView ); // Test object creation - TestPageFactory factory(application); + TestPageFactory factory; portraitView = PageTurnPortraitView::New( factory, PAGE_SIZE ); DALI_TEST_CHECK( portraitView ); @@ -358,7 +356,7 @@ int UtcDaliPageTurnLandscapeViewCopyConstructorAndAssignment(void) DALI_TEST_CHECK( !landscapeView ); // Test object creation - TestPageFactory factory(application); + TestPageFactory factory; landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE ); DALI_TEST_CHECK( landscapeView ); @@ -387,7 +385,7 @@ int UtcDaliPageTurnViewSetGetProperty(void) tet_infoline(" UtcDaliPageTurnViewSetGetProperty "); - TestPageFactory factory(application); + TestPageFactory factory; PageTurnView landscapeView = PageTurnLandscapeView::New( factory, PAGE_SIZE ); DALI_TEST_CHECK( landscapeView ); @@ -438,7 +436,7 @@ int UtcDaliPageTurnPortraitViewSignals(void) application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - TestPageFactory factory(application); + TestPageFactory factory; Vector2 size = Stage::GetCurrent().GetSize(); PageTurnView portraitView = PageTurnPortraitView::New( factory, size ); portraitView.SetParentOrigin( ParentOrigin::CENTER ); @@ -575,7 +573,7 @@ int UtcDaliPageTurnLanscapeViewSignals(void) * ---------------- */ - TestPageFactory factory(application); + TestPageFactory factory; Vector2 stageSize = Stage::GetCurrent().GetSize(); PageTurnView landscapeView = PageTurnLandscapeView::New( factory, Vector2(stageSize.x*0.5f, stageSize.x*0.8f) ); landscapeView.SetParentOrigin( ParentOrigin::CENTER ); @@ -687,7 +685,7 @@ int UtcDaliPageTurnLanscapeViewSignals(void) int UtcDaliPageImageFactoryGetExtention(void) { ToolkitTestApplication application; - TestPageFactory factory(application); + TestPageFactory factory; DALI_TEST_CHECK( factory.GetExtension() == NULL ); END_TEST; } @@ -700,7 +698,7 @@ int UtcDaliPageTurnEmptyTextureHandle(void) application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - TestPageFactory factory(application, false); // returns empty handles + TestPageFactory factory( false /* returns empty handles */ ); Vector2 size = Stage::GetCurrent().GetSize(); try { diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp index 99613a5..a59a708 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -58,26 +58,19 @@ struct CallbackFunctor bool* mCallbackFlag; }; -const int MILLISECONDS_PER_SECOND = 1000; const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS) -const int RENDER_ANIMATION_TEST_DURATION_MS = 1000; ///< 1000ms to test animation const int RENDER_DELAY_SCROLL = 1000; ///< duration to wait for any scroll to complete. // For Clamp Signal testing... const float CLAMP_EXCESS_WIDTH = 200.0f; ///< Amount of width that can be panned outside scrollview const float CLAMP_EXCESS_HEIGHT = 200.0f; ///< Amount of height that can be panned outside scrollview -const int CLAMP_STEP_0_CHECK_NOTCLAMPED = 0; ///< FSM: "First check that scrollview isn't clamped" -const int CLAMP_STEP_1_CHECK_CLAMPED_WEST = 1; ///< FSM: "Next check that scrollview clamps against left side" -const int CLAMP_STEP_2_CHECK_CLAMPED_SOUTH_WEST = 2; ///< FSM: "Then check that scrollview clamps against bottom-left side" -const int CLAMP_STEP_3_SUCCESS = 3; ///< FSM: "Finished (Success)" const Vector2 CLAMP_START_SCROLL_POSITION(30.0f, 100.0f); ///< Scroll start position for the Clamping tests. const Vector2 CLAMP_TOUCH_START( 100.0f, 100.0f ); ///< Start point to touch from for the Clamping tests. const Vector2 CLAMP_TOUCH_MOVEMENT( 5.0f, -5.0f ); ///< Amount to move touch for each frame for the Clamping tests. const int CLAMP_GESTURE_FRAMES = 100; ///< Number of Frames to synthesize a gesture for the Clamping tests. const Vector3 TEST_ACTOR_POSITION(100.0f, 100.0f, 0.0f); ///< A Test actor position offset (arbitrary value) const Vector3 TEST_CONSTRAINT_OFFSET(1.0f, 2.0f, 0.0f); ///< A Test constraint offset (arbitrary value to test effects) -const float TEST_RATIO_TOLERANCE = 0.05; ///< +/-5% tolerance for ratio comparisons. const float DEFAULT_SNAP_OVERSHOOT_DURATION(0.5f); ///< Default overshoot snapping animation time. const float DEFAULT_MAX_OVERSHOOT(100.0f); ///< Default maximum allowed overshoot in pixels diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp index 94cc011..3e3b0e3 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextEditor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -104,19 +104,11 @@ const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE = "enableGr const char* const PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION = "matchSystemLanguageDirection"; -const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND; - const Vector4 PLACEHOLDER_TEXT_COLOR( 0.8f, 0.8f, 0.8f, 0.8f ); const Dali::Vector4 LIGHT_BLUE( 0.75f, 0.96f, 1.f, 1.f ); // The text highlight color. -const unsigned int CURSOR_BLINK_INTERVAL = 500u; // Cursor blink interval -const float TO_MILLISECONDS = 1000.f; -const float TO_SECONDS = 1.f / TO_MILLISECONDS; const float RENDER_FRAME_INTERVAL = 16.66f; -const float SCROLL_THRESHOLD = 10.f; -const float SCROLL_SPEED = 300.f; - const unsigned int DEFAULT_FONT_SIZE = 1152u; const std::string DEFAULT_FONT_DIR( "/resources/fonts" ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp index 8c1eecd..39cd605 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextField.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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,20 +103,11 @@ const char* const PROPERTY_NAME_ENABLE_SHIFT_SELECTION = "enableSh const char* const PROPERTY_NAME_ENABLE_GRAB_HANDLE = "enableGrabHandle"; const char* const PROPERTY_NAME_MATCH_SYSTEM_LANGUAGE_DIRECTION = "matchSystemLanguageDirection"; -const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND; - const Vector4 PLACEHOLDER_TEXT_COLOR( 0.8f, 0.8f, 0.8f, 0.8f ); const Dali::Vector4 LIGHT_BLUE( 0.75f, 0.96f, 1.f, 1.f ); // The text highlight color. -const unsigned int CURSOR_BLINK_INTERVAL = 500u; // Cursor blink interval const float RENDER_FRAME_INTERVAL = 16.66f; -const float TO_MILLISECONDS = 1000.f; -const float TO_SECONDS = 1.f / TO_MILLISECONDS; - -const float SCROLL_THRESHOLD = 10.f; -const float SCROLL_SPEED = 300.f; - const unsigned int DEFAULT_FONT_SIZE = 1152u; const std::string DEFAULT_FONT_DIR( "/resources/fonts" ); diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp index 67dc221..551acf2 100755 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp @@ -67,7 +67,6 @@ const char* const PROPERTY_NAME_PIXEL_SIZE = "pixelSize"; const char* const PROPERTY_NAME_ELLIPSIS = "ellipsis"; const char* const PROPERTY_NAME_AUTO_SCROLL_LOOP_DELAY = "autoScrollLoopDelay"; -const int DEFAULT_RENDERING_BACKEND = Dali::Toolkit::Text::DEFAULT_RENDERING_BACKEND; const std::string DEFAULT_FONT_DIR( "/resources/fonts" ); const unsigned int EMOJI_FONT_SIZE = 3840u; // 60 * 64 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp index 99cd40e..a9cf36b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -93,7 +93,7 @@ int UtcDaliToolBarNew(void) DALI_TEST_CHECK( gObjectCreatedCallBackCalled ); Actor actor = toolbar; - toolbar == ToolBar::DownCast( actor ); + toolbar = ToolBar::DownCast( actor ); DALI_TEST_CHECK( toolbar ); END_TEST; diff --git a/dali-toolkit/devel-api/layouting/layout-group.h b/dali-toolkit/devel-api/layouting/layout-group.h index 4962032..45aec98 100755 --- a/dali-toolkit/devel-api/layouting/layout-group.h +++ b/dali-toolkit/devel-api/layouting/layout-group.h @@ -1,7 +1,7 @@ #ifndef DALI_TOOLKIT_LAYOUTING_LAYOUT_GROUP_H #define DALI_TOOLKIT_LAYOUTING_LAYOUT_GROUP_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -54,14 +54,6 @@ public: using LayoutId = unsigned int; static const unsigned int UNKNOWN_ID = 0; - struct ChildProperty - { - enum - { - }; - }; - - /** * @brief Creates an uninitialized LayoutGroup handle. * diff --git a/dali-toolkit/devel-api/shader-effects/dissolve-effect.h b/dali-toolkit/devel-api/shader-effects/dissolve-effect.h index b0660be..a4ae564 100644 --- a/dali-toolkit/devel-api/shader-effects/dissolve-effect.h +++ b/dali-toolkit/devel-api/shader-effects/dissolve-effect.h @@ -1,8 +1,8 @@ -#ifndef DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H_ +#ifndef DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H #define DALI_TOOLKIT_SHADER_EFFECT_DISSOLVE_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. diff --git a/dali-toolkit/devel-api/visual-factory/visual-factory.h b/dali-toolkit/devel-api/visual-factory/visual-factory.h index 454919a..0a86754 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-factory.h +++ b/dali-toolkit/devel-api/visual-factory/visual-factory.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_VISUAL_FACTORY_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -29,7 +29,7 @@ namespace Dali { class Image; -class Vector4; +struct Vector4; namespace Toolkit { diff --git a/dali-toolkit/internal/helpers/color-conversion.h b/dali-toolkit/internal/helpers/color-conversion.h index dcd51bd..2838dc3 100644 --- a/dali-toolkit/internal/helpers/color-conversion.h +++ b/dali-toolkit/internal/helpers/color-conversion.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_COLOR_CONVERSION_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -24,7 +24,7 @@ namespace Dali { -class Vector4; +struct Vector4; namespace Toolkit { diff --git a/dali-toolkit/internal/text/text-model.h b/dali-toolkit/internal/text/text-model.h index 688eac4..f4fbd7b 100755 --- a/dali-toolkit/internal/text/text-model.h +++ b/dali-toolkit/internal/text/text-model.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_MODEL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -61,27 +61,27 @@ public: /** * @copydoc ModelInterface::GetControlSize() */ - virtual const Size& GetControlSize() const; + virtual const Size& GetControlSize() const override; /** * @copydoc ModelInterface::GetLayoutSize() */ - virtual const Size& GetLayoutSize() const; + virtual const Size& GetLayoutSize() const override; /** * @copydoc ModelInterface::GetScrollPosition() */ - virtual const Vector2& GetScrollPosition() const; + virtual const Vector2& GetScrollPosition() const override; /** * @copydoc ModelInterface::GetHorizontalAlignment() */ - virtual HorizontalAlignment::Type GetHorizontalAlignment() const; + virtual HorizontalAlignment::Type GetHorizontalAlignment() const override; /** * @copydoc ModelInterface::GetVerticalAlignment() */ - virtual VerticalAlignment::Type GetVerticalAlignment() const; + virtual VerticalAlignment::Type GetVerticalAlignment() const override; /** * @copydoc ModelInterface::GetVerticalLineAlignment() @@ -91,117 +91,117 @@ public: /** * @copydoc ModelInterface::IsTextElideEnabled() */ - virtual bool IsTextElideEnabled() const; + virtual bool IsTextElideEnabled() const override; /** * @copydoc ModelInterface::GetNumberOfLines() */ - virtual Length GetNumberOfLines() const; + virtual Length GetNumberOfLines() const override; /** * @copydoc ModelInterface::GetLines() */ - virtual const LineRun* const GetLines() const; + virtual const LineRun* const GetLines() const override; /** * @copydoc ModelInterface::GetNumberOfScripts() */ - virtual Length GetNumberOfScripts() const; + virtual Length GetNumberOfScripts() const override; /** * @copydoc ModelInterface::GetScriptRuns() */ - virtual const ScriptRun* const GetScriptRuns() const; + virtual const ScriptRun* const GetScriptRuns() const override; /** * @copydoc ModelInterface::GetNumberOfGlyphs() */ - virtual Length GetNumberOfGlyphs() const; + virtual Length GetNumberOfGlyphs() const override; /** * @copydoc ModelInterface::GetGlyphs() */ - virtual const GlyphInfo* const GetGlyphs() const; + virtual const GlyphInfo* const GetGlyphs() const override; /** * @copydoc ModelInterface::GetLayout() */ - virtual const Vector2* const GetLayout() const; + virtual const Vector2* const GetLayout() const override; /** * @copydoc ModelInterface::GetColors() */ - virtual const Vector4* const GetColors() const; + virtual const Vector4* const GetColors() const override; /** * @copydoc ModelInterface::GetColorIndices() */ - virtual const ColorIndex* const GetColorIndices() const; + virtual const ColorIndex* const GetColorIndices() const override; /** * @copydoc ModelInterface::GetDefaultColor() */ - virtual const Vector4& GetDefaultColor() const; + virtual const Vector4& GetDefaultColor() const override; /** * @copydoc ModelInterface::GetShadowOffset() */ - virtual const Vector2& GetShadowOffset() const; + virtual const Vector2& GetShadowOffset() const override; /** * @copydoc ModelInterface::GetShadowColor() */ - virtual const Vector4& GetShadowColor() const; + virtual const Vector4& GetShadowColor() const override; /** * @copydoc ModelInterface::GetShadowBlurRadius() */ - virtual const float& GetShadowBlurRadius() const; + virtual const float& GetShadowBlurRadius() const override; /** * @copydoc ModelInterface::GetUnderlineColor() */ - virtual const Vector4& GetUnderlineColor() const; + virtual const Vector4& GetUnderlineColor() const override; /** * @copydoc ModelInterface::IsUnderlineEnabled() */ - virtual bool IsUnderlineEnabled() const; + virtual bool IsUnderlineEnabled() const override; /** * @copydoc ModelInterface::GetUnderlineHeight() */ - virtual float GetUnderlineHeight() const; + virtual float GetUnderlineHeight() const override; /** * @copydoc ModelInterface::GetNumberOfUnderlineRuns() */ - virtual Length GetNumberOfUnderlineRuns() const; + virtual Length GetNumberOfUnderlineRuns() const override; /** * @copydoc ModelInterface::GetUnderlineRuns() */ - virtual void GetUnderlineRuns( GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns ) const; + virtual void GetUnderlineRuns( GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns ) const override; /** * @copydoc ModelInterface::GetOutlineColor() */ - virtual const Vector4& GetOutlineColor() const; + virtual const Vector4& GetOutlineColor() const override; /** * @copydoc ModelInterface::GetOutlineWidth() */ - virtual float GetOutlineWidth() const; + virtual float GetOutlineWidth() const override; /** * @copydoc ModelInterface::GetBackgroundColor() */ - virtual const Vector4& GetBackgroundColor() const; + virtual const Vector4& GetBackgroundColor() const override; /** * @copydoc ModelInterface::IsBackgroundEnabled() */ - virtual bool IsBackgroundEnabled() const; + virtual bool IsBackgroundEnabled() const override; private: // Private contructors & copy operator. diff --git a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h index ab480d9..28e820a 100755 --- a/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h +++ b/dali-toolkit/internal/visuals/animated-gradient/animated-gradient-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_ANIMATED_GRADIENT_VISUAL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -173,12 +173,12 @@ private: //from Visual /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -199,22 +199,22 @@ protected: //from Visual /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ); + void DoSetOffStage( Actor& actor ) override; private: diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h index dcd48ce..791783d 100755 --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_ANIMATED_IMAGE_VISUAL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -123,22 +123,22 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::OnDoAction */ - virtual void OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) override; + void OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) override; protected: @@ -158,7 +158,7 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * Helper method to set individual values by index key. @@ -170,17 +170,17 @@ protected: /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ); + void DoSetOffStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; private: /** diff --git a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h index 570b2d7..ceb9fff 100644 --- a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h +++ b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_FIXED_IMAGE_CACHE_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -52,14 +52,14 @@ public: * Get the first frame. If it's not ready, this will trigger the * sending of FrameReady() when the image becomes ready. */ - virtual TextureSet FirstFrame(); + TextureSet FirstFrame() override; /** * Get the next frame. If it's not ready, this will trigger the * sending of FrameReady() when the image becomes ready. * This will trigger the loading of the next batch. */ - virtual TextureSet NextFrame(); + TextureSet NextFrame() override; private: /** @@ -90,7 +90,7 @@ private: void CheckFrontFrame( bool wasReady ); protected: - virtual void UploadComplete( + void UploadComplete( bool loadSuccess, int32_t textureId, TextureSet textureSet, diff --git a/dali-toolkit/internal/visuals/animated-image/image-cache.h b/dali-toolkit/internal/visuals/animated-image/image-cache.h index e8277de..ef1efed 100644 --- a/dali-toolkit/internal/visuals/animated-image/image-cache.h +++ b/dali-toolkit/internal/visuals/animated-image/image-cache.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_IMAGE_CACHE_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -86,10 +86,11 @@ public: virtual TextureSet NextFrame() = 0; private: + /** * Called before the texture manager is destroyed. */ - virtual void TextureManagerDestroyed() override final; + void TextureManagerDestroyed() final; protected: TextureManager& mTextureManager; diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-gif-image-cache.h b/dali-toolkit/internal/visuals/animated-image/rolling-gif-image-cache.h index d912ab3..981274c 100644 --- a/dali-toolkit/internal/visuals/animated-image/rolling-gif-image-cache.h +++ b/dali-toolkit/internal/visuals/animated-image/rolling-gif-image-cache.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_ROLLING_GIF_IMAGE_CACHE_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -68,14 +68,14 @@ public: * Get the first frame. If it's not ready, this will trigger the * sending of FrameReady() when the image becomes ready. */ - virtual TextureSet FirstFrame(); + TextureSet FirstFrame() override; /** * Get the next frame. If it's not ready, this will trigger the * sending of FrameReady() when the image becomes ready. * This will trigger the loading of the next batch. */ - virtual TextureSet NextFrame(); + TextureSet NextFrame() override; private: /** diff --git a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h index 76a79ec..c5650cf 100644 --- a/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h +++ b/dali-toolkit/internal/visuals/animated-image/rolling-image-cache.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_ROLLING_IMAGE_CACHE_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -63,14 +63,14 @@ public: * Get the first frame. If it's not ready, this will trigger the * sending of FrameReady() when the image becomes ready. */ - virtual TextureSet FirstFrame(); + TextureSet FirstFrame() override; /** * Get the next frame. If it's not ready, this will trigger the * sending of FrameReady() when the image becomes ready. * This will trigger the loading of the next batch. */ - virtual TextureSet NextFrame(); + TextureSet NextFrame() override; private: /** @@ -106,7 +106,7 @@ private: void CheckFrontFrame( bool wasReady ); protected: - virtual void UploadComplete( + void UploadComplete( bool loadSuccess, int32_t textureId, TextureSet textureSet, diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h index f0ec2cd..5d871f0 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_ANIMATED_VECTOR_IMAGE_VISUAL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -84,17 +84,17 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ) override; + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const override; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const override; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -115,27 +115,27 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ) override; + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ) override; + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ) override; + void DoSetOffStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform() override; + void OnSetTransform() override; /** * @copydoc Visual::Base::OnDoAction */ - virtual void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override; + void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override; private: diff --git a/dali-toolkit/internal/visuals/border/border-visual.h b/dali-toolkit/internal/visuals/border/border-visual.h index 473080b..db4ddb0 100644 --- a/dali-toolkit/internal/visuals/border/border-visual.h +++ b/dali-toolkit/internal/visuals/border/border-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_BORDER_VISUAL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -78,27 +78,27 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; public: diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h index 4b6dca6..64ff0b2 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.h +++ b/dali-toolkit/internal/visuals/color/color-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -63,12 +63,12 @@ public: // from Visual /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -87,17 +87,17 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; private: /** diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.h b/dali-toolkit/internal/visuals/gradient/gradient-visual.h index 9c84cf2..c67ee87 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.h +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -98,12 +98,12 @@ public: // from Visual /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -122,17 +122,17 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; private: diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index c693f0b..dcd76f6 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_IMAGE_VISUAL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -172,22 +172,22 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::OnDoAction */ - virtual void OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) override; + void OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) override; protected: @@ -227,27 +227,27 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ) ; + void DoSetOffStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform() ; + void OnSetTransform() override; /** * @copydoc Visual::Base::IsResourceReady */ - virtual bool IsResourceReady() const; + bool IsResourceReady() const override; public: @@ -257,7 +257,7 @@ public: * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready. * This callback is the place to add the renderer as it would be called once the loading is finished. */ - virtual void UploadCompleted() override; + void UploadCompleted() override; /** * @copydoc TextureUploadObserver::UploadCompleted @@ -265,8 +265,8 @@ public: * To avoid rendering garbage pixels, renderer should be added to actor after the resources are ready. * This callback is the place to add the renderer as it would be called once the loading is finished. */ - virtual void UploadComplete( bool success, int32_t textureId, TextureSet textureSet, - bool usingAtlas, const Vector4& atlasRectangle, bool preMultiplied ) override; + void UploadComplete( bool success, int32_t textureId, TextureSet textureSet, + bool usingAtlas, const Vector4& atlasRectangle, bool preMultiplied ) override; private: diff --git a/dali-toolkit/internal/visuals/mesh/mesh-visual.h b/dali-toolkit/internal/visuals/mesh/mesh-visual.h index 511ce49..99ed559 100644 --- a/dali-toolkit/internal/visuals/mesh/mesh-visual.h +++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_MESH_VISUAL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -73,12 +73,12 @@ public: // from Visual /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -97,17 +97,17 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; public: diff --git a/dali-toolkit/internal/visuals/npatch/npatch-visual.h b/dali-toolkit/internal/visuals/npatch/npatch-visual.h index d10e687..a761628 100644 --- a/dali-toolkit/internal/visuals/npatch/npatch-visual.h +++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_N_PATCH_VISUAL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -96,17 +96,17 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -125,22 +125,22 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ); + void DoSetOffStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; private: diff --git a/dali-toolkit/internal/visuals/primitive/primitive-visual.h b/dali-toolkit/internal/visuals/primitive/primitive-visual.h index 6b38bd7..e27239b 100644 --- a/dali-toolkit/internal/visuals/primitive/primitive-visual.h +++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_PRIMITIVE_VISUAL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -115,17 +115,17 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -144,17 +144,17 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; private: diff --git a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h index 46c6966..f30c459 100644 --- a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h +++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -183,7 +183,7 @@ protected: * The entry function of the worker thread. * It fetches task from the Queue, rasterizes the image and apply to the renderer. */ - virtual void Run(); + void Run() override; private: diff --git a/dali-toolkit/internal/visuals/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h index e516186..8fc2ad8 100644 --- a/dali-toolkit/internal/visuals/svg/svg-visual.h +++ b/dali-toolkit/internal/visuals/svg/svg-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -87,17 +87,17 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -117,22 +117,22 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ); + void DoSetOffStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; public: diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h index f1d7e12..6f47e45 100644 --- a/dali-toolkit/internal/visuals/text/text-visual.h +++ b/dali-toolkit/internal/visuals/text/text-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_TEXT_VISUAL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -128,22 +128,22 @@ public: // from Visual::Base /** * @copydoc Visual::Base::GetHeightForWidth() */ - virtual float GetHeightForWidth( float width ); + float GetHeightForWidth( float width ) override; /** * @copydoc Visual::Base::GetNaturalSize() */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap() */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -164,22 +164,22 @@ protected: /** * @copydoc Visual::Base::DoSetProperties() */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage() */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage() */ - virtual void DoSetOffStage( Actor& actor ); + void DoSetOffStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; private: /** diff --git a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h index d63cfa8..eb54b71 100644 --- a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h +++ b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_WIREFRAME_VISUAL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -96,44 +96,44 @@ protected: // from Visual::Base /** * @copydoc Visual::Base::GetHeightForWidth() */ - virtual float GetHeightForWidth( float width ); + float GetHeightForWidth( float width ) override; /** * @copydoc Visual::Base::GetNaturalSize() */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap() */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::DoSetProperties() */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; /** * @copydoc Visual::Base::GetVisualObject * * Overriding as this visual can sometimes act as a proxy to the actual visual, i.e. when using debug rendering. */ - virtual Base& GetVisualObject() override; + Base& GetVisualObject() override; private: /**