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.h
diff --git
a/dali-toolkit/internal/text/controller/text-controller.h
b/dali-toolkit/internal/text/controller/text-controller.h
index
0a1b057
..
55953f4
100644
(file)
--- a/
dali-toolkit/internal/text/controller/text-controller.h
+++ b/
dali-toolkit/internal/text/controller/text-controller.h
@@
-829,7
+829,7
@@
public: // Default style & Input style
*
* @return The default font family.
*/
*
* @return The default font family.
*/
-
const std::string&
GetDefaultFontFamily() const;
+
std::string
GetDefaultFontFamily() const;
/**
* @brief Sets the placeholder text font family.
/**
* @brief Sets the placeholder text font family.
@@
-842,7
+842,7
@@
public: // Default style & Input style
*
* @return The placeholder text font family
*/
*
* @return The placeholder text font family
*/
-
const std::string&
GetPlaceholderFontFamily() const;
+
std::string
GetPlaceholderFontFamily() const;
/**
* @brief Sets the default font weight.
/**
* @brief Sets the default font weight.
@@
-1258,7
+1258,7
@@
public: // Default style & Input style
*
* @return The emboss's properties string.
*/
*
* @return The emboss's properties string.
*/
-
const std::string&
GetDefaultEmbossProperties() const;
+
std::string
GetDefaultEmbossProperties() const;
/**
* @brief Sets the outline's properties string.
/**
* @brief Sets the outline's properties string.
@@
-1274,7
+1274,7
@@
public: // Default style & Input style
*
* @return The outline's properties string.
*/
*
* @return The outline's properties string.
*/
-
const std::string&
GetDefaultOutlineProperties() const;
+
std::string
GetDefaultOutlineProperties() const;
/**
* @brief Sets the default line spacing.
/**
* @brief Sets the default line spacing.
@@
-1350,7
+1350,7
@@
public: // Default style & Input style
*
* @return The input text's font family name.
*/
*
* @return The input text's font family name.
*/
-
const std::string&
GetInputFontFamily() const;
+
std::string
GetInputFontFamily() const;
/**
* @brief Sets the input font's weight.
/**
* @brief Sets the input font's weight.
@@
-1451,7
+1451,7
@@
public: // Default style & Input style
*
* @return The shadow's properties string.
*/
*
* @return The shadow's properties string.
*/
-
const std::string&
GetInputShadowProperties() const;
+
std::string
GetInputShadowProperties() const;
/**
* @brief Sets the input underline's properties string.
/**
* @brief Sets the input underline's properties string.
@@
-1467,7
+1467,7
@@
public: // Default style & Input style
*
* @return The underline's properties string.
*/
*
* @return The underline's properties string.
*/
-
const std::string&
GetInputUnderlineProperties() const;
+
std::string
GetInputUnderlineProperties() const;
/**
* @brief Sets the input emboss's properties string.
/**
* @brief Sets the input emboss's properties string.
@@
-1483,7
+1483,7
@@
public: // Default style & Input style
*
* @return The emboss's properties string.
*/
*
* @return The emboss's properties string.
*/
-
const std::string&
GetInputEmbossProperties() const;
+
std::string
GetInputEmbossProperties() const;
/**
* @brief Sets input the outline's properties string.
/**
* @brief Sets input the outline's properties string.
@@
-1499,7
+1499,7
@@
public: // Default style & Input style
*
* @return The outline's properties string.
*/
*
* @return The outline's properties string.
*/
-
const std::string&
GetInputOutlineProperties() const;
+
std::string
GetInputOutlineProperties() const;
/**
* @brief Sets the input strikethrough's properties string.
/**
* @brief Sets the input strikethrough's properties string.
@@
-1515,7
+1515,7
@@
public: // Default style & Input style
*
* @return The strikethrough's properties string.
*/
*
* @return The strikethrough's properties string.
*/
-
const std::string&
GetInputStrikethroughProperties() const;
+
std::string
GetInputStrikethroughProperties() const;
/**
* @brief Set the control's interface.
/**
* @brief Set the control's interface.