Merge "Changed 'virtual' function override declarations to 'override' in automated...

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / windows / callback-manager-win.h

diff --git a/dali/internal/system/windows/callback-manager-win.h b/dali/internal/system/windows/callback-manager-win.h
index 3048036..eed550f 100755 (executable)
--- a/dali/internal/system/windows/callback-manager-win.h
+++ b/dali/internal/system/windows/callback-manager-win.h
@@ -2,7 +2,7 @@
 #define DALI_WIN_CALLBACK_MANAGER_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -19,12 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <list>
+#include <set>
 
 // INTERNAL INCLUDES
 #include <dali/internal/system/common/callback-manager.h>
 
-
 namespace Dali
 {
 
@@ -55,12 +54,22 @@ public:
     /**
      * @copydoc CallbackManager::AddIdleCallback()
      */
-    virtual bool AddIdleCallback( CallbackBase* callback, bool hasReturnValue );
+    bool AddIdleCallback( CallbackBase* callback, bool hasReturnValue ) override;
 
     /**
      * @copydoc CallbackManager::RemoveIdleCallback()
      */
-    virtual void RemoveIdleCallback( CallbackBase* callback );
+    void RemoveIdleCallback( CallbackBase* callback ) override;
+
+    /**
+     * @copydoc CallbackManager::ProcessIdle()
+     */
+    bool ProcessIdle() override;
+
+    /**
+     * @copydoc CallbackManager::ClearIdleCallbacks()
+     */
+    void ClearIdleCallbacks() override;
 
     /**
     * @brief Adds a @p callback to be run when entering an idle state.
@@ -76,7 +85,7 @@ public:
     *
     * @return true on success
     */
-    virtual bool AddIdleEntererCallback( CallbackBase* callback );
+    bool AddIdleEntererCallback( CallbackBase* callback ) override;
 
     /**
     * @brief Removes a previously added the idle enterer callback.
@@ -86,19 +95,20 @@ public:
     *
     * @param[in] callback The callback to be removed.
     */
-    virtual void RemoveIdleEntererCallback( CallbackBase* callback );
+    void RemoveIdleEntererCallback( CallbackBase* callback ) override;
 
     /**
      * @copydoc CallbackManager::Start()
      */
-    virtual void Start();
+    void Start() override;
 
     /**
      * @copydoc CallbackManager::Stop()
      */
-    virtual void Stop();
+    void Stop() override;
 
 private:
+    std::set<CallbackBase*>        mCallbacks;
     bool                           mRunning;            ///< flag is set to true if when running
 };
 
@@ -108,4 +118,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_UV_CALLBACK_MANAGER_H__
+#endif // DALI_WIN_CALLBACK_MANAGER_H