diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-08 00:44:17 +0300 |
| commit | 4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe (patch) | |
| tree | 714897eca03fbcb764f5b450a29cc1aef8d33433 /src/gui/tradewindow.cpp | |
| parent | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (diff) | |
| download | plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.gz plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.bz2 plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.tar.xz plus-4cea2a5cd85b8d3ad905eb3b337b28284c62d4fe.zip | |
Fix more gcc 4.7 warnings.
Diffstat (limited to 'src/gui/tradewindow.cpp')
| -rw-r--r-- | src/gui/tradewindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index bd7e9bb1e..506bf65c9 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -63,11 +63,11 @@ #define CAPTION_ACCEPTED _("Agreed. Waiting...") TradeWindow::TradeWindow(): - Window(_("Trade: You"), false, 0, "trade.xml"), + Window(_("Trade: You"), false, nullptr, "trade.xml"), mMyInventory(new Inventory(Inventory::TRADE)), mPartnerInventory(new Inventory(Inventory::TRADE)), mStatus(PROPOSING), - mAutoAddItem(0), + mAutoAddItem(nullptr), mAutoAddToNick(""), mGotMoney(0), mGotMaxMoney(0), @@ -390,7 +390,7 @@ void TradeWindow::close() void TradeWindow::clear() { - mAutoAddItem = 0; + mAutoAddItem = nullptr; mAutoAddToNick = ""; mAutoMoney = 0; mAutoAddAmount = 0; |