X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-physical-keyboard.cpp;h=de4a86e47c1e2527d74b385d43ecba2fd5ebc75f;hp=41b0078f8d07a32702b99a0c7fd615b895155cde;hb=d07dc4c4a6067ba3080184d862bca40a90d1789c;hpb=fa6279fb2830427d5ab569ca14e6ade1557ef2fa diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp index 41b0078..de4a86e 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-physical-keyboard.cpp @@ -1,24 +1,25 @@ -// -// 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. + * + */ #include "toolkit-physical-keyboard.h" #include #include -#include +#include namespace Dali { @@ -42,10 +43,10 @@ public: bool IsAttached() const; public: // Signals - Dali::PhysicalKeyboard::Signal& StatusChangedSignal(); + Dali::PhysicalKeyboard::PhysicalKeyboardSignalType& StatusChangedSignal(); private: - Dali::PhysicalKeyboard::Signal mStatusChangedSignal; + Dali::PhysicalKeyboard::PhysicalKeyboardSignalType mStatusChangedSignal; bool mIsAttached; static Dali::PhysicalKeyboard mPhysicalKeyboard; }; @@ -75,7 +76,7 @@ bool PhysicalKeyboard::IsAttached() const return mIsAttached; } -Dali::PhysicalKeyboard::Signal& PhysicalKeyboard::StatusChangedSignal() +Dali::PhysicalKeyboard::PhysicalKeyboardSignalType& PhysicalKeyboard::StatusChangedSignal() { return mStatusChangedSignal; } @@ -105,7 +106,7 @@ bool PhysicalKeyboard::IsAttached() const return pyke.IsAttached(); } -PhysicalKeyboard::Signal& PhysicalKeyboard::StatusChangedSignal() +PhysicalKeyboard::PhysicalKeyboardSignalType& PhysicalKeyboard::StatusChangedSignal() { BaseObject& object = GetBaseObject(); Internal::Adaptor::PhysicalKeyboard& pyke = static_cast< Internal::Adaptor::PhysicalKeyboard& >( object );