Moving visuals into new folder with same level as controls

Renaming of header file include ifdefs.

Change-Id: Ie54a0916d0b0f1e24e02570a512659dbd458ba9b

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
index 6e62e5e..5310467 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DebugVisual.cpp
@@ -16,7 +16,7 @@
  */
 
 #include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali/public-api/rendering/renderer.h>
 #include <dali/public-api/rendering/geometry.h>
 

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
index 029654d..2418f49 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ToolBar.cpp
@@ -21,7 +21,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 using namespace Dali;
 using namespace Toolkit;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
index 1f0915b..6807fb3 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp
@@ -20,7 +20,7 @@
 #include <dali/public-api/rendering/renderer.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <dali/public-api/rendering/shader.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
index f0bc1c8..657c0ce 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-VisualFactory.cpp
@@ -21,7 +21,7 @@
 #include <dali/public-api/rendering/renderer.h>
 #include <dali/public-api/rendering/texture-set.h>
 #include <dali/public-api/rendering/shader.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;

diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list
index 08cdf22..4c1b3d7 100755 (executable)
--- a/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@ -10,8 +10,6 @@ devel_api_src_files = \
   $(devel_api_src_dir)/controls/magnifier/magnifier.cpp \
   $(devel_api_src_dir)/controls/popup/confirmation-popup.cpp \
   $(devel_api_src_dir)/controls/popup/popup.cpp \
-  $(devel_api_src_dir)/controls/visual-factory/visual-factory.cpp \
-  $(devel_api_src_dir)/controls/visual-factory/visual.cpp \
   $(devel_api_src_dir)/controls/shadow-view/shadow-view.cpp \
   $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.cpp \
   $(devel_api_src_dir)/controls/text-controls/text-selection-popup.cpp \
@@ -23,7 +21,9 @@ devel_api_src_files = \
   $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
   $(devel_api_src_dir)/transition-effects/cube-transition-effect.cpp \
   $(devel_api_src_dir)/transition-effects/cube-transition-fold-effect.cpp \
-  $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp
+  $(devel_api_src_dir)/transition-effects/cube-transition-wave-effect.cpp \
+  $(devel_api_src_dir)/visual-factory/visual-factory.cpp \
+  $(devel_api_src_dir)/visual-factory/visual.cpp
 
 # Add devel header files here
 
@@ -52,8 +52,8 @@ devel_api_popup_header_files = \
   $(devel_api_src_dir)/controls/popup/popup.h
 
 devel_api_visual_factory_header_files = \
-  $(devel_api_src_dir)/controls/visual-factory/visual-factory.h \
-  $(devel_api_src_dir)/controls/visual-factory/visual.h
+  $(devel_api_src_dir)/visual-factory/visual-factory.h \
+  $(devel_api_src_dir)/visual-factory/visual.h
 
 devel_api_shadow_view_header_files = \
   $(devel_api_src_dir)/controls/shadow-view/shadow-view.h

diff --git a/dali-toolkit/devel-api/controls/visual-factory/visual-factory.cpp b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
similarity index 97%
rename from dali-toolkit/devel-api/controls/visual-factory/visual-factory.cpp
rename to dali-toolkit/devel-api/visual-factory/visual-factory.cpp
index 9070388..ca763e9 100644 (file)
--- a/dali-toolkit/devel-api/controls/visual-factory/visual-factory.cpp
+++ b/dali-toolkit/devel-api/visual-factory/visual-factory.cpp
@@ -23,7 +23,7 @@
 #include <dali/devel-api/adaptor-framework/environment-variable.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/devel-api/controls/visual-factory/visual-factory.h b/dali-toolkit/devel-api/visual-factory/visual-factory.h
similarity index 98%
rename from dali-toolkit/devel-api/controls/visual-factory/visual-factory.h
rename to dali-toolkit/devel-api/visual-factory/visual-factory.h
index d6678b9..76e963c 100644 (file)
--- a/dali-toolkit/devel-api/controls/visual-factory/visual-factory.h
+++ b/dali-toolkit/devel-api/visual-factory/visual-factory.h
@@ -23,7 +23,7 @@
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/visual-factory/visual.h>
+#include <dali-toolkit/devel-api/visual-factory/visual.h>
 
 namespace Dali
 {
@@ -39,7 +39,7 @@ class VisualFactory;
 }
 
 /**
- * @brief VisualFactory is a singleton object that provides and shares renderers for controls
+ * @brief VisualFactory is a singleton object that provides and shares visuals between controls
  *
  * By setting environment variable 'DALI_DEBUG_RENDERING', all concrete renderer is replaced with the debug renderer which renders a quad wireframe.
  *

diff --git a/dali-toolkit/devel-api/controls/visual-factory/visual.cpp b/dali-toolkit/devel-api/visual-factory/visual.cpp
similarity index 96%
rename from dali-toolkit/devel-api/controls/visual-factory/visual.cpp
rename to dali-toolkit/devel-api/visual-factory/visual.cpp
index a3862e2..f61d4cb 100644 (file)
--- a/dali-toolkit/devel-api/controls/visual-factory/visual.cpp
+++ b/dali-toolkit/devel-api/visual-factory/visual.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 #include "visual.h"
 
 namespace Dali

diff --git a/dali-toolkit/devel-api/controls/visual-factory/visual.h b/dali-toolkit/devel-api/visual-factory/visual.h
similarity index 96%
rename from dali-toolkit/devel-api/controls/visual-factory/visual.h
rename to dali-toolkit/devel-api/visual-factory/visual.h
index 87cf36d..8591d2a 100644 (file)
--- a/dali-toolkit/devel-api/controls/visual-factory/visual.h
+++ b/dali-toolkit/devel-api/visual-factory/visual.h
@@ -94,12 +94,12 @@ public:
   void GetNaturalSize( Vector2& naturalSize ) const;
 
   /**
-   * @brief Set the depth index of this renderer.
+   * @brief Set the depth index of this visual.
    *
-   * Depth-index controls draw-order for overlapping renderers.
+   * Depth-index controls draw-order for overlapping visuals.
    * Renderer with higher depth indices are rendered in front of other renderer with smaller values
    *
-   * @param[in] index The depth index of this renderer.
+   * @param[in] index The depth index of this visual.
    */
   void SetDepthIndex( float index );
 

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index 07722b9..30034fd 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -29,7 +29,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 /**
  * Button states and contents

diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
index 3a53284..85058a1 100644 (file)
--- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
+++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
@@ -31,7 +31,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/internal/filters/blur-two-pass-filter.h>
 #include <dali-toolkit/internal/filters/emboss-filter.h>
 #include <dali-toolkit/internal/filters/spread-filter.h>

diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
index bf106e6..e8476e7 100644 (file)
--- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
+++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.h
@@ -27,7 +27,7 @@
 #include <dali-toolkit/devel-api/controls/effects-view/effects-view.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 3a0063a..c0aece7 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -11,9 +11,9 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h
index 3dec1b0..d75509a 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/image/image-visual.h>
+#include <dali-toolkit/internal/visuals/image/image-visual.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
@@ -114,7 +114,7 @@ public:
   /**
    * @brief Set the depth index of this image renderer
    *
-   * Renderer with higher depth indices are rendered in front of other renderers with smaller values
+   * Renderer with higher depth indices are rendered in front of other visuals with smaller values
    *
    * @param[in] depthIndex The depth index of this renderer
    */

diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
index d33627f..b35f5de 100644 (file)
--- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
+++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp
@@ -29,8 +29,8 @@
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
index 214459f..b0e9663 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp
@@ -31,7 +31,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-effect.h>
 #include <dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 
 using namespace Dali;
 

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
index 613cc3d..1bdb61d 100644 (file)
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp
@@ -30,7 +30,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL_INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 
 namespace //Unnamed namespace
 {

diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
index eff3cda..fbcb5a5 100644 (file)
--- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
+++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.h
@@ -22,7 +22,7 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/devel-api/controls/super-blur-view/super-blur-view.h>
 #include <dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index 8f7916c..75780c3 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -1328,7 +1328,7 @@ void TextEditor::OnStageConnection( int depth )
   // Call the Control::OnStageConnection() to set the depth of the background.
   Control::OnStageConnection( depth );
 
-  // Sets the depth to the renderers inside the text's decorator.
+  // Sets the depth to the visuals inside the text's decorator.
   mDecorator->SetTextDepth( depth );
 
   // The depth of the text renderer is set in the RenderText() called from OnRelayout().

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index 32fe824..655b63b 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -1510,7 +1510,7 @@ void TextField::OnStageConnection( int depth )
   // Call the Control::OnStageConnection() to set the depth of the background.
   Control::OnStageConnection( depth );
 
-  // Sets the depth to the renderers inside the text's decorator.
+  // Sets the depth to the visuals inside the text's decorator.
   mDecorator->SetTextDepth( depth );
 
   // The depth of the text renderer is set in the RenderText() called from OnRelayout().

diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h
index be3ef81..3e0567b 100644 (file)
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.h
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H__
-#define __DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H__
+#ifndef DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H
+#define DALI_TOOLKIT_INTERNAL_VIDEO_VIEW_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -24,7 +24,7 @@
 #include <dali/devel-api/adaptor-framework/video-player.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/image/image-visual.h>
+#include <dali-toolkit/internal/visuals/image/image-visual.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/video-view/video-view.h>
 
@@ -179,7 +179,7 @@ public:
   /**
    * @brief Set the depth index of this image renderer
    *
-   * Renderer with higher depth indices are rendered in front of other renderers with smaller values
+   * Renderer with higher depth indices are rendered in front of other visuals with smaller values
    * @SINCE_1_1.38
    * @param[in] depthIndex The depth index of this renderer
    */
@@ -271,4 +271,4 @@ inline const Toolkit::Internal::VideoView& GetImpl( const Toolkit::VideoView& ha
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_VIDEO_VIEW_H__
+#endif // DALI_TOOLKIT_VIDEO_VIEW_H

diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index 2b8bf6c..15c9865 100644 (file)
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -10,25 +10,25 @@ toolkit_src_files = \
    $(toolkit_src_dir)/builder/json-parser-impl.cpp \
    $(toolkit_src_dir)/builder/tree-node-manipulator.cpp \
    $(toolkit_src_dir)/builder/replacement.cpp \
-   $(toolkit_src_dir)/controls/renderers/visual-impl.cpp \
-   $(toolkit_src_dir)/controls/renderers/visual-data-impl.cpp \
-   $(toolkit_src_dir)/controls/renderers/image-atlas-manager.cpp \
-   $(toolkit_src_dir)/controls/renderers/visual-factory-cache.cpp \
-   $(toolkit_src_dir)/controls/renderers/visual-factory-impl.cpp \
-   $(toolkit_src_dir)/controls/renderers/visual-string-constants.cpp \
-   $(toolkit_src_dir)/controls/renderers/border/border-visual.cpp \
-   $(toolkit_src_dir)/controls/renderers/color/color-visual.cpp \
-   $(toolkit_src_dir)/controls/renderers/debug/debug-visual.cpp \
-   $(toolkit_src_dir)/controls/renderers/image/image-visual.cpp \
-   $(toolkit_src_dir)/controls/renderers/npatch/npatch-visual.cpp \
-   $(toolkit_src_dir)/controls/renderers/gradient/gradient.cpp \
-   $(toolkit_src_dir)/controls/renderers/gradient/linear-gradient.cpp \
-   $(toolkit_src_dir)/controls/renderers/gradient/radial-gradient.cpp \
-   $(toolkit_src_dir)/controls/renderers/gradient/gradient-visual.cpp \
-   $(toolkit_src_dir)/controls/renderers/svg/svg-rasterize-thread.cpp \
-   $(toolkit_src_dir)/controls/renderers/svg/svg-visual.cpp \
-   $(toolkit_src_dir)/controls/renderers/mesh/mesh-visual.cpp \
-   $(toolkit_src_dir)/controls/renderers/primitive/primitive-visual.cpp \
+   $(toolkit_src_dir)/visuals/visual-impl.cpp \
+   $(toolkit_src_dir)/visuals/visual-data-impl.cpp \
+   $(toolkit_src_dir)/visuals/image-atlas-manager.cpp \
+   $(toolkit_src_dir)/visuals/visual-factory-cache.cpp \
+   $(toolkit_src_dir)/visuals/visual-factory-impl.cpp \
+   $(toolkit_src_dir)/visuals/visual-string-constants.cpp \
+   $(toolkit_src_dir)/visuals/border/border-visual.cpp \
+   $(toolkit_src_dir)/visuals/color/color-visual.cpp \
+   $(toolkit_src_dir)/visuals/debug/debug-visual.cpp \
+   $(toolkit_src_dir)/visuals/image/image-visual.cpp \
+   $(toolkit_src_dir)/visuals/npatch/npatch-visual.cpp \
+   $(toolkit_src_dir)/visuals/gradient/gradient.cpp \
+   $(toolkit_src_dir)/visuals/gradient/linear-gradient.cpp \
+   $(toolkit_src_dir)/visuals/gradient/radial-gradient.cpp \
+   $(toolkit_src_dir)/visuals/gradient/gradient-visual.cpp \
+   $(toolkit_src_dir)/visuals/svg/svg-rasterize-thread.cpp \
+   $(toolkit_src_dir)/visuals/svg/svg-visual.cpp \
+   $(toolkit_src_dir)/visuals/mesh/mesh-visual.cpp \
+   $(toolkit_src_dir)/visuals/primitive/primitive-visual.cpp \
    $(toolkit_src_dir)/controls/alignment/alignment-impl.cpp \
    $(toolkit_src_dir)/controls/bloom-view/bloom-view-impl.cpp \
    $(toolkit_src_dir)/controls/bubble-effect/bubble-emitter-impl.cpp \

diff --git a/dali-toolkit/internal/filters/emboss-filter.cpp b/dali-toolkit/internal/filters/emboss-filter.cpp
index 8edca2e..dcf7164 100644 (file)
--- a/dali-toolkit/internal/filters/emboss-filter.cpp
+++ b/dali-toolkit/internal/filters/emboss-filter.cpp
@@ -28,7 +28,7 @@
 #include <dali/devel-api/images/texture-set-image.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/filters/emboss-filter.h b/dali-toolkit/internal/filters/emboss-filter.h
index bc90e84..1e83c1a 100644 (file)
--- a/dali-toolkit/internal/filters/emboss-filter.h
+++ b/dali-toolkit/internal/filters/emboss-filter.h
@@ -21,7 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/render-tasks/render-task.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual.h>
+#include <dali-toolkit/devel-api/visual-factory/visual.h>
 #include "image-filter.h"
 
 namespace Dali

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index c2802e7..828ecce 100644 (file)
--- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@ -22,11 +22,11 @@
 #include <cstring> // for strcmp
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/border/border-visual.cpp b/dali-toolkit/internal/visuals/border/border-visual.cpp
similarity index 96%
rename from dali-toolkit/internal/controls/renderers/border/border-visual.cpp
rename to dali-toolkit/internal/visuals/border/border-visual.cpp
index 547ebc0..3cb1688 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/border/border-visual.cpp
+++ b/dali-toolkit/internal/visuals/border/border-visual.cpp
@@ -22,10 +22,10 @@
 #include <dali/integration-api/debug.h>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/border/border-visual.h b/dali-toolkit/internal/visuals/border/border-visual.h
similarity index 93%
rename from dali-toolkit/internal/controls/renderers/border/border-visual.h
rename to dali-toolkit/internal/visuals/border/border-visual.h
index 2fdbe9f..b30f36a 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/border/border-visual.h
+++ b/dali-toolkit/internal/visuals/border/border-visual.h
@@ -1,5 +1,5 @@
-#ifndef DALI_TOOLKIT_INTERNAL_BORDER_RENDERER_H
-#define DALI_TOOLKIT_INTERNAL_BORDER_RENDERER_H
+#ifndef DALI_TOOLKIT_INTERNAL_BORDER_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_BORDER_VISUAL_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -22,7 +22,7 @@
 #include <dali/public-api/rendering/geometry.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 
 namespace Dali
 {
@@ -147,4 +147,4 @@ private:
 
 } // namespace Dali
 
-#endif // DALI_TOOLKIT_INTERNAL_BORDER_RENDERER_H
+#endif // DALI_TOOLKIT_INTERNAL_BORDER_VISUAL_H

diff --git a/dali-toolkit/internal/controls/renderers/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp
similarity index 92%
rename from dali-toolkit/internal/controls/renderers/color/color-visual.cpp
rename to dali-toolkit/internal/visuals/color/color-visual.cpp
index 180088a..2146e50 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/color/color-visual.cpp
+++ b/dali-toolkit/internal/visuals/color/color-visual.cpp
@@ -22,10 +22,10 @@
 #include <dali/integration-api/debug.h>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h
similarity index 92%
rename from dali-toolkit/internal/controls/renderers/color/color-visual.h
rename to dali-toolkit/internal/visuals/color/color-visual.h
index f101bb3..bd05356 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/color/color-visual.h
+++ b/dali-toolkit/internal/visuals/color/color-visual.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_COLOR_RENDERER_H__
-#define __DALI_TOOLKIT_INTERNAL_COLOR_RENDERER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 
 namespace Dali
 {
@@ -124,4 +124,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_COLOR_RENDERER_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H */

diff --git a/dali-toolkit/internal/controls/renderers/debug/debug-visual.cpp b/dali-toolkit/internal/visuals/debug/debug-visual.cpp
similarity index 91%
rename from dali-toolkit/internal/controls/renderers/debug/debug-visual.cpp
rename to dali-toolkit/internal/visuals/debug/debug-visual.cpp
index 993d251..679bf3b 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/debug/debug-visual.cpp
+++ b/dali-toolkit/internal/visuals/debug/debug-visual.cpp
@@ -20,10 +20,10 @@
 #include "debug-visual.h"
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/debug/debug-visual.h b/dali-toolkit/internal/visuals/debug/debug-visual.h
similarity index 89%
rename from dali-toolkit/internal/controls/renderers/debug/debug-visual.h
rename to dali-toolkit/internal/visuals/debug/debug-visual.h
index fed09d1..98afd14 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/debug/debug-visual.h
+++ b/dali-toolkit/internal/visuals/debug/debug-visual.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_DEBUG_RENDERER_H__
-#define __DALI_TOOLKIT_INTERNAL_DEBUG_RENDERER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_DEBUG_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_DEBUG_VISUAL_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 
 namespace Dali
 {
@@ -91,4 +91,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_DEBUG_RENDERER_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_DEBUG_VISUAL_H */

diff --git a/dali-toolkit/internal/controls/renderers/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
similarity index 96%
rename from dali-toolkit/internal/controls/renderers/gradient/gradient-visual.cpp
rename to dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
index 7546346..0e7610d 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/gradient/gradient-visual.cpp
+++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp
@@ -26,12 +26,12 @@
 #include <dali/public-api/object/property-array.h>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/gradient/linear-gradient.h>
-#include <dali-toolkit/internal/controls/renderers/gradient/radial-gradient.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/gradient/linear-gradient.h>
+#include <dali-toolkit/internal/visuals/gradient/radial-gradient.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/gradient/gradient-visual.h b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
similarity index 93%
rename from dali-toolkit/internal/controls/renderers/gradient/gradient-visual.h
rename to dali-toolkit/internal/visuals/gradient/gradient-visual.h
index 8d01e15..6c82b57 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/gradient/gradient-visual.h
+++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_GRADIENT_RENDERER_H__
-#define __DALI_TOOLKIT_INTERNAL_GRADIENT_RENDERER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
-#include <dali-toolkit/internal/controls/renderers/gradient/gradient.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/gradient/gradient.h>
 
 namespace Dali
 {
@@ -166,4 +166,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_GRADIENT_RENDERER_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H */

diff --git a/dali-toolkit/internal/controls/renderers/gradient/gradient.cpp b/dali-toolkit/internal/visuals/gradient/gradient.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/gradient/gradient.cpp
rename to dali-toolkit/internal/visuals/gradient/gradient.cpp

diff --git a/dali-toolkit/internal/controls/renderers/gradient/gradient.h b/dali-toolkit/internal/visuals/gradient/gradient.h
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/gradient/gradient.h
rename to dali-toolkit/internal/visuals/gradient/gradient.h

diff --git a/dali-toolkit/internal/controls/renderers/gradient/linear-gradient.cpp b/dali-toolkit/internal/visuals/gradient/linear-gradient.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/gradient/linear-gradient.cpp
rename to dali-toolkit/internal/visuals/gradient/linear-gradient.cpp

diff --git a/dali-toolkit/internal/controls/renderers/gradient/linear-gradient.h b/dali-toolkit/internal/visuals/gradient/linear-gradient.h
similarity index 90%
rename from dali-toolkit/internal/controls/renderers/gradient/linear-gradient.h
rename to dali-toolkit/internal/visuals/gradient/linear-gradient.h
index 099e9bf..187c244 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/gradient/linear-gradient.h
+++ b/dali-toolkit/internal/visuals/gradient/linear-gradient.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_LINEAR_GRADIENT_H__
-#define __DALI_TOOLKIT_INTERNAL_LINEAR_GRADIENT_H__
+#ifndef DALI_TOOLKIT_INTERNAL_LINEAR_GRADIENT_H
+#define DALI_TOOLKIT_INTERNAL_LINEAR_GRADIENT_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -18,7 +18,7 @@
  *
  */
 
-#include <dali-toolkit/internal/controls/renderers/gradient/gradient.h>
+#include <dali-toolkit/internal/visuals/gradient/gradient.h>
 
 #include <dali/public-api/math/vector2.h>
 
@@ -90,4 +90,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_LINEAR_GRADIENT_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_LINEAR_GRADIENT_H */

diff --git a/dali-toolkit/internal/controls/renderers/gradient/radial-gradient.cpp b/dali-toolkit/internal/visuals/gradient/radial-gradient.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/gradient/radial-gradient.cpp
rename to dali-toolkit/internal/visuals/gradient/radial-gradient.cpp

diff --git a/dali-toolkit/internal/controls/renderers/gradient/radial-gradient.h b/dali-toolkit/internal/visuals/gradient/radial-gradient.h
similarity index 90%
rename from dali-toolkit/internal/controls/renderers/gradient/radial-gradient.h
rename to dali-toolkit/internal/visuals/gradient/radial-gradient.h
index f2f2135..6e2e35e 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/gradient/radial-gradient.h
+++ b/dali-toolkit/internal/visuals/gradient/radial-gradient.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_RADIAL_GRADIENT_H__
-#define __DALI_TOOLKIT_INTERNAL_RADIAL_GRADIENT_H__
+#ifndef DALI_TOOLKIT_INTERNAL_RADIAL_GRADIENT_H
+#define DALI_TOOLKIT_INTERNAL_RADIAL_GRADIENT_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -18,7 +18,7 @@
  *
  */
 
-#include <dali-toolkit/internal/controls/renderers/gradient/gradient.h>
+#include <dali-toolkit/internal/visuals/gradient/gradient.h>
 
 #include <dali/public-api/math/vector2.h>
 
@@ -90,4 +90,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_RADIAL_GRADIENT_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_RADIAL_GRADIENT_H */

diff --git a/dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp b/dali-toolkit/internal/visuals/image-atlas-manager.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/image-atlas-manager.cpp
rename to dali-toolkit/internal/visuals/image-atlas-manager.cpp

diff --git a/dali-toolkit/internal/controls/renderers/image-atlas-manager.h b/dali-toolkit/internal/visuals/image-atlas-manager.h
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/image-atlas-manager.h
rename to dali-toolkit/internal/visuals/image-atlas-manager.h

diff --git a/dali-toolkit/internal/controls/renderers/image/image-visual.cpp b/dali-toolkit/internal/visuals/image/image-visual.cpp
similarity index 98%
rename from dali-toolkit/internal/controls/renderers/image/image-visual.cpp
rename to dali-toolkit/internal/visuals/image/image-visual.cpp
index e77c046..6934c8e 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image/image-visual.cpp
+++ b/dali-toolkit/internal/visuals/image/image-visual.cpp
@@ -28,12 +28,12 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL HEADER
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
-#include <dali-toolkit/internal/controls/renderers/image-atlas-manager.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h
similarity index 96%
rename from dali-toolkit/internal/controls/renderers/image/image-visual.h
rename to dali-toolkit/internal/visuals/image/image-visual.h
index 0b91a98..e55491f 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image/image-visual.h
+++ b/dali-toolkit/internal/visuals/image/image-visual.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_IMAGE_RENDERER_H__
-#define __DALI_TOOLKIT_INTERNAL_IMAGE_RENDERER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_IMAGE_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_IMAGE_VISUAL_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
-#include <dali-toolkit/internal/controls/renderers/image-atlas-manager.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
@@ -270,4 +270,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_IMAGE_RENDERER_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_IMAGE_VISUAL_H */

diff --git a/dali-toolkit/internal/controls/renderers/mesh/mesh-visual.cpp b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
similarity index 99%
rename from dali-toolkit/internal/controls/renderers/mesh/mesh-visual.cpp
rename to dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
index c3fa41f..638e1ff 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/mesh/mesh-visual.cpp
+++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.cpp
@@ -26,8 +26,8 @@
 #include <fstream>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/mesh/mesh-visual.h b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
similarity index 96%
rename from dali-toolkit/internal/controls/renderers/mesh/mesh-visual.h
rename to dali-toolkit/internal/visuals/mesh/mesh-visual.h
index fccb4e3..43e604e 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/mesh/mesh-visual.h
+++ b/dali-toolkit/internal/visuals/mesh/mesh-visual.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_MESH_RENDERER_H__
-#define __DALI_TOOLKIT_INTERNAL_MESH_RENDERER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_MESH_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_MESH_VISUAL_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -23,7 +23,7 @@
 #include <string.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 #include <dali-toolkit/internal/controls/model3d-view/obj-loader.h>
 
 namespace Dali
@@ -209,4 +209,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_MESH_RENDERER_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_MESH_VISUAL_H */

diff --git a/dali-toolkit/internal/controls/renderers/npatch/npatch-visual.cpp b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
similarity index 98%
rename from dali-toolkit/internal/controls/renderers/npatch/npatch-visual.cpp
rename to dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
index 7417105..89fc8ea 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/npatch/npatch-visual.cpp
+++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
@@ -25,11 +25,11 @@
 #include <dali/devel-api/images/texture-set-image.h>
 
 // INTERNAL IINCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
 
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/renderers/npatch/npatch-visual.h b/dali-toolkit/internal/visuals/npatch/npatch-visual.h
similarity index 95%
rename from dali-toolkit/internal/controls/renderers/npatch/npatch-visual.h
rename to dali-toolkit/internal/visuals/npatch/npatch-visual.h
index 0b7ae62..7f74022 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/npatch/npatch-visual.h
+++ b/dali-toolkit/internal/visuals/npatch/npatch-visual.h
@@ -1,5 +1,5 @@
-#ifndef DALI_TOOLKIT_INTERNAL_N_PATCH_RENDERER_H
-#define DALI_TOOLKIT_INTERNAL_N_PATCH_RENDERER_H
+#ifndef DALI_TOOLKIT_INTERNAL_N_PATCH_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_N_PATCH_VISUAL_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/images/image.h>
@@ -145,7 +145,7 @@ private:
   Shader CreateShader();
 
   /**
-   * @brief Creates a geometry for the grid size to be used by this renderers' shaders
+   * @brief Creates a geometry for the grid size to be used by this visuals' shaders
    *
    * @param[in] gridSize The grid size of the solid geometry to create
    * @return Returns the created geometry for the grid size
@@ -153,7 +153,7 @@ private:
   Geometry CreateGeometry( Uint16Pair gridSize );
 
   /**
-   * @brief Creates a geometry with the border only for the grid size to be used by this renderers' shaders
+   * @brief Creates a geometry with the border only for the grid size to be used by this visuals' shaders
    * e.g. a 5x4 grid would create a geometry that would look like:
    *
    *   ---------------------
@@ -220,4 +220,4 @@ private:
 
 } // namespace Dali
 
-#endif // DALI_TOOLKIT_INTERNAL_N_PATCH_RENDERER_H
+#endif // DALI_TOOLKIT_INTERNAL_N_PATCH_VISUAL_H

diff --git a/dali-toolkit/internal/controls/renderers/primitive/primitive-visual.cpp b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
similarity index 99%
rename from dali-toolkit/internal/controls/renderers/primitive/primitive-visual.cpp
rename to dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
index 565693e..c27b516 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/primitive/primitive-visual.cpp
+++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.cpp
@@ -24,8 +24,8 @@
 #include <dali/public-api/common/constants.h>
 
 //INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/primitive/primitive-visual.h b/dali-toolkit/internal/visuals/primitive/primitive-visual.h
similarity index 98%
rename from dali-toolkit/internal/controls/renderers/primitive/primitive-visual.h
rename to dali-toolkit/internal/visuals/primitive/primitive-visual.h
index 62b2078..b655ee3 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/primitive/primitive-visual.h
+++ b/dali-toolkit/internal/visuals/primitive/primitive-visual.h
@@ -1,5 +1,5 @@
-#ifndef DALI_TOOLKIT_INTERNAL_PRIMITIVE_RENDERER_H
-#define DALI_TOOLKIT_INTERNAL_PRIMITIVE_RENDERER_H
+#ifndef DALI_TOOLKIT_INTERNAL_PRIMITIVE_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_PRIMITIVE_VISUAL_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -46,7 +46,7 @@
 
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 
 namespace Dali
 {
@@ -349,4 +349,4 @@ private:
 
 } // namespace Dali
 
-#endif /* DALI_TOOLKIT_INTERNAL_PRIMITIVE_RENDERER_H */
+#endif /* DALI_TOOLKIT_INTERNAL_PRIMITIVE_VISUAL_H */

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
similarity index 98%
rename from dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
rename to dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
index 1f5054b..d328304 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
+++ b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/third-party/nanosvg/nanosvgrast.h>
-#include <dali-toolkit/internal/controls/renderers/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
rename to dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-visual.cpp b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
similarity index 94%
rename from dali-toolkit/internal/controls/renderers/svg/svg-visual.cpp
rename to dali-toolkit/internal/visuals/svg/svg-visual.cpp
index 2996e58..ace3bc3 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-visual.cpp
+++ b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
@@ -28,11 +28,11 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/third-party/nanosvg/nanosvg.h>
-#include <dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h>
-#include <dali-toolkit/internal/controls/renderers/image/image-visual.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h>
+#include <dali-toolkit/internal/visuals/image/image-visual.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
 
 
 namespace

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-visual.h b/dali-toolkit/internal/visuals/svg/svg-visual.h
similarity index 92%
rename from dali-toolkit/internal/controls/renderers/svg/svg-visual.h
rename to dali-toolkit/internal/visuals/svg/svg-visual.h
index ffd6a8a..d674d2f 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-visual.h
+++ b/dali-toolkit/internal/visuals/svg/svg-visual.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_SVG_RENDERER_H__
-#define __DALI_TOOLKIT_INTERNAL_SVG_RENDERER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H
+#define DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
-#include <dali-toolkit/internal/controls/renderers/image-atlas-manager.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 
 struct NSVGimage;
 
@@ -148,4 +148,4 @@ private:
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_SVG_RENDERER_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H */

diff --git a/dali-toolkit/internal/controls/renderers/visual-data-impl.cpp b/dali-toolkit/internal/visuals/visual-data-impl.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/visual-data-impl.cpp
rename to dali-toolkit/internal/visuals/visual-data-impl.cpp

diff --git a/dali-toolkit/internal/controls/renderers/visual-data-impl.h b/dali-toolkit/internal/visuals/visual-data-impl.h
similarity index 86%
rename from dali-toolkit/internal/controls/renderers/visual-data-impl.h
rename to dali-toolkit/internal/visuals/visual-data-impl.h
index 42ebe93..eabdb37 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/visual-data-impl.h
+++ b/dali-toolkit/internal/visuals/visual-data-impl.h
@@ -1,5 +1,5 @@
-#ifndef DALI_TOOLKIT_INTERNAL_CONTROL_RENDERER_DATA_IMPL_H
-#define DALI_TOOLKIT_INTERNAL_CONTROL_RENDERER_DATA_IMPL_H
+#ifndef DALI_TOOLKIT_INTERNAL_VISUAL_DATA_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_VISUAL_DATA_IMPL_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -23,7 +23,7 @@
 #include <dali/public-api/rendering/renderer.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/visual-impl.h>
+#include <dali-toolkit/internal/visuals/visual-impl.h>
 
 namespace Dali
 {
@@ -75,4 +75,4 @@ struct Internal::Visual::Impl
 
 } // namespace Dali
 
-#endif // DALI_TOOLKIT_INTERNAL_CONTROL_RENDERER_DATA_IMPL_H
+#endif // DALI_TOOLKIT_INTERNAL_VISUAL_DATA_IMPL_H

diff --git a/dali-toolkit/internal/controls/renderers/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
similarity index 97%
rename from dali-toolkit/internal/controls/renderers/visual-factory-cache.cpp
rename to dali-toolkit/internal/visuals/visual-factory-cache.cpp
index 1a0a5ba..72245ed 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/visual-factory-cache.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.cpp
@@ -21,8 +21,8 @@
 #include <dali/devel-api/common/hash.h>
 
 // INTERNAL HEADER
-#include <dali-toolkit/internal/controls/renderers/color/color-visual.h>
-#include <dali-toolkit/internal/controls/renderers/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/color/color-visual.h>
+#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/visual-factory-cache.h b/dali-toolkit/internal/visuals/visual-factory-cache.h
similarity index 96%
rename from dali-toolkit/internal/controls/renderers/visual-factory-cache.h
rename to dali-toolkit/internal/visuals/visual-factory-cache.h
index 9f887b9..46920c5 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/visual-factory-cache.h
+++ b/dali-toolkit/internal/visuals/visual-factory-cache.h
@@ -1,5 +1,5 @@
-#ifndef DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H
-#define DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H
+#ifndef DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H
+#define DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -207,7 +207,7 @@ private:
   typedef Dali::OwnerContainer< const CachedRenderer* > CachedRenderers;
 
   /**
-   * @brief Finds the first index into the cached renderers from the url
+   * @brief Finds the first index into the cached visuals from the url
    *
    * @return Returns the first index into the cached renderer from the url if it exists in the cache, otherwise returns -1
    */
@@ -231,4 +231,4 @@ private:
 
 } // namespace Dali
 
-#endif // DALI_TOOLKIT_RENDERER_FACTORY_CACHE_H
+#endif // DALI_TOOLKIT_VISUAL_FACTORY_CACHE_H

diff --git a/dali-toolkit/internal/controls/renderers/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
similarity index 87%
rename from dali-toolkit/internal/controls/renderers/visual-factory-impl.cpp
rename to dali-toolkit/internal/visuals/visual-factory-impl.cpp
index 51bf68b..2ccc1d6 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/visual-factory-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@ -15,7 +15,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/internal/controls/renderers/visual-factory-impl.h>
+#include <dali-toolkit/internal/visuals/visual-factory-impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
@@ -25,18 +25,18 @@
 #include <dali/public-api/object/type-registry-helper.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/border/border-visual.h>
-#include <dali-toolkit/internal/controls/renderers/color/color-visual.h>
-#include <dali-toolkit/internal/controls/renderers/debug/debug-visual.h>
-#include <dali-toolkit/internal/controls/renderers/gradient/gradient-visual.h>
-#include <dali-toolkit/internal/controls/renderers/npatch/npatch-visual.h>
-#include <dali-toolkit/internal/controls/renderers/image/image-visual.h>
-#include <dali-toolkit/internal/controls/renderers/svg/svg-visual.h>
-#include <dali-toolkit/internal/controls/renderers/mesh/mesh-visual.h>
-#include <dali-toolkit/internal/controls/renderers/primitive/primitive-visual.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/renderers/image-atlas-manager.h>
+#include <dali-toolkit/internal/visuals/border/border-visual.h>
+#include <dali-toolkit/internal/visuals/color/color-visual.h>
+#include <dali-toolkit/internal/visuals/debug/debug-visual.h>
+#include <dali-toolkit/internal/visuals/gradient/gradient-visual.h>
+#include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
+#include <dali-toolkit/internal/visuals/image/image-visual.h>
+#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/mesh/mesh-visual.h>
+#include <dali-toolkit/internal/visuals/primitive/primitive-visual.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
 
 namespace
 {

diff --git a/dali-toolkit/internal/controls/renderers/visual-factory-impl.h b/dali-toolkit/internal/visuals/visual-factory-impl.h
similarity index 92%
rename from dali-toolkit/internal/controls/renderers/visual-factory-impl.h
rename to dali-toolkit/internal/visuals/visual-factory-impl.h
index 83f4b1f..5a54a68 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/visual-factory-impl.h
+++ b/dali-toolkit/internal/visuals/visual-factory-impl.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_RENDERER_FACTORY_IMPL_H__
-#define __DALI_TOOLKIT_RENDERER_FACTORY_IMPL_H__
+#ifndef DALI_TOOLKIT_VISUAL_FACTORY_IMPL_H
+#define DALI_TOOLKIT_VISUAL_FACTORY_IMPL_H
 
 /*
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -21,8 +21,8 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
-#include "../../../devel-api/controls/visual-factory/visual.h"
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual.h>
 
 namespace Dali
 {
@@ -150,4 +150,4 @@ inline Internal::VisualFactory& GetImplementation(Toolkit::VisualFactory& factor
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_RENDERER_FACTORY_IMPL_H__ */
+#endif /* DALI_TOOLKIT_VISUAL_FACTORY_IMPL_H */

diff --git a/dali-toolkit/internal/controls/renderers/visual-impl.cpp b/dali-toolkit/internal/visuals/visual-impl.cpp
similarity index 98%
rename from dali-toolkit/internal/controls/renderers/visual-impl.cpp
rename to dali-toolkit/internal/visuals/visual-impl.cpp
index 9f7bd9b..f0c1f50 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/visual-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-impl.cpp
@@ -23,7 +23,7 @@
 #include <dali/integration-api/debug.h>
 
 //INTERNAL HEARDER
-#include <dali-toolkit/internal/controls/renderers/visual-data-impl.h>
+#include <dali-toolkit/internal/visuals/visual-data-impl.h>
 
 namespace
 {

diff --git a/dali-toolkit/internal/controls/renderers/visual-impl.h b/dali-toolkit/internal/visuals/visual-impl.h
similarity index 97%
rename from dali-toolkit/internal/controls/renderers/visual-impl.h
rename to dali-toolkit/internal/visuals/visual-impl.h
index ca3d87a..6d9f94f 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/visual-impl.h
+++ b/dali-toolkit/internal/visuals/visual-impl.h
@@ -24,9 +24,9 @@
 #include <dali/public-api/rendering/shader.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
-#include <dali-toolkit/internal/controls/renderers/visual-factory-cache.h>
-#include "../../../devel-api/controls/visual-factory/visual.h"
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
+#include <dali-toolkit/devel-api/visual-factory/visual.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/renderers/visual-string-constants.cpp b/dali-toolkit/internal/visuals/visual-string-constants.cpp
similarity index 100%
rename from dali-toolkit/internal/controls/renderers/visual-string-constants.cpp
rename to dali-toolkit/internal/visuals/visual-string-constants.cpp

diff --git a/dali-toolkit/internal/controls/renderers/visual-string-constants.h b/dali-toolkit/internal/visuals/visual-string-constants.h
similarity index 91%
rename from dali-toolkit/internal/controls/renderers/visual-string-constants.h
rename to dali-toolkit/internal/visuals/visual-string-constants.h
index e07ee97..4464f1a 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/visual-string-constants.h
+++ b/dali-toolkit/internal/visuals/visual-string-constants.h
@@ -1,5 +1,5 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_RENDERER_STRING_CONSTANTS_H__
-#define __DALI_TOOLKIT_INTERNAL_RENDERER_STRING_CONSTANTS_H__
+#ifndef DALI_TOOLKIT_INTERNAL_VISUAL_STRING_CONSTANTS_H
+#define DALI_TOOLKIT_INTERNAL_VISUAL_STRING_CONSTANTS_H
 
 /*
  * Copyright (c) 2016 Samsung Electronics Co., Ltd.
@@ -67,4 +67,4 @@ extern const char * const BEVEL_SMOOTHNESS;
 
 } // namespace Dali
 
-#endif /* __DALI_TOOLKIT_INTERNAL_RENDERER_STRING_CONSTANTS_H__ */
+#endif /* DALI_TOOLKIT_INTERNAL_VISUAL_STRING_CONSTANTS_H */

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 719c6a8..c19f8e3 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -36,11 +36,11 @@
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/styling/style-manager.h>
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
-#include <dali-toolkit/devel-api/controls/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
-#include <dali-toolkit/internal/controls/renderers/color/color-visual.h>
-#include <dali-toolkit/internal/controls/renderers/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/color/color-visual.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
 
 namespace Dali
 {