Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 7e9d8ea45280ad6657796da9536ccf6218111f22)

4 files changed, 68 insertions, 68 deletions

diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp
index b29106c..f578092 100644
--- a/atlantikdesigner/designer/boardinfo.cpp
+++ b/atlantikdesigner/designer/boardinfo.cpp
@@ -122,11 +122,11 @@ LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, c
 	{
 		KPushButton *more = new KPushButton(i18n("&Add Name"), this);
 		hlayout->addWidget(more);
-		connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
+		connect(more, TQ_SIGNAL(clicked()), this, TQ_SLOT(more()));
 		hlayout->addStretch();
 		KPushButton *less= new KPushButton(i18n("&Delete Name"), this);
 		hlayout->addWidget(less);
-		connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
+		connect(less, TQ_SIGNAL(clicked()), this, TQ_SLOT(less()));
 	}
 
 	layout->addStretch();
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 23cdf2c..4a7ea7b 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -48,29 +48,29 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
 	board = 0;
 	layout = 0;
 
-	(void) KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
-	(void) KStdAction::open(this, TQT_SLOT(open()), actionCollection());
-	(void) KStdAction::openNew(this, TQT_SLOT(openNew()), actionCollection());
-	(void) KStdAction::save(this, TQT_SLOT(save()), actionCollection());
-	(void) KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection());
-	(void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, TQT_SLOT(info()), actionCollection(), "boardinfo");
-	(void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, this, TQT_SLOT(editGroups()), actionCollection(), "groupeditor");
-
-	(void) new TDEAction(i18n("&Add 4 Squares"), "zoom-in", 0, this, TQT_SLOT(larger()), actionCollection(), "larger");
-	(void) new TDEAction(i18n("&Remove 4 Squares"), "zoom-out", 0, this, TQT_SLOT(smaller()), actionCollection(), "smaller");
-	(void) KStdAction::copy(this, TQT_SLOT(copy()), actionCollection());
-	(void) KStdAction::paste(this, TQT_SLOT(paste()), actionCollection());
-	(void) new TDEAction(i18n("&Up"), Key_Up, this, TQT_SLOT(up()), actionCollection(), "up");
-	(void) new TDEAction(i18n("&Down"), Key_Down, this, TQT_SLOT(down()), actionCollection(), "down");
-	(void) new TDEAction(i18n("&Left"), Key_Left, this, TQT_SLOT(left()), actionCollection(), "left");
-	(void) new TDEAction(i18n("&Right"), Key_Right, this, TQT_SLOT(right()), actionCollection(), "right");
+	(void) KStdAction::quit(this, TQ_SLOT(close()), actionCollection());
+	(void) KStdAction::open(this, TQ_SLOT(open()), actionCollection());
+	(void) KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection());
+	(void) KStdAction::save(this, TQ_SLOT(save()), actionCollection());
+	(void) KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection());
+	(void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, this, TQ_SLOT(info()), actionCollection(), "boardinfo");
+	(void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, this, TQ_SLOT(editGroups()), actionCollection(), "groupeditor");
+
+	(void) new TDEAction(i18n("&Add 4 Squares"), "zoom-in", 0, this, TQ_SLOT(larger()), actionCollection(), "larger");
+	(void) new TDEAction(i18n("&Remove 4 Squares"), "zoom-out", 0, this, TQ_SLOT(smaller()), actionCollection(), "smaller");
+	(void) KStdAction::copy(this, TQ_SLOT(copy()), actionCollection());
+	(void) KStdAction::paste(this, TQ_SLOT(paste()), actionCollection());
+	(void) new TDEAction(i18n("&Up"), Key_Up, this, TQ_SLOT(up()), actionCollection(), "up");
+	(void) new TDEAction(i18n("&Down"), Key_Down, this, TQ_SLOT(down()), actionCollection(), "down");
+	(void) new TDEAction(i18n("&Left"), Key_Left, this, TQ_SLOT(left()), actionCollection(), "left");
+	(void) new TDEAction(i18n("&Right"), Key_Right, this, TQ_SLOT(right()), actionCollection(), "right");
 
 	recentAct = KStdAction::openRecent(0, 0, actionCollection());
-	connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), this, TQT_SLOT(openRecent(const KURL &)));
+	connect(recentAct, TQ_SIGNAL(urlSelected(const KURL &)), this, TQ_SLOT(openRecent(const KURL &)));
 	recentAct->loadEntries(TDEGlobal::config(), "Designer recent files");
 
 	estateAct = new TDEListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num");
-	connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int)));
+	connect(estateAct, TQ_SIGNAL(activated(int)), TQ_SLOT(changeEstate(int)));
 
 	createGUI("atlantikdesignerui.rc");
 
