X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fobject%2Fproperty.cpp;h=1ac8453471f1414ad61793a6729269c1a321d9bb;hb=646f736e77b085c86e982c0d1d4b895c2a431330;hp=ba6cf7da2e46f60260d2341548e3f634ce8091b1;hpb=68ccc0200ae9c9fa5a8a38b79c3888abb2390b29;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/object/property.cpp b/dali/public-api/object/property.cpp index ba6cf7d..1ac8453 100644 --- a/dali/public-api/object/property.cpp +++ b/dali/public-api/object/property.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -24,9 +24,9 @@ namespace Dali { -const int Property::INVALID_INDEX = -1; -const int Property::INVALID_KEY = -1; -const int Property::INVALID_COMPONENT_INDEX = -1; +const int32_t Property::INVALID_INDEX = -1; +const int32_t Property::INVALID_KEY = -1; +const int32_t Property::INVALID_COMPONENT_INDEX = -1; Property::Property(Handle& obj, Property::Index propIndex) : object(obj), @@ -35,7 +35,7 @@ Property::Property(Handle& obj, Property::Index propIndex) { } -Property::Property(Handle& obj, Property::Index propIndex, int compIndex) +Property::Property(Handle& obj, Property::Index propIndex, int32_t compIndex) : object(obj), propertyIndex(propIndex), componentIndex(compIndex) @@ -50,7 +50,7 @@ Property::Property(Handle& obj, const std::string& propertyName) propertyIndex = object.GetPropertyIndex( propertyName ); } -Property::Property(Handle& obj, const std::string& propertyName, int compIndex) +Property::Property(Handle& obj, const std::string& propertyName, int32_t compIndex) : object(obj), propertyIndex(Property::INVALID_INDEX), componentIndex(compIndex)