X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fbuttons%2Fpush-button.cpp;h=f6e277556b2162925764929de2a56d7d3ce79519;hb=1123d866f9342b8950fe63715f6eaa1be9a2c18f;hp=5ca56819a8072f5abc7375bb9f374482585881a2;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/base/dali-toolkit/public-api/controls/buttons/push-button.cpp b/base/dali-toolkit/public-api/controls/buttons/push-button.cpp index 5ca5681..f6e2775 100644 --- a/base/dali-toolkit/public-api/controls/buttons/push-button.cpp +++ b/base/dali-toolkit/public-api/controls/buttons/push-button.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 @@ -28,7 +29,6 @@ namespace Dali namespace Toolkit { -const char* const PushButton::SIGNAL_TOGGLED = "toggled"; const char* const PushButton::SIGNAL_PRESSED = "pressed"; const char* const PushButton::SIGNAL_RELEASED = "released"; @@ -218,11 +218,6 @@ Actor PushButton::GetLabelText() const return Dali::Toolkit::GetImplementation( *this ).GetLabelText(); } -PushButton::ToggledSignalV2& PushButton::ToggledSignal() -{ - return Dali::Toolkit::GetImplementation( *this ).ToggledSignal(); -} - PushButton::PressedSignalV2& PushButton::PressedSignal() { return Dali::Toolkit::GetImplementation( *this ).PressedSignal();