Purge underscored header file barriers

Change-Id: Ib751b480a450ba6d6656e01f02f25b1e78b12e20

diff --git a/automated-tests/scripts/tcheadgen.sh b/automated-tests/scripts/tcheadgen.sh
index dfd378a..c8cd679 100755 (executable)
--- 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-adaptor-internal/image-loaders.h b/automated-tests/src/dali-adaptor-internal/image-loaders.h
index 088b1bd..65cb420 100755 (executable)
--- a/automated-tests/src/dali-adaptor-internal/image-loaders.h
+++ b/automated-tests/src/dali-adaptor-internal/image-loaders.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef __DALI_ADAPTOR_TET_IMAGE_LOADERS_H_
-#define __DALI_ADAPTOR_TET_IMAGE_LOADERS_H_
+#ifndef DALI_ADAPTOR_TET_IMAGE_LOADERS_H
+#define DALI_ADAPTOR_TET_IMAGE_LOADERS_H
 
 #include <dali/dali.h>
 #include <dali/integration-api/bitmap.h>
@@ -122,4 +122,4 @@ void CompareLoadedImageData( const ImageDetails& image, const LoadFunctions& fun
  */
 void DumpImageBufferToTempFile( std::string filename, std::string targetFilename, const LoadFunctions& functions );
 
-#endif // __DALI_ADAPTOR_TET_IMAGE_LOADERS_H_
+#endif // DALI_ADAPTOR_TET_IMAGE_LOADERS_H

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/adaptor-test-adaptor-impl.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/adaptor-test-adaptor-impl.h
index 38a8e77..f2920b9 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/adaptor-test-adaptor-impl.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/adaptor-test-adaptor-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ADAPTOR_TEST_ADAPTOR_IMPL_H__
-#define __DALI_ADAPTOR_TEST_ADAPTOR_IMPL_H__
+#ifndef DALI_ADAPTOR_TEST_ADAPTOR_IMPL_H
+#define DALI_ADAPTOR_TEST_ADAPTOR_IMPL_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.
@@ -46,4 +46,4 @@ public:
 
 } // Dali
 
-#endif  // __DALI_ADAPTOR_TEST_ADAPTOR_IMPL_H__
+#endif  // DALI_ADAPTOR_TEST_ADAPTOR_IMPL_H

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/adaptor-test-application.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/adaptor-test-application.h
index 421fb11..99f24d7 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/adaptor-test-application.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/adaptor-test-application.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ADAPTOR_TEST_APPLICATION_H__
-#define __DALI_ADAPTOR_TEST_APPLICATION_H__
+#ifndef DALI_ADAPTOR_TEST_APPLICATION_H
+#define DALI_ADAPTOR_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.
@@ -48,4 +48,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_ADAPTOR_TEST_APPLICATION_H__
+#endif // DALI_ADAPTOR_TEST_APPLICATION_H

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-img-utils.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-img-utils.h
index 5428dbc..3c09db6 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-img-utils.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-img-utils.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TEST_IMG_UTILS_H__
-#define __DALI_TEST_IMG_UTILS_H__
+#ifndef DALI_TEST_IMG_UTILS_H
+#define DALI_TEST_IMG_UTILS_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.
@@ -138,4 +138,4 @@ inline void DALI_IMAGE_TEST_EQUALS( Dali::Devel::PixelBuffer pixelBuffer1, Dali:
 
 }
 
-#endif // __DALI_TEST_SUITE_UTILS_H__
+#endif // DALI_TEST_SUITE_UTILS_H

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h
index 27aafd3..99cb1ce 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-application.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-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-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h
index c2db8d2..775d209 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-sync-abstraction.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-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-adaptor/dali-test-suite-utils/test-intrusive-ptr.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-intrusive-ptr.h
index 03aafe3..5fb17da 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-intrusive-ptr.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-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-adaptor/dali-test-suite-utils/test-native-image.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
index a664107..0c215b7 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-native-image.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-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-adaptor/dali-test-suite-utils/test-render-controller.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h
index 7c785f1..d44e7b6 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-render-controller.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-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-adaptor/dali-test-suite-utils/test-touch-utils.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-touch-utils.h
index 28caca9..3a623cb 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-touch-utils.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-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-platform-abstraction/utc-image-loading-common.h b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
index 84af982..7aa9e46 100644 (file)
--- a/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
+++ b/automated-tests/src/dali-platform-abstraction/utc-image-loading-common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef __DALI_TEST_SUITE_IMAGE_LOADING_COMMON_H__
-#define __DALI_TEST_SUITE_IMAGE_LOADING_COMMON_H__
+#ifndef DALI_TEST_SUITE_IMAGE_LOADING_COMMON_H
+#define DALI_TEST_SUITE_IMAGE_LOADING_COMMON_H
 #include <unistd.h>
 #include <iostream>
 #include <stdlib.h>
@@ -77,4 +77,4 @@ double GetTimeMilliseconds( Integration::PlatformAbstraction& abstraction ); ///
 void utc_dali_loading_startup(void);
 void utc_dali_loading_cleanup(void);
 
-#endif // __DALI_TEST_SUITE_IMAGE_LOADING_COMMON_H__
+#endif // DALI_TEST_SUITE_IMAGE_LOADING_COMMON_H

diff --git a/dali/dali.h b/dali/dali.h
index e53d86c..dd85954 100644 (file)
--- a/dali/dali.h
+++ b/dali/dali.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_H__
-#define __DALI_H__
+#ifndef DALI_H
+#define DALI_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.
@@ -34,4 +34,4 @@
 #include <dali/public-api/adaptor-framework/widget.h>
 #include <dali/public-api/dali-adaptor-version.h>
 
-#endif //__DALI_H__
+#endif //DALI_H

diff --git a/dali/devel-api/adaptor-framework/accessibility-action-handler.h b/dali/devel-api/adaptor-framework/accessibility-action-handler.h
index e860423..a23620d 100644 (file)
--- a/dali/devel-api/adaptor-framework/accessibility-action-handler.h
+++ b/dali/devel-api/adaptor-framework/accessibility-action-handler.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ACCESSIBILITY_ACTION_HANDLER_H__
-#define __DALI_ACCESSIBILITY_ACTION_HANDLER_H__
+#ifndef DALI_ACCESSIBILITY_ACTION_HANDLER_H
+#define DALI_ACCESSIBILITY_ACTION_HANDLER_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.
@@ -209,4 +209,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_ACCESSIBILITY_ACTION_HANDLER_H__
+#endif // DALI_ACCESSIBILITY_ACTION_HANDLER_H

diff --git a/dali/devel-api/adaptor-framework/accessibility-adaptor.h b/dali/devel-api/adaptor-framework/accessibility-adaptor.h
index af713dc..251f591 100755 (executable)
--- a/dali/devel-api/adaptor-framework/accessibility-adaptor.h
+++ b/dali/devel-api/adaptor-framework/accessibility-adaptor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ACCESSIBILITY_ADAPTOR_H__
-#define __DALI_ACCESSIBILITY_ADAPTOR_H__
+#ifndef DALI_ACCESSIBILITY_ADAPTOR_H
+#define DALI_ACCESSIBILITY_ADAPTOR_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.
@@ -338,4 +338,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_ACCESSIBILITY_ADAPTOR_H__
+#endif // DALI_ACCESSIBILITY_ADAPTOR_H

diff --git a/dali/devel-api/adaptor-framework/bitmap-saver.h b/dali/devel-api/adaptor-framework/bitmap-saver.h
index 0e0e6b6..e1f6ab7 100755 (executable)
--- a/dali/devel-api/adaptor-framework/bitmap-saver.h
+++ b/dali/devel-api/adaptor-framework/bitmap-saver.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ADAPTOR_BITMAP_SAVER_H__
-#define __DALI_ADAPTOR_BITMAP_SAVER_H__
+#ifndef DALI_ADAPTOR_BITMAP_SAVER_H
+#define DALI_ADAPTOR_BITMAP_SAVER_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.
@@ -49,4 +49,4 @@ DALI_ADAPTOR_API bool EncodeToFile(const unsigned char* const pixelBuffer,
 } // namespace Dali
 
 
-#endif // __DALI_ADAPTOR_BITMAP_SAVER_H__
+#endif // DALI_ADAPTOR_BITMAP_SAVER_H

diff --git a/dali/devel-api/adaptor-framework/clipboard-event-notifier.h b/dali/devel-api/adaptor-framework/clipboard-event-notifier.h
index 4e2d43a..83c4008 100755 (executable)
--- a/dali/devel-api/adaptor-framework/clipboard-event-notifier.h
+++ b/dali/devel-api/adaptor-framework/clipboard-event-notifier.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_CLIPBOARD_EVENT_NOTIFIER_H__
-#define __DALI_CLIPBOARD_EVENT_NOTIFIER_H__
+#ifndef DALI_CLIPBOARD_EVENT_NOTIFIER_H
+#define DALI_CLIPBOARD_EVENT_NOTIFIER_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.
@@ -118,4 +118,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_CLIPBOARD_EVENT_NOTIFIER_H__
+#endif // DALI_CLIPBOARD_EVENT_NOTIFIER_H

diff --git a/dali/devel-api/adaptor-framework/clipboard.h b/dali/devel-api/adaptor-framework/clipboard.h
index db8ab47..c462182 100755 (executable)
--- a/dali/devel-api/adaptor-framework/clipboard.h
+++ b/dali/devel-api/adaptor-framework/clipboard.h
@@ -1,8 +1,8 @@
-#ifndef  __DALI_CLIPBOARD_H__
-#define  __DALI_CLIPBOARD_H__
+#ifndef  DALI_CLIPBOARD_H
+#define  DALI_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.
@@ -117,4 +117,4 @@ public:
 };
 } // namespace Dali
 
-#endif // __DALI_CLIPBOARD_H__
+#endif // DALI_CLIPBOARD_H

diff --git a/dali/devel-api/adaptor-framework/environment-variable.h b/dali/devel-api/adaptor-framework/environment-variable.h
index 3ebe394..f3c1c79 100644 (file)
--- a/dali/devel-api/adaptor-framework/environment-variable.h
+++ b/dali/devel-api/adaptor-framework/environment-variable.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ENVIRONMENT_VARIABLE_H__
-#define __DALI_ENVIRONMENT_VARIABLE_H__
+#ifndef DALI_ENVIRONMENT_VARIABLE_H
+#define DALI_ENVIRONMENT_VARIABLE_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.
@@ -47,4 +47,4 @@ DALI_ADAPTOR_API bool SetEnvironmentVariable( const char * variable, const char
 
 } // namespace Dali
 
-#endif /*__DALI_ ENVIRONMENT_VARIABLE_H__ */
+#endif /*DALI_ ENVIRONMENT_VARIABLE_H */

diff --git a/dali/devel-api/adaptor-framework/event-feeder.h b/dali/devel-api/adaptor-framework/event-feeder.h
index 8bc3782..bffbcd4 100644 (file)
--- a/dali/devel-api/adaptor-framework/event-feeder.h
+++ b/dali/devel-api/adaptor-framework/event-feeder.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_EVENT_FEEDER_H_
-#define __DALI_EVENT_FEEDER_H_
+#ifndef DALI_EVENT_FEEDER_H
+#define DALI_EVENT_FEEDER_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,4 +63,4 @@ DALI_ADAPTOR_API void FeedKeyEvent( KeyEvent& keyEvent );
 
 } // namespace Dali
 
-#endif // __DALI_EVENT_FEEDER_H_
+#endif // DALI_EVENT_FEEDER_H

diff --git a/dali/devel-api/adaptor-framework/event-thread-callback.h b/dali/devel-api/adaptor-framework/event-thread-callback.h
index 1c4f4d6..5c65b51 100644 (file)
--- a/dali/devel-api/adaptor-framework/event-thread-callback.h
+++ b/dali/devel-api/adaptor-framework/event-thread-callback.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_EVENT_THREAD_CALLBACK_H_
-#define __DALI_EVENT_THREAD_CALLBACK_H_
+#ifndef DALI_EVENT_THREAD_CALLBACK_H
+#define DALI_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.
@@ -71,4 +71,4 @@ private:
 };
 
 }
-#endif /* __DALI_EVENT_THREAD_CALLBACK_H_ */
+#endif /* DALI_EVENT_THREAD_CALLBACK_H */

diff --git a/dali/devel-api/adaptor-framework/feedback-player.h b/dali/devel-api/adaptor-framework/feedback-player.h
index d78d511..cc7598d 100755 (executable)
--- a/dali/devel-api/adaptor-framework/feedback-player.h
+++ b/dali/devel-api/adaptor-framework/feedback-player.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_FEEDBACK_PLAYER_H__
-#define __DALI_FEEDBACK_PLAYER_H__
+#ifndef DALI_FEEDBACK_PLAYER_H
+#define DALI_FEEDBACK_PLAYER_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.
@@ -119,4 +119,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_FEEDBACK_PLAYER_H__
+#endif // DALI_FEEDBACK_PLAYER_H

diff --git a/dali/devel-api/adaptor-framework/feedback-plugin.h b/dali/devel-api/adaptor-framework/feedback-plugin.h
index 56c0212..45ad08a 100644 (file)
--- a/dali/devel-api/adaptor-framework/feedback-plugin.h
+++ b/dali/devel-api/adaptor-framework/feedback-plugin.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_FEEDBACK_PLUGIN_H__
-#define __DALI_FEEDBACK_PLUGIN_H__
+#ifndef DALI_FEEDBACK_PLUGIN_H
+#define DALI_FEEDBACK_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.
@@ -95,4 +95,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_FEEDBACK_PLUGIN_H__
+#endif // DALI_FEEDBACK_PLUGIN_H

diff --git a/dali/devel-api/adaptor-framework/file-loader.h b/dali/devel-api/adaptor-framework/file-loader.h
index 591a4ce..7b158a9 100644 (file)
--- a/dali/devel-api/adaptor-framework/file-loader.h
+++ b/dali/devel-api/adaptor-framework/file-loader.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_FILE_LOADER_H__
-#define __DALI_FILE_LOADER_H__
+#ifndef DALI_FILE_LOADER_H
+#define DALI_FILE_LOADER_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 @@ DALI_ADAPTOR_API std::streampos GetFileSize(const std::string& filename);
 };
 
 } // Dali
-#endif // __DALI_FILE_LOADER_H__
+#endif // DALI_FILE_LOADER_H

