[atlantik-cvs] CVS: kdegames/atlantik/libatlantic atlantic_core.cpp,1.25,1.26 atlantic_core.h,1.21,1.22

Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv11186/libatlantic

Modified Files:
	atlantic_core.cpp atlantic_core.h 
Log Message:
core management fixes

Index: atlantic_core.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- atlantic_core.cpp	14 Jul 2003 07:15:48 -0000	1.25
+++ atlantic_core.cpp	14 Jul 2003 08:03:07 -0000	1.26
@@ -27,9 +27,6 @@
 AtlanticCore::AtlanticCore(QObject *parent, const char *name) : QObject(parent, name)
 {
 	m_playerSelf = 0;
-
-	connect(this, SIGNAL(deletePlayer(Player *)), this, SLOT(slotDeletePlayer(Player *)));
-	connect(this, SIGNAL(deleteTrade(Trade *)), this, SLOT(slotDeleteTrade(Trade *)));
 }
 
 void AtlanticCore::reset(bool deletePlayers)
@@ -46,7 +43,11 @@
 
 	Trade *trade = 0;
 	for (QPtrListIterator<Trade> it(m_trades); (trade = *it) ; ++it)
-		removeTrade(trade);
+	{
+		emit removeGUI(trade);
+		trade->deleteLater();
+	}
+	m_trades.clear();
 
 	Player *player = 0;
 	for (QPtrListIterator<Player> it(m_players); (player = *it) ; ++it)
@@ -54,7 +55,7 @@
 		if (deletePlayers)
 		{
 			emit removeGUI(player);
-			emit deletePlayer(player);
+			player->deleteLater();
 		}
 		else
 		{
@@ -105,12 +106,7 @@
 {
 	m_players.remove(player);
 	emit removeGUI(player);
-	emit deletePlayer(player);
-}
-
-void AtlanticCore::slotDeletePlayer(Player *player)
-{
-	delete player;
+	player->deleteLater();
 }
 
 QPtrList<Estate> AtlanticCore::estates()
@@ -199,12 +195,7 @@
 {
 	m_trades.remove(trade);
 	emit removeGUI(trade);
-	emit deleteTrade(trade);
-}
-
-void AtlanticCore::slotDeleteTrade(Trade *trade)
-{	
-	delete trade;
+	trade->deleteLater();
 }
 
 QPtrList<Auction> AtlanticCore::auctions()

Index: atlantic_core.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/atlantic_core.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- atlantic_core.h	14 Jul 2003 01:29:51 -0000	1.21
+++ atlantic_core.h	14 Jul 2003 08:03:07 -0000	1.22
@@ -69,10 +69,6 @@
 	void removeGUI(Trade *trade);
 	void deleteTrade(Trade *trade);
 
-private slots:
-	void slotDeletePlayer(Player *player);
-	void slotDeleteTrade(Trade *trade);
-
 private:
 	Player *m_playerSelf;
 	QPtrList<Player> m_players;