X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fitem-view%2Fgrid-layout.h;h=92ca3c9fbc3e514d8477bcf0b24f50ff5e7838d1;hp=915e8a6d1f286988bf395c77e5fb16366bf6e595;hb=73e02f6f3ea83cbdf3d894a7d067c4dafc0ac54d;hpb=2567e558195975a08d35f0a4dcafe8c7041e06ce

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
index 915e8a6..92ca3c9 100755
--- a/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
+++ b/dali-toolkit/internal/controls/scrollable/item-view/grid-layout.h
@@ -188,74 +188,74 @@ public:
   /**
    * @copydoc ItemLayout::GetScrollSpeedFactor()
    */
-  virtual float GetScrollSpeedFactor() const;
+  float GetScrollSpeedFactor() const override;
 
   /**
    * @copydoc ItemLayout::GetMaximumSwipeSpeed()
    */
-  virtual float GetMaximumSwipeSpeed() const;
+  float GetMaximumSwipeSpeed() const override;
 
   /**
    * @copydoc ItemLayout::GetItemFlickAnimationDuration()
    */
-  virtual float GetItemFlickAnimationDuration() const;
+  float GetItemFlickAnimationDuration() const override;
 
   /**
    * @copydoc ItemLayout::GetClosestOnScreenLayoutPosition()
    */
-  virtual float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize);
+  float GetClosestOnScreenLayoutPosition(int itemID, float currentLayoutPosition, const Vector3& layoutSize) override;
 
   /**
    * @copydoc ItemLayout::GetNextFocusItemID()
    */
-  virtual int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled);
+  int GetNextFocusItemID(int itemID, int maxItems, Dali::Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) override;
 
 private:
 
   /**
    * @copydoc ItemLayout::GetMinimumLayoutPosition()
    */
-  virtual float GetMinimumLayoutPosition(unsigned int numberOfItems, Vector3 layoutSize) const;
+  float GetMinimumLayoutPosition(unsigned int numberOfItems, Vector3 layoutSize) const override;
 
   /**
    * @copydoc ItemLayout::GetClosestAnchorPosition()
    */
-  virtual float GetClosestAnchorPosition(float layoutPosition) const;
+  float GetClosestAnchorPosition(float layoutPosition) const override;
 
   /**
    * @copydoc ItemLayout::GetItemScrollToPosition()
    */
-  virtual float GetItemScrollToPosition(unsigned int itemId) const;
+  float GetItemScrollToPosition(unsigned int itemId) const override;
 
   /**
    * @copydoc ItemLayout::GetItemsWithinArea()
    */
-  virtual ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const;
+  ItemRange GetItemsWithinArea(float firstItemPosition, Vector3 layoutSize) const override;
 
   /**
    * @copydoc ItemLayout::GetReserveItemCount()
    */
-  virtual unsigned int GetReserveItemCount(Vector3 layoutSize) const;
+  unsigned int GetReserveItemCount(Vector3 layoutSize) const override;
 
   /**
    * @copydoc ItemLayout::GetDefaultItemSize()
    */
-  virtual void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const;
+  void GetDefaultItemSize( unsigned int itemId, const Vector3& layoutSize, Vector3& itemSize ) const override;
 
   /**
    * @copydoc ItemLayout::GetScrollDirection()
    */
-  virtual Degree GetScrollDirection() const;
+  Degree GetScrollDirection() const override;
 
   /**
    * @copydoc ItemLayout::ApplyConstraints()
    */
-  virtual void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor );
+  void ApplyConstraints( Actor& actor, const int itemId, const Vector3& layoutSize, const Actor& itemViewActor ) override;
 
   /**
    * @copydoc ItemLayout::GetItemPosition()
    */
-  virtual Vector3 GetItemPosition( int itemID, float currentLayoutPosition, const Vector3& layoutSize ) const;
+  Vector3 GetItemPosition( int itemID, float currentLayoutPosition, const Vector3& layoutSize ) const override;
 
 protected: