[dali_1.0.17] Merge branch 'tizen'

Change-Id: I859f215053698ae32a68181dc77f5d4e8cacc4fc

diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index f61d458..fae3df1 100644 (file)
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -26,7 +26,6 @@
 
 using namespace Dali;
 using namespace Dali::Toolkit;
-using namespace std;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -492,7 +491,7 @@ void DaliTableView::Rotate( unsigned int degrees )
   mRotateAnimation.Play();
 }
 
-Actor DaliTableView::CreateTile( const string& name, const string& title, const Size& parentSize, bool addBackground )
+Actor DaliTableView::CreateTile( const std::string& name, const std::string& title, const Size& parentSize, bool addBackground )
 {
   Actor tile = Actor::New();
   tile.SetName( name );

diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp
index 543db7e..18ed966 100644 (file)
--- a/examples/blocks/blocks-example.cpp
+++ b/examples/blocks/blocks-example.cpp
@@ -27,7 +27,6 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include "../shared/view.h"
 
-using namespace std;
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace DemoHelper;
@@ -564,7 +563,7 @@ private:
       if(turn)
       {
         // turn 90 degrees clockwise.
-        swap(di, dj);
+        std::swap(di, dj);
         di = -di;
         if (length<=1)
         {

diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index 1c30aaf..1f98958 100644 (file)
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -393,7 +393,7 @@ public:
     SetTitle("View");
   }
 
-  void OnTap( Actor actor, TapGesture tap )
+  void OnTap( Actor actor, const TapGesture& tap )
   {
     ItemId id = mItemView.GetItemId( actor );
 

diff --git a/examples/cluster/cluster-example.cpp b/examples/cluster/cluster-example.cpp
index cf107d9..f582038 100644 (file)
--- a/examples/cluster/cluster-example.cpp
+++ b/examples/cluster/cluster-example.cpp
@@ -24,7 +24,6 @@
 
 using namespace Dali;
 using namespace Dali::Toolkit;
-using namespace std;
 using namespace DemoHelper;
 
 namespace // unnamed namespace
@@ -554,7 +553,7 @@ public:
     clusterActor.SetAnchorPoint(AnchorPoint::CENTER);
 
     Vector2 stageSize = Dali::Stage::GetCurrent().GetSize();
-    float minStageDimension = min(stageSize.x, stageSize.y);
+    float minStageDimension = std::min(stageSize.x, stageSize.y);
     clusterActor.SetSize(minStageDimension * CLUSTER_RELATIVE_SIZE, minStageDimension * CLUSTER_RELATIVE_SIZE, 0.0f);
 
     DALI_ASSERT_ALWAYS(clusterType < CLUSTER_COUNT);
@@ -649,7 +648,7 @@ public:
     int column = mClusterCount>>1;
     int row = mClusterCount&1;
 
-    float minStageDimension = min(stageSize.x, stageSize.y);
+    float minStageDimension = std::min(stageSize.x, stageSize.y);
     float clusterRightShift = 1.0f - CLUSTER_COLUMN_INDENT * 2.0f;
     Vector3 clusterPosition = Vector3(CLUSTER_COLUMN_INDENT * stageSize.width + row * (clusterRightShift * stageSize.width - minStageDimension * CLUSTER_RELATIVE_SIZE),
                                       CLUSTER_ROW_INDENT * stageSize.height + row * (clusterRightShift * stageSize.height - minStageDimension * CLUSTER_RELATIVE_SIZE), 0.0f);
@@ -718,14 +717,14 @@ public:
 
     mLayoutButton.SetBackgroundImage( mLayoutButtonImages[ type ] );
 
-    for( vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
+    for( std::vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
     {
       Cluster cluster = i->mCluster;
       RemoveShaderEffectRecursively( cluster );
       if( i->mEffectConstraint )
       {
         cluster.RemoveConstraint(i->mEffectConstraint);
-        i->mEffectConstraint = 0;
+        i->mEffectConstraint.Reset();
       }
     }
 
@@ -743,7 +742,7 @@ public:
 
       case WOBBLE_EFFECT:
       {
-        for( vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
+        for( std::vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
         {
           Cluster cluster = i->mCluster;
           Vector3 position = i->mPosition;
@@ -788,7 +787,7 @@ public:
         CarouselEffect shaderEffect = CarouselEffect::New();
         shaderEffect.SetRadius( -CAROUSEL_EFFECT_RADIUS );
         // dont apply shader effect to scrollview as it might override internal shaders for bounce effect etc
-        for( vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
+        for( std::vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
         {
           Cluster cluster = i->mCluster;
           SetShaderEffectRecursively( cluster, shaderEffect );
@@ -825,7 +824,7 @@ public:
         shaderEffect.SetRadius( SPHERE_EFFECT_RADIUS );
         shaderEffect.SetAnglePerUnit( Vector2( SPHERE_EFFECT_ANGLE_SWEEP / stageSize.y, SPHERE_EFFECT_ANGLE_SWEEP / stageSize.y ) );
         // dont apply shader effect to scrollview as it might override internal shaders for bounce effect etc
-        for( vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
+        for( std::vector<ClusterInfo>::iterator i = mClusterInfo.begin(); i != mClusterInfo.end(); ++i )
         {
           Constraint constraint = Constraint::New<float>(Actor::POSITION_Z, SphereEffectOffsetConstraint(SPHERE_EFFECT_POSITION_Z));
           constraint.SetRemoveAction(Constraint::Discard);
@@ -898,7 +897,7 @@ private:
   ScrollViewWobbleEffect     mScrollViewEffect;                  ///< ScrollView Wobble effect
   Image                      mClusterBorderImage;                ///< The border frame that appears on each image
 
-  vector<ClusterInfo>        mClusterInfo;                       ///< Keeps track of each cluster's information.
+  std::vector<ClusterInfo>   mClusterInfo;                       ///< Keeps track of each cluster's information.
   int                        mClusterCount;                      ///< Current number of clusters in use
   ExampleEffectType          mExampleEffect;                     ///< Current example effect.
 

diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index 6ab5e50..9697cc7 100644 (file)
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -26,7 +26,6 @@
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 
-using namespace std;
 using namespace Dali;
 using namespace Dali::Toolkit;
 
@@ -535,7 +534,7 @@ public:
     mTapDetector.Reset();
   }
 
-  void RemoveOnTap( Actor actor, TapGesture tap )
+  void RemoveOnTap( Actor actor, const TapGesture& tap )
   {
     mItemView.RemoveItem( mItemView.GetItemId(actor), 0.5f );
   }
@@ -587,7 +586,7 @@ public:
     mDeleteButton.SetVisible( false );
   }
 
-  void SelectOnTap( Actor actor, TapGesture tap )
+  void SelectOnTap( Actor actor, const TapGesture& tap )
   {
     Actor tick = actor.FindChildByName( "Tick" );
     if( tick )
@@ -638,7 +637,7 @@ public:
     mTapDetector.Reset();
   }
 
-  void InsertOnTap( Actor actor, TapGesture tap )
+  void InsertOnTap( Actor actor, const TapGesture& tap )
   {
     ItemId id = mItemView.GetItemId( actor );
 
@@ -731,7 +730,7 @@ public:
     mTapDetector.DetectedSignal().Connect( this, &ItemViewExample::ReplaceOnTap );
   }
 
-  void ReplaceOnTap( Actor actor, TapGesture tap )
+  void ReplaceOnTap( Actor actor, const TapGesture& tap )
   {
     mItemView.ReplaceItem( Item( mItemView.GetItemId(actor), NewItem(rand()) ), 0.5f );
   }
@@ -1038,7 +1037,7 @@ private:
     return true;
   }
 
-  void ChangeAlphaFunctionOnTap( Actor actor, TapGesture tap )
+  void ChangeAlphaFunctionOnTap( Actor actor, const TapGesture& tap )
   {
     if( NUM_ALPHA_FUNCTIONS <= ++mAlphaFuncIndex )
     {

diff --git a/examples/motion/motion-blur-example.cpp b/examples/motion/motion-blur-example.cpp
index 837fb92..4100f44 100644 (file)
--- a/examples/motion/motion-blur-example.cpp
+++ b/examples/motion/motion-blur-example.cpp
@@ -24,7 +24,6 @@
 
 using namespace Dali;
 using namespace Dali::Toolkit;
-using namespace std;
 
 
 
@@ -332,7 +331,7 @@ public:
   //
 
   // move to point on screen that was tapped
-  void OnTap( Actor actor, TapGesture tapGesture )
+  void OnTap( Actor actor, const TapGesture& tapGesture )
   {
     Vector3 destPos;
     float originOffsetX, originOffsetY;

diff --git a/examples/motion/motion-stretch-example.cpp b/examples/motion/motion-stretch-example.cpp
index 549e912..db224ae 100644 (file)
--- a/examples/motion/motion-stretch-example.cpp
+++ b/examples/motion/motion-stretch-example.cpp
@@ -24,7 +24,6 @@
 
 using namespace Dali;
 using namespace Dali::Toolkit;
-using namespace std;
 
 
 
@@ -244,7 +243,7 @@ public:
   //
 
   // move to point on screen that was tapped
-  void OnTap( Actor actor, TapGesture tapGesture )
+  void OnTap( Actor actor, const TapGesture& tapGesture )
   {
     Vector3 destPos;
     float originOffsetX, originOffsetY;

diff --git a/examples/radial-menu/radial-sweep-view.h b/examples/radial-menu/radial-sweep-view.h
index e3cf533..1c70078 100644 (file)
--- a/examples/radial-menu/radial-sweep-view.h
+++ b/examples/radial-menu/radial-sweep-view.h
@@ -133,7 +133,7 @@ public:
   /**
    * Destructor
    */
-  virtual ~RadialSweepView();
+  ~RadialSweepView();
 
   /**
    * Downcast method

diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp
index cad9691..fce13f8 100644 (file)
--- a/examples/scroll-view/scroll-view-example.cpp
+++ b/examples/scroll-view/scroll-view-example.cpp
@@ -23,7 +23,6 @@
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 
-using namespace std;
 using namespace Dali;
 using namespace Dali::Toolkit;
 

diff --git a/examples/shader-effect/dissolve-effect-example.cpp b/examples/shader-effect/dissolve-effect-example.cpp
index 211b325..327c08c 100644 (file)
--- a/examples/shader-effect/dissolve-effect-example.cpp
+++ b/examples/shader-effect/dissolve-effect-example.cpp
@@ -96,7 +96,7 @@ private:
    * @param[in] actor The actor receiving the pan gesture.
    * @param[in] gesture The detected pan gesture.
    */
-  void OnPanGesture( Actor actor, PanGesture gesture );
+  void OnPanGesture( Actor actor, const PanGesture& gesture );
 
   /**
    * Set up the animations for transition
@@ -237,7 +237,7 @@ void DissolveEffectApp::OnInit( Application& application )
 }
 
 // signal handler, called when the pan gesture is detected
-void DissolveEffectApp::OnPanGesture( Actor actor, PanGesture gesture )
+void DissolveEffectApp::OnPanGesture( Actor actor, const PanGesture& gesture )
 {
   // does not response when the animation has not finished
   if( mIsTransiting || mSlideshow )

diff --git a/examples/shadows/shadow-bone-lighting-example.cpp b/examples/shadows/shadow-bone-lighting-example.cpp
index b1a97f4..1246be2 100644 (file)
--- a/examples/shadows/shadow-bone-lighting-example.cpp
+++ b/examples/shadows/shadow-bone-lighting-example.cpp
@@ -326,7 +326,7 @@ public:
     return p*q;
   }
 
-  void OnTap(Dali::Actor actor, TapGesture gesture)
+  void OnTap(Dali::Actor actor, const TapGesture& gesture)
   {
     if( ! mPaused )
     {
@@ -342,7 +342,7 @@ public:
     }
   }
 
-  void OnPan(Actor actor, PanGesture gesture)
+  void OnPan(Actor actor, const PanGesture& gesture)
   {
     switch (gesture.state)
     {
@@ -396,7 +396,7 @@ public:
     }
   }
 
-  void OnPinch(Actor actor, PinchGesture gesture)
+  void OnPinch(Actor actor, const PinchGesture& gesture)
   {
     if (gesture.state == Gesture::Started)
     {

diff --git a/examples/transition/cube-transition-effect-example.cpp b/examples/transition/cube-transition-effect-example.cpp
index a441136..bd0d0a7 100644 (file)
--- a/examples/transition/cube-transition-effect-example.cpp
+++ b/examples/transition/cube-transition-effect-example.cpp
@@ -110,7 +110,7 @@ private:
    * @param[in] actor The actor receiving the pan gesture.
    * @param[in] gesture The detected pan gesture.
    */
-  void OnPanGesture( Actor actor, PanGesture gesture );
+  void OnPanGesture( Actor actor, const PanGesture& gesture );
   /**
    * Load the next image and start the transition;
    */
@@ -281,7 +281,7 @@ void CubeTransitionApp::OnInit( Application& application )
 }
 
 // signal handler, called when the pan gesture is detected
-void CubeTransitionApp::OnPanGesture( Actor actor, PanGesture gesture )
+void CubeTransitionApp::OnPanGesture( Actor actor, const PanGesture& gesture )
 {
   // does not response when the transition has not finished
   if( mIsImageLoading || mCubeWaveEffect.IsTransiting() || mCubeCrossEffect.IsTransiting() || mCubeFoldEffect.IsTransiting() || mSlideshow )

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index c01d0fd..5336e1d 100755 (executable)
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.0.16
+Version:    1.0.17
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0