X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Ffont.cpp;h=ee228576bfb9852bfb495159a46919c35199f44e;hp=a8f0b120615753c25897a26fcee5f7f4b6832a68;hb=ddc3964ed95d01e72229dc9af968a327cd84e56c;hpb=1aeefd997cc362c3b37c1587c5f08891b35c3a75

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index a8f0b12..ee22857 100644
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -101,7 +101,7 @@ FT_Error fontRenderClass::FTC_Face_Requester(FTC_FaceID	face_id, FT_Face* aface)
 	return 0;
 }																																																																
 
-FTC_FaceID fontRenderClass::getFaceID(const eString &face)
+FTC_FaceID fontRenderClass::getFaceID(const std::string &face)
 {
 	for (fontListEntry *f=font; f; f=f->next)
 	{
@@ -117,7 +117,7 @@ FT_Error fontRenderClass::getGlyphBitmap(FTC_Image_Desc *font, FT_ULong glyph_in
 	return res;
 }
 
-eString fontRenderClass::AddFont(const eString &filename, const eString &name, int scale)
+std::string fontRenderClass::AddFont(const std::string &filename, const std::string &name, int scale)
 {
 	eDebugNoNewLine("[FONT] adding font %s...", filename.c_str());
 	fflush(stdout);
@@ -225,7 +225,7 @@ fontRenderClass::~fontRenderClass()
 //	FT_Done_FreeType(library);
 }
 
-int fontRenderClass::getFont(ePtr<Font> &font, const eString &face, int size, int tabwidth)
+int fontRenderClass::getFont(ePtr<Font> &font, const std::string &face, int size, int tabwidth)
 {
 	FTC_FaceID id=getFaceID(face);
 	if (!id)
@@ -400,7 +400,7 @@ void eTextPara::setFont(const gFont *font)
 	setFont(fnt, replacement);
 }
 
-eString eTextPara::replacement_facename;
+std::string eTextPara::replacement_facename;
 
 void eTextPara::setFont(Font *fnt, Font *replacement)
 {
@@ -437,7 +437,7 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
 void
 shape (std::vector<unsigned long> &string, const std::vector<unsigned long> &text);
 
-int eTextPara::renderString(const eString &string, int rflags)
+int eTextPara::renderString(const std::string &string, int rflags)
 {
 	singleLock s(ftlock);
 	
@@ -463,7 +463,7 @@ int eTextPara::renderString(const eString &string, int rflags)
 	std::vector<unsigned long> uc_string, uc_visual;
 	uc_string.reserve(string.length());
 	
-	eString::const_iterator p(string.begin());
+	std::string::const_iterator p(string.begin());
 
 	while(p != string.end())
 	{