use modern construct 'override' in the derive class.

[platform/core/uifw/dali-core.git] / dali / internal / update / controllers / scene-controller-impl.h

diff --git a/dali/internal/update/controllers/scene-controller-impl.h b/dali/internal/update/controllers/scene-controller-impl.h
index 055f502..57b3fdb 100644 (file)
--- a/dali/internal/update/controllers/scene-controller-impl.h
+++ b/dali/internal/update/controllers/scene-controller-impl.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H
+#define DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H
 
 /*
- * Copyright (c) 2014 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.
@@ -20,7 +20,6 @@
 
 // INTERNAL INCLUDES
 #include <dali/internal/update/controllers/scene-controller.h>
-#include <dali/internal/update/controllers/light-controller.h>
 
 namespace Dali
 {
@@ -41,55 +40,35 @@ public:
 
   /**
    * Constructor
-   * @param[in] context  dali context
    * @param[in] rendererDispatcher Used for passing ownership of renderers to the render-thread.
    * @param[in] renderQueue  The renderQueue
    * @param[in] discardQueue The discardQueue
-   * @param[in] completeStatusTracker The resource complete status tracker
-   * @param[in] defaultShader to use for renderable attachments
    */
   SceneControllerImpl( RenderMessageDispatcher& renderMessageDispatcher,
                        RenderQueue& renderQueue,
-                       DiscardQueue& discardQueue,
-                       TextureCache& textureCache,
-                       CompleteStatusManager& completeStatusManager );
+                       DiscardQueue& discardQueue );
 
   /**
    * Destructor
    */
-  virtual ~SceneControllerImpl();
+  ~SceneControllerImpl() override;
 
 public:  // from SceneController
 
   /**
-   * @copydoc SceneController::GetLightController()
-   */
-  virtual LightController& GetLightController() { return *mLightController; }
-
-  /**
    * @copydoc SceneController::GetRenderMessageDispatcher()
    */
-  virtual RenderMessageDispatcher& GetRenderMessageDispatcher() { return mRenderMessageDispatcher; }
+  RenderMessageDispatcher& GetRenderMessageDispatcher() override { return mRenderMessageDispatcher; }
 
   /**
    * @copydoc SceneController::GetRenderQueue()
    */
-  virtual RenderQueue& GetRenderQueue() { return mRenderQueue; }
+  RenderQueue& GetRenderQueue() override { return mRenderQueue; }
 
   /**
    * @copydoc SceneController::GetDiscardQueue()
    */
-  virtual DiscardQueue& GetDiscardQueue() { return mDiscardQueue; }
-
-  /**
-   * @copydoc SceneController::GetTextureCache()
-   */
-  virtual TextureCache& GetTextureCache() { return mTextureCache; }
-
-  /**
-   * @copydoc SceneController::GetCompleteStatusManager()
-   */
-  virtual CompleteStatusManager& GetCompleteStatusManager() { return mCompleteStatusManager;  }
+  DiscardQueue& GetDiscardQueue() override { return mDiscardQueue; }
 
 private:
 
@@ -101,13 +80,9 @@ private:
 
 private:
 
-  LightController*         mLightController;       ///< light controller
   RenderMessageDispatcher& mRenderMessageDispatcher;    ///< Used for passing messages to the render-thread
   RenderQueue&             mRenderQueue;           ///< render queue
   DiscardQueue&            mDiscardQueue;          ///< discard queue
-  TextureCache&            mTextureCache;          ///< texture cache
-  CompleteStatusManager&   mCompleteStatusManager; ///< Complete Status manager
-
 };
 
 } // namespace SceneGraph
@@ -116,4 +91,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_IMPL_H