X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fstyling%2Fstyle-manager.cpp;h=d2bc299f063263f8bb83dfcdb6c3789dff25d76f;hp=bdef3d1da6a99033d954e9d457eb3b4e7d870d91;hb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;hpb=022b76df6f53c2860f2684ef1ffee81af1805e2e diff --git a/base/dali-toolkit/public-api/styling/style-manager.cpp b/base/dali-toolkit/public-api/styling/style-manager.cpp index bdef3d1..d2bc299 100644 --- a/base/dali-toolkit/public-api/styling/style-manager.cpp +++ b/base/dali-toolkit/public-api/styling/style-manager.cpp @@ -1,18 +1,18 @@ -// -// 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 @@ -83,9 +83,9 @@ StyleManager::StyleManager( Internal::StyleManager *impl ) { } -StyleManager::ThemeChangeSignalType& StyleManager::ThemeChangeSignal() +StyleManager::StyleChangeSignalType& StyleManager::StyleChangeSignal() { - return GetImpl( *this ).ThemeChangeSignal(); + return GetImpl( *this ).StyleChangeSignal(); } void StyleManager::RequestThemeChange( const std::string& themeFile )