Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1157634 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 109 insertions, 109 deletions

diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp
index f092254..fd978d2 100644
--- a/atlantikdesigner/designer/editor.cpp
+++ b/atlantikdesigner/designer/editor.cpp
@@ -1,15 +1,15 @@
-#include <qcheckbox.h>
-#include <qevent.h>
-#include <qframe.h>
-#include <qhgroupbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qvbox.h>
-#include <qvgroupbox.h>
+#include <tqcheckbox.h>
+#include <tqevent.h>
+#include <tqframe.h>
+#include <tqhgroupbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
+#include <tqvbox.h>
+#include <tqvgroupbox.h>
 
 #include <kcolorbutton.h>
 #include <kcombobox.h>
@@ -59,7 +59,7 @@ void ConfigEstate::setType(const int type)
 	}
 }
 
-void ConfigEstate::setGroup(const QString &group)
+void ConfigEstate::setGroup(const TQString &group)
 {
 	if (m_group != group)
 	{
@@ -104,7 +104,7 @@ void ConfigEstate::setTaxPercentage(const int taxPercentage)
 	}
 }
 
-void ConfigEstate::setTakeCard(const QString &takeCard)
+void ConfigEstate::setTakeCard(const TQString &takeCard)
 {
 	if (m_takeCard != takeCard)
 	{
@@ -113,7 +113,7 @@ void ConfigEstate::setTakeCard(const QString &takeCard)
 	}
 }
 
-void ConfigEstate::setForceBg(const QColor &forceBg)
+void ConfigEstate::setForceBg(const TQColor &forceBg)
 {
 	if (m_forceBg != forceBg)
 	{
@@ -142,10 +142,10 @@ void ConfigEstate::setPassMoney(const int passMoney)
 
 ///////////////////////////
 
-QStringList types;
+TQStringList types;
 
-EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QValueList<CardStack> *cards, QWidget *parent, const char *name)
-	: QWidget(parent, name)
+EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *parent, const char *name)
+	: TQWidget(parent, name)
 {
 	groups = newGroups;
 
@@ -170,12 +170,12 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QV
 	ready = false;
 	locked = false;
 
-	connect(this, SIGNAL(somethingChanged()), this, SLOT(saveEstate()));
+	connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate()));
 
-	layout = new QGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
-	nameEdit = new QLineEdit(this, "Name Edit");
+	layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
+	nameEdit = new TQLineEdit(this, "Name Edit");
 	layout->addWidget(nameEdit, 0, 0);
-	connect(nameEdit, SIGNAL(returnPressed()), this, SIGNAL(somethingChanged()));
+	connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged()));
 
 	confDlg = 0;
 
@@ -183,31 +183,31 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, QV
 
 	layout->addWidget(new KSeparator(this), 3, 0);
 
-	QHBoxLayout *typeLayout = new QHBoxLayout(KDialog::spacingHint());
+	TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint());
 	layout->addLayout(typeLayout, 4, 0);
 
-	QLabel *typeLabel = new QLabel(i18n("Type:"), this);
+	TQLabel *typeLabel = new TQLabel(i18n("Type:"), this);
 	typeLayout->addWidget(typeLabel);
 	typeCombo = new KComboBox(false, this, "Type Combo");
 	typeLayout->addWidget(typeCombo);
-	connect(typeCombo, SIGNAL(activated(int)), this, SIGNAL(somethingChanged()));
-	connect(typeCombo, SIGNAL(activated(int)), this, SIGNAL(updateBackground()));
+	connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(somethingChanged()));
+	connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(updateBackground()));
 
-	goCheck = new QCheckBox(i18n("This estate is 'Go'"), this);
-	connect(goCheck, SIGNAL(toggled(bool)), this, SIGNAL(somethingChanged()));
-	connect(goCheck, SIGNAL(toggled(bool)), this, SLOT(goToggled(bool)));
+	goCheck = new TQCheckBox(i18n("This estate is 'Go'"), this);
+	connect(goCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(somethingChanged()));
+	connect(goCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(goToggled(bool)));
 	layout->addWidget(goCheck, 5, 0);
 
-	QHBoxLayout *passMoneyLayout = new QHBoxLayout(KDialog::spacingHint());
+	TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint());
 	layout->addLayout(passMoneyLayout, 6, 0);
-	QLabel *passMoneyLabel = new QLabel(i18n("Pass money:"), this);
+	TQLabel *passMoneyLabel = new TQLabel(i18n("Pass money:"), this);
 	passMoneyLayout->addWidget(passMoneyLabel);
