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-impl.cpp

diff --git a/dali/internal/update/controllers/scene-controller-impl.cpp b/dali/internal/update/controllers/scene-controller-impl.cpp
index 3bc444a..ee528e8 100644 (file)
--- a/dali/internal/update/controllers/scene-controller-impl.cpp
+++ b/dali/internal/update/controllers/scene-controller-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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,7 +19,6 @@
 #include <dali/internal/update/controllers/scene-controller-impl.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/update/controllers/light-controller-impl.h>
 
 namespace Dali
 {
@@ -32,24 +31,14 @@ namespace SceneGraph
 
 SceneControllerImpl::SceneControllerImpl( RenderMessageDispatcher& renderMessageDispatcher,
                                           RenderQueue& renderQueue,
-                                          DiscardQueue& discardQueue,
-                                          TextureCache& textureCache,
-                                          CompleteStatusManager& completeStatusManager,
-                                          Shader*& defaultShader )
+                                          DiscardQueue& discardQueue )
 : mRenderMessageDispatcher( renderMessageDispatcher ),
   mRenderQueue( renderQueue ),
-  mDiscardQueue( discardQueue ),
-  mTextureCache( textureCache ),
-  mCompleteStatusManager( completeStatusManager ),
-  mDefaultShader( defaultShader )
+  mDiscardQueue( discardQueue )
 {
-  mLightController  = new LightControllerImpl;
 }
 
-SceneControllerImpl::~SceneControllerImpl()
-{
-  delete mLightController;
-}
+SceneControllerImpl::~SceneControllerImpl() = default;
 
 } // namespace SceneGraph