[4.0] AddCustomFontDirectory input parameter type change

Change-Id: I246ad473695dc874919e81e0958fec30a54e3b8e

diff --git a/text/dali/devel-api/text-abstraction/font-client.cpp b/text/dali/devel-api/text-abstraction/font-client.cpp
index d15cc57..e08cf8b 100644 (file)
--- a/text/dali/devel-api/text-abstraction/font-client.cpp
+++ b/text/dali/devel-api/text-abstraction/font-client.cpp
@@ -207,7 +207,7 @@ bool FontClient::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex )
   return GetImplementation(*this).IsColorGlyph( fontId, glyphIndex );
 }
 
-bool FontClient::AddCustomFontDirectory( const char* path )
+bool FontClient::AddCustomFontDirectory( const FontPath& path )
 {
   return GetImplementation(*this).AddCustomFontDirectory( path );
 }

diff --git a/text/dali/devel-api/text-abstraction/font-client.h b/text/dali/devel-api/text-abstraction/font-client.h
index cf0c0b1..951d4ae 100644 (file)
--- a/text/dali/devel-api/text-abstraction/font-client.h
+++ b/text/dali/devel-api/text-abstraction/font-client.h
@@ -412,7 +412,7 @@ public:
    *
    * @return true if the fonts can be added.
    */
-  bool AddCustomFontDirectory( const char* path );
+  bool AddCustomFontDirectory( const FontPath& path );
 
 public: // Not intended for application developers
   /**

diff --git a/text/dali/internal/text-abstraction/font-client-impl.cpp b/text/dali/internal/text-abstraction/font-client-impl.cpp
index 1bed788..497c8f4 100644 (file)
--- a/text/dali/internal/text-abstraction/font-client-impl.cpp
+++ b/text/dali/internal/text-abstraction/font-client-impl.cpp
@@ -281,7 +281,7 @@ bool FontClient::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex )
   return mPlugin->IsColorGlyph( fontId, glyphIndex );
 }
 
-bool FontClient::AddCustomFontDirectory( const char* path )
+bool FontClient::AddCustomFontDirectory( const FontPath& path )
 {
   CreatePlugin();
 

diff --git a/text/dali/internal/text-abstraction/font-client-impl.h b/text/dali/internal/text-abstraction/font-client-impl.h
index 9637531..13d847b 100644 (file)
--- a/text/dali/internal/text-abstraction/font-client-impl.h
+++ b/text/dali/internal/text-abstraction/font-client-impl.h
@@ -196,7 +196,7 @@ public:
   /**
    * @copydoc Dali::TextAbstraction::FontClient::AddCustomFontDirectory()
    */
-  bool AddCustomFontDirectory( const char* path );
+  bool AddCustomFontDirectory( const FontPath& path );
 
 private:
 

diff --git a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
index b7055c1..28750e0 100644 (file)
--- a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
+++ b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp
@@ -1274,10 +1274,10 @@ bool FontClient::Plugin::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex )
   return FT_Err_Ok == error;
 }
 
-bool FontClient::Plugin::AddCustomFontDirectory( const char* path )
+bool FontClient::Plugin::AddCustomFontDirectory( const FontPath& path )
 {
   // NULL as first parameter means the current configuration is used.
-  return FcConfigAppFontAddDir( NULL, reinterpret_cast<const FcChar8 *>( path ) );
+  return FcConfigAppFontAddDir( NULL, reinterpret_cast<const FcChar8 *>( path.c_str() ) );
 }
 
 void FontClient::Plugin::InitSystemFonts()

diff --git a/text/dali/internal/text-abstraction/font-client-plugin-impl.h b/text/dali/internal/text-abstraction/font-client-plugin-impl.h
index 936a159..a1ceb9a 100644 (file)
--- a/text/dali/internal/text-abstraction/font-client-plugin-impl.h
+++ b/text/dali/internal/text-abstraction/font-client-plugin-impl.h
@@ -324,7 +324,7 @@ struct FontClient::Plugin
   /**
    * @copydoc Dali::TextAbstraction::FontClient::AddCustomFontDirectory()
    */
-  bool AddCustomFontDirectory( const char* path );
+  bool AddCustomFontDirectory( const FontPath& path );
 
 private: