X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fimage-view%2Fimage-view.h;h=c6d0b2af2240774f2ade91e180a513cd5cbef230;hp=ac2befacbf7d56d925b9035073d452f8adb9a070;hb=c0d8c3caf853d94266c589b425cadc26333f716a;hpb=e6a69025d7f388522a1fdd2e5241c08aa81b5df9 diff --git a/dali-toolkit/public-api/controls/image-view/image-view.h b/dali-toolkit/public-api/controls/image-view/image-view.h index ac2befa..c6d0b2a 100644 --- a/dali-toolkit/public-api/controls/image-view/image-view.h +++ b/dali-toolkit/public-api/controls/image-view/image-view.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_IMAGE_VIEW_H__ -#define __DALI_TOOLKIT_IMAGE_VIEW_H__ +#ifndef DALI_TOOLKIT_IMAGE_VIEW_H +#define DALI_TOOLKIT_IMAGE_VIEW_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -48,7 +48,7 @@ class ImageView; * ResouceReadySignal is done after the resource is set then signal will be missed. * * To protect against this, IsResourceReady() can be checked before connecting to ResourceReadySignal, - * or the signal connection can be done before setting the resource" + * or the signal connection can be done before setting the resource. * * @code * auto myImageView = ImageView::New( resourceUrl ); @@ -73,7 +73,7 @@ class ImageView; * @SINCE_1_0.0 * */ -class DALI_IMPORT_API ImageView : public Control +class DALI_TOOLKIT_API ImageView : public Control { public: @@ -104,12 +104,7 @@ public: { // Event side properties - /** - * @DEPRECATED_1_1.16. Use IMAGE instead. - * @brief name "resourceUrl", type string. - * @SINCE_1_0.0 - */ - RESOURCE_URL = PROPERTY_START_INDEX, + RESERVED_PROPERTY_01 = PROPERTY_START_INDEX, ///< Reserved index for a removed property. /** * @brief name "image", type string if it is a url, map otherwise. @@ -310,4 +305,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_IMAGE_VIEW_H__ +#endif // DALI_TOOLKIT_IMAGE_VIEW_H