Modified 0 -> 0.0f
authorYunji Park <yunji19.park@samsung.com>
Wed, 10 Apr 2013 01:48:08 +0000 (10:48 +0900)
committerYunji Park <yunji19.park@samsung.com>
Wed, 10 Apr 2013 01:48:08 +0000 (10:48 +0900)
Change-Id: Ib4cd341eb6b5b819e1093daf2cc12b05de87d40b

src/graphics/FGrp_EnrichedTextImpl.cpp

index 3bc7f74..2da897c 100644 (file)
@@ -86,14 +86,14 @@ _EnrichedTextImpl::Construct(const Tizen::Graphics::Dimension& dim)
 result
 _EnrichedTextImpl::Construct(const Tizen::Graphics::FloatDimension& dim)
 {
-       SysTryReturn(NID_GRP, (dim.width > 0) && (dim.height > 0), E_INVALID_ARG, E_INVALID_ARG
+       SysTryReturn(NID_GRP, (dim.width > 0.0f) && (dim.height > 0.0f), E_INVALID_ARG, E_INVALID_ARG
                        , "[E_INVALID_ARG] The argument is invalid. (width = %d height = %d)", dim.width, dim.height);
 
        result r = E_SUCCESS;
 
        __width = dim.width;
        __height = dim.height;
-       __lineSpace = 0;
+       __lineSpace = 0.0f;
 
        __pLinkedListTextElementList = new (std::nothrow) Tizen::Base::Collection::LinkedList;
        SysTryCatch(NID_GRP
@@ -111,7 +111,7 @@ _EnrichedTextImpl::Construct(const Tizen::Graphics::FloatDimension& dim)
                        , r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[%s] Fails to create a TextObject.", GetErrorMessage(r));
 
        __pTextObject->Construct();
-       __pTextObject->SetBounds(FloatRectangle(0, 0, __width, __height));
+       __pTextObject->SetBounds(FloatRectangle(0.0f, 0.0f, __width, __height));
        __pTextObject->SetCutLinkViewMode(true);
        __pTextObject->SetAlignment(TEXT_OBJECT_ALIGNMENT_LEFT);
        __pTextObject->HideFrontSpace(TEXT_OBJECT_SPACE_HIDE_TYPE_ONE);
@@ -408,10 +408,10 @@ _EnrichedTextImpl::SetSize(const Tizen::Graphics::FloatDimension& size)
 {
        SysTryReturn(NID_GRP, __pTextObject != null, E_OPERATION_FAILED, E_OPERATION_FAILED
                        , "[E_OPERATION_FAILED] This instance is not constructed yet.");
-       SysTryReturn(NID_GRP, (size.width > 0) && (size.height > 0), E_OUT_OF_RANGE, E_OUT_OF_RANGE
+       SysTryReturn(NID_GRP, (size.width > 0.0f) && (size.height > 0.0f), E_OUT_OF_RANGE, E_OUT_OF_RANGE
                        , "[E_OUT_OF_RANGE] The given rectangle(width:%d,height:%d) is out of range.\n", size.width, size.height);
 
-       FloatRectangle rect(0, 0, size.width, size.height);
+       FloatRectangle rect(0.0f, 0.0f, size.width, size.height);
 
        __pTextObject->SetBounds(rect);
        __width = rect.width;
@@ -431,7 +431,7 @@ _EnrichedTextImpl::SetSize(float width, float height)
 {
        SysTryReturn(NID_GRP, __pTextObject != null, E_OPERATION_FAILED, E_OPERATION_FAILED
                        , "[E_OPERATION_FAILED] This instance is not constructed yet.");
-       SysTryReturn(NID_GRP, (width > 0) && (height > 0), E_OUT_OF_RANGE, E_OUT_OF_RANGE
+       SysTryReturn(NID_GRP, (width > 0.0f) && (height > 0.0f), E_OUT_OF_RANGE, E_OUT_OF_RANGE
                        , "[E_OUT_OF_RANGE] The given rectangle(width:%d,height:%d) is out of range.\n", width, height);
 
        FloatDimension dim(width, height);
@@ -458,7 +458,7 @@ _EnrichedTextImpl::GetSize(void) const
 Tizen::Graphics::FloatDimension
 _EnrichedTextImpl::GetSizeF(void) const
 {
-       SysTryReturn(NID_GRP, __pTextObject != null, FloatDimension(0, 0), E_OPERATION_FAILED
+       SysTryReturn(NID_GRP, __pTextObject != null, FloatDimension(0.0f, 0.0f), E_OPERATION_FAILED
                        , "[E_OPERATION_FAILED] This instance is not constructed yet.");
 
        FloatDimension dim;
@@ -501,7 +501,7 @@ _EnrichedTextImpl::GetWidth(void) const
 float
 _EnrichedTextImpl::GetWidthF(void) const
 {
-       SysTryReturn(NID_GRP, __pTextObject != null, 0, E_OPERATION_FAILED
+       SysTryReturn(NID_GRP, __pTextObject != null, 0.0f, E_OPERATION_FAILED
                        , "[E_OPERATION_FAILED] This instance is not constructed yet.");
 
        return __width;
@@ -519,7 +519,7 @@ _EnrichedTextImpl::GetHeight(void) const
 float
 _EnrichedTextImpl::GetHeightF(void) const
 {
-       SysTryReturn(NID_GRP, __pTextObject != null, 0, E_OPERATION_FAILED
+       SysTryReturn(NID_GRP, __pTextObject != null, 0.0f, E_OPERATION_FAILED
                        , "[E_OPERATION_FAILED] This instance is not constructed yet.");
 
        return __height;
@@ -670,7 +670,7 @@ _EnrichedTextImpl::SetLineSpace(float lineSpace)
 {
        SysTryReturn(NID_GRP, __pTextObject != null, E_OPERATION_FAILED, E_OPERATION_FAILED
                        , "[E_OPERATION_FAILED] This instance is not constructed yet.");
-       SysTryReturn(NID_GRP, lineSpace > 0, E_INVALID_ARG, E_INVALID_ARG
+       SysTryReturn(NID_GRP, lineSpace > 0.0f, E_INVALID_ARG, E_INVALID_ARG
                        , "[E_INVALID_ARG] The argument is invalid.");
 
        __lineSpace = lineSpace;
@@ -720,7 +720,7 @@ _EnrichedTextImpl::GetTotalLineHeight(void) const
 float
 _EnrichedTextImpl::GetTotalLineHeightF(void) const
 {
-       SysTryReturn(NID_GRP, __pTextObject != null, 0, E_OPERATION_FAILED
+       SysTryReturn(NID_GRP, __pTextObject != null, 0.0f, E_OPERATION_FAILED
                        , "[E_OPERATION_FAILED] This instance is not constructed yet.");
 
        __pTextObject->Compose();