diff --git a/dali/devel-api/adaptor-framework/gif-loading.h b/dali/devel-api/adaptor-framework/gif-loading.h
index 50c1769..6143f15 100755 (executable)
--- a/dali/devel-api/adaptor-framework/gif-loading.h
+++ b/dali/devel-api/adaptor-framework/gif-loading.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_GIF_LOADING_H__
-#define __DALI_INTERNAL_GIF_LOADING_H__
+#ifndef DALI_INTERNAL_GIF_LOADING_H
+#define DALI_INTERNAL_GIF_LOADING_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.
@@ -129,4 +129,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_GIF_LOADING_H__
+#endif // DALI_INTERNAL_GIF_LOADING_H

diff --git a/dali/devel-api/adaptor-framework/image-loader-input.h b/dali/devel-api/adaptor-framework/image-loader-input.h
index a7df23a..f2e7d24 100755 (executable)
--- a/dali/devel-api/adaptor-framework/image-loader-input.h
+++ b/dali/devel-api/adaptor-framework/image-loader-input.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_IMAGE_LOADER_INPUT_H__
-#define __DALI_TIZEN_PLATFORM_IMAGE_LOADER_INPUT_H__
+#ifndef DALI_TIZEN_PLATFORM_IMAGE_LOADER_INPUT_H
+#define DALI_TIZEN_PLATFORM_IMAGE_LOADER_INPUT_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.
@@ -75,4 +75,4 @@ struct BitmapLoader
 } // ImageLoader
 } // Dali
 
-#endif // __DALI_TIZEN_PLATFORM_IMAGE_LOADER_INPUT_H__
+#endif // DALI_TIZEN_PLATFORM_IMAGE_LOADER_INPUT_H

diff --git a/dali/devel-api/adaptor-framework/image-loader-plugin.h b/dali/devel-api/adaptor-framework/image-loader-plugin.h
index 1a3c004..02594f6 100755 (executable)
--- a/dali/devel-api/adaptor-framework/image-loader-plugin.h
+++ b/dali/devel-api/adaptor-framework/image-loader-plugin.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_IMAGE_LOADING_PLUGIN_H__
-#define __DALI_IMAGE_LOADING_PLUGIN_H__
+#ifndef DALI_IMAGE_LOADING_PLUGIN_H
+#define DALI_IMAGE_LOADING_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.

diff --git a/dali/devel-api/adaptor-framework/input-method-context.h b/dali/devel-api/adaptor-framework/input-method-context.h
index 15666ff..5a3950c 100755 (executable)
--- a/dali/devel-api/adaptor-framework/input-method-context.h
+++ b/dali/devel-api/adaptor-framework/input-method-context.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INPUT_METHOD_CONTEXT_H__
-#define __DALI_INPUT_METHOD_CONTEXT_H__
+#ifndef DALI_INPUT_METHOD_CONTEXT_H
+#define DALI_INPUT_METHOD_CONTEXT_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -519,4 +519,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INPUT_METHOD_CONTEXT_H__
+#endif // DALI_INPUT_METHOD_CONTEXT_H

diff --git a/dali/devel-api/adaptor-framework/input-method-options.h b/dali/devel-api/adaptor-framework/input-method-options.h
index b2109a4..f8598bd 100644 (file)
--- a/dali/devel-api/adaptor-framework/input-method-options.h
+++ b/dali/devel-api/adaptor-framework/input-method-options.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIRTUAL_KEYBOARD_OPTIONS_H__
-#define __DALI_VIRTUAL_KEYBOARD_OPTIONS_H__
+#ifndef DALI_VIRTUAL_KEYBOARD_OPTIONS_H
+#define DALI_VIRTUAL_KEYBOARD_OPTIONS_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.
@@ -82,4 +82,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_VIRTUAL_KEYBOARD_OPTIONS_H__
+#endif // DALI_VIRTUAL_KEYBOARD_OPTIONS_H

diff --git a/dali/devel-api/adaptor-framework/key-extension-plugin.h b/dali/devel-api/adaptor-framework/key-extension-plugin.h
index b21456e..c2f5b2b 100644 (file)
--- a/dali/devel-api/adaptor-framework/key-extension-plugin.h
+++ b/dali/devel-api/adaptor-framework/key-extension-plugin.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_KEY_EXTENSION_PLUGIN_H__
-#define __DALI_KEY_EXTENSION_PLUGIN_H__
+#ifndef DALI_KEY_EXTENSION_PLUGIN_H
+#define DALI_KEY_EXTENSION_PLUGIN_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/dali/devel-api/adaptor-framework/lifecycle-controller.h b/dali/devel-api/adaptor-framework/lifecycle-controller.h
index 8bcf52b..e075d5c 100755 (executable)
--- a/dali/devel-api/adaptor-framework/lifecycle-controller.h
+++ b/dali/devel-api/adaptor-framework/lifecycle-controller.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_LIFECYCLE_CONTROLLER_H__
-#define __DALI_LIFECYCLE_CONTROLLER_H__
+#ifndef DALI_LIFECYCLE_CONTROLLER_H
+#define DALI_LIFECYCLE_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.
@@ -154,4 +154,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_LIFECYCLE_CONTROLLER_H__
+#endif // DALI_LIFECYCLE_CONTROLLER_H

diff --git a/dali/devel-api/adaptor-framework/orientation.h b/dali/devel-api/adaptor-framework/orientation.h
index 3c6edb0..2f38671 100755 (executable)
--- a/dali/devel-api/adaptor-framework/orientation.h
+++ b/dali/devel-api/adaptor-framework/orientation.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ORIENTATION_H__
-#define __DALI_ORIENTATION_H__
+#ifndef DALI_ORIENTATION_H
+#define DALI_ORIENTATION_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.
@@ -119,4 +119,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_ORIENTATION_H__
+#endif // DALI_ORIENTATION_H

diff --git a/dali/devel-api/adaptor-framework/performance-logger.h b/dali/devel-api/adaptor-framework/performance-logger.h
index 7b104d0..00055c5 100755 (executable)
--- a/dali/devel-api/adaptor-framework/performance-logger.h
+++ b/dali/devel-api/adaptor-framework/performance-logger.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PERFORMANCE_LOGGER_H__
-#define __DALI_PERFORMANCE_LOGGER_H__
+#ifndef DALI_PERFORMANCE_LOGGER_H
+#define DALI_PERFORMANCE_LOGGER_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.
@@ -133,4 +133,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_PERFORMANCE_LOGGER_H__
+#endif // DALI_PERFORMANCE_LOGGER_H

diff --git a/dali/devel-api/adaptor-framework/physical-keyboard.h b/dali/devel-api/adaptor-framework/physical-keyboard.h
index 362966e..ee2c322 100755 (executable)
--- a/dali/devel-api/adaptor-framework/physical-keyboard.h
+++ b/dali/devel-api/adaptor-framework/physical-keyboard.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PHYSICAL_KEYBOARD_H__
-#define __DALI_PHYSICAL_KEYBOARD_H__
+#ifndef DALI_PHYSICAL_KEYBOARD_H
+#define DALI_PHYSICAL_KEYBOARD_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,4 +96,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_PHYSICAL_KEYBOARD_H__
+#endif // DALI_PHYSICAL_KEYBOARD_H

diff --git a/dali/devel-api/adaptor-framework/singleton-service.h b/dali/devel-api/adaptor-framework/singleton-service.h
index cb1ac4c..7df5fc7 100755 (executable)
--- a/dali/devel-api/adaptor-framework/singleton-service.h
+++ b/dali/devel-api/adaptor-framework/singleton-service.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SINGELTON_SERVICE_H__
-#define __DALI_SINGELTON_SERVICE_H__
+#ifndef DALI_SINGELTON_SERVICE_H
+#define DALI_SINGELTON_SERVICE_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.
@@ -114,4 +114,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_SINGELTON_SERVICE_H__
+#endif // DALI_SINGELTON_SERVICE_H

diff --git a/dali/devel-api/adaptor-framework/sound-player.h b/dali/devel-api/adaptor-framework/sound-player.h
index 154c429..817c964 100755 (executable)
--- a/dali/devel-api/adaptor-framework/sound-player.h
+++ b/dali/devel-api/adaptor-framework/sound-player.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_SOUND_PLAYER_H__
-#define __DALI_SOUND_PLAYER_H__
+#ifndef DALI_SOUND_PLAYER_H
+#define DALI_SOUND_PLAYER_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.
@@ -105,4 +105,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_SOUND_PLAYER_H__
+#endif // DALI_SOUND_PLAYER_H

diff --git a/dali/devel-api/adaptor-framework/style-monitor.h b/dali/devel-api/adaptor-framework/style-monitor.h
index ebf754e..464884c 100644 (file)
--- a/dali/devel-api/adaptor-framework/style-monitor.h
+++ b/dali/devel-api/adaptor-framework/style-monitor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_STYLE_MONITOR_H__
-#define __DALI_STYLE_MONITOR_H__
+#ifndef DALI_STYLE_MONITOR_H
+#define DALI_STYLE_MONITOR_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.
@@ -171,4 +171,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_STYLE_MONITOR_H__
+#endif // DALI_STYLE_MONITOR_H

diff --git a/dali/devel-api/adaptor-framework/tilt-sensor.h b/dali/devel-api/adaptor-framework/tilt-sensor.h
index e435ecb..631f9e6 100755 (executable)
--- a/dali/devel-api/adaptor-framework/tilt-sensor.h
+++ b/dali/devel-api/adaptor-framework/tilt-sensor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TILT_SENSOR_H__
-#define __DALI_TILT_SENSOR_H__
+#ifndef DALI_TILT_SENSOR_H
+#define DALI_TILT_SENSOR_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.
@@ -200,4 +200,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-#endif // __DALI_TILT_SENSOR_H__
+#endif // DALI_TILT_SENSOR_H

diff --git a/dali/devel-api/adaptor-framework/video-player-plugin.h b/dali/devel-api/adaptor-framework/video-player-plugin.h
index caf74fb..39a2926 100755 (executable)
--- a/dali/devel-api/adaptor-framework/video-player-plugin.h
+++ b/dali/devel-api/adaptor-framework/video-player-plugin.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIDEO_PLAYER_PLUGIN_H__
-#define __DALI_VIDEO_PLAYER_PLUGIN_H__
+#ifndef DALI_VIDEO_PLAYER_PLUGIN_H
+#define DALI_VIDEO_PLAYER_PLUGIN_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.
@@ -271,4 +271,4 @@ public:
 
 } // namespace Dali;
 
-#endif
+#endif // DALI_VIDEO_PLAYER_PLUGIN_H

diff --git a/dali/devel-api/adaptor-framework/video-player.h b/dali/devel-api/adaptor-framework/video-player.h
index 842718f..1df28fc 100755 (executable)
--- a/dali/devel-api/adaptor-framework/video-player.h
+++ b/dali/devel-api/adaptor-framework/video-player.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIDEO_PLAYER_H__
-#define __DALI_VIDEO_PLAYER_H__
+#ifndef DALI_VIDEO_PLAYER_H
+#define DALI_VIDEO_PLAYER_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.
@@ -283,5 +283,4 @@ private: // Not intended for application developers
 
 } // namespace Dali;
 
-#endif
-
+#endif // DALI_VIDEO_PLAYER_H

diff --git a/dali/devel-api/adaptor-framework/virtual-keyboard.h b/dali/devel-api/adaptor-framework/virtual-keyboard.h
index fa3a469..84c2d4e 100755 (executable)
--- a/dali/devel-api/adaptor-framework/virtual-keyboard.h
+++ b/dali/devel-api/adaptor-framework/virtual-keyboard.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIRTUAL_KEYBOARD_H__
-#define __DALI_VIRTUAL_KEYBOARD_H__
+#ifndef DALI_VIRTUAL_KEYBOARD_H
+#define DALI_VIRTUAL_KEYBOARD_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.
@@ -151,4 +151,4 @@ DALI_ADAPTOR_API TextDirection GetTextDirection();
 
 } // namespace Dali
 
-#endif // __DALI_VIRTUAL_KEYBOARD_H__
+#endif // DALI_VIRTUAL_KEYBOARD_H

diff --git a/dali/devel-api/text-abstraction/bidirectional-support.h b/dali/devel-api/text-abstraction/bidirectional-support.h
index 142cdab..6bd5b75 100755 (executable)
--- a/dali/devel-api/text-abstraction/bidirectional-support.h
+++ b/dali/devel-api/text-abstraction/bidirectional-support.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PLATFORM_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_H__
-#define __DALI_PLATFORM_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_H__
+#ifndef DALI_PLATFORM_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_H
+#define DALI_PLATFORM_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_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.
@@ -151,4 +151,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_PLATFORM_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_H__
+#endif // DALI_PLATFORM_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_H

diff --git a/dali/devel-api/text-abstraction/script.h b/dali/devel-api/text-abstraction/script.h
index dff94ea..a89a52a 100644 (file)
--- a/dali/devel-api/text-abstraction/script.h
+++ b/dali/devel-api/text-abstraction/script.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_TEXT_ABSTRACTION_SCRIPT_H__
-#define __DALI_TOOLKIT_TEXT_ABSTRACTION_SCRIPT_H__
+#ifndef DALI_TOOLKIT_TEXT_ABSTRACTION_SCRIPT_H
+#define DALI_TOOLKIT_TEXT_ABSTRACTION_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.
@@ -292,4 +292,4 @@ DALI_ADAPTOR_API bool HasLigatureMustBreak( Script script );
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TEXT_ABSTRACTION_SCRIPT_H__
+#endif // DALI_TOOLKIT_TEXT_ABSTRACTION_SCRIPT_H

diff --git a/dali/devel-api/text-abstraction/segmentation.h b/dali/devel-api/text-abstraction/segmentation.h
index a56fa89..3dfe71b 100755 (executable)
--- a/dali/devel-api/text-abstraction/segmentation.h
+++ b/dali/devel-api/text-abstraction/segmentation.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PLATFORM_TEXT_ABSTRACTION_SEGMENTATION_H__
-#define __DALI_PLATFORM_TEXT_ABSTRACTION_SEGMENTATION_H__
+#ifndef DALI_PLATFORM_TEXT_ABSTRACTION_SEGMENTATION_H
+#define DALI_PLATFORM_TEXT_ABSTRACTION_SEGMENTATION_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.
@@ -131,4 +131,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_PLATFORM_TEXT_ABSTRACTION_SEGMENTATION_H__
+#endif // DALI_PLATFORM_TEXT_ABSTRACTION_SEGMENTATION_H

diff --git a/dali/devel-api/text-abstraction/shaping.h b/dali/devel-api/text-abstraction/shaping.h
index 9c8e278..5c7ee80 100644 (file)
--- a/dali/devel-api/text-abstraction/shaping.h
+++ b/dali/devel-api/text-abstraction/shaping.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_PLATFORM_TEXT_ABSTRACTION_SHAPING_H__
-#define __DALI_PLATFORM_TEXT_ABSTRACTION_SHAPING_H__
+#ifndef DALI_PLATFORM_TEXT_ABSTRACTION_SHAPING_H
+#define DALI_PLATFORM_TEXT_ABSTRACTION_SHAPING_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.
@@ -126,4 +126,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_PLATFORM_TEXT_ABSTRACTION_SHAPING_H__
+#endif // DALI_PLATFORM_TEXT_ABSTRACTION_SHAPING_H

diff --git a/dali/devel-api/text-abstraction/text-abstraction-definitions.h b/dali/devel-api/text-abstraction/text-abstraction-definitions.h
index c8c346a..338d0c8 100755 (executable)
--- a/dali/devel-api/text-abstraction/text-abstraction-definitions.h
+++ b/dali/devel-api/text-abstraction/text-abstraction-definitions.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TEXT_ABSTRACTION_DEFINITIONS_H__
-#define __DALI_TEXT_ABSTRACTION_DEFINITIONS_H__
+#ifndef DALI_TEXT_ABSTRACTION_DEFINITIONS_H
+#define DALI_TEXT_ABSTRACTION_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.
@@ -86,4 +86,4 @@ enum class ColorBlendingMode
 
 } // namespace Dali
 
-#endif // __DALI_TEXT_ABSTRACTION_DEFINITIONS_H__
+#endif // DALI_TEXT_ABSTRACTION_DEFINITIONS_H

diff --git a/dali/integration-api/egl-interface.h b/dali/integration-api/egl-interface.h
index 823cfa6..9c988a4 100644 (file)
--- a/dali/integration-api/egl-interface.h
+++ b/dali/integration-api/egl-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_EGL_INTERFACE_H__
-#define __DALI_INTEGRATION_EGL_INTERFACE_H__
+#ifndef DALI_INTEGRATION_EGL_INTERFACE_H
+#define DALI_INTEGRATION_EGL_INTERFACE_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.
@@ -76,4 +76,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_EGL_INTERFACE_H__
+#endif // DALI_INTEGRATION_EGL_INTERFACE_H

