Using migrated Public Visual API

Change-Id: I4805f01066b272b7b56935fe59a9e76110177378

diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
index 35a71fce07dd27ceb78df3873551a7444bb07b2f..8c30f848a768913e3d54aea6fcf9b870244747b5 100644 (file)
--- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
+++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics 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,8 +16,6 @@
  */
 
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
 #include <cstring>
 
 using namespace Dali;
@@ -112,17 +110,17 @@ private:
     Property::Map map;
     map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::Type::IMAGE );
     map.Add( Toolkit::ImageVisual::Property::URL, image );
-    map.Add( Toolkit::DevelImageVisual::Property::ALPHA_MASK_URL, mask );
+    map.Add( Toolkit::ImageVisual::Property::ALPHA_MASK_URL, mask );
 
     if( mImageCombinationIndex%2 == 0 )
     {
-      map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.f );
-      map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, false );
+      map.Add( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.f );
+      map.Add( Toolkit::ImageVisual::Property::CROP_TO_MASK, false );
     }
     else
     {
-      map.Add( Toolkit::DevelImageVisual::Property::MASK_CONTENT_SCALE, 1.6f );
-      map.Add( Toolkit::DevelImageVisual::Property::CROP_TO_MASK, true );
+      map.Add( Toolkit::ImageVisual::Property::MASK_CONTENT_SCALE, 1.6f );
+      map.Add( Toolkit::ImageVisual::Property::CROP_TO_MASK, true );
     }
 
     mImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, map );

diff --git a/examples/animated-images/animated-images-example.cpp b/examples/animated-images/animated-images-example.cpp
index 102470cc5eb38eadf6311bd8933e2ec9bf80e10b..ddcbc99571eeaf038362b797189868e5fe8e7a5d 100644 (file)
--- a/examples/animated-images/animated-images-example.cpp
+++ b/examples/animated-images/animated-images-example.cpp
@@ -17,7 +17,6 @@
 
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
 #include "shared/utility.h"
 
 using namespace Dali;
@@ -361,9 +360,9 @@ public:
     if( type == IMAGE_ARRAY )
     {
       map
-        .Add( Toolkit::DevelImageVisual::Property::BATCH_SIZE, 4 )
-        .Add( Toolkit::DevelImageVisual::Property::CACHE_SIZE, 10 )
-        .Add( Toolkit::DevelImageVisual::Property::FRAME_DELAY, 150 );
+        .Add( Toolkit::ImageVisual::Property::BATCH_SIZE, 4 )
+        .Add( Toolkit::ImageVisual::Property::CACHE_SIZE, 10 )
+        .Add( Toolkit::ImageVisual::Property::FRAME_DELAY, 150 );
     }
   }
 

diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp
index dd79982a9abef5f2b2dc238b450eb5a08b391f61..206bacb187a81ed016e875e0ff190b749ebf9770 100644 (file)
--- a/examples/animated-shapes/animated-shapes-example.cpp
+++ b/examples/animated-shapes/animated-shapes-example.cpp
@@ -114,7 +114,7 @@ public:
     background.SetParentOrigin( Dali::ParentOrigin::CENTER );
     background.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS );
     Dali::Property::Map map;
-    map.Insert( Visual::Property::TYPE,  Visual::GRADIENT );
+    map.Insert( Toolkit::Visual::Property::TYPE,  Visual::GRADIENT );
     Property::Array stopOffsets;
     stopOffsets.PushBack( 0.0f );
     stopOffsets.PushBack( 1.0f );

diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp
index 546e8e580b271435e3d4c8cdda5f6374fdad14b5..cd3c332360dabc4f371dddca238f815c2c4dc45c 100644 (file)
--- a/examples/benchmark/benchmark.cpp
+++ b/examples/benchmark/benchmark.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics 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,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 // INTERNAL INCLUDES

diff --git a/examples/clipping/clipping-example.cpp b/examples/clipping/clipping-example.cpp
index 6598b68dcd58f6ad89ad4cb030675e53424647e4..884bc1833d917b35e3e3fb2716c9afca83102042 100644 (file)
--- a/examples/clipping/clipping-example.cpp
+++ b/examples/clipping/clipping-example.cpp
@@ -19,8 +19,6 @@
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/devel-api/actors/actor-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 // INTERNAL INCLUDES
 #include "clipping-item-factory.h"
@@ -121,7 +119,7 @@ private:
     border.SetParentOrigin( ParentOrigin::CENTER );
     border.SetAnchorPoint( AnchorPoint::CENTER );
     border.SetProperty( Control::Property::BACKGROUND,
-                        Property::Map().Add( Visual::Property::TYPE, Visual::BORDER )
+                        Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
                                        .Add( BorderVisual::Property::COLOR, Color::WHITE )
                                        .Add( BorderVisual::Property::SIZE, 2.0f )
                                        .Add( BorderVisual::Property::ANTI_ALIASING, true ) );

