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 "Fixed Control and Magnifier API" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
focus-manager
/
focus-manager.cpp
diff --git
a/dali-toolkit/public-api/focus-manager/focus-manager.cpp
b/dali-toolkit/public-api/focus-manager/focus-manager.cpp
index
1bd721a
..
c24c93e
100644
(file)
--- a/
dali-toolkit/public-api/focus-manager/focus-manager.cpp
+++ b/
dali-toolkit/public-api/focus-manager/focus-manager.cpp
@@
-1,5
+1,5
@@
/*
/*
- * 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.
@@
-19,7
+19,7
@@
#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/public-api/focus-manager/focus-manager.h>
// EXTERNAL INCLUDES
-#include <dali/
public
-api/adaptor-framework/singleton-service.h>
+#include <dali/
devel
-api/adaptor-framework/singleton-service.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/focus-manager/focus-manager-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/focus-manager/focus-manager-impl.h>
@@
-30,10
+30,6
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
-const char* const FocusManager::SIGNAL_FOCUS_CHANGED = "focus-changed";
-const char* const FocusManager::SIGNAL_FOCUS_OVERSHOT = "focus-overshot";
-const char* const FocusManager::SIGNAL_FOCUSED_ACTOR_ACTIVATED = "focused-actor-activated";
-
FocusManager::FocusManager()
{
}
FocusManager::FocusManager()
{
}