From: Victor Cebollada Date: Fri, 24 May 2019 06:07:34 +0000 (+0100) Subject: [dali_1.4.21] Merge branch 'devel/master' X-Git-Tag: dali_1.9.8~5^2~45 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=acbe10c62c46a30c58e08d8971a736f04e68dbf8;hp=b514a4671789bee2f03b0177393b9a21f62ac2c3 [dali_1.4.21] Merge branch 'devel/master' Change-Id: If84f1dddf4d5e842ebc334e64500b6e782909ec0 --- diff --git a/automated-tests/scripts/tcheadgen.sh b/automated-tests/scripts/tcheadgen.sh index dfd378a..c8cd679 100755 --- a/automated-tests/scripts/tcheadgen.sh +++ b/automated-tests/scripts/tcheadgen.sh @@ -28,8 +28,8 @@ awk -F',' -v HEADER_NAME="$HEADER_NAME" ' tc_array_counter = 0; tc_array_list[0] = ""; -print "#ifndef __" HEADER_NAME "__" -print "#define __" HEADER_NAME "__" +print "#ifndef " HEADER_NAME +print "#define " HEADER_NAME print "" print "#include \"testcase.h\"" print "" @@ -67,7 +67,7 @@ print " {" tc_array_list[i] "}," print " {NULL, NULL}" print "};" print "" -print "#endif // __" HEADER_NAME "__" +print "#endif // " HEADER_NAME }' $TFILE > $FILE unlink $TFILE diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dummy-visual.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dummy-visual.h index 23334ba..05cae85 100644 --- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dummy-visual.h +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/dummy-visual.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEST_DUMMY_VISUAL_H__ -#define __DALI_TOOLKIT_TEST_DUMMY_VISUAL_H__ +#ifndef DALI_TOOLKIT_TEST_DUMMY_VISUAL_H +#define DALI_TOOLKIT_TEST_DUMMY_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. @@ -94,4 +94,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEST_DUMMY_VISUAL_H__ +#endif // DALI_TOOLKIT_TEST_DUMMY_VISUAL_H diff --git a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h index 8ba7306..1e6d750 100644 --- a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h +++ b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_UTILS_H__ -#define __DALI_TOOLKIT_TEXT_UTILS_H__ +#ifndef DALI_TOOLKIT_TEXT_UTILS_H +#define DALI_TOOLKIT_TEXT_UTILS_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,4 +98,4 @@ void ConfigureTextEditor( ControllerPtr controller ); } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_UTILS_H__ +#endif // DALI_TOOLKIT_TEXT_UTILS_H 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 95f7697..e581626 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 @@ -1045,3 +1045,41 @@ int UtcDaliTextControllerSelectEvent(void) END_TEST; } + + +int UtcDaliTextControllerMaxLengthSetText(void) +{ + tet_infoline(" UtcDaliTextControllerMaxLengthSetText"); + ToolkitTestApplication application; + + // Creates a text controller. + ControllerPtr controller = Controller::New(); + + ConfigureTextLabel(controller); + + const Length MAX_TEXT_LENGTH = 1024u * 32u; + + // make over length world + int maxLength = (1024u * 32u) + 10u; + char world[maxLength]; + for( int i = 0; i < maxLength; i++ ) + { + world[i] = 'a'; + } + + // Set the text + std::string text(world); + controller->SetText( text ); + + // Perform a relayout + const Size size( Dali::Stage::GetCurrent().GetSize() ); + controller->Relayout(size); + + // check text length + controller->GetText( text ); + Length textSize = text.size(); + + DALI_TEST_EQUALS( MAX_TEXT_LENGTH, textSize, TEST_LOCATION ); + + END_TEST; +} diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h index 013d2c6..da96fac 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-toolkit-test-suite-utils.h @@ -1,5 +1,5 @@ -#ifndef __DALI_TOOLKIT_TEST_SUITE_UTILS_H__ -#define __DALI_TOOLKIT_TEST_SUITE_UTILS_H__ +#ifndef DALI_TOOLKIT_TEST_SUITE_UTILS_H +#define DALI_TOOLKIT_TEST_SUITE_UTILS_H /* * Copyright (c) 2019 Samsung Electronics Co., Ltd. @@ -33,4 +33,4 @@ std::ostream& operator<<( std::ostream& ostream, Dali::Toolkit::Visual::Resource #include "toolkit-input-method-context.h" #include "toolkit-clipboard-event-notifier.h" -#endif // __DALI_TOOLKIT_TEST_SUITE_UTILS_H__ +#endif // DALI_TOOLKIT_TEST_SUITE_UTILS_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h index d991a82..1f32459 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dummy-control.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEST_DUMMY_CONTROL_H__ -#define __DALI_TOOLKIT_TEST_DUMMY_CONTROL_H__ +#ifndef DALI_TOOLKIT_TEST_DUMMY_CONTROL_H +#define DALI_TOOLKIT_TEST_DUMMY_CONTROL_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. @@ -221,4 +221,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_TEST_DUMMY_CONTROL_H__ +#endif // DALI_TOOLKIT_TEST_DUMMY_CONTROL_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h index 27aafd3..99cb1ce 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-application.h @@ -1,5 +1,5 @@ -#ifndef __DALI_TEST_APPLICATION_H__ -#define __DALI_TEST_APPLICATION_H__ +#ifndef DALI_TEST_APPLICATION_H +#define DALI_TEST_APPLICATION_H /* * Copyright (c) 2019 Samsung Electronics Co., Ltd. @@ -114,4 +114,4 @@ protected: } // Dali -#endif +#endif // DALI_TEST_APPLICATION_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h index c2db8d2..775d209 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h @@ -1,8 +1,8 @@ -#ifndef __TEST_GL_SYNC_ABSTRACTION_H__ -#define __TEST_GL_SYNC_ABSTRACTION_H__ +#ifndef TEST_GL_SYNC_ABSTRACTION_H +#define TEST_GL_SYNC_ABSTRACTION_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. @@ -120,4 +120,4 @@ private: } // Dali -#endif // __TEST_GL_SYNC_ABSTRACTION_H__ +#endif // TEST_GL_SYNC_ABSTRACTION_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-intrusive-ptr.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-intrusive-ptr.h index 03aafe3..5fb17da 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-intrusive-ptr.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-intrusive-ptr.h @@ -1,8 +1,8 @@ -#ifndef __TEST_INTRUSIVE_PTR_H__ -#define __TEST_INTRUSIVE_PTR_H__ +#ifndef TEST_INTRUSIVE_PTR_H +#define TEST_INTRUSIVE_PTR_H /* - * Copyright (c) 2014 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. @@ -55,6 +55,6 @@ struct UtcCoverageIntrusivePtr } // Dali -#endif +#endif // TEST_INTRUSIVE_PTR_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h index a664107..0c215b7 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-native-image.h @@ -1,8 +1,8 @@ -#ifndef __TEST_NATIVE_IMAGE_H__ -#define __TEST_NATIVE_IMAGE_H__ +#ifndef TEST_NATIVE_IMAGE_H +#define TEST_NATIVE_IMAGE_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. @@ -100,4 +100,4 @@ public: } // Dali -#endif +#endif // TEST_NATIVE_IMAGE_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h index 7c785f1..d44e7b6 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-render-controller.h @@ -1,8 +1,8 @@ -#ifndef __TEST_RENDER_CONTROLLER_H__ -#define __TEST_RENDER_CONTROLLER_H__ +#ifndef TEST_RENDER_CONTROLLER_H +#define TEST_RENDER_CONTROLLER_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. @@ -51,4 +51,4 @@ private: } // Dali -#endif +#endif // TEST_RENDER_CONTROLLER_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h index 28caca9..3a623cb 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-touch-utils.h @@ -1,8 +1,8 @@ -#ifndef _TEST_TOUCH_UTILS_H_ -#define _TEST_TOUCH_UTILS_H_ +#ifndef TEST_TOUCH_UTILS_H +#define TEST_TOUCH_UTILS_H /* - * Copyright (c) 2014 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,4 +78,4 @@ struct TouchEventDataFunctor } // namespace Dali -#endif // _TEST_TOUCH_UTILS_H_ +#endif // TEST_TOUCH_UTILS_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h index 902167c..b5bab83 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ADAPTOR_IMPL_H__ -#define __DALI_TOOLKIT_ADAPTOR_IMPL_H__ +#ifndef DALI_TOOLKIT_ADAPTOR_IMPL_H +#define DALI_TOOLKIT_ADAPTOR_IMPL_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. @@ -68,4 +68,4 @@ public: } // namespace Internal } // namespace Dali -#endif // __DALI_TOOLKIT_ADAPTOR_IMPL_H__ +#endif // DALI_TOOLKIT_ADAPTOR_IMPL_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.h index 584a38c..d444557 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-application.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TOOLKIT_APPLICATION_H__ -#define __DALI_TOOLKIT_TOOLKIT_APPLICATION_H__ +#ifndef DALI_TOOLKIT_TOOLKIT_APPLICATION_H +#define DALI_TOOLKIT_TOOLKIT_APPLICATION_H /* - * Copyright (c) 2014 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. @@ -92,4 +92,4 @@ public: // Test static member } // namespace Dali -#endif // __DALI_TOOLKIT_TOOLKIT_APPLICATION_H__ +#endif // DALI_TOOLKIT_TOOLKIT_APPLICATION_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h index d167dc8..282a0c0 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H__ -#define __DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H__ +#ifndef DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H +#define DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H /* - * Copyright (c) 2014 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. @@ -22,7 +22,7 @@ #include // PUBLIC INCLUDES -#define __DALI_CLIPBOARD_EVENT_NOTIFIER_H__ +#define DALI_CLIPBOARD_EVENT_NOTIFIER_H #include #include @@ -59,4 +59,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H__ +#endif // DALI_TOOLKIT_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h index aa13ef0..ad532cd 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard.h @@ -1,8 +1,8 @@ -#ifndef __TOOLKIT_CLIPBOARD_H__ -#define __TOOLKIT_CLIPBOARD_H__ +#ifndef TOOLKIT_CLIPBOARD_H +#define TOOLKIT_CLIPBOARD_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. @@ -18,7 +18,7 @@ * */ -#define __DALI_CLIPBOARD_H__ +#define DALI_CLIPBOARD_H // EXTERNAL INCLUDES #include @@ -103,4 +103,4 @@ public: }; } // namespace Dali -#endif // __TOOLKIT_CLIPBOARD_H__ +#endif // TOOLKIT_CLIPBOARD_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h index ae968d3..b1ebae0 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-environment-variable.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H__ -#define __DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H__ +#ifndef DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H +#define DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H /* - * Copyright (c) 2015 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. @@ -17,7 +17,7 @@ * limitations under the License. * */ -#define __DALI_ENVIRONMENT_VARIABLE_H__ +#define DALI_ENVIRONMENT_VARIABLE_H #include @@ -36,4 +36,4 @@ void SetTestingEnvironmentVariable( bool ); } // namespace Dali -#endif /* __DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H__ */ +#endif // DALI_TOOLKIT_ENVIRONMENT_VARIABLE_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h index f3dc134..9693e6e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-event-thread-callback.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H__ -#define __DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H__ +#ifndef DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H +#define DALI_TOOLKIT_EVENT_THREAD_CALLBACK_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. @@ -17,7 +17,7 @@ * limitations under the License. * */ -#define __DALI_EVENT_THREAD_CALLBACK_H_ +#define DALI_EVENT_THREAD_CALLBACK_H // EXTERNAL INCLUDES #include @@ -71,4 +71,4 @@ bool WaitForEventThreadTrigger( int triggerCount, int timeoutInSeconds=30 ); } -#endif /* __DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H__ */ +#endif // DALI_TOOLKIT_EVENT_THREAD_CALLBACK_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h index cb4e085..409e2b8 100755 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-input-method-context.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TOOLKIT_INPUT_METHOD_CONTEXT_H__ -#define __DALI_TOOLKIT_TOOLKIT_INPUT_METHOD_CONTEXT_H__ +#ifndef DALI_TOOLKIT_TOOLKIT_INPUT_METHOD_CONTEXT_H +#define DALI_TOOLKIT_TOOLKIT_INPUT_METHOD_CONTEXT_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. @@ -19,7 +19,7 @@ */ // EXTERNAL INCLUDES -#define __DALI_INPUT_METHOD_CONTEXT_H__ +#define DALI_INPUT_METHOD_CONTEXT_H #include #include #include @@ -306,4 +306,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_TOOLKIT_INPUT_METHOD_CONTEXT_H__ +#endif // DALI_TOOLKIT_TOOLKIT_INPUT_METHOD_CONTEXT_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp index 4018f37..b959638 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp @@ -42,21 +42,7 @@ struct RotationEvent int height; ///< new window height }; -/** - * The RotationObserver can be overridden in order to listen to rotation events. - */ -class RotationObserver -{ -public: - virtual void OnRotationPrepare( const RotationEvent& rotation ) = 0; - virtual void OnRotationRequest( ) = 0; - -protected: - RotationObserver(){} - virtual ~RotationObserver(){} -}; - -class Orientation : public BaseObject, public RotationObserver +class Orientation : public BaseObject { public: typedef Dali::Orientation::OrientationSignalType OrientationSignalType; @@ -75,9 +61,6 @@ protected: { } public: - void SetAdaptor(Dali::Adaptor& adaptor) - { - } int GetDegrees() const { return 0; @@ -86,16 +69,13 @@ public: { return 0.0f; } + void OnOrientationChanged( const RotationEvent& rotation ) + { + } OrientationSignalType& ChangedSignal() { return mChangedSignal; } - virtual void OnRotationPrepare( const RotationEvent& rotation ) - { - }; - virtual void OnRotationRequest( ) - { - }; private: Orientation(const Orientation&); diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h index 8637d20..4119640 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_PHYSICAL_KEYBOARD_H__ -#define __DALI_TOOLKIT_PHYSICAL_KEYBOARD_H__ +#ifndef DALI_TOOLKIT_PHYSICAL_KEYBOARD_H +#define DALI_TOOLKIT_PHYSICAL_KEYBOARD_H /* - * Copyright (c) 2014 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,4 +48,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_PHYSICAL_KEYBOARD_H__ +#endif // DALI_TOOLKIT_PHYSICAL_KEYBOARD_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h index dc9a018..cd5dcfe 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_H__ -#define __DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_H__ +#ifndef DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_H +#define DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_H /* - * Copyright (c) 2014 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. @@ -39,4 +39,4 @@ void SetDefaultFontSize( float size ); } } -#endif // __DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_H__ +#endif // DALI_TOOLKIT_TOOLKIT_STYLE_MONITOR_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h index 2b1db83..1b576bc 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEST_APPLICATION_H__ -#define __DALI_TOOLKIT_TEST_APPLICATION_H__ +#ifndef DALI_TOOLKIT_TEST_APPLICATION_H +#define DALI_TOOLKIT_TEST_APPLICATION_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. @@ -103,4 +103,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEST_APPLICATION_H__ +#endif // DALI_TOOLKIT_TEST_APPLICATION_H diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h index 544146a..fdd44b4 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TOOLKIT_TIMER_H__ -#define __DALI_TOOLKIT_TOOLKIT_TIMER_H__ +#ifndef DALI_TOOLKIT_TOOLKIT_TIMER_H +#define DALI_TOOLKIT_TOOLKIT_TIMER_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. @@ -22,7 +22,7 @@ #include // PUBLIC INCLUDES -#define __DALI_TIMER_H__ +#define DALI_TIMER_H #include #include @@ -69,4 +69,4 @@ void EmitGlobalTimerSignal(); bool AreTimersRunning(); } -#endif // __DALI_TOOLKIT_TOOLKIT_TIMER_H__ +#endif // DALI_TOOLKIT_TOOLKIT_TIMER_H diff --git a/dali-toolkit/devel-api/builder/builder.h b/dali-toolkit/devel-api/builder/builder.h index fb76667..f3975f6 100755 --- a/dali-toolkit/devel-api/builder/builder.h +++ b/dali-toolkit/devel-api/builder/builder.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_UIBUILDER_H__ -#define __DALI_TOOLKIT_UIBUILDER_H__ +#ifndef DALI_TOOLKIT_UIBUILDER_H +#define DALI_TOOLKIT_UIBUILDER_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. @@ -456,4 +456,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_UIBUILDER_H__ +#endif // DALI_TOOLKIT_UIBUILDER_H diff --git a/dali-toolkit/devel-api/builder/json-parser.h b/dali-toolkit/devel-api/builder/json-parser.h index 645b985..b4ae41b 100644 --- a/dali-toolkit/devel-api/builder/json-parser.h +++ b/dali-toolkit/devel-api/builder/json-parser.h @@ -1,8 +1,8 @@ -#ifndef __DALI_JSON_PARSER_H__ -#define __DALI_JSON_PARSER_H__ +#ifndef DALI_JSON_PARSER_H +#define DALI_JSON_PARSER_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. @@ -146,4 +146,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_JSON_PARSER_H__ +#endif // DALI_JSON_PARSER_H diff --git a/dali-toolkit/devel-api/builder/tree-node.h b/dali-toolkit/devel-api/builder/tree-node.h index 0bc10cb..f99059d 100644 --- a/dali-toolkit/devel-api/builder/tree-node.h +++ b/dali-toolkit/devel-api/builder/tree-node.h @@ -1,8 +1,8 @@ -#ifndef __DALI_SCRIPT_TREE_NODE_H__ -#define __DALI_SCRIPT_TREE_NODE_H__ +#ifndef DALI_SCRIPT_TREE_NODE_H +#define DALI_SCRIPT_TREE_NODE_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. @@ -237,4 +237,4 @@ private: } // namespace Dali -#endif // __DALI_SCRIPT_TREE_NODE_H__ +#endif // DALI_SCRIPT_TREE_NODE_H diff --git a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h index b6c3a88..8aa23da 100644 --- a/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h +++ b/dali-toolkit/devel-api/controls/bloom-view/bloom-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_BLOOM_VIEW_H__ -#define __DALI_TOOLKIT_BLOOM_VIEW_H__ +#ifndef DALI_TOOLKIT_BLOOM_VIEW_H +#define DALI_TOOLKIT_BLOOM_VIEW_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. @@ -227,4 +227,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_BLOOM_VIEW_H__ +#endif // DALI_TOOLKIT_BLOOM_VIEW_H diff --git a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h index 450d3a2..8475b4d 100644 --- a/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h +++ b/dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_BUBBLE_EMMITER_H__ -#define __DALI_TOOLKIT_BUBBLE_EMMITER_H__ +#ifndef DALI_TOOLKIT_BUBBLE_EMMITER_H +#define DALI_TOOLKIT_BUBBLE_EMMITER_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. @@ -177,4 +177,4 @@ public: // Not intended for developer use } // namespace Dali -#endif /* __DALI_TOOLKIT_BUBBLE_EMMITER_H__ */ +#endif /* DALI_TOOLKIT_BUBBLE_EMMITER_H */ diff --git a/dali-toolkit/devel-api/controls/buttons/button-devel.h b/dali-toolkit/devel-api/controls/buttons/button-devel.h index 769c8eb..fb20ce3 100644 --- a/dali-toolkit/devel-api/controls/buttons/button-devel.h +++ b/dali-toolkit/devel-api/controls/buttons/button-devel.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_BUTTON_DEVEL_H__ -#define __DALI_TOOLKIT_BUTTON_DEVEL_H__ +#ifndef DALI_TOOLKIT_BUTTON_DEVEL_H +#define DALI_TOOLKIT_BUTTON_DEVEL_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. @@ -148,4 +148,4 @@ namespace DevelButton } // namespace Dali -#endif // __DALI_TOOLKIT_BUTTON_DEVEL_H__ +#endif // DALI_TOOLKIT_BUTTON_DEVEL_H diff --git a/dali-toolkit/devel-api/controls/buttons/toggle-button.h b/dali-toolkit/devel-api/controls/buttons/toggle-button.h index 4d761d7..93dace9 100644 --- a/dali-toolkit/devel-api/controls/buttons/toggle-button.h +++ b/dali-toolkit/devel-api/controls/buttons/toggle-button.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TOGGLE_BUTTON_H__ -#define __DALI_TOOLKIT_TOGGLE_BUTTON_H__ +#ifndef DALI_TOOLKIT_TOGGLE_BUTTON_H +#define DALI_TOOLKIT_TOGGLE_BUTTON_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. @@ -220,4 +220,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TOGGLE_BUTTON_H__ +#endif // DALI_TOOLKIT_TOGGLE_BUTTON_H diff --git a/dali-toolkit/devel-api/controls/control-depth-index-ranges.h b/dali-toolkit/devel-api/controls/control-depth-index-ranges.h index 088fb7a..6c4ed30 100644 --- a/dali-toolkit/devel-api/controls/control-depth-index-ranges.h +++ b/dali-toolkit/devel-api/controls/control-depth-index-ranges.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_DEVEL_CONTROL_DEPTH_INDEX_RANGES_H__ -#define __DALI_TOOLKIT_DEVEL_CONTROL_DEPTH_INDEX_RANGES_H__ +#ifndef DALI_TOOLKIT_DEVEL_CONTROL_DEPTH_INDEX_RANGES_H +#define DALI_TOOLKIT_DEVEL_CONTROL_DEPTH_INDEX_RANGES_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. @@ -60,4 +60,4 @@ DALI_COMPILE_TIME_ASSERT( DECORATION < FOREGROUND_EFFECT ); } // namespace Dali -#endif // __DALI_TOOLKIT_DEVEL_CONTROL_DEPTH_INDEX_RANGES_H__ +#endif // DALI_TOOLKIT_DEVEL_CONTROL_DEPTH_INDEX_RANGES_H diff --git a/dali-toolkit/devel-api/controls/effects-view/effects-view.h b/dali-toolkit/devel-api/controls/effects-view/effects-view.h index 6196617..7079bd9 100644 --- a/dali-toolkit/devel-api/controls/effects-view/effects-view.h +++ b/dali-toolkit/devel-api/controls/effects-view/effects-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_EFFECTS_VIEW_H__ -#define __DALI_TOOLKIT_EFFECTS_VIEW_H__ +#ifndef DALI_TOOLKIT_EFFECTS_VIEW_H +#define DALI_TOOLKIT_EFFECTS_VIEW_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. @@ -197,4 +197,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_EFFECTS_VIEW_H__ +#endif // DALI_TOOLKIT_EFFECTS_VIEW_H diff --git a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h index 58894a9..d93e880 100644 --- a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h +++ b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H__ -#define __DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H__ +#ifndef DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H +#define DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_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. @@ -323,4 +323,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H__ +#endif // DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H diff --git a/dali-toolkit/devel-api/controls/magnifier/magnifier.h b/dali-toolkit/devel-api/controls/magnifier/magnifier.h index ab31ba6..1e47446 100644 --- a/dali-toolkit/devel-api/controls/magnifier/magnifier.h +++ b/dali-toolkit/devel-api/controls/magnifier/magnifier.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_MAGNIFIER_H__ -#define __DALI_TOOLKIT_MAGNIFIER_H__ +#ifndef DALI_TOOLKIT_MAGNIFIER_H +#define DALI_TOOLKIT_MAGNIFIER_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. @@ -139,4 +139,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_MAGNIFIER_H__ +#endif // DALI_TOOLKIT_MAGNIFIER_H diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h index bc6e17a..4768b21 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-factory.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_PAGE_FACTORY_H__ -#define __DALI_TOOLKIT_PAGE_FACTORY_H__ +#ifndef DALI_TOOLKIT_PAGE_FACTORY_H +#define DALI_TOOLKIT_PAGE_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. @@ -81,4 +81,4 @@ public: } // namespace Toolkit } // namespace Dali -#endif /* __DALI_TOOLKIT_PAGE_FACTORY_H__ */ +#endif /* DALI_TOOLKIT_PAGE_FACTORY_H */ diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h index a170aa2..d2397b6 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-landscape-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_H__ -#define __DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_H__ +#ifndef DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_H +#define DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_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. @@ -108,4 +108,4 @@ public: // Not intended for application developers } // namespace Dali -#endif /* __DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_H__ */ +#endif /* DALI_TOOLKIT_PAGE_TURN_LANDSCAPE_VIEW_H */ diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h index e28bb6c..15dc95f 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-portrait-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_H__ -#define __DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_H__ +#ifndef DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_H +#define DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_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,4 +109,4 @@ public: // Not intended for application developers } // namespace Dali -#endif /* __DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_H__ */ +#endif /* DALI_TOOLKIT_PAGE_TURN_PORTRAIT_VIEW_H */ diff --git a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h index a4705e4..63bc35c 100644 --- a/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h +++ b/dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_PAGE_TURN_VIEW_H__ -#define __DALI_TOOLKIT_PAGE_TURN_VIEW_H__ +#ifndef DALI_TOOLKIT_PAGE_TURN_VIEW_H +#define DALI_TOOLKIT_PAGE_TURN_VIEW_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. @@ -203,4 +203,4 @@ public: // Not intended for application developers } // namespace Dali -#endif /* __DALI_TOOLKIT_PAGE_TURN_VIEW_H__ */ +#endif /* DALI_TOOLKIT_PAGE_TURN_VIEW_H */ diff --git a/dali-toolkit/devel-api/controls/popup/confirmation-popup.h b/dali-toolkit/devel-api/controls/popup/confirmation-popup.h index 940840b..4a804cb 100644 --- a/dali-toolkit/devel-api/controls/popup/confirmation-popup.h +++ b/dali-toolkit/devel-api/controls/popup/confirmation-popup.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CONFIRMATION_POPUP_H__ -#define __DALI_TOOLKIT_CONFIRMATION_POPUP_H__ +#ifndef DALI_TOOLKIT_CONFIRMATION_POPUP_H +#define DALI_TOOLKIT_CONFIRMATION_POPUP_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. @@ -145,4 +145,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_CONFIRMATION_POPUP_H__ +#endif // DALI_TOOLKIT_CONFIRMATION_POPUP_H diff --git a/dali-toolkit/devel-api/controls/popup/popup.h b/dali-toolkit/devel-api/controls/popup/popup.h index 2cc0636..054815c 100644 --- a/dali-toolkit/devel-api/controls/popup/popup.h +++ b/dali-toolkit/devel-api/controls/popup/popup.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_POPUP_H__ -#define __DALI_TOOLKIT_POPUP_H__ +#ifndef DALI_TOOLKIT_POPUP_H +#define DALI_TOOLKIT_POPUP_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. @@ -309,4 +309,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_POPUP_H__ +#endif // DALI_TOOLKIT_POPUP_H diff --git a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h index c37cfb1..52de248 100644 --- a/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h +++ b/dali-toolkit/devel-api/controls/shadow-view/shadow-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SHADOW_VIEW_H__ -#define __DALI_TOOLKIT_SHADOW_VIEW_H__ +#ifndef DALI_TOOLKIT_SHADOW_VIEW_H +#define DALI_TOOLKIT_SHADOW_VIEW_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. @@ -230,4 +230,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_SHADOW_VIEW_H__ +#endif // DALI_TOOLKIT_SHADOW_VIEW_H diff --git a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h index b82e039..6bc0db2 100644 --- a/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h +++ b/dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SUPER_BLUR_VIEW_H__ -#define __DALI_TOOLKIT_SUPER_BLUR_VIEW_H__ +#ifndef DALI_TOOLKIT_SUPER_BLUR_VIEW_H +#define DALI_TOOLKIT_SUPER_BLUR_VIEW_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. @@ -195,4 +195,4 @@ public: // Not intended for application developers } // namespace Dali -#endif /* __DALI_TOOLKIT_SUPER_BLUR_VIEW_H__ */ +#endif /* DALI_TOOLKIT_SUPER_BLUR_VIEW_H */ diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h index e903b77..49cacd5 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup-callback-interface.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SELECTION_POPUP_CALLBACK_INTERFACE_H__ -#define __DALI_TOOLKIT_TEXT_SELECTION_POPUP_CALLBACK_INTERFACE_H__ +#ifndef DALI_TOOLKIT_TEXT_SELECTION_POPUP_CALLBACK_INTERFACE_H +#define DALI_TOOLKIT_TEXT_SELECTION_POPUP_CALLBACK_INTERFACE_H /* - * Copyright (c) 2015 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,4 +52,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SELECTION_POPUP_CALLBACK_INTERFACE_H__ +#endif // DALI_TOOLKIT_TEXT_SELECTION_POPUP_CALLBACK_INTERFACE_H diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h index 9e9ee48..ccc25cc 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__ -#define __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__ +#ifndef DALI_TOOLKIT_TEXT_SELECTION_POPUP_H +#define DALI_TOOLKIT_TEXT_SELECTION_POPUP_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. @@ -276,4 +276,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SELECTION_POPUP_H__ +#endif // DALI_TOOLKIT_TEXT_SELECTION_POPUP_H diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h index 43b7c72..e8adee9 100644 --- a/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H__ -#define __DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H__ +#ifndef DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H +#define DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_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. @@ -167,4 +167,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H__ +#endif // DALI_TOOLKIT_TEXT_SELECTION_TOOLBAR_H diff --git a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h index 8725bb3..a9ad2e0 100644 --- a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h +++ b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TOOL_BAR_H__ -#define __DALI_TOOLKIT_TOOL_BAR_H__ +#ifndef DALI_TOOLKIT_TOOL_BAR_H +#define DALI_TOOLKIT_TOOL_BAR_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. @@ -124,4 +124,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TOOL_BAR_H__ +#endif // DALI_TOOLKIT_TOOL_BAR_H diff --git a/dali-toolkit/devel-api/direction-enums.h b/dali-toolkit/devel-api/direction-enums.h index ff86b16..d03979b 100644 --- a/dali-toolkit/devel-api/direction-enums.h +++ b/dali-toolkit/devel-api/direction-enums.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMS_H__ -#define __DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMS_H__ +#ifndef DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMS_H +#define DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMS_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. @@ -38,4 +38,4 @@ namespace Direction } // namespace Dali -#endif // __DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMS_H__ +#endif // DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMS_H diff --git a/dali-toolkit/devel-api/drag-drop-detector/drag-and-drop-detector.h b/dali-toolkit/devel-api/drag-drop-detector/drag-and-drop-detector.h index 2bd34db..15b14b2 100755 --- a/dali-toolkit/devel-api/drag-drop-detector/drag-and-drop-detector.h +++ b/dali-toolkit/devel-api/drag-drop-detector/drag-and-drop-detector.h @@ -1,8 +1,8 @@ -#ifndef __DALI_DRAG_AND_DROP_DETECTOR_H__ -#define __DALI_DRAG_AND_DROP_DETECTOR_H__ +#ifndef DALI_DRAG_AND_DROP_DETECTOR_H +#define DALI_DRAG_AND_DROP_DETECTOR_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. @@ -269,4 +269,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_DRAG_AND_DROP_DETECTOR_H__ +#endif // DALI_DRAG_AND_DROP_DETECTOR_H diff --git a/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h b/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h index dd43152..e54f18f 100644 --- a/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h +++ b/dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__ -#define __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__ +#ifndef DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H +#define DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_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,4 +123,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H__ +#endif // DALI_TOOLKIT_KEYINPUT_FOCUS_MANAGER_H diff --git a/dali-toolkit/devel-api/scripting/script-plugin.h b/dali-toolkit/devel-api/scripting/script-plugin.h index 837a5e3..54b26ae 100644 --- a/dali-toolkit/devel-api/scripting/script-plugin.h +++ b/dali-toolkit/devel-api/scripting/script-plugin.h @@ -1,8 +1,8 @@ -#ifndef __DALI_SCRIPT_PLUGIN_H__ -#define __DALI_SCRIPT_PLUGIN_H__ +#ifndef DALI_SCRIPT_PLUGIN_H +#define DALI_SCRIPT_PLUGIN_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. @@ -85,4 +85,4 @@ public: } // namespace Dali -#endif // __DALI_SCRIPT_PLUGIN_H__ +#endif // DALI_SCRIPT_PLUGIN_H diff --git a/dali-toolkit/devel-api/scripting/script.h b/dali-toolkit/devel-api/scripting/script.h index 86e2678..12cd72a 100644 --- a/dali-toolkit/devel-api/scripting/script.h +++ b/dali-toolkit/devel-api/scripting/script.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SCRIPT_H__ -#define __DALI_TOOLKIT_SCRIPT_H__ +#ifndef DALI_TOOLKIT_SCRIPT_H +#define DALI_TOOLKIT_SCRIPT_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. @@ -90,4 +90,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_SCRIPT_H__ +#endif // DALI_TOOLKIT_SCRIPT_H diff --git a/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h index e5cd8f9..ec2fe78 100644 --- a/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h +++ b/dali-toolkit/devel-api/shader-effects/alpha-discard-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__ -#define __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__ +#ifndef DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H +#define DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_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. @@ -74,4 +74,4 @@ inline Property::Map CreateAlphaDiscardEffect() } // namespace Dali -#endif // __DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H__ +#endif // DALI_TOOLKIT_ALPHA_DISCARD_EFFECT_H diff --git a/dali-toolkit/devel-api/shader-effects/distance-field-effect.h b/dali-toolkit/devel-api/shader-effects/distance-field-effect.h index 703340c..8c4b800 100644 --- a/dali-toolkit/devel-api/shader-effects/distance-field-effect.h +++ b/dali-toolkit/devel-api/shader-effects/distance-field-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SHADER_EFFECT_DISTANCEFIELD_H__ -#define __DALI_TOOLKIT_SHADER_EFFECT_DISTANCEFIELD_H__ +#ifndef DALI_TOOLKIT_SHADER_EFFECT_DISTANCEFIELD_H +#define DALI_TOOLKIT_SHADER_EFFECT_DISTANCEFIELD_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. @@ -180,4 +180,4 @@ inline Dali::Property::Map CreateDistanceFieldEffect() } // namespace Dali -#endif // __DALI_TOOLKIT_SHADER_EFFECT_SPOT_H__ +#endif // DALI_TOOLKIT_SHADER_EFFECT_DISTANCEFIELD_H diff --git a/dali-toolkit/devel-api/shader-effects/image-region-effect.h b/dali-toolkit/devel-api/shader-effects/image-region-effect.h index 0593d7d..f031f15 100644 --- a/dali-toolkit/devel-api/shader-effects/image-region-effect.h +++ b/dali-toolkit/devel-api/shader-effects/image-region-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_IMAGE_REGION_EFFECT_H__ -#define __DALI_TOOLKIT_IMAGE_REGION_EFFECT_H__ +#ifndef DALI_TOOLKIT_IMAGE_REGION_EFFECT_H +#define DALI_TOOLKIT_IMAGE_REGION_EFFECT_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,4 +86,4 @@ inline Property::Map CreateImageRegionEffect() } // namespace Dali -#endif // __DALI_TOOLKIT_IMAGE_REGION_EFFECT_H__ +#endif // DALI_TOOLKIT_IMAGE_REGION_EFFECT_H diff --git a/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h index de0491c..1e16f21 100644 --- a/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h +++ b/dali-toolkit/devel-api/shader-effects/motion-blur-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SHADER_EFFECT_MOTION_BLUR_H__ -#define __DALI_TOOLKIT_SHADER_EFFECT_MOTION_BLUR_H__ +#ifndef DALI_TOOLKIT_SHADER_EFFECT_MOTION_BLUR_H +#define DALI_TOOLKIT_SHADER_EFFECT_MOTION_BLUR_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. @@ -245,4 +245,4 @@ inline Property::Map CreateMotionBlurEffect() } -#endif //#ifndef __DALI_TOOLKIT_SHADER_EFFECT_MOTION_BLUR_H__ +#endif // DALI_TOOLKIT_SHADER_EFFECT_MOTION_BLUR_H diff --git a/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h b/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h index 07ee2dd..3adfb3f 100644 --- a/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h +++ b/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_H__ -#define __DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_H__ +#ifndef DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_H +#define DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_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. @@ -209,4 +209,4 @@ inline Property::Map CreateMotionStretchEffect() } -#endif //#ifndef __DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_H__ +#endif // DALI_TOOLKIT_SHADER_EFFECT_MOTION_STRETCH_H diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h index 7de6dc6..adbab92 100644 --- a/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-cross-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H__ -#define __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H__ +#ifndef DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H +#define DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_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. @@ -73,4 +73,4 @@ public: // Not intended for developer use } // namespace Dali -#endif /* __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H__ */ +#endif // DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h index 04a375e..f3b093b 100644 --- a/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-fold-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_H__ -#define __DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_H__ +#ifndef DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_H +#define DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_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. @@ -73,4 +73,4 @@ public: // Not intended for developer use } // namespace Dali -#endif /* __DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_H__ */ +#endif // DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_H diff --git a/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h b/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h index 89abc2c..493b7c6 100644 --- a/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h +++ b/dali-toolkit/devel-api/transition-effects/cube-transition-wave-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H__ -#define __DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H__ +#ifndef DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H +#define DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_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. @@ -72,4 +72,5 @@ public: // Not intended for developer use } // namespace Toolkit } // namespace Dali -#endif /* __DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H__ */ + +#endif // DALI_TOOLKIT_CUBE_TRANSITION_WAVE_EFFECT_H diff --git a/dali-toolkit/devel-api/visual-factory/transition-data.h b/dali-toolkit/devel-api/visual-factory/transition-data.h index 8d662cf..9bba0f6 100755 --- a/dali-toolkit/devel-api/visual-factory/transition-data.h +++ b/dali-toolkit/devel-api/visual-factory/transition-data.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TRANSITION_DATA_H__ -#define __DALI_TOOLKIT_TRANSITION_DATA_H__ +#ifndef DALI_TOOLKIT_TRANSITION_DATA_H +#define DALI_TOOLKIT_TRANSITION_DATA_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. @@ -156,4 +156,4 @@ public: // Not intended for application developers } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_TRANSITION_DATA_H__ +#endif // DALI_TOOLKIT_TRANSITION_DATA_H diff --git a/dali-toolkit/internal/builder/builder-declarations.h b/dali-toolkit/internal/builder/builder-declarations.h index 831a478..09a5fd1 100644 --- a/dali-toolkit/internal/builder/builder-declarations.h +++ b/dali-toolkit/internal/builder/builder-declarations.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_BUILDER_DECLARATIONS_H__ -#define __DALI_TOOLKIT_BUILDER_DECLARATIONS_H__ +#ifndef DALI_TOOLKIT_BUILDER_DECLARATIONS_H +#define DALI_TOOLKIT_BUILDER_DECLARATIONS_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. @@ -49,4 +49,4 @@ typedef OptionalValue OptionalMatrix3; typedef OptionalValue > OptionalRect; typedef OptionalValue OptionalExtents; -#endif // __DALI_TOOLKIT_BUILDER_DECLARATIONS_H__ +#endif // DALI_TOOLKIT_BUILDER_DECLARATIONS_H diff --git a/dali-toolkit/internal/builder/builder-filesystem.h b/dali-toolkit/internal/builder/builder-filesystem.h index d7118dd..75e9d28 100755 --- a/dali-toolkit/internal/builder/builder-filesystem.h +++ b/dali-toolkit/internal/builder/builder-filesystem.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_FILESYSTEM_H__ -#define __DALI_TOOLKIT_INTERNAL_BUILDER_FILESYSTEM_H__ +#ifndef DALI_TOOLKIT_INTERNAL_BUILDER_FILESYSTEM_H +#define DALI_TOOLKIT_INTERNAL_BUILDER_FILESYSTEM_H /* - * Copyright (c) 2014 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,4 +58,4 @@ inline std::string GetFileContents(const std::string &fn) return std::string((std::istreambuf_iterator(t)), std::istreambuf_iterator()); } -#endif // __DALI_TOOLKIT_INTERNAL_BUILDER_FILESYSTEM_H__ +#endif // DALI_TOOLKIT_INTERNAL_BUILDER_FILESYSTEM_H diff --git a/dali-toolkit/internal/builder/builder-get-is.inl.h b/dali-toolkit/internal/builder/builder-get-is.inl.h index 63cd31e..01dab59 100644 --- a/dali-toolkit/internal/builder/builder-get-is.inl.h +++ b/dali-toolkit/internal/builder/builder-get-is.inl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL__ -#define __DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL__ +#ifndef DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL +#define DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL /* - * 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. @@ -441,4 +441,4 @@ inline int GetInteger(const TreeNode &child) -#endif // __DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL__ +#endif // DALI_TOOLKIT_INTERNAL_BUILDER_GET_IS_INL diff --git a/dali-toolkit/internal/builder/builder-impl.h b/dali-toolkit/internal/builder/builder-impl.h index f2bc15a..2eb4a2b 100755 --- a/dali-toolkit/internal/builder/builder-impl.h +++ b/dali-toolkit/internal/builder/builder-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_H__ -#define __DALI_TOOLKIT_INTERNAL_BUILDER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_BUILDER_H +#define DALI_TOOLKIT_INTERNAL_BUILDER_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. @@ -421,4 +421,4 @@ inline const Internal::Builder& GetImpl(const Dali::Toolkit::Builder& obj) } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_BUILDER_H__ +#endif // DALI_TOOLKIT_INTERNAL_BUILDER_H diff --git a/dali-toolkit/internal/builder/json-parser-impl.h b/dali-toolkit/internal/builder/json-parser-impl.h index dbdbf45..21992e9 100644 --- a/dali-toolkit/internal/builder/json-parser-impl.h +++ b/dali-toolkit/internal/builder/json-parser-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_JSON_PARSER_IMPL_H__ -#define __DALI_JSON_PARSER_IMPL_H__ +#ifndef DALI_JSON_PARSER_IMPL_H +#define DALI_JSON_PARSER_IMPL_H /* - * Copyright (c) 2014 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. @@ -155,4 +155,4 @@ inline Internal::JsonParser& GetImplementation(Toolkit::JsonParser& parser) } // namespace Dali -#endif // __DALI_JSON_PARSER_IMPL_H__ +#endif // DALI_JSON_PARSER_IMPL_H diff --git a/dali-toolkit/internal/builder/json-parser-state.h b/dali-toolkit/internal/builder/json-parser-state.h index 2a7badc..210c11f 100644 --- a/dali-toolkit/internal/builder/json-parser-state.h +++ b/dali-toolkit/internal/builder/json-parser-state.h @@ -1,8 +1,8 @@ -#ifndef __DALI_JSON_PARSE_STATE_H__ -#define __DALI_JSON_PARSE_STATE_H__ +#ifndef DALI_JSON_PARSE_STATE_H +#define DALI_JSON_PARSE_STATE_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. @@ -312,5 +312,4 @@ private: } // namespace Dali - -#endif // header +#endif // DALI_JSON_PARSE_STATE_H diff --git a/dali-toolkit/internal/builder/optional-value.h b/dali-toolkit/internal/builder/optional-value.h index afa4567..666dd30 100644 --- a/dali-toolkit/internal/builder/optional-value.h +++ b/dali-toolkit/internal/builder/optional-value.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL__ -#define __DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL__ +#ifndef DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL_H +#define DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL_H /* - * Copyright (c) 2014 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,4 +87,4 @@ bool operator!=( const OptionalValue& lhs, const OptionalValue& rhs ) return false; } -#endif // header +#endif // DALI_TOOLKIT_INTERNAL_BUILDER_OPTIONAL_H diff --git a/dali-toolkit/internal/builder/replacement.h b/dali-toolkit/internal/builder/replacement.h index 1c4d34c..24260de 100644 --- a/dali-toolkit/internal/builder/replacement.h +++ b/dali-toolkit/internal/builder/replacement.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT__ -#define __DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT__ +#ifndef DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT_H +#define DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT_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. @@ -262,5 +262,4 @@ private: } // namespace Dali - -#endif // header +#endif // DALI_TOOLKIT_INTERNAL_BUILDER_REPLACEMENT_H diff --git a/dali-toolkit/internal/builder/tree-node-manipulator.h b/dali-toolkit/internal/builder/tree-node-manipulator.h index ea37e62..267c69e 100644 --- a/dali-toolkit/internal/builder/tree-node-manipulator.h +++ b/dali-toolkit/internal/builder/tree-node-manipulator.h @@ -1,8 +1,8 @@ -#ifndef __DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__ -#define __DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__ +#ifndef DALI_SCRIPT_TREE_NODE_MANIPULATOR_H +#define DALI_SCRIPT_TREE_NODE_MANIPULATOR_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. @@ -260,4 +260,4 @@ char *CopyString( const char *fromString, VectorCharIter& iter, const VectorChar } // namespace Dali -#endif // __DALI_SCRIPT_TREE_NODE_MANIPULATOR_H__ +#endif // DALI_SCRIPT_TREE_NODE_MANIPULATOR_H diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.h b/dali-toolkit/internal/controls/alignment/alignment-impl.h index 44d058f..83f5301 100644 --- a/dali-toolkit/internal/controls/alignment/alignment-impl.h +++ b/dali-toolkit/internal/controls/alignment/alignment-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__ -#define __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_ALIGNMENT_H +#define DALI_TOOLKIT_INTERNAL_ALIGNMENT_H /* - * Copyright (c) 2014 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. @@ -139,4 +139,4 @@ inline const Toolkit::Internal::Alignment& GetImpl( const Toolkit::Alignment& al } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_ALIGNMENT_H__ +#endif // DALI_TOOLKIT_INTERNAL_ALIGNMENT_H diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h index 7048bc8..9f6e64b 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BLOOM_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_BLOOM_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_BLOOM_VIEW_H +#define DALI_TOOLKIT_INTERNAL_BLOOM_VIEW_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. @@ -197,4 +197,4 @@ inline const Toolkit::Internal::BloomView& GetImpl( const Toolkit::BloomView& ob } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_BLOOM_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_BLOOM_VIEW_H diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h index daee597..aa99068 100644 --- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__ -#define __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__ +#ifndef DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H +#define DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_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. @@ -106,4 +106,4 @@ inline const Toolkit::Internal::CheckBoxButton& GetImplementation( const Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H__ +#endif // DALI_TOOLKIT_INTERNAL_CHECK_BOX_BUTTON_H diff --git a/dali-toolkit/internal/controls/buttons/push-button-impl.h b/dali-toolkit/internal/controls/buttons/push-button-impl.h index 6417b4b..d7e91d3 100644 --- a/dali-toolkit/internal/controls/buttons/push-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/push-button-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__ -#define __DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__ +#ifndef DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H +#define DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H /* - * Copyright (c) 2014 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. @@ -197,4 +197,4 @@ inline const Toolkit::Internal::PushButton& GetImplementation( const Toolkit::Pu } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H__ +#endif // DALI_TOOLKIT_INTERNAL_PUSH_BUTTON_H diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h index 1012196..944162b 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__ -#define __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__ +#ifndef DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H +#define DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H /* - * Copyright (c) 2014 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. @@ -112,4 +112,4 @@ inline const Toolkit::Internal::RadioButton& GetImplementation(const Toolkit::Ra } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H__ +#endif // DALI_TOOLKIT_INTERNAL_RADIO_BUTTON_H diff --git a/dali-toolkit/internal/controls/buttons/toggle-button-impl.h b/dali-toolkit/internal/controls/buttons/toggle-button-impl.h index 8c76eb4..2c4f753 100644 --- a/dali-toolkit/internal/controls/buttons/toggle-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/toggle-button-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TOGGLE_BUTTON_H__ -#define __DALI_TOOLKIT_INTERNAL_TOGGLE_BUTTON_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TOGGLE_BUTTON_H +#define DALI_TOOLKIT_INTERNAL_TOGGLE_BUTTON_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. @@ -191,4 +191,4 @@ inline const Toolkit::Internal::ToggleButton& GetImplementation( const Toolkit:: } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TOGGLE_BUTTON_H__ +#endif // DALI_TOOLKIT_INTERNAL_TOGGLE_BUTTON_H diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h index 9a5f6a2..54527d3 100644 --- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h +++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H +#define DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_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. @@ -274,4 +274,4 @@ inline const Toolkit::Internal::EffectsView& GetImpl( const Toolkit::EffectsView } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_EFFECTS_VIEW_H diff --git a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h index 9b8b9e9..a06c8a9 100755 --- a/dali-toolkit/internal/controls/flex-container/flex-container-impl.h +++ b/dali-toolkit/internal/controls/flex-container/flex-container-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__ -#define __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H +#define DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_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. @@ -271,4 +271,4 @@ inline const Toolkit::Internal::FlexContainer& GetImpl( const Toolkit::FlexConta } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H__ +#endif // DALI_TOOLKIT_INTERNAL_FLEX_CONTAINER_H diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h index 1b3bf38..792c1b1 100644 --- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h +++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_GAUSSIAN_BLUR_EFFECT_H__ -#define __DALI_TOOLKIT_INTERNAL_GAUSSIAN_BLUR_EFFECT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_GAUSSIAN_BLUR_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_GAUSSIAN_BLUR_EFFECT_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. @@ -228,4 +228,4 @@ inline const Toolkit::Internal::GaussianBlurView& GetImpl( const Toolkit::Gaussi } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_GAUSSIAN_BLUR_EFFECT_H__ +#endif // DALI_TOOLKIT_INTERNAL_GAUSSIAN_BLUR_EFFECT_H diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h index df095b0..c707523 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.h +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_MAGNIFIER_H__ -#define __DALI_TOOLKIT_INTERNAL_MAGNIFIER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_MAGNIFIER_H +#define DALI_TOOLKIT_INTERNAL_MAGNIFIER_H /* - * Copyright (c) 2014 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. @@ -184,4 +184,4 @@ inline const Toolkit::Internal::Magnifier& GetImpl(const Toolkit::Magnifier& pub } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_MAGNIFIER_H__ +#endif // DALI_TOOLKIT_INTERNAL_MAGNIFIER_H diff --git a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h index c6d9160..0222144 100644 --- a/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h +++ b/dali-toolkit/internal/controls/navigation-view/navigation-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H__ -#define __DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H__ +#ifndef DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H +#define DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_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. @@ -139,4 +139,4 @@ inline const Toolkit::Internal::NavigationView& GetImpl( const Toolkit::Navigati } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H__ */ +#endif // DALI_TOOLKIT_INTERNAL_NAVIGATION_CONTROL_H diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h index 35895d4..fba77c5 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_PAGE_TURN_EFFECT_H_ -#define __DALI_PAGE_TURN_EFFECT_H_ +#ifndef DALI_PAGE_TURN_EFFECT_H +#define DALI_PAGE_TURN_EFFECT_H /* - * Copyright (c) 2015 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,4 +84,4 @@ Property::Map CreatePageTurnEffect(); } // namespace Dali -#endif /* __DALI_TOOLKIT_SC_CURVE_EFFECT_H_ */ +#endif // DALI_PAGE_TURN_EFFECT_H diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h index c28594b..4137796 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-landscape-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__ -#define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__ +#ifndef DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H +#define DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_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. @@ -91,4 +91,5 @@ private: } // namespace Toolkit } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H__ */ + +#endif // DALI_TOOLKIT_INTERNAL_PAGE_TURN_LANDSCAPE_VIEW_IMPL_H diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h index 1a4b001..5e950f8 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-portrait-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__ -#define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__ +#ifndef DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H +#define DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_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. @@ -107,4 +107,5 @@ private: } // namespace Toolkit } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H__ */ + +#endif // DALI_TOOLKIT_INTERNAL_PAGE_TURN_PORTRAIT_VIEW_IMPL_H diff --git a/dali-toolkit/internal/controls/popup/confirmation-popup-impl.h b/dali-toolkit/internal/controls/popup/confirmation-popup-impl.h index 804b93f..4db8bd1 100644 --- a/dali-toolkit/internal/controls/popup/confirmation-popup-impl.h +++ b/dali-toolkit/internal/controls/popup/confirmation-popup-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_CONFIRMATION_POPUP_H__ -#define __DALI_TOOLKIT_INTERNAL_CONFIRMATION_POPUP_H__ +#ifndef DALI_TOOLKIT_INTERNAL_CONFIRMATION_POPUP_H +#define DALI_TOOLKIT_INTERNAL_CONFIRMATION_POPUP_H /* - * Copyright (c) 2015 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,4 +172,4 @@ inline const Toolkit::Internal::ConfirmationPopup& GetDerivedImplementation( con } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_CONFIRMATION_POPUP_H__ +#endif // DALI_TOOLKIT_INTERNAL_CONFIRMATION_POPUP_H diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h index 1596a92..6b2c19a 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.h +++ b/dali-toolkit/internal/controls/popup/popup-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_POPUP_H__ -#define __DALI_TOOLKIT_INTERNAL_POPUP_H__ +#ifndef DALI_TOOLKIT_INTERNAL_POPUP_H +#define DALI_TOOLKIT_INTERNAL_POPUP_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. @@ -581,4 +581,4 @@ inline const Toolkit::Internal::Popup& GetImpl( const Toolkit::Popup& publicObje } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_POPUP_H__ +#endif // DALI_TOOLKIT_INTERNAL_POPUP_H diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h index d95d190..a46808cd 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_BAR_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLL_BAR_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_BAR_H +#define DALI_TOOLKIT_INTERNAL_SCROLL_BAR_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. @@ -347,4 +347,4 @@ inline const Toolkit::Internal::ScrollBar& GetImpl(const Toolkit::ScrollBar& scr } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_BAR_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLL_BAR_H diff --git a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h index a59b7fe..0a262ed 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/depth-layout.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_DEPTH_LAYOUT_H__ -#define __DALI_TOOLKIT_DEPTH_LAYOUT_H__ +#ifndef DALI_TOOLKIT_DEPTH_LAYOUT_H +#define DALI_TOOLKIT_DEPTH_LAYOUT_H /* - * Copyright (c) 2015 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. @@ -240,4 +240,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_DEPTH_LAYOUT_H__ +#endif // DALI_TOOLKIT_DEPTH_LAYOUT_H diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h index 58476a8..915e8a6 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_GRID_LAYOUT_H__ -#define __DALI_TOOLKIT_GRID_LAYOUT_H__ +#ifndef DALI_TOOLKIT_GRID_LAYOUT_H +#define DALI_TOOLKIT_GRID_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. @@ -284,4 +284,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_GRID_LAYOUT_H__ +#endif // DALI_TOOLKIT_GRID_LAYOUT_H diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h index 3f8444f..9cb2df6 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H +#define DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H /* - * Copyright (c) 2014 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. @@ -672,4 +672,4 @@ inline const Toolkit::Internal::ItemView& GetImpl(const Toolkit::ItemView& itemV } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_ITEM_VIEW_H diff --git a/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h index 29c46d5..4d65433 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h +++ b/dali-toolkit/internal/controls/scrollable/item-view/spiral-layout.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SPIRAL_LAYOUT_H__ -#define __DALI_TOOLKIT_SPIRAL_LAYOUT_H__ +#ifndef DALI_TOOLKIT_SPIRAL_LAYOUT_H +#define DALI_TOOLKIT_SPIRAL_LAYOUT_H /* - * Copyright (c) 2015 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. @@ -212,4 +212,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_SPIRAL_LAYOUT_H__ +#endif // DALI_TOOLKIT_SPIRAL_LAYOUT_H diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h index dcc5f74..aa34f20 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_BASE_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLL_BASE_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_BASE_H +#define DALI_TOOLKIT_INTERNAL_SCROLL_BASE_H /* - * Copyright (c) 2014 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. @@ -216,4 +216,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_GROUP_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLL_BASE_H diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h index 1dadcfc..fd408ac 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H +#define DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H /* - * Copyright (c) 2014 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. @@ -262,4 +262,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLL_OVERSHOOT_INDICATOR_H diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h index 63c51be..603d8b2 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-effect-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_EFFECT_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_EFFECT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_EFFECT_H /* - * Copyright (c) 2014 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. @@ -137,4 +137,4 @@ inline const Internal::ScrollViewEffect& GetImpl(const Dali::Toolkit::ScrollView } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_EFFECT_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_EFFECT_H diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h index 44797d7..2c2829a 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H +#define DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_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. @@ -993,4 +993,4 @@ inline const Toolkit::Internal::ScrollView& GetImpl(const Toolkit::ScrollView& s } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_H diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.h index 8ab45f6..033ddb5 100644 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-page-path-effect-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_PAGE_PATH_EFFECT_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_PAGE_PATH_EFFECT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_PAGE_PATH_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_PAGE_PATH_EFFECT_H /* - * Copyright (c) 2015 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. @@ -114,4 +114,4 @@ inline const Internal::ScrollViewPagePathEffect& GetImpl(const Dali::Toolkit::Sc } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_PAGE_CAROUSEL_EFFECT_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLL_VIEW_PAGE_PATH_EFFECT_H diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h index bf6fa98..9ffdc8e 100644 --- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h +++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCROLLABLE_H__ -#define __DALI_TOOLKIT_INTERNAL_SCROLLABLE_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCROLLABLE_H +#define DALI_TOOLKIT_INTERNAL_SCROLLABLE_H /* - * Copyright (c) 2014 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. @@ -252,4 +252,4 @@ inline const Toolkit::Internal::Scrollable& GetImpl(const Toolkit::Scrollable& s } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCROLLABLE_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCROLLABLE_H diff --git a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h index ff0156a..bd0b376 100644 --- a/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h +++ b/dali-toolkit/internal/controls/shadow-view/shadow-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H +#define DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_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. @@ -197,4 +197,4 @@ inline const Toolkit::Internal::ShadowView& GetImpl( const Toolkit::ShadowView& } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_SHADOW_VIEW_H diff --git a/dali-toolkit/internal/controls/slider/slider-impl.h b/dali-toolkit/internal/controls/slider/slider-impl.h index cbb23b0..bbae4d5 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.h +++ b/dali-toolkit/internal/controls/slider/slider-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SLIDER_H__ -#define __DALI_TOOLKIT_INTERNAL_SLIDER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SLIDER_H +#define DALI_TOOLKIT_INTERNAL_SLIDER_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. @@ -783,4 +783,4 @@ inline const Toolkit::Internal::Slider& GetImpl( const Toolkit::Slider& pub ) } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SLIDER_H__ +#endif // DALI_TOOLKIT_INTERNAL_SLIDER_H diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h index 0c782c9..9f229fb 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H +#define DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_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. @@ -176,7 +176,7 @@ private: bool mResourcesCleared; }; -} +} // namespace Internal // Helpers for public-api forwarding methods inline Toolkit::Internal::SuperBlurView& GetImpl( Toolkit::SuperBlurView& obj ) @@ -193,8 +193,8 @@ inline const Toolkit::Internal::SuperBlurView& GetImpl( const Toolkit::SuperBlur return static_cast(handle); } -} +} // namespace Toolkit -} +} // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNALSUPER_BLUR_VIEW_H__ */ +#endif // DALI_TOOLKIT_INTERNAL_SUPER_BLUR_VIEW_H diff --git a/dali-toolkit/internal/controls/table-view/array-2d.h b/dali-toolkit/internal/controls/table-view/array-2d.h index fe9ecd7..31339c9 100644 --- a/dali-toolkit/internal/controls/table-view/array-2d.h +++ b/dali-toolkit/internal/controls/table-view/array-2d.h @@ -1,9 +1,9 @@ #pragma once -#ifndef __DALI_ARRAY2D_H__ -#define __DALI_ARRAY2D_H__ +#ifndef DALI_ARRAY2D_H +#define DALI_ARRAY2D_H /* - * Copyright (c) 2014 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. @@ -272,4 +272,4 @@ private: } // namespace Dali -#endif // __DALI_ARRAY2D_H__ +#endif // DALI_ARRAY2D_H diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.h b/dali-toolkit/internal/controls/table-view/table-view-impl.h index a162b7a..901461f 100755 --- a/dali-toolkit/internal/controls/table-view/table-view-impl.h +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H +#define DALI_TOOLKIT_INTERNAL_TABLE_VIEW_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. @@ -533,4 +533,4 @@ inline const Toolkit::Internal::TableView& GetImpl( const Toolkit::TableView& ta } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_TABLE_VIEW_H diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h index c437361..a79a925 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_H__ -#define __DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_H +#define DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_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. @@ -339,5 +339,5 @@ inline const Toolkit::Internal::TextSelectionPopup& GetImpl( const Toolkit::Text } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_H__ +#endif // DALI_TOOLKIT_INTERNAL_TEXT_SELECTION_POPUP_H diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h index f64d9e8..2d6b981 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__ -#define __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TOOL_BAR_H +#define DALI_TOOLKIT_INTERNAL_TOOL_BAR_H /* - * Copyright (c) 2014 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. @@ -155,4 +155,4 @@ inline const Toolkit::Internal::ToolBar& GetImpl( const Toolkit::ToolBar& toolBa } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TOOL_BAR_H__ +#endif // DALI_TOOLKIT_INTERNAL_TOOL_BAR_H diff --git a/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.h b/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.h index e2e1c47..b83ea13 100755 --- a/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.h +++ b/dali-toolkit/internal/drag-drop-detector/drag-and-drop-detector-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_INTERNAL_DRAG_AND_DROP_DETECTOR_H__ -#define __DALI_INTERNAL_DRAG_AND_DROP_DETECTOR_H__ +#ifndef DALI_INTERNAL_DRAG_AND_DROP_DETECTOR_H +#define DALI_INTERNAL_DRAG_AND_DROP_DETECTOR_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. @@ -266,4 +266,4 @@ inline const Internal::DragAndDropDetector& GetImplementation(const Dali::Toolki } // namespace Dali -#endif // __DALI_INTERNAL_DRAG_AND_DROP_DETECTOR_H__ +#endif // DALI_INTERNAL_DRAG_AND_DROP_DETECTOR_H diff --git a/dali-toolkit/internal/feedback/feedback-ids.h b/dali-toolkit/internal/feedback/feedback-ids.h index cb7ffa3..7dd256e 100644 --- a/dali-toolkit/internal/feedback/feedback-ids.h +++ b/dali-toolkit/internal/feedback/feedback-ids.h @@ -1,8 +1,8 @@ -#ifndef __DALI_FEEDBACK_IDS_H__ -#define __DALI_FEEDBACK_IDS_H__ +#ifndef DALI_FEEDBACK_IDS_H +#define DALI_FEEDBACK_IDS_H /* - * Copyright (c) 2014 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. @@ -102,4 +102,4 @@ enum FeedbackPattern } // namespace Dali -#endif // __DALI_FEEDBACK_IDS_H__ +#endif // DALI_FEEDBACK_IDS_H diff --git a/dali-toolkit/internal/feedback/feedback-style.h b/dali-toolkit/internal/feedback/feedback-style.h index 3693369..2167ace 100644 --- a/dali-toolkit/internal/feedback/feedback-style.h +++ b/dali-toolkit/internal/feedback/feedback-style.h @@ -1,5 +1,5 @@ -#ifndef __DALI_INTERNAL_FEEDBACK_STYLE_H__ -#define __DALI_INTERNAL_FEEDBACK_STYLE_H__ +#ifndef DALI_INTERNAL_FEEDBACK_STYLE_H +#define DALI_INTERNAL_FEEDBACK_STYLE_H /* * Copyright (c) 2019 Samsung Electronics Co., Ltd. @@ -157,4 +157,4 @@ private: } // namespace Dali -#endif // __DALI_INTERNAL_FEEDBACK_STYLE_H__ +#endif // DALI_INTERNAL_FEEDBACK_STYLE_H diff --git a/dali-toolkit/internal/filters/blur-two-pass-filter.h b/dali-toolkit/internal/filters/blur-two-pass-filter.h index 3e73a27..438761d 100644 --- a/dali-toolkit/internal/filters/blur-two-pass-filter.h +++ b/dali-toolkit/internal/filters/blur-two-pass-filter.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__ -#define __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H +#define DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H /* - * Copyright (c) 2014 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. @@ -113,5 +113,5 @@ private: // Attributes } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H__ +#endif // DALI_TOOLKIT_INTERNAL_BLUR_TWO_PASS_FILTER_H diff --git a/dali-toolkit/internal/filters/emboss-filter.h b/dali-toolkit/internal/filters/emboss-filter.h index ace7114..d61a823 100644 --- a/dali-toolkit/internal/filters/emboss-filter.h +++ b/dali-toolkit/internal/filters/emboss-filter.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__ -#define __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H +#define DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H /* - * Copyright (c) 2014 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. @@ -92,5 +92,5 @@ private: // Attributes } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H__ +#endif // DALI_TOOLKIT_INTERNAL_EMBOSS_FILTER_H diff --git a/dali-toolkit/internal/filters/image-filter.h b/dali-toolkit/internal/filters/image-filter.h index 3a4fac9..dbab5b1 100644 --- a/dali-toolkit/internal/filters/image-filter.h +++ b/dali-toolkit/internal/filters/image-filter.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H__ -#define __DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H +#define DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H /* - * Copyright (c) 2014 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. @@ -163,5 +163,5 @@ protected: } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H__ +#endif // DALI_TOOLKIT_INTERNAL_IMAGE_FILTER_H diff --git a/dali-toolkit/internal/filters/spread-filter.h b/dali-toolkit/internal/filters/spread-filter.h index 3ef2155..bc498de 100644 --- a/dali-toolkit/internal/filters/spread-filter.h +++ b/dali-toolkit/internal/filters/spread-filter.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SPREAD_FILTER_H__ -#define __DALI_TOOLKIT_INTERNAL_SPREAD_FILTER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SPREAD_FILTER_H +#define DALI_TOOLKIT_INTERNAL_SPREAD_FILTER_H /* - * Copyright (c) 2014 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. @@ -100,5 +100,5 @@ private: // Attributes } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SPREAD_FILTER_H__ +#endif // DALI_TOOLKIT_INTERNAL_SPREAD_FILTER_H diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h index 9e4d96e..0e0f867 100644 --- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h +++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_KEYBOARD_FOCUS_MANAGER_H__ -#define __DALI_TOOLKIT_INTERNAL_KEYBOARD_FOCUS_MANAGER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_KEYBOARD_FOCUS_MANAGER_H +#define DALI_TOOLKIT_INTERNAL_KEYBOARD_FOCUS_MANAGER_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. @@ -313,4 +313,4 @@ inline const Internal::KeyboardFocusManager& GetImpl(const Dali::Toolkit::Keyboa } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_KEYBOARD_FOCUS_MANAGER_H__ +#endif // DALI_TOOLKIT_INTERNAL_KEYBOARD_FOCUS_MANAGER_H diff --git a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h index e1d1a94..f7886c2 100644 --- a/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h +++ b/dali-toolkit/internal/focus-manager/keyinput-focus-manager-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_KEYINPUT_FOCUS_MANAGER_H__ -#define __DALI_TOOLKIT_INTERNAL_KEYINPUT_FOCUS_MANAGER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_KEYINPUT_FOCUS_MANAGER_H +#define DALI_TOOLKIT_INTERNAL_KEYINPUT_FOCUS_MANAGER_H /* - * Copyright (c) 2014 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. @@ -152,4 +152,4 @@ inline const Internal::KeyInputFocusManager& GetImpl(const Dali::Toolkit::KeyInp } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_KEYINPUT_FOCUS_MANAGER_H__ +#endif // DALI_TOOLKIT_INTERNAL_KEYINPUT_FOCUS_MANAGER_H diff --git a/dali-toolkit/internal/image-loader/atlas-packer.h b/dali-toolkit/internal/image-loader/atlas-packer.h index 2d6c95b..b356124 100644 --- a/dali-toolkit/internal/image-loader/atlas-packer.h +++ b/dali-toolkit/internal/image-loader/atlas-packer.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ATLAS_PACKER_H__ -#define __DALI_TOOLKIT_ATLAS_PACKER_H__ +#ifndef DALI_TOOLKIT_ATLAS_PACKER_H +#define DALI_TOOLKIT_ATLAS_PACKER_H /* - * Copyright (c) 2015 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. @@ -195,4 +195,4 @@ private: } // namespace Dali -#endif /* __DALI_TOOLKIT_ATLAS_PACKER_H__ */ +#endif // DALI_TOOLKIT_ATLAS_PACKER_H diff --git a/dali-toolkit/internal/image-loader/image-atlas-impl.h b/dali-toolkit/internal/image-loader/image-atlas-impl.h index 25b50de..94601a2 100644 --- a/dali-toolkit/internal/image-loader/image-atlas-impl.h +++ b/dali-toolkit/internal/image-loader/image-atlas-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H__ -#define __DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H__ +#ifndef DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H +#define DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H /* - * Copyright (c) 2015 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. @@ -192,4 +192,4 @@ inline Internal::ImageAtlas& GetImplementation( Toolkit::ImageAtlas& imageAtlas } // namespace Dali -#endif /* __DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H__ */ +#endif // DALI_TOOLKIT_IMAGE_ATLAS_IMPL_H diff --git a/dali-toolkit/internal/image-loader/image-load-thread.h b/dali-toolkit/internal/image-loader/image-load-thread.h index c3f230c..4791a75 100644 --- a/dali-toolkit/internal/image-loader/image-load-thread.h +++ b/dali-toolkit/internal/image-loader/image-load-thread.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_IMAGE_LOAD_THREAD_H__ -#define __DALI_TOOLKIT_IMAGE_LOAD_THREAD_H__ +#ifndef DALI_TOOLKIT_IMAGE_LOAD_THREAD_H +#define DALI_TOOLKIT_IMAGE_LOAD_THREAD_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. @@ -176,4 +176,4 @@ private: } // namespace Dali -#endif /* __DALI_TOOLKIT_IMAGE_LOAD_THREAD_H__ */ +#endif // DALI_TOOLKIT_IMAGE_LOAD_THREAD_H diff --git a/dali-toolkit/internal/scripting/script-impl.h b/dali-toolkit/internal/scripting/script-impl.h index e8677b3..f523928 100644 --- a/dali-toolkit/internal/scripting/script-impl.h +++ b/dali-toolkit/internal/scripting/script-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_SCRIPT_H__ -#define __DALI_TOOLKIT_INTERNAL_SCRIPT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_SCRIPT_H +#define DALI_TOOLKIT_INTERNAL_SCRIPT_H /* - * Copyright (c) 2014 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,4 +103,4 @@ inline const Internal::Script& GetImpl(const Dali::Toolkit::Script& obj) } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_SCRIPT_H__ +#endif // DALI_TOOLKIT_INTERNAL_SCRIPT_H diff --git a/dali-toolkit/internal/scripting/script-plugin-proxy.h b/dali-toolkit/internal/scripting/script-plugin-proxy.h index eff47e3..7af87a2 100644 --- a/dali-toolkit/internal/scripting/script-plugin-proxy.h +++ b/dali-toolkit/internal/scripting/script-plugin-proxy.h @@ -1,8 +1,8 @@ -#ifndef __DALI_INTERNAL_SCRIPT_PLUGIN_PROXY_H__ -#define __DALI_INTERNAL_SCRIPT_PLUGIN_PROXY_H__ +#ifndef DALI_INTERNAL_SCRIPT_PLUGIN_PROXY_H +#define DALI_INTERNAL_SCRIPT_PLUGIN_PROXY_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. @@ -110,4 +110,4 @@ private: } // namespace Dali -#endif // __DALI_INTERNAL_SCRIPT_PLUGIN_PROXY_H__ +#endif // DALI_INTERNAL_SCRIPT_PLUGIN_PROXY_H diff --git a/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h index d6bc4a1..7ca7535 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.h +++ b/dali-toolkit/internal/styling/style-manager-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H__ -#define __DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H +#define DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H /* - * Copyright (c) 2014 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. @@ -267,4 +267,4 @@ inline const Internal::StyleManager& GetImpl( const Dali::Toolkit::StyleManager& } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H__ +#endif // DALI_TOOLKIT_INTERNAL_STYLE_MANAGER_H diff --git a/dali-toolkit/internal/text/bidirectional-line-info-run.h b/dali-toolkit/internal/text/bidirectional-line-info-run.h index 355668d..e34e6d0 100644 --- a/dali-toolkit/internal/text/bidirectional-line-info-run.h +++ b/dali-toolkit/internal/text/bidirectional-line-info-run.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H__ -#define __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H__ +#ifndef DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H +#define DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H /* - * Copyright (c) 2015 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. @@ -46,4 +46,4 @@ struct BidirectionalLineInfoRun } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H__ +#endif // DALI_TOOLKIT_TEXT_BIDIRECTIONAL_LINE_INFO_RUN_H diff --git a/dali-toolkit/internal/text/bidirectional-paragraph-info-run.h b/dali-toolkit/internal/text/bidirectional-paragraph-info-run.h index feefa84..34af0f7 100644 --- a/dali-toolkit/internal/text/bidirectional-paragraph-info-run.h +++ b/dali-toolkit/internal/text/bidirectional-paragraph-info-run.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_PARAGRAPH_INFO_RUN_H__ -#define __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_PARAGRAPH_INFO_RUN_H__ +#ifndef DALI_TOOLKIT_TEXT_BIDIRECTIONAL_PARAGRAPH_INFO_RUN_H +#define DALI_TOOLKIT_TEXT_BIDIRECTIONAL_PARAGRAPH_INFO_RUN_H /* - * Copyright (c) 2015 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,4 +48,4 @@ struct BidirectionalParagraphInfoRun } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_PARAGRAPH_INFO_RUN_H__ +#endif // DALI_TOOLKIT_TEXT_BIDIRECTIONAL_PARAGRAPH_INFO_RUN_H diff --git a/dali-toolkit/internal/text/bidirectional-support.h b/dali-toolkit/internal/text/bidirectional-support.h index c29f401..1ca4eca 100755 --- a/dali-toolkit/internal/text/bidirectional-support.h +++ b/dali-toolkit/internal/text/bidirectional-support.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__ -#define __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__ +#ifndef DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H +#define DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H /* - * Copyright (c) 2015 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,4 +123,4 @@ void GetCharactersDirection( const Vector& bidire } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H__ +#endif // DALI_TOOLKIT_TEXT_BIDIRECTIONAL_SUPPORT_H diff --git a/dali-toolkit/internal/text/character-set-conversion.h b/dali-toolkit/internal/text/character-set-conversion.h index e2306fe..168c525 100644 --- a/dali-toolkit/internal/text/character-set-conversion.h +++ b/dali-toolkit/internal/text/character-set-conversion.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CHARACTER_SET_CONVERSION_H__ -#define __DALI_TOOLKIT_CHARACTER_SET_CONVERSION_H__ +#ifndef DALI_TOOLKIT_CHARACTER_SET_CONVERSION_H +#define DALI_TOOLKIT_CHARACTER_SET_CONVERSION_H /* - * Copyright (c) 2015 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. @@ -106,4 +106,4 @@ void Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters, std: } // namespace Dali -#endif // __DALI_TOOLKIT_CHARACTER_SET_CONVERSION_H__ +#endif // DALI_TOOLKIT_CHARACTER_SET_CONVERSION_H diff --git a/dali-toolkit/internal/text/color-run.h b/dali-toolkit/internal/text/color-run.h index 73a9a1c..ad5e6db 100644 --- a/dali-toolkit/internal/text/color-run.h +++ b/dali-toolkit/internal/text/color-run.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_COLOR_RUN_H__ -#define __DALI_TOOLKIT_TEXT_COLOR_RUN_H__ +#ifndef DALI_TOOLKIT_TEXT_COLOR_RUN_H +#define DALI_TOOLKIT_TEXT_COLOR_RUN_H /* - * Copyright (c) 2015 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. @@ -49,4 +49,4 @@ struct ColorRun } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_COLOR_RUN_H__ +#endif // DALI_TOOLKIT_TEXT_COLOR_RUN_H diff --git a/dali-toolkit/internal/text/color-segmentation.h b/dali-toolkit/internal/text/color-segmentation.h index 0a816ab..cde9997 100644 --- a/dali-toolkit/internal/text/color-segmentation.h +++ b/dali-toolkit/internal/text/color-segmentation.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_COLOR_SEGMENTATION_H__ -#define __DALI_TOOLKIT_TEXT_COLOR_SEGMENTATION_H__ +#ifndef DALI_TOOLKIT_TEXT_COLOR_SEGMENTATION_H +#define DALI_TOOLKIT_TEXT_COLOR_SEGMENTATION_H /* - * Copyright (c) 2015 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. @@ -62,4 +62,4 @@ void SetColorSegmentationInfo( const Vector& colorRuns, } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_COLOR_SEGMENTATION_H__ +#endif // DALI_TOOLKIT_TEXT_COLOR_SEGMENTATION_H diff --git a/dali-toolkit/internal/text/decorator/text-decorator.h b/dali-toolkit/internal/text/decorator/text-decorator.h index 4818a72..36adee4 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.h +++ b/dali-toolkit/internal/text/decorator/text-decorator.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_DECORATOR_H__ -#define __DALI_TOOLKIT_TEXT_DECORATOR_H__ +#ifndef DALI_TOOLKIT_TEXT_DECORATOR_H +#define DALI_TOOLKIT_TEXT_DECORATOR_H /* - * Copyright (c) 2015 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. @@ -655,4 +655,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_DECORATOR_H__ +#endif // DALI_TOOLKIT_TEXT_DECORATOR_H diff --git a/dali-toolkit/internal/text/glyph-metrics-helper.h b/dali-toolkit/internal/text/glyph-metrics-helper.h index 2c2c848..761ef86 100644 --- a/dali-toolkit/internal/text/glyph-metrics-helper.h +++ b/dali-toolkit/internal/text/glyph-metrics-helper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_GLYPH_METRICS_HELPER_H__ -#define __DALI_TOOLKIT_TEXT_GLYPH_METRICS_HELPER_H__ +#ifndef DALI_TOOLKIT_TEXT_GLYPH_METRICS_HELPER_H +#define DALI_TOOLKIT_TEXT_GLYPH_METRICS_HELPER_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. @@ -90,4 +90,4 @@ void GetGlyphsMetrics( GlyphIndex glyphIndex, } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_GLYPH_METRICS_HELPER_H__ +#endif // DALI_TOOLKIT_TEXT_GLYPH_METRICS_HELPER_H diff --git a/dali-toolkit/internal/text/glyph-run.h b/dali-toolkit/internal/text/glyph-run.h index 47ebfb8..9524f01 100644 --- a/dali-toolkit/internal/text/glyph-run.h +++ b/dali-toolkit/internal/text/glyph-run.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_GLYPH_RUN_H__ -#define __DALI_TOOLKIT_TEXT_GLYPH_RUN_H__ +#ifndef DALI_TOOLKIT_TEXT_GLYPH_RUN_H +#define DALI_TOOLKIT_TEXT_GLYPH_RUN_H /* - * Copyright (c) 2015 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. @@ -45,4 +45,4 @@ struct GlyphRun } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_GLYPH_RUN_H__ +#endif // DALI_TOOLKIT_TEXT_GLYPH_RUN_H diff --git a/dali-toolkit/internal/text/hidden-text.h b/dali-toolkit/internal/text/hidden-text.h index 90ca9f8..2480a4e 100644 --- a/dali-toolkit/internal/text/hidden-text.h +++ b/dali-toolkit/internal/text/hidden-text.h @@ -1,8 +1,8 @@ -#ifndef __DALI_HIDDEN_TEXT_H__ -#define __DALI_HIDDEN_TEXT_H__ +#ifndef DALI_HIDDEN_TEXT_H +#define DALI_HIDDEN_TEXT_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. @@ -100,4 +100,4 @@ private: } // namespace Dali -#endif // __DALI_HIDDEN_TEXT_H__ +#endif // DALI_HIDDEN_TEXT_H diff --git a/dali-toolkit/internal/text/input-style.h b/dali-toolkit/internal/text/input-style.h index 54d5e80..0a10d90 100644 --- a/dali-toolkit/internal/text/input-style.h +++ b/dali-toolkit/internal/text/input-style.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_INPUT_STYLE_H__ -#define __DALI_TOOLKIT_TEXT_INPUT_STYLE_H__ +#ifndef DALI_TOOLKIT_TEXT_INPUT_STYLE_H +#define DALI_TOOLKIT_TEXT_INPUT_STYLE_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. @@ -245,4 +245,4 @@ struct InputStyle } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_INPUT_STYLE_H__ +#endif // DALI_TOOLKIT_TEXT_INPUT_STYLE_H diff --git a/dali-toolkit/internal/text/line-run.h b/dali-toolkit/internal/text/line-run.h index 9023121..84fde1c 100644 --- a/dali-toolkit/internal/text/line-run.h +++ b/dali-toolkit/internal/text/line-run.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_LINE_RUN_H__ -#define __DALI_TOOLKIT_TEXT_LINE_RUN_H__ +#ifndef DALI_TOOLKIT_TEXT_LINE_RUN_H +#define DALI_TOOLKIT_TEXT_LINE_RUN_H /* - * Copyright (c) 2015 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,4 +54,4 @@ struct LineRun } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_LINE_RUN_H__ +#endif // DALI_TOOLKIT_TEXT_LINE_RUN_H diff --git a/dali-toolkit/internal/text/markup-processor-color.h b/dali-toolkit/internal/text/markup-processor-color.h index bf3ea20..52fa73b 100644 --- a/dali-toolkit/internal/text/markup-processor-color.h +++ b/dali-toolkit/internal/text/markup-processor-color.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H__ -#define __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H__ +#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H +#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H /* - * Copyright (c) 2015 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. @@ -44,4 +44,4 @@ void ProcessColorTag( const Tag& tag, ColorRun& colorRun ); } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H__ +#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_COLOR_H diff --git a/dali-toolkit/internal/text/markup-processor-font.h b/dali-toolkit/internal/text/markup-processor-font.h index c804011..954d471 100644 --- a/dali-toolkit/internal/text/markup-processor-font.h +++ b/dali-toolkit/internal/text/markup-processor-font.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H__ -#define __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H__ +#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H +#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_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. @@ -44,4 +44,4 @@ void ProcessFontTag( const Tag& tag, FontDescriptionRun& fontRun ); } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H__ +#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_FONT_H diff --git a/dali-toolkit/internal/text/markup-processor-helper-functions.h b/dali-toolkit/internal/text/markup-processor-helper-functions.h index 2b0cafb..d6f65c1 100755 --- a/dali-toolkit/internal/text/markup-processor-helper-functions.h +++ b/dali-toolkit/internal/text/markup-processor-helper-functions.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H__ -#define __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H__ +#ifndef DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H +#define DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H /* - * Copyright (c) 2015 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. @@ -192,4 +192,4 @@ void Vector2ToString( const Vector2& value, std::string& vector2Str ); } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H__ +#endif // DALI_TOOLKIT_TEXT_MARKUP_PROCESSOR_HELPER_FUNCTIONS_H diff --git a/dali-toolkit/internal/text/metrics.h b/dali-toolkit/internal/text/metrics.h index 868dba3..d85fff4 100755 --- a/dali-toolkit/internal/text/metrics.h +++ b/dali-toolkit/internal/text/metrics.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_METRICS_H__ -#define __DALI_TOOLKIT_TEXT_METRICS_H__ +#ifndef DALI_TOOLKIT_TEXT_METRICS_H +#define DALI_TOOLKIT_TEXT_METRICS_H /* - * Copyright (c) 2015 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. @@ -134,4 +134,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_METRICS_H__ +#endif // DALI_TOOLKIT_TEXT_METRICS_H diff --git a/dali-toolkit/internal/text/multi-language-helper-functions.h b/dali-toolkit/internal/text/multi-language-helper-functions.h index 14dee1b..c5dc7cd 100644 --- a/dali-toolkit/internal/text/multi-language-helper-functions.h +++ b/dali-toolkit/internal/text/multi-language-helper-functions.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H__ -#define __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H__ +#ifndef DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H +#define DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_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. @@ -74,4 +74,4 @@ Script GetScript( Length index, } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H__ +#endif // DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_HELPER_FUNCTIONS_H diff --git a/dali-toolkit/internal/text/multi-language-support-impl.h b/dali-toolkit/internal/text/multi-language-support-impl.h index c9a7d30..cc6c985 100644 --- a/dali-toolkit/internal/text/multi-language-support-impl.h +++ b/dali-toolkit/internal/text/multi-language-support-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_IMPL_H__ -#define __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_IMPL_H__ +#ifndef DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_IMPL_H +#define DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_IMPL_H /* - * Copyright (c) 2015 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,4 +185,4 @@ inline static const Internal::MultilanguageSupport& GetImplementation( const Mul } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_IMPL_H__ +#endif // DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_IMPL_H diff --git a/dali-toolkit/internal/text/multi-language-support.h b/dali-toolkit/internal/text/multi-language-support.h index 718ecdb..f9749df 100644 --- a/dali-toolkit/internal/text/multi-language-support.h +++ b/dali-toolkit/internal/text/multi-language-support.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_H__ -#define __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_H__ +#ifndef DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_H +#define DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_H /* - * Copyright (c) 2015 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. @@ -135,4 +135,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_H__ +#endif // DALI_TOOLKIT_TEXT_MULTI_LANGUAGE_SUPPORT_H diff --git a/dali-toolkit/internal/text/paragraph-run.h b/dali-toolkit/internal/text/paragraph-run.h index 7a90363..64f2fa1 100644 --- a/dali-toolkit/internal/text/paragraph-run.h +++ b/dali-toolkit/internal/text/paragraph-run.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_PARAGRAPH_RUN_H__ -#define __DALI_TOOLKIT_TEXT_PARAGRAPH_RUN_H__ +#ifndef DALI_TOOLKIT_TEXT_PARAGRAPH_RUN_H +#define DALI_TOOLKIT_TEXT_PARAGRAPH_RUN_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. @@ -51,4 +51,4 @@ struct ParagraphRun } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_PARAGRAPH_RUN_H__ +#endif // DALI_TOOLKIT_TEXT_PARAGRAPH_RUN_H diff --git a/dali-toolkit/internal/text/property-string-parser.h b/dali-toolkit/internal/text/property-string-parser.h index 19d78b7..3584f35 100644 --- a/dali-toolkit/internal/text/property-string-parser.h +++ b/dali-toolkit/internal/text/property-string-parser.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_PROPERTY_STRING_PARSER_H__ -#define __DALI_TOOLKIT_PROPERTY_STRING_PARSER_H__ +#ifndef DALI_TOOLKIT_PROPERTY_STRING_PARSER_H +#define DALI_TOOLKIT_PROPERTY_STRING_PARSER_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. @@ -62,4 +62,4 @@ void ParsePropertyString( const std::string& property, Property::Map& map ); } //namespace Dali -#endif //__DALI_TOOLKIT_PROPERTY_STRING_PARSER_H__ +#endif //DALI_TOOLKIT_PROPERTY_STRING_PARSER_H diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h b/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h index dc48498..ed51450 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__ -#define __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__ +#ifndef DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H +#define DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H /* - * Copyright (c) 2015 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. @@ -215,4 +215,4 @@ inline Internal::AtlasManager& GetImplementation(Toolkit::AtlasManager& manager) } // namespace Dali - #endif // __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__ + #endif // DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-mesh-factory.h b/dali-toolkit/internal/text/rendering/atlas/atlas-mesh-factory.h index f3a953c..bbc1d2f 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-mesh-factory.h +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-mesh-factory.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ATLAS_MESH_FACTORY_H__ -#define __DALI_TOOLKIT_ATLAS_MESH_FACTORY_H__ +#ifndef DALI_TOOLKIT_ATLAS_MESH_FACTORY_H +#define DALI_TOOLKIT_ATLAS_MESH_FACTORY_H /* - * Copyright (c) 2015 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. @@ -67,4 +67,4 @@ namespace AtlasMeshFactory } // namespace Dali -#endif // __DALI_TOOLKIT_ATLAS_MESH_FACTORY_H__ +#endif // DALI_TOOLKIT_ATLAS_MESH_FACTORY_H diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h index f114b02..131dd26 100644 --- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h +++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H__ -#define __DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H__ +#ifndef DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H +#define DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H /* - * Copyright (c) 2015 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,4 +84,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H__ +#endif // DALI_TOOLKIT_TEXT_ATLAS_RENDERER_H diff --git a/dali-toolkit/internal/text/rendering/text-backend-impl.h b/dali-toolkit/internal/text/rendering/text-backend-impl.h index a185ee2..fc52c5f 100644 --- a/dali-toolkit/internal/text/rendering/text-backend-impl.h +++ b/dali-toolkit/internal/text/rendering/text-backend-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_BACKEND_H__ -#define __DALI_TOOLKIT_INTERNAL_TEXT_BACKEND_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TEXT_BACKEND_H +#define DALI_TOOLKIT_INTERNAL_TEXT_BACKEND_H /* - * Copyright (c) 2015 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. @@ -100,4 +100,4 @@ inline static const Internal::Backend& GetImplementation(const Backend& backend) } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TEXT_BACKEND_H__ +#endif // DALI_TOOLKIT_INTERNAL_TEXT_BACKEND_H diff --git a/dali-toolkit/internal/text/rendering/text-backend.h b/dali-toolkit/internal/text/rendering/text-backend.h index 42eacff..2b554dc 100644 --- a/dali-toolkit/internal/text/rendering/text-backend.h +++ b/dali-toolkit/internal/text/rendering/text-backend.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_BACKEND_H__ -#define __DALI_TOOLKIT_TEXT_BACKEND_H__ +#ifndef DALI_TOOLKIT_TEXT_BACKEND_H +#define DALI_TOOLKIT_TEXT_BACKEND_H /* - * Copyright (c) 2015 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,4 +103,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_BACKEND_H__ +#endif // DALI_TOOLKIT_TEXT_BACKEND_H diff --git a/dali-toolkit/internal/text/rendering/text-renderer.h b/dali-toolkit/internal/text/rendering/text-renderer.h index 1d473c5..65fbf50 100644 --- a/dali-toolkit/internal/text/rendering/text-renderer.h +++ b/dali-toolkit/internal/text/rendering/text-renderer.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_RENDERER_H__ -#define __DALI_TOOLKIT_TEXT_RENDERER_H__ +#ifndef DALI_TOOLKIT_TEXT_RENDERER_H +#define DALI_TOOLKIT_TEXT_RENDERER_H /* - * Copyright (c) 2015 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. @@ -90,4 +90,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_RENDERER_H__ +#endif // DALI_TOOLKIT_TEXT_RENDERER_H diff --git a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h index 9ba3930..4a7e75b 100644 --- a/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h +++ b/dali-toolkit/internal/text/rendering/vector-based/vector-based-renderer.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__ -#define __DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__ +#ifndef DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H +#define DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_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. @@ -84,4 +84,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H__ +#endif // DALI_TOOLKIT_TEXT_VECTOR_BASED_RENDERER_H diff --git a/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas-share.h b/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas-share.h index a854089..c9a7590 100644 --- a/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas-share.h +++ b/dali-toolkit/internal/text/rendering/vector-based/vector-blob-atlas-share.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_VECTOR_BLOB_ATLAS_SHARE_H__ -#define __DALI_TOOLKIT_VECTOR_BLOB_ATLAS_SHARE_H__ +#ifndef DALI_TOOLKIT_VECTOR_BLOB_ATLAS_SHARE_H +#define DALI_TOOLKIT_VECTOR_BLOB_ATLAS_SHARE_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. @@ -88,4 +88,4 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_VECTOR_BLOB_ATLAS_SHARE_H__ +#endif // DALI_TOOLKIT_VECTOR_BLOB_ATLAS_SHARE_H diff --git a/dali-toolkit/internal/text/script-run.h b/dali-toolkit/internal/text/script-run.h index 3f6b678..ce0698f 100755 --- a/dali-toolkit/internal/text/script-run.h +++ b/dali-toolkit/internal/text/script-run.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SCRIPT_RUN_H__ -#define __DALI_TOOLKIT_TEXT_SCRIPT_RUN_H__ +#ifndef DALI_TOOLKIT_TEXT_SCRIPT_RUN_H +#define DALI_TOOLKIT_TEXT_SCRIPT_RUN_H /* - * Copyright (c) 2015 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. @@ -46,4 +46,4 @@ struct ScriptRun } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SCRIPT_RUN_H__ +#endif // DALI_TOOLKIT_TEXT_SCRIPT_RUN_H diff --git a/dali-toolkit/internal/text/segmentation.h b/dali-toolkit/internal/text/segmentation.h index e23065a..a60865a 100644 --- a/dali-toolkit/internal/text/segmentation.h +++ b/dali-toolkit/internal/text/segmentation.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SEGMENTATION_H__ -#define __DALI_TOOLKIT_TEXT_SEGMENTATION_H__ +#ifndef DALI_TOOLKIT_TEXT_SEGMENTATION_H +#define DALI_TOOLKIT_TEXT_SEGMENTATION_H /* - * Copyright (c) 2015 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. @@ -76,4 +76,4 @@ void SetWordBreakInfo( const Vector& text, } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SEGMENTATION_H__ +#endif // DALI_TOOLKIT_TEXT_SEGMENTATION_H diff --git a/dali-toolkit/internal/text/shaper.h b/dali-toolkit/internal/text/shaper.h index 2cd47cb..b38b0a0 100644 --- a/dali-toolkit/internal/text/shaper.h +++ b/dali-toolkit/internal/text/shaper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SHAPER_H__ -#define __DALI_TOOLKIT_TEXT_SHAPER_H__ +#ifndef DALI_TOOLKIT_TEXT_SHAPER_H +#define DALI_TOOLKIT_TEXT_SHAPER_H /* - * Copyright (c) 2015 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. @@ -70,4 +70,4 @@ void ShapeText( const Vector& text, } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SHAPER_H__ +#endif // DALI_TOOLKIT_TEXT_SHAPER_H diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index e0c63c8..36314c9 100755 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -61,6 +61,7 @@ const char * const PLACEHOLDER_FONT_STYLE = "fontStyle"; const char * const PLACEHOLDER_POINT_SIZE = "pointSize"; const char * const PLACEHOLDER_PIXEL_SIZE = "pixelSize"; const char * const PLACEHOLDER_ELLIPSIS = "ellipsis"; +const unsigned int MAX_TEXT_LENGTH = 1024u * 32u; float ConvertToEven( float value ) { @@ -309,7 +310,7 @@ bool Controller::IsSmoothHandlePanEnabled() const void Controller::SetMaximumNumberOfCharacters( Length maxCharacters ) { - mImpl->mMaximumNumberOfCharacters = maxCharacters; + mImpl->mMaximumNumberOfCharacters = std::min( maxCharacters, MAX_TEXT_LENGTH ); } int Controller::GetMaximumNumberOfCharacters() @@ -592,6 +593,13 @@ void Controller::SetText( const std::string& text ) utf8 = reinterpret_cast( text.c_str() ); } + // Limit the text size. If the text size is too large, crash or deadlock will occur. + if( textSize > MAX_TEXT_LENGTH ) + { + DALI_LOG_WARNING( "The text size is too large(%d), limit the length to 32,768u\n", textSize ); + textSize = MAX_TEXT_LENGTH; + } + // Convert text into UTF-32 Vector& utf32Characters = mImpl->mModel->mLogicalModel->mText; utf32Characters.Resize( textSize ); diff --git a/dali-toolkit/internal/text/text-definitions.h b/dali-toolkit/internal/text/text-definitions.h index e98e08e..6ea207b 100755 --- a/dali-toolkit/internal/text/text-definitions.h +++ b/dali-toolkit/internal/text/text-definitions.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__ -#define __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__ +#ifndef DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H +#define DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H /* - * Copyright (c) 2015 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. @@ -69,4 +69,4 @@ typedef uint32_t ParagraphRunIndex; ///< An inde } // namespace Dali -#endif // __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__ +#endif // DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H diff --git a/dali-toolkit/internal/text/text-effects-style.h b/dali-toolkit/internal/text/text-effects-style.h index 240a76e..a64d26f 100755 --- a/dali-toolkit/internal/text/text-effects-style.h +++ b/dali-toolkit/internal/text/text-effects-style.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_EFFECTS_STYLE_H__ -#define __DALI_TOOLKIT_INTERNAL_TEXT_EFFECTS_STYLE_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TEXT_EFFECTS_STYLE_H +#define DALI_TOOLKIT_INTERNAL_TEXT_EFFECTS_STYLE_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. @@ -206,4 +206,4 @@ void GetBackgroundProperties( ControllerPtr controller, Property::Value& value, } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TEXT_EFFECTS_STYLE_H__ +#endif // DALI_TOOLKIT_INTERNAL_TEXT_EFFECTS_STYLE_H diff --git a/dali-toolkit/internal/text/text-font-style.h b/dali-toolkit/internal/text/text-font-style.h index 4a01d32..e53d754 100644 --- a/dali-toolkit/internal/text/text-font-style.h +++ b/dali-toolkit/internal/text/text-font-style.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H__ -#define __DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H__ +#ifndef DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H +#define DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_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. @@ -148,4 +148,4 @@ FontSlant StringToSlant( const char* const slantStr ); } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H__ +#endif // DALI_TOOLKIT_INTERNAL_TEXT_FONT_STYLE_H diff --git a/dali-toolkit/internal/text/text-io.h b/dali-toolkit/internal/text/text-io.h index 25620e0..6c6d3c5 100644 --- a/dali-toolkit/internal/text/text-io.h +++ b/dali-toolkit/internal/text/text-io.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TEXT_ABSTRACTION_TEXT_IO_H__ -#define __DALI_TEXT_ABSTRACTION_TEXT_IO_H__ +#ifndef DALI_TEXT_ABSTRACTION_TEXT_IO_H +#define DALI_TEXT_ABSTRACTION_TEXT_IO_H /* - * Copyright (c) 2015 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. @@ -79,4 +79,4 @@ std::ostream& operator<< (std::ostream& o, const Vector& lineRuns); } // namespace Dali -#endif // __DALI_TEXT_ABSTRACTION_TEXT_IO_H__ +#endif // DALI_TEXT_ABSTRACTION_TEXT_IO_H diff --git a/dali-toolkit/internal/text/text-run-container.h b/dali-toolkit/internal/text/text-run-container.h index ecac39d..3b54d5c 100644 --- a/dali-toolkit/internal/text/text-run-container.h +++ b/dali-toolkit/internal/text/text-run-container.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_RUN_CONTAINER_H__ -#define __DALI_TOOLKIT_TEXT_RUN_CONTAINER_H__ +#ifndef DALI_TOOLKIT_TEXT_RUN_CONTAINER_H +#define DALI_TOOLKIT_TEXT_RUN_CONTAINER_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. @@ -353,4 +353,4 @@ void ClearGlyphRuns( GlyphIndex startIndex, } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_RUN_CONTAINER_H__ +#endif // DALI_TOOLKIT_TEXT_RUN_CONTAINER_H diff --git a/dali-toolkit/internal/text/text-scroller-interface.h b/dali-toolkit/internal/text/text-scroller-interface.h index 08b1153..9cecc36 100644 --- a/dali-toolkit/internal/text/text-scroller-interface.h +++ b/dali-toolkit/internal/text/text-scroller-interface.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SCROLLER_INTERFACE_H__ -#define __DALI_TOOLKIT_TEXT_SCROLLER_INTERFACE_H__ +#ifndef DALI_TOOLKIT_TEXT_SCROLLER_INTERFACE_H +#define DALI_TOOLKIT_TEXT_SCROLLER_INTERFACE_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. @@ -54,4 +54,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SCROLLER_INTERFACE_H__ +#endif // DALI_TOOLKIT_TEXT_SCROLLER_INTERFACE_H diff --git a/dali-toolkit/internal/text/text-scroller.h b/dali-toolkit/internal/text/text-scroller.h index a7a6410..16e350a 100644 --- a/dali-toolkit/internal/text/text-scroller.h +++ b/dali-toolkit/internal/text/text-scroller.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_SCROLLER_H__ -#define __DALI_TOOLKIT_TEXT_SCROLLER_H__ +#ifndef DALI_TOOLKIT_TEXT_SCROLLER_H +#define DALI_TOOLKIT_TEXT_SCROLLER_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. @@ -194,5 +194,5 @@ private: } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_SCROLLER_H__ +#endif // DALI_TOOLKIT_TEXT_SCROLLER_H diff --git a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h index 8f6fda9..d9ce90f 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H__ -#define __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H /* - * Copyright (c) 2014 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. @@ -118,4 +118,4 @@ inline const Internal::CubeTransitionCrossEffect& GetImpl( const Dali::Toolkit:: } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H_ */ +#endif // DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H diff --git a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h index 336557f..40f28bf 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-fold-effect-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H__ -#define __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H /* - * Copyright (c) 2014 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,4 +103,4 @@ inline const Internal::CubeTransitionFoldEffect& GetImpl( const Dali::Toolkit::C } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H_ */ +#endif // DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_FOLD_EFFECT_H diff --git a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h index d53ccc4..ff968d3 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-wave-effect-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_WAVE_EFFECT_H__ -#define __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_WAVE_EFFECT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_WAVE_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_WAVE_EFFECT_H /* - * Copyright (c) 2014 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. @@ -124,4 +124,4 @@ inline const Internal::CubeTransitionWaveEffect& GetImpl( const Dali::Toolkit::C } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_WAVE_EFFECT_H__ */ +#endif // DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_WAVE_EFFECT_H diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp index ab3dbb1..543ca0d 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp @@ -379,6 +379,8 @@ void VectorRasterizeThread::Rasterize() { mPlayState = DevelImageVisual::PlayState::STOPPED; + ResetToStart( mCurrentFrameUpdated, mCurrentFrame, startFrame, mConditionalWait ); + // Animation is finished mAnimationFinishedTrigger->Trigger(); diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h index a8b2f8e..eefbcdb 100755 --- a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h +++ b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ACCESSIBILITY_MANAGER_H__ -#define __DALI_TOOLKIT_ACCESSIBILITY_MANAGER_H__ +#ifndef DALI_TOOLKIT_ACCESSIBILITY_MANAGER_H +#define DALI_TOOLKIT_ACCESSIBILITY_MANAGER_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. @@ -828,4 +828,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_ACCESSIBILITY_MANAGER_H__ +#endif // DALI_TOOLKIT_ACCESSIBILITY_MANAGER_H diff --git a/dali-toolkit/public-api/align-enumerations.h b/dali-toolkit/public-api/align-enumerations.h index 24312ab..7934d16 100644 --- a/dali-toolkit/public-api/align-enumerations.h +++ b/dali-toolkit/public-api/align-enumerations.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMERATIONS_H__ -#define __DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMERATIONS_H__ +#ifndef DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMERATIONS_H +#define DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMERATIONS_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,4 +63,4 @@ enum Type } // namespace Dali -#endif // __DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMERATIONS_H__ +#endif // DALI_TOOLKIT_DEVEL_API_ALIGN_ENUMERATIONS_H diff --git a/dali-toolkit/public-api/controls/alignment/alignment.h b/dali-toolkit/public-api/controls/alignment/alignment.h index 039e6c6..116f658 100644 --- a/dali-toolkit/public-api/controls/alignment/alignment.h +++ b/dali-toolkit/public-api/controls/alignment/alignment.h @@ -1,8 +1,8 @@ -#ifndef __DALI_ALIGNMENT_H__ -#define __DALI_ALIGNMENT_H__ +#ifndef DALI_ALIGNMENT_H +#define DALI_ALIGNMENT_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. @@ -258,8 +258,9 @@ public: // Not intended for application developers /** * @} */ + } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_LAYOUT_H__ +#endif // DALI_ALIGNMENT_H diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h index 848644f..6bb9991 100644 --- a/dali-toolkit/public-api/controls/buttons/button.h +++ b/dali-toolkit/public-api/controls/buttons/button.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_BUTTON_H__ -#define __DALI_TOOLKIT_BUTTON_H__ +#ifndef DALI_TOOLKIT_BUTTON_H +#define DALI_TOOLKIT_BUTTON_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. @@ -637,4 +637,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_BUTTON_H__ +#endif // DALI_TOOLKIT_BUTTON_H diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.h b/dali-toolkit/public-api/controls/buttons/check-box-button.h index 7e83432..8b4c8cf 100644 --- a/dali-toolkit/public-api/controls/buttons/check-box-button.h +++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CHECK_BOX_BUTTON_H__ -#define __DALI_TOOLKIT_CHECK_BOX_BUTTON_H__ +#ifndef DALI_TOOLKIT_CHECK_BOX_BUTTON_H +#define DALI_TOOLKIT_CHECK_BOX_BUTTON_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. @@ -156,4 +156,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_CHECK_BOX_BUTTON_H__ +#endif // DALI_TOOLKIT_CHECK_BOX_BUTTON_H diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h index 13784dd..66dcab4 100644 --- a/dali-toolkit/public-api/controls/buttons/push-button.h +++ b/dali-toolkit/public-api/controls/buttons/push-button.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_PUSH_BUTTON_H__ -#define __DALI_TOOLKIT_PUSH_BUTTON_H__ +#ifndef DALI_TOOLKIT_PUSH_BUTTON_H +#define DALI_TOOLKIT_PUSH_BUTTON_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. @@ -288,4 +288,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_PUSH_BUTTON_H__ +#endif // DALI_TOOLKIT_PUSH_BUTTON_H diff --git a/dali-toolkit/public-api/controls/buttons/radio-button.h b/dali-toolkit/public-api/controls/buttons/radio-button.h index 8d4b4cb..2793710 100644 --- a/dali-toolkit/public-api/controls/buttons/radio-button.h +++ b/dali-toolkit/public-api/controls/buttons/radio-button.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_RADIO_BUTTON_H__ -#define __DALI_TOOLKIT_RADIO_BUTTON_H__ +#ifndef DALI_TOOLKIT_RADIO_BUTTON_H +#define DALI_TOOLKIT_RADIO_BUTTON_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. @@ -175,4 +175,4 @@ class DALI_TOOLKIT_API RadioButton: public Button } // namespace Dali -#endif // __DALI_TOOLKIT_RADIO_BUTTON_H__ +#endif // DALI_TOOLKIT_RADIO_BUTTON_H diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index f418372..01a0af5 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_CONTROL_H__ -#define __DALI_TOOLKIT_CONTROL_H__ +#ifndef DALI_TOOLKIT_CONTROL_H +#define DALI_TOOLKIT_CONTROL_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. @@ -572,4 +572,4 @@ public: // Templates for Deriving Classes } // namespace Dali -#endif // __DALI_TOOLKIT_CONTROL_H__ +#endif // DALI_TOOLKIT_CONTROL_H diff --git a/dali-toolkit/public-api/controls/flex-container/flex-container.h b/dali-toolkit/public-api/controls/flex-container/flex-container.h index ac564b9..78965f8 100644 --- a/dali-toolkit/public-api/controls/flex-container/flex-container.h +++ b/dali-toolkit/public-api/controls/flex-container/flex-container.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_FLEX_CONTAINER_H__ -#define __DALI_TOOLKIT_FLEX_CONTAINER_H__ +#ifndef DALI_TOOLKIT_FLEX_CONTAINER_H +#define DALI_TOOLKIT_FLEX_CONTAINER_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. @@ -307,4 +307,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_FLEX_CONTAINER_H__ +#endif // DALI_TOOLKIT_FLEX_CONTAINER_H diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h index 7a8fc9e..01cb7b2 100644 --- a/dali-toolkit/public-api/controls/image-view/image-view.h +++ b/dali-toolkit/public-api/controls/image-view/image-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_IMAGE_VIEW_H__ -#define __DALI_TOOLKIT_IMAGE_VIEW_H__ +#ifndef DALI_TOOLKIT_IMAGE_VIEW_H +#define DALI_TOOLKIT_IMAGE_VIEW_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. @@ -310,4 +310,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_IMAGE_VIEW_H__ +#endif // DALI_TOOLKIT_IMAGE_VIEW_H diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h index 60d6d4b..dfa6830 100755 --- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h +++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_MODEL3D_VIEW_H__ -#define __DALI_TOOLKIT_MODEL3D_VIEW_H__ +#ifndef DALI_TOOLKIT_MODEL3D_VIEW_H +#define DALI_TOOLKIT_MODEL3D_VIEW_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. @@ -190,4 +190,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_MODEL3D_VIEW_H__ +#endif // DALI_TOOLKIT_MODEL3D_VIEW_H diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h index 2285e68..d988212 100755 --- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h +++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SCROLL_BAR_H__ -#define __DALI_TOOLKIT_SCROLL_BAR_H__ +#ifndef DALI_TOOLKIT_SCROLL_BAR_H +#define DALI_TOOLKIT_SCROLL_BAR_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. @@ -447,4 +447,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_SCROLL_BAR_H__ +#endif // DALI_TOOLKIT_SCROLL_BAR_H diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h index a416b4d..5660714 100755 --- a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h @@ -23,6 +23,10 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_controls_item_view + * @{ + */ /** * @brief Default item layout property. @@ -277,6 +281,9 @@ enum Property SPIRAL_TOP_ITEM_ALIGNMENT, }; +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h index 04bc8e6..d3f1514 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_DEFAULT_ITEM_LAYOUT_H__ -#define __DALI_TOOLKIT_DEFAULT_ITEM_LAYOUT_H__ +#ifndef DALI_TOOLKIT_DEFAULT_ITEM_LAYOUT_H +#define DALI_TOOLKIT_DEFAULT_ITEM_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. @@ -68,4 +68,4 @@ DALI_TOOLKIT_API ItemLayoutPtr New( Type type ); } // namespace Dali -#endif // __DALI_TOOLKIT_DEFAULT_ITEM_LAYOUT_H__ +#endif // DALI_TOOLKIT_DEFAULT_ITEM_LAYOUT_H diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h index 69fe4aa..49ed6d3 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ITEM_FACTORY_H__ -#define __DALI_TOOLKIT_ITEM_FACTORY_H__ +#ifndef DALI_TOOLKIT_ITEM_FACTORY_H +#define DALI_TOOLKIT_ITEM_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. @@ -98,4 +98,4 @@ public: } // namespace Dali -#endif // __DALI_TOOLKIT_ITEM_FACTORY_H__ +#endif // DALI_TOOLKIT_ITEM_FACTORY_H diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h index 2ffcdcc..995bb1b 100755 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ITEM_LAYOUT_H__ -#define __DALI_TOOLKIT_ITEM_LAYOUT_H__ +#ifndef DALI_TOOLKIT_ITEM_LAYOUT_H +#define DALI_TOOLKIT_ITEM_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. @@ -424,4 +424,4 @@ protected: } // namespace Dali -#endif // __DALI_TOOLKIT_ITEM_LAYOUT_H__ +#endif // DALI_TOOLKIT_ITEM_LAYOUT_H diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h index 20e1f53..ca09059 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ITEM_VIEW_DECLARATIONS_H__ -#define __DALI_TOOLKIT_ITEM_VIEW_DECLARATIONS_H__ +#ifndef DALI_TOOLKIT_ITEM_VIEW_DECLARATIONS_H +#define DALI_TOOLKIT_ITEM_VIEW_DECLARATIONS_H /* - * Copyright (c) 2015 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. @@ -55,4 +55,4 @@ class ItemLayout; } // namespace Dali -#endif // __DALI_TOOLKIT_ITEM_VIEW_DECLARATIONS_H__ +#endif // DALI_TOOLKIT_ITEM_VIEW_DECLARATIONS_H diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h index b2e99f5..692d129 100755 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ITEM_VIEW_H__ -#define __DALI_TOOLKIT_ITEM_VIEW_H__ +#ifndef DALI_TOOLKIT_ITEM_VIEW_H +#define DALI_TOOLKIT_ITEM_VIEW_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. @@ -635,4 +635,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_ITEM_VIEW_H__ +#endif // DALI_TOOLKIT_ITEM_VIEW_H diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h index 0805ba6..737c3bd 100755 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SCROLL_VIEW_CONSTRAINTS_H__ -#define __DALI_TOOLKIT_SCROLL_VIEW_CONSTRAINTS_H__ +#ifndef DALI_TOOLKIT_SCROLL_VIEW_CONSTRAINTS_H +#define DALI_TOOLKIT_SCROLL_VIEW_CONSTRAINTS_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. @@ -70,4 +70,4 @@ DALI_TOOLKIT_API void WrapActorConstraint( Vector3& position, const PropertyInpu } // namespace Dali -#endif // __DALI_TOOLKIT_SCROLL_VIEW_CONSTRAINTS_H__ +#endif // DALI_TOOLKIT_SCROLL_VIEW_CONSTRAINTS_H diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h index 639ae75..d6f3402 100755 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SCROLL_VIEW_EFFECT_H__ -#define __DALI_TOOLKIT_SCROLL_VIEW_EFFECT_H__ +#ifndef DALI_TOOLKIT_SCROLL_VIEW_EFFECT_H +#define DALI_TOOLKIT_SCROLL_VIEW_EFFECT_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. @@ -92,4 +92,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_SCROLL_VIEW_EFFECT_H__ +#endif // DALI_TOOLKIT_SCROLL_VIEW_EFFECT_H diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h index e18eff4..4207633 100755 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H__ -#define __DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H__ +#ifndef DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H +#define DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_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,4 +128,4 @@ protected: } // namespace Dali -#endif // __DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H__ +#endif // DALI_TOOLKIT_SCROLL_VIEW_PAGE_PATH_EFFECT_H diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h index 4bed510..2822027 100755 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SCROLL_VIEW_H__ -#define __DALI_TOOLKIT_SCROLL_VIEW_H__ +#ifndef DALI_TOOLKIT_SCROLL_VIEW_H +#define DALI_TOOLKIT_SCROLL_VIEW_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. @@ -1445,4 +1445,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_SCROLL_VIEW_H__ +#endif // DALI_TOOLKIT_SCROLL_VIEW_H diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h index b369321..38050ae 100644 --- a/dali-toolkit/public-api/controls/scrollable/scrollable.h +++ b/dali-toolkit/public-api/controls/scrollable/scrollable.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SCROLLABLE_H__ -#define __DALI_TOOLKIT_SCROLLABLE_H__ +#ifndef DALI_TOOLKIT_SCROLLABLE_H +#define DALI_TOOLKIT_SCROLLABLE_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. @@ -269,4 +269,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_SCROLLABLE_H__ +#endif // DALI_TOOLKIT_SCROLLABLE_H diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h index e2c529e..603e110 100644 --- a/dali-toolkit/public-api/controls/slider/slider.h +++ b/dali-toolkit/public-api/controls/slider/slider.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_SLIDER_H__ -#define __DALI_TOOLKIT_SLIDER_H__ +#ifndef DALI_TOOLKIT_SLIDER_H +#define DALI_TOOLKIT_SLIDER_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. @@ -299,4 +299,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_SLIDER_H__ +#endif // DALI_TOOLKIT_SLIDER_H diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/public-api/controls/table-view/table-view.h index 61da392..c73d8d0 100644 --- a/dali-toolkit/public-api/controls/table-view/table-view.h +++ b/dali-toolkit/public-api/controls/table-view/table-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TABLE_VIEW_H__ -#define __DALI_TOOLKIT_TABLE_VIEW_H__ +#ifndef DALI_TOOLKIT_TABLE_VIEW_H +#define DALI_TOOLKIT_TABLE_VIEW_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. @@ -541,4 +541,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TABLE_VIEW_H__ +#endif // DALI_TOOLKIT_TABLE_VIEW_H diff --git a/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h b/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h index 53d54a9..1e34ebf 100644 --- a/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h +++ b/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h @@ -25,7 +25,7 @@ namespace Toolkit { /** - * @addtogroup dali_toolkit_controls + * @addtogroup dali_toolkit_controls_text_controls * @{ */ diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.h b/dali-toolkit/public-api/controls/text-controls/text-editor.h index 5260ffe..389b0fe 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-editor.h +++ b/dali-toolkit/public-api/controls/text-controls/text-editor.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_EDITOR_H__ -#define __DALI_TOOLKIT_TEXT_EDITOR_H__ +#ifndef DALI_TOOLKIT_TEXT_EDITOR_H +#define DALI_TOOLKIT_TEXT_EDITOR_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. @@ -634,4 +634,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_EDITOR_H__ +#endif // DALI_TOOLKIT_TEXT_EDITOR_H diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h index 01b1569..133b2c7 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-field.h +++ b/dali-toolkit/public-api/controls/text-controls/text-field.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_FIELD_H__ -#define __DALI_TOOLKIT_TEXT_FIELD_H__ +#ifndef DALI_TOOLKIT_TEXT_FIELD_H +#define DALI_TOOLKIT_TEXT_FIELD_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. @@ -650,4 +650,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_FIELD_H__ +#endif // DALI_TOOLKIT_TEXT_FIELD_H diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h index a85297a..a3a0c3d 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.h +++ b/dali-toolkit/public-api/controls/text-controls/text-label.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_LABEL_H__ -#define __DALI_TOOLKIT_TEXT_LABEL_H__ +#ifndef DALI_TOOLKIT_TEXT_LABEL_H +#define DALI_TOOLKIT_TEXT_LABEL_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. @@ -497,4 +497,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_LABEL_H__ +#endif // DALI_TOOLKIT_TEXT_LABEL_H diff --git a/dali-toolkit/public-api/controls/video-view/video-view.h b/dali-toolkit/public-api/controls/video-view/video-view.h index 87ade91..88728ee 100755 --- a/dali-toolkit/public-api/controls/video-view/video-view.h +++ b/dali-toolkit/public-api/controls/video-view/video-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_VIDEO_VIEW_H__ -#define __DALI_TOOLKIT_VIDEO_VIEW_H__ +#ifndef DALI_TOOLKIT_VIDEO_VIEW_H +#define DALI_TOOLKIT_VIDEO_VIEW_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. @@ -347,4 +347,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_VIDEO_VIEW_H__ +#endif // DALI_TOOLKIT_VIDEO_VIEW_H diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp index 55e6f17..637b1a2 100644 --- a/dali-toolkit/public-api/dali-toolkit-version.cpp +++ b/dali-toolkit/public-api/dali-toolkit-version.cpp @@ -31,7 +31,7 @@ namespace Toolkit const unsigned int TOOLKIT_MAJOR_VERSION = 1; const unsigned int TOOLKIT_MINOR_VERSION = 4; -const unsigned int TOOLKIT_MICRO_VERSION = 20; +const unsigned int TOOLKIT_MICRO_VERSION = 21; const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/dali-toolkit/public-api/dali-toolkit-version.h b/dali-toolkit/public-api/dali-toolkit-version.h index 617fdcb..5f174dd 100755 --- a/dali-toolkit/public-api/dali-toolkit-version.h +++ b/dali-toolkit/public-api/dali-toolkit-version.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_VERSION_H__ -#define __DALI_TOOLKIT_VERSION_H__ +#ifndef DALI_TOOLKIT_VERSION_H +#define DALI_TOOLKIT_VERSION_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. @@ -32,4 +32,4 @@ DALI_TOOLKIT_API extern const char * const TOOLKIT_BUILD_DATE; ///< The date/ } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_VERSION_H__ +#endif // DALI_TOOLKIT_VERSION_H diff --git a/dali-toolkit/public-api/enums.h b/dali-toolkit/public-api/enums.h index 08c922f..e2529f2 100644 --- a/dali-toolkit/public-api/enums.h +++ b/dali-toolkit/public-api/enums.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_ENUMS_H__ -#define __DALI_TOOLKIT_ENUMS_H__ +#ifndef DALI_TOOLKIT_ENUMS_H +#define DALI_TOOLKIT_ENUMS_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. @@ -79,4 +79,4 @@ DALI_TOOLKIT_API bool IsHorizontal(ControlOrientation::Type orientation); } // namespace Dali -#endif // __DALI_TOOLKIT_ENUMS_H__ +#endif // DALI_TOOLKIT_ENUMS_H diff --git a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h index caed557..56b57cf 100644 --- a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h +++ b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_H__ -#define __DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_H__ +#ifndef DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_H +#define DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_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. @@ -313,4 +313,4 @@ public: // Signals } // namespace Dali -#endif // __DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_H__ +#endif // DALI_TOOLKIT_KEYBOARD_FOCUS_MANAGER_H diff --git a/dali-toolkit/public-api/image-loader/async-image-loader.h b/dali-toolkit/public-api/image-loader/async-image-loader.h index 8d4c629..3a30253 100755 --- a/dali-toolkit/public-api/image-loader/async-image-loader.h +++ b/dali-toolkit/public-api/image-loader/async-image-loader.h @@ -39,6 +39,11 @@ class AsyncImageLoader; } /** + * @addtogroup dali_toolkit_image_loader + * @{ + */ + +/** * @brief The AsyncImageLoader is used to load pixel data from a URL asynchronously. * * The images are loaded in a worker thread to avoid blocking the main event thread. @@ -242,6 +247,9 @@ public: // Not intended for developer use }; +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/public-api/image-loader/sync-image-loader.h b/dali-toolkit/public-api/image-loader/sync-image-loader.h index 732c937..7d52867 100755 --- a/dali-toolkit/public-api/image-loader/sync-image-loader.h +++ b/dali-toolkit/public-api/image-loader/sync-image-loader.h @@ -31,6 +31,11 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_image_loader + * @{ + */ + namespace SyncImageLoader { @@ -102,6 +107,9 @@ DALI_TOOLKIT_API PixelData Load( const std::string& url, } // namespace SyncImageLoader +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/public-api/styling/style-manager.h b/dali-toolkit/public-api/styling/style-manager.h index de6bfb1..4e42f57 100644 --- a/dali-toolkit/public-api/styling/style-manager.h +++ b/dali-toolkit/public-api/styling/style-manager.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_STYLE_MANAGER_H__ -#define __DALI_TOOLKIT_STYLE_MANAGER_H__ +#ifndef DALI_TOOLKIT_STYLE_MANAGER_H +#define DALI_TOOLKIT_STYLE_MANAGER_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. @@ -193,9 +193,9 @@ public: /** * @} */ + } // namespace Toolkit } // namespace Dali - -#endif /* __DALI_TOOLKIT_STYLE_MANAGER_H__ */ +#endif // DALI_TOOLKIT_STYLE_MANAGER_H diff --git a/dali-toolkit/public-api/text/rendering-backend.h b/dali-toolkit/public-api/text/rendering-backend.h index 00686ed..6c266f8 100755 --- a/dali-toolkit/public-api/text/rendering-backend.h +++ b/dali-toolkit/public-api/text/rendering-backend.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_RENDERING_BACKEND_H__ -#define __DALI_TOOLKIT_RENDERING_BACKEND_H__ +#ifndef DALI_TOOLKIT_RENDERING_BACKEND_H +#define DALI_TOOLKIT_RENDERING_BACKEND_H /* - * Copyright (c) 2015 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. @@ -23,6 +23,10 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_controls_text_controls + * @{ + */ namespace Text { @@ -41,8 +45,11 @@ const unsigned int DEFAULT_RENDERING_BACKEND = RENDERING_SHARED_ATLAS; } // namespace Text +/** + * @} + */ } // namespace Toolkit } // namespace Dali -#endif // __DALI_TOOLKIT_RENDERING_BACKEND_H__ +#endif // DALI_TOOLKIT_RENDERING_BACKEND_H diff --git a/dali-toolkit/public-api/text/text-enumerations.h b/dali-toolkit/public-api/text/text-enumerations.h index d9f23be..5276d32 100644 --- a/dali-toolkit/public-api/text/text-enumerations.h +++ b/dali-toolkit/public-api/text/text-enumerations.h @@ -23,9 +23,8 @@ namespace Dali namespace Toolkit { - /** - * @addtogroup dali_toolkit_controls + * @addtogroup dali_toolkit_controls_text_controls * @{ */ diff --git a/dali-toolkit/public-api/toolkit-property-index-ranges.h b/dali-toolkit/public-api/toolkit-property-index-ranges.h index f77d859..c3bb73b 100644 --- a/dali-toolkit/public-api/toolkit-property-index-ranges.h +++ b/dali-toolkit/public-api/toolkit-property-index-ranges.h @@ -26,6 +26,10 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_controls + * @{ + */ /** * @brief Enumeration for the start and end property ranges. @@ -39,6 +43,9 @@ enum PropertyRanges VISUAL_PROPERTY_END_INDEX = VISUAL_PROPERTY_START_INDEX + 100000, ///< Visual Property End Index. @SINCE_1_1.45 }; +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h index 813d2ac..e8cae72 100755 --- a/doc/dali-toolkit-doc.h +++ b/doc/dali-toolkit-doc.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_DOC_H__ -#define __DALI_TOOLKIT_DOC_H__ +#ifndef DALI_TOOLKIT_DOC_H +#define DALI_TOOLKIT_DOC_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. @@ -140,6 +140,10 @@ * @ref dali_toolkit_visuals * Visuals can control rendering the contents as using Property. * + * + * @ref dali_toolkit_image_loader + * The ImageLoader is used to load pixel data from a URL. + * * * * \ifnot show_tizen_feature @@ -219,8 +223,10 @@ * @defgroup dali_toolkit_visuals Visuals * @brief Visuals can control rendering the contents as using Property. + * @defgroup dali_toolkit_image_loader Image Loader + * @brief The ImageLoader is used to load pixel data from a URL. + * @} */ - -#endif /* __DALI_TOOLKIT_DOC_H__ */ +#endif // DALI_TOOLKIT_DOC_H diff --git a/node-addon/javascript-application-options.h b/node-addon/javascript-application-options.h index 56c92fe..1401c7d 100644 --- a/node-addon/javascript-application-options.h +++ b/node-addon/javascript-application-options.h @@ -1,8 +1,8 @@ -#ifndef __DALI_JAVASCRIPT_APPLICATION_OPTIONS_H__ -#define __DALI_JAVASCRIPT_APPLICATION_OPTIONS_H__ +#ifndef DALI_JAVASCRIPT_APPLICATION_OPTIONS_H +#define DALI_JAVASCRIPT_APPLICATION_OPTIONS_H /* - * Copyright (c) 2015 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,4 +73,4 @@ bool GetApplicationOptions( const v8::FunctionCallbackInfo& args, App -#endif // __DALI_JAVASCRIPT_APPLICATION_OPTIONS_H__ +#endif // DALI_JAVASCRIPT_APPLICATION_OPTIONS_H diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec index 7001896..ea37b74 100644 --- a/packaging/dali-toolkit.spec +++ b/packaging/dali-toolkit.spec @@ -1,6 +1,6 @@ Name: dali-toolkit Summary: Dali 3D engine Toolkit -Version: 1.4.20 +Version: 1.4.21 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT diff --git a/plugins/dali-script-v8/src/actors/actor-api.h b/plugins/dali-script-v8/src/actors/actor-api.h index 2963400..6db7534 100644 --- a/plugins/dali-script-v8/src/actors/actor-api.h +++ b/plugins/dali-script-v8/src/actors/actor-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_ACTOR_API_H__ -#define __DALI_V8PLUGIN_ACTOR_API_H__ +#ifndef DALI_V8PLUGIN_ACTOR_API_H +#define DALI_V8PLUGIN_ACTOR_API_H /* - * Copyright (c) 2015 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. @@ -72,11 +72,10 @@ namespace ActorApi // they're dealing with, returns actor name as a string void GetActorType( const v8::FunctionCallbackInfo< v8::Value >& args ); - }; // namespace ActorApi } // namespace V8Plugin } // namespace Dali -#endif // header __DALI_V8PLUGIN_ACTOR_API_H__ +#endif // DALI_V8PLUGIN_ACTOR_API_H diff --git a/plugins/dali-script-v8/src/actors/actor-wrapper.h b/plugins/dali-script-v8/src/actors/actor-wrapper.h index e84559f..f7a48b3 100644 --- a/plugins/dali-script-v8/src/actors/actor-wrapper.h +++ b/plugins/dali-script-v8/src/actors/actor-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_ACTOR_WRAPPER_H__ -#define __DALI_V8PLUGIN_ACTOR_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_ACTOR_WRAPPER_H +#define DALI_V8PLUGIN_ACTOR_WRAPPER_H /* - * Copyright (c) 2015 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,4 +123,4 @@ private: } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_ACTOR_WRAPPER_H diff --git a/plugins/dali-script-v8/src/actors/camera-actor-api.h b/plugins/dali-script-v8/src/actors/camera-actor-api.h index df250f4..eeabae7 100644 --- a/plugins/dali-script-v8/src/actors/camera-actor-api.h +++ b/plugins/dali-script-v8/src/actors/camera-actor-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_CAMERA_ACTOR_API_H__ -#define __DALI_V8PLUGIN_CAMERA_ACTOR_API_H__ +#ifndef DALI_V8PLUGIN_CAMERA_ACTOR_API_H +#define DALI_V8PLUGIN_CAMERA_ACTOR_API_H /* - * Copyright (c) 2015 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,4 +48,4 @@ namespace CameraActorApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_CAMERA_ACTOR_API_H__ +#endif // DALI_V8PLUGIN_CAMERA_ACTOR_API_H diff --git a/plugins/dali-script-v8/src/actors/layer-api.h b/plugins/dali-script-v8/src/actors/layer-api.h index adb50d6..e6d0187 100644 --- a/plugins/dali-script-v8/src/actors/layer-api.h +++ b/plugins/dali-script-v8/src/actors/layer-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_LAYER_API_H__ -#define __DALI_V8PLUGIN_LAYER_API_H__ +#ifndef DALI_V8PLUGIN_LAYER_API_H +#define DALI_V8PLUGIN_LAYER_API_H /* - * Copyright (c) 2015 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. @@ -57,4 +57,4 @@ namespace LayerApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_LAYER_API_H__ +#endif // DALI_V8PLUGIN_LAYER_API_H diff --git a/plugins/dali-script-v8/src/animation/animation-api.h b/plugins/dali-script-v8/src/animation/animation-api.h index 8400c62..b903818 100644 --- a/plugins/dali-script-v8/src/animation/animation-api.h +++ b/plugins/dali-script-v8/src/animation/animation-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_ANIMATION_API_H__ -#define __DALI_V8PLUGIN_ANIMATION_API_H__ +#ifndef DALI_V8PLUGIN_ANIMATION_API_H +#define DALI_V8PLUGIN_ANIMATION_API_H /* - * Copyright (c) 2015 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. @@ -81,4 +81,4 @@ namespace AnimationApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_ANIMATION_API_H__ +#endif // DALI_V8PLUGIN_ANIMATION_API_H diff --git a/plugins/dali-script-v8/src/animation/animation-wrapper.h b/plugins/dali-script-v8/src/animation/animation-wrapper.h index 469736c..2fcc541 100644 --- a/plugins/dali-script-v8/src/animation/animation-wrapper.h +++ b/plugins/dali-script-v8/src/animation/animation-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_ANIMATION_WRAPPER_H__ -#define __DALI_V8PLUGIN_ANIMATION_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_ANIMATION_WRAPPER_H +#define DALI_V8PLUGIN_ANIMATION_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -79,4 +79,4 @@ private: } // namespace Dali -#endif // __DALI_V8PLUGIN_ANIMATION_WRAPPER_H__ +#endif // DALI_V8PLUGIN_ANIMATION_WRAPPER_H diff --git a/plugins/dali-script-v8/src/animation/constrainer-api.h b/plugins/dali-script-v8/src/animation/constrainer-api.h index 15d49ea..bbd5729 100644 --- a/plugins/dali-script-v8/src/animation/constrainer-api.h +++ b/plugins/dali-script-v8/src/animation/constrainer-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_CONSTRAINER_API_H__ -#define __DALI_V8PLUGIN_CONSTRAINER_API_H__ +#ifndef DALI_V8PLUGIN_CONSTRAINER_API_H +#define DALI_V8PLUGIN_CONSTRAINER_API_H /* - * Copyright (c) 2015 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. @@ -43,4 +43,4 @@ namespace ConstrainerApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_PATH_CONSTRAINER_API_H__ +#endif // DALI_V8PLUGIN_PATH_CONSTRAINER_API_H diff --git a/plugins/dali-script-v8/src/animation/linear-constrainer-wrapper.h b/plugins/dali-script-v8/src/animation/linear-constrainer-wrapper.h index 610ab62..426a65c 100644 --- a/plugins/dali-script-v8/src/animation/linear-constrainer-wrapper.h +++ b/plugins/dali-script-v8/src/animation/linear-constrainer-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_LINEAR_CONSTRAINER_WRAPPER_H__ -#define __DALI_V8PLUGIN_LINEAR_CONSTRAINER_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_LINEAR_CONSTRAINER_WRAPPER_H +#define DALI_V8PLUGIN_LINEAR_CONSTRAINER_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -80,4 +80,4 @@ private: } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_LINEAR_CONSTRAINER_WRAPPER_H diff --git a/plugins/dali-script-v8/src/animation/path-api.h b/plugins/dali-script-v8/src/animation/path-api.h index 8fb7c47..a144110 100644 --- a/plugins/dali-script-v8/src/animation/path-api.h +++ b/plugins/dali-script-v8/src/animation/path-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_PATH_API_H__ -#define __DALI_V8PLUGIN_PATH_API_H__ +#ifndef DALI_V8PLUGIN_PATH_API_H +#define DALI_V8PLUGIN_PATH_API_H /* - * Copyright (c) 2015 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. @@ -47,4 +47,4 @@ namespace PathApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_PATH_API_H__ +#endif // DALI_V8PLUGIN_PATH_API_H diff --git a/plugins/dali-script-v8/src/animation/path-constrainer-wrapper.h b/plugins/dali-script-v8/src/animation/path-constrainer-wrapper.h index 014f6cc..c7fab39 100644 --- a/plugins/dali-script-v8/src/animation/path-constrainer-wrapper.h +++ b/plugins/dali-script-v8/src/animation/path-constrainer-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_PATH_CONSTRAINER_WRAPPER_H__ -#define __DALI_V8PLUGIN_PATH_CONSTRAINER_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_PATH_CONSTRAINER_WRAPPER_H +#define DALI_V8PLUGIN_PATH_CONSTRAINER_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -80,4 +80,4 @@ private: } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_PATH_CONSTRAINER_WRAPPER_H diff --git a/plugins/dali-script-v8/src/animation/path-wrapper.h b/plugins/dali-script-v8/src/animation/path-wrapper.h index d6c42b6..1736bdac 100644 --- a/plugins/dali-script-v8/src/animation/path-wrapper.h +++ b/plugins/dali-script-v8/src/animation/path-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_PATH_WRAPPER_H__ -#define __DALI_V8PLUGIN_PATH_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_PATH_WRAPPER_H +#define DALI_V8PLUGIN_PATH_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -80,4 +80,4 @@ private: } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_PATH_WRAPPER_H diff --git a/plugins/dali-script-v8/src/constants/constants-wrapper.h b/plugins/dali-script-v8/src/constants/constants-wrapper.h index 9e25e6a..c4ed4f3 100644 --- a/plugins/dali-script-v8/src/constants/constants-wrapper.h +++ b/plugins/dali-script-v8/src/constants/constants-wrapper.h @@ -1,7 +1,7 @@ -#ifndef __DALI_V8PLUGIN_DALI_CONSTANTS_WRAPPER -#define __DALI_V8PLUGIN_DALI_CONSTANTS_WRAPPER +#ifndef DALI_V8PLUGIN_DALI_CONSTANTS_WRAPPER +#define DALI_V8PLUGIN_DALI_CONSTANTS_WRAPPER /* - * Copyright (c) 2015 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. @@ -36,4 +36,5 @@ void AddDaliConstants( v8::Isolate* isolate, v8::Local& obj ); } // namespace V8Plugin } // namespace Dali -#endif + +#endif // DALI_V8PLUGIN_DALI_CONSTANTS_WRAPPER diff --git a/plugins/dali-script-v8/src/controls/control-wrapper.h b/plugins/dali-script-v8/src/controls/control-wrapper.h index 8147d56..7e4e843 100644 --- a/plugins/dali-script-v8/src/controls/control-wrapper.h +++ b/plugins/dali-script-v8/src/controls/control-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_CONTROL_WRAPPER_H__ -#define __DALI_V8PLUGIN_CONTROL_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_CONTROL_WRAPPER_H +#define DALI_V8PLUGIN_CONTROL_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -125,4 +125,4 @@ private: } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_CONTROL_WRAPPER_H diff --git a/plugins/dali-script-v8/src/controls/item-factory-wrapper.h b/plugins/dali-script-v8/src/controls/item-factory-wrapper.h index cfb21fb..44b9baf 100644 --- a/plugins/dali-script-v8/src/controls/item-factory-wrapper.h +++ b/plugins/dali-script-v8/src/controls/item-factory-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_ITEM_FACTORY_WRAPPER_H__ -#define __DALI_V8PLUGIN_ITEM_FACTORY_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_ITEM_FACTORY_WRAPPER_H +#define DALI_V8PLUGIN_ITEM_FACTORY_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -143,4 +143,4 @@ private: } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_ITEM_FACTORY_WRAPPER_H diff --git a/plugins/dali-script-v8/src/controls/item-view-api.h b/plugins/dali-script-v8/src/controls/item-view-api.h index 7f56653..a3349fa 100644 --- a/plugins/dali-script-v8/src/controls/item-view-api.h +++ b/plugins/dali-script-v8/src/controls/item-view-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_ITEM_VIEW_API_H__ -#define __DALI_V8PLUGIN_ITEM_VIEW_API_H__ +#ifndef DALI_V8PLUGIN_ITEM_VIEW_API_H +#define DALI_V8PLUGIN_ITEM_VIEW_API_H /* - * Copyright (c) 2015 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. @@ -56,4 +56,4 @@ namespace ItemViewApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_ITEM_VIEW_API_H__ +#endif // DALI_V8PLUGIN_ITEM_VIEW_API_H diff --git a/plugins/dali-script-v8/src/controls/scroll-view-api.h b/plugins/dali-script-v8/src/controls/scroll-view-api.h index 0ca74db..c3e0e50 100644 --- a/plugins/dali-script-v8/src/controls/scroll-view-api.h +++ b/plugins/dali-script-v8/src/controls/scroll-view-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_SCROLL_VIEW_API_H__ -#define __DALI_V8PLUGIN_SCROLL_VIEW_API_H__ +#ifndef DALI_V8PLUGIN_SCROLL_VIEW_API_H +#define DALI_V8PLUGIN_SCROLL_VIEW_API_H /* - * Copyright (c) 2015 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. @@ -55,4 +55,4 @@ namespace ScrollViewApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_SCROLL_VIEW_API_H__ +#endif // DALI_V8PLUGIN_SCROLL_VIEW_API_H diff --git a/plugins/dali-script-v8/src/dali-script-v8.h b/plugins/dali-script-v8/src/dali-script-v8.h index 8177f3b..1a9d773 100644 --- a/plugins/dali-script-v8/src/dali-script-v8.h +++ b/plugins/dali-script-v8/src/dali-script-v8.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_SCRIPT_H__ -#define __DALI_V8PLUGIN_SCRIPT_H__ +#ifndef DALI_V8PLUGIN_SCRIPT_H +#define DALI_V8PLUGIN_SCRIPT_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,12 +61,10 @@ public: // ScriptV8Plugin overrides * @copydoc Dali::Toolkit::ScriptPlugin::ExecuteFile() */ virtual bool ExecuteFile(const std::string& fileName); - - }; } // namespace V8Plugin } // namespace Dali -#endif // __FEEDBACK_PLUGIN_H__ +#endif // DALI_V8PLUGIN_SCRIPT_H diff --git a/plugins/dali-script-v8/src/dali-wrapper.h b/plugins/dali-script-v8/src/dali-wrapper.h index c1013fe..e3e5e91 100644 --- a/plugins/dali-script-v8/src/dali-wrapper.h +++ b/plugins/dali-script-v8/src/dali-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_DALI_WRAP_H__ -#define __DALI_V8PLUGIN_DALI_WRAP_H__ +#ifndef DALI_V8PLUGIN_DALI_WRAP_H +#define DALI_V8PLUGIN_DALI_WRAP_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. @@ -186,4 +186,4 @@ private: } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_DALI_WRAP_H diff --git a/plugins/dali-script-v8/src/events/event-object-generator.h b/plugins/dali-script-v8/src/events/event-object-generator.h index 0bbd47a..897a3c2 100644 --- a/plugins/dali-script-v8/src/events/event-object-generator.h +++ b/plugins/dali-script-v8/src/events/event-object-generator.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_EVENT_OBJECT_GENERATOR_H__ -#define __DALI_V8PLUGIN_EVENT_OBJECT_GENERATOR_H__ +#ifndef DALI_V8PLUGIN_EVENT_OBJECT_GENERATOR_H +#define DALI_V8PLUGIN_EVENT_OBJECT_GENERATOR_H /* - * Copyright (c) 2015 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. @@ -47,13 +47,10 @@ namespace EventObjectGenerator v8::Handle CreateWheelEvent( v8::Isolate* isolate, const WheelEvent& wheelEvent); v8::Handle CreateKeyEvent( v8::Isolate* isolate, const KeyEvent& keyEvent); v8::Handle CreatePanGesture( v8::Isolate* isolate, const PanGesture& panGesture); - - - }; } // namespace V8Plugin } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_EVENT_OBJECT_GENERATOR_H diff --git a/plugins/dali-script-v8/src/events/pan-gesture-detector-api.h b/plugins/dali-script-v8/src/events/pan-gesture-detector-api.h index 8a33566..0f6fc54 100644 --- a/plugins/dali-script-v8/src/events/pan-gesture-detector-api.h +++ b/plugins/dali-script-v8/src/events/pan-gesture-detector-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_API_H__ -#define __DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_API_H__ +#ifndef DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_API_H +#define DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_API_H /* - * Copyright (c) 2015 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. @@ -47,4 +47,4 @@ namespace PanGestureDetectorApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_API_H__ +#endif // DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_API_H diff --git a/plugins/dali-script-v8/src/events/pan-gesture-detector-wrapper.h b/plugins/dali-script-v8/src/events/pan-gesture-detector-wrapper.h index 59d824d..16d28e5 100644 --- a/plugins/dali-script-v8/src/events/pan-gesture-detector-wrapper.h +++ b/plugins/dali-script-v8/src/events/pan-gesture-detector-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_WRAPPER_H__ -#define __DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_WRAPPER_H +#define DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -79,4 +79,4 @@ private: } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_PAN_GESTURE_DETECTOR_WRAPPER_H diff --git a/plugins/dali-script-v8/src/garbage-collector/garbage-collector.h b/plugins/dali-script-v8/src/garbage-collector/garbage-collector.h index d28faf3..dd48698 100644 --- a/plugins/dali-script-v8/src/garbage-collector/garbage-collector.h +++ b/plugins/dali-script-v8/src/garbage-collector/garbage-collector.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_GARBAGE_COLLECTOR_H__ -#define __DALI_V8PLUGIN_GARBAGE_COLLECTOR_H__ +#ifndef DALI_V8PLUGIN_GARBAGE_COLLECTOR_H +#define DALI_V8PLUGIN_GARBAGE_COLLECTOR_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. @@ -74,8 +74,8 @@ private: }; -} // V8Plugin +} // namespace V8Plugin -} // Dali +} // namespace Dali -#endif // header __DALI_V8PLUGIN_GARBAGE_COLLECTOR_H__ +#endif // DALI_V8PLUGIN_GARBAGE_COLLECTOR_H diff --git a/plugins/dali-script-v8/src/image/buffer-image-api.h b/plugins/dali-script-v8/src/image/buffer-image-api.h index b46f2e3..667cef3 100644 --- a/plugins/dali-script-v8/src/image/buffer-image-api.h +++ b/plugins/dali-script-v8/src/image/buffer-image-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_RESOURCE_BUFFER_IMAGE_API_H__ -#define __DALI_V8PLUGIN_RESOURCE_BUFFER_IMAGE_API_H__ +#ifndef DALI_V8PLUGIN_RESOURCE_BUFFER_IMAGE_API_H +#define DALI_V8PLUGIN_RESOURCE_BUFFER_IMAGE_API_H /* - * Copyright (c) 2015 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. @@ -59,4 +59,4 @@ namespace BufferImageApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_RESOURCE_BUFFER_IMAGE_API_H__ +#endif // DALI_V8PLUGIN_RESOURCE_BUFFER_IMAGE_API_H diff --git a/plugins/dali-script-v8/src/image/frame-buffer-image-api.h b/plugins/dali-script-v8/src/image/frame-buffer-image-api.h index ec0aaf3..9d2b2cf 100644 --- a/plugins/dali-script-v8/src/image/frame-buffer-image-api.h +++ b/plugins/dali-script-v8/src/image/frame-buffer-image-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_FRAME_BUFFER_IMAGE_API_H__ -#define __DALI_V8PLUGIN_FRAME_BUFFER_IMAGE_API_H__ +#ifndef DALI_V8PLUGIN_FRAME_BUFFER_IMAGE_API_H +#define DALI_V8PLUGIN_FRAME_BUFFER_IMAGE_API_H /* - * Copyright (c) 2015 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. @@ -44,4 +44,4 @@ namespace FrameBufferImageApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_FRAME_BUFFER_IMAGE_API_H__ +#endif // DALI_V8PLUGIN_FRAME_BUFFER_IMAGE_API_H diff --git a/plugins/dali-script-v8/src/image/image-api.h b/plugins/dali-script-v8/src/image/image-api.h index 5985dd7..923fe70 100644 --- a/plugins/dali-script-v8/src/image/image-api.h +++ b/plugins/dali-script-v8/src/image/image-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_IMAGE_API_H__ -#define __DALI_V8PLUGIN_IMAGE_API_H__ +#ifndef DALI_V8PLUGIN_IMAGE_API_H +#define DALI_V8PLUGIN_IMAGE_API_H /* - * Copyright (c) 2015 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,4 +54,4 @@ namespace ImageApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_IMAGE_API_H__ +#endif // DALI_V8PLUGIN_IMAGE_API_H diff --git a/plugins/dali-script-v8/src/image/image-wrapper.h b/plugins/dali-script-v8/src/image/image-wrapper.h index d6d461d..948e706 100644 --- a/plugins/dali-script-v8/src/image/image-wrapper.h +++ b/plugins/dali-script-v8/src/image/image-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_IMAGE_WRAPPER_H__ -#define __DALI_V8PLUGIN_IMAGE_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_IMAGE_WRAPPER_H +#define DALI_V8PLUGIN_IMAGE_WRAPPER_H /* - * Copyright (c) 2015 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,4 +123,4 @@ private: } // namespace Dali -#endif // __DALI_V8PLUGIN_IMAGE_WRAPPER_H__ +#endif // DALI_V8PLUGIN_IMAGE_WRAPPER_H diff --git a/plugins/dali-script-v8/src/image/resource-image-api.h b/plugins/dali-script-v8/src/image/resource-image-api.h index 5912975..fb052fb 100644 --- a/plugins/dali-script-v8/src/image/resource-image-api.h +++ b/plugins/dali-script-v8/src/image/resource-image-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_RESOURCE_IMAGE_API_H__ -#define __DALI_V8PLUGIN_RESOURCE_IMAGE_API_H__ +#ifndef DALI_V8PLUGIN_RESOURCE_IMAGE_API_H +#define DALI_V8PLUGIN_RESOURCE_IMAGE_API_H /* - * Copyright (c) 2015 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. @@ -55,4 +55,4 @@ namespace ResourceImageApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_RESOURCE_IMAGE_API_H__ +#endif // DALI_V8PLUGIN_RESOURCE_IMAGE_API_H diff --git a/plugins/dali-script-v8/src/interfaces/garbage-collector-interface.h b/plugins/dali-script-v8/src/interfaces/garbage-collector-interface.h index 77e83a9..1bf4957 100644 --- a/plugins/dali-script-v8/src/interfaces/garbage-collector-interface.h +++ b/plugins/dali-script-v8/src/interfaces/garbage-collector-interface.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_GARBAGE_COLLECTOR_INTERFACE_H__ -#define __DALI_V8PLUGIN_GARBAGE_COLLECTOR_INTERFACE_H__ +#ifndef DALI_V8PLUGIN_GARBAGE_COLLECTOR_INTERFACE_H +#define DALI_V8PLUGIN_GARBAGE_COLLECTOR_INTERFACE_H /* - * Copyright (c) 2015 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,12 +86,10 @@ protected: // Undefined assignment operator. GarbageCollectorInterface& operator=( const GarbageCollectorInterface& ); - - }; -} // V8Plugin +} // namespace V8Plugin -} // Dali +} // namespace Dali -#endif // header __DALI_V8PLUGIN_GARBAGE_COLLECTOR_INTERFACE_H__ +#endif // DALI_V8PLUGIN_GARBAGE_COLLECTOR_INTERFACE_H diff --git a/plugins/dali-script-v8/src/module-loader/module-loader.h b/plugins/dali-script-v8/src/module-loader/module-loader.h index 001f83e..1ef3692 100644 --- a/plugins/dali-script-v8/src/module-loader/module-loader.h +++ b/plugins/dali-script-v8/src/module-loader/module-loader.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_MODULE_LOADER_H__ -#define __DALI_V8PLUGIN_MODULE_LOADER_H__ +#ifndef DALI_V8PLUGIN_MODULE_LOADER_H +#define DALI_V8PLUGIN_MODULE_LOADER_H /* - * Copyright (c) 2015 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. @@ -157,9 +157,8 @@ private: }; - } // namespace V8Plugin } // namespace Dali -#endif // header MODULE_LOADER +#endif // DALI_V8PLUGIN_MODULE_LOADER_H diff --git a/plugins/dali-script-v8/src/module-loader/module.h b/plugins/dali-script-v8/src/module-loader/module.h index e0286bf..fe92675 100644 --- a/plugins/dali-script-v8/src/module-loader/module.h +++ b/plugins/dali-script-v8/src/module-loader/module.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_MODULE_H__ -#define __DALI_V8PLUGIN_MODULE_H__ +#ifndef DALI_V8PLUGIN_MODULE_H +#define DALI_V8PLUGIN_MODULE_H /* - * Copyright (c) 2015 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. @@ -74,12 +74,10 @@ private: Module( const Module& ); ///< undefined copy constructor Module& operator=( const Module& ); ///< undefined assignment operator - - }; } // namespace V8Plugin } // namespace Dali -#endif // header MODULE_LOADER +#endif // DALI_V8PLUGIN_MODULE_H diff --git a/plugins/dali-script-v8/src/object/handle-wrapper.h b/plugins/dali-script-v8/src/object/handle-wrapper.h index 7356f01..98f9c22 100644 --- a/plugins/dali-script-v8/src/object/handle-wrapper.h +++ b/plugins/dali-script-v8/src/object/handle-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_HANDLE_WRAPPER_H__ -#define __DALI_V8PLUGIN_HANDLE_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_HANDLE_WRAPPER_H +#define DALI_V8PLUGIN_HANDLE_WRAPPER_H /* - * Copyright (c) 2015 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,9 +101,8 @@ private: }; - } // namespace V8Plugin } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_HANDLE_WRAPPER_H diff --git a/plugins/dali-script-v8/src/object/property-value-wrapper.h b/plugins/dali-script-v8/src/object/property-value-wrapper.h index 05a3e38..6a4bbf6 100644 --- a/plugins/dali-script-v8/src/object/property-value-wrapper.h +++ b/plugins/dali-script-v8/src/object/property-value-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_PROPERTYVALUE_WRAPPER_H__ -#define __DALI_V8PLUGIN_PROPERTYVALUE_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_PROPERTYVALUE_WRAPPER_H +#define DALI_V8PLUGIN_PROPERTYVALUE_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -159,8 +159,8 @@ private: Dali::Property::Value mValue; ///< property value }; -} // V8Plugin +} // namespace V8Plugin -} // Dali +} // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_PROPERTYVALUE_WRAPPER_H diff --git a/plugins/dali-script-v8/src/render-tasks/render-task-api.h b/plugins/dali-script-v8/src/render-tasks/render-task-api.h index efd7444..622f9bc 100644 --- a/plugins/dali-script-v8/src/render-tasks/render-task-api.h +++ b/plugins/dali-script-v8/src/render-tasks/render-task-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_RENDER_TASK_API_H__ -#define __DALI_V8PLUGIN_RENDER_TASK_API_H__ +#ifndef DALI_V8PLUGIN_RENDER_TASK_API_H +#define DALI_V8PLUGIN_RENDER_TASK_API_H /* - * Copyright (c) 2015 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,4 +61,4 @@ namespace RenderTaskApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_RENDER_TASK_API_H__ +#endif // DALI_V8PLUGIN_RENDER_TASK_API_H diff --git a/plugins/dali-script-v8/src/render-tasks/render-task-list-api.h b/plugins/dali-script-v8/src/render-tasks/render-task-list-api.h index 6472ffa..1d8a6b6 100644 --- a/plugins/dali-script-v8/src/render-tasks/render-task-list-api.h +++ b/plugins/dali-script-v8/src/render-tasks/render-task-list-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_RENDER_TASK_LIST_API_H__ -#define __DALI_V8PLUGIN_RENDER_TASK_LIST_API_H__ +#ifndef DALI_V8PLUGIN_RENDER_TASK_LIST_API_H +#define DALI_V8PLUGIN_RENDER_TASK_LIST_API_H /* - * Copyright (c) 2015 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. @@ -50,4 +50,4 @@ namespace RenderTaskListApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_RENDER_TASK_LIST_API_H__ +#endif // DALI_V8PLUGIN_RENDER_TASK_LIST_API_H diff --git a/plugins/dali-script-v8/src/render-tasks/render-task-list-wrapper.h b/plugins/dali-script-v8/src/render-tasks/render-task-list-wrapper.h index 6450665..c074007 100644 --- a/plugins/dali-script-v8/src/render-tasks/render-task-list-wrapper.h +++ b/plugins/dali-script-v8/src/render-tasks/render-task-list-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_RENDER_TASK_LIST_WRAPPER_H__ -#define __DALI_V8PLUGIN_RENDER_TASK_LIST_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_RENDER_TASK_LIST_WRAPPER_H +#define DALI_V8PLUGIN_RENDER_TASK_LIST_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -72,4 +72,4 @@ private: } // namespace Dali -#endif // __DALI_V8PLUGIN_RENDER_TASK_LIST_WRAPPER_H__ +#endif // DALI_V8PLUGIN_RENDER_TASK_LIST_WRAPPER_H diff --git a/plugins/dali-script-v8/src/render-tasks/render-task-wrapper.h b/plugins/dali-script-v8/src/render-tasks/render-task-wrapper.h index ab88f87..e992e42 100644 --- a/plugins/dali-script-v8/src/render-tasks/render-task-wrapper.h +++ b/plugins/dali-script-v8/src/render-tasks/render-task-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_SHADER_EFFECT_WRAPPER_H__ -#define __DALI_V8PLUGIN_SHADER_EFFECT_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_SHADER_EFFECT_WRAPPER_H +#define DALI_V8PLUGIN_SHADER_EFFECT_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -74,4 +74,4 @@ private: } // namespace Dali -#endif // __DALI_V8PLUGIN_SHADER_EFFECT_WRAPPER_H__ +#endif // DALI_V8PLUGIN_SHADER_EFFECT_WRAPPER_H diff --git a/plugins/dali-script-v8/src/rendering/shader-wrapper.h b/plugins/dali-script-v8/src/rendering/shader-wrapper.h index a5833f9..7840a3d 100644 --- a/plugins/dali-script-v8/src/rendering/shader-wrapper.h +++ b/plugins/dali-script-v8/src/rendering/shader-wrapper.h @@ -2,7 +2,7 @@ #define DALI_V8PLUGIN_SHADER_WRAPPER_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. @@ -104,4 +104,4 @@ private: } // namespace Dali -#endif // DALI_V8PLUGIN_SHADER_WRAPPER_H__ +#endif // DALI_V8PLUGIN_SHADER_WRAPPER_H diff --git a/plugins/dali-script-v8/src/shared/api-function.h b/plugins/dali-script-v8/src/shared/api-function.h index acb3f25..d57ace3 100644 --- a/plugins/dali-script-v8/src/shared/api-function.h +++ b/plugins/dali-script-v8/src/shared/api-function.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_API_FUNCTION_H__ -#define __DALI_V8PLUGIN_API_FUNCTION_H__ +#ifndef DALI_V8PLUGIN_API_FUNCTION_H +#define DALI_V8PLUGIN_API_FUNCTION_H /* - * Copyright (c) 2015 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. @@ -46,9 +46,8 @@ struct ApiFunction void (*function)( const v8::FunctionCallbackInfo< v8::Value >& args); }; +} // namespace V8Plugin -} // V8Plugin +} // namespace Dali -} // Dali - -#endif +#endif // DALI_V8PLUGIN_API_FUNCTION_H diff --git a/plugins/dali-script-v8/src/shared/base-wrapped-object.h b/plugins/dali-script-v8/src/shared/base-wrapped-object.h index 4cdc867..4f06f4c 100644 --- a/plugins/dali-script-v8/src/shared/base-wrapped-object.h +++ b/plugins/dali-script-v8/src/shared/base-wrapped-object.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_BASE_WRAPPED_OBJECT_H__ -#define __DALI_V8PLUGIN_BASE_WRAPPED_OBJECT_H__ +#ifndef DALI_V8PLUGIN_BASE_WRAPPED_OBJECT_H +#define DALI_V8PLUGIN_BASE_WRAPPED_OBJECT_H /* - * Copyright (c) 2015 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. @@ -189,8 +189,8 @@ private: GarbageCollectorInterface& mGarbageCollector; ///< Dali garbage collector }; -} // V8Plugin +} // namespace V8Plugin -} // Dali +} // namespace Dali -#endif // header __DALI_V8PLUGIN_DALI_OBJECT_LIFETIME_MANAGER_H__ +#endif // DALI_V8PLUGIN_BASE_WRAPPED_OBJECT_H diff --git a/plugins/dali-script-v8/src/shared/object-template-helper.h b/plugins/dali-script-v8/src/shared/object-template-helper.h index df027eb..cbe02c8 100644 --- a/plugins/dali-script-v8/src/shared/object-template-helper.h +++ b/plugins/dali-script-v8/src/shared/object-template-helper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_OBJECT_TEMPLATE_HELPER_H__ -#define __DALI_V8PLUGIN_OBJECT_TEMPLATE_HELPER_H__ +#ifndef DALI_V8PLUGIN_OBJECT_TEMPLATE_HELPER_H +#define DALI_V8PLUGIN_OBJECT_TEMPLATE_HELPER_H /* - * Copyright (c) 2015 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. @@ -56,11 +56,10 @@ void InstallFunctions( v8::Isolate* isolate, const ApiFunction* functionTable, unsigned int tableCount, FunctionType type = NORMAL_FUNCTIONS); - - } -} // V8Plugin -} // Dali +} // namespace V8Plugin + +} // namespace Dali -#endif // __DALI_V8PLUGIN_OBJECT_TEMPLATE_HELPER_H__ +#endif // DALI_V8PLUGIN_OBJECT_TEMPLATE_HELPER_H diff --git a/plugins/dali-script-v8/src/signals/dali-any-javascript-converter.h b/plugins/dali-script-v8/src/signals/dali-any-javascript-converter.h index fa241f1..3a72d55 100644 --- a/plugins/dali-script-v8/src/signals/dali-any-javascript-converter.h +++ b/plugins/dali-script-v8/src/signals/dali-any-javascript-converter.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_DALI_ANY_JAVASCRIPT_CONVERTER_H__ -#define __DALI_V8PLUGIN_DALI_ANY_JAVASCRIPT_CONVERTER_H__ +#ifndef DALI_V8PLUGIN_DALI_ANY_JAVASCRIPT_CONVERTER_H +#define DALI_V8PLUGIN_DALI_ANY_JAVASCRIPT_CONVERTER_H /* - * Copyright (c) 2015 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,4 +52,4 @@ Dali::Any ConvertToDaliAny( v8::Isolate* isolate, v8::Local, const Da } // namespace Dali -#endif // __DALI_V8PLUGIN_DALI_ANY_JAVASCRIPT_CONVERTER_H__ +#endif // DALI_V8PLUGIN_DALI_ANY_JAVASCRIPT_CONVERTER_H diff --git a/plugins/dali-script-v8/src/signals/emit-notification-interface.h b/plugins/dali-script-v8/src/signals/emit-notification-interface.h index 8ba1d0f..12b030c 100644 --- a/plugins/dali-script-v8/src/signals/emit-notification-interface.h +++ b/plugins/dali-script-v8/src/signals/emit-notification-interface.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_EMIT_NOTIFICATION_INTERFACE_H__ -#define __DALI_V8PLUGIN_EMIT_NOTIFICATION_INTERFACE_H__ +#ifndef DALI_V8PLUGIN_EMIT_NOTIFICATION_INTERFACE_H +#define DALI_V8PLUGIN_EMIT_NOTIFICATION_INTERFACE_H /* - * Copyright (c) 2015 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. @@ -62,4 +62,4 @@ class EmitNotificationInterface } // namespace Dali -#endif // __DALI_V8PLUGIN_EMIT_NOTIFICATION_INTERFACE_H__ +#endif // DALI_V8PLUGIN_EMIT_NOTIFICATION_INTERFACE_H diff --git a/plugins/dali-script-v8/src/signals/signal-manager.h b/plugins/dali-script-v8/src/signals/signal-manager.h index cf09569..1fc5e44 100644 --- a/plugins/dali-script-v8/src/signals/signal-manager.h +++ b/plugins/dali-script-v8/src/signals/signal-manager.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_SIGNAL_MANAGER_H__ -#define __DALI_V8PLUGIN_SIGNAL_MANAGER_H__ +#ifndef DALI_V8PLUGIN_SIGNAL_MANAGER_H +#define DALI_V8PLUGIN_SIGNAL_MANAGER_H /* - * Copyright (c) 2015 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. @@ -135,9 +135,8 @@ public: }; - } // namespace V8Plugin } // namespace Dali -#endif // header +#endif // DALI_V8PLUGIN_SIGNAL_MANAGER_H diff --git a/plugins/dali-script-v8/src/stage/stage-api.h b/plugins/dali-script-v8/src/stage/stage-api.h index e304334..5010209 100644 --- a/plugins/dali-script-v8/src/stage/stage-api.h +++ b/plugins/dali-script-v8/src/stage/stage-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_STAGE_API_H__ -#define __DALI_V8PLUGIN_STAGE_API_H__ +#ifndef DALI_V8PLUGIN_STAGE_API_H +#define DALI_V8PLUGIN_STAGE_API_H /* - * Copyright (c) 2015 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. @@ -57,4 +57,4 @@ namespace StageApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_STAGE_API_H__ +#endif // DALI_V8PLUGIN_STAGE_API_H diff --git a/plugins/dali-script-v8/src/stage/stage-wrapper.h b/plugins/dali-script-v8/src/stage/stage-wrapper.h index 50e5c6c..2187f36 100644 --- a/plugins/dali-script-v8/src/stage/stage-wrapper.h +++ b/plugins/dali-script-v8/src/stage/stage-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_STAGE_WRAPPER_H__ -#define __DALI_V8PLUGIN_STAGE_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_STAGE_WRAPPER_H +#define DALI_V8PLUGIN_STAGE_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -74,4 +74,4 @@ private: } // namespace Dali -#endif // __DALI_V8PLUGIN_STAGE_WRAPPER_H__ +#endif // DALI_V8PLUGIN_STAGE_WRAPPER_H diff --git a/plugins/dali-script-v8/src/toolkit/builder/builder-api.h b/plugins/dali-script-v8/src/toolkit/builder/builder-api.h index a53f4b1..5c5f7e8 100644 --- a/plugins/dali-script-v8/src/toolkit/builder/builder-api.h +++ b/plugins/dali-script-v8/src/toolkit/builder/builder-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_BUILDER_API_H__ -#define __DALI_V8PLUGIN_BUILDER_API_H__ +#ifndef DALI_V8PLUGIN_BUILDER_API_H +#define DALI_V8PLUGIN_BUILDER_API_H /* - * Copyright (c) 2015 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. @@ -59,4 +59,4 @@ namespace BuilderApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_BUILDER_API_H__ +#endif // DALI_V8PLUGIN_BUILDER_API_H diff --git a/plugins/dali-script-v8/src/toolkit/builder/builder-wrapper.h b/plugins/dali-script-v8/src/toolkit/builder/builder-wrapper.h index 90ab615..5046b76 100644 --- a/plugins/dali-script-v8/src/toolkit/builder/builder-wrapper.h +++ b/plugins/dali-script-v8/src/toolkit/builder/builder-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_BUILDER_WRAPPER_H__ -#define __DALI_V8PLUGIN_BUILDER_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_BUILDER_WRAPPER_H +#define DALI_V8PLUGIN_BUILDER_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -71,4 +71,4 @@ private: } // namespace Dali -#endif // __DALI_V8PLUGIN_BUILDER_WRAPPER_H__ +#endif // DALI_V8PLUGIN_BUILDER_WRAPPER_H diff --git a/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-api.h b/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-api.h index c136dc8..57ba93c 100644 --- a/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-api.h +++ b/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-api.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_API_H__ -#define __DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_API_H__ +#ifndef DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_API_H +#define DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_API_H /* - * Copyright (c) 2015 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. @@ -59,4 +59,4 @@ namespace KeyboardFocusManagerApi } // namespace Dali -#endif // header __DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_API_H__ +#endif // DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_API_H diff --git a/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-wrapper.h b/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-wrapper.h index ae1dff3..679f802 100644 --- a/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-wrapper.h +++ b/plugins/dali-script-v8/src/toolkit/focus-manager/keyboard-focus-manager-wrapper.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_WRAPPER_H__ -#define __DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_WRAPPER_H__ +#ifndef DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_WRAPPER_H +#define DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_WRAPPER_H /* - * Copyright (c) 2015 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. @@ -80,4 +80,4 @@ private: } // namespace Dali -#endif // __DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_WRAPPER_H__ +#endif // DALI_V8PLUGIN_KEYBOARD_FOCUS_MANAGER_WRAPPER_H diff --git a/plugins/dali-script-v8/src/utils/v8-utils.h b/plugins/dali-script-v8/src/utils/v8-utils.h index 63ff2c6..177360f 100644 --- a/plugins/dali-script-v8/src/utils/v8-utils.h +++ b/plugins/dali-script-v8/src/utils/v8-utils.h @@ -1,8 +1,8 @@ -#ifndef __DALI_V8PLUGIN_V8_UTILS_H__ -#define __DALI_V8PLUGIN_V8_UTILS_H__ +#ifndef DALI_V8PLUGIN_V8_UTILS_H +#define DALI_V8PLUGIN_V8_UTILS_H /* - * Copyright (c) 2015 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. @@ -383,5 +383,5 @@ void ReadIntegerArguments( bool& foundAllArguments, int* data, int dataSize, con } // namespace Dali -#endif // __DALI_V8PLUGIN_V8_UTILS_H__ +#endif // DALI_V8PLUGIN_V8_UTILS_H