diff --git a/examples/clipping/clipping-item-factory.cpp b/examples/clipping/clipping-item-factory.cpp
index 50ec810099fc8f0c3fc47594ac6e65202b54fba7..1233831e0cf9a48753ca46098ebdfe17d0c83367 100644 (file)
--- a/examples/clipping/clipping-item-factory.cpp
+++ b/examples/clipping/clipping-item-factory.cpp
@@ -112,7 +112,7 @@ Actor ClippingItemFactory::NewItem( unsigned int itemId )
   borderActor.SetSizeModeFactor( Vector3( 2.0f * ITEM_BORDER_SIZE, 2.0f * ITEM_BORDER_SIZE, 0.0f ) );
   borderActor.SetColorMode( USE_PARENT_COLOR );
   borderActor.SetProperty( ImageView::Property::IMAGE,
-                           Property::Map().Add( Visual::Property::TYPE, Visual::BORDER )
+                           Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
                                           .Add( BorderVisual::Property::COLOR, Color::WHITE )
                                           .Add( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE )
                                           .Add( BorderVisual::Property::ANTI_ALIASING, true ) );

diff --git a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
index 9363805fc7afb2fc822963ea2cdf6771635f180a..d53b8cf96e8780b8bbfc6dccc19e0e15acf9678b 100644 (file)
--- a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
+++ b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/dali.h>
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 // INTERNAL INCLUDES

diff --git a/examples/contact-cards/contact-card.cpp b/examples/contact-cards/contact-card.cpp
index eb89a6cb1a8c67e3bbe238bd8a83040528a9170a..61fd38ec4ec6095ff40046c233ad508b9a23bff9 100644 (file)
--- a/examples/contact-cards/contact-card.cpp
+++ b/examples/contact-cards/contact-card.cpp
@@ -104,7 +104,7 @@ ContactCard::ContactCard(
   // Create a control which will be used for the background and to clip the contents
   mContactCard = Control::New();
   mContactCard.SetProperty( Control::Property::BACKGROUND,
-                            Property::Map().Add( Visual::Property::TYPE, Visual::COLOR )
+                            Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
                                            .Add( ColorVisual::Property::MIX_COLOR, Color::WHITE ) );
   mContactCard.SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN );
   mContactCard.SetParentOrigin( ParentOrigin::TOP_LEFT );
@@ -117,7 +117,7 @@ ContactCard::ContactCard(
   mHeader = Control::New();
   mHeader.SetSize( mContactCardLayoutInfo.headerSize );
   mHeader.SetProperty( Control::Property::BACKGROUND,
-                       Property::Map().Add( Visual::Property::TYPE, Visual::COLOR )
+                       Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
                                       .Add( ColorVisual::Property::MIX_COLOR, HEADER_COLOR ) );
   mHeader.SetParentOrigin( ParentOrigin::TOP_LEFT );
   mHeader.SetAnchorPoint( AnchorPoint::TOP_LEFT );

diff --git a/examples/fpp-game/fpp-game-tutorial-controller.cpp b/examples/fpp-game/fpp-game-tutorial-controller.cpp
index 61af0c1ce8426a1b7db6cb2e020e279caf58fc1d..81419866ba6ab11148ebc21938daa815164f9b6d 100644 (file)
--- a/examples/fpp-game/fpp-game-tutorial-controller.cpp
+++ b/examples/fpp-game/fpp-game-tutorial-controller.cpp
@@ -115,7 +115,7 @@ void FppGameTutorialController::DisplayTutorial()
   mLeftLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
   mLeftLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) );
   mLeftLabel.SetProperty( Toolkit::Control::Property::BACKGROUND,
-                          Property::Map().Add( Visual::Property::TYPE, Visual::COLOR )
+                          Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
                                          .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.0, 0.0, 0.7, 0.2 ) ) );
   mLeftLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
   mLeftLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
@@ -128,7 +128,7 @@ void FppGameTutorialController::DisplayTutorial()
   mRightLabel.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
   mRightLabel.SetSize( Vector3( stageSize.x*0.5, stageSize.y, 1.0f ) );
   mRightLabel.SetProperty( Toolkit::Control::Property::BACKGROUND,
-                           Property::Map().Add( Visual::Property::TYPE, Visual::COLOR )
+                           Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
                                           .Add( ColorVisual::Property::MIX_COLOR, Vector4( 0.5, 0.0, 0.0, 0.2 ) ) );
   mRightLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Vector4( 1.0f, 1.0f, 1.0f, 1.0f ) ); // White.
   mRightLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );

diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp
index 9a92d2e46079ad217d82686eb6fa927b1f87583d..822caef0acf7b188992ef2b950254e1a33c591c2 100644 (file)
--- a/examples/gradients/gradients-example.cpp
+++ b/examples/gradients/gradients-example.cpp
@@ -78,7 +78,7 @@ public:
 
 // ---- Gradient for background
 
-    mGradientMap.Insert( Visual::Property::TYPE,  Visual::GRADIENT );
+    mGradientMap.Insert( Toolkit::Visual::Property::TYPE,  Visual::GRADIENT );
 
     Property::Array stopOffsets;
     stopOffsets.PushBack( 0.0f );

diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp
index c0cb012d168ab481a539b4b9013726660845d992..64ff1ad92b0371d427395cda701ff313ec5e25fc 100644 (file)
--- a/examples/homescreen-benchmark/homescreen-benchmark.cpp
+++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics 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,6 @@
 #include <iostream>
 
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 using namespace Dali;
 using Dali::Toolkit::TextLabel;
@@ -323,7 +321,7 @@ public:
           else
           {
             Property::Map map;
-            map.Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ).
+            map.Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ).
               Add( Toolkit::TextVisual::Property::TEXT, DEMO_APPS_NAMES[currentIconIndex] ).
               Add( Toolkit::TextVisual::Property::TEXT_COLOR, Color::WHITE ).
               Add( Toolkit::TextVisual::Property::POINT_SIZE, ( ( static_cast<float>( ROW_HEIGHT * LABEL_AREA ) * 72.0f )  / dpi.y ) * 0.25f ).

diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
index c6941b47f842217fa0cfffa02bdc8bd9a01f96b4..6219742371f36dd47a179aab680e195083959e53 100644 (file)
--- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
+++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
-#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 #include "shared/view.h"
 #include <iostream>
 

diff --git a/examples/image-view-url/image-view-url-example.cpp b/examples/image-view-url/image-view-url-example.cpp
index 2bd35183ce95a67131849b4878b0150baa8bc024..35229295febe2a043eacabdaaf27d66c3bbbb8b5 100644 (file)
--- a/examples/image-view-url/image-view-url-example.cpp
+++ b/examples/image-view-url/image-view-url-example.cpp
@@ -17,7 +17,6 @@
 
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/devel-api/image-loader/texture-manager.h>
 
 #include "shared/view.h"
@@ -116,7 +115,7 @@ private:
       Property::Map customShader;
       customShader[Toolkit::Visual::Shader::Property::FRAGMENT_SHADER] = FILTER_FRAGMENT_SOURCE;
       Property::Map visualMap;
-      visualMap.Insert(Toolkit::DevelVisual::Property::SHADER, customShader);
+      visualMap.Insert(Toolkit::Visual::Property::SHADER, customShader);
       mActorForInput.SetProperty(Toolkit::ImageView::Property::IMAGE, visualMap);
 
       mDeltaPropertyIndex = mActorForInput.RegisterProperty(DELTA_UNIFORM_NAME, 0.f);

diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index 9b13be3d7deb8b25132d3e790656b9c0e93b265b..c9f4e97f6afa994c94f8a91cc0060998e6a29a65 100644 (file)
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -879,7 +879,7 @@ public: // From ItemFactory
     borderActor.SetColorMode( USE_PARENT_COLOR );
 
     Property::Map borderProperty;
-    borderProperty.Insert( Visual::Property::TYPE, Visual::BORDER );
+    borderProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::BORDER );
     borderProperty.Insert( BorderVisual::Property::COLOR, Color::WHITE );
     borderProperty.Insert( BorderVisual::Property::SIZE, ITEM_BORDER_SIZE );
     borderProperty.Insert( BorderVisual::Property::ANTI_ALIASING, true );
@@ -903,7 +903,7 @@ public: // From ItemFactory
     checkbox.SetZ( 0.1f );
 
     Property::Map solidColorProperty;
-    solidColorProperty.Insert( Visual::Property::TYPE, Visual::COLOR );
+    solidColorProperty.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR );
     solidColorProperty.Insert( ColorVisual::Property::MIX_COLOR, Vector4(0.f, 0.f, 0.f, 0.6f) );
     checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty );
 

diff --git a/examples/line-mesh/line-mesh-example.cpp b/examples/line-mesh/line-mesh-example.cpp
index 922da415a2c0c8cb2a3db5b8df19a365a60e123e..e2cb540d4b880fd68ba6d16c91e2d044c2008c41 100644 (file)
--- a/examples/line-mesh/line-mesh-example.cpp
+++ b/examples/line-mesh/line-mesh-example.cpp
@@ -16,10 +16,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 
 // INTERNAL INCLUDES
 #include "shared/view.h"
@@ -246,7 +243,7 @@ public:
 
       radio.SetProperty( Toolkit::Button::Property::LABEL,
                                  Property::Map()
-                                  .Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT )
+                                  .Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT )
                                   .Add( Toolkit::TextVisual::Property::TEXT, labels[i] )
                                   .Add( Toolkit::TextVisual::Property::TEXT_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) )
                                );

diff --git a/examples/mesh-morph/mesh-morph-example.cpp b/examples/mesh-morph/mesh-morph-example.cpp
index 7b591464b54e8ae7b88fc01b75efc5022279f2d8..ebf3654aae67bd2a03e90f8e2a79c599a8877c32 100644 (file)
--- a/examples/mesh-morph/mesh-morph-example.cpp
+++ b/examples/mesh-morph/mesh-morph-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics 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,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 // INTERNAL INCLUDES

diff --git a/examples/mesh-sorting/mesh-sorting-example.cpp b/examples/mesh-sorting/mesh-sorting-example.cpp
index 0b94968bbb95812199693d1523b2e94b03ce5102..35300d5ebcb0be314093d29c00e0d294d3ceaaf1 100644 (file)
--- a/examples/mesh-sorting/mesh-sorting-example.cpp
+++ b/examples/mesh-sorting/mesh-sorting-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics 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,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <stdio.h>
 #include <sstream>

diff --git a/examples/mesh-visual/mesh-visual-example.cpp b/examples/mesh-visual/mesh-visual-example.cpp
index 4b9fb23247be49d58decd70ee28a51a377080e37..682c243528f1b98592234a4b893dbdd939005fdf 100644 (file)
--- a/examples/mesh-visual/mesh-visual-example.cpp
+++ b/examples/mesh-visual/mesh-visual-example.cpp
@@ -1,7 +1,4 @@
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/public-api/object/property-map.h>
-#include <dali-toolkit/devel-api/align-enums.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -312,7 +309,7 @@ public:
     }
 
     Property::Map lightMap;
