(GCC 6.2) Remove unused functions from automated tests

[platform/core/uifw/dali-core.git] / dali / internal / event / images / image-connector.cpp

diff --git a/dali/internal/event/images/image-connector.cpp b/dali/internal/event/images/image-connector.cpp
index d484f5e..265115c 100644 (file)
--- a/dali/internal/event/images/image-connector.cpp
+++ b/dali/internal/event/images/image-connector.cpp
@@ -1,18 +1,19 @@
-//
-// 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) 2014 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/event/images/image-connector.h>
@@ -27,6 +28,7 @@ namespace Internal
 {
 
 ImageConnector::ImageConnector()
+: mImage(NULL)
 {
 }
 
@@ -34,14 +36,14 @@ ImageConnector::~ImageConnector()
 {
 }
 
-Image* ImageConnector::Get() const
+ImagePtr ImageConnector::Get() const
 {
-  return mImage.Get();
+  return mImage;
 }
 
-void ImageConnector::Set( Image* image, bool onStage )
+void ImageConnector::Set( ImagePtr image, bool onStage )
 {
-  if ( mImage.Get() != image )
+  if ( mImage != image )
   {
     // Disconnect from old image
     if ( mImage && onStage )
@@ -49,7 +51,7 @@ void ImageConnector::Set( Image* image, bool onStage )
       mImage->Disconnect();
     }
 
-    mImage.Reset(image);
+    mImage = image;
 
     // Connect to new image
     if ( mImage && onStage )