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
Merge "Stop setting crazy Z value with controls (at the moment depth is ignored by...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
character-set-conversion.h
diff --git
a/dali-toolkit/internal/text/character-set-conversion.h
b/dali-toolkit/internal/text/character-set-conversion.h
index
19784fb
..
b60a344
100644
(file)
--- a/
dali-toolkit/internal/text/character-set-conversion.h
+++ b/
dali-toolkit/internal/text/character-set-conversion.h
@@
-22,15
+22,15
@@
#include <stdint.h>
#include <string>
#include <stdint.h>
#include <string>
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-
namespace Dali
{
namespace Toolkit
{
namespace Dali
{
namespace Toolkit
{
+namespace Text
+{
+
/**
* @brief Retrieves the number of characters of the text array encoded in UTF8
*
/**
* @brief Retrieves the number of characters of the text array encoded in UTF8
*
@@
-86,6
+86,8
@@
uint32_t Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters,
*/
void Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters, std::string& utf8 );
*/
void Utf32ToUtf8( const uint32_t* const utf32, uint32_t numberOfCharacters, std::string& utf8 );
+} // namespace Text
+
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali