Merge "Clean up the code to build successfully on macOS" into devel/master

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

diff --git a/dali/internal/update/controllers/scene-controller.h b/dali/internal/update/controllers/scene-controller.h
index fbefd0f..5eb5aea 100644 (file)
--- a/dali/internal/update/controllers/scene-controller.h
+++ b/dali/internal/update/controllers/scene-controller.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H__
+#ifndef DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H
+#define DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_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.
@@ -27,11 +27,9 @@ namespace Internal
 namespace SceneGraph
 {
 
-class CameraController;
 class RenderMessageDispatcher;
 class RenderQueue;
 class DiscardQueue;
-class TextureCache;
 
 /**
  * Abstract interface for the scene controller
@@ -43,16 +41,12 @@ public:
   /**
    * Constructor
    */
-  SceneController()
-  {
-  }
+  SceneController() = default;
 
   /**
    * Destructor
    */
-  virtual ~SceneController()
-  {
-  }
+  virtual ~SceneController() = default;
 
   /**
    * Return the render message dispatcher
@@ -72,15 +66,6 @@ public:
    */
   virtual DiscardQueue& GetDiscardQueue() = 0;
 
-  /**
-   * Return the texture cache
-   * TODO: Remove this method when renderer's & shader's second stage initialization
-   * is done by RenderManager rather than by the attachments in the Update thread.
-   * DO NOT USE THIS IN THE UPDATE THREAD!
-   * @return A reference to the texture cache
-   */
-  virtual TextureCache& GetTextureCache() = 0;
-
 private:
 
   // Undefined copy constructor.
@@ -96,4 +81,4 @@ private:
 
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H__
+#endif // DALI_INTERNAL_SCENE_GRAPH_SCENE_CONTROLLER_H