TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


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

1 files changed, 54 insertions, 54 deletions

diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp
index fd978d2..407e03d 100644
--- a/atlantikdesigner/designer/editor.cpp
+++ b/atlantikdesigner/designer/editor.cpp
@@ -144,8 +144,8 @@ void ConfigEstate::setPassMoney(const int passMoney)
 
 TQStringList types;
 
-EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *parent, const char *name)
-	: TQWidget(parent, name)
+EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *tqparent, const char *name)
+	: TQWidget(tqparent, name)
 {
 	groups = newGroups;
 
@@ -172,19 +172,19 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ
 
 	connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate()));
 
-	layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
+	tqlayout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
 	nameEdit = new TQLineEdit(this, "Name Edit");
-	layout->addWidget(nameEdit, 0, 0);
+	tqlayout->addWidget(nameEdit, 0, 0);
 	connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged()));
 
 	confDlg = 0;
 
-	layout->setRowStretch(2, 2);
+	tqlayout->setRowStretch(2, 2);
 
-	layout->addWidget(new KSeparator(this), 3, 0);
+	tqlayout->addWidget(new KSeparator(this), 3, 0);
 
 	TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint());
-	layout->addLayout(typeLayout, 4, 0);
+	tqlayout->addLayout(typeLayout, 4, 0);
 
 	TQLabel *typeLabel = new TQLabel(i18n("Type:"), this);
 	typeLayout->addWidget(typeLabel);
@@ -196,10 +196,10 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ
 	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);
+	tqlayout->addWidget(goCheck, 5, 0);
 
 	TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint());
-	layout->addLayout(passMoneyLayout, 6, 0);
+	tqlayout->addLayout(passMoneyLayout, 6, 0);
 	TQLabel *passMoneyLabel = new TQLabel(i18n("Pass money:"), this);
 	passMoneyLayout->addWidget(passMoneyLabel);
 	passMoney = new TQSpinBox(0, 3000, 10, this);
@@ -327,7 +327,7 @@ void EstateEdit::configure()
 
 	connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground()));
 
-	layout->addWidget(confDlg, 1, 0);
+	tqlayout->addWidget(confDlg, 1, 0);
 	confDlg->show();
 
 	oldType = typeCombo->currentItem();
@@ -378,8 +378,8 @@ bool EstateEdit::rightArrow()const
 
 /////////////////////////////////
 
-TaxDlg::TaxDlg(TQWidget *parent, char *name)
-	: EstateDlg(parent, name)
+TaxDlg::TaxDlg(TQWidget *tqparent, char *name)
+	: EstateDlg(tqparent, name)
 {
 	TQGridLayout *taxBox = new TQGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint());
 	taxBox->addWidget(new TQLabel(i18n("Fixed tax:"), this), 0, 0);
@@ -406,14 +406,14 @@ void TaxDlg::update()
 
 /////////////////////////////////
 
-GenericDlg::GenericDlg(TQWidget *parent, char *name)
-	: EstateDlg(parent, name)
+GenericDlg::GenericDlg(TQWidget *tqparent, char *name)
+	: EstateDlg(tqparent, name)
 {
-	TQHBoxLayout *layout = new TQHBoxLayout(this, KDialog::spacingHint());
-	layout->addWidget(new TQLabel(i18n("Background:"), this));
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialog::spacingHint());
+	tqlayout->addWidget(new TQLabel(i18n("Background:"), this));
 
 	col = new KColorButton(this);
-	layout->addWidget(col);
+	tqlayout->addWidget(col);
 }
 
 void GenericDlg::save()
@@ -429,40 +429,40 @@ void GenericDlg::update()
 
 /////////////////////////////////
 
-CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *parent, char *name)
-	: EstateDlg(parent, name)
+CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *tqparent, char *name)
+	: EstateDlg(tqparent, name)
 {
 	estates = newEstates;
 	stacks = newCards;
 
 	view = 0;
 
-	vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-	TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
 
 	KPushButton *addB = new KPushButton(i18n("&New Stack"), this);
 	connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack()));
-	layout->addWidget(addB);
-	layout->addStretch();
+	tqlayout->addWidget(addB);
+	tqlayout->addStretch();
 
-	layout->addWidget(new TQLabel(i18n("Cards from"), this));
+	tqlayout->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 TQComboBox(this);
 	cards->insertStringList(cardNames);
-	layout->addWidget(cards);
+	tqlayout->addWidget(cards);
 	connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &)));
 
-	vlayout->addWidget(new KSeparator(this));
+	vtqlayout->addWidget(new KSeparator(this));
 }
 
 void CardsDlg::addStack()
 {
 	bool ok;
-	TQString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), TQString::null, &ok, this);
+	TQString name = KLineEditDlg::getText(i18n("Add Stack"), i18n("Enter the name of the new stack:"), TQString(), &ok, this);
 	if (ok)
 	{
 		for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
@@ -493,7 +493,7 @@ void CardsDlg::updateView(const TQString &curName)
 
 	delete view;
 	view = new CardView(estates, curStack, this);
-	vlayout->addWidget(view);
+	vtqlayout->addWidget(view);
 	view->show();
 }
 
