/**
* @copydoc PlatformAbstraction::GetDefaultFontFamily()
*/
-std::string TestPlatformAbstraction::GetDefaultFontFamily() const
+const std::string& TestPlatformAbstraction::GetDefaultFontFamily() const
{
mTrace.PushCall("GetDefaultFontFamily", "");
return mGetDefaultFontFamilyResult;
/**
* @copydoc PlatformAbstraction::GetDefaultFontSize()
*/
-const float TestPlatformAbstraction::GetDefaultFontSize() const
+float TestPlatformAbstraction::GetDefaultFontSize() const
{
mTrace.PushCall("GetDefaultFontSize", "");
return mGetDefaultFontSizeResult;
}
-const PixelSize TestPlatformAbstraction::GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, const CapsHeight& capsHeight) const
+PixelSize TestPlatformAbstraction::GetFontLineHeightFromCapsHeight(const std::string& fontFamily, const std::string& fontStyle, CapsHeight capsHeight) const
{
mTrace.PushCall("GetFontLineHeightFromCapsHeight", "");
// LineHeight will be bigger than CapsHeight, so return capsHeight + 1
/**
* @copydoc PlatformAbstraction::GetFontFamilyForChars()
*/
-std::string TestPlatformAbstraction::GetFontFamilyForChars(const TextArray& charsRequested) const
+const std::string& TestPlatformAbstraction::GetFontFamilyForChars(const TextArray& charsRequested) const
{
mTrace.PushCall("GetFontFamilyForChars", "");
return mGetDefaultFontFamilyResult;
/**
* @copydoc PlatformAbstraction::GetFontList()
*/
-std::vector<std::string> TestPlatformAbstraction::GetFontList( PlatformAbstraction::FontListMode mode ) const
+void TestPlatformAbstraction::GetFontList( PlatformAbstraction::FontListMode mode, std::vector<std::string>& fonstList ) const
{
mFontListMode = mode;
mTrace.PushCall("ValidateGetFontList", "");
- std::vector<std::string> fontList;
- return fontList;
}
/**
*/
// 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>
/**
* @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()
/**
* @copydoc PlatformAbstraction::GetFontFamilyForChars()
*/
- virtual std::string GetFontFamilyForChars(const TextArray& charsRequested) const;
+ virtual const std::string& GetFontFamilyForChars(const TextArray& charsRequested) const;
/**
* @copydoc PlatformAbstraction::AllGlyphsSupported()
/**
* @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()