From 8f5f7c07039d34a2f4ccb9836ace7f7e0d54d08a Mon Sep 17 00:00:00 2001 From: "dahyeong.kim" Date: Mon, 29 Jul 2013 15:56:07 +0900 Subject: [PATCH] [2.2.1] Merge different codes between 2.2 and 3.0 Change-Id: I2fb562b32f2269324db4cd4f3c9b87f11d24cdc7 Signed-off-by: dahyeong.kim --- inc/FBaseColMultiHashMap.h | 4 +- inc/FBaseColStlConverter.h | 26 +++--- inc/FBaseComparerT.h | 12 ++- inc/FBaseDataType.h | 16 +++- inc/FBaseFloat.h | 9 +- inc/FBaseFloatComparer.h | 5 +- inc/FBaseFloatMatrix.h | 79 +++++++++--------- inc/FBaseFloatMatrix3.h | 5 +- inc/FBaseFloatMatrix4.h | 13 ++- inc/FBaseInt8.h | 8 +- inc/FBaseInt8Comparer.h | 11 ++- inc/FBaseIntMatrix.h | 56 ++++++------- inc/FBaseInteger.h | 9 +- inc/FBaseIntegerComparer.h | 5 +- inc/FBaseLog.h | 148 ++++++++++++++++----------------- inc/FBaseLong.h | 5 +- inc/FBaseLongComparer.h | 11 ++- inc/FBaseLongLong.h | 7 +- inc/FBaseLongLongComparer.h | 33 ++++---- inc/FBaseNumber.h | 1 - inc/FBaseObject.h | 3 +- inc/FBaseResult.h | 30 +++---- src/base/FBaseDoubleMatrix.cpp | 4 +- src/base/FBaseFloatMatrix.cpp | 4 +- src/base/FBaseIntMatrix.cpp | 4 +- src/base/FBaseResult.cpp | 4 +- src/base/FBaseSys.cpp | 34 ++++---- src/base/inc/FBase_Log.h | 8 +- src/base/inc/FBase_ObjectManagerImpl.h | 12 +-- 29 files changed, 279 insertions(+), 287 deletions(-) mode change 100755 => 100644 src/base/FBaseSys.cpp diff --git a/inc/FBaseColMultiHashMap.h b/inc/FBaseColMultiHashMap.h index e9da74c..25ac0d2 100644 --- a/inc/FBaseColMultiHashMap.h +++ b/inc/FBaseColMultiHashMap.h @@ -237,7 +237,7 @@ public: * @return An enumerator (an instance of the IEnumerator derived class) of this map, @n * else @c null if some exception occurs * @remarks If the key has multiple values, the enumeration proceeds as follows: {A: a}, {B: b}, {B: c}, {B, d}, {C: e}, ... - * The specific error code can be accessed using the GetLastResult() method. + * The specific error code can be accessed using the GetLastResult() method. * @see IMapEnumerator */ virtual IEnumerator* GetEnumeratorN(void) const; @@ -250,7 +250,7 @@ public: * @return An enumerator (an instance of the IMapEnumerator derived class) of this map, @n * else @c null if some exception occurs * @remarks If the key has multiple values, the enumeration proceeds as follows: {A: a}, {B: b}, {B: c}, {B, d}, {C: e}, ... - * The specific error code can be accessed using the GetLastResult() method. + * The specific error code can be accessed using the GetLastResult() method. * @see IEnumerator */ virtual IMapEnumerator* GetMapEnumeratorN(void) const; diff --git a/inc/FBaseColStlConverter.h b/inc/FBaseColStlConverter.h index e6c282d..819b18b 100644 --- a/inc/FBaseColStlConverter.h +++ b/inc/FBaseColStlConverter.h @@ -97,7 +97,7 @@ public: * @return An IteratorT instance * @param[in] pList A pointer to the IList instance to convert */ - template < typename T > + template< typename T > static IteratorT< T > GetBeginIterator(const IList* pList) { return IteratorT< T >(*pList); @@ -111,7 +111,7 @@ public: * @return An IteratorT instance * @param[in] pList A pointer to the IList instance to convert */ - template < typename T > + template< typename T > static IteratorT< T > GetEndIterator(const IList* pList) { return IteratorT< T >(*pList, true); @@ -125,7 +125,7 @@ public: * @return A RandomIteratorT instance * @param[in] pList A pointer to the IList instance to convert */ - template < typename T > + template< typename T > static RandomIteratorT< T > GetBeginRandomIterator(const IList* pList) { return RandomIteratorT< T >(*pList, 0); @@ -139,7 +139,7 @@ public: * @return A RandomIteratorT instance * @param[in] pList A pointer to the IList instance to convert */ - template < typename T > + template< typename T > static RandomIteratorT< T > GetEndRandomIterator(const IList* pList) { return RandomIteratorT< T >(*pList, pList->GetCount()); @@ -154,7 +154,7 @@ public: * @return A PairIteratorT instance * @param[in] pMap A pointer to the IMap instance to convert */ - template < typename K, typename V > + template< typename K, typename V > static PairIteratorT< K, V > GetBeginPairIterator(const IMap* pMap) { return PairIteratorT< K, V >(*pMap); @@ -169,7 +169,7 @@ public: * @return A PairIteratorT instance * @param[in] pMap A pointer to the IMap instance to convert */ - template < typename K, typename V > + template< typename K, typename V > static PairIteratorT< K, V > GetEndPairIterator(const IMap* pMap) { return PairIteratorT< K, V >(*pMap, true); @@ -184,7 +184,7 @@ public: * @return A PairIteratorT instance * @param[in] pMultiMap A pointer to the IMultiMap instance to convert */ - template < typename K, typename V > + template< typename K, typename V > static PairIteratorT< K, V > GetBeginPairIterator(const IMultiMap* pMultiMap) { return PairIteratorT< K, V >(*pMultiMap); @@ -199,7 +199,7 @@ public: * @return A PairIteratorT instance * @param[in] pMultiMap A pointer to the IMultiMap instance to convert */ - template < typename K, typename V > + template< typename K, typename V > static PairIteratorT< K, V > GetEndPairIterator(const IMultiMap* pMultiMap) { return PairIteratorT< K, V >(*pMultiMap, true); @@ -227,7 +227,7 @@ public: * @see SingleObjectDeleter() * @see ArrayDeleter() */ - template < typename FwdIter > + template< typename FwdIter > static std::unique_ptr< ArrayList > GetArrayListN(FwdIter begin, FwdIter end, DeleterFunctionType deleter = NoOpDeleter) { std::unique_ptr< ArrayList > pArrayList(new (std::nothrow) ArrayList(deleter)); @@ -271,7 +271,7 @@ public: * @see SingleObjectDeleter() * @see ArrayDeleter() */ - template < typename FwdIter > + template< typename FwdIter > static std::unique_ptr< LinkedList > GetLinkedListN(FwdIter begin, FwdIter end, DeleterFunctionType deleter = NoOpDeleter) { std::unique_ptr< LinkedList > pLinkedList(new (std::nothrow) LinkedList(deleter)); @@ -312,7 +312,7 @@ public: * @see SingleObjectDeleter() * @see ArrayDeleter() */ - template < typename PairedFwdIter > + template< typename PairedFwdIter > static std::unique_ptr< HashMap > GetHashMapN(PairedFwdIter begin, PairedFwdIter end, DeleterFunctionType deleter = NoOpDeleter) { std::unique_ptr< HashMap > pMap(new (std::nothrow) HashMap(deleter)); @@ -356,7 +356,7 @@ public: * @see SingleObjectDeleter() * @see ArrayDeleter() */ - template < typename PairedFwdIter > + template< typename PairedFwdIter > static std::unique_ptr< MultiHashMap > GetMultiHashMapN(PairedFwdIter begin, PairedFwdIter end, DeleterFunctionType deleter = NoOpDeleter) { std::unique_ptr< MultiHashMap > pMultiMap(new (std::nothrow) MultiHashMap(deleter)); @@ -410,7 +410,7 @@ private: // @return A reference to the %StlConverter instance // @param[in] rhs A reference to the %StlConverter instance // - StlConverter& operator=(const StlConverter& rhs); + StlConverter& operator =(const StlConverter& rhs); }; }}} // Tizen::Base::Collection diff --git a/inc/FBaseComparerT.h b/inc/FBaseComparerT.h index 17a4e59..cb597e1 100644 --- a/inc/FBaseComparerT.h +++ b/inc/FBaseComparerT.h @@ -23,11 +23,9 @@ #ifndef _FBASE_COMPARER_T_H_ #define _FBASE_COMPARER_T_H_ -// Includes #include #include - namespace Tizen { namespace Base { /** @@ -63,9 +61,9 @@ namespace Tizen { namespace Base * } * @endcode */ -template +template< class Type > class ComparerT - : public virtual Tizen::Base::Collection::IComparerT + : public virtual Tizen::Base::Collection::IComparerT< Type > , public Object { public: @@ -133,9 +131,9 @@ private: }; // ComparerT -template<> -class ComparerT - : public virtual Tizen::Base::Collection::IComparerT +template< > +class ComparerT< Tizen::Base::String > + : public virtual Tizen::Base::Collection::IComparerT< Tizen::Base::String > , public Object { public: diff --git a/inc/FBaseDataType.h b/inc/FBaseDataType.h index 65f321a..1a83392 100644 --- a/inc/FBaseDataType.h +++ b/inc/FBaseDataType.h @@ -40,14 +40,24 @@ namespace Tizen { namespace Base class String; }} +/** + * The user ID for authentication + * @since 2.0 + */ typedef Tizen::Base::String UserId; + +/** + * The user ID for login + * @since 2.0 + */ typedef Tizen::Base::String LoginId; /** -* The invocation ID is returned when a request is sent. -* @since 2.0 -*/ + * The invocation ID is returned when a request is sent. + * @since 2.0 + */ typedef long RequestId; + #define INVALID_REQUEST_ID -1 // Macro to get the value in byte diff --git a/inc/FBaseFloat.h b/inc/FBaseFloat.h index 3217cde..b10d4e0 100644 --- a/inc/FBaseFloat.h +++ b/inc/FBaseFloat.h @@ -27,7 +27,6 @@ #include - namespace Tizen { namespace Base { /** @@ -193,7 +192,7 @@ 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 + * @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() @@ -269,7 +268,7 @@ public: * @since 2.0 * * @return A string containing a Unicode representation of the value of the current instance - * @remarks + * @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. @@ -284,7 +283,7 @@ public: * * @return A string containing a Unicode representation of the specified @c float value * @param[in] value A @c float value to convert - * @remarks + * @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. @@ -399,7 +398,7 @@ private: static const int __DBL_MAX_10_EXP = 308; friend class _FloatImpl; - class _FloatImpl * __pFloatImpl; + class _FloatImpl* __pFloatImpl; }; // Float diff --git a/inc/FBaseFloatComparer.h b/inc/FBaseFloatComparer.h index 4056ed0..54e6e43 100644 --- a/inc/FBaseFloatComparer.h +++ b/inc/FBaseFloatComparer.h @@ -28,7 +28,6 @@ #include #include - namespace Tizen { namespace Base { /** @@ -98,7 +97,7 @@ public: * @exception E_INVALID_ARG The specified object instances are not of the expected type. * @remarks The value of @c cmp can be: * - * @code + * @code * < 0 if the value of @c obj1 is less than the value of @c obj2 * == 0 if the value of @c obj1 is equal to the value of @c obj2 * > 0 if the value of @c obj1 is greater than the value of @c obj2 @@ -119,7 +118,7 @@ private: FloatComparer& operator =(const FloatComparer& rhs); friend class _FloatComparerImpl; - class _FloatComparerImpl * __pFloatComparerImpl; + class _FloatComparerImpl* __pFloatComparerImpl; }; // FloatComparer diff --git a/inc/FBaseFloatMatrix.h b/inc/FBaseFloatMatrix.h index 9a54eb4..558f2d7 100644 --- a/inc/FBaseFloatMatrix.h +++ b/inc/FBaseFloatMatrix.h @@ -21,7 +21,6 @@ * This header file contains the declarations of the %FloatMatrix class. * */ - #ifndef _FBASE_FLOAT_MATRIX_H_ #define _FBASE_FLOAT_MATRIX_H_ @@ -70,7 +69,7 @@ public: * * @param[in] rowCount The number of rows in the current instance * @param[in] columnCount The number of columns in the current instance - * @param[in] pArray A one-dimensional array @n The array must be at least row * column in length. + * @param[in] pArray A one-dimensional array @n The array must be at least row * column in length. * @param[in] rowMajor Set to @c true to copy the array in row-major order, @n * else @c copy in column-major order */ @@ -121,11 +120,11 @@ public: * * @since 2.0 * - * @return The reference to this instance + * @return The reference to this instance * @param[in] rhs An instance of %FloatMatrix * @exception E_INVALID_ARG Either row or column count of the current instance is not same with that of the specified instance. - * @remarks The specific error code can be accessed using the GetLastResult() method. - * @remarks If either row or column count of the current instance is not same with that of the specified instance, + * @remarks The specific error code can be accessed using the GetLastResult() method. + * @remarks If either row or column count of the current instance is not same with that of the specified instance, * return the reference to this instance without assigning. */ FloatMatrix& operator =(const FloatMatrix& rhs); @@ -138,7 +137,7 @@ public: * @return @c true if the values of the current instance are equal to the value of the specified instance, @n * else @c false * @param[in] obj An instance of %FloatMatrix - * @remarks This method overrides Tizen::Base::Object::Equals(). This method uses the values of the Matrix components to compare the two instances. + * @remarks This method overrides Tizen::Base::Object::Equals(). This method uses the values of the Matrix components to compare the two instances. */ virtual bool Equals(const Tizen::Base::Object& obj) const; @@ -149,7 +148,7 @@ public: * * @return The hash value of the current instance * @remarks Two equal instances must return the same hash value. For better performance, - * the used hash function must generate a random distribution for all inputs. + * the used hash function must generate a random distribution for all inputs. */ virtual int GetHashCode(void) const; @@ -159,8 +158,8 @@ public: * @since 2.0 * * @return An error code - * @param[in] matrix An instance of %FloatMatrix - * @exception E_SUCCESS The method is successful. + * @param[in] matrix An instance of %FloatMatrix + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG Either row or column count of the current instance is not same with that of the specified instance. */ result Add(const FloatMatrix& matrix); @@ -189,9 +188,9 @@ public: * @since 2.0 * * @return A pointer to float array - * @param[in] columnIndex The target column number in the current instance + * @param[in] columnIndex The target column number in the current instance * @exception E_INVALID_ARG The @c columnIndex is larger than the column count of the current instance. - * @remarks The specific error code can be accessed using the GetLastResult() method. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ float* GetColumnN(int columnIndex) const; @@ -200,9 +199,9 @@ public: * * @since 2.0 * - * @return The determinant value of the current instance + * @return The determinant value of the current instance * @exception E_INVALID_OPERATION The current instance is not a square matrix. - * @remarks The specific error code can be accessed using the GetLastResult() method. + * @remarks The specific error code can be accessed using the GetLastResult() method. * @remarks If the current instance is not a square matrix, return zero. */ float GetDeterminant(void) const; @@ -213,10 +212,10 @@ public: * @since 2.0 * * @return The value at the specified row and column of the current instance - * @param[in] rowIndex The target row number in the current instance - * @param[in] columnIndex The target column number in the current instance + * @param[in] rowIndex The target row number in the current instance + * @param[in] columnIndex The target column number in the current instance * @exception E_INVALID_ARG The @c columnIndex or @c rowIndex is larger than that of the current instance. - * @remarks The specific error code can be accessed using the GetLastResult() method. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ float GetElement(int rowIndex, int columnIndex) const; @@ -225,9 +224,9 @@ public: * * @since 2.0 * - * @return A pointer to the instance of %FloatMatrix containing the resulting value of the operation + * @return A pointer to the instance of %FloatMatrix containing the resulting value of the operation * @exception E_INVALID_OPERATION The current instance is not a square matrix. - * @remarks The specific error code can be accessed using the GetLastResult() method. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ FloatMatrix* GetInverseN(void) const; @@ -246,9 +245,9 @@ public: * @since 2.0 * * @return A pointer to @c float array - * @param[in] rowIndex The target row number in the current instance + * @param[in] rowIndex The target row number in the current instance * @exception E_INVALID_ARG The @c rowIndex is larger than the row count of the current instance. - * @remarks The specific error code can be accessed using the GetLastResult() method. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ float* GetRowN(int rowIndex) const; @@ -258,7 +257,7 @@ public: * @since 2.0 * * @return An error code - * @param[out] value A @c float value + * @param[out] value A @c float value * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ @@ -269,9 +268,9 @@ public: * * @since 2.0 * - * @return A pointer to the instance of %FloatMatrix containing the resulting value of the operation - * @exception E_INVALID_OPERATION The current instance is not a square matrix. - * @remarks The specific error code can be accessed using the GetLastResult() method. + * @return A pointer to the instance of %FloatMatrix containing the resulting value of the operation + * @exception E_INVALID_OPERATION The current instance is not a square matrix. + * @remarks The specific error code can be accessed using the GetLastResult() method. */ FloatMatrix* GetTransposeN(void) const; @@ -301,8 +300,8 @@ public: * @since 2.0 * * @return An error code - * @param[in] matrix An instance of %FloatMatrix - * @exception E_SUCCESS The method is successful. + * @param[in] matrix An instance of %FloatMatrix + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The column count of the current instance is not same with the row count of the specified instance. */ result Multiply(const FloatMatrix& matrix); @@ -329,7 +328,7 @@ public: * @since 2.0 * * @return An error code - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ result SetAsIdentity(void); @@ -340,7 +339,7 @@ public: * @since 2.0 * * @return An error code - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ result Invert(void); @@ -351,7 +350,7 @@ public: * @since 2.0 * * @return An error code - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ result Transpose(void); @@ -362,9 +361,9 @@ public: * @since 2.0 * * @return An error code - * @param[in] columnIndex The target column number in the current instance - * @param[in] pArray An array which includes the values @n The array must be at least row in length. - * @exception E_SUCCESS The method is successful. + * @param[in] columnIndex The target column number in the current instance + * @param[in] pArray An array which includes the values @n The array must be at least row in length. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The @c pArray is @c null, or the @c columnIndex is larger than the column count of the current instance. */ result SetColumn(int columnIndex, const float* pArray); @@ -375,9 +374,9 @@ public: * @since 2.0 * * @return An error code - * @param[in] rowIndex The target row number in the current instance - * @param[in] pArray An array which includes the values @n The array must be at least column in length. - * @exception E_SUCCESS The method is successful. + * @param[in] rowIndex The target row number in the current instance + * @param[in] pArray An array which includes the values @n The array must be at least column in length. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The @c pArray is @c null, or the @c rowIndex is larger than the row count of the current instance. */ result SetRow(int rowIndex, const float* pArray); @@ -390,7 +389,7 @@ public: * @return An error code * @param[in] rowIndex The target row number in the current instance * @param[in] columnIndex The target column number in the current instance - * @param[in] value A @c float value + * @param[in] value A @c float value * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The pArray is @c null, or the @c rowIndex is larger than the row count of the current instance, * or the @c columnIndex is larger than the column count of the current instance. @@ -403,10 +402,10 @@ public: * @since 2.0 * * @return An error code - * @param[in] pArray A one-dimensional array @n The array must be at least row * column in length. + * @param[in] pArray A one-dimensional array @n The array must be at least row * column in length. * @param[in] rowMajor Set to @c true to copy the array in row-major order, @n * else @c false to copy in column-major order - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The pArray is @c null. */ result SetValue(const float* pArray, bool rowMajor = true); @@ -424,8 +423,8 @@ public: * @since 2.0 * * @return An error code - * @param[in] matrix An instance of %FloatMatrix - * @exception E_SUCCESS The method is successful. + * @param[in] matrix An instance of %FloatMatrix + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG Either row or column count of the current instance is not same with that of the specified instance. */ result Subtract(const FloatMatrix& matrix); diff --git a/inc/FBaseFloatMatrix3.h b/inc/FBaseFloatMatrix3.h index e6a9e06..ed340f7 100644 --- a/inc/FBaseFloatMatrix3.h +++ b/inc/FBaseFloatMatrix3.h @@ -21,7 +21,6 @@ * This header file contains the declarations of the %FloatMatrix3 class. * */ - #ifndef _FBASE_FLOAT_MATRIX3_H_ #define _FBASE_FLOAT_MATRIX3_H_ @@ -280,7 +279,7 @@ public: * @return @c true if the values of the current instance is equal to the value of the specified instance, @n * else @c false * @param[in] obj An instance of %FloatMatrix3 - * @remarks This method overrides Tizen::Base::Object::Equals(). This method uses the values of the Matrix components to compare the two instances. + * @remarks This method overrides Tizen::Base::Object::Equals(). This method uses the values of the Matrix components to compare the two instances. */ virtual bool Equals(const Tizen::Base::Object& obj) const; @@ -406,6 +405,6 @@ private: }; // FloatMatrix3 -}}// Tizen::Base +}} // Tizen::Base #endif //_FBASE_FLOAT_MATRIX3_H_ diff --git a/inc/FBaseFloatMatrix4.h b/inc/FBaseFloatMatrix4.h index faac984..18120fe 100644 --- a/inc/FBaseFloatMatrix4.h +++ b/inc/FBaseFloatMatrix4.h @@ -21,7 +21,6 @@ * This header file contains the declarations of the %FloatMatrix4 class. * */ - #ifndef _FBASE_FLOAT_MATRIX4_H_ #define _FBASE_FLOAT_MATRIX4_H_ @@ -246,7 +245,7 @@ public: * * @return A new instance of %FloatMatrix4 containing the resulting value of the operation * @param[in] value A @c float value to add - * @param[in] rhs An instance of %FloatMatrix4 + * @param[in] rhs An instance of %FloatMatrix4 */ _OSP_EXPORT_ friend FloatMatrix4 operator +(const float& value, const FloatMatrix4& rhs); @@ -257,7 +256,7 @@ public: * * @return A new instance of %FloatMatrix4 containing the resulting value of the operation * @param[in] value A @c float value to multiply - * @param[in] rhs An instance of %FloatMatrix4 + * @param[in] rhs An instance of %FloatMatrix4 */ _OSP_EXPORT_ friend FloatMatrix4 operator *(const float& value, const FloatMatrix4& rhs); @@ -268,7 +267,7 @@ public: * * @return A new instance of %FloatMatrix4 containing the resulting value of the operation * @param[in] value A @c float value to subtract - * @param[in] rhs An instance of %FloatMatrix4 + * @param[in] rhs An instance of %FloatMatrix4 */ _OSP_EXPORT_ friend FloatMatrix4 operator -(const float& value, const FloatMatrix4& rhs); @@ -280,7 +279,7 @@ public: * @return @c true if the values of the current instance is equal to the value of the specified instance, @n * else @c false * @param[in] obj An instance of %FloatMatrix4 - * @remarks This method overrides Tizen::Base::Object::Equals(). This method uses the values of the Matrix components to compare the two instances. + * @remarks This method overrides Tizen::Base::Object::Equals(). This method uses the values of the Matrix components to compare the two instances. */ virtual bool Equals(const Tizen::Base::Object& obj) const; @@ -291,7 +290,7 @@ public: * * @return The hash value of the current instance * @remarks Two equal instances must return the same hash value. For better performance, - * the used hash function must generate a random distribution for all inputs. + * the used hash function must generate a random distribution for all inputs. */ virtual int GetHashCode(void) const; @@ -372,7 +371,7 @@ public: * @since 2.0 * * @return An error code - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not invertible. */ result Invert(void); diff --git a/inc/FBaseInt8.h b/inc/FBaseInt8.h index 111c893..30cfdfe 100644 --- a/inc/FBaseInt8.h +++ b/inc/FBaseInt8.h @@ -27,7 +27,6 @@ #include - namespace Tizen { namespace Base { /** @@ -84,7 +83,6 @@ public: */ Int8(char value = 0); - /** * Copying of objects using this copy constructor is allowed. * @@ -170,8 +168,8 @@ public: * * @since 2.0 * - * @return An integer value indicating the hash value of the specified @c char value - * @param[in] val A @c char value to get the hash value + * @return An integer value indicating the hash value of the specified @c char value + * @param[in] val A @c char value to get the hash value */ static int GetHashCode(char val); @@ -349,7 +347,7 @@ public: private: friend class _Int8Impl; - class _Int8Impl * __pInt8Impl; + class _Int8Impl* __pInt8Impl; }; // Int8 diff --git a/inc/FBaseInt8Comparer.h b/inc/FBaseInt8Comparer.h index 3983fe1..e76551d 100644 --- a/inc/FBaseInt8Comparer.h +++ b/inc/FBaseInt8Comparer.h @@ -29,7 +29,6 @@ #include #include - namespace Tizen { namespace Base { /** @@ -92,14 +91,14 @@ public: * @since 2.0 * * @return An error code - * @param[in] obj1 The first instance of type Int8 - * @param[in] obj2 The second instance of type Int8 - * @param[out] cmp The result of comparison + * @param[in] obj1 The first instance of type Int8 + * @param[in] obj2 The second instance of type Int8 + * @param[out] cmp The result of comparison * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The specified object instances are not of the expected type. * @remarks The value of @c cmp can be: * - * @code + * @code * < 0 if the value of @c obj1 is less than the value of @c obj2 * == 0 if the value of @c obj1 is equal to the value of @c obj2 * > 0 if the value of @c obj1 is greater than the value of @c obj2 @@ -120,7 +119,7 @@ private: Int8Comparer& operator =(const Int8Comparer& rhs); friend class _Int8ComparerImpl; - class _Int8ComparerImpl * __pInt8ComparerImpl; + class _Int8ComparerImpl* __pInt8ComparerImpl; }; // Int8Comparer diff --git a/inc/FBaseIntMatrix.h b/inc/FBaseIntMatrix.h index d57f9f3..fde7ef0 100644 --- a/inc/FBaseIntMatrix.h +++ b/inc/FBaseIntMatrix.h @@ -70,7 +70,7 @@ public: * * @param[in] rowCount The number of rows in the current instance * @param[in] columnCount The number of columns in the current instance - * @param[in] pArray A one-dimensional array @n The array must be at least row * column in length. + * @param[in] pArray A one-dimensional array @n The array must be at least row * column in length. * @param[in] rowMajor Set to @c true to copy the array in row-major order, @n * else @c copy in column-major order */ @@ -125,7 +125,7 @@ public: * @param[in] rhs An instance of %IntMatrix * @exception E_INVALID_ARG Either row or column count of the current instance is not same with that of the specified instance. * @remarks If either row or column count of the current instance is not same with that of the specified instance, - * return the reference to this instance without assigning. + * return the reference to this instance without assigning. */ IntMatrix& operator =(const IntMatrix& rhs); @@ -148,7 +148,7 @@ public: * * @return The hash value of the current instance * @remarks Two equal instances must return the same hash value. For better performance, - * the used hash function must generate a random distribution for all inputs. + * the used hash function must generate a random distribution for all inputs. */ virtual int GetHashCode(void) const; @@ -158,8 +158,8 @@ public: * @since 2.0 * * @return An error code - * @param[in] matrix An instance of %IntMatrix - * @exception E_SUCCESS The method is successful. + * @param[in] matrix An instance of %IntMatrix + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG Either row or column count of the current instance is not same with that of the specified instance. */ result Add(const IntMatrix& matrix); @@ -188,7 +188,7 @@ public: * @since 2.0 * * @return A pointer to @c int array - * @param[in] columnIndex The target column number in the current instance + * @param[in] columnIndex The target column number in the current instance * @exception E_INVALID_ARG The @c columnIndex is larger than the column count of the current instance. */ int* GetColumnN(int columnIndex) const; @@ -199,7 +199,7 @@ public: * @since 2.0 * * @return The determinant value of the current instance - * @exception E_INVALID_OPERATION The current instance is not a square matrix. + * @exception E_INVALID_OPERATION The current instance is not a square matrix. * @remarks If the current instance is not a square matrix, return zero. */ int GetDeterminant(void) const; @@ -221,8 +221,8 @@ public: * * @since 2.0 * - * @return A pointer to the instance of %IntMatrix containing the resulting value of the operation - * @exception E_INVALID_OPERATION The current instance is not a square matrix. + * @return A pointer to the instance of %IntMatrix containing the resulting value of the operation + * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ IntMatrix* GetInverseN(void) const; @@ -241,7 +241,7 @@ public: * @since 2.0 * * @return A pointer to @c int array - * @param[in] rowIndex The target row number in the current instance + * @param[in] rowIndex The target row number in the current instance * @exception E_INVALID_ARG The @c rowIndex is larger than the row count of the current instance. */ int* GetRowN(int rowIndex) const; @@ -253,7 +253,7 @@ public: * * @return An error code * @param[out] value A @c int value - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ result GetTrace(int& value) const; @@ -263,8 +263,8 @@ public: * * @since 2.0 * - * @return A pointer to the instance of %IntMatrix containing the resulting value of the operation - * @exception E_INVALID_OPERATION The current instance is not a square matrix. + * @return A pointer to the instance of %IntMatrix containing the resulting value of the operation + * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ IntMatrix* GetTransposeN(void) const; @@ -294,8 +294,8 @@ public: * @since 2.0 * * @return An error code - * @param[in] matrix An instance of %IntMatrix - * @exception E_SUCCESS The method is successful. + * @param[in] matrix An instance of %IntMatrix + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The column count of the current instance is not same with the row count of the specified instance. */ result Multiply(const IntMatrix& matrix); @@ -322,7 +322,7 @@ public: * @since 2.0 * * @return An error code - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ result SetAsIdentity(void); @@ -333,7 +333,7 @@ public: * @since 2.0 * * @return An error code - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ result Invert(void); @@ -344,7 +344,7 @@ public: * @since 2.0 * * @return An error code - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_OPERATION The current instance is not a square matrix. */ result Transpose(void); @@ -355,9 +355,9 @@ public: * @since 2.0 * * @return An error code - * @param[in] columnIndex The target column number in the current instance - * @param[in] pArray An array which includes the values @n The array must be at least row in length. - * @exception E_SUCCESS The method is successful. + * @param[in] columnIndex The target column number in the current instance + * @param[in] pArray An array which includes the values @n The array must be at least row in length. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The @c pArray is @c null, or the @c columnIndex is larger than the column count of the current instance. */ result SetColumn(int columnIndex, const int* pArray); @@ -368,9 +368,9 @@ public: * @since 2.0 * * @return An error code - * @param[in] rowIndex The target row number in the current instance - * @param[in] pArray An array which includes the values @n The array must be at least column in length. - * @exception E_SUCCESS The method is successful. + * @param[in] rowIndex The target row number in the current instance + * @param[in] pArray An array which includes the values @n The array must be at least column in length. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The @c pArray is @c null, or the @c rowIndex is larger than the row count of the current instance. */ result SetRow(int rowIndex, const int* pArray); @@ -383,8 +383,8 @@ public: * @return An error code * @param[in] rowIndex The target row number in the current instance * @param[in] columnIndex The target column number in the current instance - * @param[in] value A @c int value - * @exception E_SUCCESS The method is successful. + * @param[in] value A @c int value + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The pArray is @c null, or the @c rowIndex is larger than the row count of the current instance, * or the @c columnIndex is larger than the column count of the current instance. */ @@ -399,7 +399,7 @@ public: * @param[in] pArray A one-dimensional array @n The array must be at least row * column in length. * @param[in] rowMajor Set to @c true to copy the array in row-major order, @n * else @c false to copy in column-major order - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The pArray is @c null. */ result SetValue(const int* pArray, bool rowMajor = true); @@ -418,7 +418,7 @@ public: * * @return An error code * @param[in] matrix An instance of %IntMatrix - * @exception E_SUCCESS The method is successful. + * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG Either row or column count of the current instance is not same with that of the specified instance. */ result Subtract(const IntMatrix& matrix); diff --git a/inc/FBaseInteger.h b/inc/FBaseInteger.h index 9c734dd..85af846 100644 --- a/inc/FBaseInteger.h +++ b/inc/FBaseInteger.h @@ -27,7 +27,6 @@ #include - namespace Tizen { namespace Base { /** @@ -162,8 +161,8 @@ public: * @since 2.0 * * @return An error code - * @param[in] s A string representing the numeric value - * @param[out] ret The result of the operation + * @param[in] s A string representing the numeric value + * @param[out] ret The result of the operation * @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 accepts decimal, hexadecimal, and octal numbers given by the @@ -231,7 +230,7 @@ public: * @param[out] ret The result of the operation * @exception E_SUCCESS The method is successful. * @exception E_NUM_FORMAT The specified string does not contain a number that can be parsed. - * @exception E_OUT_OF_RANGE The specified @c radix is invalid. + * @exception E_OUT_OF_RANGE The specified @c radix is invalid. * @remarks This method guarantees that the original value of out-parameter is not changed when the method returns error. */ static result Parse(const String& s, int radix, int& ret); @@ -344,7 +343,7 @@ public: private: friend class _IntegerImpl; - class _IntegerImpl * __pIntegerImpl; + class _IntegerImpl* __pIntegerImpl; }; // Integer diff --git a/inc/FBaseIntegerComparer.h b/inc/FBaseIntegerComparer.h index 7b02f52..5a1c86b 100644 --- a/inc/FBaseIntegerComparer.h +++ b/inc/FBaseIntegerComparer.h @@ -29,7 +29,6 @@ #include #include - namespace Tizen { namespace Base { /** @@ -98,7 +97,7 @@ public: * @exception E_INVALID_ARG The specified object instances are not of the expected type. * @remarks The value of @c cmp can be: * - * @code + * @code * < 0 if the value of @c obj1 is less than the value of @c obj2 * == 0 if the value of @c obj1 is equal to the value of @c obj2 * > 0 if the value of @c obj1 is greater than the value of @c obj2 @@ -119,7 +118,7 @@ private: IntegerComparer& operator =(const IntegerComparer& rhs); friend class _IntegerComparerImpl; - class _IntegerComparerImpl * __pIntegerComparerImpl; + class _IntegerComparerImpl* __pIntegerComparerImpl; }; // IntegerComparer diff --git a/inc/FBaseLog.h b/inc/FBaseLog.h index cec83bc..b2e251b 100644 --- a/inc/FBaseLog.h +++ b/inc/FBaseLog.h @@ -70,13 +70,13 @@ extern "C" { else {;} #define AppAssert(condition) \ - if (!(condition)) { \ + if (!(condition)) { \ AppassertInternal(__PRETTY_FUNCTION__, __LINE__); \ } \ else {;} #define AppAssertf(condition, ...) \ - if (!(condition)) { \ + if (!(condition)) { \ AppassertfInternal(# condition, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__); \ } \ else {;} @@ -187,7 +187,7 @@ extern "C" { * @since 2.0 * * @param[in] condition The condition that is expected to be true - * @param[in] ... The message to print, if the assertion fails + * @param[in] ... The message to print, if the assertion fails * * @image html debugging_appassert.png * @@ -219,7 +219,7 @@ extern "C" { * @since 2.0 * * @param[in] expression The expression to evaluate - * @param[in] ... The message to display + * @param[in] ... The message to display * * The following example demonstrates how to use the AppLogIf macro. * @@ -243,7 +243,7 @@ extern "C" { * @since 2.0 * * @param[in] expression The expression to evaluate - * @param[in] ... The message to display + * @param[in] ... The message to display * * The following example demonstrates how to use the AppLogDebugIf macro. * @@ -267,7 +267,7 @@ extern "C" { * @since 2.0 * * @param[in] expression The expression to evaluate - * @param[in] ... The message to display + * @param[in] ... The message to display * * The following example demonstrates how to use the AppLogExceptionIf macro. * @@ -389,7 +389,7 @@ extern "C" { * * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to CATCH label - * @param[in] ... The message to display + * @param[in] ... The message to display * * The following example demonstrates how to use the Try macro. * @@ -418,7 +418,7 @@ extern "C" { * @hideinitializer */ #define TryCatch(condition, expr, ...) \ - if (!(condition)) { \ + if (!(condition)) { \ AppLogException(__VA_ARGS__); \ expr; \ goto CATCH; \ @@ -433,8 +433,8 @@ extern "C" { * * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to CATCH label - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define TryCatchResult(condition, expr, r, ...) \ @@ -455,8 +455,8 @@ extern "C" { * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to catchLabel * @param[in] catchLabel The label for goto operation -* @param[in] r The last result to set -* @param[in] ... The message to display +* @param[in] r The last result to set +* @param[in] ... The message to display * @hideinitializer */ #define TryCatchLabelResult(condition, expr, catchLabel, r, ...) \ @@ -475,7 +475,7 @@ extern "C" { * * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define TryReturn(condition, returnValue, ...) \ @@ -509,7 +509,7 @@ extern "C" { * * @since 2.0 * - * @param[in] condition The condition that is expected to be true + * @param[in] condition The condition that is expected to be true * @param[in] r The last result to set * @param[in] ... The message to display * @hideinitializer @@ -528,7 +528,7 @@ extern "C" { * @since 2.0 * * @param[in] condition The condition that is expected to be true - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define TryReturnVoid(condition, ...) \ @@ -544,7 +544,7 @@ extern "C" { * @since 2.0 * * @param[in] condition The condition that is expected to be true - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define TryLog(condition, ...) \ @@ -560,7 +560,7 @@ extern "C" { * * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false -* @param[in] ... The message to display +* @param[in] ... The message to display * @hideinitializer */ #define TryLogReturn(condition, returnValue, ...) \ @@ -578,10 +578,10 @@ extern "C" { * * @since 2.0 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to CATCH label - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define TryCatchTag(tag, condition, expr, ...) \ @@ -598,11 +598,11 @@ extern "C" { * * @since 2.0 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to CATCH label - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define TryCatchResultTag(tag, condition, expr, r, ...) \ @@ -620,12 +620,12 @@ extern "C" { * * @since 2.1 * -* @param[in] tag Used to identify the source of a log message +* @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to catchLabel * @param[in] catchLabel The label for goto operation -* @param[in] r The last result to set -* @param[in] ... The message to display +* @param[in] r The last result to set +* @param[in] ... The message to display * @hideinitializer */ #define TryCatchLabelResultTag(tag, condition, expr, catchLabel, r, ...) \ @@ -642,10 +642,10 @@ extern "C" { * * @since 2.0 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define TryReturnTag(tag, condition, returnValue, ...) \ @@ -660,11 +660,11 @@ extern "C" { * * @since 2.0 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define TryReturnResultTag(tag, condition, returnValue, r, ...) \ @@ -680,10 +680,10 @@ extern "C" { * * @since 2.0 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define TryReturnVoidResultTag(tag, condition, r, ...) \ @@ -699,9 +699,9 @@ extern "C" { * * @since 2.0 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define TryReturnVoidTag(tag, condition, ...) \ @@ -717,7 +717,7 @@ extern "C" { * @since 2.0 * * @param[in] tag Used to identify the source of a log message - * @param[in] condition The condition that is expected to be true + * @param[in] condition The condition that is expected to be true * @param[in] ... The message to display * @hideinitializer */ @@ -732,10 +732,10 @@ extern "C" { * * @since 2.1 * -* @param[in] tag Used to identify the source of a log message +* @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false -* @param[in] ... The message to display +* @param[in] ... The message to display * @hideinitializer */ #define TryLogReturnTag(tag, condition, returnValue, ...) \ @@ -757,11 +757,11 @@ extern "C" { #if (defined(_APP_LOG) || defined(_OSP_DEBUG_) || defined(_DEBUG)) && defined(_SECURE_LOG) -#define AppSecureLog(...) AppLogInternal(__PRETTY_FUNCTION__, __LINE__, "[SECURE_LOG] "__VA_ARGS__) +#define AppSecureLog(...) AppLogInternal(__PRETTY_FUNCTION__, __LINE__, "[SECURE_LOG] "__VA_ARGS__) #define AppSecureLogDebug(...) AppLogDebugInternal(__PRETTY_FUNCTION__, __LINE__, "[SECURE_LOG] "__VA_ARGS__) #define AppSecureLogException(...) AppLogExceptionInternal(__PRETTY_FUNCTION__, __LINE__, "[SECURE_LOG] "__VA_ARGS__) -#define AppSecureLogTag(tag, ...) AppLogTagInternal(tag, __PRETTY_FUNCTION__, __LINE__, "[SECURE_LOG] "__VA_ARGS__) +#define AppSecureLogTag(tag, ...) AppLogTagInternal(tag, __PRETTY_FUNCTION__, __LINE__, "[SECURE_LOG] "__VA_ARGS__) #define AppSecureLogDebugTag(tag, ...) AppLogDebugTagInternal(tag, __PRETTY_FUNCTION__, __LINE__, "[SECURE_LOG] "__VA_ARGS__) #define AppSecureLogExceptionTag(tag, ...) AppLogExceptionTagInternal(tag, __PRETTY_FUNCTION__, __LINE__, "[SECURE_LOG] "__VA_ARGS__) @@ -828,7 +828,7 @@ extern "C" { * * @since 2.1 * - * @param[in] ... The message to display + * @param[in] ... The message to display * * The following example demonstrates how to use the AppSecureLogException macro. * @@ -939,7 +939,7 @@ extern "C" { * * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to CATCH label - * @param[in] ... The message to display + * @param[in] ... The message to display * * The following example demonstrates how to use the SecureTry macro. * @@ -986,8 +986,8 @@ extern "C" { * * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to CATCH label - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryCatchResult(condition, expr, r, ...) \ @@ -1010,7 +1010,7 @@ extern "C" { * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to catchLabel * @param[in] catchLabel The label for goto operation - * @param[in] r The last result to set + * @param[in] r The last result to set * @param[in] ... The message to display * @hideinitializer */ @@ -1032,7 +1032,7 @@ extern "C" { * * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryReturn(condition, returnValue, ...) \ @@ -1051,8 +1051,8 @@ extern "C" { * * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryReturnResult(condition, returnValue, r, ...) \ @@ -1071,8 +1071,8 @@ extern "C" { * @since 2.1 * * @param[in] condition The condition that is expected to be true - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryReturnVoidResult(condition, r, ...) \ @@ -1091,7 +1091,7 @@ extern "C" { * @since 2.1 * * @param[in] condition The condition that is expected to be true - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryReturnVoid(condition, ...) \ @@ -1109,7 +1109,7 @@ extern "C" { * @since 2.1 * * @param[in] condition The condition that is expected to be true - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryLog(condition, ...) \ @@ -1125,9 +1125,9 @@ extern "C" { * * @since 2.1 * - * @param[in] condition The condition that is expected to be true + * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryLogReturn(condition, returnValue, ...) \ @@ -1147,10 +1147,10 @@ extern "C" { * * @since 2.1 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to CATCH label - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryCatchTag(tag, condition, expr, ...) \ @@ -1169,11 +1169,11 @@ extern "C" { * * @since 2.1 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to CATCH label - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryCatchResultTag(tag, condition, expr, r, ...) \ @@ -1197,7 +1197,7 @@ extern "C" { * @param[in] condition The condition that is expected to be true * @param[in] expr Expressions that are evaluated before going to catchLabel * @param[in] catchLabel The label for goto operation - * @param[in] r The last result to set + * @param[in] r The last result to set * @param[in] ... The message to display * @hideinitializer */ @@ -1217,10 +1217,10 @@ extern "C" { * * @since 2.1 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryReturnTag(tag, condition, returnValue, ...) \ @@ -1237,11 +1237,11 @@ extern "C" { * * @since 2.1 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] r The last result to set - * @param[in] ... The message to display + * @param[in] r The last result to set + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryReturnResultTag(tag, condition, returnValue, r, ...) \ @@ -1260,7 +1260,7 @@ extern "C" { * @since 2.1 * * @param[in] tag Used to identify the source of a log message - * @param[in] condition The condition that is expected to be true + * @param[in] condition The condition that is expected to be true * @param[in] r The last result to set * @param[in] ... The message to display * @hideinitializer @@ -1280,9 +1280,9 @@ extern "C" { * * @since 2.1 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryReturnVoidTag(tag, condition, ...) \ @@ -1299,13 +1299,13 @@ extern "C" { * * @since 2.1 * - * @param[in] tag Used to identify the source of a log message + * @param[in] tag Used to identify the source of a log message * @param[in] condition The condition that is expected to be true - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryLogTag(tag, condition, ...) \ - if (!(condition)) { \ + if (!(condition)) { \ AppSecureLogTag(tag, __VA_ARGS__); \ } \ else {;} @@ -1317,10 +1317,10 @@ extern "C" { * * @since 2.1 * - * @param[in] tag Used to identify the source of a log message - * @param[in] condition The condition that is expected to be true + * @param[in] tag Used to identify the source of a log message + * @param[in] condition The condition that is expected to be true * @param[in] returnValue The value to return when the condition is @c false - * @param[in] ... The message to display + * @param[in] ... The message to display * @hideinitializer */ #define SecureTryLogReturnTag(tag, condition, returnValue, ...) \ diff --git a/inc/FBaseLong.h b/inc/FBaseLong.h index 2617ffc..08cb852 100644 --- a/inc/FBaseLong.h +++ b/inc/FBaseLong.h @@ -27,7 +27,6 @@ #include - namespace Tizen { namespace Base { /** @@ -230,7 +229,7 @@ public: * @param[out] ret The result of the operation * @exception E_SUCCESS The method is successful. * @exception E_NUM_FORMAT The specified string does not contain a number that can be parsed. - * @exception E_OUT_OF_RANGE The specified @c radix is invalid. + * @exception E_OUT_OF_RANGE The specified @c radix is invalid. * @remarks This method guarantees that the original value of out-parameter is not changed when the method returns error. */ static result Parse(const String& s, int radix, long& ret); @@ -341,7 +340,7 @@ public: private: friend class _LongImpl; - class _LongImpl * __pLongImpl; + class _LongImpl* __pLongImpl; }; // Long diff --git a/inc/FBaseLongComparer.h b/inc/FBaseLongComparer.h index 1c1aa7d..687ae3e 100644 --- a/inc/FBaseLongComparer.h +++ b/inc/FBaseLongComparer.h @@ -29,7 +29,6 @@ #include #include - namespace Tizen { namespace Base { /** @@ -91,14 +90,14 @@ public: * @since 2.0 * * @return An error code - * @param[in] obj1 The first instance of type %Long - * @param[in] obj2 The second instance of type %Long - * @param[out] cmp The result of comparison + * @param[in] obj1 The first instance of type %Long + * @param[in] obj2 The second instance of type %Long + * @param[out] cmp The result of comparison * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The specified object instances are not of the expected type. * @remarks The value of @c cmp can be: * - * @code + * @code * < 0 if the value of @c obj1 is less than the value of @c obj2 * == 0 if the value of @c obj1 is equal to the value of @c obj2 * > 0 if the value of @c obj1 is greater than the value of @c obj2 @@ -119,7 +118,7 @@ private: LongComparer& operator =(const LongComparer& rhs); friend class _LongComparerImpl; - class _LongComparerImpl * __pLongComparerImpl; + class _LongComparerImpl* __pLongComparerImpl; }; // LongComparer diff --git a/inc/FBaseLongLong.h b/inc/FBaseLongLong.h index 2734687..27c73a8 100644 --- a/inc/FBaseLongLong.h +++ b/inc/FBaseLongLong.h @@ -27,7 +27,6 @@ #include - namespace Tizen { namespace Base { /** @@ -171,7 +170,7 @@ public: * * @since 2.0 * - * @return An integer value indicating the hash value of the specified @c long @c long value + * @return An integer value indicating the hash value of the specified @c long @c long value * @param[in] val A @c long @c long value to get the hash value */ static int GetHashCode(long long val); @@ -253,7 +252,7 @@ public: * * @since 2.0 * - * @return The string containing a Unicode representation of the specified @c signed @c long @c long value + * @return The string containing a Unicode representation of the specified @c signed @c long @c long value * @param[in] value A @c signed @c long @c long value to convert */ static String ToString(long long value); @@ -317,7 +316,7 @@ public: private: friend class _LongLongImpl; - class _LongLongImpl * __pLongLongImpl; + class _LongLongImpl* __pLongLongImpl; }; // LongLong diff --git a/inc/FBaseLongLongComparer.h b/inc/FBaseLongLongComparer.h index 654f283..722464e 100644 --- a/inc/FBaseLongLongComparer.h +++ b/inc/FBaseLongLongComparer.h @@ -29,7 +29,6 @@ #include #include - namespace Tizen { namespace Base { /** @@ -72,36 +71,36 @@ class _OSP_EXPORT_ LongLongComparer { public: /** - * This is the default constructor for this class. + * This is the default constructor for this class. * - * @since 2.0 + * @since 2.0 */ LongLongComparer(void); /** - * This destructor overrides Tizen::Base::Object::~Object(). + * This destructor overrides Tizen::Base::Object::~Object(). * - * @since 2.0 + * @since 2.0 */ virtual ~LongLongComparer(void); /** - * Compares two given instances of type LongLong. + * Compares two given instances of type LongLong. * - * @since 2.0 - * @return An error code - * @param[in] obj1 The first instance of type LongLong - * @param[in] obj2 The second instance of type LongLong - * @param[out] cmp The result of comparison - * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_ARG The specified object instances are not of the expected type. - * @remarks The value of @c cmp can be: + * @since 2.0 + * @return An error code + * @param[in] obj1 The first instance of type LongLong + * @param[in] obj2 The second instance of type LongLong + * @param[out] cmp The result of comparison + * @exception E_SUCCESS The method is successful. + * @exception E_INVALID_ARG The specified object instances are not of the expected type. + * @remarks The value of @c cmp can be: * - * @code + * @code * < 0 if the value of @c obj1 is less than the value of @c obj2 * == 0 if the value of @c obj1 is equal to the value of @c obj2 * > 0 if the value of @c obj1 is greater than the value of @c obj2 - * @endcode + * @endcode */ virtual result Compare(const Tizen::Base::Object& obj1, const Tizen::Base::Object& obj2, int& cmp) const; @@ -118,7 +117,7 @@ private: LongLongComparer& operator =(const LongLongComparer& rhs); friend class _LongLongComparerImpl; - class _LongLongComparerImpl * __pLongLongComparerImpl; + class _LongLongComparerImpl* __pLongLongComparerImpl; }; // LongLongComparer diff --git a/inc/FBaseNumber.h b/inc/FBaseNumber.h index 893749c..df41931 100644 --- a/inc/FBaseNumber.h +++ b/inc/FBaseNumber.h @@ -27,7 +27,6 @@ #include #include - namespace Tizen { namespace Base { /** diff --git a/inc/FBaseObject.h b/inc/FBaseObject.h index 2ab0af2..eb21496 100644 --- a/inc/FBaseObject.h +++ b/inc/FBaseObject.h @@ -28,7 +28,6 @@ #include #include - namespace Tizen { namespace Base { /** @@ -64,7 +63,7 @@ public: * @since 2.0 * * @return @c true if the value of the specified instance of %Object is equal to the value of the current instance of %Object, @n - * else @c false + * else @c false * @param[in] obj An instance of %Object to compare * @remarks The default implementation of this method returns @c true * if the two instances have the same address. @n diff --git a/inc/FBaseResult.h b/inc/FBaseResult.h index 75aa944..4a5e490 100644 --- a/inc/FBaseResult.h +++ b/inc/FBaseResult.h @@ -54,41 +54,41 @@ _OSP_EXPORT_ void RegisterErrorTable(unsigned long package, struct ErrorTable* p _OSP_EXPORT_ const char* GetErrorMessage(result value); -_OSP_EXPORT_ result TransExceptionsExclusiveInternal(result r, result e, int num,...); +_OSP_EXPORT_ result TransExceptionsExclusiveInternal(result r, result e, int num, ...); -_OSP_EXPORT_ result TransExceptionsInclusiveInternal(result r, result e, int num,...); +_OSP_EXPORT_ result TransExceptionsInclusiveInternal(result r, result e, int num, ...); -#define NUMARGS(...) (sizeof((result[]){0, ##__VA_ARGS__})/sizeof(result)-1) +#define NUMARGS(...) (sizeof((result[]){0, ##__VA_ARGS__}) / sizeof(result) - 1) /** * This macro returns translated exception when the checked exception doesn't correspond with the conditional exceptions. -* In contrast, this macro returns the checked exception if it corresponds with the conditional exceptions. +* In contrast, this macro returns the checked exception if it corresponds with the conditional exceptions. * * @since 2.0 * -* @return The translated exception -* @param[in] r The result that will be checked -* @param[in] e The translated exception -* @param[in] ... The list of exceptions that will be excluded in translation process @n -* All other exceptions than this list will be translated into @c e. +* @return The translated exception +* @param[in] r The result that will be checked +* @param[in] e The translated exception +* @param[in] ... The list of exceptions that will be excluded in translation process @n +* All other exceptions than this list will be translated into @c e. * * */ #define TransExceptionsExclusive(r, e, ...) TransExceptionsExclusiveInternal(r, e, NUMARGS(__VA_ARGS__), __VA_ARGS__) - + /** * This macro returns translated exception when the checked exception corresponds with the conditional exceptions. * In contrast, this macro returns the checked exception if it doesn't correspond with the conditional exceptions. * * @since 2.0 * -* @return The translated exception -* @param[in] r The result that will be checked -* @param[in] e The translated exception -* @param[in] ... The list of exceptions that will be included in translation process @n -* All exceptions in this list will be translated into @c e. +* @return The translated exception +* @param[in] r The result that will be checked +* @param[in] e The translated exception +* @param[in] ... The list of exceptions that will be included in translation process @n +* All exceptions in this list will be translated into @c e. * */ diff --git a/src/base/FBaseDoubleMatrix.cpp b/src/base/FBaseDoubleMatrix.cpp index 72a1e18..e9a2ed7 100644 --- a/src/base/FBaseDoubleMatrix.cpp +++ b/src/base/FBaseDoubleMatrix.cpp @@ -693,9 +693,9 @@ DoubleMatrix::Invert(void) pMinor[i] = new double[__row - 1]; if (pMinor[i] == null) { - for (int i = 0; i < __row; i++) + for (int k = 0; k < __row; k++) { - delete[] pInverse[i]; + delete[] pInverse[k]; } for (int j = 0; j < i; j++) diff --git a/src/base/FBaseFloatMatrix.cpp b/src/base/FBaseFloatMatrix.cpp index 5a09982..bcd60e0 100644 --- a/src/base/FBaseFloatMatrix.cpp +++ b/src/base/FBaseFloatMatrix.cpp @@ -691,9 +691,9 @@ FloatMatrix::Invert(void) pMinor[i] = new (std::nothrow) float[__row - 1]; if (pMinor[i] == null) { - for (int i = 0; i < __row; i++) + for (int k = 0; k < __row; k++) { - delete[] pInverse[i]; + delete[] pInverse[k]; } for (int j = 0; j < i; j++) diff --git a/src/base/FBaseIntMatrix.cpp b/src/base/FBaseIntMatrix.cpp index 676bbe1..0c2cbb8 100644 --- a/src/base/FBaseIntMatrix.cpp +++ b/src/base/FBaseIntMatrix.cpp @@ -690,9 +690,9 @@ IntMatrix::Invert(void) pMinor[i] = new int[__row - 1]; if (pMinor[i] == null) { - for (int i = 0; i < __row; i++) + for (int k = 0; k < __row; k++) { - delete[] pInverse[i]; + delete[] pInverse[k]; } for (int j = 0; j < i; j++) diff --git a/src/base/FBaseResult.cpp b/src/base/FBaseResult.cpp index 0b8264c..65f976b 100644 --- a/src/base/FBaseResult.cpp +++ b/src/base/FBaseResult.cpp @@ -378,7 +378,7 @@ TransExceptionsExclusiveInternal(result r, result e, int num, ...) } va_start(ap, num); - for (count; count < num; count++) + for (; count < num; count++) { if (r == va_arg(ap, result)) { @@ -409,7 +409,7 @@ TransExceptionsInclusiveInternal(result r, result e, int num, ...) } va_start(ap, num); - for (count; count < num; count++) + for (; count < num; count++) { if (r == va_arg(ap, result)) { diff --git a/src/base/FBaseSys.cpp b/src/base/FBaseSys.cpp old mode 100755 new mode 100644 index 8c7ab5a..a560d93 --- a/src/base/FBaseSys.cpp +++ b/src/base/FBaseSys.cpp @@ -81,7 +81,7 @@ static bool envPlatformInfoEnabled = false; #define WEB_RESERVED(X) NID_WEB+X #define SHELL_RESERVED(X) NID_SHELL+X -LogInfo logInfo = +static LogInfo logInfo = { { //OSP Namespace ID =============================================================== @@ -482,7 +482,7 @@ SysLogInternal(unsigned long nid, const char* pFunction, int lineNumber, const c { va_list args; - if (!envLoaded) + if (unlikely(!envLoaded)) { int ret = access("/home/developer/.platforminfologgingmode", F_OK); if (ret == 0) @@ -538,7 +538,7 @@ SysLogTagInternal(unsigned long nid, const char* pTag, const char* pFunction, in { va_list args; - if (!envLoaded) + if (unlikely(!envLoaded)) { int ret = access("/home/developer/.platforminfologgingmode", F_OK); if (ret == 0) @@ -695,7 +695,7 @@ SysTryReturnResultInternal(unsigned long id, result r, const char* pFunction, in void __PrintLog(_LogType type, const char* pFunction, int lineNumber, const char* pFormat, va_list args) { - if (!iniLoaded) + if (unlikely(!iniLoaded)) { __InitializeLogInfo(); } @@ -706,7 +706,7 @@ __PrintLog(_LogType type, const char* pFunction, int lineNumber, const char* pFo char logTag[LOG_MODULE_NAME_LEN_MAX]; - if (!appNameLoaded) + if (unlikely(!appNameLoaded)) { appNameLoaded = true; char* pAppName = _StringConverter::CopyToCharArrayN(_AppInfo::GetAppExecutableName()); @@ -744,7 +744,7 @@ __PrintLog(_LogType type, const char* pFunction, int lineNumber, const char* pFo void __PrintLogTag(const char* pTag, _LogType type, const char* pFunction, int lineNumber, const char* pFormat, va_list args) { - if (!iniLoaded) + if (unlikely(!iniLoaded)) { __InitializeLogInfo(); } @@ -786,7 +786,7 @@ __PrintLogTag(const char* pTag, _LogType type, const char* pFunction, int lineNu void __PrintSysLog(_LogType type, LogID id, const char* pFunction, int lineNumber, const char* pFormat, va_list args) { - if (!iniLoaded) + if (unlikely(!iniLoaded)) { __InitializeLogInfo(); } @@ -832,7 +832,7 @@ __PrintSysLog(_LogType type, LogID id, const char* pFunction, int lineNumber, co void __PrintSysLogTag(const char* pTag, _LogType type, LogID id, const char* pFunction, int lineNumber, const char* pFormat, va_list args) { - if (!iniLoaded) + if (unlikely(!iniLoaded)) { __InitializeLogInfo(); } @@ -875,7 +875,7 @@ __PrintSysLogTag(const char* pTag, _LogType type, LogID id, const char* pFunctio } } -char* +const char* __GetModuleName(LogID id) { return logInfo.logTable[id].logModuleName; @@ -913,14 +913,14 @@ __InitializeLogInfo() void __InitializeLogLevel(const Registry& reg) { - String sectApp(L"Application"); - String sectPlatform(L"Platform"); + const String sectApp(L"Application"); + const String sectPlatform(L"Platform"); - String entryInfo(L"INFO"); - String entryDebug(L"DEBUG"); - String entryException(L"EXCEPTION"); + const String entryInfo(L"INFO"); + const String entryDebug(L"DEBUG"); + const String entryException(L"EXCEPTION"); - String strYes(L"YES"); + const String strYes(L"YES"); String retString; result r; @@ -974,10 +974,10 @@ __InitializeLogLevel(const Registry& reg) void __InitializePlatformModule(const Registry& reg) { - String strYes(L"YES"); + const String strYes(L"YES"); String retString; - String sectModule(L"PlatformModules"); + const String sectModule(L"PlatformModules"); result r; diff --git a/src/base/inc/FBase_Log.h b/src/base/inc/FBase_Log.h index 8292f2e..9b11e33 100644 --- a/src/base/inc/FBase_Log.h +++ b/src/base/inc/FBase_Log.h @@ -43,9 +43,9 @@ extern "C" { */ typedef struct LogEntry { - int logID; - char logIDName[LOG_MODULE_NAME_LEN_MAX]; - char logModuleName[LOG_MODULE_NAME_LEN_MAX]; + const int logID; + const char logIDName[LOG_MODULE_NAME_LEN_MAX]; + const char logModuleName[LOG_MODULE_NAME_LEN_MAX]; bool loggingEnabled; } LogEntry; @@ -83,7 +83,7 @@ void __PrintLogTag(const char* pTag, _LogType type, const char* pFunction, int l void __PrintSysLog(_LogType type, LogID id, const char* pFunction, int lineNumber, const char* pFormat, va_list args); void __PrintSysLogTag(const char* pTag, _LogType type, LogID id, const char* pFunction, int lineNumber, const char* pFormat, va_list args); -char* __GetModuleName(LogID id); +const char* __GetModuleName(LogID id); bool __GetEnableInfo(LogID id); void __InitializeLogInfo(void); diff --git a/src/base/inc/FBase_ObjectManagerImpl.h b/src/base/inc/FBase_ObjectManagerImpl.h index 8806cc8..362c451 100644 --- a/src/base/inc/FBase_ObjectManagerImpl.h +++ b/src/base/inc/FBase_ObjectManagerImpl.h @@ -71,15 +71,15 @@ public: * * @since 2.0 */ - _ObjectManagerImpl(_ObjectManagerImpl& pObjectManagerImpl) + _ObjectManagerImpl(_ObjectManagerImpl& objectManagerImpl) { - __slotCount = pObjectManagerImpl.__slotCount; - __slotCapacity = pObjectManagerImpl.__slotCapacity; - __pSlots = new _HandleElement[pObjectManagerImpl.__slotCapacity]; + __slotCount = objectManagerImpl.__slotCount; + __slotCapacity = objectManagerImpl.__slotCapacity; + __pSlots = new _HandleElement[objectManagerImpl.__slotCapacity]; - for (unsigned int i = 0; i < pObjectManagerImpl.__slotCapacity; i++) + for (unsigned int i = 0; i < objectManagerImpl.__slotCapacity; i++) { - __pSlots[i] = pObjectManagerImpl.__pSlots[i]; + __pSlots[i] = objectManagerImpl.__pSlots[i]; } __pLock = new (std::nothrow) Tizen::Base::Runtime::Mutex(); -- 2.7.4