X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fscroll-connector.cpp;h=ac15652ddd3ba75e76d0260be7bc0305264ec082;hb=b3aff14cae6b3af637e75171422c16661878ba8e;hp=c89dfab6d82a83f2292fb33beb404b3cf370551f;hpb=2ddfbb9e23a7c3fc30e604236c41e0ef6d2ed6a2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp b/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp index c89dfab..ac15652 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp +++ b/dali-toolkit/public-api/controls/scrollable/scroll-connector.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * 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. @@ -32,9 +32,6 @@ const char* const ScrollConnector::OVERSHOOT_PROPERTY_NAME = "overshoot"; const Property::Index ScrollConnector::SCROLL_POSITION = Internal::ScrollConnector::SCROLL_POSITION; const Property::Index ScrollConnector::OVERSHOOT = Internal::ScrollConnector::OVERSHOOT; -const char* const ScrollConnector::DOMAIN_CHANGED_SIGNAL_NAME = "domain-changed"; -const char* const ScrollConnector::SCROLL_POSITION_CHANGED_SIGNAL_NAME = "scroll-position-changed"; - ScrollConnector ScrollConnector::New() { return ScrollConnector( Internal::ScrollConnector::New() ); @@ -78,7 +75,7 @@ float ScrollConnector::GetContentLength() const return GetImpl(*this).GetContentLength(); } -Constrainable ScrollConnector::GetScrollPositionObject() const +Handle ScrollConnector::GetScrollPositionObject() const { return GetImpl(*this).GetScrollPositionObject(); }