Merge "Refactored EventToUpdate into EventThreadServices" into tizen

[platform/core/uifw/dali-core.git] / dali / internal / update / common / inherited-property.h

diff --git a/dali/internal/update/common/inherited-property.h b/dali/internal/update/common/inherited-property.h
index a3f4bd7..6a9fa9a 100644 (file)
--- a/dali/internal/update/common/inherited-property.h
+++ b/dali/internal/update/common/inherited-property.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_INTERNAL_SCENE_GRAPH_INHERITED_PROPERTY_H__
 #define __DALI_INTERNAL_SCENE_GRAPH_INHERITED_PROPERTY_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/internal/event/common/property-input-impl.h>
@@ -36,32 +37,37 @@ namespace Internal
 namespace SceneGraph
 {
 
-template <class T>
-class InheritedProperty;
-
 /**
  * An inherited Vector3 property.
  */
-template <>
-class InheritedProperty<Vector3> : public PropertyInputImpl
+class InheritedVector3 : public PropertyInputImpl
 {
 public:
 
   /**
-   * Create an inherited property.
+   * Create an inherited Vector3.
+   */
+  InheritedVector3()
+  : mValue(),
+    mInheritedFlag( false ),
+    mReinheritedFlag( true )
+  {
+  }
+
+  /**
+   * Create an inherited Vector3.
    * @param [in] initialValue The initial value of the property.
    */
-  InheritedProperty( const Vector3& initialValue )
+  InheritedVector3( const Vector3& initialValue )
   : mValue( initialValue ),
     mInheritedFlag( false ),
     mReinheritedFlag( true )
   {
   }
-
   /**
    * Virtual destructor.
    */
-  virtual ~InheritedProperty()
+  virtual ~InheritedVector3()
   {
   }
 
@@ -178,10 +184,10 @@ public:
 private:
 
   // Undefined
-  InheritedProperty(const InheritedProperty& property);
+  InheritedVector3(const InheritedVector3& property);
 
   // Undefined
-  InheritedProperty& operator=(const InheritedProperty& rhs);
+  InheritedVector3& operator=(const InheritedVector3& rhs);
 
 private:
 
@@ -365,17 +371,15 @@ private:
 /**
  * An inherited Quaternion property.
  */
-template <>
-class InheritedProperty<Quaternion> : public PropertyInputImpl
+class InheritedQuaternion : public PropertyInputImpl
 {
 public:
 
   /**
    * Create an inherited property.
-   * @param [in] initialValue The initial value of the property.
    */
-  InheritedProperty( const Quaternion& initialValue )
-  : mValue( initialValue ),
+  InheritedQuaternion()
+  : mValue(),
     mInheritedFlag( false ),
     mReinheritedFlag( true )
   {
@@ -384,7 +388,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~InheritedProperty()
+  virtual ~InheritedQuaternion()
   {
   }
 
@@ -501,13 +505,10 @@ public:
 private:
 
   // Undefined
-  InheritedProperty();
-
-  // Undefined
-  InheritedProperty(const InheritedProperty& property);
+  InheritedQuaternion(const InheritedQuaternion& property);
 
   // Undefined
-  InheritedProperty& operator=(const InheritedProperty& rhs);
+  InheritedQuaternion& operator=(const InheritedQuaternion& rhs);
 
 private:
 
@@ -520,17 +521,15 @@ private:
 /**
  * An inherited Matrix property.
  */
-template <>
-class InheritedProperty<Matrix> : public PropertyInputImpl
+class InheritedMatrix : public PropertyInputImpl
 {
 public:
 
   /**
    * Create an inherited property.
-   * @param [in] initialValue The initial value of the property.
    */
-  InheritedProperty( const Matrix& initialValue )
-  : mValue( initialValue ),
+  InheritedMatrix()
+  : mValue(),
     mInheritedFlag( false ),
     mReinheritedFlag( true )
   {
@@ -539,7 +538,7 @@ public:
   /**
    * Virtual destructor.
    */
-  virtual ~InheritedProperty()
+  virtual ~InheritedMatrix()
   {
   }
 
@@ -682,13 +681,10 @@ public:
 private:
 
   // Undefined
-  InheritedProperty();
-
-  // Undefined
-  InheritedProperty(const InheritedProperty& property);
+  InheritedMatrix(const InheritedMatrix& property);
 
   // Undefined
-  InheritedProperty& operator=(const InheritedProperty& rhs);
+  InheritedMatrix& operator=(const InheritedMatrix& rhs);
 
 private: