From 9289d2ffb47267b8f305e14e92be53f9094d1370 Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Thu, 21 Aug 2014 15:05:53 +0100 Subject: [PATCH] Uses TextArray new type definition. TextArray is now a Dali::Vector instead a std::vector. Change-Id: Ifc45f872607e04fe6826578b7a0bb6d7de0f9d7c Signed-off-by: Victor Cebollada --- .../dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h | 8 ++++---- .../dali-toolkit-test-utils/test-platform-abstraction.cpp | 4 ++-- .../dali-toolkit-test-utils/test-platform-abstraction.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h index 082c2dd..5590b91 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp index 4f749ce..ef3eb77 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.cpp +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h index 4723d90..2d4c38c 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-platform-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-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() -- 2.7.4