diff --git a/dali/integration-api/native-render-surface-factory.h b/dali/integration-api/native-render-surface-factory.h
index 18768c5..17990e4 100755 (executable)
--- a/dali/integration-api/native-render-surface-factory.h
+++ b/dali/integration-api/native-render-surface-factory.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_NATIVE_RENDER_SURFACE_FACTORY_H__
-#define __DALI_INTEGRATION_NATIVE_RENDER_SURFACE_FACTORY_H__
+#ifndef DALI_INTEGRATION_NATIVE_RENDER_SURFACE_FACTORY_H
+#define DALI_INTEGRATION_NATIVE_RENDER_SURFACE_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.
@@ -41,4 +41,4 @@ NativeRenderSurface* CreateNativeSurface( PositionSize positionSize,
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_NATIVE_RENDER_SURFACE_FACTORY_H__
+#endif // DALI_INTEGRATION_NATIVE_RENDER_SURFACE_FACTORY_H

diff --git a/dali/integration-api/native-render-surface.h b/dali/integration-api/native-render-surface.h
index eea86f9..4728bcb 100644 (file)
--- a/dali/integration-api/native-render-surface.h
+++ b/dali/integration-api/native-render-surface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_NATIVE_RENDER_SURFACE_H__
-#define __DALI_NATIVE_RENDER_SURFACE_H__
+#ifndef DALI_NATIVE_RENDER_SURFACE_H
+#define DALI_NATIVE_RENDER_SURFACE_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.
@@ -93,4 +93,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_NATIVE_RENDER_SURFACE_H__
+#endif // DALI_NATIVE_RENDER_SURFACE_H

diff --git a/dali/integration-api/thread-synchronization-interface.h b/dali/integration-api/thread-synchronization-interface.h
index 15164be..c752369 100644 (file)
--- a/dali/integration-api/thread-synchronization-interface.h
+++ b/dali/integration-api/thread-synchronization-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_THREAD_SYNCHRONIZATION_INTERFACE_H__
-#define __DALI_INTEGRATION_THREAD_SYNCHRONIZATION_INTERFACE_H__
+#ifndef DALI_INTEGRATION_THREAD_SYNCHRONIZATION_INTERFACE_H
+#define DALI_INTEGRATION_THREAD_SYNCHRONIZATION_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.
@@ -83,4 +83,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_THREAD_SYNCHRONIZATION_INTERFACE_H__
+#endif // DALI_INTEGRATION_THREAD_SYNCHRONIZATION_INTERFACE_H

diff --git a/dali/integration-api/trigger-event-factory-interface.h b/dali/integration-api/trigger-event-factory-interface.h
index b1f1f77..8fa4290 100644 (file)
--- a/dali/integration-api/trigger-event-factory-interface.h
+++ b/dali/integration-api/trigger-event-factory-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_INTERFACE_H__
-#define __DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_INTERFACE_H__
+#ifndef DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_INTERFACE_H
+#define DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_INTERFACE_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.
@@ -84,4 +84,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_INTERFACE_H__
+#endif // DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_INTERFACE_H

diff --git a/dali/integration-api/trigger-event-factory.h b/dali/integration-api/trigger-event-factory.h
index 44efc42..d2630ee 100644 (file)
--- a/dali/integration-api/trigger-event-factory.h
+++ b/dali/integration-api/trigger-event-factory.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_H__
-#define __DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_H__
+#ifndef DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_H
+#define DALI_INTEGRATION_TRIGGER_EVENT_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.
@@ -67,4 +67,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_H__
+#endif // DALI_INTEGRATION_TRIGGER_EVENT_FACTORY_H

diff --git a/dali/integration-api/trigger-event-interface.h b/dali/integration-api/trigger-event-interface.h
index c6c1eaa..679f8e8 100644 (file)
--- a/dali/integration-api/trigger-event-interface.h
+++ b/dali/integration-api/trigger-event-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTEGRATION_TRIGGER_EVENT_INTERFACE_H__
-#define __DALI_INTEGRATION_TRIGGER_EVENT_INTERFACE_H__
+#ifndef DALI_INTEGRATION_TRIGGER_EVENT_INTERFACE_H
+#define DALI_INTEGRATION_TRIGGER_EVENT_INTERFACE_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.
@@ -79,4 +79,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTEGRATION_TRIGGER_EVENT_INTERFACE_H__
+#endif // DALI_INTEGRATION_TRIGGER_EVENT_INTERFACE_H

diff --git a/dali/internal/accessibility/common/accessibility-adaptor-impl.h b/dali/internal/accessibility/common/accessibility-adaptor-impl.h
index 06dff1f..d59f69f 100644 (file)
--- a/dali/internal/accessibility/common/accessibility-adaptor-impl.h
+++ b/dali/internal/accessibility/common/accessibility-adaptor-impl.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
-#define __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
+#ifndef DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H
+#define DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -291,4 +291,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
+#endif // DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H

diff --git a/dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h b/dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h
index c4c8166..fd2939e 100644 (file)
--- a/dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h
+++ b/dali/internal/accessibility/tizen-wayland/tizen-mobile/accessibility-adaptor-impl-mobile.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_MOBILE_H__
-#define __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_MOBILE_H__
+#ifndef DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_MOBILE_H
+#define DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_MOBILE_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.
@@ -129,4 +129,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_MOBILE_H__
+#endif // DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_MOBILE_H

diff --git a/dali/internal/adaptor/common/combined-update-render-controller-debug.h b/dali/internal/adaptor/common/combined-update-render-controller-debug.h
index ca52e25..91f9f76 100755 (executable)
--- a/dali/internal/adaptor/common/combined-update-render-controller-debug.h
+++ b/dali/internal/adaptor/common/combined-update-render-controller-debug.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_COMBINED_UPDATE_RENDER_CONTROLLER_DEBUG_H__
-#define __DALI_INTERNAL_COMBINED_UPDATE_RENDER_CONTROLLER_DEBUG_H__
+#ifndef DALI_INTERNAL_COMBINED_UPDATE_RENDER_CONTROLLER_DEBUG_H
+#define DALI_INTERNAL_COMBINED_UPDATE_RENDER_CONTROLLER_DEBUG_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.
@@ -137,4 +137,4 @@ Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_TH
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_COMBINED_UPDATE_RENDER_CONTROLLER_DEBUG_H__
+#endif // DALI_INTERNAL_COMBINED_UPDATE_RENDER_CONTROLLER_DEBUG_H

diff --git a/dali/internal/adaptor/common/framework.h b/dali/internal/adaptor/common/framework.h
index 96dfb7d..0a53f75 100644 (file)
--- a/dali/internal/adaptor/common/framework.h
+++ b/dali/internal/adaptor/common/framework.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_FRAMEWORK_H__
-#define __DALI_INTERNAL_FRAMEWORK_H__
+#ifndef DALI_INTERNAL_FRAMEWORK_H
+#define DALI_INTERNAL_FRAMEWORK_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.
@@ -277,4 +277,4 @@ private: // impl members
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_FRAMEWORK_H__
+#endif // DALI_INTERNAL_FRAMEWORK_H

diff --git a/dali/internal/adaptor/common/lifecycle-controller-impl.h b/dali/internal/adaptor/common/lifecycle-controller-impl.h
index 3c79976..904ba1e 100644 (file)
--- a/dali/internal/adaptor/common/lifecycle-controller-impl.h
+++ b/dali/internal/adaptor/common/lifecycle-controller-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_LIFECYCLE_CONTROLLER_H__
-#define __DALI_INTERNAL_LIFECYCLE_CONTROLLER_H__
+#ifndef DALI_INTERNAL_LIFECYCLE_CONTROLLER_H
+#define DALI_INTERNAL_LIFECYCLE_CONTROLLER_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.
@@ -224,4 +224,4 @@ inline const Internal::Adaptor::LifecycleController& GetImplementation(const Dal
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_LIFECYCLE_CONTROLLER_H__
+#endif // DALI_INTERNAL_LIFECYCLE_CONTROLLER_H

diff --git a/dali/internal/adaptor/common/lifecycle-observer.h b/dali/internal/adaptor/common/lifecycle-observer.h
index a17ad10..d84ac8c 100644 (file)
--- a/dali/internal/adaptor/common/lifecycle-observer.h
+++ b/dali/internal/adaptor/common/lifecycle-observer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_BASE_LIFECYCLE_OBSERVER_H__
-#define __DALI_INTERNAL_BASE_LIFECYCLE_OBSERVER_H__
+#ifndef DALI_INTERNAL_BASE_LIFECYCLE_OBSERVER_H
+#define DALI_INTERNAL_BASE_LIFECYCLE_OBSERVER_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.
@@ -94,4 +94,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_BASE_LIFECYCLE_OBSERVER_H__
+#endif // DALI_INTERNAL_BASE_LIFECYCLE_OBSERVER_H

diff --git a/dali/internal/adaptor/common/thread-controller-interface.h b/dali/internal/adaptor/common/thread-controller-interface.h
index 6885819..d805ced 100644 (file)
--- a/dali/internal/adaptor/common/thread-controller-interface.h
+++ b/dali/internal/adaptor/common/thread-controller-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_THREAD_CONTROLLER_INTERFACE_H__
-#define __DALI_INTERNAL_THREAD_CONTROLLER_INTERFACE_H__
+#ifndef DALI_INTERNAL_THREAD_CONTROLLER_INTERFACE_H
+#define DALI_INTERNAL_THREAD_CONTROLLER_INTERFACE_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.
@@ -122,4 +122,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_THREAD_CONTROLLER_INTERFACE_H__
+#endif // DALI_INTERNAL_THREAD_CONTROLLER_INTERFACE_H

diff --git a/dali/internal/adaptor/common/threading-mode.h b/dali/internal/adaptor/common/threading-mode.h
index cafefb9..d113c3a 100644 (file)
--- a/dali/internal/adaptor/common/threading-mode.h
+++ b/dali/internal/adaptor/common/threading-mode.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_THREADING_MODE_H__
-#define __DALI_INTERNAL_ADAPTOR_THREADING_MODE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_THREADING_MODE_H
+#define DALI_INTERNAL_ADAPTOR_THREADING_MODE_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.
@@ -41,4 +41,4 @@ struct ThreadingMode
 
 } // Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_THREADING_MODE_H__
+#endif // DALI_INTERNAL_ADAPTOR_THREADING_MODE_H

diff --git a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h
index 5757bf7..4701bba 100644 (file)
--- a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h
+++ b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_WATCH_APPLICATION_H__
-#define __DALI_INTERNAL_WATCH_APPLICATION_H__
+#ifndef DALI_INTERNAL_WATCH_APPLICATION_H
+#define DALI_INTERNAL_WATCH_APPLICATION_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.
@@ -155,4 +155,4 @@ inline const WatchApplication& GetImplementation(const Dali::WatchApplication& w
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_WATCH_APPLICATION_H__
+#endif // DALI_INTERNAL_WATCH_APPLICATION_H

diff --git a/dali/internal/clipboard/common/clipboard-event-notifier-impl.h b/dali/internal/clipboard/common/clipboard-event-notifier-impl.h
index a3eb57d..993b680 100755 (executable)
--- a/dali/internal/clipboard/common/clipboard-event-notifier-impl.h
+++ b/dali/internal/clipboard/common/clipboard-event-notifier-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CLIPBOARD_EVENT_NOTIFIER_H__
-#define __DALI_INTERNAL_CLIPBOARD_EVENT_NOTIFIER_H__
+#ifndef DALI_INTERNAL_CLIPBOARD_EVENT_NOTIFIER_H
+#define DALI_INTERNAL_CLIPBOARD_EVENT_NOTIFIER_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:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CLIPBOARD_EVENT_NOTIFIER_H__
+#endif // DALI_INTERNAL_CLIPBOARD_EVENT_NOTIFIER_H

diff --git a/dali/internal/clipboard/common/clipboard-impl.h b/dali/internal/clipboard/common/clipboard-impl.h
index 2713244..376d788 100644 (file)
--- a/dali/internal/clipboard/common/clipboard-impl.h
+++ b/dali/internal/clipboard/common/clipboard-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CLIPBOARD_H__
-#define __DALI_INTERNAL_CLIPBOARD_H__
+#ifndef DALI_INTERNAL_CLIPBOARD_H
+#define DALI_INTERNAL_CLIPBOARD_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.
@@ -133,4 +133,4 @@ inline static const  Internal::Adaptor::Clipboard& GetImplementation(const Dali:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CLIPBOARD_H__
+#endif // DALI_INTERNAL_CLIPBOARD_H

diff --git a/dali/internal/graphics/common/egl-image-extensions.h b/dali/internal/graphics/common/egl-image-extensions.h
index bd0e93e..464eaba 100644 (file)
--- a/dali/internal/graphics/common/egl-image-extensions.h
+++ b/dali/internal/graphics/common/egl-image-extensions.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_EGL_IMAGE_EXTENSIONS_H__
-#define __DALI_INTERNAL_EGL_IMAGE_EXTENSIONS_H__
+#ifndef DALI_INTERNAL_EGL_IMAGE_EXTENSIONS_H
+#define DALI_INTERNAL_EGL_IMAGE_EXTENSIONS_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.
@@ -90,4 +90,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_EGL_IMAGE_EXTENSIONS_H__
+#endif // DALI_INTERNAL_EGL_IMAGE_EXTENSIONS_H

diff --git a/dali/internal/graphics/common/vsync-monitor-interface.h b/dali/internal/graphics/common/vsync-monitor-interface.h
index 2fc1145..63d70ba 100644 (file)
--- a/dali/internal/graphics/common/vsync-monitor-interface.h
+++ b/dali/internal/graphics/common/vsync-monitor-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_BASE_VSYNC_MONITOR_INTERFACE_H__
-#define __DALI_INTERNAL_BASE_VSYNC_MONITOR_INTERFACE_H__
+#ifndef DALI_INTERNAL_BASE_VSYNC_MONITOR_INTERFACE_H
+#define DALI_INTERNAL_BASE_VSYNC_MONITOR_INTERFACE_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 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_BASE_VSYNC_MONITOR_INTERFACE_H__
+#endif // DALI_INTERNAL_BASE_VSYNC_MONITOR_INTERFACE_H

diff --git a/dali/internal/graphics/common/vsync-monitor.h b/dali/internal/graphics/common/vsync-monitor.h
index e90b845..5c34deb 100644 (file)
--- a/dali/internal/graphics/common/vsync-monitor.h
+++ b/dali/internal/graphics/common/vsync-monitor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_VSYNC_MONITOR_IMPL_H__
-#define __DALI_INTERNAL_VSYNC_MONITOR_IMPL_H__
+#ifndef DALI_INTERNAL_VSYNC_MONITOR_IMPL_H
+#define DALI_INTERNAL_VSYNC_MONITOR_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.
@@ -100,4 +100,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_VSYNC_MONITOR_IMPL_H__
+#endif // DALI_INTERNAL_VSYNC_MONITOR_IMPL_H

diff --git a/dali/internal/graphics/gles/egl-debug.h b/dali/internal/graphics/gles/egl-debug.h
index ae93aa9..84bc988 100644 (file)
--- a/dali/internal/graphics/gles/egl-debug.h
+++ b/dali/internal/graphics/gles/egl-debug.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_EGL_DEBUG_H__
-#define __DALI_INTERNAL_EGL_DEBUG_H__
+#ifndef DALI_INTERNAL_EGL_DEBUG_H
+#define DALI_INTERNAL_EGL_DEBUG_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.
@@ -43,4 +43,4 @@ void PrintError( EGLint error);
 
 }  // namespace Dali
 
-#endif //__DALI_INTERNAL_EGL_DEBUG_H__
+#endif //DALI_INTERNAL_EGL_DEBUG_H

diff --git a/dali/internal/graphics/gles/egl-graphics.h b/dali/internal/graphics/gles/egl-graphics.h
index f02d673..45a6aca 100644 (file)
--- a/dali/internal/graphics/gles/egl-graphics.h
+++ b/dali/internal/graphics/gles/egl-graphics.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_BASE_GRAPHICS_IMPLEMENTATION_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.
@@ -148,4 +148,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_BASE_GRAPHICS_IMPLEMENTATION_H__
+#endif // DALI_INTERNAL_BASE_GRAPHICS_IMPLEMENTATION_H

diff --git a/dali/internal/graphics/gles/egl-sync-implementation.h b/dali/internal/graphics/gles/egl-sync-implementation.h
index 932a3fe..7042c06 100644 (file)
--- a/dali/internal/graphics/gles/egl-sync-implementation.h
+++ b/dali/internal/graphics/gles/egl-sync-implementation.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_H__
-#define __DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_H__
+#ifndef DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_H
+#define DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_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.
@@ -121,4 +121,4 @@ private:
 } // namespace Internal
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_EGL_ADAPTOR_SYNC_IMPLEMENTATION_H__
+#endif // DALI_INTERNAL_EGL_ADAPTOR_SYNC_IMPLEMENTATION_H

diff --git a/dali/internal/graphics/gles/gl-extensions.h b/dali/internal/graphics/gles/gl-extensions.h
index fd6438b..b3a8085 100644 (file)
--- a/dali/internal/graphics/gles/gl-extensions.h
+++ b/dali/internal/graphics/gles/gl-extensions.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_INTERNAL_GL_EXTENSION_H__
-#define __DALI_INTERNAL_GL_EXTENSION_H__
+#ifndef DALI_INTERNAL_GL_EXTENSION_H
+#define DALI_INTERNAL_GL_EXTENSION_H
 
 /*
  * Copyright (c) 2019 Samsung Electronics Co., Ltd.
@@ -119,4 +119,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_INTERNAL_GL_EXTENSION_H__ */
+#endif /* DALI_INTERNAL_GL_EXTENSION_H */

diff --git a/dali/internal/graphics/gles/gl-proxy-implementation.h b/dali/internal/graphics/gles/gl-proxy-implementation.h
index 35bd511..638dcaa 100644 (file)
--- a/dali/internal/graphics/gles/gl-proxy-implementation.h
+++ b/dali/internal/graphics/gles/gl-proxy-implementation.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_GL_PROXY_IMPLEMENTATION_H__
-#define __DALI_INTERNAL_GL_PROXY_IMPLEMENTATION_H__
+#ifndef DALI_INTERNAL_GL_PROXY_IMPLEMENTATION_H
+#define DALI_INTERNAL_GL_PROXY_IMPLEMENTATION_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.
@@ -238,4 +238,4 @@ private: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_GL_PROXY_IMPLEMENTATION_H__
+#endif // DALI_INTERNAL_GL_PROXY_IMPLEMENTATION_H

diff --git a/dali/internal/haptics/common/feedback-player-impl.h b/dali/internal/haptics/common/feedback-player-impl.h
index 3b5f40a..1355e31 100644 (file)
--- a/dali/internal/haptics/common/feedback-player-impl.h
+++ b/dali/internal/haptics/common/feedback-player-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_FEEDBACK_PLAYER_H__
-#define __DALI_INTERNAL_FEEDBACK_PLAYER_H__
+#ifndef DALI_INTERNAL_FEEDBACK_PLAYER_H
+#define DALI_INTERNAL_FEEDBACK_PLAYER_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.
@@ -142,4 +142,4 @@ inline const Internal::Adaptor::FeedbackPlayer& GetImplementation(const Dali::Fe
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_FEEDBACK_PLAYER_H__
+#endif // DALI_INTERNAL_FEEDBACK_PLAYER_H

diff --git a/dali/internal/haptics/common/feedback-plugin-proxy.h b/dali/internal/haptics/common/feedback-plugin-proxy.h
index 07b0ea2..fb17ad9 100644 (file)
--- a/dali/internal/haptics/common/feedback-plugin-proxy.h
+++ b/dali/internal/haptics/common/feedback-plugin-proxy.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_FEEDBACK_PLUGIN_PROXY_H__
-#define __DALI_INTERNAL_FEEDBACK_PLUGIN_PROXY_H__
+#ifndef DALI_INTERNAL_FEEDBACK_PLUGIN_PROXY_H
+#define DALI_INTERNAL_FEEDBACK_PLUGIN_PROXY_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 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_FEEDBACK_PLUGIN_PROXY_H__
+#endif // DALI_INTERNAL_FEEDBACK_PLUGIN_PROXY_H

diff --git a/dali/internal/imaging/common/file-download.h b/dali/internal/imaging/common/file-download.h
index d2ee371..f807b22 100755 (executable)
--- a/dali/internal/imaging/common/file-download.h
+++ b/dali/internal/imaging/common/file-download.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H__
-#define __DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H__
+#ifndef DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_H
+#define DALI_TIZEN_PLATFORM_NETWORK_FILE_DOWNLOAD_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.
@@ -105,4 +105,4 @@ bool DownloadRemoteFileIntoMemory( const std::string& url,
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H__
+#endif // DALI_TIZEN_PLATFORM_RESOURCE_THREAD_IMAGE_H

diff --git a/dali/internal/imaging/common/http-utils.h b/dali/internal/imaging/common/http-utils.h
index 01bd89c..01de460 100644 (file)
--- a/dali/internal/imaging/common/http-utils.h
+++ b/dali/internal/imaging/common/http-utils.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_NETWORK_UTILS_H__
-#define __DALI_TIZEN_PLATFORM_NETWORK_UTILS_H__
+#ifndef DALI_TIZEN_PLATFORM_NETWORK_UTILS_H
+#define DALI_TIZEN_PLATFORM_NETWORK_UTILS_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.
@@ -41,4 +41,4 @@ bool IsHttpUrl( const std::string& path );
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_NETWORK_UTILS_H__
+#endif // DALI_TIZEN_PLATFORM_NETWORK_UTILS_H

diff --git a/dali/internal/imaging/common/image-loader.h b/dali/internal/imaging/common/image-loader.h
index 64e10c5..55f1680 100644 (file)
--- a/dali/internal/imaging/common/image-loader.h
+++ b/dali/internal/imaging/common/image-loader.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_IMAGE_LOADER_H__
-#define __DALI_TIZEN_PLATFORM_IMAGE_LOADER_H__
+#ifndef DALI_TIZEN_PLATFORM_IMAGE_LOADER_H
+#define DALI_TIZEN_PLATFORM_IMAGE_LOADER_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.
@@ -99,4 +99,4 @@ unsigned int GetMaxTextureSize();
 } // TizenPlatform
 } // Dali
 
-#endif // __DALI_TIZEN_PLATFORM_IMAGE_LOADER_H__
+#endif // DALI_TIZEN_PLATFORM_IMAGE_LOADER_H

diff --git a/dali/internal/imaging/common/loader-astc.h b/dali/internal/imaging/common/loader-astc.h
index 2ee94d1..ed78a7d 100755 (executable)
--- a/dali/internal/imaging/common/loader-astc.h
+++ b/dali/internal/imaging/common/loader-astc.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_LOADER_ASTC_H__
-#define __DALI_TIZEN_PLATFORM_LOADER_ASTC_H__
+#ifndef DALI_TIZEN_PLATFORM_LOADER_ASTC_H
+#define DALI_TIZEN_PLATFORM_LOADER_ASTC_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.
@@ -65,4 +65,4 @@ bool LoadAstcHeader( const Dali::ImageLoader::Input& input, unsigned int& width,
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_LOADER_ASTC_H__
+#endif // DALI_TIZEN_PLATFORM_LOADER_ASTC_H

diff --git a/dali/internal/imaging/common/loader-bmp.h b/dali/internal/imaging/common/loader-bmp.h
index c77c09f..2e95efb 100755 (executable)
--- a/dali/internal/imaging/common/loader-bmp.h
+++ b/dali/internal/imaging/common/loader-bmp.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_LOADER_BMP_H__
-#define __DALI_TIZEN_PLATFORM_LOADER_BMP_H__
+#ifndef DALI_TIZEN_PLATFORM_LOADER_BMP_H
+#define DALI_TIZEN_PLATFORM_LOADER_BMP_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 @@ bool LoadBmpHeader( const Dali::ImageLoader::Input& input, unsigned int& width,
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_LOADER_BMP_H__
+#endif // DALI_TIZEN_PLATFORM_LOADER_BMP_H

diff --git a/dali/internal/imaging/common/loader-gif.h b/dali/internal/imaging/common/loader-gif.h
index 28ed05c..a215ae5 100755 (executable)
--- a/dali/internal/imaging/common/loader-gif.h
+++ b/dali/internal/imaging/common/loader-gif.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_LOADER_GIF_H__
-#define __DALI_TIZEN_PLATFORM_LOADER_GIF_H__
+#ifndef DALI_TIZEN_PLATFORM_LOADER_GIF_H
+#define DALI_TIZEN_PLATFORM_LOADER_GIF_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.
@@ -64,4 +64,4 @@ bool LoadGifHeader( const Dali::ImageLoader::Input& input, unsigned int& width,
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_LOADER_GIF_H__
+#endif // DALI_TIZEN_PLATFORM_LOADER_GIF_H

diff --git a/dali/internal/imaging/common/loader-ico.h b/dali/internal/imaging/common/loader-ico.h
index a8f9e80..c68f154 100755 (executable)
--- a/dali/internal/imaging/common/loader-ico.h
+++ b/dali/internal/imaging/common/loader-ico.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_LOADER_ICO_H__
-#define __DALI_TIZEN_PLATFORM_LOADER_ICO_H__
+#ifndef DALI_TIZEN_PLATFORM_LOADER_ICO_H
+#define DALI_TIZEN_PLATFORM_LOADER_ICO_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.
@@ -54,7 +54,8 @@ bool LoadBitmapFromIco( const Dali::ImageLoader::Input& input, Dali::Devel::Pixe
  */
 bool LoadIcoHeader( const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height );
 
-}
+} // namespace TizenPlatform
 
-}
-#endif
+} // namespace Dali
+
+#endif // DALI_TIZEN_PLATFORM_LOADER_ICO_H

