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/itempopup.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/itempopup.cpp')
| -rw-r--r-- | src/gui/itempopup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index b05d7fe28..2e87cd544 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -50,7 +50,7 @@ ItemPopup::ItemPopup(): Popup("ItemPopup", "itempopup.xml"), - mIcon(0), + mIcon(nullptr), mLastName(""), mLastColor(1) { @@ -76,7 +76,7 @@ ItemPopup::ItemPopup(): mItemWeight->setEditable(false); mItemWeight->setPosition(getPadding(), 3 * fontHeight + 4 * getPadding()); - mIcon = new Icon(0); + mIcon = new Icon(nullptr); add(mItemName); add(mItemDesc); @@ -95,7 +95,7 @@ ItemPopup::~ItemPopup() if (image) { image->decRef(); - image = 0; + image = nullptr; } } } @@ -164,7 +164,7 @@ void ItemPopup::setItem(const ItemInfo &item, unsigned char color, } else { - mIcon->setImage(0); + mIcon->setImage(nullptr); } mItemType = item.getType(); |