@@ -515,8 +515,8 @@ void CardsDlg::update()
 
 /////////////////////////////////
 
-ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *parent, char *name)
-	: TQWidget (parent, name)
+ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *tqparent, char *name)
+	: TQWidget (tqparent, name)
 {
 	this->id = id;
 	this->card = card;
@@ -530,7 +530,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa
 
 	value = 0;
 
-	hlayout = new TQHBoxLayout(this, KDialog::spacingHint());
+	htqlayout = new TQHBoxLayout(this, KDialog::spacingHint());
 	typeCombo = new KComboBox(this);
 	TQStringList _types(i18n("Pay"));
 	_types.append(i18n("Pay Each Player"));
@@ -546,10 +546,10 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa
 	_types.append(i18n("Pay for Each House"));
 	_types.append(i18n("Pay for Each Hotel"));
 	typeCombo->insertStringList(_types);
-	hlayout->addWidget(typeCombo);
+	htqlayout->addWidget(typeCombo);
 	connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int)));
 
-	hlayout->addStretch();
+	htqlayout->addStretch();
 }
 
 void ChooseWidget::valueChanged(int i)
@@ -588,7 +588,7 @@ void ChooseWidget::typeChanged(int i)
 
 		value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this);
 
-		hlayout->addWidget(value);
+		htqlayout->addWidget(value);
 		connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
 
 		value->show();
@@ -605,7 +605,7 @@ void ChooseWidget::typeChanged(int i)
 		estate->insertStringList(estateStrings);
 		connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int)));
 
-		hlayout->addWidget(estate);
+		htqlayout->addWidget(estate);
 		estate->show();
 	}
 
@@ -640,7 +640,7 @@ Skipped:
 
 /////////////////////////////////
 
-CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char *name) : TQWidget(parent, name)
+CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *tqparent, char *name) : TQWidget(tqparent, name)
 {
 	card = 0;
 
@@ -649,36 +649,36 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char
 
 	choosies.setAutoDelete(true);
 
-	layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
+	tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 
 	addButton = new KPushButton(i18n("&Add Card..."), this);
 	connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
-	hlayout->addWidget(addButton);
-	hlayout->addStretch();
+	htqlayout->addWidget(addButton);
+	htqlayout->addStretch();
 	renameButton = new KPushButton(i18n("&Rename..."), this);
 	connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename()));
-	hlayout->addWidget(renameButton);
-	hlayout->addStretch();
+	htqlayout->addWidget(renameButton);
+	htqlayout->addStretch();
 	delButton = new KPushButton(i18n("&Delete"), this);
 	connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del()));
-	hlayout->addWidget(delButton);
+	htqlayout->addWidget(delButton);
 
 	List = new KListBox(this);
-	layout->addWidget(List);
+	tqlayout->addWidget(List);
 	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 TQHBoxLayout(layout, KDialog::spacingHint());
+	htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
 	moreButton = new KPushButton(i18n("&More Properties"), this);
 	connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
-	hlayout->addWidget(moreButton);
-	hlayout->addStretch();
+	htqlayout->addWidget(moreButton);
+	htqlayout->addStretch();
 	lessButton = new KPushButton(i18n("&Fewer Properties"), this);
 	connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
-	hlayout->addWidget(lessButton);
+	htqlayout->addWidget(lessButton);
 
 	for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it)
 		List->insertItem((*it).name);
@@ -698,7 +698,7 @@ void CardView::more()
 	newChooseWidget->valueChanged(0);
 
 	choosies.append(newChooseWidget);
-	layout->addWidget(newChooseWidget);
+	tqlayout->addWidget(newChooseWidget);
 
 	newChooseWidget->show();
 
@@ -720,7 +720,7 @@ void CardView::less()
 void CardView::add()
 {
 	bool ok = false;
-	TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), TQString::null, &ok, this);
+	TQString name = KLineEditDlg::getText(i18n("Add Card"), i18n("Enter the name of the new card:"), TQString(), &ok, this);
 	if (ok)
 		List->insertItem(name, 0);
 
@@ -780,11 +780,11 @@ void CardView::selected(int i)
 		ChooseWidget *newChooseWidget = new ChooseWidget(estates, choosies.count(), card, this);
 
 		choosies.append(newChooseWidget);
-		layout->addWidget(newChooseWidget);
+		tqlayout->addWidget(newChooseWidget);
 
 		newChooseWidget->show();
 
-		newChooseWidget->typeChanged(types.findIndex(*it));
+		newChooseWidget->typeChanged(types.tqfindIndex(*it));
 		newChooseWidget->valueChanged(*vit);
 		newChooseWidget->estateChanged(*vit);
 
@@ -812,8 +812,8 @@ void CardView::updateButtonsEnabled()
 
 /////////////////////////////////
 
-StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *parent, char *name)
-	: EstateDlg(parent, name)
+StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *tqparent, char *name)
+	: EstateDlg(tqparent, name)
 {
 	groups = newGroups;