From: Victor Cebollada Date: Wed, 13 Aug 2014 14:32:23 +0000 (+0100) Subject: Uses TextArray new type definition. X-Git-Tag: dali_1.0.8~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F26395%2F3;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Uses TextArray new type definition. TextArray is now a Dali::Vector instead a std::vector. Change-Id: I49930f74969b8b7b7562b57f104baf1ebcf3585a Signed-off-by: Victor Cebollada --- diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h index 0ff0ff9..ddd2c07 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h @@ -303,20 +303,20 @@ void DALI_TEST_EQUALS( const char* str1, const std::string &str2, const char* lo * @param[in] location The TEST_LOCATION macro should be used here */ template<> -inline void DALI_TEST_EQUALS( const TextArray& str1, const TextArray& str2, const char* location) +inline void DALI_TEST_EQUALS( const Integration::TextArray& str1, const Integration::TextArray& str2, const char* location) { - if (!std::equal(str1.begin(), str1.end(), str2.begin())) + if (!std::equal(str1.Begin(), str1.End(), str2.Begin())) { fprintf(stderr, "%s, checking '", location); - for( unsigned int i = 0; i < str1.size(); ++i) + for( unsigned int i = 0; i < str1.Count(); ++i) { fprintf(stderr, "%c", str1[i]); } fprintf(stderr, "' == '"); - for( unsigned int i = 0; i < str2.size(); ++i) + for( unsigned int i = 0; i < str2.Count(); ++i) { fprintf(stderr, "%c", str2[i]); } diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp index 4f749ce..ef3eb77 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.cpp @@ -322,7 +322,7 @@ void TestPlatformAbstraction::SetDpi (unsigned int dpiHorizontal, unsigned int d /** * @copydoc PlatformAbstraction::GetFontFamilyForChars() */ -const std::string& TestPlatformAbstraction::GetFontFamilyForChars(const TextArray& charsRequested) const +const std::string& TestPlatformAbstraction::GetFontFamilyForChars(const Integration::TextArray& charsRequested) const { mTrace.PushCall("GetFontFamilyForChars", ""); return mGetDefaultFontFamilyResult; @@ -331,7 +331,7 @@ const std::string& TestPlatformAbstraction::GetFontFamilyForChars(const TextArra /** * @copydoc PlatformAbstraction::AllGlyphsSupported() */ -bool TestPlatformAbstraction::AllGlyphsSupported(const std::string& name, const std::string& fontStyle, const TextArray& text) const +bool TestPlatformAbstraction::AllGlyphsSupported(const std::string& name, const std::string& fontStyle, const Integration::TextArray& text) const { mTrace.PushCall("AllGlyphsSupported", ""); return true; diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h index 4723d90..2d4c38c 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-platform-abstraction.h @@ -185,12 +185,12 @@ public: /** * @copydoc PlatformAbstraction::GetFontFamilyForChars() */ - virtual const std::string& GetFontFamilyForChars(const TextArray& charsRequested) const; + virtual const std::string& GetFontFamilyForChars(const Integration::TextArray& charsRequested) const; /** * @copydoc PlatformAbstraction::AllGlyphsSupported() */ - virtual bool AllGlyphsSupported(const std::string& name, const std::string& fontStyle, const TextArray& text) const; + virtual bool AllGlyphsSupported(const std::string& name, const std::string& fontStyle, const Integration::TextArray& text) const; /** * @copydoc PlatformAbstraction::ValidateFontFamilyName() diff --git a/platform-abstractions/interfaces/font-controller.h b/platform-abstractions/interfaces/font-controller.h index cab28ce..83a8945 100644 --- a/platform-abstractions/interfaces/font-controller.h +++ b/platform-abstractions/interfaces/font-controller.h @@ -105,14 +105,14 @@ public: * Otherwise returns closest match. * @param[in] charsRequested displayed text. */ - virtual const StyledFontFamily& GetFontFamilyForChars( const TextArray& charsRequested ) = 0; + virtual const StyledFontFamily& GetFontFamilyForChars( const Integration::TextArray& charsRequested ) = 0; /** * Checks whether all characters of text could be displayed with specified font family. * @param[in] styledFontFamily The name of the font's family and the font's style. * @param[in] text displayed text. */ - virtual bool AllGlyphsSupported( const StyledFontFamily& styledFontFamily, const TextArray& text ) = 0; + virtual bool AllGlyphsSupported( const StyledFontFamily& styledFontFamily, const Integration::TextArray& text ) = 0; /** * Set the default font family and its style that should be used by the font controller. diff --git a/platform-abstractions/slp/font-platform/font-controller-impl.cpp b/platform-abstractions/slp/font-platform/font-controller-impl.cpp index db4a327..4baa4ff 100755 --- a/platform-abstractions/slp/font-platform/font-controller-impl.cpp +++ b/platform-abstractions/slp/font-platform/font-controller-impl.cpp @@ -361,7 +361,7 @@ bool FontController::ValidateFontFamilyName( const StyledFontFamily& styledFontF return validFont; } -const FontController::StyledFontFamily& FontController::GetFontFamilyForChars( const TextArray& charsRequested ) +const FontController::StyledFontFamily& FontController::GetFontFamilyForChars( const Integration::TextArray& charsRequested ) { if( 0u == mPreferredFonts.Count() ) { @@ -446,7 +446,7 @@ void FontController::CacheFontInfo( FcPattern* pattern, const StyledFontFamily& } } -bool FontController::AllGlyphsSupported( const StyledFontFamily& styledFontFamily, const TextArray& text ) +bool FontController::AllGlyphsSupported( const StyledFontFamily& styledFontFamily, const Integration::TextArray& text ) { // The font has already been validated by the font implementation. @@ -564,18 +564,18 @@ bool FontController::IsAControlCharacter( uint32_t character ) const ( character == UNICODE_CR_LF ) ); } -bool FontController::FontFamilySupportsText( const StyledFontFamily& styledFontFamily, const TextArray& text ) +bool FontController::FontFamilySupportsText( const StyledFontFamily& styledFontFamily, const Integration::TextArray& text ) { FcCharSet* charSet = GetCachedFontCharacterSet( styledFontFamily ); DALI_ASSERT_ALWAYS( charSet && "No cached character set for font family" ); - const size_t textLength = text.size(); + const size_t textLength = text.Count(); // quick early exit before accessing font config for text arrays which are just a single control character if( textLength == 1u ) { - if( IsAControlCharacter( *text.begin() ) ) + if( IsAControlCharacter( *text.Begin() ) ) { return true; } @@ -584,7 +584,7 @@ bool FontController::FontFamilySupportsText( const StyledFontFamily& styledFontF // protect font config boost::mutex::scoped_lock fcLock( mFontConfigMutex ); - for( TextArray::const_iterator iter = text.begin(), endIter = text.end(); iter != endIter; ++iter ) + for( Integration::TextArray::ConstIterator iter = text.Begin(), endIter = text.End(); iter != endIter; ++iter ) { const uint32_t character = (*iter); @@ -672,7 +672,7 @@ _FcFontSet* FontController::GetFontSet() const return fontset; } -_FcCharSet* FontController::CreateCharacterSet( const TextArray& charsRequested ) +_FcCharSet* FontController::CreateCharacterSet( const Integration::TextArray& charsRequested ) { // create the character set object FcCharSet* charSet = FcCharSetCreate(); @@ -680,7 +680,7 @@ _FcCharSet* FontController::CreateCharacterSet( const TextArray& charsRequested bool validCharAdded(false); // add valid characters to the character set. - for( TextArray::const_iterator iter = charsRequested.begin(), endIter = charsRequested.end(); iter != endIter; ++iter ) + for( Integration::TextArray::ConstIterator iter = charsRequested.Begin(), endIter = charsRequested.End(); iter != endIter; ++iter ) { const uint32_t character = (*iter); diff --git a/platform-abstractions/slp/font-platform/font-controller-impl.h b/platform-abstractions/slp/font-platform/font-controller-impl.h index db2c86e..0283882 100644 --- a/platform-abstractions/slp/font-platform/font-controller-impl.h +++ b/platform-abstractions/slp/font-platform/font-controller-impl.h @@ -95,12 +95,12 @@ public: /** * @copydoc Dali::Platform::FontController::GetFontFamilyForChars() */ - virtual const StyledFontFamily& GetFontFamilyForChars( const TextArray& charsRequested); + virtual const StyledFontFamily& GetFontFamilyForChars( const Integration::TextArray& charsRequested); /** * @copydoc Dali::Platform::FontController::AllGlyphsSupported() */ - virtual bool AllGlyphsSupported( const StyledFontFamily& styledFontFamily, const TextArray& text ); + virtual bool AllGlyphsSupported( const StyledFontFamily& styledFontFamily, const Integration::TextArray& text ); /** * @copydoc Dali::Platform::FontController::SetDefaultFontFamily() @@ -165,7 +165,7 @@ private: * @param text text array. * @return true if the font family supports the text false if not. */ - bool FontFamilySupportsText( const StyledFontFamily& styledFontFamily, const TextArray& text ); + bool FontFamilySupportsText( const StyledFontFamily& styledFontFamily, const Integration::TextArray& text ); /** * Clear the font family cache. @@ -192,7 +192,7 @@ private: * @param charsRequested array of characters. * @return a pointer to _FcCharSet object on success, NULL on failure. */ - _FcCharSet* CreateCharacterSet( const TextArray& charsRequested ); + _FcCharSet* CreateCharacterSet( const Integration::TextArray& charsRequested ); /** * Add a font that has not been found on the system but a match has been found. diff --git a/platform-abstractions/slp/resource-loader/resource-loader.cpp b/platform-abstractions/slp/resource-loader/resource-loader.cpp index 27cb71b..c79b84e 100755 --- a/platform-abstractions/slp/resource-loader/resource-loader.cpp +++ b/platform-abstractions/slp/resource-loader/resource-loader.cpp @@ -454,12 +454,12 @@ bool ResourceLoader::IsLoading() return mImpl->IsLoading(); } -const std::string& ResourceLoader::GetFontFamilyForChars( const TextArray& charsRequested ) +const std::string& ResourceLoader::GetFontFamilyForChars( const Integration::TextArray& charsRequested ) { return mImpl->mFontController->GetFontFamilyForChars( charsRequested ).first; } -bool ResourceLoader::AllGlyphsSupported( const std::string& fontFamily, const std::string& fontStyle, const TextArray& charsRequested ) +bool ResourceLoader::AllGlyphsSupported( const std::string& fontFamily, const std::string& fontStyle, const Integration::TextArray& charsRequested ) { // At this point fontFamily and fontStyle must have been validated. diff --git a/platform-abstractions/slp/resource-loader/resource-loader.h b/platform-abstractions/slp/resource-loader/resource-loader.h index 8d3a9a2..9d216f2 100644 --- a/platform-abstractions/slp/resource-loader/resource-loader.h +++ b/platform-abstractions/slp/resource-loader/resource-loader.h @@ -302,12 +302,12 @@ public: /** * @copydoc PlatformAbstraction::GetFontFamilyForChars() */ - const std::string& GetFontFamilyForChars(const TextArray& charsRequested); + const std::string& GetFontFamilyForChars(const Integration::TextArray& charsRequested); /** * @copydoc PlatformAbstraction::AllGlyphsSupported() */ - bool AllGlyphsSupported(const std::string& fontFamily, const std::string& fontStyle, const TextArray& charsRequested); + bool AllGlyphsSupported(const std::string& fontFamily, const std::string& fontStyle, const Integration::TextArray& charsRequested); /** * @copydoc PlatformAbstraction::ValidateFontFamilyName() diff --git a/platform-abstractions/slp/slp-platform-abstraction.cpp b/platform-abstractions/slp/slp-platform-abstraction.cpp index 0f1e488..5114054 100644 --- a/platform-abstractions/slp/slp-platform-abstraction.cpp +++ b/platform-abstractions/slp/slp-platform-abstraction.cpp @@ -242,7 +242,7 @@ void SlpPlatformAbstraction::SetDpi(unsigned int dpiHor, unsigned int dpiVer) } } -const std::string& SlpPlatformAbstraction::GetFontFamilyForChars(const TextArray& charsRequested) const +const std::string& SlpPlatformAbstraction::GetFontFamilyForChars(const Integration::TextArray& charsRequested) const { if( mResourceLoader ) { @@ -252,7 +252,7 @@ const std::string& SlpPlatformAbstraction::GetFontFamilyForChars(const TextArray return NULL_FONT_FAMILY_NAME; } -bool SlpPlatformAbstraction::AllGlyphsSupported(const std::string &fontFamily, const std::string& fontStyle, const TextArray& charsRequested) const +bool SlpPlatformAbstraction::AllGlyphsSupported(const std::string &fontFamily, const std::string& fontStyle, const Integration::TextArray& charsRequested) const { bool ret = false; if (mResourceLoader) diff --git a/platform-abstractions/slp/slp-platform-abstraction.h b/platform-abstractions/slp/slp-platform-abstraction.h index a7b54c6..cf308c6 100644 --- a/platform-abstractions/slp/slp-platform-abstraction.h +++ b/platform-abstractions/slp/slp-platform-abstraction.h @@ -167,12 +167,12 @@ public: // PlatformAbstraction overrides /** * @copydoc PlatformAbstraction::GetFontFamilyForChars() */ - const std::string& GetFontFamilyForChars(const TextArray& charsRequested) const; + const std::string& GetFontFamilyForChars(const Integration::TextArray& charsRequested) const; /** * @copydoc PlatformAbstraction::AllGlyphsSupported() */ - bool AllGlyphsSupported(const std::string &fontFamily, const std::string& fontStyle, const TextArray& charsRequested) const; + bool AllGlyphsSupported(const std::string &fontFamily, const std::string& fontStyle, const Integration::TextArray& charsRequested) const; /** * @copydoc PlatformAbstraction::ValidateFontFamilyName()