diff --git a/dali/internal/imaging/common/loader-jpeg.h b/dali/internal/imaging/common/loader-jpeg.h
index 987b338..29ec9dc 100755 (executable)
--- a/dali/internal/imaging/common/loader-jpeg.h
+++ b/dali/internal/imaging/common/loader-jpeg.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_LOADER_JPEG_H__
-#define __DALI_TIZEN_PLATFORM_LOADER_JPEG_H__
+#ifndef DALI_TIZEN_PLATFORM_LOADER_JPEG_H
+#define DALI_TIZEN_PLATFORM_LOADER_JPEG_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.
@@ -80,4 +80,4 @@ bool EncodeToJpeg(const unsigned char* pixelBuffer, Vector< unsigned char >& enc
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_LOADER_JPEG_H__
+#endif // DALI_TIZEN_PLATFORM_LOADER_JPEG_H

diff --git a/dali/internal/imaging/common/loader-ktx.h b/dali/internal/imaging/common/loader-ktx.h
index 966d14d..6853da0 100755 (executable)
--- a/dali/internal/imaging/common/loader-ktx.h
+++ b/dali/internal/imaging/common/loader-ktx.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_LOADER_KTX_H__
-#define __DALI_TIZEN_PLATFORM_LOADER_KTX_H__
+#ifndef DALI_TIZEN_PLATFORM_LOADER_KTX_H
+#define DALI_TIZEN_PLATFORM_LOADER_KTX_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 @@ bool LoadKtxHeader( const Dali::ImageLoader::Input& input, unsigned int& width,
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_LOADER_KTX_H__
+#endif // DALI_TIZEN_PLATFORM_LOADER_KTX_H

diff --git a/dali/internal/imaging/common/loader-png.h b/dali/internal/imaging/common/loader-png.h
index 49b8922..d2d52fb 100755 (executable)
--- a/dali/internal/imaging/common/loader-png.h
+++ b/dali/internal/imaging/common/loader-png.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_LOADER_PNG_H__
-#define __DALI_TIZEN_PLATFORM_LOADER_PNG_H__
+#ifndef DALI_TIZEN_PLATFORM_LOADER_PNG_H
+#define DALI_TIZEN_PLATFORM_LOADER_PNG_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.
@@ -75,4 +75,4 @@ bool EncodeToPng( const unsigned char* pixelBuffer, Vector<unsigned char>& encod
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_LOADER_PNG_H__
+#endif // DALI_TIZEN_PLATFORM_LOADER_PNG_H

diff --git a/dali/internal/imaging/common/loader-wbmp.h b/dali/internal/imaging/common/loader-wbmp.h
index 6995b4c..ccc8038 100755 (executable)
--- a/dali/internal/imaging/common/loader-wbmp.h
+++ b/dali/internal/imaging/common/loader-wbmp.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_LOADER_WBMP_H__
-#define __DALI_TIZEN_PLATFORM_LOADER_WBMP_H__
+#ifndef DALI_TIZEN_PLATFORM_LOADER_WBMP_H
+#define DALI_TIZEN_PLATFORM_LOADER_WBMP_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,7 +49,8 @@ bool LoadBitmapFromWbmp( const Dali::ImageLoader::Input& input, Dali::Devel::Pix
  */
 bool LoadWbmpHeader( const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height );
 
-}
+} // namespace TizenPlatform
 
-}
-#endif
+} // namespace Dali
+
+#endif // DALI_TIZEN_PLATFORM_LOADER_WBMP_H

diff --git a/dali/internal/imaging/common/native-bitmap-buffer-impl.h b/dali/internal/imaging/common/native-bitmap-buffer-impl.h
index fc8d55d..f1ff5fc 100644 (file)
--- a/dali/internal/imaging/common/native-bitmap-buffer-impl.h
+++ b/dali/internal/imaging/common/native-bitmap-buffer-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_NATIVE_BITMAP_BUFFER_H__
-#define __DALI_NATIVE_BITMAP_BUFFER_H__
+#ifndef DALI_NATIVE_BITMAP_BUFFER_H
+#define DALI_NATIVE_BITMAP_BUFFER_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.
@@ -127,4 +127,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_NATIVE_BITMAP_BUFFER_H__
+#endif // DALI_NATIVE_BITMAP_BUFFER_H

diff --git a/dali/internal/imaging/common/pixel-buffer-impl.h b/dali/internal/imaging/common/pixel-buffer-impl.h
index 5c5c045..d912022 100755 (executable)
--- a/dali/internal/imaging/common/pixel-buffer-impl.h
+++ b/dali/internal/imaging/common/pixel-buffer-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_ADAPTOR_PIXEL_BUFFER_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,4 +312,4 @@ inline const Internal::Adaptor::PixelBuffer& GetImplementation( const Devel::Pix
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_PIXEL_BUFFER_H__
+#endif // DALI_INTERNAL_ADAPTOR_PIXEL_BUFFER_H

diff --git a/dali/internal/imaging/windows/native-image-source-impl-win.h b/dali/internal/imaging/windows/native-image-source-impl-win.h
index f5ba236..cc76cf4 100755 (executable)
--- a/dali/internal/imaging/windows/native-image-source-impl-win.h
+++ b/dali/internal/imaging/windows/native-image-source-impl-win.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_NATIVE_IMAGE_SOURCE_H__
-#define __DALI_INTERNAL_NATIVE_IMAGE_SOURCE_H__
+#ifndef DALI_INTERNAL_NATIVE_IMAGE_SOURCE_H
+#define DALI_INTERNAL_NATIVE_IMAGE_SOURCE_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.
@@ -192,4 +192,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_NATIVE_IMAGE_SOURCE_H__
+#endif // DALI_INTERNAL_NATIVE_IMAGE_SOURCE_H

diff --git a/dali/internal/input/common/input-method-context-impl.h b/dali/internal/input/common/input-method-context-impl.h
index 7890b1c..49387c1 100755 (executable)
--- a/dali/internal/input/common/input-method-context-impl.h
+++ b/dali/internal/input/common/input-method-context-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_INPUT_COMMON_INPUT_METHOD_CONTEXT_IMPL_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.
@@ -343,4 +343,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_INPUT_METHOD_CONTEXT_H
+#endif // DALI_INTERNAL_INPUT_COMMON_INPUT_METHOD_CONTEXT_IMPL_H

diff --git a/dali/internal/legacy/tizen/data-compression.h b/dali/internal/legacy/tizen/data-compression.h
index 451b250..ddbcf8c 100644 (file)
--- a/dali/internal/legacy/tizen/data-compression.h
+++ b/dali/internal/legacy/tizen/data-compression.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_DATA_COMPRESSION_H__
-#define __DALI_TIZEN_PLATFORM_DATA_COMPRESSION_H__
+#ifndef DALI_TIZEN_PLATFORM_DATA_COMPRESSION_H
+#define DALI_TIZEN_PLATFORM_DATA_COMPRESSION_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.
@@ -69,4 +69,4 @@ bool DecodeRle( const unsigned char* input,
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_DATA_COMPRESSION_H__
+#endif // DALI_TIZEN_PLATFORM_DATA_COMPRESSION_H

diff --git a/dali/internal/legacy/tizen/image-encoder.h b/dali/internal/legacy/tizen/image-encoder.h
index e6ec381..96145ab 100644 (file)
--- a/dali/internal/legacy/tizen/image-encoder.h
+++ b/dali/internal/legacy/tizen/image-encoder.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_IMAGE_ENCODER_H__
-#define __DALI_TIZEN_PLATFORM_IMAGE_ENCODER_H__
+#ifndef DALI_TIZEN_PLATFORM_IMAGE_ENCODER_H
+#define DALI_TIZEN_PLATFORM_IMAGE_ENCODER_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.
@@ -36,4 +36,4 @@ enum FileFormat
 
 } // namespace Dali
 
-#endif //__DALI_TIZEN_PLATFORM_IMAGE_ENCODER_H__
+#endif //DALI_TIZEN_PLATFORM_IMAGE_ENCODER_H

diff --git a/dali/internal/legacy/tizen/platform-capabilities.h b/dali/internal/legacy/tizen/platform-capabilities.h
index aba3dbd..403414e 100644 (file)
--- a/dali/internal/legacy/tizen/platform-capabilities.h
+++ b/dali/internal/legacy/tizen/platform-capabilities.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_PLATFORM_CAPABILITIES_H__
-#define __DALI_TIZEN_PLATFORM_CAPABILITIES_H__
+#ifndef DALI_TIZEN_PLATFORM_CAPABILITIES_H
+#define DALI_TIZEN_PLATFORM_CAPABILITIES_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.
@@ -56,4 +56,4 @@ inline unsigned int GetTextureDimension( unsigned int size )
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_PLATFORM_CAPABILITIES_H__
+#endif // DALI_TIZEN_PLATFORM_CAPABILITIES_H

diff --git a/dali/internal/network/common/automation.h b/dali/internal/network/common/automation.h
index a57f393..4420153 100644 (file)
--- a/dali/internal/network/common/automation.h
+++ b/dali/internal/network/common/automation.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_AUTOMATION_H__
-#define __DALI_INTERNAL_ADAPTOR_AUTOMATION_H__
+#ifndef DALI_INTERNAL_ADAPTOR_AUTOMATION_H
+#define DALI_INTERNAL_ADAPTOR_AUTOMATION_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.

diff --git a/dali/internal/network/common/client-send-data-interface.h b/dali/internal/network/common/client-send-data-interface.h
index 905fc41..9908bf5 100644 (file)
--- a/dali/internal/network/common/client-send-data-interface.h
+++ b/dali/internal/network/common/client-send-data-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_CLIENT_SEND_DATA_INTERFACE_H__
-#define __DALI_INTERNAL_ADAPTOR_CLIENT_SEND_DATA_INTERFACE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_CLIENT_SEND_DATA_INTERFACE_H
+#define DALI_INTERNAL_ADAPTOR_CLIENT_SEND_DATA_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.
@@ -76,4 +76,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_CLIENT_SEND_DATA_INTERFACE_H__
+#endif // DALI_INTERNAL_ADAPTOR_CLIENT_SEND_DATA_INTERFACE_H

diff --git a/dali/internal/network/common/network-performance-client.h b/dali/internal/network/common/network-performance-client.h
index 7a2a40a..1920f2c 100644 (file)
--- a/dali/internal/network/common/network-performance-client.h
+++ b/dali/internal/network/common/network-performance-client.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_CLIENT_H__
-#define __DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_CLIENT_H__
+#ifndef DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_CLIENT_H
+#define DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_CLIENT_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.
@@ -141,4 +141,4 @@ private:
 
 } // namespace Dali
 
-#endif
+#endif // DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_CLIENT_H

diff --git a/dali/internal/network/common/network-performance-protocol.h b/dali/internal/network/common/network-performance-protocol.h
index e3dfcb1..ce6e467 100644 (file)
--- a/dali/internal/network/common/network-performance-protocol.h
+++ b/dali/internal/network/common/network-performance-protocol.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_PROTOCOL_H__
-#define __DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_PROTOCOL_H__
+#ifndef DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_PROTOCOL_H
+#define DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_PROTOCOL_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 @@ const char* const GetHelpMessage();
 
 } // namespace Dali
 
-#endif //__DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_PROTOCOL_H__
+#endif //DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_PROTOCOL_H

diff --git a/dali/internal/network/common/network-performance-server.h b/dali/internal/network/common/network-performance-server.h
index 4e017dc..b5be9ed 100644 (file)
--- a/dali/internal/network/common/network-performance-server.h
+++ b/dali/internal/network/common/network-performance-server.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_SERVER_H__
-#define __DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_SERVER_H__
+#ifndef DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_SERVER_H
+#define DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_SERVER_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.
@@ -181,4 +181,4 @@ private:
 
 } // namespace Dali
 
-#endif //__DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_SERVER_H__
+#endif //DALI_INTERNAL_ADAPTOR_NETWORK_PERFORMANCE_SERVER_H

diff --git a/dali/internal/network/common/socket-factory-interface.h b/dali/internal/network/common/socket-factory-interface.h
index 5457fff..4819e94 100644 (file)
--- a/dali/internal/network/common/socket-factory-interface.h
+++ b/dali/internal/network/common/socket-factory-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_BASE_SOCKET_FACTORY_INTERFACE_H__
-#define __DALI_INTERNAL_ADAPTOR_BASE_SOCKET_FACTORY_INTERFACE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_BASE_SOCKET_FACTORY_INTERFACE_H
+#define DALI_INTERNAL_ADAPTOR_BASE_SOCKET_FACTORY_INTERFACE_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.
@@ -79,4 +79,4 @@ private:
 } // Internal
 } // Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_BASE_SOCKET_FACTORY_INTERFACE_H__
+#endif // DALI_INTERNAL_ADAPTOR_BASE_SOCKET_FACTORY_INTERFACE_H

diff --git a/dali/internal/network/common/socket-factory.h b/dali/internal/network/common/socket-factory.h
index 0d3103c..2b048e6 100644 (file)
--- a/dali/internal/network/common/socket-factory.h
+++ b/dali/internal/network/common/socket-factory.h
@@ -1,7 +1,7 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_SOCKET_FACTORY_H__
-#define __DALI_INTERNAL_ADAPTOR_SOCKET_FACTORY_H__
+#ifndef DALI_INTERNAL_ADAPTOR_SOCKET_FACTORY_H
+#define DALI_INTERNAL_ADAPTOR_SOCKET_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.
@@ -68,4 +68,4 @@ public:
 
 } // Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_SOCKET_FACTORY_H__
+#endif // DALI_INTERNAL_ADAPTOR_SOCKET_FACTORY_H

diff --git a/dali/internal/network/common/socket-impl.h b/dali/internal/network/common/socket-impl.h
index c938b97..21c8780 100644 (file)
--- a/dali/internal/network/common/socket-impl.h
+++ b/dali/internal/network/common/socket-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_SOCKET_IMPL_H__
-#define __DALI_INTERNAL_ADAPTOR_SOCKET_IMPL_H__
+#ifndef DALI_INTERNAL_ADAPTOR_SOCKET_IMPL_H
+#define DALI_INTERNAL_ADAPTOR_SOCKET_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.
@@ -135,4 +135,4 @@ private:
 
 } // Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_SOCKET_IMPL_H__
+#endif // DALI_INTERNAL_ADAPTOR_SOCKET_IMPL_H

diff --git a/dali/internal/network/common/socket-interface.h b/dali/internal/network/common/socket-interface.h
index e76af50..b2eb301 100644 (file)
--- a/dali/internal/network/common/socket-interface.h
+++ b/dali/internal/network/common/socket-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_BASE_SOCKET_INTERFACE_H__
-#define __DALI_INTERNAL_ADAPTOR_BASE_SOCKET_INTERFACE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_BASE_SOCKET_INTERFACE_H
+#define DALI_INTERNAL_ADAPTOR_BASE_SOCKET_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.
@@ -195,4 +195,4 @@ private:
 } // Internal
 } // Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_BASE_SOCKET_INTERFACE_H__
