diff options
| author | Eugene Sandulenko | 2010-08-06 10:59:35 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-10-12 22:29:37 +0000 |
| commit | 6dcf9f0ee557e692df3c70a263ca35068ff45380 (patch) | |
| tree | ad705b0174fda87d448900178c688c302e8625a3 /engines/sword25/gfx/fontresource.h | |
| parent | c1b5e5acb88201910b07d20819a677ee09e64df4 (diff) | |
| download | scummvm-rg350-6dcf9f0ee557e692df3c70a263ca35068ff45380.tar.gz scummvm-rg350-6dcf9f0ee557e692df3c70a263ca35068ff45380.tar.bz2 scummvm-rg350-6dcf9f0ee557e692df3c70a263ca35068ff45380.zip | |
SWORD25: std::string -> Common::String in gfx/
svn-id: r53218
Diffstat (limited to 'engines/sword25/gfx/fontresource.h')
| -rw-r--r-- | engines/sword25/gfx/fontresource.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sword25/gfx/fontresource.h b/engines/sword25/gfx/fontresource.h index 826a14522f..dff0cee085 100644 --- a/engines/sword25/gfx/fontresource.h +++ b/engines/sword25/gfx/fontresource.h @@ -66,7 +66,7 @@ public: @param FileName der Dateiname der zu ladenen Resource @remark Wenn der Konstruktor erfolgreich ausgeführt werden konnte gibt die Methode IsValid true zurück. */ - BS_FontResource(BS_Kernel * pKernel, const std::string & FileName); + BS_FontResource(BS_Kernel * pKernel, const Common::String & FileName); /** @brief Gibt true zurück, wenn das Objekt korrekt initialisiert wurde. @@ -99,12 +99,12 @@ public: /** @brief Gibt den Dateinamen der Charactermap zurück. */ - const std::string & GetCharactermapFileName() const { return _BitmapFileName; } + const Common::String & GetCharactermapFileName() const { return _BitmapFileName; } private: BS_Kernel * _pKernel; bool _Valid; - std::string _BitmapFileName; + Common::String _BitmapFileName; int _LineHeight; int _GapWidth; BS_Rect _CharacterRects[256]; @@ -113,8 +113,8 @@ private: // Hilfsmethoden // ----------------------------------------------------------------------------- - bool _ParseXMLDocument(const std::string & FileName, TiXmlDocument & Doc) const; - bool _ParseFontTag(TiXmlElement & Tag, std::string & BitmapFileName, int & LineHeight, int & GapWidth) const; + bool _ParseXMLDocument(const Common::String & FileName, TiXmlDocument & Doc) const; + bool _ParseFontTag(TiXmlElement & Tag, Common::String & BitmapFileName, int & LineHeight, int & GapWidth) const; bool _ParseCharacterTag(TiXmlElement & Tag, int & Code, BS_Rect & Rect) const; }; |