From 07978c7f46b49a673c9a72b987e653c5d55b1ef3 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 22 May 2019 14:43:00 +0900 Subject: [PATCH 1/1] Add '@addtogroup' tag to generate doxygen page - In some classes, @addtogroup tag is mssing. So, they cannot be included in each API group. Change-Id: Idc84d7eda0565ca0d93941d8ac5c4da4d8e42521 Signed-off-by: Seoyeon Kim --- .../controls/scrollable/item-view/default-item-layout-property.h | 7 +++++++ .../public-api/controls/text-controls/placeholder-properties.h | 2 +- dali-toolkit/public-api/image-loader/async-image-loader.h | 8 ++++++++ dali-toolkit/public-api/image-loader/sync-image-loader.h | 8 ++++++++ dali-toolkit/public-api/text/rendering-backend.h | 7 +++++++ dali-toolkit/public-api/text/text-enumerations.h | 3 +-- dali-toolkit/public-api/toolkit-property-index-ranges.h | 7 +++++++ doc/dali-toolkit-doc.h | 7 +++++++ 8 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h index a416b4d..5660714 100755 --- a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h @@ -23,6 +23,10 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_controls_item_view + * @{ + */ /** * @brief Default item layout property. @@ -277,6 +281,9 @@ enum Property SPIRAL_TOP_ITEM_ALIGNMENT, }; +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h b/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h index 53d54a9..1e34ebf 100644 --- a/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h +++ b/dali-toolkit/public-api/controls/text-controls/placeholder-properties.h @@ -25,7 +25,7 @@ namespace Toolkit { /** - * @addtogroup dali_toolkit_controls + * @addtogroup dali_toolkit_controls_text_controls * @{ */ diff --git a/dali-toolkit/public-api/image-loader/async-image-loader.h b/dali-toolkit/public-api/image-loader/async-image-loader.h index 8d4c629..3a30253 100755 --- a/dali-toolkit/public-api/image-loader/async-image-loader.h +++ b/dali-toolkit/public-api/image-loader/async-image-loader.h @@ -39,6 +39,11 @@ class AsyncImageLoader; } /** + * @addtogroup dali_toolkit_image_loader + * @{ + */ + +/** * @brief The AsyncImageLoader is used to load pixel data from a URL asynchronously. * * The images are loaded in a worker thread to avoid blocking the main event thread. @@ -242,6 +247,9 @@ public: // Not intended for developer use }; +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/public-api/image-loader/sync-image-loader.h b/dali-toolkit/public-api/image-loader/sync-image-loader.h index 732c937..7d52867 100755 --- a/dali-toolkit/public-api/image-loader/sync-image-loader.h +++ b/dali-toolkit/public-api/image-loader/sync-image-loader.h @@ -31,6 +31,11 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_image_loader + * @{ + */ + namespace SyncImageLoader { @@ -102,6 +107,9 @@ DALI_TOOLKIT_API PixelData Load( const std::string& url, } // namespace SyncImageLoader +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/public-api/text/rendering-backend.h b/dali-toolkit/public-api/text/rendering-backend.h index 7552724..6c266f8 100755 --- a/dali-toolkit/public-api/text/rendering-backend.h +++ b/dali-toolkit/public-api/text/rendering-backend.h @@ -23,6 +23,10 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_controls_text_controls + * @{ + */ namespace Text { @@ -41,6 +45,9 @@ const unsigned int DEFAULT_RENDERING_BACKEND = RENDERING_SHARED_ATLAS; } // namespace Text +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/dali-toolkit/public-api/text/text-enumerations.h b/dali-toolkit/public-api/text/text-enumerations.h index d9f23be..5276d32 100644 --- a/dali-toolkit/public-api/text/text-enumerations.h +++ b/dali-toolkit/public-api/text/text-enumerations.h @@ -23,9 +23,8 @@ namespace Dali namespace Toolkit { - /** - * @addtogroup dali_toolkit_controls + * @addtogroup dali_toolkit_controls_text_controls * @{ */ diff --git a/dali-toolkit/public-api/toolkit-property-index-ranges.h b/dali-toolkit/public-api/toolkit-property-index-ranges.h index f77d859..c3bb73b 100644 --- a/dali-toolkit/public-api/toolkit-property-index-ranges.h +++ b/dali-toolkit/public-api/toolkit-property-index-ranges.h @@ -26,6 +26,10 @@ namespace Dali namespace Toolkit { +/** + * @addtogroup dali_toolkit_controls + * @{ + */ /** * @brief Enumeration for the start and end property ranges. @@ -39,6 +43,9 @@ enum PropertyRanges VISUAL_PROPERTY_END_INDEX = VISUAL_PROPERTY_START_INDEX + 100000, ///< Visual Property End Index. @SINCE_1_1.45 }; +/** + * @} + */ } // namespace Toolkit } // namespace Dali diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h index 8e8a9b2..e8cae72 100755 --- a/doc/dali-toolkit-doc.h +++ b/doc/dali-toolkit-doc.h @@ -140,6 +140,10 @@ * @ref dali_toolkit_visuals * Visuals can control rendering the contents as using Property. * + * + * @ref dali_toolkit_image_loader + * The ImageLoader is used to load pixel data from a URL. + * * * * \ifnot show_tizen_feature @@ -219,6 +223,9 @@ * @defgroup dali_toolkit_visuals Visuals * @brief Visuals can control rendering the contents as using Property. + * @defgroup dali_toolkit_image_loader Image Loader + * @brief The ImageLoader is used to load pixel data from a URL. + * @} */ -- 2.7.4