Merge "DALi Version 1.2.27" into devel/master

[platform/core/uifw/dali-core.git] / dali / public-api / signals / signal-slot-connections.cpp

diff --git a/dali/public-api/signals/signal-slot-connections.cpp b/dali/public-api/signals/signal-slot-connections.cpp
index f6bb8ff..a4bb208 100644 (file)
--- a/dali/public-api/signals/signal-slot-connections.cpp
+++ b/dali/public-api/signals/signal-slot-connections.cpp
@@ -1,22 +1,26 @@
-//
-// 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) 2015 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/public-api/signals/signal-slot-connections.h>
 
+// EXTERNAL INCLUDES
+#include <cstddef>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/signals/callback.h>
 
@@ -31,8 +35,6 @@ SlotConnection::SlotConnection( SlotObserver* slotObserver, CallbackBase* callba
 
 SlotConnection::~SlotConnection()
 {
-  // slot connections have ownership of the callback.
-  delete mCallback;
 }
 
 CallbackBase* SlotConnection::GetCallback()
@@ -59,6 +61,8 @@ SignalConnection::SignalConnection( SignalObserver* signalObserver, CallbackBase
 
 SignalConnection::~SignalConnection()
 {
+  // signal connections have ownership of the callback.
+  delete mCallback;
 }
 
 void SignalConnection::Disconnect( SlotObserver* slotObserver )
@@ -70,6 +74,8 @@ void SignalConnection::Disconnect( SlotObserver* slotObserver )
     mSignalObserver = NULL;
   }
 
+  // we own the callback, SignalObserver is expected to delete the SlotConnection on Disconnected so its pointer to our mCallback is no longer used
+  delete mCallback;
   mCallback = NULL;
 }