Merge "Use <cstddef> for NULL" into tizen

[platform/core/uifw/dali-core.git] / dali / public-api / object / constrainable.cpp

diff --git a/dali/public-api/object/constrainable.cpp b/dali/public-api/object/constrainable.cpp
index f0053b1..1404751 100644 (file)
--- a/dali/public-api/object/constrainable.cpp
+++ b/dali/public-api/object/constrainable.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 <dali/public-api/object/constrainable.h>
@@ -21,7 +22,7 @@
 #include <dali/public-api/object/property-index.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/active-constraint.h>
-#include <dali/internal/event/common/proxy-object.h>
+#include <dali/internal/event/common/object-impl.h>
 #include <dali/internal/event/animation/constraint-impl.h>
 #include <dali/internal/event/object/custom-object-internal.h>
 
@@ -44,7 +45,7 @@ Constrainable::Constrainable()
 
 Constrainable Constrainable::DownCast( BaseHandle handle )
 {
-  return Constrainable( dynamic_cast<Dali::Internal::ProxyObject*>(handle.GetObjectPtr()) );
+  return Constrainable( dynamic_cast<Dali::Internal::Object*>(handle.GetObjectPtr()) );
 }
 
 Constrainable::~Constrainable()
@@ -56,6 +57,12 @@ Constrainable::Constrainable(const Constrainable& handle)
 {
 }
 
+Constrainable& Constrainable::operator=(const Constrainable& rhs)
+{
+  BaseHandle::operator=(rhs);
+  return *this;
+}
+
 ActiveConstraint Constrainable::ApplyConstraint( Constraint constraint )
 {
   return GetImplementation(*this).ApplyConstraint( GetImplementation( constraint ) );