@@ -137,9 +137,9 @@ void AtlanticDesigner::initBoard()
 	setCentralWidget(board);
 	layout = new TQVBoxLayout(board->centerWidget());
 	editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor");
-	connect(editor, TQT_SIGNAL(goChecked(int)), this, TQT_SLOT(goChanged(int)));
-	connect(editor, TQT_SIGNAL(updateBackground()), this, TQT_SLOT(updateBackground()));
-	connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath()));
+	connect(editor, TQ_SIGNAL(goChecked(int)), this, TQ_SLOT(goChanged(int)));
+	connect(editor, TQ_SIGNAL(updateBackground()), this, TQ_SLOT(updateBackground()));
+	connect(editor, TQ_SIGNAL(resized()), board, TQ_SLOT(slotResizeAftermath()));
 	layout->addWidget(editor);
 
 	editor->setReady(false);
@@ -159,7 +159,7 @@ void AtlanticDesigner::initToken()
 	
 	board->addToken(m_player);
 
-	connect(m_player, TQT_SIGNAL(changed(Player *)), board, TQT_SLOT(playerChanged(Player *)));
+	connect(m_player, TQ_SIGNAL(changed(Player *)), board, TQ_SLOT(playerChanged(Player *)));
 }
 
 void AtlanticDesigner::openNew()
@@ -184,7 +184,7 @@ void AtlanticDesigner::openNew()
 	groupsChanged();
 	updateBackground();
 
-	TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
+	TQTimer::singleShot(500, this, TQ_SLOT(setPlayerAtBeginning()));
 	doCaption(false);
 }
 
@@ -198,8 +198,8 @@ ConfigEstate *AtlanticDesigner::newEstate(int i)
 	estate->setChanged(false);
 	estates.insert(i, estate);
 
-	connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *)));
-	connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
+	connect(estate, TQ_SIGNAL(LMBClicked(Estate *)), this, TQ_SLOT(changeEstate(Estate *)));
+	connect(estate, TQ_SIGNAL(changed()), this, TQ_SLOT(modified()));
 
 	board->addEstateView(estate);
 
@@ -486,8 +486,8 @@ void AtlanticDesigner::openFile(const TQString &filename)
 			estate->setPassMoney(passMoney);
 			estates.append(estate);
 
-			connect(estate, TQT_SIGNAL(LMBClicked(Estate *)), this, TQT_SLOT(changeEstate(Estate *)));
-			connect(estate, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
+			connect(estate, TQ_SIGNAL(LMBClicked(Estate *)), this, TQ_SLOT(changeEstate(Estate *)));
+			connect(estate, TQ_SIGNAL(changed()), this, TQ_SLOT(modified()));
 			i++;
 		}
 		else if (parseMode == Parse_Cards)
@@ -545,7 +545,7 @@ void AtlanticDesigner::openFile(const TQString &filename)
 	updateBackground();
 	updateJumpMenu();
 
-	TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
+	TQTimer::singleShot(500, this, TQ_SLOT(setPlayerAtBeginning()));
 	doCaption(false);
 }
 
@@ -895,7 +895,7 @@ void AtlanticDesigner::larger()
 	groupsChanged();
 	updateBackground();
 
-	TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
+	TQTimer::singleShot(500, this, TQ_SLOT(setPlayerAtBeginning()));
 	doCaption(true);
 }
 
@@ -934,7 +934,7 @@ void AtlanticDesigner::smaller()
 	updateJumpMenu();
 	groupsChanged();
 	updateBackground();
-	TQTimer::singleShot(500, this, TQT_SLOT(setPlayerAtBeginning()));
+	TQTimer::singleShot(500, this, TQ_SLOT(setPlayerAtBeginning()));
 
 	doCaption(true);
 }
@@ -957,9 +957,9 @@ void AtlanticDesigner::editGroups()
 		groupEditor = new GroupEditor(&groups, this);
 		groupEditor->show();
 
-		connect(groupEditor, TQT_SIGNAL(changed()), this, TQT_SLOT(modified()));
-		connect(groupEditor, TQT_SIGNAL(update()), this, TQT_SLOT(groupsChanged()));
-		connect(groupEditor, TQT_SIGNAL(update()), editor, TQT_SLOT(groupsChanged()));
+		connect(groupEditor, TQ_SIGNAL(changed()), this, TQ_SLOT(modified()));
+		connect(groupEditor, TQ_SIGNAL(update()), this, TQ_SLOT(groupsChanged()));
+		connect(groupEditor, TQ_SIGNAL(update()), editor, TQ_SLOT(groupsChanged()));
 	}
 	else
 		groupEditor->raise();
