Merge "Auto Scrolling Text Label" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / styling / style-manager.cpp

diff --git a/dali-toolkit/public-api/styling/style-manager.cpp b/dali-toolkit/public-api/styling/style-manager.cpp
index d2bc299..e7231d6 100644 (file)
--- a/dali-toolkit/public-api/styling/style-manager.cpp
+++ b/dali-toolkit/public-api/styling/style-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,24 +43,14 @@ StyleManager StyleManager::Get()
   return Internal::StyleManager::Get();
 }
 
-void StyleManager::SetOrientationValue( int orientation )
+void StyleManager::ApplyTheme( const std::string& themeFile )
 {
-  GetImpl(*this).SetOrientationValue( orientation );
+  GetImpl(*this).ApplyTheme( themeFile );
 }
 
-int StyleManager::GetOrientationValue()
+void StyleManager::ApplyDefaultTheme()
 {
-  return GetImpl(*this).GetOrientationValue();
-}
-
-void StyleManager::SetOrientation( Orientation orientation )
-{
-  GetImpl(*this).SetOrientation( orientation );
-}
-
-Orientation StyleManager::GetOrientation()
-{
-  return GetImpl(*this).GetOrientation();
+  GetImpl(*this).ApplyDefaultTheme();
 }
 
 void StyleManager::SetStyleConstant( const std::string& key, const Property::Value& value )
@@ -78,27 +68,16 @@ void StyleManager::ApplyStyle( Toolkit::Control control, const std::string& json
   GetImpl(*this).ApplyStyle( control, jsonFileName, styleName );
 }
 
-StyleManager::StyleManager( Internal::StyleManager *impl )
-  : BaseHandle( impl )
+StyleManager::StyleChangedSignalType& StyleManager::StyleChangedSignal()
 {
+  return GetImpl( *this ).StyleChangedSignal();
 }
 
-StyleManager::StyleChangeSignalType& StyleManager::StyleChangeSignal()
-{
-  return GetImpl( *this ).StyleChangeSignal();
-}
-
-void StyleManager::RequestThemeChange( const std::string& themeFile )
-{
-  GetImpl(*this).RequestThemeChange( themeFile );
-}
-
-void StyleManager::RequestDefaultTheme()
+StyleManager::StyleManager( Internal::StyleManager *impl )
+  : BaseHandle( impl )
 {
-  GetImpl(*this).RequestDefaultTheme();
 }
 
 } // namespace Toolkit
 
 } // namespace Dali
-