-	passMoney = new QSpinBox(0, 3000, 10, this);
+	passMoney = new TQSpinBox(0, 3000, 10, this);
 	passMoney->setSpecialValueText(i18n("None"));
 	passMoney->setSuffix("$");
 	passMoneyLayout->addWidget(passMoney);
 
-	QStringList estateTypes(i18n("Street"));
+	TQStringList estateTypes(i18n("Street"));
 	estateTypes.append(i18n("Cards"));
 	estateTypes.append(i18n("Free Parking"));
 	estateTypes.append(i18n("Go to Jail"));
@@ -227,7 +227,7 @@ void EstateEdit::setReady(bool ready)
 	this->ready = ready;
 }
 
-void EstateEdit::resizeEvent(QResizeEvent *)
+void EstateEdit::resizeEvent(TQResizeEvent *)
 {
 	emit resized();
 }
@@ -325,7 +325,7 @@ void EstateEdit::configure()
 
 	confDlg->slotUpdate(estate);
 
-	connect(confDlg, SIGNAL(updateBackground()), this, SIGNAL(updateBackground()));
+	connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground()));
 
 	layout->addWidget(confDlg, 1, 0);
 	confDlg->show();
@@ -378,16 +378,16 @@ bool EstateEdit::rightArrow()const
 
 /////////////////////////////////
 
-TaxDlg::TaxDlg(QWidget *parent, char *name)
+TaxDlg::TaxDlg(TQWidget *parent, char *name)
 	: EstateDlg(parent, name)
 {
-	QGridLayout *taxBox = new QGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
-	taxBox->addWidget(new QLabel(i18n("Fixed tax:"), this), 0, 0);
-	taxBox->addWidget(tax = new QSpinBox(0, 3000, 1, this), 0, 1);
+	TQGridLayout *taxBox = new TQGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
+	taxBox->addWidget(new TQLabel(i18n("Fixed tax:"), this), 0, 0);
+	taxBox->addWidget(tax = new TQSpinBox(0, 3000, 1, this), 0, 1);
 	tax->setSpecialValueText(i18n("None"));
 	tax->setSuffix("$");
-	taxBox->addWidget(new QLabel(i18n("Percentage tax:"), this), 1, 0);
-	taxBox->addWidget(taxPercentage = new QSpinBox(0, 100, 1, this), 1, 1);
+	taxBox->addWidget(new TQLabel(i18n("Percentage tax:"), this), 1, 0);
+	taxBox->addWidget(taxPercentage = new TQSpinBox(0, 100, 1, this), 1, 1);
 	taxPercentage->setSpecialValueText(i18n("None"));
 	taxPercentage->setSuffix("%");
 }
@@ -406,11 +406,11 @@ void TaxDlg::update()
 
 /////////////////////////////////
 
-GenericDlg::GenericDlg(QWidget *parent, char *name)
+GenericDlg::GenericDlg(TQWidget *parent, char *name)
 	: EstateDlg(parent, name)
 {
-	QHBoxLayout *layout = new QHBoxLayout(this, KDialog::spacingHint());
-	layout->addWidget(new QLabel(i18n("Background:"), this));
+	TQHBoxLayout *layout = new TQHBoxLayout(this, KDialog::spacingHint());
+	layout->addWidget(new TQLabel(i18n("Background:"), this));
 
 	col = new KColorButton(this);
 	layout->addWidget(col);
@@ -429,7 +429,7 @@ void GenericDlg::update()
 
 /////////////////////////////////
 
-CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWidget *parent, char *name)
+CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *parent, char *name)
 	: EstateDlg(parent, name)
 {
 	estates = newEstates;
@@ -437,24 +437,24 @@ CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWid
 
 	view = 0;
 
-	vlayout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-	QHBoxLayout *layout = new QHBoxLayout(vlayout, KDialog::spacingHint());
+	TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
 
 	KPushButton *addB = new KPushButton(i18n("&New Stack"), this);
-	connect(addB, SIGNAL(clicked()), this, SLOT(addStack()));
+	connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack()));
 	layout->addWidget(addB);
 	layout->addStretch();
 
-	layout->addWidget(new QLabel(i18n("Cards from"), this));
-	QStringList cardNames;
-	for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
+	layout->addWidget(new TQLabel(i18n("Cards from"), this));
+	TQStringList cardNames;
+	for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
 		cardNames.append((*it).name());
 
