From 9665e0005fdc4290f6f7b5ecb0867657c4694429 Mon Sep 17 00:00:00 2001 From: Suchita Date: Fri, 12 Jul 2013 16:07:39 +0600 Subject: [PATCH] Beautified source code of appfw/inc Change-Id: I962718f9f568c170deb354ed23ce8c5b490957e3 Signed-off-by: Suchita --- inc/FBaseDataType.h | 8 +--- inc/FBaseDateTime.h | 105 ++++++++++++++++++++++------------------------ inc/FBaseDouble.h | 64 +++++++++++++--------------- inc/FBaseDoubleComparer.h | 14 +++---- inc/FBaseDoubleMatrix.h | 75 ++++++++++++++++----------------- inc/FBaseDoubleMatrix3.h | 79 +++++++++++++++++----------------- inc/FBaseDoubleMatrix4.h | 77 ++++++++++++++++------------------ inc/FBaseErrorDefine.h | 16 +++---- inc/FBaseErrors.h | 19 +-------- 9 files changed, 203 insertions(+), 254 deletions(-) diff --git a/inc/FBaseDataType.h b/inc/FBaseDataType.h index d0cd079..65f321a 100644 --- a/inc/FBaseDataType.h +++ b/inc/FBaseDataType.h @@ -23,7 +23,6 @@ #ifndef _FBASE_DATA_TYPE_H_ #define _FBASE_DATA_TYPE_H_ - /** * @c byte is an @c unsigned @c char datatype. * @since 2.0 @@ -36,7 +35,6 @@ typedef unsigned char byte; */ typedef unsigned long result; - namespace Tizen { namespace Base { class String; @@ -45,7 +43,6 @@ class String; typedef Tizen::Base::String UserId; typedef Tizen::Base::String LoginId; - /** * The invocation ID is returned when a request is sent. * @since 2.0 @@ -53,13 +50,11 @@ typedef Tizen::Base::String LoginId; typedef long RequestId; #define INVALID_REQUEST_ID -1 - // Macro to get the value in byte #define GET_MASK(val, pos, msk) (((val) & ((msk) << (pos))) >> (pos)) // Macro to put the value in byte #define PUT_MASK(var, val, pos) ((var) | ((val) << (pos))) - #ifndef Handle typedef int Handle; #define INVALID_HANDLE -1 @@ -73,7 +68,6 @@ typedef int Handle; #define INFINITE 0xFFFFFFFF #endif // INFINITE - #ifndef UUID #ifndef UUID__DEFINED typedef struct UUID_ @@ -91,4 +85,4 @@ typedef struct UUID_ #define UUID UUID_ #endif // UUID -#endif // _FBASE_DATA_TYPE_H_ +#endif // _FBASE_DATA_TYPE_H_ \ No newline at end of file diff --git a/inc/FBaseDateTime.h b/inc/FBaseDateTime.h index 7e626e6..8112db6 100644 --- a/inc/FBaseDateTime.h +++ b/inc/FBaseDateTime.h @@ -28,7 +28,6 @@ #include #include - namespace Tizen { namespace Base { /** @@ -127,7 +126,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] year The year to set * @param[in] month The month to set * @param[in] day The day to set @@ -136,9 +135,9 @@ public: * @param[in] second The second to set * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n - * Either the arguments are greater than the value returned by GetMaxValue() or + * Either the arguments are greater than the value returned by GetMaxValue() or * are less than the value returned by GetMinValue(), or - * the arguments contain invalid values. + * the arguments contain invalid values. * For example, day is 31 when month is 2. */ result SetValue(int year, int month, int day, int hour = 0, int minute = 0, int second = 0); @@ -148,7 +147,7 @@ public: * * @since 2.1 * - * @return An error code + * @return An error code * @param[in] year The year to set * @param[in] month The month to set * @param[in] day The day to set @@ -171,7 +170,7 @@ public: * * @since 2.1 * - * @return An error code + * @return An error code * @param[in] ticks The number of ticks * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @@ -187,8 +186,8 @@ public: * * @since 2.0 * - * @return A reference to the current object - * @param[in] rhs An instance of %DateTime + * @return A reference to the current object + * @param[in] rhs An instance of %DateTime */ DateTime& operator =(const DateTime& rhs); @@ -197,9 +196,9 @@ public: * * @since 2.0 * - * @return @c true if the current instance is equivalent to the specified instance, @n - * else @c false - * @param[in] rhs An instance of %DateTime + * @return @c true if the current instance is equivalent to the specified instance, @n + * else @c false + * @param[in] rhs An instance of %DateTime */ bool operator ==(const DateTime& rhs) const; @@ -208,9 +207,9 @@ public: * * @since 2.0 * - * @return @c true if the current instance is not equivalent to the specified instance, @n - * else @c false - * @param[in] rhs An instance of %DateTime + * @return @c true if the current instance is not equivalent to the specified instance, @n + * else @c false + * @param[in] rhs An instance of %DateTime */ bool operator !=(const DateTime& rhs) const; @@ -219,9 +218,9 @@ public: * * @since 2.0 * - * @return @c true if the value of the current instance is less than the value of the specified instance, @n - * else @c false - * @param[in] rhs An instance of %DateTime + * @return @c true if the value of the current instance is less than the value of the specified instance, @n + * else @c false + * @param[in] rhs An instance of %DateTime */ bool operator <(const DateTime& rhs) const; @@ -230,9 +229,9 @@ public: * * @since 2.0 * - * @return @c true if the value of the current instance is greater than the value of the specified instance, @n - * else @c false - * @param[in] rhs An instance of %DateTime + * @return @c true if the value of the current instance is greater than the value of the specified instance, @n + * else @c false + * @param[in] rhs An instance of %DateTime */ bool operator >(const DateTime& rhs) const; @@ -241,9 +240,9 @@ public: * * @since 2.0 * - * @return @c true if the value of the current instance is less than or equal to the value of the specified instance, @n - * else @c false - * @param[in] rhs An instance of %DateTime + * @return @c true if the value of the current instance is less than or equal to the value of the specified instance, @n + * else @c false + * @param[in] rhs An instance of %DateTime */ bool operator <=(const DateTime& rhs) const; @@ -252,8 +251,8 @@ public: * * @since 2.0 * - * @return @c true if the value of the current instance is greater than or equal to the value of the specified instance, @n - * else @c false + * @return @c true if the value of the current instance is greater than or equal to the value of the specified instance, @n + * else @c false * @param[in] rhs An instance of %DateTime */ bool operator >=(const DateTime& rhs) const; @@ -263,7 +262,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] t The time span to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -277,7 +276,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] days The number of days to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -291,7 +290,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] hours The number of hours to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -305,7 +304,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] minutes The number of minutes to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -319,7 +318,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] months The number of months to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -333,7 +332,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] seconds The number of seconds to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -347,7 +346,7 @@ public: * * @since 2.1 * - * @return An error code + * @return An error code * @param[in] milliseconds The number of milliseconds to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -361,7 +360,7 @@ public: * * @since 2.1 * - * @return An error code + * @return An error code * @param[in] ticks The number of ticks to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -375,7 +374,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] years The number of years to add * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -390,7 +389,7 @@ public: * * @since 2.0 * - * @return A 32-bit @c signed integer value + * @return A 32-bit @c signed integer value * @code * < 0 if the value of @c dt1 is less than the value of @c dt2 * == 0 if the value of @c dt1 is equal to the value of @c dt2 @@ -406,13 +405,13 @@ public: * * @since 2.0 * - * @return A 32-bit @c signed integer value + * @return A 32-bit @c signed integer value * @code * < 0 if the value of the current instance is less than value of the specified instance * == 0 if the value of the current instance is equal to value of the specified instance * > 0 if the value of the current instance is greater than value of the specified instance * @endcode - * @param[in] value An instance of %DateTime + * @param[in] value An instance of %DateTime */ int CompareTo(const DateTime& value) const; @@ -422,9 +421,9 @@ public: * @since 2.0 * * @return @c true if the specified instance of Object is equivalent to the current instance of %DateTime, @n - * else @c false + * else @c false * @param[in] obj The object to compare with the current instance of %DateTime - * @see Tizen::Base::Object::GetHashCode() + * @see Tizen::Base::Object::GetHashCode() */ virtual bool Equals(const Object& obj) const; @@ -453,13 +452,13 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] year The year * @param[in] month The month * @param[out] days The number of days * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n - * @c year must be a value between @c 1 and @c 9999 and @c month must be a value between @c 1 and @c 12. + * @c year must be a value between @c 1 and @c 9999 and @c month must be a value between @c 1 and @c 12. */ static result GetDaysInMonth(int year, int month, int& days); @@ -468,7 +467,7 @@ public: * * @since 2.0 * - * @return An error code + * @return An error code * @param[in] t The time span to deduct * @exception E_SUCCESS The method is successful. * @exception E_OUT_OF_RANGE The value of the argument is outside the valid range defined by the method. @n @@ -500,10 +499,10 @@ public: * @exception E_SUCCESS The method is successful. * @exception E_INVALID_FORMAT The specified string is in an invalid format. * @exception E_OUT_OF_RANGE The specified string contains an invalid value. @n - * 1) The resulting value of %DateTime is greater than the value returned by GetMaxValue() - * or is less than the value returned by GetMinValue(). @n - * 2) The specified string contains an invalid value. - * For example, day is 31 when the month is 2. + * 1) The resulting value of %DateTime is greater than the value returned by GetMaxValue() + * or is less than the value returned by GetMinValue(). @n + * 2) The specified string contains an invalid value. + * For example, day is 31 when the month is 2. * @remarks * - The format of the string is "mm/dd/yyyy hh:mm:ss". * - This method guarantees that the original value of out-parameter is not changed when the method returns error. @@ -515,7 +514,7 @@ public: * * @since 2.0 * - * @return An integer value indicating the year of the current instance of %DateTime + * @return An integer value indicating the year of the current instance of %DateTime */ int GetYear(void) const; @@ -626,7 +625,7 @@ public: * @since 2.0 * * @return @c true if the year represented by the current instance of %DateTime is a leap year, @n - * else @c false + * else @c false */ bool IsLeapYear(void) const; @@ -636,7 +635,7 @@ public: * @since 2.0 * * @return @c true if the specified year is a leap year, @n - * else @c false + * else @c false * @param[in] year The year */ static bool IsLeapYear(int year); @@ -647,7 +646,6 @@ private: int CountLeapYear(int year) const { return static_cast< int >((year - 1) / 4 - (year - 1) / 100 + (year - 1) / 400); - } int CountDays(int year) const @@ -709,11 +707,8 @@ private: TmDateTime __dateTime; friend class _DateTimeImpl; - class _DateTimeImpl * __pDateTimeImpl; + class _DateTimeImpl* __pDateTimeImpl; }; // DateTime - }} // Tizen::Base - -#endif // _FBASE_DATE_TIME_H_ - +#endif // _FBASE_DATE_TIME_H_ \ No newline at end of file diff --git a/inc/FBaseDouble.h b/inc/FBaseDouble.h index c61f155..a636438 100644 --- a/inc/FBaseDouble.h +++ b/inc/FBaseDouble.h @@ -15,10 +15,10 @@ // /** - * @file FBaseDouble.h - * @brief This is the header file for the %Double class. + * @file FBaseDouble.h + * @brief This is the header file for the %Double class. * - * @see Tizen::Base::Number + * @see Tizen::Base::Number * * This header file contains the declarations of the %Double class. */ @@ -27,7 +27,6 @@ #include - namespace Tizen { namespace Base { /** @@ -85,11 +84,10 @@ public: * * @since 2.0 * - * @param[in] value A @c double value + * @param[in] value A @c double value */ Double(double value = 0.0L); - /** * Copying of objects using this copy constructor is allowed. * @@ -179,7 +177,7 @@ public: * @since 2.0 * * @return An integer value indicating the hash value of the current instance of %Double - * @remarks Two equal instances must return the same hash value. For better performance, + * @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. @n * The default implementation of this method returns the value of the current instance. */ @@ -190,8 +188,8 @@ public: * * @since 2.0 * - * @return An integer value indicating the hash value of the specified @c double value - * @param[in] val A @c double value to get the hash value + * @return An integer value indicating the hash value of the specified @c double value + * @param[in] val A @c double value to get the hash value */ static int GetHashCode(double val); @@ -202,12 +200,12 @@ public: * * @return An error code * @param[in] s A unicode representation of @c signed @c double value - * @param[out] ret The converted numeric value + * @param[out] ret The converted numeric value * @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. - * - 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. */ static result Parse(const String& s, double& ret); @@ -216,7 +214,7 @@ public: * * @since 2.0 * - * @return A @c signed @c char equivalent of the current instance + * @return A @c signed @c char equivalent of the current instance */ virtual char ToChar(void) const; @@ -225,7 +223,7 @@ public: * * @since 2.0 * - * @return A @c signed @c short equivalent of the current instance + * @return A @c signed @c short equivalent of the current instance */ virtual short ToShort(void) const; @@ -234,7 +232,7 @@ public: * * @since 2.0 * - * @return A @c signed @c int equivalent of the current instance + * @return A @c signed @c int equivalent of the current instance */ virtual int ToInt(void) const; @@ -243,7 +241,7 @@ public: * * @since 2.0 * - * @return A @c signed @c long equivalent of the current instance + * @return A @c signed @c long equivalent of the current instance */ virtual long ToLong(void) const; @@ -252,7 +250,7 @@ public: * * @since 2.0 * - * @return A @c signed @c long @c long equivalent of the current instance + * @return A @c signed @c long @c long equivalent of the current instance */ virtual long long ToLongLong(void) const; @@ -261,7 +259,7 @@ public: * * @since 2.0 * - * @return A @c signed @c float equivalent of the current instance + * @return A @c signed @c float equivalent of the current instance */ virtual float ToFloat(void) const; @@ -270,7 +268,7 @@ public: * * @since 2.0 * - * @return A @c signed @c double equivalent of the current instance + * @return A @c signed @c double equivalent of the current instance */ virtual double ToDouble(void) const; @@ -280,11 +278,11 @@ public: * @since 2.0 * * @return A string containing a Unicode representation of the value of the current instance - * @remarks + * @remarks * - If the value of the current instance 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. - * - 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; @@ -295,11 +293,11 @@ public: * * @return A string containing a Unicode representation of the specified @c double value * @param[in] value A @c double value to convert - * @remarks - * - If the input value is Not-a-Number (NaN), the result is the string "NaN". Furthermore, infinity + * @remarks + * - If the input 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. - * - 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(double value); @@ -309,7 +307,7 @@ public: * @since 2.0 * * @return The bits that represent the floating-point number in the IEEE 754 floating-point "double format" bit layout - * @param[in] value A @c double value to convert + * @param[in] value A @c double value to convert */ static long long ToBits(double value); @@ -319,7 +317,7 @@ public: * @since 2.0 * * @return The @c double floating-point value with the same bit pattern - * @param[in] value The floating-point value to convert + * @param[in] value The floating-point value to convert */ static double ToDoubleFromBits(long long value); @@ -340,9 +338,8 @@ public: * * @return @c true if the specified value equals negative or positive infinity, @n * else @c false - * @param[in] value A @c double value to check + * @param[in] value A @c double value to check */ - static bool IsInfinity(double value); /** @@ -362,7 +359,7 @@ public: * * @return @c true if the specified value is Not-a-Number, @n * else @c false - * @param[in] value A @c double value to check + * @param[in] value A @c double value to check */ static bool IsNaN(double value); @@ -393,7 +390,6 @@ public: */ double value; - private: /** * Checks if the specified @c double value is finite. @@ -409,10 +405,8 @@ private: static const int __DBL_MAX_10_EXP = 308; friend class _DoubleImpl; - class _DoubleImpl * __pDoubleImpl; + class _DoubleImpl* __pDoubleImpl; }; // Double - }} // Tizen::Base - -#endif //_FBASE_DOUBLE_H_ +#endif //_FBASE_DOUBLE_H_ \ No newline at end of file diff --git a/inc/FBaseDoubleComparer.h b/inc/FBaseDoubleComparer.h index c7f826b..1a7aa44 100644 --- a/inc/FBaseDoubleComparer.h +++ b/inc/FBaseDoubleComparer.h @@ -28,7 +28,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 Double - * @param[in] obj2 The second instance of type Double + * @param[in] obj1 The first instance of type Double + * @param[in] obj2 The second instance of type Double * @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 @@ -106,7 +105,6 @@ public: */ virtual result Compare(const Tizen::Base::Object& obj1, const Tizen::Base::Object& obj2, int& cmp) const; - private: /** * The implementation of this copy constructor is intentionally blank and declared as private to prohibit copying of objects. @@ -119,10 +117,8 @@ private: DoubleComparer& operator =(const DoubleComparer& rhs); friend class _DoubleComparerImpl; - class _DoubleComparerImpl * __pDoubleComparerImpl; + class _DoubleComparerImpl* __pDoubleComparerImpl; }; // DoubleComparer - }} // Tizen::Base - -#endif // _FBASE_DOUBLE_COMPARER_H_ +#endif // _FBASE_DOUBLE_COMPARER_H_ \ No newline at end of file diff --git a/inc/FBaseDoubleMatrix.h b/inc/FBaseDoubleMatrix.h index 1f9ae14..35d035c 100644 --- a/inc/FBaseDoubleMatrix.h +++ b/inc/FBaseDoubleMatrix.h @@ -21,7 +21,6 @@ * This header file contains the declarations of the %DoubleMatrix class. * */ - #ifndef _FBASE_DOUBLE_MATRIX_H_ #define _FBASE_DOUBLE_MATRIX_H_ @@ -70,9 +69,9 @@ 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 + * else @c copy in column-major order */ DoubleMatrix(int rowCount, int columnCount, const double* pArray, bool rowMajor = true); @@ -100,8 +99,8 @@ public: * * @since 2.0 * - * @return @c true if all matrix members of the current instance are equal to the corresponding matrix members in the specified instance, @n - * else @c false + * @return @c true if all matrix members of the current instance are equal to the corresponding matrix members in the specified instance, @n + * else @c false * @param[in] rhs An instance of %DoubleMatrix */ bool operator ==(const DoubleMatrix& rhs) const; @@ -111,8 +110,8 @@ public: * * @since 2.0 * - * @return @c true if all matrix members of the current instance are not equal to the corresponding matrix members in the specified instance, @n - * else @c false + * @return @c true if all matrix members of the current instance are not equal to the corresponding matrix members in the specified instance, @n + * else @c false * @param[in] rhs An instance of %DoubleMatrix */ bool operator !=(const DoubleMatrix& rhs) const; @@ -122,11 +121,11 @@ public: * * @since 2.0 * - * @return The reference to this instance + * @return The reference to this instance * @param[in] rhs An instance of %DoubleMatrix * @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. */ DoubleMatrix& operator =(const DoubleMatrix& rhs); @@ -136,10 +135,10 @@ public: * * @since 2.0 * - * @return @c true if the values of the current instance are equal to the value of the specified instance, @n - * else @c false + * @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 %DoubleMatrix - * @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; @@ -148,8 +147,8 @@ public: * * @since 2.0 * - * @return The hash value of the current instance - * @remarks Two equal instances must return the same hash value. For better performance, + * @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. */ virtual int GetHashCode(void) const; @@ -180,7 +179,7 @@ public: * * @since 2.0 * - * @return The number of column in the current instance + * @return The number of column in the current instance */ int GetColumnCount(void) const; @@ -189,10 +188,10 @@ public: * * @since 2.0 * - * @return A pointer to @c double array + * @return A pointer to @c double array * @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. */ double* GetColumnN(int columnIndex) const; @@ -201,10 +200,10 @@ 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 If the current instance is not a square matrix, return zero. + * @remarks The specific error code can be accessed using the GetLastResult() method. + * @remarks If the current instance is not a square matrix, return zero. */ double GetDeterminant(void) const; @@ -213,11 +212,11 @@ public: * * @since 2.0 * - * @return The value at the specified row and column of the current instance + * @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 * @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. */ double GetElement(int rowIndex, int columnIndex) const; @@ -226,9 +225,9 @@ public: * * @since 2.0 * - * @return A pointer to the instance of %DoubleMatrix containing the resulting value of the operation + * @return A pointer to the instance of %DoubleMatrix 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. */ DoubleMatrix* GetInverseN(void) const; @@ -246,10 +245,10 @@ public: * * @since 2.0 * - * @return A pointer to @c double array + * @return A pointer to @c double array * @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. */ double* GetRowN(int rowIndex) const; @@ -270,9 +269,9 @@ public: * * @since 2.0 * - * @return A pointer to the instance of %DoubleMatrix containing the resulting value of the operation + * @return A pointer to the instance of %DoubleMatrix 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. */ DoubleMatrix* GetTransposeN(void) const; @@ -281,8 +280,8 @@ public: * * @since 2.0 * - * @return @c true if the matrix is an identity matrix, @n - * else @c false + * @return @c true if the matrix is an identity matrix, @n + * else @c false */ bool IsIdentity(void) const; @@ -291,8 +290,8 @@ public: * * @since 2.0 * - * @return @c true if the matrix is invertible, @n - * else @c false + * @return @c true if the matrix is invertible, @n + * else @c false */ bool IsInvertible(void) const; @@ -363,7 +362,7 @@ public: * @since 2.0 * * @return An error code - * @param[in] columnIndex The target column number in the current instance + * @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. @@ -376,7 +375,7 @@ public: * @since 2.0 * * @return An error code - * @param[in] rowIndex The target row number in the current instance + * @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. @@ -406,7 +405,7 @@ public: * @return An error code * @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 + * else @c copy in column-major order * @exception E_SUCCESS The method is successful. * @exception E_INVALID_ARG The @c pArray is @c null. */ @@ -460,7 +459,5 @@ private: int __column; }; // DoubleMatrix - }} // Tizen::Base - -#endif //_FBASE_DOUBLE_MATRIX_H_ +#endif //_FBASE_DOUBLE_MATRIX_H_ \ No newline at end of file diff --git a/inc/FBaseDoubleMatrix3.h b/inc/FBaseDoubleMatrix3.h index cf50fe8..4a4f81f 100644 --- a/inc/FBaseDoubleMatrix3.h +++ b/inc/FBaseDoubleMatrix3.h @@ -21,7 +21,6 @@ * This header file contains the declarations of the %DoubleMatrix3 class. * */ - #ifndef _FBASE_DOUBLE_MATRIX3_H_ #define _FBASE_DOUBLE_MATRIX3_H_ @@ -82,8 +81,8 @@ public: * * @since 2.0 * - * @return @c true if all matrix members of the current instance are equal to the corresponding matrix members in the specified instance, @n - * else @c false + * @return @c true if all matrix members of the current instance are equal to the corresponding matrix members in the specified instance, @n + * else @c false * @param[in] rhs An instance of %DoubleMatrix3 */ bool operator ==(const DoubleMatrix3& rhs) const; @@ -93,8 +92,8 @@ public: * * @since 2.0 * - * @return @c true if all matrix members of the current instance are not equal to the corresponding matrix members in the specified instance, @n - * else @c false + * @return @c true if all matrix members of the current instance are not equal to the corresponding matrix members in the specified instance, @n + * else @c false * @param[in] rhs An instance of %DoubleMatrix3 */ bool operator !=(const DoubleMatrix3& rhs) const; @@ -104,7 +103,7 @@ public: * * @since 2.0 * - * @return The reference to this instance + * @return The reference to this instance * @param[in] rhs An instance of %DoubleMatrix3 */ DoubleMatrix3& operator =(const DoubleMatrix3& rhs); @@ -114,7 +113,7 @@ public: * * @since 2.0 * - * @return The reference to this instance + * @return The reference to this instance * @param[in] value A @c double value to assign */ DoubleMatrix3& operator =(double value); @@ -124,7 +123,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix3 */ DoubleMatrix3 operator *(const DoubleMatrix3& rhs) const; @@ -134,7 +133,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to multiply */ DoubleMatrix3 operator *(double value) const; @@ -144,7 +143,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix3 */ DoubleMatrix3 operator +(const DoubleMatrix3& rhs) const; @@ -154,7 +153,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to add */ DoubleMatrix3 operator +(double value) const; @@ -164,7 +163,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix3 */ DoubleMatrix3 operator -(const DoubleMatrix3& rhs) const; @@ -174,7 +173,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to subtract */ DoubleMatrix3 operator -(double value) const; @@ -184,7 +183,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix3 containing the resulting value of the operation + * @return The reference to %DoubleMatrix3 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix3 */ DoubleMatrix3& operator *=(const DoubleMatrix3& rhs); @@ -194,7 +193,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix3 containing the resulting value of the operation + * @return The reference to %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to multiply */ DoubleMatrix3& operator *=(double value); @@ -204,7 +203,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix3 containing the resulting value of the operation + * @return The reference to %DoubleMatrix3 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix3 */ DoubleMatrix3& operator +=(const DoubleMatrix3& rhs); @@ -214,7 +213,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix3 containing the resulting value of the operation + * @return The reference to %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to add */ DoubleMatrix3& operator +=(double value); @@ -224,7 +223,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix3 containing the resulting value of the operation + * @return The reference to %DoubleMatrix3 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix3 */ DoubleMatrix3& operator -=(const DoubleMatrix3& rhs); @@ -234,7 +233,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix3 containing the resulting value of the operation + * @return The reference to %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to subtract */ DoubleMatrix3& operator -=(double value); @@ -244,7 +243,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to add * @param[in] rhs An instance of %DoubleMatrix3 */ @@ -255,7 +254,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to multiply * @param[in] rhs An instance of %DoubleMatrix3 */ @@ -266,7 +265,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation * @param[in] value A @c double value to subtract * @param[in] rhs An instance of %DoubleMatrix3 */ @@ -277,10 +276,10 @@ public: * * @since 2.0 * - * @return @c true if the values of the current instance is equal to the value of the specified instance, @n - * else @c false + * @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 %DoubleMatrix3 - * @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; @@ -289,8 +288,8 @@ public: * * @since 2.0 * - * @return The hash value of the current instance - * @remarks Two equal instances must return the same hash value. For better performance, + * @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. */ virtual int GetHashCode(void) const; @@ -300,7 +299,7 @@ public: * * @since 2.0 * - * @return The determinant value of the current instance + * @return The determinant value of the current instance */ double GetDeterminant(void) const; @@ -309,8 +308,8 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation - * @remarks This function must be called after checking whether the matrix is invertible or not. + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @remarks This function must be called after checking whether the matrix is invertible or not. */ DoubleMatrix3 GetInverse(void) const; @@ -319,7 +318,7 @@ public: * * @since 2.0 * - * @return The trace of the current instance + * @return The trace of the current instance */ double GetTrace(void) const; @@ -328,7 +327,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix3 containing the resulting value of the operation */ DoubleMatrix3 GetTranspose(void) const; @@ -337,8 +336,8 @@ public: * * @since 2.0 * - * @return @c true if the matrix is an identity matrix, @n - * else @c false + * @return @c true if the matrix is an identity matrix, @n + * else @c false */ bool IsIdentity(void) const; @@ -347,8 +346,8 @@ public: * * @since 2.0 * - * @return @c true if the matrix is invertible, @n - * else @c false + * @return @c true if the matrix is invertible, @n + * else @c false */ bool IsInvertible(void) const; @@ -396,7 +395,7 @@ public: * * @since 2.0 * - * @remarks The column-major order matrix. + * @remarks The column-major order matrix. */ double matrix[3][3]; @@ -405,7 +404,5 @@ private: class _DoubleMatrix3Impl* __pImpl; }; // DoubleMatrix3 - -}}// Tizen::Base - -#endif //_FBASE_DOUBLE_MATRIX3_H_ +}} // Tizen::Base +#endif //_FBASE_DOUBLE_MATRIX3_H_ \ No newline at end of file diff --git a/inc/FBaseDoubleMatrix4.h b/inc/FBaseDoubleMatrix4.h index 193d898..8dccc11 100644 --- a/inc/FBaseDoubleMatrix4.h +++ b/inc/FBaseDoubleMatrix4.h @@ -21,7 +21,6 @@ * This header file contains the declarations of the %DoubleMatrix4 class. * */ - #ifndef _FBASE_DOUBLE_MATRIX4_H_ #define _FBASE_DOUBLE_MATRIX4_H_ @@ -82,8 +81,8 @@ public: * * @since 2.0 * - * @return @c true if all matrix members of the current instance are equal to the corresponding matrix members in the specified instance, @n - * else @c false + * @return @c true if all matrix members of the current instance are equal to the corresponding matrix members in the specified instance, @n + * else @c false * @param[in] rhs An instance of %DoubleMatrix4 */ bool operator ==(const DoubleMatrix4& rhs) const; @@ -93,8 +92,8 @@ public: * * @since 2.0 * - * @return @c true if all matrix members of the current instance are not equal to the corresponding matrix members in the specified instance, @n - * else @c false + * @return @c true if all matrix members of the current instance are not equal to the corresponding matrix members in the specified instance, @n + * else @c false * @param[in] rhs An instance of %DoubleMatrix4 */ bool operator !=(const DoubleMatrix4& rhs) const; @@ -104,7 +103,7 @@ public: * * @since 2.0 * - * @return The reference to this instance + * @return The reference to this instance * @param[in] rhs An instance of %DoubleMatrix4 */ DoubleMatrix4& operator =(const DoubleMatrix4& rhs); @@ -114,7 +113,7 @@ public: * * @since 2.0 * - * @return The reference to this instance + * @return The reference to this instance * @param[in] value A @c double value to assign */ DoubleMatrix4& operator =(double value); @@ -124,7 +123,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix4 */ DoubleMatrix4 operator *(const DoubleMatrix4& rhs) const; @@ -134,7 +133,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to multiply */ DoubleMatrix4 operator *(double value) const; @@ -144,7 +143,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix4 */ DoubleMatrix4 operator +(const DoubleMatrix4& rhs) const; @@ -154,7 +153,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to add */ DoubleMatrix4 operator +(double value) const; @@ -164,7 +163,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix4 */ DoubleMatrix4 operator -(const DoubleMatrix4& rhs) const; @@ -174,7 +173,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to subtract */ DoubleMatrix4 operator -(double value) const; @@ -184,7 +183,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix4 containing the resulting value of the operation + * @return The reference to %DoubleMatrix4 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix4 */ DoubleMatrix4& operator *=(const DoubleMatrix4& rhs); @@ -194,7 +193,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix4 containing the resulting value of the operation + * @return The reference to %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to multiply */ DoubleMatrix4& operator *=(double value); @@ -204,7 +203,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix4 containing the resulting value of the operation + * @return The reference to %DoubleMatrix4 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix4 */ DoubleMatrix4& operator +=(const DoubleMatrix4& rhs); @@ -214,7 +213,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix4 containing the resulting value of the operation + * @return The reference to %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to add */ DoubleMatrix4& operator +=(double value); @@ -224,7 +223,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix4 containing the resulting value of the operation + * @return The reference to %DoubleMatrix4 containing the resulting value of the operation * @param[in] rhs An instance of %DoubleMatrix4 */ DoubleMatrix4& operator -=(const DoubleMatrix4& rhs); @@ -234,7 +233,7 @@ public: * * @since 2.0 * - * @return The reference to %DoubleMatrix4 containing the resulting value of the operation + * @return The reference to %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to subtract */ DoubleMatrix4& operator -=(double value); @@ -244,7 +243,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to add * @param[in] rhs An instance of %DoubleMatrix4 */ @@ -255,7 +254,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to multiply * @param[in] rhs An instance of %DoubleMatrix4 */ @@ -266,7 +265,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation * @param[in] value A @c double value to subtract * @param[in] rhs An instance of %DoubleMatrix4 */ @@ -277,10 +276,10 @@ public: * * @since 2.0 * - * @return @c true if the values of the current instance is equal to the value of the specified instance, @n - * else @c false + * @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 %DoubleMatrix4 - * @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; @@ -289,8 +288,8 @@ public: * * @since 2.0 * - * @return The hash value of the current instance - * @remarks Two equal instances must return the same hash value. For better performance, + * @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. */ virtual int GetHashCode(void) const; @@ -300,7 +299,7 @@ public: * * @since 2.0 * - * @return The determinant value of the current instance + * @return The determinant value of the current instance */ double GetDeterminant(void) const; @@ -309,8 +308,8 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation - * @remarks This function must be called after checking whether the matrix is invertible or not. + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @remarks This function must be called after checking whether the matrix is invertible or not. */ DoubleMatrix4 GetInverse(void) const; @@ -319,7 +318,7 @@ public: * * @since 2.0 * - * @return The trace of the current instance + * @return The trace of the current instance */ double GetTrace(void) const; @@ -328,7 +327,7 @@ public: * * @since 2.0 * - * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation + * @return A new instance of %DoubleMatrix4 containing the resulting value of the operation */ DoubleMatrix4 GetTranspose(void) const; @@ -337,8 +336,8 @@ public: * * @since 2.0 * - * @return @c true if the matrix is an identity matrix, @n - * else @c false + * @return @c true if the matrix is an identity matrix, @n + * else @c false */ bool IsIdentity(void) const; @@ -347,8 +346,8 @@ public: * * @since 2.0 * - * @return @c true if the matrix is invertible, @n - * else @c false + * @return @c true if the matrix is invertible, @n + * else @c false */ bool IsInvertible(void) const; @@ -396,7 +395,7 @@ public: * * @since 2.0 * - * @remarks The column-major order matrix. + * @remarks The column-major order matrix. */ double matrix[4][4]; @@ -405,7 +404,5 @@ private: class _DoubleMatrix4Impl* __pImpl; }; // DoubleMatrix4 - }} // Tizen::Base - -#endif //_FBASE_DOUBLE_MATRIX4_H_ +#endif //_FBASE_DOUBLE_MATRIX4_H_ \ No newline at end of file diff --git a/inc/FBaseErrorDefine.h b/inc/FBaseErrorDefine.h index 385ac82..af22460 100644 --- a/inc/FBaseErrorDefine.h +++ b/inc/FBaseErrorDefine.h @@ -20,33 +20,27 @@ * * This header file contains the definitions of error codes. */ - #ifndef _FBASE_ERROR_DEFINE_H_ #define _FBASE_ERROR_DEFINE_H_ #include - #define E_SEVERITY_POS 31 #define E_TYPE_POS 29 -#define SET_E_SEVERITY(X) (static_cast(PUT_MASK(0, (X), E_SEVERITY_POS))) -#define SET_E_TYPE(X) (static_cast(PUT_MASK(0, (X), E_TYPE_POS))) -#define SET_E_CAUSE(X) (static_cast(X)) - +#define SET_E_SEVERITY(X) (static_cast< unsigned long >(PUT_MASK(0, (X), E_SEVERITY_POS))) +#define SET_E_TYPE(X) (static_cast< unsigned long >(PUT_MASK(0, (X), E_TYPE_POS))) +#define SET_E_CAUSE(X) (static_cast< unsigned long >(X)) // Error severities #define E_SUCCESS (SET_E_SEVERITY(0)) #define E_FAILURE (SET_E_SEVERITY(1)) - // Error types #define ERR_SRC_FRAMEWORK (E_FAILURE + SET_E_TYPE(1)) #define ERR_SRC_USER (E_FAILURE + SET_E_TYPE(2)) - // Macros for error codes -#define IsFailed(X) (static_cast(X) != E_SUCCESS) - +#define IsFailed(X) (static_cast< long >(X) != E_SUCCESS) -#endif //_FBASE_ERROR_DEFINE_H_ +#endif //_FBASE_ERROR_DEFINE_H_ \ No newline at end of file diff --git a/inc/FBaseErrors.h b/inc/FBaseErrors.h index 5cc0322..1381e77 100644 --- a/inc/FBaseErrors.h +++ b/inc/FBaseErrors.h @@ -25,7 +25,6 @@ #include - //----------------------------------------------------------------------------A /** (specialized) Thrown when network address is changed externally. */ #define E_ADDRESS_CHANGED (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1100)) @@ -54,7 +53,6 @@ /** Thrown when a required account does not exist. */ #define E_ACCOUNT_NOT_FOUND (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1108)) - //----------------------------------------------------------------------------B //----------------------------------------------------------------------------C @@ -135,10 +133,7 @@ * during an input operation. */ #define E_END_OF_FILE (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1503)) - //----------------------------------------------------------------------------F -// Thrown when the requested operation fails by undefined reason. -//#define E_FAILURE (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1600)) /** (specialized) Thrown when application tries to call with a number which is * not allowed in FDN mode, while the FDN mode is enabled. */ @@ -152,12 +147,10 @@ * fails. */ #define E_FILE_NOT_FOUND (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1602)) - //----------------------------------------------------------------------------G /** Thrown when a required group does not exist. */ #define E_GROUP_NOT_FOUND (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1700)) - //----------------------------------------------------------------------------H /** Thrown the destination host is not found. */ #define E_HOST_NOT_FOUND (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1800)) @@ -168,7 +161,6 @@ /** Thrown the Http transaction is canceled by user. */ #define E_HTTP_USER (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1802)) - //----------------------------------------------------------------------------I /** Thrown when the user does not have proper permissions. */ #define E_ILLEGAL_ACCESS (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1900)) @@ -284,7 +276,6 @@ /** Thrown when the specified password has invalid format. */ #define E_INVALID_PASSWORD (ERR_SRC_FRAMEWORK + SET_E_CAUSE(1933)) - //----------------------------------------------------------------------------J //----------------------------------------------------------------------------K @@ -340,7 +331,6 @@ /** Thrown when a specified member already exists. */ #define E_MEMBER_ALREADY_EXIST (ERR_SRC_FRAMEWORK + SET_E_CAUSE(2304)) - //----------------------------------------------------------------------------N /** General network exception. */ #define E_NETWORK_FAILED (ERR_SRC_FRAMEWORK + SET_E_CAUSE(2400)) @@ -402,7 +392,6 @@ * registered log scope is not matched with query condition (log type or log provider) specified in Query() API. */ #define E_OBJ_NOT_REGISTERED (ERR_SRC_FRAMEWORK + SET_E_CAUSE(2510)) - //----------------------------------------------------------------------------P /** (specialized) Thrown when the requested Bluetooth pairing fails. */ #define E_PAIRING_FAILED (ERR_SRC_FRAMEWORK + SET_E_CAUSE(2600)) @@ -438,7 +427,7 @@ /** Thrown when the right to get served has expired. */ #define E_RIGHT_EXPIRED (ERR_SRC_FRAMEWORK + SET_E_CAUSE(2805)) -/** Thrown when there is no right. */ +/** Thrown when there is no right. */ #define E_RIGHT_NO_LICENSE (ERR_SRC_FRAMEWORK + SET_E_CAUSE(2806)) /** Thrown when the right is for future use. */ @@ -495,7 +484,6 @@ /** Thrown when a service is deactivated. */ #define E_SERVICE_DEACTIVATED (ERR_SRC_FRAMEWORK + SET_E_CAUSE(2915)) - //----------------------------------------------------------------------------T /** (specialized) Thrown then the specified table does not exist. */ #define E_TABLE_NOT_FOUND (ERR_SRC_FRAMEWORK + SET_E_CAUSE(3000)) @@ -507,7 +495,6 @@ /** Thrown when the specified type does not match. */ #define E_TYPE_MISMATCH (ERR_SRC_FRAMEWORK + SET_E_CAUSE(3002)) - //----------------------------------------------------------------------------U /** Thrown when the operation causes an underflow. */ #define E_UNDERFLOW (ERR_SRC_FRAMEWORK + SET_E_CAUSE(3100)) @@ -581,14 +568,12 @@ /** Thrown when the specified object would cause a deadlock. */ #define E_WOULD_DEADLOCK (ERR_SRC_FRAMEWORK + SET_E_CAUSE(3301)) - //----------------------------------------------------------------------------X //----------------------------------------------------------------------------Y //----------------------------------------------------------------------------Z - //----------------------------------------------------------------------------- -#endif // _FBASE_ERRORS_H_ +#endif // _FBASE_ERRORS_H_ \ No newline at end of file -- 2.7.4