Merge "Do not substarct outline width in text-controller" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / layouting / measured-size.h

diff --git a/dali-toolkit/devel-api/layouting/measured-size.h b/dali-toolkit/devel-api/layouting/measured-size.h
index 3e38a1e..f04be0a 100644 (file)
--- a/dali-toolkit/devel-api/layouting/measured-size.h
+++ b/dali-toolkit/devel-api/layouting/measured-size.h
@@ -19,6 +19,7 @@
 
 #include <dali/public-api/common/dali-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 )
   {
   }
@@ -68,7 +69,7 @@ public:
     return *this;
   }
 
-  MeasuredSize& operator=( LayoutLength::IntType rhs )
+  MeasuredSize& operator=( LayoutLength rhs )
   {
     this->mMeasuredSize = rhs;
     this->mState = State::MEASURED_SIZE_OK;
@@ -85,11 +86,6 @@ public:
     return mMeasuredSize != value.mMeasuredSize;
   }
 
-  inline operator LayoutLength::IntType()
-  {
-    return mMeasuredSize.mValue;
-  }
-
   inline void SetState( MeasuredSize::State state )
   {
     mState = state;