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/guichan/widgets/icon.cpp | |
| parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
| download | manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz manaverse-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip | |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/guichan/widgets/icon.cpp')
| -rw-r--r-- | src/guichan/widgets/icon.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/guichan/widgets/icon.cpp b/src/guichan/widgets/icon.cpp index 2983c7c29..13a9f1309 100644 --- a/src/guichan/widgets/icon.cpp +++ b/src/guichan/widgets/icon.cpp @@ -56,14 +56,14 @@ namespace gcn { Icon::Icon() - : mImage(0) + : mImage(nullptr) , mInternalImage(false) { setSize(0, 0); } Icon::Icon(const std::string& filename) - : mImage(0), + : mImage(nullptr), mInternalImage(false) { mImage = Image::load(filename); @@ -85,7 +85,7 @@ namespace gcn if (mInternalImage) { delete mImage; - mImage = 0; + mImage = nullptr; } } @@ -107,7 +107,7 @@ namespace gcn void Icon::draw(Graphics* graphics) { - if (mImage != NULL) + if (mImage) { const int x = (getWidth() - mImage->getWidth()) / 2; const int y = (getHeight() - mImage->getHeight()) / 2; |