[atlantik-cvs] CVS: kdeaddons/atlantikdesigner/designer editor.cpp,1.35,1.36 editor.h,1.23,1.24 group.h,1.5,1.6

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

Modified Files:
	editor.cpp editor.h group.h 
Log Message:
Fix include/header


Index: editor.cpp
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/editor.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- editor.cpp	23 Dec 2002 05:25:27 -0000	1.35
+++ editor.cpp	5 Jan 2003 21:07:58 -0000	1.36
@@ -266,7 +266,7 @@
 	if (!superficial)
 	{
 		confDlg->slotOk();
-	
+
 		estate->setType(curType);
 		estate->setName(nameEdit->text());
 		estate->setGo(goCheck->isChecked());
@@ -283,7 +283,7 @@
 	configure();
 
 	locked = false;
-	
+
 	return estate;
 }
 
@@ -310,7 +310,7 @@
 	case Cards:
 		confDlg = new CardsDlg(estates, cards, this);
 		break;
-	
+
 	case Jail:
 	case ToJail:
 	case FreeParking:
@@ -325,7 +325,7 @@
 	confDlg->slotUpdate(estate);
 
 	connect(confDlg, SIGNAL(updateBackground()), this, SIGNAL(updateBackground()));
-	
+
 	layout->addWidget(confDlg, 1, 0);
 	confDlg->show();
 
@@ -345,17 +345,17 @@
 	}
 }
 
-bool EstateEdit::upArrow()
+bool EstateEdit::upArrow()const
 {
 	return (nameEdit->hasFocus() || typeCombo->hasFocus());
 }
 
-bool EstateEdit::downArrow()
+bool EstateEdit::downArrow()const
 {
 	return upArrow();
 }
 
-bool EstateEdit::leftArrow()
+bool EstateEdit::leftArrow()const
 {
 	if (nameEdit->hasFocus())
 	{
@@ -365,7 +365,7 @@
 	return false;
 }
 
-bool EstateEdit::rightArrow()
+bool EstateEdit::rightArrow()const
 {
 	if (nameEdit->hasFocus())
 	{
@@ -410,7 +410,7 @@
 {
 	QHBoxLayout *layout = new QHBoxLayout(this, KDialog::spacingHint());
 	layout->addWidget(new QLabel(i18n("Background:"), this));
-	
+
 	col = new KColorButton(this);
 	layout->addWidget(col);
 }
@@ -472,7 +472,7 @@
 				return;
 			}
 		}
-		
+
 		stacks->append(CardStack(name));
 		cards->insertItem(name);
 		cards->setCurrentText(name);
@@ -586,7 +586,7 @@
 		estate = 0;
 
 		value = new QSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this);
-		
+
 		hlayout->addWidget(value);
 		connect(value, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int)));
 
@@ -626,7 +626,7 @@
 
 	QString suffix = "";
 	QString prefix = "";
-	
+
 	// first four types are money, pay, payeach, collect, collecteach
 	if (i < 4 || key == "payhouse" || key == "payhotel")
 		suffix = "$";
@@ -752,11 +752,11 @@
 void CardView::del()
 {
 	int curItem = List->currentItem();
-	
+
 	// for some reason, crashes if count == 0
 	if (curItem < 0 || List->count() <= 1)
 		return;
-	
+
 	List->removeItem(curItem);
 	stack->remove(stack->at(curItem));
 	choosies.clear();
@@ -871,7 +871,7 @@
 		{
 			estate->setColor((*it).fgColor());
 			estate->setBgColor((*it).bgColor());
-		
+
 			estate->update();
 
 			break;

Index: editor.h
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/editor.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- editor.h	9 Nov 2002 19:41:37 -0000	1.23
+++ editor.h	5 Jan 2003 21:07:58 -0000	1.24
@@ -27,15 +27,15 @@
 	public:
 	ConfigEstate(int estateId);
 	void setEstateId(const int estateId);
-	int type() { return m_type; };
+	int type()const { return m_type; };
 	void setType(const int type);
 	const QString &group() { return m_group; };
 	void setGroup(const QString &group);
-	int price() { return m_price; }
+	int price()const { return m_price; }
 	void setPrice(int);
-	int rent(int _h) { return m_rent[_h]; }
+	int rent(int _h)const { return m_rent[_h]; }
 	void setRent(const int, const int);
-	int tax() { return m_tax; }
+	int tax()const { return m_tax; }
 	void setTax(const int);
 	int taxPercentage() { return m_taxPercentage; }
 	void setTaxPercentage(const int);
@@ -43,9 +43,9 @@
 	void setTakeCard(const QString &);
 	const QColor &forceBg() { return m_forceBg; }
 	void setForceBg(const QColor &);
-	bool go() { return m_go; }
+	bool go()const { return m_go; }
 	void setGo(const bool);
-	int passMoney() { return m_passMoney; }
+	int passMoney()const { return m_passMoney; }
 	void setPassMoney(const int);
 
 	void setChanged(bool);
@@ -113,13 +113,13 @@
 	public:
 	EstateEdit(ConfigEstateGroupList *, EstateList *, QValueList<CardStack> *, QWidget *parent = 0, const char *name = 0);
 	ConfigEstate *theEstate() { return estate; }
-	bool upArrow();
-	bool downArrow();
-	bool leftArrow();
-	bool rightArrow();
+	bool upArrow()const;
+	bool downArrow()const;
+	bool leftArrow()const;
+	bool rightArrow()const;
 	void aboutToDie();
 	void setReady(bool);
-	
+
 	public slots:
 	void setEstate(ConfigEstate *);
 	ConfigEstate *saveEstate(bool superficial = false);
@@ -164,7 +164,7 @@
 class ChooseWidget : public QWidget
 {
 	Q_OBJECT
-	
+
 	public:
 	ChooseWidget(EstateList *, int id, Card *, QWidget *parent = 0, char *name = 0);
 

Index: group.h
===================================================================
RCS file: /home/kde/kdeaddons/atlantikdesigner/designer/group.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- group.h	9 Jul 2002 02:19:59 -0000	1.5
+++ group.h	5 Jan 2003 21:07:58 -0000	1.6
@@ -26,12 +26,12 @@
 	void init() { setHousePrice(0); setGlobalPrice(0); }
 
 	void setHousePrice(int newPrice) { m_housePrice = newPrice; }
-	int housePrice() { return m_housePrice; }
+	int housePrice()const { return m_housePrice; }
 	void setGlobalPrice(int newGlobalPrice) { m_globalPrice = newGlobalPrice; }
-	int globalPrice() { return m_globalPrice; }
+	int globalPrice()const { return m_globalPrice; }
 	const QString &rentMath() { return m_rentMath; }
 	void setRentMath(const QString &newMath) { m_rentMath = newMath; }
-	bool dynamicRent() { return !m_rentMath.isEmpty(); }
+	bool dynamicRent()const { return !m_rentMath.isEmpty(); }
 	void setName(const QString &name) { m_name = name; }
 	const QString &name() { return m_name; }