[prev in list] [next in list] [prev in thread] [next in thread]
List: atlantik-devel
Subject: [atlantik-cvs] CVS: kdegames/atlantik/libatlantic
From: kde () office ! kde ! org
Date: 2003-07-14 8:03:34
[Download RAW message or body]
Update of /home/kde/kdegames/atlantik/libatlantic
In directory office:/tmp/cvs-serv11423/libatlantic
Modified Files:
Tag: KDE_3_1_BRANCH
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.14.4.8
retrieving revision 1.14.4.9
diff -u -d -r1.14.4.8 -r1.14.4.9
--- atlantic_core.cpp 14 Jul 2003 07:16:16 -0000 1.14.4.8
+++ atlantic_core.cpp 14 Jul 2003 08:03:31 -0000 1.14.4.9
@@ -25,9 +25,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)
@@ -44,7 +41,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)
@@ -52,7 +53,7 @@
if (deletePlayers)
{
emit removeGUI(player);
- emit deletePlayer(player);
+ player->deleteLater();
}
else
{
@@ -103,12 +104,7 @@
{
m_players.remove(player);
emit removeGUI(player);
- emit deletePlayer(player);
-}
-
-void AtlanticCore::slotDeletePlayer(Player *player)
-{
- delete player;
+ player->deleteLater();
}
QPtrList<Estate> AtlanticCore::estates()
@@ -197,12 +193,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.13.4.7
retrieving revision 1.13.4.8
diff -u -d -r1.13.4.7 -r1.13.4.8
--- atlantic_core.h 14 Jul 2003 01:30:11 -0000 1.13.4.7
+++ atlantic_core.h 14 Jul 2003 08:03:31 -0000 1.13.4.8
@@ -67,10 +67,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;
_______________________________________________
atlantik-cvs mailing list
atlantik-cvs@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic