From 78ab0ec914d3c5a97f162905afb3dede53f8b9ed Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Thu, 9 Mar 2006 01:20:48 +0000 Subject: Use std::auto_ptr in some places. --- src/gui/trade.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src/gui/trade.cpp') diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp index f7286fd2..9d10774b 100644 --- a/src/gui/trade.cpp +++ b/src/gui/trade.cpp @@ -45,7 +45,9 @@ TradeWindow::TradeWindow(Network *network): Window("Trade: You"), - mNetwork(network) + mNetwork(network), + myInventory(new Inventory()), + partnerInventory(new Inventory()) { setContentSize(322, 150); @@ -54,16 +56,13 @@ TradeWindow::TradeWindow(Network *network): cancelButton = new Button("Cancel"); tradeButton = new Button("Trade"); - myInventory = new Inventory(); - partnerInventory = new Inventory(); - - myItemContainer = new ItemContainer(myInventory); + myItemContainer = new ItemContainer(myInventory.get()); myItemContainer->setPosition(2, 2); myScroll = new ScrollArea(myItemContainer); myScroll->setPosition(8, 8); - partnerItemContainer = new ItemContainer(partnerInventory); + partnerItemContainer = new ItemContainer(partnerInventory.get()); partnerItemContainer->setPosition(2, 58); partnerScroll = new ScrollArea(partnerItemContainer); @@ -137,8 +136,6 @@ TradeWindow::TradeWindow(Network *network): TradeWindow::~TradeWindow() { - delete myInventory; - delete partnerInventory; } void TradeWindow::addMoney(int amount) -- cgit v1.2.3-70-g09d2