X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fcontroller%2Ftext-controller-input-properties.cpp;h=7842d053f4f5020f57a5ffdb6fa44f3851e4d63a;hb=e4c8362431523550a745b190c67c0c8e3f25ac4d;hp=f410187f4b7d4330b0abf6810a668d42001e7fe4;hpb=309be8bafca890aea5baad5c46679cf207adb497;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp b/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp index f410187..7842d05 100644 --- a/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp +++ b/dali-toolkit/internal/text/controller/text-controller-input-properties.cpp @@ -38,7 +38,7 @@ namespace { -const std::string EMPTY_STRING(""); +const char* EMPTY_STRING = ""; } namespace Dali::Toolkit::Text @@ -116,7 +116,7 @@ void Controller::InputProperties::SetInputShadowProperties(Controller& controlle } } -const std::string& Controller::InputProperties::GetInputShadowProperties(const Controller& controller) +std::string Controller::InputProperties::GetInputShadowProperties(const Controller& controller) { return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.shadowProperties : EMPTY_STRING; } @@ -129,7 +129,7 @@ void Controller::InputProperties::SetInputUnderlineProperties(Controller& contro } } -const std::string& Controller::InputProperties::GetInputUnderlineProperties(const Controller& controller) +std::string Controller::InputProperties::GetInputUnderlineProperties(const Controller& controller) { return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.underlineProperties : EMPTY_STRING; } @@ -142,7 +142,7 @@ void Controller::InputProperties::SetInputEmbossProperties(Controller& controlle } } -const std::string& Controller::InputProperties::GetInputEmbossProperties(const Controller& controller) +std::string Controller::InputProperties::GetInputEmbossProperties(const Controller& controller) { return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.embossProperties : controller.GetDefaultEmbossProperties(); } @@ -155,7 +155,7 @@ void Controller::InputProperties::SetInputOutlineProperties(Controller& controll } } -const std::string& Controller::InputProperties::GetInputOutlineProperties(const Controller& controller) +std::string Controller::InputProperties::GetInputOutlineProperties(const Controller& controller) { return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.outlineProperties : controller.GetDefaultOutlineProperties(); }