From a55bef8df7a2603cee6c4449b4183070733a2e8d Mon Sep 17 00:00:00 2001 From: taeyoon Date: Tue, 9 Aug 2016 20:26:13 +0900 Subject: [PATCH] Revert "[3.0] Exclude internal tag module in Public API reference" This reverts commit 16c784aac03ef0caf68262193ec49c9be2367542. Change-Id: I146fc8c623895d9198639cfee439a3d9ee3a41f8 --- dali-toolkit/public-api/controls/alignment/alignment.h | 2 -- dali-toolkit/public-api/controls/buttons/button.h | 2 -- dali-toolkit/public-api/controls/buttons/check-box-button.h | 2 -- dali-toolkit/public-api/controls/buttons/push-button.h | 2 -- dali-toolkit/public-api/controls/buttons/radio-button.h | 2 -- dali-toolkit/public-api/controls/control-impl.h | 3 --- dali-toolkit/public-api/controls/control.h | 2 -- dali-toolkit/public-api/controls/flex-container/flex-container.h | 2 -- .../public-api/controls/gaussian-blur-view/gaussian-blur-view.h | 2 -- dali-toolkit/public-api/controls/image-view/image-view.h | 2 -- dali-toolkit/public-api/controls/model3d-view/model3d-view.h | 2 -- .../public-api/controls/page-turn-view/page-turn-landscape-view.h | 2 -- .../public-api/controls/page-turn-view/page-turn-portrait-view.h | 2 -- dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h | 2 -- dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h | 2 -- dali-toolkit/public-api/controls/scrollable/item-view/item-view.h | 2 -- .../public-api/controls/scrollable/scroll-view/scroll-view-effect.h | 1 - .../controls/scrollable/scroll-view/scroll-view-page-path-effect.h | 1 - dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h | 2 -- dali-toolkit/public-api/controls/scrollable/scrollable.h | 2 -- dali-toolkit/public-api/controls/slider/slider.h | 4 ---- dali-toolkit/public-api/controls/table-view/table-view.h | 2 -- dali-toolkit/public-api/controls/text-controls/text-editor.h | 2 -- dali-toolkit/public-api/controls/text-controls/text-label.h | 2 -- dali-toolkit/public-api/controls/video-view/video-view.h | 2 -- dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h | 1 - dali-toolkit/public-api/styling/style-manager.h | 1 - 27 files changed, 53 deletions(-) diff --git a/dali-toolkit/public-api/controls/alignment/alignment.h b/dali-toolkit/public-api/controls/alignment/alignment.h index 79ca65c..a5360d7 100644 --- a/dali-toolkit/public-api/controls/alignment/alignment.h +++ b/dali-toolkit/public-api/controls/alignment/alignment.h @@ -237,7 +237,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -246,7 +245,6 @@ public: // Not intended for application developers DALI_INTERNAL Alignment( Internal::Alignment& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/buttons/button.h b/dali-toolkit/public-api/controls/buttons/button.h index b6e2eec..8893d88 100644 --- a/dali-toolkit/public-api/controls/buttons/button.h +++ b/dali-toolkit/public-api/controls/buttons/button.h @@ -521,7 +521,6 @@ public: //Signals public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -530,7 +529,6 @@ public: // Not intended for application developers DALI_INTERNAL Button( Internal::Button& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_0.0 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 17463dd..fb8e5e8 100644 --- a/dali-toolkit/public-api/controls/buttons/check-box-button.h +++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h @@ -106,7 +106,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_0.0 * @param[in] implementation The Control implementation. @@ -114,7 +113,6 @@ public: // Not intended for application developers DALI_INTERNAL CheckBoxButton( Internal::CheckBoxButton& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @SINCE_1_0.0 * @param[in] internal A pointer to the internal CustomActor. diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h index 894082b..0b03907 100644 --- a/dali-toolkit/public-api/controls/buttons/push-button.h +++ b/dali-toolkit/public-api/controls/buttons/push-button.h @@ -220,7 +220,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -229,7 +228,6 @@ public: // Not intended for application developers DALI_INTERNAL PushButton( Internal::PushButton& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/buttons/radio-button.h b/dali-toolkit/public-api/controls/buttons/radio-button.h index 1266d4a..110a6a6 100644 --- a/dali-toolkit/public-api/controls/buttons/radio-button.h +++ b/dali-toolkit/public-api/controls/buttons/radio-button.h @@ -148,7 +148,6 @@ class DALI_IMPORT_API RadioButton: public Button public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -157,7 +156,6 @@ class DALI_IMPORT_API RadioButton: public Button DALI_INTERNAL RadioButton( Internal::RadioButton& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index cd57e81..4779d58 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -248,14 +248,12 @@ public: bool IsKeyboardFocusGroup(); /** - * @internal * @brief Called by the AccessibilityManager to activate the Control. * @SINCE_1_0.0 */ DALI_INTERNAL void AccessibilityActivate(); /** - * @internal * @brief Called by the KeyboardFocusManager. * @SINCE_1_0.0 */ @@ -279,7 +277,6 @@ public: Toolkit::Control::KeyInputFocusSignalType& KeyInputFocusLostSignal(); /** - * @internal * @brief Called by the KeyInputFocusManager to emit key event signals. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index 613307a..cdeee6b 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -412,7 +412,6 @@ public: // Intended for control developers public: // Templates for Deriving Classes /** - * @internal * @brief Template to allow deriving controls to DownCast handles to deriving handle classes. * * @tparam T The handle class @@ -444,7 +443,6 @@ public: // Templates for Deriving Classes } /** - * @internal * @brief Template to allow deriving controls to verify whether the Internal::CustomActor* is actually an * implementation of their class. * diff --git a/dali-toolkit/public-api/controls/flex-container/flex-container.h b/dali-toolkit/public-api/controls/flex-container/flex-container.h index 2b96061..856c83a 100644 --- a/dali-toolkit/public-api/controls/flex-container/flex-container.h +++ b/dali-toolkit/public-api/controls/flex-container/flex-container.h @@ -272,7 +272,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_1.35 * @@ -281,7 +280,6 @@ public: // Not intended for application developers DALI_INTERNAL FlexContainer( Internal::FlexContainer& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @SINCE_1_1.35 * 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 c8242a2..524943d 100644 --- 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 @@ -299,7 +299,6 @@ public: // Signals public: /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_0.0 * @param[in] implementation The UI Control implementation. @@ -307,7 +306,6 @@ public: DALI_INTERNAL GaussianBlurView( Internal::GaussianBlurView& implementation ); /** - * @internal * @brief Allows the creation of this UI Control from an Internal::CustomActor pointer. * @SINCE_1_0.0 * @param[in] internal A pointer to the internal CustomActor. 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 56b0f5f..bc401f1 100644 --- a/dali-toolkit/public-api/controls/image-view/image-view.h +++ b/dali-toolkit/public-api/controls/image-view/image-view.h @@ -243,7 +243,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -252,7 +251,6 @@ public: // Not intended for application developers DALI_INTERNAL ImageView( Internal::ImageView& implementation ); /** - * @internal * @brief Allows the creation of this ImageView from an Internal::CustomActor pointer. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h index 0af5de9..536df51 100644 --- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.h +++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.h @@ -145,7 +145,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_1.4 @@ -154,7 +153,6 @@ public: // Not intended for application developers DALI_INTERNAL Model3dView( Internal::Model3dView& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_1.4 diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h index bd34929..da8a4cd 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-landscape-view.h @@ -88,7 +88,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_0.0 * @param[in] implementation The Control implementation. @@ -96,7 +95,6 @@ public: // Not intended for application developers DALI_INTERNAL PageTurnLandscapeView( Internal::PageTurnLandscapeView& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @SINCE_1_0.0 * @param[in] internal A pointer to the internal CustomActor. diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h index dfd9a86..deab41e 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-portrait-view.h @@ -89,7 +89,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_1.4 * @param[in] implementation The Control implementation. @@ -97,7 +96,6 @@ public: // Not intended for application developers DALI_INTERNAL PageTurnPortraitView( Internal::PageTurnPortraitView& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @SINCE_1_1.4 * @param[in] internal A pointer to the internal CustomActor. diff --git a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h index 2f044bd..42c8b48 100644 --- a/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h +++ b/dali-toolkit/public-api/controls/page-turn-view/page-turn-view.h @@ -183,7 +183,6 @@ public: //Signal public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_1.4 * @param[in] implementation The Control implementation. @@ -191,7 +190,6 @@ public: // Not intended for application developers DALI_INTERNAL PageTurnView(Internal::PageTurnView& implementation); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @SINCE_1_1.4 * @param[in] internal A pointer to the internal CustomActor. 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 8e77b50..f8cbfea 100755 --- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h +++ b/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h @@ -398,7 +398,6 @@ public: // Signals public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_0.0 * @param[in] implementation The Control implementation. @@ -406,7 +405,6 @@ public: // Not intended for application developers DALI_INTERNAL ScrollBar( Internal::ScrollBar& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @SINCE_1_0.0 * @param[in] internal A pointer to the internal CustomActor. 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 cdbfa34..e1907c5 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-view.h @@ -515,7 +515,6 @@ public: // Signals public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -524,7 +523,6 @@ public: // Not intended for application developers DALI_INTERNAL ItemView(Internal::ItemView& implementation); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_0.0 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 57fd52e..72758a3 100644 --- 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 @@ -71,7 +71,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief This constructor is used by Dali New() methods. * * @SINCE_1_0.0 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 cfbc1ca..5ffd551 100644 --- 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 @@ -108,7 +108,6 @@ public: protected: /** - * @internal * @brief This constructor is used by Dali New() methods. * @SINCE_1_0.0 * @param [in] impl A pointer to a newly allocated Dali resource 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 3d33d7c..69fbd94 100644 --- a/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h +++ b/dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h @@ -1235,7 +1235,6 @@ public: // Signals public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -1244,7 +1243,6 @@ public: // Not intended for application developers DALI_INTERNAL ScrollView(Internal::ScrollView& implementation); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/scrollable/scrollable.h b/dali-toolkit/public-api/controls/scrollable/scrollable.h index e3cc844..0df8a58 100644 --- a/dali-toolkit/public-api/controls/scrollable/scrollable.h +++ b/dali-toolkit/public-api/controls/scrollable/scrollable.h @@ -240,7 +240,6 @@ public: // Signals public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -249,7 +248,6 @@ public: // Not intended for application developers DALI_INTERNAL Scrollable(Internal::Scrollable& implementation); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/slider/slider.h b/dali-toolkit/public-api/controls/slider/slider.h index d1fec07..8ba6139 100644 --- a/dali-toolkit/public-api/controls/slider/slider.h +++ b/dali-toolkit/public-api/controls/slider/slider.h @@ -267,18 +267,14 @@ public: // Signals public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. - * * @SINCE_1_1.39 * @param[in] implementation The Control implementation */ DALI_INTERNAL Slider(Internal::Slider& implementation); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. - * @SINCE_1_1.39 * @param[in] internal A pointer to the internal CustomActor */ 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 de308a9..e3f17b7 100644 --- a/dali-toolkit/public-api/controls/table-view/table-view.h +++ b/dali-toolkit/public-api/controls/table-view/table-view.h @@ -500,7 +500,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_0.0 * @param[in] implementation The Control implementation. @@ -508,7 +507,6 @@ public: // Not intended for application developers DALI_INTERNAL TableView(Internal::TableView& implementation); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @SINCE_1_0.0 * @param[in] internal A pointer to the internal CustomActor. diff --git a/dali-toolkit/public-api/controls/text-controls/text-editor.h b/dali-toolkit/public-api/controls/text-controls/text-editor.h index f9cdff4..1de3730 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-editor.h +++ b/dali-toolkit/public-api/controls/text-controls/text-editor.h @@ -173,7 +173,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @param[in] implementation The Control implementation. @@ -181,7 +180,6 @@ public: // Not intended for application developers DALI_INTERNAL TextEditor( Internal::TextEditor& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @param[in] internal A pointer to the internal CustomActor. 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 557c419..105690a 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.h +++ b/dali-toolkit/public-api/controls/text-controls/text-label.h @@ -318,7 +318,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_0.0 @@ -327,7 +326,6 @@ public: // Not intended for application developers DALI_INTERNAL TextLabel( Internal::TextLabel& implementation ); /** - * @internal * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/controls/video-view/video-view.h b/dali-toolkit/public-api/controls/video-view/video-view.h index ae4c612..e519db1 100644 --- a/dali-toolkit/public-api/controls/video-view/video-view.h +++ b/dali-toolkit/public-api/controls/video-view/video-view.h @@ -210,7 +210,6 @@ public: public: // Not intended for application developers /** - * @internal * @brief Creates a handle using the Toolkit::Internal implementation. * * @SINCE_1_1.38 @@ -219,7 +218,6 @@ public: // Not intended for application developers DALI_INTERNAL VideoView( Internal::VideoView& implementation ); /** - * @internal * @brief Allows the creation of this VideoView from an Internal::CustomActor pointer. * * @SINCE_1_1.38 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 374d7ed..18f0dbb 100644 --- a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h +++ b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h @@ -288,7 +288,6 @@ public: // Signals // Not intended for application developers /** - * @internal * @brief Creates a new handle from the implementation. * * @SINCE_1_0.0 diff --git a/dali-toolkit/public-api/styling/style-manager.h b/dali-toolkit/public-api/styling/style-manager.h index 1e27c90..54191e4 100644 --- a/dali-toolkit/public-api/styling/style-manager.h +++ b/dali-toolkit/public-api/styling/style-manager.h @@ -173,7 +173,6 @@ public: // Signals public: /** - * @internal * @brief Allows the creation of a StyleManager handle from an internal pointer. * * @note Not intended for application developers -- 2.7.4