[2.2.1] Merge different codes between 2.2 and 3.0

[platform/framework/native/appfw.git] / inc / FBaseFloat.h

diff --git a/inc/FBaseFloat.h b/inc/FBaseFloat.h
index 7e2b38c..b10d4e0 100644 (file)
--- a/inc/FBaseFloat.h
+++ b/inc/FBaseFloat.h
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -28,7 +27,6 @@
 
 #include <FBaseNumber.h>
 
-
 namespace Tizen { namespace Base
 {
 /**
@@ -194,8 +192,9 @@ public:
         *      @param[out]     ret                     The numeric representation of the string
         *      @exception      E_SUCCESS        The method is successful.
         *      @exception      E_NUM_FORMAT The specified string does not contain a number that can be parsed.
-        *      @remarks        This method guarantees that the original value of out-parameter is not changed when the method returns error.
-        *      @remarks        The behavior of this method is dependent on the system default locale setting.
+        *      @remarks
+        *                              - This method guarantees that the original value of out-parameter is not changed when the method returns error.
+        *                              - The behavior of this method is dependent on the system default locale setting.
         *      @see            Tizen::Base::Double::Parse()
         */
        static result Parse(const String& s, float& ret);
@@ -269,10 +268,11 @@ public:
         * @since                       2.0
         *
         * @return              A string containing a Unicode representation of the value of the current instance
-        * @remarks             If the value is Not-a-Number (NaN), the result is the string "NaN". Furthermore, infinity
+        * @remarks
+        *                              - If the value is Not-a-Number (NaN), the result is the string "NaN". Furthermore, infinity
         *                              produces the result "Infinity". @n
         *                              6 digits are given for the precision of this method. Use String::Format() to set the specific precision.
-        * @remarks             The behavior of this method is dependent on the system default locale setting.
+        *                              - The behavior of this method is dependent on the system default locale setting.
         */
        virtual String ToString(void) const;
 
@@ -283,10 +283,11 @@ public:
         *
         *      @return         A string containing a Unicode representation of the specified @c float value
         *      @param[in]      value   A @c float value to convert
-        *  @remarks    If the value is Not-a-Number (NaN), the result is the string "NaN". Furthermore, infinity
+        *  @remarks
+        *                              - If the value is Not-a-Number (NaN), the result is the string "NaN". Furthermore, infinity
         *                              produces the result "Infinity". @n
         *                              6 digits are given for the precision of this method. Use String::Format() to set the specific precision.
-        * @remarks             The behavior of this method is dependent on the system default locale setting.
+        *                              - The behavior of this method is dependent on the system default locale setting.
         */
        static String ToString(float value);
 
@@ -397,7 +398,7 @@ private:
        static const int __DBL_MAX_10_EXP = 308;
 
        friend class _FloatImpl;
-       class _FloatImpl * __pFloatImpl;
+       class _FloatImpl* __pFloatImpl;
 
 }; // Float