-    lightMap.Insert( Visual::Property::TYPE, Visual::IMAGE );
+    lightMap.Insert( Toolkit::Visual::Property::TYPE, Visual::IMAGE );
     lightMap.Insert( ImageVisual::Property::URL, imageUrl );
     mLightSource.SetProperty( Control::Property::BACKGROUND, Property::Value( lightMap ) );
   }
@@ -322,10 +319,10 @@ public:
   {
     //Create mesh property map
     Property::Map map;
-    map.Insert( Visual::Property::TYPE,  Visual::MESH );
-    map.Insert( DevelVisual::Property::TRANSFORM,
-                Property::Map().Add( DevelVisual::Transform::Property::ORIGIN, Align::CENTER )
-                               .Add( DevelVisual::Transform::Property::ANCHOR_POINT, Align::CENTER ) );
+    map.Insert( Toolkit::Visual::Property::TYPE,  Visual::MESH );
+    map.Insert( Visual::Property::TRANSFORM,
+                Property::Map().Add( Visual::Transform::Property::ORIGIN, Align::CENTER )
+                               .Add( Visual::Transform::Property::ANCHOR_POINT, Align::CENTER ) );
     map.Insert( MeshVisual::Property::OBJECT_URL, MODEL_FILE_TABLE[mModelIndex] );
     map.Insert( MeshVisual::Property::MATERIAL_URL, MATERIAL_FILE_TABLE[mModelIndex] );
     map.Insert( MeshVisual::Property::TEXTURES_PATH, TEXTURES_PATH );

diff --git a/examples/native-image-source/native-image-source-example.cpp b/examples/native-image-source/native-image-source-example.cpp
index 267452a6fe82b199140144383d942c27fbe7724e..35d08fcc5746f9e22924a07ed7fbb1a6015d6a70 100644 (file)
--- a/examples/native-image-source/native-image-source-example.cpp
+++ b/examples/native-image-source/native-image-source-example.cpp
@@ -18,8 +18,6 @@
 // EXTERNAL INCLUDES
 #include <dali/dali.h>
 #include <dali/devel-api/images/native-image-interface-extension.h>
-#include <dali/public-api/rendering/renderer.h>
-#include <dali/public-api/rendering/frame-buffer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <cstring>
 

diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp
index 3bfdda5b069e509d3eb3e91b960162aa36b63183..9283dce671a83362e32e7c28b9a6df451704d36f 100644 (file)
--- a/examples/perf-scroll/perf-scroll.cpp
+++ b/examples/perf-scroll/perf-scroll.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  *
  */
 
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 #include "shared/utility.h"

diff --git a/examples/point-mesh/point-mesh-example.cpp b/examples/point-mesh/point-mesh-example.cpp
index 86e2d7172b0b21939a2237e009da72333c536533..747f07f3b6469588e1027b03e7f80a562f3c5f42 100644 (file)
--- a/examples/point-mesh/point-mesh-example.cpp
+++ b/examples/point-mesh/point-mesh-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics 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,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 // INTERNAL INCLUDES

diff --git a/examples/primitive-shapes/primitive-shapes-example.cpp b/examples/primitive-shapes/primitive-shapes-example.cpp
index cce4f3c1fdc61486f0ddb77cdb2a46d9cd42c856..8f437226d25d5a1d051fdbb6fc3451711ecc58d3 100644 (file)
--- a/examples/primitive-shapes/primitive-shapes-example.cpp
+++ b/examples/primitive-shapes/primitive-shapes-example.cpp
@@ -16,11 +16,7 @@
  */
 
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/public-api/object/property-map.h>
-#include <dali-toolkit/devel-api/align-enums.h>
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/controls/slider/slider.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -355,11 +351,11 @@ public:
 
     //Visual map for model
     mVisualMap.Clear();
-    mVisualMap[ Visual::Property::TYPE           ] = Visual::PRIMITIVE;
+    mVisualMap[ Toolkit::Visual::Property::TYPE           ] = Visual::PRIMITIVE;
     mVisualMap[ PrimitiveVisual::Property::MIX_COLOR ] = mColor;
-    mVisualMap[ DevelVisual::Property::TRANSFORM ] =
-        Property::Map().Add( DevelVisual::Transform::Property::ORIGIN, Align::CENTER )
-                       .Add( DevelVisual::Transform::Property::ANCHOR_POINT, Align::CENTER );
+    mVisualMap[ Visual::Property::TRANSFORM ] =
+        Property::Map().Add( Visual::Transform::Property::ORIGIN, Align::CENTER )
+                       .Add( Visual::Transform::Property::ANCHOR_POINT, Align::CENTER );
   }
 
   //Sets the 3D model to a sphere and modifies the sliders appropriately.

diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp
index 4150ac83efc5c8cc1c91a784f187967ef1646fc8..f713ee9a45829046cb573acfa180826df3bc6ed0 100644 (file)
--- a/examples/refraction-effect/refraction-effect-example.cpp
+++ b/examples/refraction-effect/refraction-effect-example.cpp
@@ -17,7 +17,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/dali.h>
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
 

diff --git a/examples/simple-visuals-control/my-control-impl.cpp b/examples/simple-visuals-control/my-control-impl.cpp
index 9a2aa5117514d947b92a43528d647147865250db..b297aeaa5082c4a83ea1030db159ec7585b2b40e 100644 (file)
--- a/examples/simple-visuals-control/my-control-impl.cpp
+++ b/examples/simple-visuals-control/my-control-impl.cpp
@@ -20,12 +20,10 @@
 
 // EXTERNAL INCLUDES
 
