X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fstyling%2Fstyle-manager-impl.h;h=c612f7d32800cb2f718a3e46c21c63886b166c34;hb=957e21ff67b0680b79b8532db4ea310c43eef770;hp=a658707e052029fd0653bf2f481ee56f88eea9cf;hpb=df5c192e17a7f8be8df32489111f5e6d09974680;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/styling/style-manager-impl.h b/dali-toolkit/internal/styling/style-manager-impl.h index a658707..c612f7d 100644 --- a/dali-toolkit/internal/styling/style-manager-impl.h +++ b/dali-toolkit/internal/styling/style-manager-impl.h @@ -19,7 +19,7 @@ // EXTERNAL INCLUDES #include -#include +#include #include #include #include @@ -27,8 +27,8 @@ #include // INTERNAL INCLUDES -#include -#include +#include +#include namespace Dali { @@ -140,7 +140,7 @@ public: private: - typedef std::list StringList; + typedef std::vector StringList; /** * @brief Internal helper method to read a file from file system. @@ -222,9 +222,9 @@ private: * Callback for when style monitor raises a signal * * @param[in] styleMonitor The style monitor object - * @param[in] styleChange The style change data + * @param[in] styleChange The style change type */ - void StyleMonitorChange( StyleMonitor styleMonitor, StyleChange styleChange ); + void StyleMonitorChange( StyleMonitor styleMonitor, StyleChange::Type styleChange ); // Undefined StyleManager(const StyleManager&); @@ -237,6 +237,7 @@ private: typedef std::map< std::string, Toolkit::Builder > BuilderMap; Toolkit::Builder mThemeBuilder; ///< Builder for all default theme properties + StyleMonitor mStyleMonitor; ///< Style monitor handle Orientation mOrientation; ///< Handle to application orientation object int mOrientationDegrees; ///< Directly set value of orientation