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
[dali_1.1.43] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-timer.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
index
16c9c96
..
e0c886c
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h
@@
-2,7
+2,7
@@
#define __DALI_TOOLKIT_TOOLKIT_TIMER_H__
/*
#define __DALI_TOOLKIT_TOOLKIT_TIMER_H__
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-24,7
+24,7
@@
// PUBLIC INCLUDES
#define __DALI_TIMER_H__
#include <dali/public-api/object/base-handle.h>
// PUBLIC INCLUDES
#define __DALI_TIMER_H__
#include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal
-v2
.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
namespace Dali
{
@@
-40,20
+40,22
@@
class Timer;
class Timer : public BaseHandle
{
public:
class Timer : public BaseHandle
{
public:
- typedef SignalV2< bool () > TimerSignalV2;
+ void MockEmitSignal();
+
+public:
+ typedef Signal< bool () > TimerSignalType;
Timer();
static Timer New( unsigned int milliSec );
Timer( const Timer& timer );
Timer& operator=( const Timer& timer );
Timer();
static Timer New( unsigned int milliSec );
Timer( const Timer& timer );
Timer& operator=( const Timer& timer );
-
virtual
~Timer();
+ ~Timer();
static Timer DownCast( BaseHandle handle );
static Timer DownCast( BaseHandle handle );
- using BaseHandle::operator=;
void Start();
void Stop();
void SetInterval( unsigned int milliSec );
unsigned int GetInterval() const;
bool IsRunning() const;
void Start();
void Stop();
void SetInterval( unsigned int milliSec );
unsigned int GetInterval() const;
bool IsRunning() const;
- TimerSignal
V2
& TickSignal();
+ TimerSignal
Type
& TickSignal();
private:
Timer(Internal::Adaptor::Timer* timer);
};
private:
Timer(Internal::Adaptor::Timer* timer);
};