Cleaning up the property framework; removal of duplicate methods and incorrect assers

[platform/core/uifw/dali-core.git] / dali / internal / event / common / object-impl.h

diff --git a/dali/internal/event/common/object-impl.h b/dali/internal/event/common/object-impl.h
index 4238643..df70fa5 100644 (file)
--- a/dali/internal/event/common/object-impl.h
+++ b/dali/internal/event/common/object-impl.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_INTERNAL_OBJECT_H__
 #define __DALI_INTERNAL_OBJECT_H__
 
-//
-// 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.
+ *
+ */
 
 // INTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>
@@ -47,7 +48,7 @@ public:
   /**
    * @copydoc Dali::Handle::Supports()
    */
-  virtual bool Supports(Capability capability) const = 0;
+  virtual bool Supports( Capability capability ) const = 0;
 
   /**
    * @copydoc Dali::Handle::GetPropertyCount()
@@ -57,42 +58,42 @@ public:
   /**
    * @copydoc Dali::Handle::GetPropertyName()
    */
-  virtual const std::string& GetPropertyName(Property::Index index) const = 0;
+  virtual std::string GetPropertyName( Property::Index index ) const = 0;
 
   /**
    * @copydoc Dali::Handle::GetPropertyIndex()
    */
-  virtual Property::Index GetPropertyIndex(const std::string& name) const = 0;
+  virtual Property::Index GetPropertyIndex( const std::string& name ) const = 0;
 
   /**
    * @copydoc Dali::Handle::IsPropertyWritable()
    */
-  virtual bool IsPropertyWritable(Property::Index index) const = 0;
+  virtual bool IsPropertyWritable( Property::Index index ) const = 0;
 
   /**
    * @copydoc Dali::Handle::IsPropertyAnimatable()
    */
-  virtual bool IsPropertyAnimatable(Property::Index index) const = 0;
+  virtual bool IsPropertyAnimatable( Property::Index index ) const = 0;
 
   /**
    * @copydoc Dali::Handle::IsPropertyAConstraintInput()
    */
-  virtual bool IsPropertyAConstraintInput(Property::Index index) const = 0;
+  virtual bool IsPropertyAConstraintInput( Property::Index index ) const = 0;
 
   /**
    * @copydoc Dali::Handle::GetPropertyType()
    */
-  virtual Property::Type GetPropertyType(Property::Index index) const = 0;
+  virtual Property::Type GetPropertyType( Property::Index index ) const = 0;
 
   /**
    * @copydoc Dali::Handle::SetProperty()
    */
-  virtual void SetProperty(Property::Index index, const Property::Value& propertyValue) = 0;
+  virtual void SetProperty( Property::Index index, const Property::Value& propertyValue ) = 0;
 
   /**
    * @copydoc Dali::Handle::GetProperty()
    */
-  virtual Property::Value GetProperty(Property::Index index) const = 0;
+  virtual Property::Value GetProperty( Property::Index index ) const = 0;
 
   /**
    * @copydoc Dali::Handle::GetPropertyIndices()
@@ -102,31 +103,30 @@ public:
   /**
    * @copydoc Dali::Handle::RegisterProperty()
    */
-  virtual Property::Index RegisterProperty(std::string name, const Property::Value& propertyValue) = 0;
+  virtual Property::Index RegisterProperty( const std::string& name, const Property::Value& propertyValue ) = 0;
 
   /**
    * @copydoc Dali::Handle::RegisterProperty(std::string name, Property::Value propertyValue, Property::AccessMode accessMode)
    */
-  virtual Property::Index RegisterProperty(std::string name, const Property::Value& propertyValue, Property::AccessMode accessMode) = 0;
+  virtual Property::Index RegisterProperty( const std::string& name, const Property::Value& propertyValue, Property::AccessMode accessMode ) = 0;
 
   /**
    * @copydoc Dali::Handle::AddPropertyNotification()
    */
-  virtual Dali::PropertyNotification AddPropertyNotification(Property::Index index,
-                                                             int componentIndex,
-                                                             const Dali::PropertyCondition& condition) = 0;
+  virtual Dali::PropertyNotification AddPropertyNotification( Property::Index index,
+                                                              int componentIndex,
+                                                              const Dali::PropertyCondition& condition ) = 0;
 
   /**
    * @copydoc Dali::Handle::RemovePropertyNotification()
    */
-  virtual void RemovePropertyNotification(Dali::PropertyNotification propertyNotification) = 0;
+  virtual void RemovePropertyNotification( Dali::PropertyNotification propertyNotification ) = 0;
 
   /**
    * @copydoc Dali::Handle::RemovePropertyNotifications()
    */
   virtual void RemovePropertyNotifications() = 0;
 
-
 protected:
 
   /**