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 b3a0028..01be6ba 100644 (file)
--- a/dali-toolkit/devel-api/styling/style-manager.cpp
+++ b/dali-toolkit/devel-api/styling/style-manager.cpp
@@ -58,6 +58,11 @@ void StyleManager::SetOrientation( Orientation orientation )
   GetImpl(*this).SetOrientation( orientation );
 }
 
+std::string StyleManager::GetDefaultFontFamily() const
+{
+  return GetImpl(*this).GetDefaultFontFamily();
+}
+
 Orientation StyleManager::GetOrientation()
 {
   return GetImpl(*this).GetOrientation();
@@ -83,9 +88,9 @@ StyleManager::StyleManager( Internal::StyleManager *impl )
 {
 }
 
-StyleManager::StyleChangeSignalType& StyleManager::StyleChangeSignal()
+StyleManager::StyleChangedSignalType& StyleManager::StyleChangedSignal()
 {
-  return GetImpl( *this ).StyleChangeSignal();
+  return GetImpl( *this ).StyleChangedSignal();
 }
 
 void StyleManager::RequestThemeChange( const std::string& themeFile )
@@ -101,4 +106,3 @@ void StyleManager::RequestDefaultTheme()
 } // namespace Toolkit
 
 } // namespace Dali
-