@@ -1019,8 +1019,8 @@ void AtlanticDesigner::info()
 		boardInfoDlg = new BoardInfoDlg(true, &boardInfo, this, "Board Information", false);
 		boardInfoDlg->show();
 
-		connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateBackground()));
-		connect(boardInfoDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(modified()));
+		connect(boardInfoDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(updateBackground()));
+		connect(boardInfoDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(modified()));
 	}
 	else
 		boardInfoDlg->raise();
diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp
index 3301ba6..1f031fc 100644
--- a/atlantikdesigner/designer/editor.cpp
+++ b/atlantikdesigner/designer/editor.cpp
@@ -170,12 +170,12 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ
 	ready = false;
 	locked = false;
 
-	connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate()));
+	connect(this, TQ_SIGNAL(somethingChanged()), this, TQ_SLOT(saveEstate()));
 
 	layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
 	nameEdit = new TQLineEdit(this, "Name Edit");
 	layout->addWidget(nameEdit, 0, 0);
-	connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged()));
+	connect(nameEdit, TQ_SIGNAL(returnPressed()), this, TQ_SIGNAL(somethingChanged()));
 
 	confDlg = 0;
 
@@ -190,12 +190,12 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ
 	typeLayout->addWidget(typeLabel);
 	typeCombo = new KComboBox(false, this, "Type Combo");
 	typeLayout->addWidget(typeCombo);
-	connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(somethingChanged()));
-	connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(updateBackground()));
+	connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(somethingChanged()));
+	connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(updateBackground()));
 
 	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)));
+	connect(goCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(somethingChanged()));
+	connect(goCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(goToggled(bool)));
 	layout->addWidget(goCheck, 5, 0);
 
 	TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint());
@@ -325,7 +325,7 @@ void EstateEdit::configure()
 
 	confDlg->slotUpdate(estate);
 
-	connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground()));
+	connect(confDlg, TQ_SIGNAL(updateBackground()), this, TQ_SIGNAL(updateBackground()));
 
 	layout->addWidget(confDlg, 1, 0);
 	confDlg->show();
@@ -442,7 +442,7 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQW
 	TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
 
 	KPushButton *addB = new KPushButton(i18n("&New Stack"), this);
-	connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack()));
+	connect(addB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addStack()));
 	layout->addWidget(addB);
 	layout->addStretch();
 
@@ -454,7 +454,7 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQW
 	cards = new TQComboBox(this);
 	cards->insertStringList(cardNames);
 	layout->addWidget(cards);
-	connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &)));
+	connect(cards, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(updateView(const TQString &)));
 
 	vlayout->addWidget(new KSeparator(this));
 }
@@ -547,7 +547,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa
 	_types.append(i18n("Pay for Each Hotel"));
 	typeCombo->insertStringList(_types);
 	hlayout->addWidget(typeCombo);
-	connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int)));
+	connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(typeChanged(int)));
 
 	hlayout->addStretch();
 }
@@ -589,7 +589,7 @@ void ChooseWidget::typeChanged(int i)
 		value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this);
 
 		hlayout->addWidget(value);
-		connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
+		connect(value, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(valueChanged(int)));
 
 		value->show();
 	}
@@ -603,7 +603,7 @@ void ChooseWidget::typeChanged(int i)
 		for (curestate = estates->first(); curestate; curestate = estates->next())
 			estateStrings.append(curestate->name());
 		estate->insertStringList(estateStrings);
-		connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int)));
+		connect(estate, TQ_SIGNAL(activated(int)), this, TQ_SLOT(estateChanged(int)));
 
 		hlayout->addWidget(estate);
 		estate->show();
@@ -653,31 +653,31 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char
 	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
 
 	addButton = new KPushButton(i18n("&Add Card..."), this);
-	connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
+	connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(add()));
 	hlayout->addWidget(addButton);
 	hlayout->addStretch();
 	renameButton = new KPushButton(i18n("&Rename..."), this);
-	connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename()));
+	connect(renameButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(rename()));
 	hlayout->addWidget(renameButton);
 	hlayout->addStretch();
 	delButton = new KPushButton(i18n("&Delete"), this);
-	connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del()));
+	connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(del()));
 	hlayout->addWidget(delButton);
 
 	List = new TDEListBox(this);
 	layout->addWidget(List);
-	connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int)));
+	connect(List, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(selected(int)));
 
 	// it gets very big (and won't shrink) otherwise
 	List->setMaximumHeight(90);
 
 	hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
 	moreButton = new KPushButton(i18n("&More Properties"), this);
-	connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
+	connect(moreButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(more()));
 	hlayout->addWidget(moreButton);
 	hlayout->addStretch();
 	lessButton = new KPushButton(i18n("&Fewer Properties"), this);