+#endif // DALI_INTERNAL_ADAPTOR_BASE_SOCKET_INTERFACE_H

diff --git a/dali/internal/network/common/trace-interface.h b/dali/internal/network/common/trace-interface.h
index 5be572a..026a29a 100644 (file)
--- a/dali/internal/network/common/trace-interface.h
+++ b/dali/internal/network/common/trace-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_BASE_TRACE_INTERFACE_H__
-#define __DALI_INTERNAL_BASE_TRACE_INTERFACE_H__
+#ifndef DALI_INTERNAL_BASE_TRACE_INTERFACE_H
+#define DALI_INTERNAL_BASE_TRACE_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.
@@ -81,4 +81,4 @@ protected:
 
 } // namespace Dali
 
-#endif
+#endif // DALI_INTERNAL_BASE_TRACE_INTERFACE_H

diff --git a/dali/internal/styling/common/style-monitor-impl.h b/dali/internal/styling/common/style-monitor-impl.h
index b553768..638863d 100644 (file)
--- a/dali/internal/styling/common/style-monitor-impl.h
+++ b/dali/internal/styling/common/style-monitor-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_STYLE_MONITOR_H__
-#define __DALI_INTERNAL_STYLE_MONITOR_H__
+#ifndef DALI_INTERNAL_STYLE_MONITOR_H
+#define DALI_INTERNAL_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.
@@ -151,4 +151,4 @@ inline const Internal::Adaptor::StyleMonitor& GetImplementation(const Dali::Styl
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_STYLE_MONITOR_H__
+#endif // DALI_INTERNAL_STYLE_MONITOR_H

diff --git a/dali/internal/system/common/abort-handler.h b/dali/internal/system/common/abort-handler.h
index 131bd9b..2910693 100755 (executable)
--- a/dali/internal/system/common/abort-handler.h
+++ b/dali/internal/system/common/abort-handler.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_ABORT_HANDLER_H__
-#define __DALI_INTERNAL_ADAPTOR_ABORT_HANDLER_H__
+#ifndef DALI_INTERNAL_ADAPTOR_ABORT_HANDLER_H
+#define DALI_INTERNAL_ADAPTOR_ABORT_HANDLER_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.
@@ -101,4 +101,4 @@ private:
 } // Namespace Internal
 } // Namespace Dali
 
-#endif //  __DALI_INTERNAL_ADAPTOR_ABORT_HANDLER_H__
+#endif //  DALI_INTERNAL_ADAPTOR_ABORT_HANDLER_H

diff --git a/dali/internal/system/common/callback-manager.h b/dali/internal/system/common/callback-manager.h
index 463fea6..44ecac4 100644 (file)
--- a/dali/internal/system/common/callback-manager.h
+++ b/dali/internal/system/common/callback-manager.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_CALLBACK_MANAGER_H__
-#define __DALI_INTERNAL_CALLBACK_MANAGER_H__
+#ifndef DALI_INTERNAL_CALLBACK_MANAGER_H
+#define DALI_INTERNAL_CALLBACK_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.
@@ -144,4 +144,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_CALLBACK_MANAGER_H__
+#endif // DALI_INTERNAL_CALLBACK_MANAGER_H

diff --git a/dali/internal/system/common/command-line-options.h b/dali/internal/system/common/command-line-options.h
index 75fab25..5738159 100644 (file)
--- a/dali/internal/system/common/command-line-options.h
+++ b/dali/internal/system/common/command-line-options.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_COMMAND_LINE_OPTIONS_H__
-#define __DALI_INTERNAL_COMMAND_LINE_OPTIONS_H__
+#ifndef DALI_INTERNAL_COMMAND_LINE_OPTIONS_H
+#define DALI_INTERNAL_COMMAND_LINE_OPTIONS_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.
@@ -78,4 +78,4 @@ public: // Command line parsed values
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_COMMAND_LINE_OPTIONS_H__
+#endif // DALI_INTERNAL_COMMAND_LINE_OPTIONS_H

diff --git a/dali/internal/system/common/core-event-interface.h b/dali/internal/system/common/core-event-interface.h
index 7d3ae59..d2240e1 100644 (file)
--- a/dali/internal/system/common/core-event-interface.h
+++ b/dali/internal/system/common/core-event-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_CORE_EVENT_INTERFACE_H__
-#define __DALI_INTERNAL_ADAPTOR_CORE_EVENT_INTERFACE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_CORE_EVENT_INTERFACE_H
+#define DALI_INTERNAL_ADAPTOR_CORE_EVENT_INTERFACE_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.
@@ -65,4 +65,4 @@ protected:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_CORE_EVENT_INTERFACE_H__
+#endif // DALI_INTERNAL_ADAPTOR_CORE_EVENT_INTERFACE_H

diff --git a/dali/internal/system/common/file-closer.h b/dali/internal/system/common/file-closer.h
index 78f6e5a..96b03b0 100755 (executable)
--- a/dali/internal/system/common/file-closer.h
+++ b/dali/internal/system/common/file-closer.h
@@ -1,7 +1,7 @@
-#ifndef _DALI_INTERNAL_PLATFORM_FILECLOSER_H__
-#define _DALI_INTERNAL_PLATFORM_FILECLOSER_H__
+#ifndef DALI_INTERNAL_PLATFORM_FILECLOSER_H
+#define DALI_INTERNAL_PLATFORM_FILECLOSER_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.
@@ -121,8 +121,10 @@ private:
   FILE* mFile;
 };
 
-} /* namespace Platform */
-} /* namespace Internal */
-} /* namespace Dali */
+} // namespace Platform
 
-#endif /* _DALI_INTERNAL_PLATFORM_FILECLOSER_H__ */
+} // namespace Internal
+
+} // namespace Dali
+
+#endif // DALI_INTERNAL_PLATFORM_FILECLOSER_H

diff --git a/dali/internal/system/common/file-descriptor-monitor.h b/dali/internal/system/common/file-descriptor-monitor.h
index 508f37f..dafd064 100644 (file)
--- a/dali/internal/system/common/file-descriptor-monitor.h
+++ b/dali/internal/system/common/file-descriptor-monitor.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_FILE_DESCRIPTOR_MONITOR_H__
-#define __DALI_INTERNAL_FILE_DESCRIPTOR_MONITOR_H__
+#ifndef DALI_INTERNAL_FILE_DESCRIPTOR_MONITOR_H
+#define DALI_INTERNAL_FILE_DESCRIPTOR_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.
@@ -113,4 +113,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_FILE_DESCRIPTOR_MONITOR_H__
+#endif // DALI_INTERNAL_FILE_DESCRIPTOR_MONITOR_H

diff --git a/dali/internal/system/common/fps-tracker.h b/dali/internal/system/common/fps-tracker.h
index cc9cc88..c943247 100644 (file)
--- a/dali/internal/system/common/fps-tracker.h
+++ b/dali/internal/system/common/fps-tracker.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_FPS_TRACKER_H__
-#define __DALI_INTERNAL_FPS_TRACKER_H__
+#ifndef DALI_INTERNAL_FPS_TRACKER_H
+#define DALI_INTERNAL_FPS_TRACKER_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.
@@ -83,4 +83,4 @@ private: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_FPS_TRACKER_H__
+#endif // DALI_INTERNAL_FPS_TRACKER_H

diff --git a/dali/internal/system/common/frame-time-stamp.h b/dali/internal/system/common/frame-time-stamp.h
index 5311690..0fa2397 100644 (file)
--- a/dali/internal/system/common/frame-time-stamp.h
+++ b/dali/internal/system/common/frame-time-stamp.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_FRAME_TIME_STAMP_H__
-#define __DALI_INTERNAL_ADAPTOR_FRAME_TIME_STAMP_H__
+#ifndef DALI_INTERNAL_ADAPTOR_FRAME_TIME_STAMP_H
+#define DALI_INTERNAL_ADAPTOR_FRAME_TIME_STAMP_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.
@@ -75,5 +75,5 @@ struct FrameTimeStamp
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_FRAME_TIME_STAMP_H__
+#endif // DALI_INTERNAL_ADAPTOR_FRAME_TIME_STAMP_H
 

diff --git a/dali/internal/system/common/frame-time-stats.h b/dali/internal/system/common/frame-time-stats.h
index 6caf6cd..5d15c1e 100644 (file)
--- a/dali/internal/system/common/frame-time-stats.h
+++ b/dali/internal/system/common/frame-time-stats.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_FRAME_TIME_STATS_H__
-#define __DALI_INTERNAL_ADAPTOR_FRAME_TIME_STATS_H__
+#ifndef DALI_INTERNAL_ADAPTOR_FRAME_TIME_STATS_H
+#define DALI_INTERNAL_ADAPTOR_FRAME_TIME_STATS_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,5 +124,5 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_FRAME_TIME_STATS_H__
+#endif // DALI_INTERNAL_ADAPTOR_FRAME_TIME_STATS_H
 

diff --git a/dali/internal/system/common/kernel-trace.h b/dali/internal/system/common/kernel-trace.h
index fce785d..07c017d 100644 (file)
--- a/dali/internal/system/common/kernel-trace.h
+++ b/dali/internal/system/common/kernel-trace.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_KERNEL_TRACE_H__
-#define __DALI_INTERNAL_ADAPTOR_KERNEL_TRACE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_KERNEL_TRACE_H
+#define DALI_INTERNAL_ADAPTOR_KERNEL_TRACE_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.
@@ -66,4 +66,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_KERNEL_TRACE_H__
+#endif // DALI_INTERNAL_ADAPTOR_KERNEL_TRACE_H

diff --git a/dali/internal/system/common/locale-utils.h b/dali/internal/system/common/locale-utils.h
index ecb251a..fcfbd07 100644 (file)
--- a/dali/internal/system/common/locale-utils.h
+++ b/dali/internal/system/common/locale-utils.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_LOCALE_UTILS_H__
-#define __DALI_INTERNAL_LOCALE_UTILS_H__
+#ifndef DALI_INTERNAL_LOCALE_UTILS_H
+#define DALI_INTERNAL_LOCALE_UTILS_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 @@ Locale::Direction GetDirection( const std::string& locale );
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_LOCALE_UTILS_H__
+#endif // DALI_INTERNAL_LOCALE_UTILS_H

diff --git a/dali/internal/system/common/logging.h b/dali/internal/system/common/logging.h
index 6165227..6f07e2a 100644 (file)
--- a/dali/internal/system/common/logging.h
+++ b/dali/internal/system/common/logging.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIZEN_LOGGING_H__
-#define __DALI_TIZEN_LOGGING_H__
+#ifndef DALI_TIZEN_LOGGING_H
+#define DALI_TIZEN_LOGGING_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.
@@ -36,4 +36,4 @@ void LogMessage(Dali::Integration::Log::DebugPriority level, std::string& messag
 
 } // namespace Dali
 
-#endif // __DALI_TIZEN_LOGGING_H__
+#endif // DALI_TIZEN_LOGGING_H

diff --git a/dali/internal/system/common/object-profiler.h b/dali/internal/system/common/object-profiler.h
index 7d38783..14b92b0 100644 (file)
--- a/dali/internal/system/common/object-profiler.h
+++ b/dali/internal/system/common/object-profiler.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ADAPTOR_OBJECT_PROFILER_H__
-#define __DALI_ADAPTOR_OBJECT_PROFILER_H__
+#ifndef DALI_ADAPTOR_OBJECT_PROFILER_H
+#define DALI_ADAPTOR_OBJECT_PROFILER_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.
@@ -97,4 +97,4 @@ private:
 } // Internal
 } // Dali
 
-#endif // __DALI_ADAPTOR_OBJECT_PROFILER_H__
+#endif // DALI_ADAPTOR_OBJECT_PROFILER_H

diff --git a/dali/internal/system/common/performance-interface-factory.h b/dali/internal/system/common/performance-interface-factory.h
index 194225a..85e63ac 100644 (file)
--- a/dali/internal/system/common/performance-interface-factory.h
+++ b/dali/internal/system/common/performance-interface-factory.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_FACTORY_H__
-#define __DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_FACTORY_H__
+#ifndef DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_FACTORY_H
+#define DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_FACTORY_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.
@@ -59,4 +59,4 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_FACTORY_H__
+#endif // DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_FACTORY_H

diff --git a/dali/internal/system/common/performance-interface.h b/dali/internal/system/common/performance-interface.h
index 0732d10..d1db387 100644 (file)
--- a/dali/internal/system/common/performance-interface.h
+++ b/dali/internal/system/common/performance-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_H__
-#define __DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_H__
+#ifndef DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_H
+#define DALI_INTERNAL_BASE_PERFORMANCE_INTERFACE_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.

diff --git a/dali/internal/system/common/performance-logger-impl.h b/dali/internal/system/common/performance-logger-impl.h
index d507221..461a3b1 100644 (file)
--- a/dali/internal/system/common/performance-logger-impl.h
+++ b/dali/internal/system/common/performance-logger-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_PERFORMANCE_LOGGER_H__
-#define __DALI_INTERNAL_PERFORMANCE_LOGGER_H__
+#ifndef DALI_INTERNAL_PERFORMANCE_LOGGER_H
+#define DALI_INTERNAL_PERFORMANCE_LOGGER_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.
@@ -123,4 +123,4 @@ inline static const  Internal::Adaptor::PerformanceLogger& GetImplementation( co
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_PERFORMANCE_LOGGER_H__
+#endif // DALI_INTERNAL_PERFORMANCE_LOGGER_H

diff --git a/dali/internal/system/common/performance-marker.h b/dali/internal/system/common/performance-marker.h
index cfabbfa..e4cae4a 100644 (file)
--- a/dali/internal/system/common/performance-marker.h
+++ b/dali/internal/system/common/performance-marker.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_PERFORMANCE_MARKER_H__
-#define __DALI_INTERNAL_ADAPTOR_PERFORMANCE_MARKER_H__
+#ifndef DALI_INTERNAL_ADAPTOR_PERFORMANCE_MARKER_H
+#define DALI_INTERNAL_ADAPTOR_PERFORMANCE_MARKER_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 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_PERFORMANCE_MARKER_H__
+#endif // DALI_INTERNAL_ADAPTOR_PERFORMANCE_MARKER_H

diff --git a/dali/internal/system/common/performance-server.h b/dali/internal/system/common/performance-server.h
index 2a6b386..1362f9b 100644 (file)
--- a/dali/internal/system/common/performance-server.h
+++ b/dali/internal/system/common/performance-server.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H__
-#define __DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H__
+#ifndef DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H
+#define DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_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.
@@ -142,4 +142,4 @@ private:
 
 } // namespace Dali
 
