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 "DALi Version 1.4.36" into 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
e0c886c
..
fdd44b4
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
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TOOLKIT_TIMER_H__
-#define
__DALI_TOOLKIT_TOOLKIT_TIMER_H__
+#ifndef
DALI_TOOLKIT_TOOLKIT_TIMER_H
+#define
DALI_TOOLKIT_TOOLKIT_TIMER_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-22,7
+22,7
@@
#include <string>
// PUBLIC INCLUDES
#include <string>
// PUBLIC INCLUDES
-#define
__DALI_TIMER_H__
+#define
DALI_TIMER_H
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/signals/dali-signal.h>
#include <dali/public-api/object/base-handle.h>
#include <dali/public-api/signals/dali-signal.h>
@@
-62,4
+62,11
@@
private:
} // namespace Dali
} // namespace Dali
-#endif // __DALI_TOOLKIT_TOOLKIT_TIMER_H__
+namespace Test
+{
+int GetTimerCount();
+void EmitGlobalTimerSignal();
+bool AreTimersRunning();
+}
+
+#endif // DALI_TOOLKIT_TOOLKIT_TIMER_H