Merge "Added travis.yml for auto-building patches" into devel/master

[platform/core/uifw/dali-core.git] / dali / public-api / signals / connection-tracker.cpp

diff --git a/dali/public-api/signals/connection-tracker.cpp b/dali/public-api/signals/connection-tracker.cpp
index 07e0849..0be40a1 100644 (file)
--- a/dali/public-api/signals/connection-tracker.cpp
+++ b/dali/public-api/signals/connection-tracker.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) 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/connection-tracker.h>
@@ -24,14 +25,6 @@
 namespace Dali
 {
 
-namespace
-{
-
-const int INVALID_CALLBACK_INDEX = -1;
-
-} // unnamed namespace
-
-
 ConnectionTracker::ConnectionTracker()
 {
 }
@@ -43,7 +36,7 @@ ConnectionTracker::~ConnectionTracker()
 
 void ConnectionTracker::DisconnectAll()
 {
-  std::size_t size = mConnections.size();
+  std::size_t size = mConnections.Size();
 
   for( std::size_t i = 0; i< size; ++i )
   {
@@ -55,18 +48,18 @@ void ConnectionTracker::DisconnectAll()
     delete connection;
   }
 
-  mConnections.clear();
+  mConnections.Clear();
 }
 
 void ConnectionTracker::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
 {
   SlotConnection* connection = new SlotConnection( slotObserver, callback );
-  mConnections.push_back( connection );
+  mConnections.PushBack( connection );
 }
 
 void ConnectionTracker::SignalDisconnected( SlotObserver* signal, CallbackBase* callback )
 {
-  std::size_t size = mConnections.size();
+  std::size_t size = mConnections.Size();
 
   for( std::size_t i = 0; i< size; ++i )
   {
@@ -76,7 +69,7 @@ void ConnectionTracker::SignalDisconnected( SlotObserver* signal, CallbackBase*
     if( connection->GetCallback() == callback )
     {
       // Remove from connection list
-      mConnections.erase( mConnections.begin() + i );
+      mConnections.Erase( mConnections.Begin() + i );
 
       // Delete connection
       delete connection;
@@ -86,12 +79,12 @@ void ConnectionTracker::SignalDisconnected( SlotObserver* signal, CallbackBase*
     }
   }
 
-  DALI_ASSERT_ALWAYS( false && "Callback lost in SignalDisconnected()" );
+  DALI_ABORT( "Callback lost in SignalDisconnected()" );
 }
 
 std::size_t ConnectionTracker::GetConnectionCount() const
 {
-  return mConnections.size();
+  return mConnections.Size();
 }
 
 } // namespace Dali