-#endif
+#endif // DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H

diff --git a/dali/internal/system/common/shared-file.h b/dali/internal/system/common/shared-file.h
index 81d48a7..213c8f3 100644 (file)
--- a/dali/internal/system/common/shared-file.h
+++ b/dali/internal/system/common/shared-file.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_SHARED_FILE_H__
-#define __DALI_INTERNAL_ADAPTOR_SHARED_FILE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_SHARED_FILE_H
+#define DALI_INTERNAL_ADAPTOR_SHARED_FILE_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.
@@ -75,4 +75,4 @@ private:
 } // Internal
 } // Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_SHARED_FILE_H__
+#endif // DALI_INTERNAL_ADAPTOR_SHARED_FILE_H

diff --git a/dali/internal/system/common/singleton-service-impl.h b/dali/internal/system/common/singleton-service-impl.h
index 1c49d6d..986e72a 100644 (file)
--- a/dali/internal/system/common/singleton-service-impl.h
+++ b/dali/internal/system/common/singleton-service-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SINGLETON_SERVICE_H__
-#define __DALI_INTERNAL_SINGLETON_SERVICE_H__
+#ifndef DALI_INTERNAL_SINGLETON_SERVICE_H
+#define DALI_INTERNAL_SINGLETON_SERVICE_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.
@@ -119,4 +119,4 @@ inline const Internal::Adaptor::SingletonService& GetImplementation(const Dali::
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SINGLETON_SERVICE_H__
+#endif // DALI_INTERNAL_SINGLETON_SERVICE_H

diff --git a/dali/internal/system/common/sound-player-impl.h b/dali/internal/system/common/sound-player-impl.h
index 0bdf840..514d4f0 100644 (file)
--- a/dali/internal/system/common/sound-player-impl.h
+++ b/dali/internal/system/common/sound-player-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SOUND_PLAYER_H__
-#define __DALI_INTERNAL_SOUND_PLAYER_H__
+#ifndef DALI_INTERNAL_SOUND_PLAYER_H
+#define DALI_INTERNAL_SOUND_PLAYER_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.
@@ -140,4 +140,4 @@ inline const Internal::Adaptor::SoundPlayer& GetImplementation(const Dali::Sound
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SOUND_PLAYER_H__
+#endif // DALI_INTERNAL_SOUND_PLAYER_H

diff --git a/dali/internal/system/common/stat-context-log-interface.h b/dali/internal/system/common/stat-context-log-interface.h
index c8e9409..0da1345 100644 (file)
--- a/dali/internal/system/common/stat-context-log-interface.h
+++ b/dali/internal/system/common/stat-context-log-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_STATISTICS_STAT_CONTEXT_LOG_INTERFACE_H__
-#define __DALI_INTERNAL_ADAPTOR_STATISTICS_STAT_CONTEXT_LOG_INTERFACE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_STATISTICS_STAT_CONTEXT_LOG_INTERFACE_H
+#define DALI_INTERNAL_ADAPTOR_STATISTICS_STAT_CONTEXT_LOG_INTERFACE_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.
@@ -74,4 +74,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_STATISTICS_STAT_CONTEXT_LOG_INTERFACE_H__
+#endif // DALI_INTERNAL_ADAPTOR_STATISTICS_STAT_CONTEXT_LOG_INTERFACE_H

diff --git a/dali/internal/system/common/stat-context-manager.h b/dali/internal/system/common/stat-context-manager.h
index f305540..e1521a3 100644 (file)
--- a/dali/internal/system/common/stat-context-manager.h
+++ b/dali/internal/system/common/stat-context-manager.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_MANAGER_H__
-#define __DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_MANAGER_H__
+#ifndef DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_MANAGER_H
+#define DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_MANAGER_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.
@@ -166,5 +166,5 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_MANAGER_H__
+#endif // DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_MANAGER_H
 

diff --git a/dali/internal/system/common/stat-context.h b/dali/internal/system/common/stat-context.h
index eee14a9..2209b25 100644 (file)
--- a/dali/internal/system/common/stat-context.h
+++ b/dali/internal/system/common/stat-context.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_H__
-#define __DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_H__
+#ifndef DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_H
+#define DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_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.
@@ -167,4 +167,4 @@ public:
 
 } // namespace Dali
 
-#endif
+#endif // DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_H

diff --git a/dali/internal/system/common/system-settings.h b/dali/internal/system/common/system-settings.h
index 7ebb352..174ad9b 100644 (file)
--- a/dali/internal/system/common/system-settings.h
+++ b/dali/internal/system/common/system-settings.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SYSTEM_SETTINGS_H___
-#define __DALI_INTERNAL_SYSTEM_SETTINGS_H___
+#ifndef DALI_INTERNAL_SYSTEM_SETTINGS_H
+#define DALI_INTERNAL_SYSTEM_SETTINGS_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 @@ int GetElmAccessActionOver();
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SYSTEM_SETTINGS_H___
+#endif // DALI_INTERNAL_SYSTEM_SETTINGS_H

diff --git a/dali/internal/system/common/system-trace.h b/dali/internal/system/common/system-trace.h
index ec9b9c6..7802f17 100644 (file)
--- a/dali/internal/system/common/system-trace.h
+++ b/dali/internal/system/common/system-trace.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_SYSTEM_TRACE_H__
-#define __DALI_INTERNAL_ADAPTOR_SYSTEM_TRACE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_SYSTEM_TRACE_H
+#define DALI_INTERNAL_ADAPTOR_SYSTEM_TRACE_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 @@ public:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_SYSTEM_TRACE_H__
+#endif // DALI_INTERNAL_ADAPTOR_SYSTEM_TRACE_H

diff --git a/dali/internal/system/common/thread-controller.h b/dali/internal/system/common/thread-controller.h
index 85d94fa..8e13370 100644 (file)
--- a/dali/internal/system/common/thread-controller.h
+++ b/dali/internal/system/common/thread-controller.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_THREAD_CONTROLLER_H__
-#define __DALI_INTERNAL_THREAD_CONTROLLER_H__
+#ifndef DALI_INTERNAL_THREAD_CONTROLLER_H
+#define DALI_INTERNAL_THREAD_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.
@@ -141,4 +141,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_THREAD_CONTROLLER_H__
+#endif // DALI_INTERNAL_THREAD_CONTROLLER_H

diff --git a/dali/internal/system/common/time-service.h b/dali/internal/system/common/time-service.h
index 39d0c6d..094aeba 100644 (file)
--- a/dali/internal/system/common/time-service.h
+++ b/dali/internal/system/common/time-service.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TIME_SERVICE_H__
-#define __DALI_INTERNAL_TIME_SERVICE_H__
+#ifndef DALI_INTERNAL_TIME_SERVICE_H
+#define DALI_INTERNAL_TIME_SERVICE_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.
@@ -60,4 +60,4 @@ void SleepUntil( uint64_t timeInNanoseconds );
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TIME_SERVICE_H__
+#endif // DALI_INTERNAL_TIME_SERVICE_H

diff --git a/dali/internal/system/common/timer-impl.h b/dali/internal/system/common/timer-impl.h
index 17d8ca4..4f1b1c6 100644 (file)
--- a/dali/internal/system/common/timer-impl.h
+++ b/dali/internal/system/common/timer-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TIMER_H__
-#define __DALI_INTERNAL_TIMER_H__
+#ifndef DALI_INTERNAL_TIMER_H
+#define DALI_INTERNAL_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.
@@ -147,4 +147,4 @@ inline const Timer& GetImplementation(const Dali::Timer& timer)
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TIMER_H__
+#endif // DALI_INTERNAL_TIMER_H

diff --git a/dali/internal/system/common/timer-interface.h b/dali/internal/system/common/timer-interface.h
index a648b5a..f75afdf 100644 (file)
--- a/dali/internal/system/common/timer-interface.h
+++ b/dali/internal/system/common/timer-interface.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_BASE_TIMER_INTERFACE_H__
-#define __DALI_INTERNAL_ADAPTOR_BASE_TIMER_INTERFACE_H__
+#ifndef DALI_INTERNAL_ADAPTOR_BASE_TIMER_INTERFACE_H
+#define DALI_INTERNAL_ADAPTOR_BASE_TIMER_INTERFACE_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.
@@ -78,4 +78,4 @@ protected:
 } // Internal
 } // Dali
 
-#endif // __DALI_INTERNAL_ADAPTOR_BASE_TIMER_INTERFACE_H__
+#endif // DALI_INTERNAL_ADAPTOR_BASE_TIMER_INTERFACE_H

diff --git a/dali/internal/system/common/trigger-event.h b/dali/internal/system/common/trigger-event.h
index 8d0d5c8..500416a 100644 (file)
--- a/dali/internal/system/common/trigger-event.h
+++ b/dali/internal/system/common/trigger-event.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TRIGGER_EVENT_H__
-#define __DALI_INTERNAL_TRIGGER_EVENT_H__
+#ifndef DALI_INTERNAL_TRIGGER_EVENT_H
+#define DALI_INTERNAL_TRIGGER_EVENT_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.
@@ -101,4 +101,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TRIGGER_EVENT_H__
+#endif // DALI_INTERNAL_TRIGGER_EVENT_H

diff --git a/dali/internal/system/common/update-status-logger.h b/dali/internal/system/common/update-status-logger.h
index 3c66002..094a7b3 100644 (file)
--- a/dali/internal/system/common/update-status-logger.h
+++ b/dali/internal/system/common/update-status-logger.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_UPDATE_STATUS_LOGGER_H__
-#define __DALI_INTERNAL_UPDATE_STATUS_LOGGER_H__
+#ifndef DALI_INTERNAL_UPDATE_STATUS_LOGGER_H
+#define DALI_INTERNAL_UPDATE_STATUS_LOGGER_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 @@ private: // Data
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_UPDATE_STATUS_LOGGER_H__
+#endif // DALI_INTERNAL_UPDATE_STATUS_LOGGER_H

diff --git a/dali/internal/system/linux/callback-manager-ecore.h b/dali/internal/system/linux/callback-manager-ecore.h
index 10f437f..d1b8dd5 100644 (file)
--- a/dali/internal/system/linux/callback-manager-ecore.h
+++ b/dali/internal/system/linux/callback-manager-ecore.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ECORE_CALLBACK_MANAGER_H__
-#define __DALI_ECORE_CALLBACK_MANAGER_H__
+#ifndef DALI_ECORE_CALLBACK_MANAGER_H
+#define DALI_ECORE_CALLBACK_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.
@@ -122,4 +122,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_ECORE_CALLBACK_MANAGER_H__
+#endif // DALI_ECORE_CALLBACK_MANAGER_H

diff --git a/dali/internal/system/windows/callback-manager-win.h b/dali/internal/system/windows/callback-manager-win.h
index 3048036..a2cd2ed 100755 (executable)
--- a/dali/internal/system/windows/callback-manager-win.h
+++ b/dali/internal/system/windows/callback-manager-win.h
@@ -2,7 +2,7 @@
 #define DALI_WIN_CALLBACK_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.
@@ -108,4 +108,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_UV_CALLBACK_MANAGER_H__
+#endif // DALI_WIN_CALLBACK_MANAGER_H

diff --git a/dali/internal/system/windows/trigger-event.h b/dali/internal/system/windows/trigger-event.h
index b0c198e..0d2e868 100755 (executable)
--- a/dali/internal/system/windows/trigger-event.h
+++ b/dali/internal/system/windows/trigger-event.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TRIGGER_EVENT_IMPL_H__
-#define __DALI_INTERNAL_TRIGGER_EVENT_IMPL_H__
+#ifndef DALI_INTERNAL_TRIGGER_EVENT_IMPL_H
+#define DALI_INTERNAL_TRIGGER_EVENT_IMPL_H
 
 /*
-* Copyright (c) 2018 Samsung Electronics Co., Ltd.
+* Copyright (c) 2019 Samsung Electronics Co., Ltd.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -84,4 +84,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TRIGGER_EVENT_IMPL_H__
\ No newline at end of file
+#endif // DALI_INTERNAL_TRIGGER_EVENT_IMPL_H
\ No newline at end of file

diff --git a/dali/internal/text/text-abstraction/bidirectional-support-impl.h b/dali/internal/text/text-abstraction/bidirectional-support-impl.h
index 8964856..bfd583a 100755 (executable)
--- a/dali/internal/text/text-abstraction/bidirectional-support-impl.h
+++ b/dali/internal/text/text-abstraction/bidirectional-support-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_IMPL_H__
-#define __DALI_INTERNAL_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_IMPL_H__
+#ifndef DALI_INTERNAL_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_IMPL_H
+#define DALI_INTERNAL_TEXT_ABSTRACTION_BIDIRECTIONAL_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.
@@ -138,4 +138,4 @@ inline static const TextAbstraction::Internal::BidirectionalSupport& GetImplemen
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_IMPL_H__
+#endif // DALI_INTERNAL_TEXT_ABSTRACTION_BIDIRECTIONAL_SUPPORT_IMPL_H

diff --git a/dali/internal/text/text-abstraction/segmentation-impl.h b/dali/internal/text/text-abstraction/segmentation-impl.h
index 3d4b4a7..f8404c7 100644 (file)
--- a/dali/internal/text/text-abstraction/segmentation-impl.h
+++ b/dali/internal/text/text-abstraction/segmentation-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TEXT_ABSTRACTION_SEGMENTATION_IMPL_H__
-#define __DALI_INTERNAL_TEXT_ABSTRACTION_SEGMENTATION_IMPL_H__
+#ifndef DALI_INTERNAL_TEXT_ABSTRACTION_SEGMENTATION_IMPL_H
+#define DALI_INTERNAL_TEXT_ABSTRACTION_SEGMENTATION_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.
@@ -113,4 +113,4 @@ inline static const TextAbstraction::Internal::Segmentation& GetImplementation(
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TEXT_ABSTRACTION_SEGMENTATION_IMPL_H__
+#endif // DALI_INTERNAL_TEXT_ABSTRACTION_SEGMENTATION_IMPL_H

diff --git a/dali/internal/text/text-abstraction/shaping-impl.h b/dali/internal/text/text-abstraction/shaping-impl.h
index e528817..2eb809e 100644 (file)
--- a/dali/internal/text/text-abstraction/shaping-impl.h
+++ b/dali/internal/text/text-abstraction/shaping-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TEXT_ABSTRACTION_SHAPING_IMPL_H__
-#define __DALI_INTERNAL_TEXT_ABSTRACTION_SHAPING_IMPL_H__
+#ifndef DALI_INTERNAL_TEXT_ABSTRACTION_SHAPING_IMPL_H
+#define DALI_INTERNAL_TEXT_ABSTRACTION_SHAPING_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.
@@ -110,4 +110,4 @@ inline static const TextAbstraction::Internal::Shaping& GetImplementation( const
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TEXT_ABSTRACTION_SHAPING_IMPL_H__
+#endif // DALI_INTERNAL_TEXT_ABSTRACTION_SHAPING_IMPL_H

diff --git a/dali/internal/thread/common/thread-settings-impl.h b/dali/internal/thread/common/thread-settings-impl.h
index 2766982..43f1c09 100644 (file)
--- a/dali/internal/thread/common/thread-settings-impl.h
+++ b/dali/internal/thread/common/thread-settings-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_THREAD_SETTINGS_H__
-#define __DALI_INTERNAL_THREAD_SETTINGS_H__
+#ifndef DALI_INTERNAL_THREAD_SETTINGS_H
+#define DALI_INTERNAL_THREAD_SETTINGS_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.
@@ -52,4 +52,4 @@ void SetThreadName(const std::string& threadName);
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_THREAD_SETTINGS_H__
+#endif // DALI_INTERNAL_THREAD_SETTINGS_H

diff --git a/dali/internal/video/common/video-player-impl.h b/dali/internal/video/common/video-player-impl.h
index 7e8f50a..bd13dcd 100755 (executable)
--- a/dali/internal/video/common/video-player-impl.h
+++ b/dali/internal/video/common/video-player-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_VIDEO_PLAYER_IMPL_H__
-#define __DALI_VIDEO_PLAYER_IMPL_H__
+#ifndef DALI_VIDEO_PLAYER_IMPL_H
+#define DALI_VIDEO_PLAYER_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.
@@ -241,5 +241,5 @@ inline static const Internal::Adaptor::VideoPlayer& GetImplementation( const Dal
 
 } // namespace Dali;
 
-#endif
+#endif // DALI_VIDEO_PLAYER_IMPL_H
 

diff --git a/dali/public-api/adaptor-framework/application-configuration.h b/dali/public-api/adaptor-framework/application-configuration.h
index c5b2c9e..0e23ff1 100644 (file)
--- a/dali/public-api/adaptor-framework/application-configuration.h
+++ b/dali/public-api/adaptor-framework/application-configuration.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_APPLICATION_CONFIGURATION_H__
-#define __DALI_APPLICATION_CONFIGURATION_H__
+#ifndef DALI_APPLICATION_CONFIGURATION_H
+#define DALI_APPLICATION_CONFIGURATION_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,6 +46,7 @@ enum ContextLoss
 /**
  * @}
  */