-	cards = new QComboBox(this);
+	cards = new TQComboBox(this);
 	cards->insertStringList(cardNames);
 	layout->addWidget(cards);
-	connect(cards, SIGNAL(activated(const QString &)), this, SLOT(updateView(const QString &)));
+	connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &)));
 
 	vlayout->addWidget(new KSeparator(this));
 }
@@ -462,10 +462,10 @@ CardsDlg::CardsDlg(EstateList *newEstates, QValueList<CardStack> *newCards, QWid
 void CardsDlg::addStack()
 {
 	bool ok;
-	QString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), QString::null, &ok, this);
+	TQString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), TQString::null, &ok, this);
 	if (ok)
 	{
-		for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
+		for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
 		{
 			if ((*it).name() == name)
 			{
@@ -481,10 +481,10 @@ void CardsDlg::addStack()
 	}
 }
 
-void CardsDlg::updateView(const QString &curName)
+void CardsDlg::updateView(const TQString &curName)
 {
 	CardStack *curStack = 0;
-	for (QValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
+	for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
 		if ((*it).name() == curName)
 			curStack = &(*it);
 
@@ -515,8 +515,8 @@ void CardsDlg::update()
 
 /////////////////////////////////
 
-ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *parent, char *name)
-	: QWidget (parent, name)
+ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *parent, char *name)
+	: TQWidget (parent, name)
 {
 	this->id = id;
 	this->card = card;
@@ -530,9 +530,9 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *par
 
 	value = 0;
 
-	hlayout = new QHBoxLayout(this, KDialog::spacingHint());
+	hlayout = new TQHBoxLayout(this, KDialog::spacingHint());
 	typeCombo = new KComboBox(this);
-	QStringList _types(i18n("Pay"));
+	TQStringList _types(i18n("Pay"));
 	_types.append(i18n("Pay Each Player"));
 	_types.append(i18n("Collect"));
 	_types.append(i18n("Collect From Each Player"));
@@ -547,7 +547,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, QWidget *par
 	_types.append(i18n("Pay for Each Hotel"));
 	typeCombo->insertStringList(_types);
 	hlayout->addWidget(typeCombo);
-	connect(typeCombo, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
+	connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int)));
 
 	hlayout->addStretch();
 }
@@ -571,7 +571,7 @@ void ChooseWidget::estateChanged(int i)
 
 void ChooseWidget::typeChanged(int i)
 {
-	QString key = (*types.at(i));
+	TQString key = (*types.at(i));
 
 	(*card->keys.at(id)) = key;
 	typeCombo->setCurrentItem(i);
@@ -586,10 +586,10 @@ void ChooseWidget::typeChanged(int i)
 		delete estate;
 		estate = 0;
 
-		value = new QSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this);
+		value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this);
 
 		hlayout->addWidget(value);
-		connect(value, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int)));
+		connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
 
 		value->show();
 	}
@@ -599,11 +599,11 @@ void ChooseWidget::typeChanged(int i)
 		value = 0;
 		estate = new KComboBox(this);
 		ConfigEstate *curestate = 0;
-		QStringList estateStrings;
+		TQStringList estateStrings;
 		for (curestate = estates->first(); curestate; curestate = estates->next())
 			estateStrings.append(curestate->name());
 		estate->insertStringList(estateStrings);
-		connect(estate, SIGNAL(activated(int)), this, SLOT(estateChanged(int)));
+		connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int)));
 
 		hlayout->addWidget(estate);
 		estate->show();
@@ -625,8 +625,8 @@ Skipped:
 	}
 	value->setEnabled(!boolean);
 
-	QString suffix = "";
-	QString prefix = "";
+	TQString suffix = "";
+	TQString prefix = "";
 
 	// first four types are money, pay, payeach, collect, collecteach
 	if (i < 4 || key == "payhouse" || key == "payhotel")
@@ -640,7 +640,7 @@ Skipped:
 
 /////////////////////////////////
 
