projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b3e71e4)
Revert "[3.0] Updated @since tags for APIs added since 1.2.0 that are required for... 33/97733/1
authordongsug.song <dongsug.song@samsung.com>
Tue, 15 Nov 2016 02:38:24 +0000 (11:38 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Tue, 15 Nov 2016 02:38:27 +0000 (11:38 +0900)
This reverts commit a4cb650405d42e266d3276967fc63f39bffd1c88.

Change-Id: Ied2247bcdc9758d8e50daf3186e9dd9029970799

build/tizen/docs/dali.doxy.in patch | blob | history
dali-toolkit/public-api/controls/text-controls/text-editor.h patch | blob | history
dali-toolkit/public-api/controls/text-controls/text-field.h patch | blob | history
dali-toolkit/public-api/visuals/primitive-visual-properties.h patch | blob | history
dali-toolkit/public-api/visuals/visual-properties.h patch | blob | history

diff --git a/build/tizen/docs/dali.doxy.in b/build/tizen/docs/dali.doxy.in
index 3f5b8a5342bb59ff1614e822e91ca0813dd636ba..c54fe2969298c3619a596a12da6a37db3cc7496e 100644 (file)
--- a/build/tizen/docs/dali.doxy.in
+++ b/build/tizen/docs/dali.doxy.in
@@ -345,10 +345,6 @@ ALIASES += clip{3}="\dontinclude \1 \n \skip \2 \n \until \3"
 ALIASES += SINCE_1_0="@since 1.0"
 ALIASES += SINCE_1_1="@since 1.1"
 
-# Extra tags for Tizen 3.0
-ALIASES += SINCE_1_2_2="@since 1.2.2"
-ALIASES += SINCE_1_2_4="@since 1.2.4"
-
 ALIASES += DEPRECATED_1_0="@deprecated Deprecated since 1.0"
 ALIASES += DEPRECATED_1_1="@deprecated Deprecated since 1.1"
 
@@ -363,17 +359,11 @@ ALIASES += REMARK_INTERNET=""
 ## For Tizen Native API Reference
 #ALIASES += SINCE_1_0="\par Since:\n 2.4, DALi version 1.0"
 #ALIASES += SINCE_1_1="\par Since:\n 3.0, DALi version 1.1"
-#ALIASES += SINCE_1_2="\par Since:\n 4.0, DALi version 1.2"
-
-## Extra tags for Tizen 3.0
-#ALIASES += SINCE_1_2_2="\par Since:\n 3.0, DALi version 1.2.2"
-#ALIASES += SINCE_1_2_4="\par Since:\n 3.0, DALi version 1.2.4"
 
 ## DALi has no deprecated API in Tizen 2.4 because it's DALi's first release.
 ## Thus deprecated APIs in DALi 1.0.xx will be deprecated in Tizen 3.0.
 #ALIASES += DEPRECATED_1_0="@deprecated Deprecated since 3.0, DALi version 1.0"
 #ALIASES += DEPRECATED_1_1="@deprecated Deprecated since 3.0, DALi version 1.1"
-#ALIASES += DEPRECATED_1_2="@deprecated Deprecated since 4.0, DALi version 1.2"
 
 #ALIASES += PLATFORM="@platform"
 #ALIASES += PRIVLEVEL_PLATFORM="\par Privilege Level:\n platform"
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 5185d891f2b568d09e9f99719869b688f4a89955..1498246c69b84169c51bced61bcdf9102c857376 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-editor.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-editor.h
@@ -43,7 +43,7 @@ class TextEditor;
  * | %Signal Name         | Method                         |                    |
  * |----------------------|--------------------------------|--------------------|
  * | textChanged          | @ref TextChangedSignal()       | @SINCE_1_1.37      |
- * | inputStyleChanged    | @ref InputStyleChangedSignal() | @SINCE_1_2_2       |
+ * | inputStyleChanged    | @ref InputStyleChangedSignal() | @SINCE_1_2.2       |
  *
  */
 class DALI_IMPORT_API TextEditor : public Control
@@ -114,22 +114,22 @@ public:
   /**
    * @brief Mask used by the signal InputStyleChangedSignal(). Notifies which parameters of the input style have changed.
    *
-   * @SINCE_1_2_2
+   * @SINCE_1_2.2
    */
   struct InputStyle
   {
     enum Mask
     {
-      NONE         = 0x0000, ///< @SINCE_1_2_2
-      COLOR        = 0x0001, ///< @SINCE_1_2_2
-      FONT_FAMILY  = 0x0002, ///< @SINCE_1_2_2
-      POINT_SIZE   = 0x0004, ///< @SINCE_1_2_2
-      FONT_STYLE   = 0x0008, ///< @SINCE_1_2_2
-      LINE_SPACING = 0x0010, ///< @SINCE_1_2_2
-      UNDERLINE    = 0x0020, ///< @SINCE_1_2_2
-      SHADOW       = 0x0040, ///< @SINCE_1_2_2
-      EMBOSS       = 0x0080, ///< @SINCE_1_2_2
-      OUTLINE      = 0x0100  ///< @SINCE_1_2_2
+      NONE         = 0x0000, ///< @SINCE_1_2.2
+      COLOR        = 0x0001, ///< @SINCE_1_2.2
+      FONT_FAMILY  = 0x0002, ///< @SINCE_1_2.2
+      POINT_SIZE   = 0x0004, ///< @SINCE_1_2.2
+      FONT_STYLE   = 0x0008, ///< @SINCE_1_2.2
+      LINE_SPACING = 0x0010, ///< @SINCE_1_2.2
+      UNDERLINE    = 0x0020, ///< @SINCE_1_2.2
+      SHADOW       = 0x0040, ///< @SINCE_1_2.2
+      EMBOSS       = 0x0080, ///< @SINCE_1_2.2
+      OUTLINE      = 0x0100  ///< @SINCE_1_2.2
     };
   };
 
@@ -143,7 +143,7 @@ public:
 
   /**
    * @brief Input Style changed signal type.
-   * @SINCE_1_2_2
+   * @SINCE_1_2.2
    */
   typedef Signal<void ( TextEditor, InputStyle::Mask ) > InputStyleChangedSignalType;
 
@@ -223,7 +223,7 @@ public:
    *   void YourCallbackName( TextEditor textEditor, TextEditor::InputStyle::Mask mask );
    * @endcode
    *
-   * @SINCE_1_2_2
+   * @SINCE_1_2.2
    * @return The signal to connect to.
    */
   InputStyleChangedSignalType& InputStyleChangedSignal();
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 ddfa4af669848697aac12242f65b390c160b53dc..f33483cd5a883ececeec9cb4c218529ccecd2609 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-field.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-field.h
@@ -44,7 +44,7 @@ class TextField;
  * |----------------------|--------------------------------|--------------------|
  * | textChanged          | @ref TextChangedSignal()       | @SINCE_1_0.0       |
  * | maxLengthReached     | @ref MaxLengthReachedSignal()  | @SINCE_1_0.0       |
- * | inputStyleChanged    | @ref InputStyleChangedSignal() | @SINCE_1_2_2       |
+ * | inputStyleChanged    | @ref InputStyleChangedSignal() | @SINCE_1_2.2       |
  */
 class DALI_IMPORT_API TextField : public Control
 {
@@ -133,21 +133,21 @@ public:
   /**
    * @brief Mask used by the signal InputStyleChangedSignal(). Notifies which parameters of the input style have changed.
    *
-   * @SINCE_1_2_2
+   * @SINCE_1_2.2
    */
   struct InputStyle
   {
     enum Mask
     {
-      NONE         = 0x0000, ///< @SINCE_1_2_2
-      COLOR        = 0x0001, ///< @SINCE_1_2_2
-      FONT_FAMILY  = 0x0002, ///< @SINCE_1_2_2
-      POINT_SIZE   = 0x0004, ///< @SINCE_1_2_2
-      FONT_STYLE   = 0x0008, ///< @SINCE_1_2_2
-      UNDERLINE    = 0x0010, ///< @SINCE_1_2_2
-      SHADOW       = 0x0020, ///< @SINCE_1_2_2
-      EMBOSS       = 0x0040, ///< @SINCE_1_2_2
-      OUTLINE      = 0x0080  ///< @SINCE_1_2_2
+      NONE         = 0x0000, ///< @SINCE_1_2.2
+      COLOR        = 0x0001, ///< @SINCE_1_2.2
+      FONT_FAMILY  = 0x0002, ///< @SINCE_1_2.2
+      POINT_SIZE   = 0x0004, ///< @SINCE_1_2.2
+      FONT_STYLE   = 0x0008, ///< @SINCE_1_2.2
+      UNDERLINE    = 0x0010, ///< @SINCE_1_2.2
+      SHADOW       = 0x0020, ///< @SINCE_1_2.2
+      EMBOSS       = 0x0040, ///< @SINCE_1_2.2
+      OUTLINE      = 0x0080  ///< @SINCE_1_2.2
     };
   };
 
@@ -167,7 +167,7 @@ public:
 
   /**
    * @brief Input Style changed signal type.
-   * @SINCE_1_2_2
+   * @SINCE_1_2.2
    */
   typedef Signal<void ( TextField, InputStyle::Mask ) > InputStyleChangedSignalType;
 
@@ -256,7 +256,7 @@ public:
    *   void YourCallbackName( TextField textField, TextField::InputStyle::Mask mask );
    * @endcode
    *
-   * @SINCE_1_2_2
+   * @SINCE_1_2.2
    * @return The signal to connect to.
    */
   InputStyleChangedSignalType& InputStyleChangedSignal();
diff --git a/dali-toolkit/public-api/visuals/primitive-visual-properties.h b/dali-toolkit/public-api/visuals/primitive-visual-properties.h
index dbf1e5ce96480d2ae587a7d0e0e53b0a7e972d70..9fdc9bd969b8fdca6776dd0f421872a44860ada6 100644 (file)
--- a/dali-toolkit/public-api/visuals/primitive-visual-properties.h
+++ b/dali-toolkit/public-api/visuals/primitive-visual-properties.h
@@ -47,7 +47,7 @@ enum
   /**
    * @brief The color of the shape.
    * @details Name "mixColor", type Property::VECTOR4.
-   * @SINCE_1_2_4
+   * @SINCE_1_1.45
    * @note Optional. If not specified, the default is Vector4(0.5, 0.5, 0.5, 1.0).
    * @note Applies to ALL shapes.
    */
diff --git a/dali-toolkit/public-api/visuals/visual-properties.h b/dali-toolkit/public-api/visuals/visual-properties.h
index 989d93871cafbaa6e42ffb0133af05d1d63534f3..8b2272dad21174ea4b6c8fb1722e520fd4c42bf5 100644 (file)
--- a/dali-toolkit/public-api/visuals/visual-properties.h
+++ b/dali-toolkit/public-api/visuals/visual-properties.h
@@ -42,7 +42,7 @@ enum Type
   IMAGE, ///< Renders an image into the control's quad. @SINCE_1_1.45
   MESH, ///< Renders a mesh using an "obj" file, optionally with textures provided by an "mtl" file. @SINCE_1_1.45
   PRIMITIVE, ///< Renders a simple 3D shape, such as a cube or sphere. @SINCE_1_1.45
-  WIREFRAME, ///< Renders a simple wire-frame outlining a quad. @SINCE_1_2_2
+  WIREFRAME, ///< Renders a simple wire-frame outlining a quad. @SINCE_1_1.45
 };
 
 namespace Property
@@ -67,7 +67,7 @@ enum
    * @note Will override the existing shaders.
    * @see Shader::Property
    */
-  SHADER,
+  SHADER
 };
 
 } // namespace Property
Domain: Graphics System / DALi;