-#include <dali/public-api/object/type-registry-helper.h>
 #include <dali/devel-api/scripting/enum-helper.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 
 using namespace Dali;

diff --git a/examples/simple-visuals-control/simple-visuals-application.cpp b/examples/simple-visuals-control/simple-visuals-application.cpp
index a698f170dddc97e1a30a37aa1521cd43098432e6..2b9d93ccf03329cc606da52eb887fde49c668670 100644 (file)
--- a/examples/simple-visuals-control/simple-visuals-application.cpp
+++ b/examples/simple-visuals-control/simple-visuals-application.cpp
@@ -19,8 +19,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <cstdio>

diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp
index b0d9dbb2e1387eb2de02498632df6f3d2a91c7ba..155e145c71f1488841bb5b75d51675fc05f25050 100644 (file)
--- a/examples/styling/image-channel-control-impl.cpp
+++ b/examples/styling/image-channel-control-impl.cpp
@@ -16,14 +16,12 @@
 
 #include "image-channel-control-impl.h"
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/public-api/object/type-registry-helper.h>
-#include <dali-toolkit/devel-api/align-enums.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
 #include <cstdio>
 
+
 using namespace Dali; // Needed for macros
 
 namespace Demo
@@ -182,12 +180,12 @@ void ImageChannelControl::OnSizeSet( const Vector3& targetSize )
     Vector2 size( targetSize );
     Property::Map transformMap;
     transformMap
-      .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
-      .Add( Toolkit::DevelVisual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
-      .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
-      .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
-      .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::DevelVisual::Transform::Policy::RELATIVE, Toolkit::DevelVisual::Transform::Policy::RELATIVE ) )
-      .Add( Toolkit::DevelVisual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::DevelVisual::Transform::Policy::RELATIVE, Toolkit::DevelVisual::Transform::Policy::RELATIVE ) );
+      .Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) )
+      .Add( Toolkit::Visual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) )
+      .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::CENTER )
+      .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER )
+      .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) )
+      .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY, Vector2( Toolkit::Visual::Transform::Policy::RELATIVE, Toolkit::Visual::Transform::Policy::RELATIVE ) );
 
     mVisual.SetTransformAndSize( transformMap, size );
   }

diff --git a/examples/styling/styling-application.cpp b/examples/styling/styling-application.cpp
index 2a4d7b613d0cc689a66d94bf86b889197d0157e1..ff8875075f5dfa7ee681dd39b9334a22dc3b6f23 100644 (file)
--- a/examples/styling/styling-application.cpp
+++ b/examples/styling/styling-application.cpp
@@ -25,8 +25,6 @@
 // External includes
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 #include "image-channel-control.h"
 #include <cstdio>
 #include <sstream>

diff --git a/examples/text-editor/text-editor-example.cpp b/examples/text-editor/text-editor-example.cpp
index 44b08c879658c108495327277b938c2032cbe24e..866bdeddbf67f19fdf6a3dbcd5fa9912f0acbf2a 100644 (file)
--- a/examples/text-editor/text-editor-example.cpp
+++ b/examples/text-editor/text-editor-example.cpp
@@ -130,7 +130,7 @@ public:
     // Add border to highlight harder-to-see colors.
     // We use a color rather than border visual as the container will always be behind the button.
     Property::Map colorMap;
-    colorMap.Insert( Visual::Property::TYPE, Visual::COLOR);
+    colorMap.Insert( Toolkit::Visual::Property::TYPE, Visual::COLOR);
     colorMap.Insert( ColorVisual::Property::MIX_COLOR, Color::BLACK );
     mColorContainer.SetProperty( Control::Property::BACKGROUND, colorMap );
 
@@ -276,7 +276,7 @@ public:
   void SetButtonColor( Button& button, const Vector4& color )
   {
     Property::Map colorVisualMap;
-    colorVisualMap.Add( Visual::Property::TYPE, Visual::COLOR )
+    colorVisualMap.Add( Toolkit::Visual::Property::TYPE, Visual::COLOR )
                   .Add( ColorVisual::Property::MIX_COLOR, color );
 
     button.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, colorVisualMap );

diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp
index 94626574280f82a2476fb53f86105e141d9255d5..36fd1db91437eb0dbfb9f274820638c09d51c6fc 100644 (file)
--- a/examples/text-field/text-field-example.cpp
+++ b/examples/text-field/text-field-example.cpp
@@ -25,7 +25,6 @@
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
 #include <iostream>
-#include <dali/public-api/events/touch-point.h>
 
 // INTERNAL INCLUDES
 #include "shared/multi-language-strings.h"

diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp
index d3218a69c52a91e6a00c3353840744af80b39b05..ada8b1c5efe6a87099dda65852f1a88dd955298f 100644 (file)
--- a/examples/text-label/text-label-example.cpp
+++ b/examples/text-label/text-label-example.cpp
@@ -231,7 +231,7 @@ public:
     mBorder.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::HEIGHT );
 
     Dali::Property::Map border;
-    border.Insert( Visual::Property::TYPE,  Visual::BORDER );
+    border.Insert( Toolkit::Visual::Property::TYPE,  Visual::BORDER );
     border.Insert( BorderVisual::Property::COLOR,  Color::WHITE );
     border.Insert( BorderVisual::Property::SIZE,  2.f );
     mBorder.SetProperty( Control::Property::BACKGROUND, border );
