Cleaning up property public API and usage of typedefs

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / internal / controls / buttons / check-box-button-impl.cpp

diff --git a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
index 4eb7831..85fe1a6 100644 (file)
--- a/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
+++ b/base/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
@@ -1,29 +1,29 @@
-//
-// 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 "check-box-button-impl.h"
 
 // EXTERNAL INCLUDES
-
 #include <algorithm>
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/object/type-registry.h>
 
 // INTERNAL INCLUDES
-
 #include "check-box-button-default-painter-impl.h"
 
 namespace Dali
@@ -85,8 +85,8 @@ void CheckBoxButton::SetChecked( bool checked )
     // Notifies the painter the checkbox has been checked.
     GetCheckBoxButtonPainter( mPainter )->Checked( handle );
 
-    // Emit signal.
-    mClickedSignalV2.Emit( handle );
+    // Raise toggled signal
+    mToggledSignalV2.Emit( handle, mChecked );
   }
 }
 
@@ -217,7 +217,7 @@ float CheckBoxButton::OnAnimationTimeRequested() const
 void CheckBoxButton::OnActivated()
 {
   // When the button is activated, it performs the click action
-  std::vector<Property::Value> attributes;
+  PropertyValueContainer attributes;
   DoClickAction(attributes);
 }
 
@@ -233,7 +233,7 @@ void CheckBoxButton::DoClickAction(const PropertyValueContainer& attributes)
   }
 }
 
-bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes)
+bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes)
 {
   bool ret = false;
 
@@ -253,7 +253,9 @@ bool CheckBoxButton::DoAction(BaseObject* object, const std::string& actionName,
 CheckBoxButton::CheckBoxButton()
 : Button(),
   mChecked( false ),
-  mClickActionPerforming(false)
+  mClickActionPerforming(false),
+  mUseFadeAnimationProperty(Property::INVALID_INDEX),
+  mUseCheckAnimationProperty(Property::INVALID_INDEX)
 {
   // Creates specific painter.
   mPainter = new CheckBoxButtonDefaultPainter();