-	connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
+	connect(lessButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(less()));
 	hlayout->addWidget(lessButton);
 
 	for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it)
@@ -861,7 +861,7 @@ StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *parent, char *n
 	pricesBox->addWidget(groupLabel, 1, 0);
 	groupCombo = new KComboBox(this, "Group Combo");
 	groupUpdate();
-	connect(groupCombo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(groupChanged(const TQString &)));
+	connect(groupCombo, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(groupChanged(const TQString &)));
 
 	pricesBox->addWidget(groupCombo, 1, 1);
 }
diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp
index 2aca4f4..5f7668a 100644
--- a/atlantikdesigner/designer/group.cpp
+++ b/atlantikdesigner/designer/group.cpp
@@ -30,12 +30,12 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 
 	groups = new TDEListBox(page);
 	hlayout->addWidget(groups);
-	connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *)));
+	connect(groups, TQ_SIGNAL(highlighted(TQListBoxItem *)), this, TQ_SLOT(updateSettings(TQListBoxItem *)));
 	TQStringList newgroups;
 	for (ConfigEstateGroupList::Iterator it = list->begin(); it != list->end(); ++it)
 		newgroups.append((*it).name());
 	groups->insertStringList(newgroups);
-	connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
+	connect(groups, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged()));
 
 	TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, spacingHint());
 	colorGroupBox = new TQVGroupBox(i18n("&Colors"), page);
@@ -43,13 +43,13 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 
 	(void) new TQLabel(i18n("Foreground:"), colorGroupBox);
 	fgButton = new KColorButton(colorGroupBox, "Foreground Button");
-	connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(fgChanged(const TQColor &)));
-	connect(fgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed()));
+	connect(fgButton, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(fgChanged(const TQColor &)));
+	connect(fgButton, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SIGNAL(changed()));
 
 	(void) new TQLabel(i18n("Background:"), colorGroupBox);
 	bgButton = new KColorButton(colorGroupBox, "Background Button");
-	connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(bgChanged(const TQColor &)));
-	connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed()));
+	connect(bgButton, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SLOT(bgChanged(const TQColor &)));
+	connect(bgButton, TQ_SIGNAL(changed(const TQColor &)), this, TQ_SIGNAL(changed()));
 
 	pricesGroupBox = new TQVGroupBox(i18n("&Prices"), page);
 	vlayout->addWidget(pricesGroupBox);
@@ -60,13 +60,13 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 	pricesLayout->addWidget(housePrice = new TQSpinBox(0, 3000, 25, pricesWidget), 0, 1);
 	housePrice->setSpecialValueText(i18n("None"));
 	housePrice->setSuffix(i18n("$"));
-	connect(housePrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(housePriceChanged(int)));
+	connect(housePrice, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(housePriceChanged(int)));
 
 	pricesLayout->addWidget(new TQLabel(i18n("Global price:"), pricesWidget), 1, 0);
 	pricesLayout->addWidget(globalPrice = new TQSpinBox(0, 3000, 25, pricesWidget), 1, 1);
 	globalPrice->setSpecialValueText(i18n("None"));
 	globalPrice->setSuffix(i18n("$"));
-	connect(globalPrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(globalPriceChanged(int)));
+	connect(globalPrice, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(globalPriceChanged(int)));
 
 	dynamicGroupBox = new TQVGroupBox(i18n("&Dynamic Rent"), page);
 	vlayout->addWidget(dynamicGroupBox);
@@ -85,18 +85,18 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 	mathLayout->addWidget(rentVarCombo, 0, 1);
 
 	rentMathEdit = new KLineEdit(mathWidget);
-	connect(rentMathEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(rentMathChanged(const TQString &)));
-	connect(rentVarCombo, TQT_SIGNAL(activated(const TQString &)), rentMathEdit, TQT_SLOT(insert(const TQString &)));
+	connect(rentMathEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(rentMathChanged(const TQString &)));
+	connect(rentVarCombo, TQ_SIGNAL(activated(const TQString &)), rentMathEdit, TQ_SLOT(insert(const TQString &)));
 	mathLayout->addWidget(rentMathEdit, 1, 1);
 
 	TQHBoxLayout *buttonlayout = new TQHBoxLayout(vlayout, spacingHint());
 	KPushButton *addB = new KPushButton(i18n("&Add..."), page);
 	buttonlayout->addWidget(addB);
-	connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
+	connect(addB, TQ_SIGNAL(clicked()), this, TQ_SLOT(add()));
 
 	removeB = new KPushButton(i18n("&Remove"), page);
 	buttonlayout->addWidget(removeB);
-	connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove()));
+	connect(removeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove()));
 
 	selectionChanged();
 }