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
fc8b8f2
..
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
@@
-41,7
+41,7
@@
class StyleMonitor;
class StyleMonitor : public BaseHandle
{
public: // Typedefs
class StyleMonitor : public BaseHandle
{
public: // Typedefs
- typedef Signal< void (StyleMonitor, StyleChange) > StyleChangeSignalType;
+ 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;
@@
-60,7
+60,7
@@
public: // Style Information
public: // Signals
StyleChangeSignalType& StyleChangeSignal();
public: // Signals
StyleChangeSignalType& StyleChangeSignal();
- void EmitStyleChangeSignal(StyleChange handle);
+ void EmitStyleChangeSignal(StyleChange
::Type
handle);
public: // Operators
StyleMonitor& operator=(const StyleMonitor& monitor);
public: // Operators
StyleMonitor& operator=(const StyleMonitor& monitor);