[dali_1.4.16] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / layouting / grid-impl.h

diff --git a/dali-toolkit/internal/layouting/grid-impl.h b/dali-toolkit/internal/layouting/grid-impl.h
index 6afb3f5..264f11d 100644 (file)
--- a/dali-toolkit/internal/layouting/grid-impl.h
+++ b/dali-toolkit/internal/layouting/grid-impl.h
@@ -93,7 +93,7 @@ private:
    * For the given availableSpace, calculate or retreive the number of required columns.
    * @param[in] availableSpace the space available for a child in each column.
    */
-  void DetermineNumberOfColumns( int availableSpace );
+  void DetermineNumberOfColumns( LayoutLength availableSpace );
 
 private:
 
@@ -107,12 +107,8 @@ private:
   int mNumColumns;
   int mNumRows;
 
-  int mHorizontalSpacing = 0;
-  int mVerticalSpacing = 0;
-  int mRequestedHorizontalSpacing;
   int mRequestedColumnWidth;
   int mRequestedNumColumns;
-  int mRequestedNumRows;
 };
 
 } // namespace Internal
@@ -134,4 +130,4 @@ inline const Internal::Grid& GetImplementation( const Dali::Toolkit::Grid& handl
 } // namespace Toolkit
 } // namespace Dali
 
-#endif // DALI_TOOLKIT_INTERNAL_LAYOUTINGInner
\ No newline at end of file
+#endif // DALI_TOOLKIT_INTERNAL_LAYOUTINGInner