-CardView::CardView(EstateList *estates, CardStack *stack, QWidget *parent, char *name) : QWidget(parent, name)
+CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char *name) : TQWidget(parent, name)
 {
 	card = 0;
 
@@ -649,35 +649,35 @@ CardView::CardView(EstateList *estates, CardStack *stack, QWidget *parent, char
 
 	choosies.setAutoDelete(true);
 
-	layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	QHBoxLayout *hlayout = new QHBoxLayout(layout, KDialog::spacingHint());
+	layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
 
 	addButton = new KPushButton(i18n("&Add Card..."), this);
-	connect(addButton, SIGNAL(clicked()), this, SLOT(add()));
+	connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
 	hlayout->addWidget(addButton);
 	hlayout->addStretch();
 	renameButton = new KPushButton(i18n("&Rename..."), this);
-	connect(renameButton, SIGNAL(clicked()), this, SLOT(rename()));
+	connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename()));
 	hlayout->addWidget(renameButton);
 	hlayout->addStretch();
 	delButton = new KPushButton(i18n("&Delete"), this);
-	connect(delButton, SIGNAL(clicked()), this, SLOT(del()));
+	connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del()));
 	hlayout->addWidget(delButton);
 
 	List = new KListBox(this);
 	layout->addWidget(List);
-	connect(List, SIGNAL(highlighted(int)), this, SLOT(selected(int)));
+	connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int)));
 
 	// it gets very big (and won't shrink) otherwise
 	List->setMaximumHeight(90);
 
-	hlayout = new QHBoxLayout(layout, KDialog::spacingHint());
+	hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
 	moreButton = new KPushButton(i18n("&More Properties"), this);
-	connect(moreButton, SIGNAL(clicked()), this, SLOT(more()));
+	connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
 	hlayout->addWidget(moreButton);
 	hlayout->addStretch();
 	lessButton = new KPushButton(i18n("&Fewer Properties"), this);
-	connect(lessButton, SIGNAL(clicked()), this, SLOT(less()));
+	connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
 	hlayout->addWidget(lessButton);
 
 	for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it)
@@ -720,7 +720,7 @@ void CardView::less()
 void CardView::add()
 {
 	bool ok = false;
-	QString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), QString::null, &ok, this);
+	TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), TQString::null, &ok, this);
 	if (ok)
 		List->insertItem(name, 0);
 
@@ -742,7 +742,7 @@ void CardView::rename()
 		return;
 
 	bool ok = false;;
