Fix compile error. Non initialized variable.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / page-turn-view / page-turn-view-impl.h

diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
index e17f2a0..3815bd8 100644 (file)
--- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
+++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H__
-#define __DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H__
+#ifndef DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H
+#define DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 // EXTERNAL INCLUDES
 #include <dali/devel-api/common/map-wrapper.h>
 #include <dali/public-api/actors/layer.h>
-#include <dali/devel-api/rendering/renderer.h>
+#include <dali/public-api/rendering/renderer.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h>
-#include <dali-toolkit/public-api/controls/page-turn-view/page-factory.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-turn-view.h>
+#include <dali-toolkit/devel-api/controls/page-turn-view/page-factory.h>
 #include <dali-toolkit/devel-api/controls/shadow-view/shadow-view.h>
 
 namespace Dali
@@ -57,23 +57,23 @@ protected:
     ~Page(){};
 
     /**
-     * Set the page image content
-     * @param[in] image The content of the page.
+     * Set the page texture content
+     * @param[in] texture The content of the page.
      */
-    void SetImage( Image image );
+    void SetTexture( Texture texture );
 
     /**
      * Apply an effect onto the page actor.
-     * @param[in] shader The shader for rendering effect.
+     * @param[in] newShader The shader for rendering effect.
      */
-    void UseEffect(Shader shader);
+    void UseEffect(Shader newShader);
 
     /**
      * Apply an effect onto the page actor.
-     * @param[in] shader The shader for rendering effect.
+     * @param[in] newShader The shader for rendering effect.
      * @param[in] geometry The geometry for rendering effect.
      */
-    void UseEffect(Shader shader, Geometry geometry);
+    void UseEffect(Shader newShader, Geometry geometry);
 
     /**
      * Change the page turning direction.
@@ -105,7 +105,8 @@ protected:
     void SetCurrentCenter( const Vector2& value );
 
     Actor actor;                              ///< The page actor
-    Material material;                        ///< The material of the actor
+    Shader shader;                            ///< The shader used by the actor
+    TextureSet textureSet;                    ///< The set of textures used by the actor
     Renderer renderer;                        ///< The renderer of the actor
     bool isTurnBack;                          ///< The turning direction
     Property::Index propertyPanDisplacement;  ///< The horizontal displacement of the pan
@@ -122,7 +123,7 @@ protected:
    * Constructor.
    * It initializes the PageTurnView members
    */
-  PageTurnView( PageFactory& pageFactory, const Vector2& pageSize );
+  PageTurnView( PageFactory& pageFactory, const Vector2& viewPageSize );
 
   /**
    * A reference counted object may only be deleted by calling Unreference()
@@ -133,9 +134,9 @@ public:
 
   /**
    * Set the page size
-   * @param[in] pageSize The size of pages
+   * @param[in] viewPageSize The size of pages
    */
-  void SetPageSize( const Vector2& pageSize );
+  void SetPageSize( const Vector2& viewPageSize );
 
   /**
    * Retrieve the page size.
@@ -257,14 +258,14 @@ private: // from Control
   virtual void OnInitialize();
 
   /**
-   * @copydoc CustomActorImpl::OnStageConnection()
+   * @copydoc CustomActorImpl::OnSceneConnection()
    */
-  virtual void OnStageConnection( int depth );
+  virtual void OnSceneConnection( int depth );
 
   /**
-   * @copydoc CustomActorImpl::OnStageDisconnection()
+   * @copydoc CustomActorImpl::OnSceneDisconnection()
    */
-  virtual void OnStageDisconnection();
+  virtual void OnSceneDisconnection();
 
 private: // implemented differently by PageTurnLandscapeView and PageTurnPortraitView
 
@@ -453,4 +454,5 @@ inline const Toolkit::Internal::PageTurnView& GetImplementation(const Toolkit::P
 } // namespace Toolkit
 
 } // namespace Dali
-#endif /* __DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H__ */
+
+#endif // DALI_TOOLKIT_INTERNAL_PAGE_TURN_VIEW_IMPL_H