Modify doxygen group names

- "-" in group names causes javascript errors when used in doxygen
1.7.6.1 with GENERATE_TREEVIEW option - by which Tizen API reference
is generated (not sure for later version)
- It makes DALi items in the tree view cannot be opened.
- Replace all "-" to "_" in doxygen group names to solve the problem.
- Arrange redundant doxygen input path

Change-Id: I203b63f685b7a7d6846337c4c395913d584cf2ec

diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in
index 3fa2e57ace01a87c7d9cf00e9f33ed0a4d2ddd9b..f9a5f53821b65b7970b9db093effc4ca2eab16b8 100644 (file)
--- a/build/tizen/docs/dali.doxy.in
+++ b/build/tizen/docs/dali.doxy.in
@@ -761,7 +761,7 @@ INPUT                  = @DOXYGEN_DOCS_DIR@/content \
                          @prefix@/include/dali/doc/dali-core-doc.h \
                          @prefix@/include/dali/doc/dali-adaptor-doc.h \
                          ../../../../dali-toolkit/doc/dali-toolkit-doc.h \
-                         @prefix@/include/dali \
+                         @prefix@/include/dali/public-api \
                          ../../../../dali-toolkit/dali-toolkit/public-api \
                          ../../../automated-tests/README.md
 

diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h
index 08ce8ceb318ce29d79bd57b6d1d871bb354735b4..b244acabb46a53e8a2888d65abe25d9fb8b3e86b 100644 (file)
--- a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h
+++ b/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h
@@ -33,7 +33,7 @@ namespace Internal DALI_INTERNAL
 class AccessibilityManager;
 }
 /**
- * @addtogroup dali-toolkit-accessibility-manager
+ * @addtogroup dali_toolkit_accessibility_manager
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/alignment/alignment.h b/dali-toolkit/public-api/controls/alignment/alignment.h
index 5a9d56c95953137966c69d3da687302dccca14ff..a879c48320402a97a4838254a38af718826c1d1d 100644 (file)
--- a/dali-toolkit/public-api/controls/alignment/alignment.h
+++ b/dali-toolkit/public-api/controls/alignment/alignment.h
@@ -32,7 +32,7 @@ namespace Internal DALI_INTERNAL
 class Alignment;
 }
 /**
- * @addtogroup dali-toolkit-controls-alignment
+ * @addtogroup dali_toolkit_controls_alignment
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h
index 34ea28f743d8b465463af57e1468c18f628e1544..4c40ac8769a6d7d3a45306c87abb4b239a6ca7a9 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/button.h
+++ b/dali-toolkit/public-api/controls/buttons/button.h
@@ -32,7 +32,7 @@ namespace Internal DALI_INTERNAL
 class Button;
 }
 /**
- * @addtogroup dali-toolkit-controls-buttons
+ * @addtogroup dali_toolkit_controls_buttons
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.h b/dali-toolkit/public-api/controls/buttons/check-box-button.h
index 357c3e1e7e9c18d01b8e2cfad8d7b777fbfeb5b2..7a5e073269ea63f56aa67dea41f2e09c6ab3ba6e 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/check-box-button.h
+++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h
@@ -34,7 +34,7 @@ namespace Internal DALI_INTERNAL
 class CheckBoxButton;
 }
 /**
- * @addtogroup dali-toolkit-controls-buttons
+ * @addtogroup dali_toolkit_controls_buttons
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h
index 313d7d086ed8df6e5d93158039c8bd9500e6704f..31684b35b5c258e81544d00f5ad81ee0536ebf95 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/push-button.h
+++ b/dali-toolkit/public-api/controls/buttons/push-button.h
@@ -36,7 +36,7 @@ namespace Internal DALI_INTERNAL
 class PushButton;
 }
 /**
- * @addtogroup dali-toolkit-controls-buttons
+ * @addtogroup dali_toolkit_controls_buttons
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/buttons/radio-button.h b/dali-toolkit/public-api/controls/buttons/radio-button.h
index 7c04b42971a550f475ebf912ba756d3d5edc3ac4..e597ca1bfb6272a8a994609b0853295601830261 100644 (file)
--- a/dali-toolkit/public-api/controls/buttons/radio-button.h
+++ b/dali-toolkit/public-api/controls/buttons/radio-button.h
@@ -36,7 +36,7 @@ namespace Internal DALI_INTERNAL
 class RadioButton;
 }
 /**
- * @addtogroup dali-toolkit-controls-buttons
+ * @addtogroup dali_toolkit_controls_buttons
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/control-depth-index-ranges.h b/dali-toolkit/public-api/controls/control-depth-index-ranges.h
index ff5732cf00992639e301f936e8190f0ff445f599..5651b0494c726565776e4982e2eca09550138164 100644 (file)
--- a/dali-toolkit/public-api/controls/control-depth-index-ranges.h
+++ b/dali-toolkit/public-api/controls/control-depth-index-ranges.h
@@ -24,7 +24,7 @@ namespace Dali
 namespace Toolkit
 {
 /**
- * @addtogroup dali-toolkit-controls
+ * @addtogroup dali_toolkit_controls
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index b8ae6bb013d4eb7555f062591165ef7f5ee4983d..4a8466d8d65a01fac8cd4505f6366a3198d6535a 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -36,7 +36,7 @@ namespace Dali
 namespace Toolkit
 {
 /**
- * @addtogroup dali-toolkit-controls
+ * @addtogroup dali_toolkit_controls
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h
index bac883585bccb683b944f088a55151c6015dc1a4..d6425e294ef6882f1f60296aa0b09d6333fa5829 100644 (file)
--- a/dali-toolkit/public-api/controls/control.h
+++ b/dali-toolkit/public-api/controls/control.h
@@ -41,7 +41,7 @@ namespace Internal
 class Control;
 }
 /**
- * @addtogroup dali-toolkit-controls
+ * @addtogroup dali_toolkit_controls
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
index a2c5ea65b685047a42a284211acbdb748eccbda4..10f05a9d28b849dd54d2b55edbbeafc6e5a9d8a4 100644 (file)
--- a/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
+++ b/dali-toolkit/public-api/controls/gaussian-blur-view/gaussian-blur-view.h
@@ -50,7 +50,7 @@ class BloomView;
 
 } // namespace Internal
 /**
- * @addtogroup dali-toolkit-controls-gaussian-blur-view
+ * @addtogroup dali_toolkit_controls_gaussian_blur_view
  * @{
  */
 

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 6fa3474c00d2232c39c89f91a21e2c516fb74f5f..a65f649fefb30a4ba689c1332efec0edbef71fbd 100644 (file)
--- a/dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/dali-toolkit/public-api/controls/image-view/image-view.h
@@ -32,7 +32,7 @@ namespace Internal DALI_INTERNAL
 class ImageView;
 }
 /**
- * @addtogroup dali-toolkit-controls-image-view
+ * @addtogroup dali_toolkit_controls_image_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
index 3f1ad10bee0e51fe2f0bba20e0209f54df6e23bd..f513a3ef78ea236c914764f1aa8a4c20b62edbd1 100755 (executable)
--- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
+++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
@@ -34,7 +34,7 @@ namespace Internal DALI_INTERNAL
 class ScrollBar;
 }
 /**
- * @addtogroup dali-toolkit-controls-scroll-bar
+ * @addtogroup dali_toolkit_controls_scroll_bar
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h
index 8299d843d1aabbec5b54eeba6b1e372313deb6a4..56de533c3a5672516cfe208dc3588cafc3719836 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h
@@ -27,7 +27,7 @@ namespace Dali
 namespace Toolkit
 {
 /**
- * @addtogroup dali-toolkit-controls-item-view
+ * @addtogroup dali_toolkit_controls_item_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
index 84ef7b74fa5f37fb38844a08cf26208bce7c7c3b..22e5261b045007252e6006f2a41b6b4360fffc9a 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
@@ -27,7 +27,7 @@ namespace Dali
 namespace Toolkit
 {
 /**
- * @addtogroup dali-toolkit-controls-item-view
+ * @addtogroup dali_toolkit_controls_item_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
index 9302e8adc06abe5fd4bbc672caa178e320653f48..51f051afa9244385e8170865f0dbdb094ab13c92 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h
@@ -31,7 +31,7 @@ namespace Dali
 namespace Toolkit
 {
 /**
- * @addtogroup dali-toolkit-controls-item-view
+ * @addtogroup dali_toolkit_controls_item_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h
index 7388bfafa2c7f862195c953d44647bb62328ea8b..0f79dc21a5a6d074748d552f650808dc04ad208c 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view-declarations.h
@@ -29,7 +29,7 @@ namespace Dali
 namespace Toolkit
 {
 /**
- * @addtogroup dali-toolkit-controls-item-view
+ * @addtogroup dali_toolkit_controls_item_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
index 279019484353b3ab87c2ee08f7926fd291e5794e..38b5856b8daa131b349ee4b76a1c01e039f9d0d3 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h
@@ -35,7 +35,7 @@ namespace Internal DALI_INTERNAL
 class ItemView;
 }
 /**
- * @addtogroup dali-toolkit-controls-item-view
+ * @addtogroup dali_toolkit_controls_item_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
index 15a29d6a3f0a46bd0e405727496284e3ae8da90e..50962f2c40f32c38cad72af1987c407d84e0fcc5 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h
@@ -32,7 +32,7 @@ class PropertyInput;
 namespace Toolkit
 {
 /**
- * @addtogroup dali-toolkit-controls-scroll-view
+ * @addtogroup dali_toolkit_controls_scroll_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
index 4af04424b917cee41c4626410f69290ac54bc645..73b97b09195934d153190742ae63b6e70501e3b2 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h
@@ -38,7 +38,7 @@ class ScrollViewEffect;
 class ScrollViewWobbleEffect;
 }
 /**
- * @addtogroup dali-toolkit-controls-scroll-view
+ * @addtogroup dali_toolkit_controls_scroll_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
index af59f833886a672c40cfb131faa4411e3f0bc778..4939ac716be174dbe46bcf8d3eab314279725d71 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-page-path-effect.h
@@ -35,7 +35,7 @@ namespace Internal DALI_INTERNAL
 class ScrollViewPagePathEffect;
 }
 /**
- * @addtogroup dali-toolkit-controls-scroll-view
+ * @addtogroup dali_toolkit_controls_scroll_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
index 508b3d201dc80cd8954ea0fbb132250e581278b9..7ebb168b339b5601ff448786deba07882932c3fb 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h
@@ -35,7 +35,7 @@ namespace Internal DALI_INTERNAL
 class ScrollView;
 }
 /**
- * @addtogroup dali-toolkit-controls-scroll-view
+ * @addtogroup dali_toolkit_controls_scroll_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h
index d43a29a7b0ecc465f9b2c8b48b60c91365484208..a7fd42b038d55c34d19a86a8fe2f3b38a44eabfd 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/scrollable.h
+++ b/dali-toolkit/public-api/controls/scrollable/scrollable.h
@@ -32,7 +32,7 @@ namespace Internal DALI_INTERNAL
 class Scrollable;
 }
 /**
- * @addtogroup dali-toolkit-controls-scrollable
+ * @addtogroup dali_toolkit_controls_scrollable
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/public-api/controls/table-view/table-view.h
index eb03b9e8f16af195794175a1b1ce8dbe25fbd0bd..d3a95177477a927273e0595832a32a2b7af12ed9 100644 (file)
--- a/dali-toolkit/public-api/controls/table-view/table-view.h
+++ b/dali-toolkit/public-api/controls/table-view/table-view.h
@@ -36,7 +36,7 @@ namespace Internal DALI_INTERNAL
 class TableView;
 }
 /**
- * @addtogroup dali-toolkit-controls-table-view
+ * @addtogroup dali_toolkit_controls_table_view
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h
index 7b9d11b4ae6831846bd7639ddcb8ad47cb497590..ea6da679d3d1722b410c0daf745fadb073410dbb 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-field.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-field.h
@@ -32,7 +32,7 @@ namespace Internal DALI_INTERNAL
 class TextField;
 }
 /**
- * @addtogroup dali-toolkit-controls-text-controls
+ * @addtogroup dali_toolkit_controls_text_controls
  * @{
  */
 

diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h
index 7669b05711270151dafdd852ed34f2c8f381b7de..6e4931ea7fb8b90180c981d4ffeedfd5c7ded491 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.h
@@ -32,7 +32,7 @@ namespace Internal DALI_INTERNAL
 class TextLabel;
 }
 /**
- * @addtogroup dali-toolkit-controls-text-controls
+ * @addtogroup dali_toolkit_controls_text_controls
  * @{
  */
 

diff --git a/dali-toolkit/public-api/enums.h b/dali-toolkit/public-api/enums.h
index ff678a9009026d70a7f4a9bda6a5356d1312dbe5..f3f893f8460be1abb7bf1c905fe9e7928e4bce59 100644 (file)
--- a/dali-toolkit/public-api/enums.h
+++ b/dali-toolkit/public-api/enums.h
@@ -29,7 +29,7 @@ namespace Dali
 namespace Toolkit
 {
 /**
- * @addtogroup dali-toolkit-controls
+ * @addtogroup dali_toolkit_controls
  * @{
  */
 

diff --git a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
index 3b6b33fab0c94a3fff56ab8d74dbf12c2d4fdc20..da3805057667c9983b0d28c144f6a6a9b8b9969e 100644 (file)
--- a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
+++ b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
@@ -32,7 +32,7 @@ namespace Internal DALI_INTERNAL
 class KeyboardFocusManager;
 }
 /**
- * @addtogroup dali-toolkit-focus-manager
+ * @addtogroup dali_toolkit_focus_manager
  * @{
  */
 

diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h
index 2cb0f1ad80474974d03941a57f32e664886e82d5..fb833550e2c02816070c0634bc97dc52576dbc0f 100644 (file)
--- a/doc/dali-toolkit-doc.h
+++ b/doc/dali-toolkit-doc.h
@@ -16,56 +16,56 @@
  * <ul>
  * <li>DALi Core: This module provides scene graph-based rendering, animation, and event handling.</li>
  * <li>DALi Adaptor: This module is a platform adaptation layer.</li>
- * <li>DALi Toolkit: This module provides UI components and various effects on top of the dali-core.</li>
+ * <li>DALi Toolkit: This module provides UI components and various effects on top of the DALi Core.</li>
  * </ul>
  *
- * @defgroup dali-toolkit DALi Toolkit
+ * @defgroup dali_toolkit DALi Toolkit
  * @ingroup dali
  *
- * @brief This module provides UI components and various effects on top of the dali-core.
+ * @brief This module provides UI components and various effects on top of the DALi Core.
  *
  * @{
- *   @defgroup dali-toolkit-accessibility-manager Accessibility Manager
+ *   @defgroup dali_toolkit_accessibility_manager Accessibility Manager
  *   @brief AccessibilityManager manages a accessibility focus chain.
 
- *   @defgroup dali-toolkit-controls Controls
+ *   @defgroup dali_toolkit_controls Controls
  *   @brief Controls are interactive components for layouting the user interface.
 
  *   @{
- *     @defgroup dali-toolkit-controls-alignment Alignment
+ *     @defgroup dali_toolkit_controls_alignment Alignment
  *     @brief Alignment is a container which provides an easy way to align other actors inside its boundary.
 
- *     @defgroup dali-toolkit-controls-buttons Buttons
+ *     @defgroup dali_toolkit_controls_buttons Buttons
  *     @brief Button is a small object on UI that you can press.
 
- *     @defgroup dali-toolkit-controls-gaussian-blur-view Gaussian Blur View
+ *     @defgroup dali_toolkit_controls_gaussian_blur_view Gaussian Blur View
  *     @brief GaussianBlurView provides a render process that blurs an image.
 
- *     @defgroup dali-toolkit-controls-image-view Image View
+ *     @defgroup dali_toolkit_controls_image_view Image View
  *     @brief ImageView is a control displying an image.
 
- *     @defgroup dali-toolkit-controls-scroll-bar Scroll Bar
+ *     @defgroup dali_toolkit_controls_scroll_bar Scroll Bar
  *     @brief ScrollBar control.
 
- *     @defgroup dali-toolkit-controls-scrollable Scrollable
+ *     @defgroup dali_toolkit_controls_scrollable Scrollable
  *     @brief Scrollable container controls.
 
  *     @{
- *       @defgroup dali-toolkit-controls-item-view Item View
+ *       @defgroup dali_toolkit_controls_item_view Item View
  *       @brief ItemView class is a scrollable container that can contain many items.
 
- *       @defgroup dali-toolkit-controls-scroll-view Scroll View
- *       @brief ScrollView class provides scrollable view which contains actors and can be scrolled automatically or manually by panning. 
+ *       @defgroup dali_toolkit_controls_scroll_view Scroll View
+ *       @brief ScrollView class provides scrollable view which contains actors and can be scrolled automatically or manually by panning.
 
  *     @}
- *     @defgroup dali-toolkit-controls-table-view Table View
+ *     @defgroup dali_toolkit_controls_table_view Table View
  *     @brief TableView class is a layout container for aligning child actors in a grid like layout.
 
- *     @defgroup dali-toolkit-controls-text-controls Text Controls
+ *     @defgroup dali_toolkit_controls_text_controls Text Controls
  *     @brief Controls for displaying text or text input.
 
  *   @}
- *   @defgroup dali-toolkit-focus-manager Focus Manager
+ *   @defgroup dali_toolkit_focus_manager Focus Manager
  *   @brief Classes for handling keyboard navigation and maintaining the two dimensional keyboard focus chain.
 
  * @}