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

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

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h
index f8ceabf..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,40 +61,38 @@ 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
   {

+    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;
     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 );

   };
 
   Renderer      mRenderer;
   CustomShader* mCustomShader;
   std::string   mName;
   Transform     mTransform;
   };
 
   Renderer      mRenderer;
   CustomShader* mCustomShader;
   std::string   mName;
   Transform     mTransform;

-  Vector2       mSize;
+  Size          mControlSize;

   float         mDepthIndex;
   int           mFlags;
   float         mDepthIndex;
   int           mFlags;

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

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