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 98f314d..ee528e8 100644 (file)
--- a/dali/internal/update/controllers/scene-controller-impl.cpp
+++ b/dali/internal/update/controllers/scene-controller-impl.cpp
@@ -1,24 +1,24 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // CLASS HEADER
 #include <dali/internal/update/controllers/scene-controller-impl.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/update/controllers/light-controller-impl.h>
 
 namespace Dali
 {
@@ -31,22 +31,14 @@ namespace SceneGraph
 
 SceneControllerImpl::SceneControllerImpl( RenderMessageDispatcher& renderMessageDispatcher,
                                           RenderQueue& renderQueue,
-                                          DiscardQueue& discardQueue,
-                                          TextureCache& textureCache,
-                                          CompleteStatusManager& completeStatusManager )
+                                          DiscardQueue& discardQueue )
 : mRenderMessageDispatcher( renderMessageDispatcher ),
   mRenderQueue( renderQueue ),
-  mDiscardQueue( discardQueue ),
-  mTextureCache( textureCache ),
-  mCompleteStatusManager( completeStatusManager )
+  mDiscardQueue( discardQueue )
 {
-  mLightController  = new LightControllerImpl;
 }
 
-SceneControllerImpl::~SceneControllerImpl()
-{
-  delete mLightController;
-}
+SceneControllerImpl::~SceneControllerImpl() = default;
 
 } // namespace SceneGraph