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
[dali_2.1.26] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
text-backend.cpp
diff --git
a/dali-toolkit/internal/text/rendering/text-backend.cpp
b/dali-toolkit/internal/text/rendering/text-backend.cpp
index
ee48026
..
1802b7b
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/text-backend.cpp
+++ b/
dali-toolkit/internal/text/rendering/text-backend.cpp
@@
-23,21
+23,18
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Text
{
namespace Text
{
-
Backend Backend::Get()
{
return Internal::Backend::Get();
}
Backend Backend::Get()
{
return Internal::Backend::Get();
}
-RendererPtr Backend::NewRenderer(
unsigned int renderingType
)
+RendererPtr Backend::NewRenderer(
unsigned int renderingType
)
{
{
- return GetImplementation(*this).NewRenderer(
renderingType
);
+ return GetImplementation(*this).NewRenderer(
renderingType
);
}
Backend::Backend()
}
Backend::Backend()
@@
-48,19
+45,19
@@
Backend::~Backend()
{
}
{
}
-Backend::Backend(
const Backend& handle
)
-: BaseHandle(
handle
)
+Backend::Backend(
const Backend& handle
)
+: BaseHandle(
handle
)
{
}
{
}
-Backend& Backend::operator=(
const Backend& handle
)
+Backend& Backend::operator=(
const Backend& handle
)
{
{
- BaseHandle::operator=(
handle
);
+ BaseHandle::operator=(
handle
);
return *this;
}
return *this;
}
-Backend::Backend(
Internal::Backend* internal
)
-: BaseHandle(
internal
)
+Backend::Backend(
Internal::Backend* internal
)
+: BaseHandle(
internal
)
{
}
{
}