Fix SINCE and DEPRECATED versions to be included in Tizen 5.5

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

diff --git a/dali/public-api/object/handle.cpp b/dali/public-api/object/handle.cpp
index e71b093..1b48d5c 100644 (file)
--- a/dali/public-api/object/handle.cpp
+++ b/dali/public-api/object/handle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -24,7 +24,6 @@
 #include <dali/public-api/object/property-notification.h>
 #include <dali/internal/event/animation/constraint-impl.h>
 #include <dali/internal/event/common/object-impl.h>
-#include <dali/internal/event/object/custom-object-internal.h>
 #include <dali/integration-api/debug.h>
 
 namespace Dali
@@ -42,7 +41,7 @@ Handle::Handle()
 
 Handle Handle::New()
 {
-  return Handle( Internal::CustomObject::New() );
+  return Handle( Internal::Object::New().Get() );
 }
 
 Handle::~Handle()
@@ -75,7 +74,7 @@ bool Handle::Supports( Capability capability ) const
   return GetImplementation(*this).Supports( capability );
 }
 
-unsigned int Handle::GetPropertyCount() const
+uint32_t Handle::GetPropertyCount() const
 {
   return GetImplementation(*this).GetPropertyCount();
 }
@@ -130,6 +129,11 @@ Property::Value Handle::GetProperty( Property::Index index ) const
   return GetImplementation(*this).GetProperty( index );
 }
 
+Property::Value Handle::GetCurrentProperty( Property::Index index ) const
+{
+  return GetImplementation(*this).GetCurrentProperty( index );
+}
+
 void Handle::GetPropertyIndices( Property::IndexContainer& indices ) const
 {
   GetImplementation(*this).GetPropertyIndices( indices );
@@ -163,21 +167,11 @@ void Handle::RemoveConstraints()
   GetImplementation(*this).RemoveConstraints();
 }
 
-void Handle::RemoveConstraints( unsigned int tag )
+void Handle::RemoveConstraints( uint32_t tag )
 {
   GetImplementation(*this).RemoveConstraints( tag );
 }
 
-void Handle::AddUniformMapping( Property::Index propertyIndex, const std::string& uniformName )
-{
-  GetImplementation(*this).AddUniformMapping( propertyIndex, uniformName );
-}
-
-void Handle::RemoveUniformMapping( const std::string uniformName )
-{
-  GetImplementation(*this).RemoveUniformMapping( uniformName );
-}
-
 namespace WeightObject
 {