@@ -343,7 +343,7 @@ public:
       mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, propertyMap );
 
       mColorButtons[index].SetProperty( Toolkit::DevelButton::Property::SELECTED_VISUAL,
-                          Property::Map().Add( Visual::Property::TYPE, Visual::BORDER )
+                          Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::BORDER )
                                          .Add( BorderVisual::Property::COLOR, Color::WHITE )
                                          .Add( BorderVisual::Property::SIZE, 2.0f )
                                          .Add( BorderVisual::Property::ANTI_ALIASING, true ) );

diff --git a/examples/text-scrolling/text-scrolling-example.cpp b/examples/text-scrolling/text-scrolling-example.cpp
index 872f2890f73123d7fe95f85aa724d0b72bf2d600..2db7033f589d212d169369b05b0276687541010e 100644 (file)
--- a/examples/text-scrolling/text-scrolling-example.cpp
+++ b/examples/text-scrolling/text-scrolling-example.cpp
@@ -87,7 +87,7 @@ public:
     parent.Add( box );
 
     Dali::Property::Map border;
-    border.Insert( Visual::Property::TYPE,  Visual::BORDER );
+    border.Insert( Toolkit::Visual::Property::TYPE,  Visual::BORDER );
     border.Insert( BorderVisual::Property::COLOR,  Color::BLUE );
     border.Insert( BorderVisual::Property::SIZE,  1.f );
     box.SetProperty( Control::Property::BACKGROUND, border );
@@ -209,8 +209,8 @@ public:
 
     Toolkit::PushButton colorButton = Toolkit::PushButton::New();
     colorButton.SetProperty( Button::Property::TOGGLABLE, true );
-    colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );
-    colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) );
+    colorButton.SetProperty( DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::RED ) );
+    colorButton.SetProperty( DevelButton::Property::SELECTED_BACKGROUND_VISUAL, Property::Map().Add ( Toolkit::Visual::Property::TYPE, Visual::COLOR ).Add( ColorVisual::Property::MIX_COLOR, Color::BLACK ) );
     colorButton.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
     colorButton.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
     colorButton.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );

diff --git a/examples/textured-mesh/textured-mesh-example.cpp b/examples/textured-mesh/textured-mesh-example.cpp
index 288e880a1a8201087b9d3a4012753c6ef07a99e4..510e34d505a9c91699380e1ba8578a351dfcf73c 100644 (file)
--- a/examples/textured-mesh/textured-mesh-example.cpp
+++ b/examples/textured-mesh/textured-mesh-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics 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,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 // INTERNAL INCLUDES

