[prev in list] [next in list] [prev in thread] [next in thread] 

List:       atlantik-devel
Subject:    [atlantik-devel] CVS: kdegames/atlantik/libatlantic estate.cpp,1.4,1.5 estate.h,1.7,1.8
From:       kde () office ! kde ! org
Date:       2002-04-30 18:26:22
[Download RAW message or body]

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

Modified Files:
	estate.cpp estate.h 
Log Message:
Estate::m_estateGroup is now pointer to group instead of QString

Index: estate.cpp
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/estate.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- estate.cpp	2002/04/23 17:02:55	1.4
+++ estate.cpp	2002/04/30 18:26:20	1.5
@@ -30,10 +30,10 @@
 	m_color = QColor();
 }
 
-void Estate::setGroup(const QString group)
+void Estate::setEstateGroup(EstateGroup *estateGroup)
 {
-	if (m_group != group)
-		m_group = group;
+	if (m_estateGroup != estateGroup)
+		m_estateGroup = estateGroup;
 }
 
 void Estate::setOwner(Player *player)

Index: estate.h
===================================================================
RCS file: /home/kde/kdegames/atlantik/libatlantic/estate.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- estate.h	2002/04/23 17:02:55	1.7
+++ estate.h	2002/04/30 18:26:20	1.8
@@ -20,6 +20,7 @@
 #include <qobject.h>
 #include <qcolor.h>
 
+class EstateGroup;
 class Player;
 
 class Estate : public QObject
@@ -31,8 +32,8 @@
 	int estateId() const { return m_estateId; }
 	void setName(const QString name);
 	QString name() const { return m_name; }
-	void setGroup(const QString group);
-	QString group() const { return m_group; }
+	void setEstateGroup(EstateGroup *estateGroup);
+	EstateGroup *estateGroup() { return m_estateGroup; }
 	void setOwner(Player *player);
 	bool isOwned() const;
 	bool isOwnedBySelf() const;
@@ -68,8 +69,9 @@
 	int m_estateId;
 
 private:
-	QString m_name, m_group;
+	QString m_name;
 	Player *m_owner;
+	EstateGroup *m_estateGroup;
 	unsigned int m_houses;
 	bool m_canBeOwned, m_canBuyHouses, m_canSellHouses, m_isMortgaged, m_canToggleMortgage;
 	QColor m_bgColor, m_color;

_______________________________________________
atlantik-devel mailing list
atlantik-devel@mail.kde.org
http://mail.kde.org/mailman/listinfo/atlantik-devel
[prev in list] [next in list] [prev in thread] [next in thread]