[atlantik-cvs] CVS: kdeaddons/atlantikdesigner/designer designer.cpp,1.47,1.48 editor.cpp,1.34,1.35

Update of /home/kde/kdeaddons/atlantikdesigner/designer
In directory office:/tmp/cvs-serv12055/designer

Modified Files:
	designer.cpp editor.cpp 
Log Message:
make it compile and compile it

Index: designer.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/designer.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- designer.cpp	9 Nov 2002 19:41:37 -0000	1.47
+++ designer.cpp	23 Dec 2002 05:25:27 -0000	1.48
@@ -546,7 +546,7 @@
 	delete m_player;
 
 	// our superstar!
-	m_player = new Player;
+	m_player = new Player(0); // playerId 0, we're not going to use it anyway
 
 	ConfigEstate *go = 0;
 	for (go = estates.first(); go; go = estates.next())
@@ -620,7 +620,7 @@
 	{
 		if (estate->go())
 		{
-			t << "go=" << estate->estateId() << endl;
+			t << "go=" << estate->id() << endl;
 			hasGo = true;
 			break;
 		}
@@ -845,7 +845,7 @@
 
 void AtlanticDesigner::movePlayer(Estate *estate)
 {
-	estateAct->setCurrentItem(estate->estateId());
+	estateAct->setCurrentItem(estate->id());
 	board->setFocus();
 	m_player->setLocation(estate);
 	m_player->update();
@@ -951,7 +951,7 @@
 {
 	ConfigEstate *curEstate = 0;
 	for (curEstate = estates.first(); curEstate; curEstate = estates.next())
-		if (curEstate->go() && curEstate->estateId() != id)
+		if (curEstate->go() && curEstate->id() != id)
 			curEstate->setGo(false);
 }
 
@@ -1015,7 +1015,7 @@
 	if (editor->upArrow())
 		return;
 	int fourth = max / 4;
-	int estateId = editor->theEstate()->estateId() + 1;
+	int estateId = editor->theEstate()->id() + 1;
 	int dest = estateId - 1;
 
 	if (estateId <= 2*fourth && estateId > fourth) // left side
@@ -1033,7 +1033,7 @@
 	if (editor->downArrow())
 		return;
 	int fourth = max / 4;
-	int estateId = editor->theEstate()->estateId() + 1;
+	int estateId = editor->theEstate()->id() + 1;
 	int dest = estateId - 1;
 
 	if (estateId <= (2*fourth + 1) && estateId > (fourth + 1)) // left side
@@ -1051,7 +1051,7 @@
 	if (editor->leftArrow())
 		return;
 	int fourth = max / 4;
-	int estateId = editor->theEstate()->estateId() + 1;
+	int estateId = editor->theEstate()->id() + 1;
 	int dest = estateId - 1;
 
 	if (estateId <= fourth) // bottom
@@ -1067,7 +1067,7 @@
 	if (editor->rightArrow())
 		return;
 	int fourth = max / 4;
-	int estateId = editor->theEstate()->estateId() + 1;
+	int estateId = editor->theEstate()->id() + 1;
 	int dest = estateId - 1;
 
 	if (estateId <= (fourth + 1) && estateId != 1) // bottom

Index: editor.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/editor.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- editor.cpp	9 Nov 2002 19:41:37 -0000	1.34
+++ editor.cpp	23 Dec 2002 05:25:27 -0000	1.35
@@ -42,9 +42,9 @@
 
 void ConfigEstate::setEstateId(const int estateId)
 {
-	if (m_estateId != estateId)
+	if (m_id != estateId)
 	{
-		m_estateId = estateId;
+		m_id = estateId;
 		m_changed = true;
 	}
 }
@@ -341,7 +341,7 @@
 {
 	if (on)
 	{
-		emit goChecked(estate->estateId());
+		emit goChecked(estate->id());
 	}
 }