X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-platform-abstraction.h;h=2d4c38c9d467769b4a146815d062f66e0986b280;hb=4ccfc72faa9b5a28ee71ffe4696b324fb5b372db;hp=fb66434fe324451d29d0423a6cf4b120f473f1bd;hpb=a881757839b7abb008873a68c67e17b3ba39669b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 fb66434..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
@@ -19,11 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <set>
 #include <stdint.h>
 #include <cstring>
 
 // INTERNAL INCLUDES
+#include <dali/public-api/common/set-wrapper.h>
 #include <dali/integration-api/platform-abstraction.h>
 
 #include <dali/integration-api/glyph-set.h>
@@ -139,14 +139,17 @@ public:
   /**
    * @copydoc PlatformAbstraction::GetDefaultFontFamily()
    */
-  virtual std::string GetDefaultFontFamily() const;
+  virtual const std::string& GetDefaultFontFamily() const;
 
   /**
    * @copydoc PlatformAbstraction::GetDefaultFontSize()
    */
-  virtual const float GetDefaultFontSize() const;
+  virtual float GetDefaultFontSize() const;
 
-  virtual const Dali::PixelSize GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, const CapsHeight& capsHeight) const;
+  /**
+   * @copydoc PlatformAbstraction::GetFontLineHeightFromCapsHeight()
+   */
+  virtual Dali::PixelSize GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const;
 
   /**
    * @copydoc PlatformAbstraction::GetGlyphData()
@@ -182,12 +185,12 @@ public:
   /**
    * @copydoc PlatformAbstraction::GetFontFamilyForChars()
    */
-  virtual 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()
@@ -197,7 +200,7 @@ public:
   /**
    * @copydoc PlatformAbstraction::GetFontList()
    */
-  virtual std::vector<std::string> GetFontList( PlatformAbstraction::FontListMode mode ) const;
+  virtual void GetFontList( PlatformAbstraction::FontListMode mode, std::vector<std::string>& fontList ) const;
 
   /**
    * @copydoc PlatformAbstraction::LoadFile()