Fix code to match correct style, i.e. methods first

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-base-data-impl.cpp

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index 158c432..489dfb6 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@ -25,7 +25,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/devel-api/visual-factory/devel-visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
 
 namespace Dali
@@ -193,40 +193,40 @@ void Internal::Visual::Base::Impl::CustomShader::CreatePropertyMap( Property::Ma
       customShader.Insert( Toolkit::Visual::Shader::Property::HINTS, static_cast< int >( mHints ) );
     }
 
-    map.Insert( Toolkit::VisualProperty::SHADER, customShader );
+    map.Insert( Toolkit::DevelVisual::Property::SHADER, customShader );
   }
 }
 
 Internal::Visual::Base::Impl::Transform::Transform()
-: mOffset(0.0f,0.0f),
-  mSize(1.0f,1.0f),
-  mOffsetSizeMode(0.0f,0.0f,0.0f,0.0f),
-  mOrigin(Toolkit::Align::CENTER),
-  mAnchorPoint(Toolkit::Align::CENTER)
+: mOffset( 0.0f,0.0f ),
+  mSize( 1.0f,1.0f ),
+  mOffsetSizeMode( 0.0f,0.0f,0.0f,0.0f ),
+  mOrigin( Toolkit::Align::CENTER ),
+  mAnchorPoint( Toolkit::Align::CENTER )
 {
 }
 
 void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Map& map )
 {
   //Set default values
-  mOffset = Vector2(0.0f,0.0f);
-  mSize = Vector2(1.0f,1.0f);
-  mOffsetSizeMode = Vector4(0.0f,0.0f,0.0f,0.0f);
+  mOffset = Vector2( 0.0f,0.0f );
+  mSize = Vector2( 1.0f,1.0f );
+  mOffsetSizeMode = Vector4( 0.0f,0.0f,0.0f,0.0f );
   mOrigin = Toolkit::Align::CENTER;
   mAnchorPoint = Toolkit::Align::CENTER;
 
   for( Property::Map::SizeType i(0); i<map.Count(); ++i )
   {
     KeyValuePair keyValue = map.GetKeyValue( i );
-    if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::OFFSET )
+    if( keyValue.first == Toolkit::DevelVisual::Transform::Property::OFFSET )
     {
       keyValue.second.Get( mOffset );
     }
-    else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::SIZE )
+    else if( keyValue.first == Toolkit::DevelVisual::Transform::Property::SIZE )
     {
       keyValue.second.Get( mSize );
     }
-    else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN )
+    else if( keyValue.first == Toolkit::DevelVisual::Transform::Property::ORIGIN )
     {
       Toolkit::Align::Type align(Toolkit::Align::CENTER);
       if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
@@ -234,7 +234,7 @@ void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
         mOrigin = align;
       }
     }
-    else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT )
+    else if( keyValue.first == Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT )
     {
       Toolkit::Align::Type align(Toolkit::Align::CENTER);
       if( Scripting::GetEnumerationProperty< Toolkit::Align::Type >( keyValue.second, ALIGN_TABLE, ALIGN_TABLE_COUNT, align ) )
@@ -242,7 +242,7 @@ void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
         mAnchorPoint = align;
       }
     }
-    else if( keyValue.first == Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE )
+    else if( keyValue.first == Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE )
     {
       keyValue.second.Get( mOffsetSizeMode );
     }
@@ -252,11 +252,11 @@ void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
 void Internal::Visual::Base::Impl::Transform::GetPropertyMap( Property::Map& map ) const
 {
   map.Clear();
-  map.Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, mOffset )
-     .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, mSize )
-     .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, mOrigin )
-     .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, mAnchorPoint )
-     .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, mOffsetSizeMode );
+  map.Add( Toolkit::DevelVisual::Transform::Property::OFFSET, mOffset )
+     .Add( Toolkit::DevelVisual::Transform::Property::SIZE, mSize )
+     .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, mOrigin )
+     .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, mAnchorPoint )
+     .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, mOffsetSizeMode );
 }
 
 void Internal::Visual::Base::Impl::Transform::RegisterUniforms( Dali::Renderer renderer, Toolkit::Direction::Type direction )