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 6007f69..a4bb208 100644 (file)
--- a/dali/public-api/signals/signal-slot-connections.cpp
+++ b/dali/public-api/signals/signal-slot-connections.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * 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.
@@ -18,6 +18,9 @@
 // CLASS HEADER
 #include <dali/public-api/signals/signal-slot-connections.h>
 
+// EXTERNAL INCLUDES
+#include <cstddef>
+
 // INTERNAL INCLUDES
 #include <dali/public-api/signals/callback.h>
 
@@ -45,7 +48,7 @@ SlotObserver* SlotConnection::GetSlotObserver()
 }
 
 SignalConnection::SignalConnection( CallbackBase* callback )
-: mSignalObserver( 0 ),
+: mSignalObserver( NULL ),
   mCallback( callback )
 {
 }
@@ -68,12 +71,12 @@ void SignalConnection::Disconnect( SlotObserver* slotObserver )
   {
     // tell the slot the signal wants to disconnect
     mSignalObserver->SignalDisconnected( slotObserver, mCallback );
-    mSignalObserver = 0;
+    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 = 0;
+  mCallback = NULL;
 }
 
 CallbackBase* SignalConnection::GetCallback()