diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
| commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
| tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/gui/sdlfont.cpp | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip | |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/gui/sdlfont.cpp')
| -rw-r--r-- | src/gui/sdlfont.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index b196ae4e4..001a8671a 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -49,14 +49,14 @@ class SDLTextChunk { public: SDLTextChunk(const std::string &text0, const gcn::Color &color0) : - img(0), text(text0), color(color0) + img(nullptr), text(text0), color(color0) { } ~SDLTextChunk() { delete img; - img = 0; + img = nullptr; } bool operator==(const SDLTextChunk &chunk) const @@ -79,7 +79,7 @@ class SDLTextChunk if (!surface) { - img = 0; + img = nullptr; return; } @@ -138,7 +138,7 @@ SDLFont::SDLFont(const std::string &filename, int size, int style) : SDLFont::~SDLFont() { TTF_CloseFont(mFont); - mFont = 0; + mFont = nullptr; --fontCounter; if (fontCounter == 0) |