(Canvas Renderer) Moved Devel Headers into sub-folder to improve SAM score

Change-Id: I28eb19ff8f75f5a7249bc9504e8e48bf7822e8ea

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 70cea5c..92b74a4 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -277,6 +277,7 @@ SET( tizenadaptordevelapidir ${INCLUDE_DIR}/dali/devel-api )
 SET( tizenadaptorintegrationapidir ${INCLUDE_DIR}/dali/integration-api/adaptor-framework )
 SET( tizenadaptorframeworkpublicapidir ${tizenadaptorpublicapidir}/adaptor-framework )
 SET( tizenadaptorframeworkdevelapidir ${tizenadaptordevelapidir}/adaptor-framework )
+SET( tizencanvasrendererdevelapidir ${tizenadaptorframeworkdevelapidir}/canvas-renderer )
 SET( tizenatspiinterfacesdevelapidir ${tizenadaptordevelapidir}/atspi-interfaces )
 SET( tizentextabstractiondevelapidir ${tizenadaptordevelapidir}/text-abstraction )
 SET( tizenadaptordaliheaderdir ${INCLUDE_DIR}/dali )
@@ -291,6 +292,7 @@ INSTALL( FILES ${public_api_header_files} DESTINATION ${tizenadaptorpublicapidir
 INSTALL( FILES ${adaptor_integration_api_header_files} DESTINATION ${tizenadaptorintegrationapidir} )
 INSTALL( FILES ${public_api_adaptor_framework_header_files} DESTINATION ${tizenadaptorframeworkpublicapidir} )
 INSTALL( FILES ${devel_api_adaptor_framework_header_files} DESTINATION ${tizenadaptorframeworkdevelapidir} )
+INSTALL( FILES ${devel_api_adaptor_framework_canvas_renderer_header_files} DESTINATION ${tizencanvasrendererdevelapidir} )
 INSTALL( FILES ${devel_api_atspi_interfaces_header_files} DESTINATION ${tizenatspiinterfacesdevelapidir} )
 INSTALL( FILES ${text_abstraction_header_files} DESTINATION ${tizentextabstractiondevelapidir} )
 

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.cpp b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.cpp
similarity index 91%
rename from dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.cpp
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.cpp
index 31af7f8..8f840f4 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h
similarity index 93%
rename from dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h
index 4c35e37..df286da 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h
@@ -2,7 +2,7 @@
 #define DALI_CANVAS_RENDERER_DRAWABLE_GROUP_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-drawable.cpp b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.cpp
similarity index 94%
rename from dali/devel-api/adaptor-framework/canvas-renderer-drawable.cpp
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.cpp
index 8963ccc..be2b76e 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-drawable.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-drawable.h b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h
similarity index 97%
rename from dali/devel-api/adaptor-framework/canvas-renderer-drawable.h
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h
index 1eae7b4..2e9642b 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-drawable.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h
@@ -2,7 +2,7 @@
 #define DALI_CANVAS_RENDERER_DRAWABLE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-gradient.cpp b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.cpp
similarity index 92%
rename from dali/devel-api/adaptor-framework/canvas-renderer-gradient.cpp
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.cpp
index 0c38af4..ed8404d 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-gradient.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-gradient.h b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h
similarity index 96%
rename from dali/devel-api/adaptor-framework/canvas-renderer-gradient.h
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h
index 3f181fd..2c241b4 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-gradient.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h
@@ -2,7 +2,7 @@
 #define DALI_CANVAS_RENDERER_GRADIENT_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.cpp b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.cpp
similarity index 91%
rename from dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.cpp
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.cpp
index 546a52f..59f13b1 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/canvas-renderer/common/linear-gradient-factory.h>

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h
similarity index 94%
rename from dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h
index d633f14..3422f53 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h
@@ -2,7 +2,7 @@
 #define DALI_CANVAS_RENDERER_LINEAR_GRADIENT_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-picture.cpp b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.cpp
similarity index 91%
rename from dali/devel-api/adaptor-framework/canvas-renderer-picture.cpp
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.cpp
index 7a897a5..540267b 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-picture.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021 Samsung Electronics Co., Ltd.
+* Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/adaptor-framework/canvas-renderer-picture.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-picture.h b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h
similarity index 93%
rename from dali/devel-api/adaptor-framework/canvas-renderer-picture.h
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h
index c3af63e..e5e1f77 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-picture.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h
@@ -2,7 +2,7 @@
 #define DALI_CANVAS_RENDERER_PICTURE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.cpp b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.cpp
similarity index 91%
rename from dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.cpp
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.cpp
index 35f1b77..3958d58 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/canvas-renderer/common/radial-gradient-factory.h>

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h
similarity index 93%
rename from dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h
index da87b26..cb8e033 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h
@@ -2,7 +2,7 @@
 #define DALI_CANVAS_RENDERER_RADIAL_GRADIENT_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-shape.cpp b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.cpp
similarity index 97%
rename from dali/devel-api/adaptor-framework/canvas-renderer-shape.cpp
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.cpp
index f9dd12a..37d5421 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-shape.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2021 Samsung Electronics Co., Ltd.
+* Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer-shape.h b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h
similarity index 98%
rename from dali/devel-api/adaptor-framework/canvas-renderer-shape.h
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h
index 281d772..aee4725 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer-shape.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h
@@ -2,7 +2,7 @@
 #define DALI_CANVAS_RENDERER_SHAPE_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/public-api/dali-adaptor-common.h>
 
 namespace Dali

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer.cpp b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.cpp
similarity index 94%
rename from dali/devel-api/adaptor-framework/canvas-renderer.cpp
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.cpp
index 7ce5f1f..fc903a8 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer.cpp
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 
 // INTERNAL INCLUDES
 #include <dali/internal/canvas-renderer/common/canvas-renderer-factory.h>

diff --git a/dali/devel-api/adaptor-framework/canvas-renderer.h b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h
similarity index 98%
rename from dali/devel-api/adaptor-framework/canvas-renderer.h
rename to dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h
index 2b6bf5e..34ee2b4 100644 (file)
--- a/dali/devel-api/adaptor-framework/canvas-renderer.h
+++ b/dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h
@@ -2,7 +2,7 @@
 #define DALI_CANVAS_RENDERER_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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/file.list b/dali/devel-api/file.list
index 89cb0a9..50b8c48 100755 (executable)
--- a/dali/devel-api/file.list
+++ b/dali/devel-api/file.list
@@ -1,20 +1,20 @@
 
 
 SET( devel_api_src_files
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer.cpp
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-drawable.cpp
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-picture.cpp
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.cpp
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-shape.cpp
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-gradient.cpp
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.cpp
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/accessibility.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/actor-accessible.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/animated-image-loading.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/application-devel.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/atspi-accessibility.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/bitmap-saver.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-drawable.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-picture.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-drawable-group.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-shape.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-gradient.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-linear-gradient.cpp
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-radial-gradient.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/capture-devel.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/clipboard.cpp
   ${adaptor_devel_api_dir}/adaptor-framework/clipboard-event-notifier.cpp
@@ -63,14 +63,6 @@ SET( devel_api_adaptor_framework_header_files
   ${adaptor_devel_api_dir}/adaptor-framework/application-devel.h
   ${adaptor_devel_api_dir}/adaptor-framework/atspi-accessibility.h
   ${adaptor_devel_api_dir}/adaptor-framework/bitmap-saver.h
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer.h
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-drawable.h
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-shape.h
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-drawable-group.h
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-gradient.h
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-linear-gradient.h
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-radial-gradient.h
-  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer-picture.h
   ${adaptor_devel_api_dir}/adaptor-framework/capture-devel.h
   ${adaptor_devel_api_dir}/adaptor-framework/clipboard-event-notifier.h
   ${adaptor_devel_api_dir}/adaptor-framework/clipboard.h
@@ -140,6 +132,17 @@ SET( devel_api_adaptor_framework_header_files
 )
 
 
+SET( devel_api_adaptor_framework_canvas_renderer_header_files
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer.h
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-shape.h
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h
+  ${adaptor_devel_api_dir}/adaptor-framework/canvas-renderer/canvas-renderer-picture.h
+)
+
 SET( devel_api_atspi_interfaces_header_files
   ${adaptor_devel_api_dir}/atspi-interfaces/accessible.h
   ${adaptor_devel_api_dir}/atspi-interfaces/action.h

diff --git a/dali/internal/canvas-renderer/common/canvas-renderer-factory.h b/dali/internal/canvas-renderer/common/canvas-renderer-factory.h
index bc58d3d..dbe7fb7 100644 (file)
--- a/dali/internal/canvas-renderer/common/canvas-renderer-factory.h
+++ b/dali/internal/canvas-renderer/common/canvas-renderer-factory.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_CANVAS_RENDERER_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/canvas-renderer-impl.h b/dali/internal/canvas-renderer/common/canvas-renderer-impl.h
index 5afb7bd..ffe9a7c 100644 (file)
--- a/dali/internal/canvas-renderer/common/canvas-renderer-impl.h
+++ b/dali/internal/canvas-renderer/common/canvas-renderer-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_CANVAS_RENDERER_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
 #include <dali/public-api/rendering/texture.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/drawable-factory.h b/dali/internal/canvas-renderer/common/drawable-factory.h
index 8a1acfe..ff5994f 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-factory.h
+++ b/dali/internal/canvas-renderer/common/drawable-factory.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_DRAWABLE_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/drawable-group-factory.h b/dali/internal/canvas-renderer/common/drawable-group-factory.h
index 44229f8..052128e 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-group-factory.h
+++ b/dali/internal/canvas-renderer/common/drawable-group-factory.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_DRAWABLE_GROUP_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/drawable-group-impl.h b/dali/internal/canvas-renderer/common/drawable-group-impl.h
index dbfd0fd..d177a00 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-group-impl.h
+++ b/dali/internal/canvas-renderer/common/drawable-group-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_DRAWABLE_GROUP_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #include <vector>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h>
 #include <dali/internal/canvas-renderer/common/drawable-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/common/drawable-impl.h b/dali/internal/canvas-renderer/common/drawable-impl.h
index 811a0d3..8177eff 100644 (file)
--- a/dali/internal/canvas-renderer/common/drawable-impl.h
+++ b/dali/internal/canvas-renderer/common/drawable-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_DRAWABLE_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/gradient-factory.h b/dali/internal/canvas-renderer/common/gradient-factory.h
index 3fa7b9f..e5eabbb 100644 (file)
--- a/dali/internal/canvas-renderer/common/gradient-factory.h
+++ b/dali/internal/canvas-renderer/common/gradient-factory.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GRADIENT_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/gradient-impl.h b/dali/internal/canvas-renderer/common/gradient-impl.h
index b422114..aee428c 100644 (file)
--- a/dali/internal/canvas-renderer/common/gradient-impl.h
+++ b/dali/internal/canvas-renderer/common/gradient-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GRADIENT_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/linear-gradient-factory.h b/dali/internal/canvas-renderer/common/linear-gradient-factory.h
index 93e6c4d..49cd985 100644 (file)
--- a/dali/internal/canvas-renderer/common/linear-gradient-factory.h
+++ b/dali/internal/canvas-renderer/common/linear-gradient-factory.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_LINEAR_GRADIENT_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/linear-gradient-impl.h b/dali/internal/canvas-renderer/common/linear-gradient-impl.h
index b91a538..3cfa457 100644 (file)
--- a/dali/internal/canvas-renderer/common/linear-gradient-impl.h
+++ b/dali/internal/canvas-renderer/common/linear-gradient-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_LINEAR_GRADIENT_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h>
 #include <dali/internal/canvas-renderer/common/gradient-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/common/picture-factory.h b/dali/internal/canvas-renderer/common/picture-factory.h
index 2a32581..80449a6 100644 (file)
--- a/dali/internal/canvas-renderer/common/picture-factory.h
+++ b/dali/internal/canvas-renderer/common/picture-factory.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_PICTURE_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-picture.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/picture-impl.h b/dali/internal/canvas-renderer/common/picture-impl.h
index ed4aa59..1e96ffa 100644 (file)
--- a/dali/internal/canvas-renderer/common/picture-impl.h
+++ b/dali/internal/canvas-renderer/common/picture-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_PICTURE_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-picture.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h>
 #include <dali/internal/canvas-renderer/common/drawable-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/common/radial-gradient-factory.h b/dali/internal/canvas-renderer/common/radial-gradient-factory.h
index 7d49ddb..4276c05 100644 (file)
--- a/dali/internal/canvas-renderer/common/radial-gradient-factory.h
+++ b/dali/internal/canvas-renderer/common/radial-gradient-factory.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_RADIAL_GRADIENT_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/radial-gradient-impl.h b/dali/internal/canvas-renderer/common/radial-gradient-impl.h
index 19176b7..be28231 100644 (file)
--- a/dali/internal/canvas-renderer/common/radial-gradient-impl.h
+++ b/dali/internal/canvas-renderer/common/radial-gradient-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_RADIAL_GRADIENT_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h>
 #include <dali/internal/canvas-renderer/common/gradient-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/common/shape-factory.h b/dali/internal/canvas-renderer/common/shape-factory.h
index 7c2d22b..d13ab05 100644 (file)
--- a/dali/internal/canvas-renderer/common/shape-factory.h
+++ b/dali/internal/canvas-renderer/common/shape-factory.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_SHAPE_FACTORY_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
 
 namespace Dali
 {

diff --git a/dali/internal/canvas-renderer/common/shape-impl.h b/dali/internal/canvas-renderer/common/shape-impl.h
index 1aecdf7..b5d9a6a 100644 (file)
--- a/dali/internal/canvas-renderer/common/shape-impl.h
+++ b/dali/internal/canvas-renderer/common/shape-impl.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_SHAPE_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
 #include <dali/internal/canvas-renderer/common/drawable-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/generic/canvas-renderer-impl-generic.h b/dali/internal/canvas-renderer/generic/canvas-renderer-impl-generic.h
index 5b3e9b8..3c7d920 100644 (file)
--- a/dali/internal/canvas-renderer/generic/canvas-renderer-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/canvas-renderer-impl-generic.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GENERIC_CANVAS_RENDERER_IMPL_GENERIC_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.h b/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.h
index d14a676..0ff36f8 100644 (file)
--- a/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/drawable-group-impl-generic.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GENERIC_DRAWABLE_GROUP_INTERFACE_GENERIC_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h>
 #include <dali/internal/canvas-renderer/common/drawable-group-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/generic/drawable-impl-generic.h b/dali/internal/canvas-renderer/generic/drawable-impl-generic.h
index 0f65e17..9ea4b22 100644 (file)
--- a/dali/internal/canvas-renderer/generic/drawable-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/drawable-impl-generic.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GENERIC_DRAWABLE_IMPL_GENERIC_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/internal/canvas-renderer/common/drawable-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/generic/gradient-impl-generic.h b/dali/internal/canvas-renderer/generic/gradient-impl-generic.h
index 1f58daf..82d9143 100644 (file)
--- a/dali/internal/canvas-renderer/generic/gradient-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/gradient-impl-generic.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GENERIC_GRADIENT_IMPL_GENERIC_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics 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,8 +22,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/internal/canvas-renderer/common/gradient-impl.h>
 #include <dali/internal/canvas-renderer/generic/canvas-renderer-impl-generic.h>
 

diff --git a/dali/internal/canvas-renderer/generic/linear-gradient-impl-generic.h b/dali/internal/canvas-renderer/generic/linear-gradient-impl-generic.h
index 7cb48a8..bfbc41d 100644 (file)
--- a/dali/internal/canvas-renderer/generic/linear-gradient-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/linear-gradient-impl-generic.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GENERIC_LINEAR_GRADIENT_IMPL_GENERIC_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h>
 #include <dali/internal/canvas-renderer/common/linear-gradient-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/generic/picture-impl-generic.h b/dali/internal/canvas-renderer/generic/picture-impl-generic.h
index 983478d..3ed0c36 100644 (file)
--- a/dali/internal/canvas-renderer/generic/picture-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/picture-impl-generic.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GENERIC_PICTURE_IMPL_GENERIC_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-picture.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h>
 #include <dali/internal/canvas-renderer/common/picture-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/generic/radial-gradient-impl-generic.h b/dali/internal/canvas-renderer/generic/radial-gradient-impl-generic.h
index 0d87c45..2b9f148 100644 (file)
--- a/dali/internal/canvas-renderer/generic/radial-gradient-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/radial-gradient-impl-generic.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GENERIC_RADIAL_GRADIENT_IMPL_GENERIC_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h>
 #include <dali/internal/canvas-renderer/common/radial-gradient-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/generic/shape-impl-generic.h b/dali/internal/canvas-renderer/generic/shape-impl-generic.h
index 630a9e6..8a4aa6a 100644 (file)
--- a/dali/internal/canvas-renderer/generic/shape-impl-generic.h
+++ b/dali/internal/canvas-renderer/generic/shape-impl-generic.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_GENERIC_SHAPE_INTERFACE_GENERIC_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
 #include <dali/internal/canvas-renderer/common/shape-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.h b/dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.h
index b200585..a7fbda7 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TIZEN_CANVAS_RENDERER_IMPL_TIZEN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@
 #include <dali/public-api/rendering/texture.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>
 #include <dali/internal/canvas-renderer/common/drawable-group-impl.h>

diff --git a/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.h b/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.h
index fccc857..16bfa41 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/drawable-group-impl-tizen.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TIZEN_DRAWABLE_GROUP_IMPL_TIZEN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 #include <dali/public-api/object/weak-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h>
 #include <dali/internal/canvas-renderer/common/drawable-group-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.h b/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.h
index b37ae2d..970c150 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TIZEN_DRAWABLE_IMPL_TIZEN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/internal/canvas-renderer/common/drawable-impl.h>
 #include <dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.h>
 

diff --git a/dali/internal/canvas-renderer/tizen/gradient-impl-tizen.h b/dali/internal/canvas-renderer/tizen/gradient-impl-tizen.h
index 717a948..cf9aba4 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/gradient-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/gradient-impl-tizen.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TIZEN_GRADIENT_IMPL_TIZEN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/internal/canvas-renderer/common/gradient-impl.h>
 #include <dali/internal/canvas-renderer/tizen/canvas-renderer-impl-tizen.h>
 

diff --git a/dali/internal/canvas-renderer/tizen/linear-gradient-impl-tizen.h b/dali/internal/canvas-renderer/tizen/linear-gradient-impl-tizen.h
index 74b79fb..0d1dd35 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/linear-gradient-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/linear-gradient-impl-tizen.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TIZEN_LINEAR_GRADIENT_IMPL_TIZEN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 #include <dali/public-api/object/weak-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h>
 #include <dali/internal/canvas-renderer/common/linear-gradient-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/tizen/picture-impl-tizen.h b/dali/internal/canvas-renderer/tizen/picture-impl-tizen.h
index 3ceae49..5bfd62c 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/picture-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/picture-impl-tizen.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TIZEN_PICTURE_IMPL_TIZEN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-picture.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h>
 #include <dali/internal/canvas-renderer/common/picture-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/tizen/radial-gradient-impl-tizen.h b/dali/internal/canvas-renderer/tizen/radial-gradient-impl-tizen.h
index 430dfe5..61b4f64 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/radial-gradient-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/radial-gradient-impl-tizen.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TIZEN_RADIAL_GRADIENT_IMPL_TIZEN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h>
 #include <dali/internal/canvas-renderer/common/radial-gradient-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
index 3c43c48..5272fa0 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
+++ b/dali/internal/canvas-renderer/tizen/shape-impl-tizen.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_TIZEN_SHAPE_IMPL_TIZEN_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
 #include <dali/internal/canvas-renderer/common/shape-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
index 2436d82..e766d12 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_UBUNTU_CANVAS_RENDERER_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,8 @@
 #include <dali/public-api/rendering/texture.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/internal/canvas-renderer/common/canvas-renderer-impl.h>
 #include <dali/internal/canvas-renderer/common/drawable-group-impl.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>

diff --git a/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.h
index 5652501..9efae26 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/drawable-group-impl-ubuntu.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_UBUNTU_DRAWABLE_GROUP_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 #include <dali/public-api/object/weak-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable-group.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable-group.h>
 #include <dali/internal/canvas-renderer/common/drawable-group-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.h
index 742ff74..81177ea 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_UBUNTU_DRAWABLE_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-drawable.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-drawable.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/internal/canvas-renderer/common/drawable-impl.h>
 #include <dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h>
 

diff --git a/dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.h
index 02d3196..d13e685 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/gradient-impl-ubuntu.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_UBUNTU_GRADIENT_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-gradient.h>
-#include <dali/devel-api/adaptor-framework/canvas-renderer.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer.h>
 #include <dali/internal/canvas-renderer/common/gradient-impl.h>
 #include <dali/internal/canvas-renderer/ubuntu/canvas-renderer-impl-ubuntu.h>
 

diff --git a/dali/internal/canvas-renderer/ubuntu/linear-gradient-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/linear-gradient-impl-ubuntu.h
index d735328..97b5b3f 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/linear-gradient-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/linear-gradient-impl-ubuntu.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_UBUNTU_LINEAR_GRADIENT_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 #include <dali/public-api/object/weak-handle.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-linear-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-linear-gradient.h>
 #include <dali/internal/canvas-renderer/common/linear-gradient-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/ubuntu/picture-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/picture-impl-ubuntu.h
index 3c2f796..42ae8fb 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/picture-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/picture-impl-ubuntu.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_UBUNTU_PICTURE_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-picture.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-picture.h>
 #include <dali/internal/canvas-renderer/common/picture-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/ubuntu/radial-gradient-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/radial-gradient-impl-ubuntu.h
index efee704..929cb00 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/radial-gradient-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/radial-gradient-impl-ubuntu.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_UBUNTU_RADIAL_GRADIENT_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-radial-gradient.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-radial-gradient.h>
 #include <dali/internal/canvas-renderer/common/radial-gradient-impl.h>
 
 namespace Dali

diff --git a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
index a459a35..36b9267 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
+++ b/dali/internal/canvas-renderer/ubuntu/shape-impl-ubuntu.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_UBUNTU_SHAPE_IMPL_UBUNTU_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/canvas-renderer-shape.h>
+#include <dali/devel-api/adaptor-framework/canvas-renderer/canvas-renderer-shape.h>
 #include <dali/internal/canvas-renderer/common/shape-impl.h>
 
 namespace Dali