projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into sandbox/dkdk/tizen
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
adaptor
/
common
/
application-impl.h
diff --git
a/dali/internal/adaptor/common/application-impl.h
b/dali/internal/adaptor/common/application-impl.h
index
d8d7363
..
4d3a4eb
100644
(file)
--- a/
dali/internal/adaptor/common/application-impl.h
+++ b/
dali/internal/adaptor/common/application-impl.h
@@
-99,7
+99,7
@@
public:
/**
* @copydoc Dali::Application::MainLoop()
*/
/**
* @copydoc Dali::Application::MainLoop()
*/
- void MainLoop(
Dali::Configuration::ContextLoss configuration
);
+ void MainLoop();
/**
* @copydoc Dali::Application::Lower()
/**
* @copydoc Dali::Application::Lower()
@@
-163,63
+163,63
@@
public: // From Framework::Observer
/**
* Called when the framework is initialised.
*/
/**
* Called when the framework is initialised.
*/
- v
irtual void OnInit()
;
+ v
oid OnInit() override
;
/**
* Called when the framework is terminated.
*/
/**
* Called when the framework is terminated.
*/
- v
irtual void OnTerminate()
;
+ v
oid OnTerminate() override
;
/**
* Called when the framework is paused.
*/
/**
* Called when the framework is paused.
*/
- v
irtual void OnPause()
;
+ v
oid OnPause() override
;
/**
* Called when the framework resumes from a paused state.
*/
/**
* Called when the framework resumes from a paused state.
*/
- v
irtual void OnResume()
;
+ v
oid OnResume() override
;
/**
* Called when the framework received AppControlSignal.
* @param[in] The bundle data of AppControl event.
*/
/**
* Called when the framework received AppControlSignal.
* @param[in] The bundle data of AppControl event.
*/
- v
irtual void OnAppControl(void *data)
;
+ v
oid OnAppControl(void *data) override
;
/**
* Called when the framework informs the application that it should reset itself.
*/
/**
* Called when the framework informs the application that it should reset itself.
*/
- v
irtual void OnReset()
;
+ v
oid OnReset() override
;
/**
* Called when the framework informs the application that the language of the device has changed.
*/
/**
* Called when the framework informs the application that the language of the device has changed.
*/
- v
irtual void OnLanguageChanged()
;
+ v
oid OnLanguageChanged() override
;
/**
* Called when the framework informs the application that the region of the device has changed.
*/
/**
* Called when the framework informs the application that the region of the device has changed.
*/
- v
irtual void OnRegionChanged()
;
+ v
oid OnRegionChanged() override
;
/**
* Called when the framework informs the application that the battery level of the device is low.
*/
/**
* Called when the framework informs the application that the battery level of the device is low.
*/
- v
irtual void OnBatteryLow( Dali::DeviceStatus::Battery::Status status )
;
+ v
oid OnBatteryLow( Dali::DeviceStatus::Battery::Status status ) override
;
/**
* Called when the framework informs the application that the memory level of the device is low.
*/
/**
* Called when the framework informs the application that the memory level of the device is low.
*/
- v
irtual void OnMemoryLow( Dali::DeviceStatus::Memory::Status status )
;
+ v
oid OnMemoryLow( Dali::DeviceStatus::Memory::Status status ) override
;
/**
* Called when the framework informs the application that the platform surface is created.
*/
/**
* Called when the framework informs the application that the platform surface is created.
*/
- v
irtual void OnSurfaceCreated( Any newSurface )
;
+ v
oid OnSurfaceCreated( Any newSurface ) override
;
/**
* Called when the framework informs the application that the platform surface is destroyed.
*/
/**
* Called when the framework informs the application that the platform surface is destroyed.
*/
- v
irtual void OnSurfaceDestroyed( Any newSurface )
;
+ v
oid OnSurfaceDestroyed( Any newSurface ) override
;
public:
public:
@@
-307,7
+307,7
@@
protected:
/**
* Destructor
*/
/**
* Destructor
*/
-
virtual ~Application()
;
+
~Application() override
;
// Undefined
Application(const Application&);
// Undefined
Application(const Application&);
@@
-349,7
+349,6
@@
private:
EventLoop* mEventLoop;
Framework* mFramework;
EventLoop* mEventLoop;
Framework* mFramework;
- Dali::Configuration::ContextLoss mContextLossConfiguration;
CommandLineOptions* mCommandLineOptions;
Dali::Internal::Adaptor::AdaptorBuilder* mAdaptorBuilder; ///< The adaptor builder
CommandLineOptions* mCommandLineOptions;
Dali::Internal::Adaptor::AdaptorBuilder* mAdaptorBuilder; ///< The adaptor builder