diff options
| author | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 22:50:06 +0200 |
|---|---|---|
| committer | Raphael Langella <raphael.langella@gmail.com> | 2012-08-26 23:06:30 +0200 |
| commit | 770bcbd1844b97b671d0e47ea8313cdf2c74c5ea (patch) | |
| tree | e030cf61afce9ca69b74bb38eb73734bf10f633e /crawl-ref/source/fontwrapper-ft.h | |
| parent | a6c16c7f2066c854a01f25e9e6c3d8e44282a638 (diff) | |
| download | crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.tar.gz crawl-ref-770bcbd1844b97b671d0e47ea8313cdf2c74c5ea.zip | |
Use std namespace.
I had to rename distance() (in coord.h) to distance2() because it conflicts
with the STL function to compare 2 iterators. Not a bad change given how it
returns the square of the distance anyway.
I also had to rename the message global variable (in message.cc) to buffer.
I tried to fix and improve the coding style has much as I could, but I
probably missed a few given how huge and tedious it is.
I also didn't touch crawl-gdb.py, and the stuff in prebuilt, rltiles/tool
and util/levcomp.*, because I have no clue about those.
Diffstat (limited to 'crawl-ref/source/fontwrapper-ft.h')
| -rw-r--r-- | crawl-ref/source/fontwrapper-ft.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/fontwrapper-ft.h b/crawl-ref/source/fontwrapper-ft.h index c5e37ee007..1b355ab4ed 100644 --- a/crawl-ref/source/fontwrapper-ft.h +++ b/crawl-ref/source/fontwrapper-ft.h @@ -48,7 +48,7 @@ public: // FontBuffer helper functions virtual void store(FontBuffer &buf, float &x, float &y, - const std::string &s, const VColour &c); + const string &s, const VColour &c); virtual void store(FontBuffer &buf, float &x, float &y, const formatted_string &fs); virtual void store(FontBuffer &buf, float &x, float &y, ucs_t c, @@ -71,7 +71,7 @@ public: protected: void store(FontBuffer &buf, float &x, float &y, - const std::string &s, const VColour &c, float orig_x); + const string &s, const VColour &c, float orig_x); void store(FontBuffer &buf, float &x, float &y, const formatted_string &fs, float orig_x); @@ -103,7 +103,7 @@ protected: ucs_t uchar; }; GlyphInfo *m_glyphs; - std::map<ucs_t, unsigned int> m_glyphmap; + map<ucs_t, unsigned int> m_glyphmap; // index of least recently used glyph ucs_t m_glyphs_lru; // index of most recently used glyph |