+
 } // namespace Dali
 
-#endif
+#endif // DALI_APPLICATION_CONFIGURATION_H

diff --git a/dali/public-api/adaptor-framework/device-status.h b/dali/public-api/adaptor-framework/device-status.h
index 47d499f..57f9ed5 100644 (file)
--- a/dali/public-api/adaptor-framework/device-status.h
+++ b/dali/public-api/adaptor-framework/device-status.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_DEVICE_STATUS_H__
-#define __DALI_DEVICE_STATUS_H__
+#ifndef DALI_DEVICE_STATUS_H
+#define DALI_DEVICE_STATUS_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.
@@ -70,4 +70,4 @@ struct Memory
  */
 } // namespace Dali
 
-#endif // __DALI_DEVICE_STATUS_H__
+#endif // DALI_DEVICE_STATUS_H

diff --git a/dali/public-api/adaptor-framework/input-method.h b/dali/public-api/adaptor-framework/input-method.h
index 9f76e6c..9b838c1 100644 (file)
--- a/dali/public-api/adaptor-framework/input-method.h
+++ b/dali/public-api/adaptor-framework/input-method.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INPUT_MEHTOD_H__
-#define __DALI_INPUT_MEHTOD_H__
+#ifndef DALI_INPUT_MEHTOD_H
+#define DALI_INPUT_MEHTOD_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.
@@ -272,4 +272,4 @@ enum Settings
  */
 } // namespace Dali
 
-#endif // __DALI_INPUT_MEHTOD_H__
+#endif // DALI_INPUT_MEHTOD_H

diff --git a/dali/public-api/adaptor-framework/key-grab.h b/dali/public-api/adaptor-framework/key-grab.h
index 9e0a297..e01a0c4 100755 (executable)
--- a/dali/public-api/adaptor-framework/key-grab.h
+++ b/dali/public-api/adaptor-framework/key-grab.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_KEY_GRAB_H__
-#define __DALI_KEY_GRAB_H__
+#ifndef DALI_KEY_GRAB_H
+#define DALI_KEY_GRAB_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.
@@ -158,4 +158,4 @@ DALI_ADAPTOR_API bool UngrabKeyList( Window window, const Dali::Vector<Dali::KEY
  */
 } // namespace Dali
 
-#endif // __DALI_KEY_GRAB_H__
+#endif // DALI_KEY_GRAB_H

diff --git a/dali/public-api/adaptor-framework/key.h b/dali/public-api/adaptor-framework/key.h
index fb9427f..9a9f10d 100755 (executable)
--- a/dali/public-api/adaptor-framework/key.h
+++ b/dali/public-api/adaptor-framework/key.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_KEY_H__
-#define __DALI_KEY_H__
+#ifndef DALI_KEY_H
+#define DALI_KEY_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.
@@ -97,4 +97,4 @@ DALI_ADAPTOR_API bool IsKey( const Dali::KeyEvent& keyEvent, Dali::KEY daliKey);
  */
 } // namespace Dali
 
-#endif // __DALI_KEY_H__
+#endif // DALI_KEY_H

diff --git a/dali/public-api/adaptor-framework/native-image-source.h b/dali/public-api/adaptor-framework/native-image-source.h
index c69e70d..e76cfca 100755 (executable)
--- a/dali/public-api/adaptor-framework/native-image-source.h
+++ b/dali/public-api/adaptor-framework/native-image-source.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_NATIVE_IMAGE_SOURCE_H__
-#define __DALI_NATIVE_IMAGE_SOURCE_H__
+#ifndef DALI_NATIVE_IMAGE_SOURCE_H
+#define DALI_NATIVE_IMAGE_SOURCE_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.
@@ -246,4 +246,4 @@ private:
  */
 } // namespace Dali
 
-#endif // __DALI_NATIVE_IMAGE_SOURCE_H__
+#endif // DALI_NATIVE_IMAGE_SOURCE_H

diff --git a/dali/public-api/adaptor-framework/style-change.h b/dali/public-api/adaptor-framework/style-change.h
index e12d6e2..bd36c9a 100644 (file)
--- a/dali/public-api/adaptor-framework/style-change.h
+++ b/dali/public-api/adaptor-framework/style-change.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_STYLE_CHANGE_H__
-#define __DALI_STYLE_CHANGE_H__
+#ifndef DALI_STYLE_CHANGE_H
+#define DALI_STYLE_CHANGE_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.
@@ -56,4 +56,4 @@ enum Type
  */
 } // namespace Dali
 
-#endif // __DALI_STYLE_CHANGE_H__
+#endif // DALI_STYLE_CHANGE_H

diff --git a/dali/public-api/adaptor-framework/timer.h b/dali/public-api/adaptor-framework/timer.h
index 28481ba..edaf556 100755 (executable)
--- a/dali/public-api/adaptor-framework/timer.h
+++ b/dali/public-api/adaptor-framework/timer.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TIMER_H__
-#define __DALI_TIMER_H__
+#ifndef DALI_TIMER_H
+#define DALI_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.
@@ -199,4 +199,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_TIMER_H__
+#endif // DALI_TIMER_H

diff --git a/dali/public-api/adaptor-framework/tts-player.h b/dali/public-api/adaptor-framework/tts-player.h
index 93fda5a..55cef69 100755 (executable)
--- a/dali/public-api/adaptor-framework/tts-player.h
+++ b/dali/public-api/adaptor-framework/tts-player.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TTS_PLAYER_H__
-#define __DALI_TTS_PLAYER_H__
+#ifndef DALI_TTS_PLAYER_H
+#define DALI_TTS_PLAYER_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.
@@ -187,4 +187,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_TTS_PLAYER_H__
+#endif // DALI_TTS_PLAYER_H

diff --git a/dali/public-api/dali-adaptor-version.h b/dali/public-api/dali-adaptor-version.h
index 7567495..8772b9b 100755 (executable)
--- a/dali/public-api/dali-adaptor-version.h
+++ b/dali/public-api/dali-adaptor-version.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ADAPTOR_VERSION_H__
-#define __DALI_ADAPTOR_VERSION_H__
+#ifndef DALI_ADAPTOR_VERSION_H
+#define DALI_ADAPTOR_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.
@@ -29,4 +29,4 @@ DALI_ADAPTOR_API extern const unsigned int ADAPTOR_MICRO_VERSION; ///< The micro
 DALI_ADAPTOR_API extern const char * const ADAPTOR_BUILD_DATE;    ///< The date/time the Adaptor library was built.
 } // namespace Dali
 
-#endif // __DALI_ADAPTOR_VERSION_H__
+#endif // DALI_ADAPTOR_VERSION_H

diff --git a/dali/public-api/watch/dali-wearable.h b/dali/public-api/watch/dali-wearable.h
index 41081d8..e122322 100644 (file)
--- a/dali/public-api/watch/dali-wearable.h
+++ b/dali/public-api/watch/dali-wearable.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_WEARABLE_H__
-#define __DALI_WEARABLE_H__
+#ifndef DALI_WEARABLE_H
+#define DALI_WEARABLE_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.
@@ -22,4 +22,4 @@
 #include <dali/public-api/watch/watch-application.h>
 #include <dali/public-api/capture/capture.h>
 
-#endif // __DALI_WEARABLE_H__
+#endif // DALI_WEARABLE_H

diff --git a/dali/public-api/watch/watch-application.h b/dali/public-api/watch/watch-application.h
index e69ada6..df59ef5 100755 (executable)
--- a/dali/public-api/watch/watch-application.h
+++ b/dali/public-api/watch/watch-application.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_WATCH_APPLICATION_H__
-#define __DALI_WATCH_APPLICATION_H__
+#ifndef DALI_WATCH_APPLICATION_H
+#define DALI_WATCH_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.
@@ -213,4 +213,4 @@ public: // Not intended for application developers
  */
 } // namespace Dali
 
-#endif // __DALI_WATCH_APPLICATION_H__
+#endif // DALI_WATCH_APPLICATION_H

diff --git a/dali/public-api/watch/watch-time.h b/dali/public-api/watch/watch-time.h
index 2805a10..5087b36 100755 (executable)
--- a/dali/public-api/watch/watch-time.h
+++ b/dali/public-api/watch/watch-time.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_WATCH_TIME_H__
-#define __DALI_WATCH_TIME_H__
+#ifndef DALI_WATCH_TIME_H
+#define DALI_WATCH_TIME_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.
@@ -205,4 +205,4 @@ private:  // Internal Data
  */
 } // namespace Dali
 
-#endif // __DALI_WATCH_TIME_H__
+#endif // DALI_WATCH_TIME_H

diff --git a/doc/dali-adaptor-doc.h b/doc/dali-adaptor-doc.h
index 66587d1..9d83921 100644 (file)
--- a/doc/dali-adaptor-doc.h
+++ b/doc/dali-adaptor-doc.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ADAPTOR_DOC_H__
-#define __DALI_ADAPTOR_DOC_H__
+#ifndef DALI_ADAPTOR_DOC_H
+#define DALI_ADAPTOR_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.
@@ -66,4 +66,4 @@
  * @}
  */
 
-#endif  /* __DALI_ADAPTOR_DOC_H__ */
+#endif  /* DALI_ADAPTOR_DOC_H */

diff --git a/plugins/dali-feedback.h b/plugins/dali-feedback.h
index a69bb9e..93c63d2 100644 (file)
--- a/plugins/dali-feedback.h
+++ b/plugins/dali-feedback.h
@@ -1,8 +1,8 @@
-#ifndef __FEEDBACK_PLUGIN_H__
-#define __FEEDBACK_PLUGIN_H__
+#ifndef FEEDBACK_PLUGIN_H
+#define FEEDBACK_PLUGIN_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.
@@ -82,4 +82,4 @@ public: // FeedbackPlugin overrides
 
 }  // namespace Dali
 
-#endif // __FEEDBACK_PLUGIN_H__
+#endif // FEEDBACK_PLUGIN_H

diff --git a/third-party/glyphy/vector-font-cache.h b/third-party/glyphy/vector-font-cache.h
index cb04606..46e6a00 100644 (file)
--- a/third-party/glyphy/vector-font-cache.h
+++ b/third-party/glyphy/vector-font-cache.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_TEXT_ABSTRACTION_VECTOR_FONT_CACHE_H__
-#define __DALI_INTERNAL_TEXT_ABSTRACTION_VECTOR_FONT_CACHE_H__
+#ifndef DALI_INTERNAL_TEXT_ABSTRACTION_VECTOR_FONT_CACHE_H
+#define DALI_INTERNAL_TEXT_ABSTRACTION_VECTOR_FONT_CACHE_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.
@@ -122,4 +122,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_TEXT_ABSTRACTION_VECTOR_FONT_CACHE_H__
+#endif // DALI_INTERNAL_TEXT_ABSTRACTION_VECTOR_FONT_CACHE_H

diff --git a/third-party/resampler/resampler.h b/third-party/resampler/resampler.h
index 4cc78a5..5db3a1d 100644 (file)
--- a/third-party/resampler/resampler.h
+++ b/third-party/resampler/resampler.h
@@ -1,8 +1,8 @@
 // resampler.h, Separable filtering image rescaler v2.21, Rich Geldreich - richgel99@gmail.com
 // See unlicense.org text at the bottom of this file.
 // Modified to specify filters as enum rather than char *
-#ifndef __RESAMPLER_H__
-#define __RESAMPLER_H__
+#ifndef RESAMPLER_H
+#define RESAMPLER_H
 
 #define RESAMPLER_DEBUG_OPS 0
 
@@ -187,7 +187,7 @@ private:
    }
 };
 
-#endif // __RESAMPLER_H__
+#endif // RESAMPLER_H
 
 // This is free and unencumbered software released into the public domain.
 //