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 "Changed signal order for StyleManager" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
styling
/
style-manager.cpp
diff --git
a/dali-toolkit/devel-api/styling/style-manager.cpp
b/dali-toolkit/devel-api/styling/style-manager.cpp
index
19e2f1f
..
01be6ba
100644
(file)
--- a/
dali-toolkit/devel-api/styling/style-manager.cpp
+++ b/
dali-toolkit/devel-api/styling/style-manager.cpp
@@
-88,9
+88,9
@@
StyleManager::StyleManager( Internal::StyleManager *impl )
{
}
{
}
-StyleManager::StyleChange
SignalType& StyleManager::StyleChange
Signal()
+StyleManager::StyleChange
dSignalType& StyleManager::StyleChanged
Signal()
{
{
- return GetImpl( *this ).StyleChangeSignal();
+ return GetImpl( *this ).StyleChange
d
Signal();
}
void StyleManager::RequestThemeChange( const std::string& themeFile )
}
void StyleManager::RequestThemeChange( const std::string& themeFile )
@@
-106,4
+106,3
@@
void StyleManager::RequestDefaultTheme()
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali
-