X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Flayouting%2Fmeasured-size.h;h=f04be0aa65d07ab2c905fd475d7adcd00fb56931;hb=refs%2Fchanges%2F75%2F189675%2F5;hp=3e38a1ea0bdc04ef3065edc44fe7c8771a666d4e;hpb=c87446dd57403afc21d11544d162df31c00922ee;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/layouting/measured-size.h b/dali-toolkit/devel-api/layouting/measured-size.h index 3e38a1e..f04be0a 100644 --- a/dali-toolkit/devel-api/layouting/measured-size.h +++ b/dali-toolkit/devel-api/layouting/measured-size.h @@ -19,6 +19,7 @@ #include #include +#include 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;