diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
commit | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (patch) | |
tree | c1edb8d8b368fdd43cd8639e6044b0f4e8dde70a /src/gui/sdlfont.cpp | |
parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
download | plus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.gz plus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.bz2 plus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.tar.xz plus-4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80.zip |
Merge branch 'master' into strippedstripped1.1.11.12
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/focushandler.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/image.cpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widget.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/imagebutton.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
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) |