X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Fmeasured-size.h;h=5be02ac23b677d9c22f843cae2c24dbcc5a48d0f;hp=68f988c6e9fd766418243d56b514db14a0b9020d;hb=fbac42bd903f8878efe9e5ecf3c8cca3f217acbb;hpb=a2a0b8577e0a8ac8f2c5180fe0557c68a069fdaa

diff --git a/dali-toolkit/devel-api/layouting/measured-size.h b/dali-toolkit/devel-api/layouting/measured-size.h
old mode 100644
new mode 100755
index 68f988c..5be02ac
--- a/dali-toolkit/devel-api/layouting/measured-size.h
+++ b/dali-toolkit/devel-api/layouting/measured-size.h
@@ -17,8 +17,9 @@
  * limitations under the License.
  */
 
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali-toolkit/devel-api/layouting/layout-length.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 
 namespace Dali
 {
@@ -28,7 +29,7 @@ namespace Toolkit
 /**
  * Class that encodes a measurement and a measure state, which is set if the measured size is too small.
  */
-class DALI_IMPORT_API MeasuredSize
+class DALI_TOOLKIT_API MeasuredSize
 {
 public:
 
@@ -39,7 +40,7 @@ public:
   };
 
   MeasuredSize()
-  : mMeasuredSize( 0u ),
+  : mMeasuredSize( 0 ),
     mState ( MeasuredSize::State::MEASURED_SIZE_OK )
   {
   }
@@ -60,12 +61,15 @@ public:
 
   MeasuredSize& operator=( const MeasuredSize& rhs )
   {
-    this->mMeasuredSize = rhs.mMeasuredSize;
-    this->mState = rhs.mState;
+    if( this != &rhs )
+    {
+      this->mMeasuredSize = rhs.mMeasuredSize;
+      this->mState = rhs.mState;
+    }
     return *this;
   }
 
-  MeasuredSize& operator=( LayoutLength::IntType rhs )
+  MeasuredSize& operator=( LayoutLength rhs )
   {
     this->mMeasuredSize = rhs;
     this->mState = State::MEASURED_SIZE_OK;
@@ -82,11 +86,6 @@ public:
     return mMeasuredSize != value.mMeasuredSize;
   }
 
-  inline operator LayoutLength::IntType()
-  {
-    return mMeasuredSize.mValue;
-  }
-
   inline void SetState( MeasuredSize::State state )
   {
     mState = state;