diff --git a/examples/tooltip/tooltip-example.cpp b/examples/tooltip/tooltip-example.cpp
index 3af4e11cd50a70c76d1150429e02a65325b354b4..885c55efd301acf2fd8a2de073cd1045d306575f 100644 (file)
--- a/examples/tooltip/tooltip-example.cpp
+++ b/examples/tooltip/tooltip-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -97,9 +95,9 @@ private:
     Layout( customFromCode, stageSize );
     customFromCode.SetProperty( DevelControl::Property::TOOLTIP,
                                 Property::Map().Add( Tooltip::Property::CONTENT,
-                                                     Property::Array().Add( Property::Map().Add( Visual::Property::TYPE, Visual::IMAGE )
+                                                     Property::Array().Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::IMAGE )
                                                                                            .Add( ImageVisual::Property::URL, DEMO_IMAGE_DIR "Logo-for-demo.png" ) )
-                                                                      .Add( Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
+                                                                      .Add( Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
                                                                                            .Add( TextVisual::Property::TEXT_COLOR, Color::WHITE )
                                                                                            .Add( TextVisual::Property::TEXT, "Custom coded style\nat hover point" )
                                                                                            .Add( TextVisual::Property::MULTI_LINE, true )
@@ -140,7 +138,7 @@ private:
     if( control )
     {
       control.SetProperty( Button::Property::LABEL,
-                           Property::Map().Add( Visual::Property::TYPE, DevelVisual::TEXT )
+                           Property::Map().Add( Toolkit::Visual::Property::TYPE, Visual::TEXT )
                                           .Add( TextVisual::Property::TEXT, label ) );
     }
   }

diff --git a/examples/transitions/shadow-button-impl.cpp b/examples/transitions/shadow-button-impl.cpp
index 135ea16bfc3bc76a286e677be367cc876bdc7c1f..4273bccde52d86b8afd386cb1a85ae558586a46b 100644 (file)
--- a/examples/transitions/shadow-button-impl.cpp
+++ b/examples/transitions/shadow-button-impl.cpp
@@ -16,11 +16,8 @@
 
 #include "shadow-button-impl.h"
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/public-api/object/type-registry-helper.h>
 #include <dali/devel-api/scripting/enum-helper.h>
-#include <dali-toolkit/devel-api/align-enums.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 
 #include <cstdio>
@@ -374,7 +371,7 @@ void ShadowButton::ResetVisual(
     }
 
     // Extract transform maps out of the visual definition and store them
-    Property::Value* value = map->Find( DevelVisual::Property::TRANSFORM, "transform");
+    Property::Value* value = map->Find( Visual::Property::TRANSFORM, "transform");
     if( value )
     {
       Property::Map* transformMap = value->GetMap();

diff --git a/examples/transitions/transition-application.cpp b/examples/transitions/transition-application.cpp
index d3acd9831e9b5cc6fb46a73a305b5164f96be042..d2697d5ef04113cefe7d2d760ed0ea26587acfdd 100644 (file)
--- a/examples/transitions/transition-application.cpp
+++ b/examples/transitions/transition-application.cpp
@@ -25,8 +25,6 @@
 // External includes
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 #include "shadow-button.h"
 #include <cstdio>
 #include <sstream>

diff --git a/examples/visual-transitions/beat-control-impl.cpp b/examples/visual-transitions/beat-control-impl.cpp
index 54ae6b0dc11b89b8966fde6abd2e288aafd31c52..dc889857c7da42fbf8d5f200e5add161f210c9fc 100644 (file)
--- a/examples/visual-transitions/beat-control-impl.cpp
+++ b/examples/visual-transitions/beat-control-impl.cpp
@@ -16,10 +16,8 @@
 
 #include "beat-control-impl.h"
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali/public-api/object/type-registry-helper.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
 using namespace Dali; // Needed for macros
 using namespace Dali::Toolkit;
@@ -212,9 +210,9 @@ void BeatControl::RelayoutVisuals( const Vector2& targetSize )
       Property::Map transformMap;
       // Make the visual half the size of the control, but leave
       // origin and anchor point at center, position is relative, but Zer0
-      transformMap[ DevelVisual::Transform::Property::SIZE ] = mTransformSize;
-      transformMap[ DevelVisual::Transform::Property::ORIGIN ] = mTransformOrigin;
-      transformMap[ DevelVisual::Transform::Property::ANCHOR_POINT ] = mTransformAnchorPoint;
+      transformMap[ Visual::Transform::Property::SIZE ] = mTransformSize;
+      transformMap[ Visual::Transform::Property::ORIGIN ] = mTransformOrigin;
+      transformMap[ Visual::Transform::Property::ANCHOR_POINT ] = mTransformAnchorPoint;
       mVisual.SetTransformAndSize( transformMap, size );
     }
   }
@@ -262,7 +260,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
         Property::Map* map = value.GetMap();
         if( map )
         {
-          Property::Value* value = map->Find( DevelVisual::Property::TRANSFORM, "transform" );
+          Property::Value* value = map->Find( Visual::Property::TRANSFORM, "transform" );
           if( value )
           {
             Property::Map* transformMap = value->GetMap();
@@ -272,14 +270,14 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
               // If there are more properties in the transform map, then we need to create a new visual
               unsigned int sizeAndPositionPropertyCount = 0;
 
-              Property::Value* sizeValue = transformMap->Find( DevelVisual::Transform::Property::SIZE, "size" );
+              Property::Value* sizeValue = transformMap->Find( Visual::Transform::Property::SIZE, "size" );
               if( sizeValue )
               {
                 sizeValue->Get( impl.mTransformSize );
                 ++sizeAndPositionPropertyCount;
               }
 
-              Property::Value* originValue = transformMap->Find( DevelVisual::Transform::Property::ORIGIN, "origin" );
+              Property::Value* originValue = transformMap->Find( Visual::Transform::Property::ORIGIN, "origin" );
               if( originValue )
               {
                 int intValue = 0;
@@ -290,7 +288,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
                 }
               }
 
-              Property::Value* anchorPointValue = transformMap->Find( DevelVisual::Transform::Property::ANCHOR_POINT, "anchorPoint" );
+              Property::Value* anchorPointValue = transformMap->Find( Visual::Transform::Property::ANCHOR_POINT, "anchorPoint" );
               if( anchorPointValue )
               {
                 int intValue = 0;

diff --git a/examples/visual-transitions/beat-control-impl.h b/examples/visual-transitions/beat-control-impl.h
index 7e77def1cee6dfb1f19fbe63ed13072f4f3a2dd7..95596a318daf3e749be6f48c2617384916c39c77 100644 (file)
--- a/examples/visual-transitions/beat-control-impl.h
+++ b/examples/visual-transitions/beat-control-impl.h
@@ -20,9 +20,9 @@
 #include "beat-control.h"
 #include <dali/public-api/animation/animation.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/devel-api/align-enums.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-base.h>
 #include <dali-toolkit/devel-api/visual-factory/transition-data.h>
+#include <dali-toolkit/public-api/align-enumerations.h>
 
 namespace Demo
 {

diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp
index 87a69d57ebc300d3cef2cabae89d9813f2e020eb..5192396850fccb14e620a9b59b48a3fa6e603d12 100644 (file)
--- a/examples/visual-transitions/transition-application.cpp
+++ b/examples/visual-transitions/transition-application.cpp
@@ -24,8 +24,6 @@
 
 // External includes
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
 #include "beat-control.h"
 #include <cstdio>
 #include <sstream>
@@ -101,8 +99,8 @@ void TransitionApplication::Create( Application& application )
   mBeatControl = BeatControl::New();
   mBeatControl.SetName("BeatControl");
   mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, Property::Map()
-                            .Add( DevelVisual::Property::TRANSFORM, Property::Map()
-                                  .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
+                            .Add( Visual::Property::TRANSFORM, Property::Map()
+                                  .Add( Visual::Transform::Property::SIZE, Vector2(0.5f, 0.5f) ) ) );
 
   mBeatControl.SetAnchorPoint( AnchorPoint::CENTER );
   mBeatControl.SetParentOrigin( ParentOrigin::CENTER );
@@ -123,8 +121,8 @@ void TransitionApplication::Create( Application& application )
   {
     Property::Map map;
     CreateVisualMap( i, map );
-    map.Add( DevelVisual::Property::TRANSFORM, Property::Map()
-             .Add( DevelVisual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) )  );
+    map.Add( Visual::Property::TRANSFORM, Property::Map()
+             .Add( Visual::Transform::Property::SIZE, Vector2(0.8f, 0.8f) )  );
     mVisualButtons[i] = BeatControl::New();
     mVisualButtons[i].SetProperty( BeatControl::Property::BEAT_VISUAL, map );
     mVisualButtons[i].SetName("VisualButton");
@@ -176,20 +174,20 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
   {
     case 0:
     {
-      map[ Visual::Property::TYPE ] = Visual::COLOR;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
       map[ ColorVisual::Property::MIX_COLOR ] = Color::YELLOW;
       break;
     }
     case 1:
     {
-      map[ Visual::Property::TYPE ] = Visual::BORDER;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::BORDER;
       map[ BorderVisual::Property::COLOR ] = Color::GREEN;
       map[ BorderVisual::Property::SIZE ] = 5;
       break;
     }
     case 2:
     {
-      map[ Visual::Property::TYPE ] = Visual::GRADIENT;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::GRADIENT;
 
       Property::Array stopOffsets;
       stopOffsets.PushBack( 0.0f );
@@ -212,21 +210,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
     }
     case 3:
     {
-      map[ Visual::Property::TYPE ] = Visual::IMAGE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
       map[ ImageVisual::Property::URL ] = DALI_LOGO_PATH;
       break;
     }
     case 4:
     {
-      map[ Visual::Property::TYPE ] = Visual::IMAGE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
       map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "preMultAlpha.png";
-      map[ DevelVisual::Property::PREMULTIPLIED_ALPHA ] = true;
+      map[ Visual::Property::PREMULTIPLIED_ALPHA ] = true;
       break;
     }
 
     case 5:
     {
-      map[ Visual::Property::TYPE ] = Visual::MESH;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::MESH;
       map[ MeshVisual::Property::OBJECT_URL ] = DALI_ROBOT_MODEL_PATH;
       map[ MeshVisual::Property::MATERIAL_URL ] = DALI_ROBOT_MATERIAL_PATH;
       map[ MeshVisual::Property::TEXTURES_PATH ] = DEMO_IMAGE_DIR;
@@ -236,7 +234,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
 
     case 6:
     {
-      map[ Visual::Property::TYPE ] = Visual::PRIMITIVE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::PRIMITIVE;
 
       map[ PrimitiveVisual::Property::SHAPE ] = PrimitiveVisual::Shape::BEVELLED_CUBE;
       map[ PrimitiveVisual::Property::BEVEL_PERCENTAGE ] = 0.3f;
@@ -250,21 +248,21 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
     case 7:
     {
       // NPatch
-      map[ Visual::Property::TYPE ] = Visual::IMAGE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
       map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "button-up-16.9.png";
       break;
     }
     case 8:
     {
       // SVG
-      map[ Visual::Property::TYPE ] = Visual::IMAGE;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::IMAGE;
       map[ ImageVisual::Property::URL ] = DEMO_IMAGE_DIR "Kid1.svg";
       break;
     }
 
     case 9:
     {
-      map[ Visual::Property::TYPE ] = DevelVisual::TEXT;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::TEXT;
       map[ TextVisual::Property::TEXT ] = "Text";
       map[ TextVisual::Property::TEXT_COLOR ] = Color::CYAN;
       map[ TextVisual::Property::POINT_SIZE ] = 10;
@@ -273,7 +271,7 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map )
 
     default:
     {
-      map[ Visual::Property::TYPE ] = Visual::COLOR;
+      map[ Toolkit::Visual::Property::TYPE ] = Visual::COLOR;
       map[ ColorVisual::Property::MIX_COLOR ] = Color::MAGENTA;
       break;
     }
@@ -287,8 +285,8 @@ bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData&
     int visual = actor.GetProperty<int>( mVisualIndex );
     Property::Map map;
     CreateVisualMap( visual, map );
-    map.Add( DevelVisual::Property::TRANSFORM, Property::Map()
-             .Add( DevelVisual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
+    map.Add( Visual::Property::TRANSFORM, Property::Map()
+             .Add( Visual::Transform::Property::SIZE, Vector2( 0.5f, 0.5f ) ) );
     mBeatControl.SetProperty( BeatControl::Property::BEAT_VISUAL, map );
   }
   return true;

diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index cae9fb1da2b69178091f7d6d31d15c76b77a6dc9..84737d0ec7a352be8fff52cdf214b19cb72505a1 100644 (file)
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -753,7 +753,7 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count )
     Dali::Property::Map effect = Toolkit::CreateDistanceFieldEffect();
     Property::Map imageMap;
     imageMap.Add( ImageVisual::Property::URL, SHAPE_IMAGE_TABLE[ shapeType ] );
-    imageMap.Add( Visual::Property::SHADER, effect );
+    imageMap.Add( Toolkit::Visual::Property::SHADER, effect );
     dfActor.SetProperty( Toolkit::ImageView::Property::IMAGE, imageMap );
 
     dfActor.SetColor( BUBBLE_COLOR[ i%NUMBER_OF_BUBBLE_COLOR ] );