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 button to use ImageView instead of ImageActor and enabled custom fragm...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-style-monitor.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
index
3876b2f
..
8aa55e5
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
@@
-24,8
+24,8
@@
// INTERNAL INCLUDES
#define __DALI_STYLE_MONITOR_H__
#include <dali/public-api/object/base-handle.h>
// INTERNAL INCLUDES
#define __DALI_STYLE_MONITOR_H__
#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal
-v2
.h>
-#include <dali/public-api/style-change.h>
+#include <dali/public-api/signals/dali-signal.h>
+#include <dali/public-api/
adaptor-framework/
style-change.h>
namespace Dali
{
namespace Dali
{
@@
-41,7
+41,7
@@
class StyleMonitor;
class StyleMonitor : public BaseHandle
{
public: // Typedefs
class StyleMonitor : public BaseHandle
{
public: // Typedefs
- typedef Signal
V2< void (StyleMonitor, StyleChange) > StyleChangeSignalV2
;
+ typedef Signal
< void (StyleMonitor, StyleChange::Type) > StyleChangeSignalType
;
static const std::string DEFAULT_FONT_FAMILY;
static const float DEFAULT_FONT_SIZE;
static const std::string DEFAULT_FONT_FAMILY;
static const float DEFAULT_FONT_SIZE;
@@
-59,8
+59,8
@@
public: // Style Information
void SetTheme(std::string themeFilePath);
public: // Signals
void SetTheme(std::string themeFilePath);
public: // Signals
- StyleChangeSignal
V2
& StyleChangeSignal();
- void EmitStyleChangeSignal(StyleChange handle);
+ StyleChangeSignal
Type
& StyleChangeSignal();
+ void EmitStyleChangeSignal(StyleChange
::Type
handle);
public: // Operators
StyleMonitor& operator=(const StyleMonitor& monitor);
public: // Operators
StyleMonitor& operator=(const StyleMonitor& monitor);