projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace std::string global variables with C-style string.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
controller
/
text-controller-input-properties.cpp
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
(file)
--- 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
{
namespace
{
-const
std::string EMPTY_STRING("")
;
+const
char* EMPTY_STRING = ""
;
}
namespace Dali::Toolkit::Text
}
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;
}
{
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;
}
{
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();
}
{
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();
}
{
return controller.mImpl->mEventData ? controller.mImpl->mEventData->mInputStyle.outlineProperties : controller.GetDefaultOutlineProperties();
}