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 "Do not change BlendMode by following whether advanced blend equation is appied...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
accessibility-manager
/
accessibility-manager.cpp
diff --git
a/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
b/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
index
d207988
..
b7f6892
100644
(file)
--- a/
dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
+++ b/
dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
@@
-19,18
+19,16
@@
#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
// EXTERNAL INCLUDES
#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
// EXTERNAL INCLUDES
-#include <dali/integration-api/debug.h>
#include <dali/devel-api/common/singleton-service.h>
#include <dali/devel-api/common/singleton-service.h>
+#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h>
namespace Dali
{
// INTERNAL INCLUDES
#include <dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h>
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
AccessibilityManager::AccessibilityManager()
{
}
AccessibilityManager::AccessibilityManager()
{
}
@@
-44,8
+42,8
@@
AccessibilityManager AccessibilityManager::Get()
AccessibilityManager manager;
// Check whether the accessibility manager is already created
AccessibilityManager manager;
// Check whether the accessibility manager is already created
- SingletonService singletonService(
SingletonService::Get()
);
- if
( singletonService
)
+ SingletonService singletonService(
SingletonService::Get()
);
+ if
(singletonService
)
{
Dali::BaseHandle handle = singletonService.GetSingleton(typeid(AccessibilityManager));
if(handle)
{
Dali::BaseHandle handle = singletonService.GetSingleton(typeid(AccessibilityManager));
if(handle)
@@
-58,17
+56,16
@@
AccessibilityManager AccessibilityManager::Get()
{
// If not, create the accessibility manager and register it as a singleton
Internal::AccessibilityManager* internalManager = new Internal::AccessibilityManager();
{
// If not, create the accessibility manager and register it as a singleton
Internal::AccessibilityManager* internalManager = new Internal::AccessibilityManager();
- manager = AccessibilityManager( internalManager );
- internalManager->Initialise();
- singletonService.Register( typeid(manager), manager );
+ manager = AccessibilityManager(internalManager);
+ singletonService.Register(typeid(manager), manager);
}
}
return manager;
}
}
}
return manager;
}
-AccessibilityManager::AccessibilityManager(Internal::AccessibilityManager
*
impl)
-
: BaseHandle(impl)
+AccessibilityManager::AccessibilityManager(Internal::AccessibilityManager
*
impl)
+: BaseHandle(impl)
{
}
{
}