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

Change-Id: I880471c51512fd36e947f9037e2924dc244f9872

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index 2f8cae6..489dfb6 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@ -198,20 +198,20 @@ void Internal::Visual::Base::Impl::CustomShader::CreatePropertyMap( Property::Ma
 }
 
 Internal::Visual::Base::Impl::Transform::Transform()
 }
 
 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
 {
 }
 
 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;
 
   mOrigin = Toolkit::Align::CENTER;
   mAnchorPoint = Toolkit::Align::CENTER;
 

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h
index e631f43..098ad1e 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h
@@ -40,6 +40,16 @@ namespace Visual
 
 struct Base::Impl
 {
 
 struct Base::Impl
 {

+  /**
+   * Constructor
+   */
+  Impl();
+
+  /**
+   * Destructor
+   */
+  ~Impl();
+

   enum Flags
   {
     IS_ON_STAGE = 1,
   enum Flags
   {
     IS_ON_STAGE = 1,


@@ -51,29 +61,29 @@ struct Base::Impl
 
   struct CustomShader
   {
 
   struct CustomShader
   {

+    CustomShader( const Property::Map& map );
+    void SetPropertyMap( const Property::Map& map );
+    void CreatePropertyMap( Property::Map& map ) const;
+

     std::string mVertexShader;
     std::string mFragmentShader;
     Dali::ImageDimensions mGridSize;
     Dali::Shader::Hint::Value mHints; //(bitfield) values from enum Shader::Hint
     std::string mVertexShader;
     std::string mFragmentShader;
     Dali::ImageDimensions mGridSize;
     Dali::Shader::Hint::Value mHints; //(bitfield) values from enum Shader::Hint

-
-    CustomShader( const Property::Map& map );
-    void SetPropertyMap( const Property::Map& map );
-    void CreatePropertyMap( Property::Map& map ) const;

   };
 
   struct Transform
   {
   };
 
   struct Transform
   {

-    Vector2 mOffset;
-    Vector2 mSize;
-    Vector4 mOffsetSizeMode;
-    Toolkit::Align::Type mOrigin;
-    Toolkit::Align::Type mAnchorPoint;
-

     Transform();
     void SetPropertyMap( const Property::Map& map );
     void GetPropertyMap( Property::Map& map ) const;
     void RegisterUniforms( Renderer renderer, Toolkit::Direction::Type direction );
     Vector2 GetVisualSize( const Vector2& controlSize );
     Transform();
     void SetPropertyMap( const Property::Map& map );
     void GetPropertyMap( Property::Map& map ) const;
     void RegisterUniforms( Renderer renderer, Toolkit::Direction::Type direction );
     Vector2 GetVisualSize( const Vector2& controlSize );

+
+    Vector2 mOffset;
+    Vector2 mSize;
+    Vector4 mOffsetSizeMode;
+    Toolkit::Align::Type mOrigin;
+    Toolkit::Align::Type mAnchorPoint;

   };
 
   Renderer      mRenderer;
   };
 
   Renderer      mRenderer;


@@ -83,9 +93,6 @@ struct Base::Impl
   Size          mControlSize;
   float         mDepthIndex;
   int           mFlags;
   Size          mControlSize;
   float         mDepthIndex;
   int           mFlags;

-
-  Impl();
-  ~Impl();

 };
 
 } // namespace Visual
 };
 
 } // namespace Visual