Merge "Add deprecate tag on API reference" into tizen_2.2

diff --git a/inc/FBaseErrors.h b/inc/FBaseErrors.h
index 7b2a53d..5cc0322 100644 (file)
--- a/inc/FBaseErrors.h
+++ b/inc/FBaseErrors.h
@@ -398,6 +398,10 @@
 /** Thrown when OpenGL operation failed. */
 #define E_OPENGL_ERROR                  (ERR_SRC_FRAMEWORK + SET_E_CAUSE(2509))
 
+/** Thrown when the application does not register the log scope or
+ *     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. */

diff --git a/src/base/FBaseResult.cpp b/src/base/FBaseResult.cpp
index 254343e..51914f4 100644 (file)
--- a/src/base/FBaseResult.cpp
+++ b/src/base/FBaseResult.cpp
@@ -231,7 +231,8 @@ const char* __errTable2500[] =
        "E_OUT_OF_MEMORY",          //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2506))
        "E_OUT_OF_RANGE",           //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2507))
        "E_OVERFLOW",               //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2508))
-       "E_OPENGL_ERROR"            //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2509))
+       "E_OPENGL_ERROR",           //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2509))
+       "E_OBJ_NOT_REGISTERED"      //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2510))
 };
 
 const char* __errTable2600[] =

diff --git a/src/text/FText_GsmEncodingCore.cpp b/src/text/FText_GsmEncodingCore.cpp
index 9895049..f8455c3 100644 (file)
--- a/src/text/FText_GsmEncodingCore.cpp
+++ b/src/text/FText_GsmEncodingCore.cpp
@@ -79,7 +79,7 @@ _GsmEncodingCore::~_GsmEncodingCore(void)
 _EncodingCore*
 _GsmEncodingCore::GetEncodingCoreImplN(const Tizen::Base::String& encodingFrom, const Tizen::Base::String& encodingTo)
 {
-       SysTryReturn(NID_TEXT, encodingFrom == L"GSM", null, E_UNSUPPORTED_TYPE, "[E_UNSUPPORTED_TYPE] It is the unsupported type.");
+       SysTryReturn(NID_TEXT, encodingFrom == L"GSM", null, E_UNSUPPORTED_TYPE, "[E_UNSUPPORTED_TYPE] It is not the GSM encoding type.");
        _GsmEncodingCore* pEncoderDecoder = new (std::nothrow) _GsmEncodingCore;
        SysTryReturn(NID_TEXT, pEncoderDecoder, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY));
        return pEncoderDecoder;

diff --git a/src/text/FText_Iso885916EncodingCore.cpp b/src/text/FText_Iso885916EncodingCore.cpp
index cc7490d..d71497d 100644 (file)
--- a/src/text/FText_Iso885916EncodingCore.cpp
+++ b/src/text/FText_Iso885916EncodingCore.cpp
@@ -59,7 +59,7 @@ _Iso885916EncodingCore::~_Iso885916EncodingCore(void)
 _EncodingCore*
 _Iso885916EncodingCore::GetEncodingCoreImplN(const Tizen::Base::String& encodingFrom, const Tizen::Base::String& encodingTo)
 {
-       SysTryReturn(NID_TEXT, encodingFrom == L"ISO-8859-16", null, E_UNSUPPORTED_TYPE, "[E_UNSUPPORTED_TYPE] It is the unsupported type.");
+       SysTryReturn(NID_TEXT, encodingFrom == L"ISO-8859-16", null, E_UNSUPPORTED_TYPE, "[E_UNSUPPORTED_TYPE] It is not the ISO-8859-16 type.");
        _Iso885916EncodingCore* pEncodingCore = new (std::nothrow) _Iso885916EncodingCore;
        SysTryReturn(NID_TEXT, pEncodingCore, null, E_OUT_OF_MEMORY, "[%s] Memory allocation failed", GetErrorMessage(E_OUT_OF_MEMORY));
        return pEncodingCore;

diff --git a/src/text/FText_Ucs2EncodingCore.cpp b/src/text/FText_Ucs2EncodingCore.cpp
index 248e38a..af9b1f2 100644 (file)
--- a/src/text/FText_Ucs2EncodingCore.cpp
+++ b/src/text/FText_Ucs2EncodingCore.cpp
@@ -57,7 +57,7 @@ _Ucs2EncodingCore::GetEncodingCoreImplN(const Tizen::Base::String& encodingFrom,
        encodingStr.Replace(L"-", "");
        encodingStr.Replace("_", "");
 
-       SysTryReturn(NID_TEXT, encodingStr.StartsWith(L"UCS2", 0), null, E_UNSUPPORTED_TYPE, "[E_UNSUPPORTED_TYPE] It is the unsupported type");
+       SysTryReturn(NID_TEXT, encodingStr.StartsWith(L"UCS2", 0), null, E_UNSUPPORTED_TYPE, "[E_UNSUPPORTED_TYPE] It is not the UCS2 type.");
 
        if ((encodingStr == "UCS2") || (encodingStr == "UCS2BE") || (encodingStr == "UCS2LE"))
        {