-	QString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), (*stack->at(curItem)).name, &ok, this);
+	TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), (*stack->at(curItem)).name, &ok, this);
 	if (ok)
 	{
 		(*stack->at(curItem)).name = name;
@@ -774,8 +774,8 @@ void CardView::selected(int i)
 	card = &(*stack->at(i));
 	unsigned int num = card->keys.count();
 
-	QValueList<int>::Iterator vit = card->values.begin();
-	for (QStringList::Iterator it = card->keys.begin(); it != card->keys.end(); ++it)
+	TQValueList<int>::Iterator vit = card->values.begin();
+	for (TQStringList::Iterator it = card->keys.begin(); it != card->keys.end(); ++it)
 	{
 		ChooseWidget *newChooseWidget = new ChooseWidget(estates, choosies.count(), card, this);
 
@@ -812,32 +812,32 @@ void CardView::updateButtonsEnabled()
 
 /////////////////////////////////
 
-StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, QWidget *parent, char *name)
+StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *parent, char *name)
 	: EstateDlg(parent, name)
 {
 	groups = newGroups;
 
-	QVBoxLayout *bigbox = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *bigbox = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-	QVGroupBox *RentPage = new QVGroupBox(i18n("&Rent by Number of Houses"), this);
+	TQVGroupBox *RentPage = new TQVGroupBox(i18n("&Rent by Number of Houses"), this);
 	RentPage->setInsideSpacing(KDialog::spacingHint());
 	RentPage->setInsideMargin(KDialog::marginHint());
 	bigbox->addWidget(RentPage);
-	QWidget *topRent = new QWidget(RentPage);
-	QGridLayout *rentBox = new QGridLayout(topRent, 3, 3, KDialog::spacingHint());
-	rentBox->addWidget(new QLabel(i18n("None:"), topRent), 0, 0);
-	rentBox->addWidget(new QLabel(i18n("One:"), topRent), 0, 1);
-	rentBox->addWidget(new QLabel(i18n("Two:"), topRent), 0, 2);
-	rentBox->addWidget(new QLabel(i18n("Three:"), topRent), 2, 0);
-	rentBox->addWidget(new QLabel(i18n("Four:"), topRent), 2, 1);
-	rentBox->addWidget(new QLabel(i18n("Hotel:"), topRent), 2, 2);
-
-	rentBox->addWidget(houses0 = new QSpinBox(0, 3000, 1, topRent), 1, 0);
-	rentBox->addWidget(houses1 = new QSpinBox(0, 3000, 1, topRent), 1, 1);
-	rentBox->addWidget(houses2 = new QSpinBox(0, 3000, 1, topRent), 1, 2);
-	rentBox->addWidget(houses3 = new QSpinBox(0, 3000, 1, topRent), 3, 0);
-	rentBox->addWidget(houses4 = new QSpinBox(0, 3000, 1, topRent), 3, 1);
-	rentBox->addWidget(houses5 = new QSpinBox(0, 3000, 1, topRent), 3, 2);
+	TQWidget *topRent = new TQWidget(RentPage);
+	TQGridLayout *rentBox = new TQGridLayout(topRent, 3, 3, KDialog::spacingHint());
+	rentBox->addWidget(new TQLabel(i18n("None:"), topRent), 0, 0);
+	rentBox->addWidget(new TQLabel(i18n("One:"), topRent), 0, 1);
+	rentBox->addWidget(new TQLabel(i18n("Two:"), topRent), 0, 2);
+	rentBox->addWidget(new TQLabel(i18n("Three:"), topRent), 2, 0);
+	rentBox->addWidget(new TQLabel(i18n("Four:"), topRent), 2, 1);
+	rentBox->addWidget(new TQLabel(i18n("Hotel:"), topRent), 2, 2);
+
+	rentBox->addWidget(houses0 = new TQSpinBox(0, 3000, 1, topRent), 1, 0);
+	rentBox->addWidget(houses1 = new TQSpinBox(0, 3000, 1, topRent), 1, 1);
+	rentBox->addWidget(houses2 = new TQSpinBox(0, 3000, 1, topRent), 1, 2);
+	rentBox->addWidget(houses3 = new TQSpinBox(0, 3000, 1, topRent), 3, 0);
+	rentBox->addWidget(houses4 = new TQSpinBox(0, 3000, 1, topRent), 3, 1);
+	rentBox->addWidget(houses5 = new TQSpinBox(0, 3000, 1, topRent), 3, 2);
 	houses0->setSuffix(i18n("$"));
 	houses0->setSpecialValueText(i18n("None"));
 	houses1->setSuffix(i18n("$"));
@@ -851,22 +851,22 @@ StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, QWidget *parent, char *na
 	houses5->setSuffix(i18n("$"));
 	houses5->setSpecialValueText(i18n("None"));
 
-	QGridLayout *pricesBox = new QGridLayout(bigbox, 2, 2, KDialog::spacingHint());
-	pricesBox->addWidget(new QLabel(i18n("Price:"), this), 0, 0);
-	pricesBox->addWidget(price = new QSpinBox(0, 3000, 25, this), 0, 1);
+	TQGridLayout *pricesBox = new TQGridLayout(bigbox, 2, 2, KDialog::spacingHint());
+	pricesBox->addWidget(new TQLabel(i18n("Price:"), this), 0, 0);
+	pricesBox->addWidget(price = new TQSpinBox(0, 3000, 25, this), 0, 1);
 	price->setSpecialValueText(i18n("None"));
 	price->setSuffix(i18n("$"));
 
-	QLabel *groupLabel = new QLabel(i18n("Group:"), this);
+	TQLabel *groupLabel = new TQLabel(i18n("Group:"), this);
 	pricesBox->addWidget(groupLabel, 1, 0);
 	groupCombo = new KComboBox(this, "Group Combo");
 	groupUpdate();
-	connect(groupCombo, SIGNAL(activated(const QString &)), this, SLOT(groupChanged(const QString &)));
+	connect(groupCombo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(groupChanged(const TQString &)));
 
 	pricesBox->addWidget(groupCombo, 1, 1);
 }
 
-void StreetDlg::groupChanged(const QString &groupName)
+void StreetDlg::groupChanged(const TQString &groupName)
 {
 	for (ConfigEstateGroupList::Iterator it =  groups->begin(); it != groups->end(); ++it)
 	{
@@ -885,9 +885,9 @@ void StreetDlg::groupChanged(const QString &groupName)
 
 void StreetDlg::groupUpdate()
 {
-	QString curGroupName = groupCombo->currentText();
+	TQString curGroupName = groupCombo->currentText();
 
-	QStringList newGroups;
+	TQStringList newGroups;
 	for (ConfigEstateGroupList::Iterator it =  groups->begin(); it != groups->end(); ++it)
 		newGroups.append((*it).name());