Picked some defaults for dali-demo on Ubuntu

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / transition-effects / cube-transition-effect.cpp

diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp b/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp
index 24cbf81..aec216f 100644 (file)
--- a/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp
+++ b/dali-toolkit/public-api/transition-effects/cube-transition-effect.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include "cube-transition-effect.h"
@@ -26,8 +27,6 @@ namespace Dali
 namespace Toolkit
 {
 
-const char* const CubeTransitionEffect::SIGNAL_TRANSITION_COMPLETED = "transition-completed";
-
 CubeTransitionEffect::CubeTransitionEffect()
 {
 }
@@ -41,6 +40,11 @@ CubeTransitionEffect::CubeTransitionEffect(Internal::CubeTransitionEffect* impl)
 {
 }
 
+CubeTransitionEffect CubeTransitionEffect::DownCast( BaseHandle handle )
+{
+  return CubeTransitionEffect( dynamic_cast< Dali::Toolkit::Internal::CubeTransitionEffect* >( handle.GetObjectPtr() ) );
+}
+
 void CubeTransitionEffect::SetTransitionDuration( float duration )
 {
   GetImpl(*this).SetTransitionDuration( duration );
@@ -106,7 +110,7 @@ void CubeTransitionEffect::StopTransition()
   GetImpl(*this).StopTransition();
 }
 
-CubeTransitionEffect::TransitionCompletedSignalV2& CubeTransitionEffect::TransitionCompletedSignal()
+CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffect::TransitionCompletedSignal()
 {
   return GetImpl( *this ).TransitionCompletedSignal();
 }