From c530c60e0f3736e655130794c27dee3e9539eec0 Mon Sep 17 00:00:00 2001 From: Bongjoo Seo Date: Thu, 26 Sep 2013 12:26:11 +0900 Subject: [PATCH] Fixed build errors in the ui-core library Change-Id: Ic4515c8a09a7c7a124939a7abd9f048c26f11af9 Signed-off-by: Bongjoo Seo --- src/ui-core/src/CMakeLists.txt | 29 +++++++++++++ src/ui-core/src/base/FBaseString.cpp | 49 +++++++++------------- src/ui-core/src/base/inc/FBaseString.h | 28 ++++++------- .../src/base/inc/FBaseUtil_AtomicOperations.h | 12 +++--- src/ui-core/src/base/inc/FBase_StringConverter.h | 8 +--- .../src/base/utility/FBaseUtil_IcuConverter.cpp | 2 +- src/ui/animations/FUiAnimLight.cpp | 1 + src/ui/animations/FUiAnimMaterial.cpp | 1 + src/ui/animations/FUiAnim_BoundingVolume.cpp | 1 + src/ui/animations/FUiAnim_CustomShader.cpp | 3 +- 10 files changed, 75 insertions(+), 59 deletions(-) diff --git a/src/ui-core/src/CMakeLists.txt b/src/ui-core/src/CMakeLists.txt index d7b855c..998ba0e 100644 --- a/src/ui-core/src/CMakeLists.txt +++ b/src/ui-core/src/CMakeLists.txt @@ -12,9 +12,11 @@ INCLUDE_DIRECTORIES( ${UIFW_DIRECTORY}/src/ui/inc ${UIFW_DIRECTORY}/src/ui/animations ${UIFW_DIRECTORY}/src/ui/animations/platform + ${UIFW_DIRECTORY}/src/ui/animations/math ${RSA_DEV_DIRECTORY}/external/boost /usr/include/cairo /usr/include/pixman-1 + /usr/include/libxml2 ) ELSEIF(_WIN32) INCLUDE_DIRECTORIES( @@ -43,6 +45,7 @@ SET(${this_target}_SOURCE_FILES base/FBaseErrors.cpp base/FBaseString.cpp base/FBaseStringComparer.cpp + base/FBaseStringHashCodeProvider.cpp base/FBaseSysLog.cpp base/FBaseDateTime.cpp base/FBaseTimeSpan.cpp @@ -53,6 +56,7 @@ SET(${this_target}_SOURCE_FILES base/FBaseDouble.cpp base/FBaseFloat.cpp base/FBase_StringConverter.cpp + base/utility/FBaseUtil_IcuConverter.cpp base/runtime/FBaseRtIEventListener.cpp base/collection/FBaseColMapEntry.cpp base/collection/FBaseColQueue.cpp @@ -173,6 +177,30 @@ SET(${this_target}_SOURCE_FILES ${UIFW_DIRECTORY}/src/ui/animations/FUiAnimVisualElementValueAnimation.cpp ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_VisualElementValueAnimationImpl.cpp ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_Waiter.cpp + + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathAdapterFunctions.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathCommon.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathMatrix2.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathMatrix3.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathMatrix4.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathPlane.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathQuaternion.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathQuaternionUnit.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathVector2.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathVector3.cpp + ${UIFW_DIRECTORY}/src/ui/animations/math/FUiAnim_MathVector4.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_GlDefaultShaderProgram.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_DynamicProperty.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_CustomShader.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_BoundingVolume.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_MeshImpl.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_Ray.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnimLight.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnimMaterial.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_LightImpl.cpp + ${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_MaterialImpl.cpp + + ${UIFW_DIRECTORY}/src/ui/FUi_Matrix3Df.cpp ${UIFW_DIRECTORY}/src/ui/FUi_PropertyBase.cpp ${UIFW_DIRECTORY}/src/ui/FUi_PropertyUtils.cpp @@ -211,6 +239,7 @@ TARGET_LINK_LIBRARIES(${this_target} "-ldl" ) TARGET_LINK_LIBRARIES(${this_target} "-lEGL" ) TARGET_LINK_LIBRARIES(${this_target} "-lpixman-1" ) TARGET_LINK_LIBRARIES(${this_target} "-lcairo" ) +TARGET_LINK_LIBRARIES(${this_target} "-licuuc" ) ELSEIF(_WIN32) diff --git a/src/ui-core/src/base/FBaseString.cpp b/src/ui-core/src/base/FBaseString.cpp index 4595cf9..f2a335e 100644 --- a/src/ui-core/src/base/FBaseString.cpp +++ b/src/ui-core/src/base/FBaseString.cpp @@ -39,6 +39,7 @@ #include #include #include "FBaseUtil_AtomicOperations.h" +#include "FBaseUtil_IcuConverter.h" namespace Tizen { namespace Base { @@ -125,7 +126,6 @@ String::String(const char* pValue) , __pValue(null) , __pStringImpl(null) { -#ifdef TEST if (pValue == null || strlen(pValue) == 0) { result r = InitializeToDefault(DEFAULT_CAPACITY); @@ -144,8 +144,7 @@ String::String(const char* pValue) __length = wcslen(__pValue); __capacity = __length + DEFAULT_CAPACITY; __pValue[__length] = '\0'; - } -#endif + } } String::String(const String& value) @@ -254,7 +253,7 @@ String::operator +=(const wchar_t* pRhs) return *this; } - Append(pRhs); + Append(pRhs); return *this; } @@ -379,6 +378,21 @@ String::Append(double d) } result +String::Append(const String& str) +{ + if (str.IsEmpty()) + { + return E_SUCCESS; + } + + result r = Append(str.__pValue); + SysTryReturn(NID_BASE, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); + + return r; +} +#endif + +result String::Append(const wchar_t* p) { SysTryReturnResult(NID_BASE, p != null, E_INVALID_ARG, "p is null."); @@ -409,20 +423,6 @@ String::Append(const wchar_t* p) return E_SUCCESS; } -result -String::Append(const String& str) -{ - if (str.IsEmpty()) - { - return E_SUCCESS; - } - - result r = Append(str.__pValue); - SysTryReturn(NID_BASE, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r)); - - return r; -} -#endif void String::Clear(void) { @@ -1438,18 +1438,7 @@ String::Contains(const String& str) const return true; } - wchar_t* pStart = __pValue; - wchar_t* pEnd = pStart + __length; - while (pStart < pEnd) - { - while (wcsstr(pStart, str.__pValue) != null) - { - return true; - } - ++pStart; - } - - return false; + return (wcsstr(__pValue, str.__pValue) != null); } bool diff --git a/src/ui-core/src/base/inc/FBaseString.h b/src/ui-core/src/base/inc/FBaseString.h index ee31a02..73dc061 100644 --- a/src/ui-core/src/base/inc/FBaseString.h +++ b/src/ui-core/src/base/inc/FBaseString.h @@ -247,6 +247,19 @@ public: * @exception E_SUCCESS The method is successful. */ result Append(wchar_t ch); + + /** + * Appends the specified null-terminated Unicode text to this instance + * of %String. + * + * @since 2.0 + * + * @return An error code + * @param[in] p A pointer to a Unicode character array + * @exception E_SUCCESS The method is successful. + * @exception E_INVALID_ARG A @c null pointer is passed. + */ + result Append(const wchar_t* p); #ifdef TEST /** * Appends the specified @c char value to this %String instance after converting it. @@ -329,20 +342,7 @@ public: * @param[in] d A @c double value to insert * @exception E_SUCCESS The method is successful. */ - result Append(double d); - - /** - * Appends the specified null-terminated Unicode text to this instance - * of %String. - * - * @since 2.0 - * - * @return An error code - * @param[in] p A pointer to a Unicode character array - * @exception E_SUCCESS The method is successful. - * @exception E_INVALID_ARG A @c null pointer is passed. - */ - result Append(const wchar_t* p); + result Append(double d); /** * Appends the specified instance of %String to this instance diff --git a/src/ui-core/src/base/inc/FBaseUtil_AtomicOperations.h b/src/ui-core/src/base/inc/FBaseUtil_AtomicOperations.h index 970c46b..d9079e5 100644 --- a/src/ui-core/src/base/inc/FBaseUtil_AtomicOperations.h +++ b/src/ui-core/src/base/inc/FBaseUtil_AtomicOperations.h @@ -29,8 +29,8 @@ namespace _AtomicOperations /** * Atomically add the @c value to the variable that @c pRefCount points to. * - * @since 2.1 - * @remarks This method supposes 4 byte alignment in ARM architecture. + * @since 2.2 + * @remarks This method supposes 4 byte alignment on ARM architecture. */ inline int AtomicAdd(volatile int* pRefCount, int value) @@ -59,8 +59,8 @@ AtomicAdd(volatile int* pRefCount, int value) /** * Atomically increase the variable that @c pRefCount points to by 1 * - * @since 2.1 - * @remarks This method supposes 4 byte alignment in ARM architecture. + * @since 2.2 + * @remarks This method supposes 4 byte alignment on ARM architecture. */ inline int AtomicInc(volatile int* pRefCount) @@ -71,8 +71,8 @@ AtomicInc(volatile int* pRefCount) /** * Atomically decrease the variable that @c pRefCount points to by 1 * - * @since 2.1 - * @remarks This method supposes 4 byte alignment in ARM architecture. + * @since 2.2 + * @remarks This method supposes 4 byte alignment on ARM architecture. */ inline int AtomicDec(volatile int* pRefCount) diff --git a/src/ui-core/src/base/inc/FBase_StringConverter.h b/src/ui-core/src/base/inc/FBase_StringConverter.h index fd2c866..c812a4f 100644 --- a/src/ui-core/src/base/inc/FBase_StringConverter.h +++ b/src/ui-core/src/base/inc/FBase_StringConverter.h @@ -1,5 +1,4 @@ // -// Open Service Platform // Copyright (c) 2012 Samsung Electronics Co., Ltd. // // Licensed under the Apache License, Version 2.0 (the License); @@ -19,17 +18,14 @@ * @file FBase_StringConverter.h * @brief This is the header file for the _StringConverter class. */ - #ifndef _FBASE_STRING_CONVERTER_H_ #define _FBASE_STRING_CONVERTER_H_ #include - namespace Tizen { namespace Base { - class _OSP_EXPORT_ _StringConverter { public: @@ -50,7 +46,5 @@ public: static char* CopyToCharArrayN(const wchar_t* pValue); }; // _StringConverter - }} // Tizen::Base - -#endif // _FBASE_STRING_CONVERTER_H_ +#endif // _FBASE_STRING_CONVERTER_H_ \ No newline at end of file diff --git a/src/ui-core/src/base/utility/FBaseUtil_IcuConverter.cpp b/src/ui-core/src/base/utility/FBaseUtil_IcuConverter.cpp index 6b14a73..b2699e8 100644 --- a/src/ui-core/src/base/utility/FBaseUtil_IcuConverter.cpp +++ b/src/ui-core/src/base/utility/FBaseUtil_IcuConverter.cpp @@ -26,8 +26,8 @@ #include #include #include -#ifdef TEST #include "FBase_StringConverter.h" +#ifdef TEST #include "FBase_NativeError.h" #endif #include diff --git a/src/ui/animations/FUiAnimLight.cpp b/src/ui/animations/FUiAnimLight.cpp index e97d45d..1b7a463 100644 --- a/src/ui/animations/FUiAnimLight.cpp +++ b/src/ui/animations/FUiAnimLight.cpp @@ -1,4 +1,5 @@ #include +#include #include "FUiAnimLight.h" #include "FUiAnim_LightImpl.h" diff --git a/src/ui/animations/FUiAnimMaterial.cpp b/src/ui/animations/FUiAnimMaterial.cpp index ca1b3ac..7440814 100644 --- a/src/ui/animations/FUiAnimMaterial.cpp +++ b/src/ui/animations/FUiAnimMaterial.cpp @@ -1,5 +1,6 @@ #include +#include #include "FUiAnimMaterial.h" #include "FUiAnim_MaterialImpl.h" diff --git a/src/ui/animations/FUiAnim_BoundingVolume.cpp b/src/ui/animations/FUiAnim_BoundingVolume.cpp index baaefa2..7502416 100644 --- a/src/ui/animations/FUiAnim_BoundingVolume.cpp +++ b/src/ui/animations/FUiAnim_BoundingVolume.cpp @@ -1,3 +1,4 @@ +#include #include "FUiAnim_BoundingVolume.h" #include "FUiAnim_MathVector3.h" diff --git a/src/ui/animations/FUiAnim_CustomShader.cpp b/src/ui/animations/FUiAnim_CustomShader.cpp index 31aba5f..cf8c5b5 100644 --- a/src/ui/animations/FUiAnim_CustomShader.cpp +++ b/src/ui/animations/FUiAnim_CustomShader.cpp @@ -22,7 +22,8 @@ * This file contains implementation _CustomShader class. */ - +#include +#include #include "FUiAnim_CustomShader.h" #include "FUiAnim_GlShaderProgram.h" -- 2.7.4