diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2004-10-01 13:21:35 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2004-10-01 13:21:35 +0000 |
| commit | ddc3964ed95d01e72229dc9af968a327cd84e56c (patch) | |
| tree | 93e6694c639db3d188f5b2868f6b2b2951d21d60 /lib/gdi/font.cpp | |
| parent | 1aeefd997cc362c3b37c1587c5f08891b35c3a75 (diff) | |
| download | enigma2-ddc3964ed95d01e72229dc9af968a327cd84e56c.tar.gz enigma2-ddc3964ed95d01e72229dc9af968a327cd84e56c.zip | |
- add python, missing gui
- remove console (needs to be rewritten anyway)
- eString -> std::string
Diffstat (limited to 'lib/gdi/font.cpp')
| -rw-r--r-- | lib/gdi/font.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp index a8f0b120..ee228576 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()) { |