Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

8 files changed, 126 insertions, 126 deletions

diff --git a/kolf/editor.cpp b/kolf/editor.cpp
index 589096f3..5dc06f63 100644
--- a/kolf/editor.cpp
+++ b/kolf/editor.cpp
@@ -30,7 +30,7 @@ Editor::Editor(ObjectList *list, TQWidget *parent, const char *name)
 
 	listbox->insertStringList(items);
 
-	connect(listbox, TQT_SIGNAL(executed(TQListBoxItem *)), TQT_SLOT(listboxExecuted(TQListBoxItem *)));
+	connect(listbox, TQ_SIGNAL(executed(TQListBoxItem *)), TQ_SLOT(listboxExecuted(TQListBoxItem *)));
 }
 
 void Editor::listboxExecuted(TQListBoxItem * /*item*/)
@@ -54,7 +54,7 @@ void Editor::setItem(CanvasItem *item)
 	config->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 	config->setLineWidth(1);
 	config->show();
-	connect(config, TQT_SIGNAL(modified()), this, TQT_SIGNAL(changed()));
+	connect(config, TQ_SIGNAL(modified()), this, TQ_SIGNAL(changed()));
 }
 
 #include "editor.moc"
diff --git a/kolf/floater.cpp b/kolf/floater.cpp
index 24e9484f..dc0f129a 100644
--- a/kolf/floater.cpp
+++ b/kolf/floater.cpp
@@ -265,7 +265,7 @@ FloaterConfig::FloaterConfig(Floater *floater, TQWidget *parent)
 	TQSlider *slider = new TQSlider(0, 20, 2, floater->curSpeed(), TQt::Horizontal, this);
 	hlayout->addWidget(slider);
 	hlayout->addWidget(new TQLabel(i18n("Fast"), this));
-	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int)));
+	connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(speedChanged(int)));
 }
 
 void FloaterConfig::speedChanged(int news)
diff --git a/kolf/game.cpp b/kolf/game.cpp
index d2b61221..4f6b7edb 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -202,19 +202,19 @@ BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent)
 	layout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0);
 	top = new TQCheckBox(i18n("&Top"), this);
 	layout->addWidget(top, 0, 1);
-	connect(top, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(topWallChanged(bool)));
+	connect(top, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(topWallChanged(bool)));
 	top->setChecked(bridge->topWallVisible());
 	bot = new TQCheckBox(i18n("&Bottom"), this);
 	layout->addWidget(bot, 1, 1);
-	connect(bot, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(botWallChanged(bool)));
+	connect(bot, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(botWallChanged(bool)));
 	bot->setChecked(bridge->botWallVisible());
 	left = new TQCheckBox(i18n("&Left"), this);
 	layout->addWidget(left, 1, 0);
-	connect(left, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(leftWallChanged(bool)));
+	connect(left, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(leftWallChanged(bool)));
 	left->setChecked(bridge->leftWallVisible());
 	right = new TQCheckBox(i18n("&Right"), this);
 	layout->addWidget(right, 1, 2);
-	connect(right, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rightWallChanged(bool)));
+	connect(right, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rightWallChanged(bool)));
 	right->setChecked(bridge->rightWallVisible());
 }
 
@@ -409,7 +409,7 @@ WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent)
 
 	TQCheckBox *check = new TQCheckBox(i18n("Windmill on bottom"), this);
 	check->setChecked(windmill->bottom());
-	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(endChanged(bool)));
+	connect(check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(endChanged(bool)));
 	m_vlayout->addWidget(check);
 
 	TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint());
@@ -417,7 +417,7 @@ WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent)
 	TQSlider *slider = new TQSlider(1, 10, 1, windmill->curSpeed(), TQt::Horizontal, this);
 	hlayout->addWidget(slider);
 	hlayout->addWidget(new TQLabel(i18n("Fast"), this));
-	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int)));
+	connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(speedChanged(int)));
 
 	endChanged(check->isChecked());
 }
@@ -647,7 +647,7 @@ SignConfig::SignConfig(Sign *sign, TQWidget *parent)
 	m_vlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this));
 	KLineEdit *name = new KLineEdit(sign->text(), this);
 	m_vlayout->addWidget(name);
-	connect(name, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &)));
+	connect(name, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(textChanged(const TQString &)));
 }
 
 void SignConfig::textChanged(const TQString &text)
@@ -667,7 +667,7 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent)
 
 	TQCheckBox *check = new TQCheckBox(i18n("Enable show/hide"), this);
 	m_vlayout->addWidget(check);
-	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(check1Changed(bool)));
+	connect(check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(check1Changed(bool)));
 	check->setChecked(ellipse->changeEnabled());
 
 	TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint());
@@ -678,7 +678,7 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent)
 	fast1 = new TQLabel(i18n("Fast"), this);
 	hlayout->addWidget(fast1);
 
-	connect(slider1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(value1Changed(int)));
+	connect(slider1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(value1Changed(int)));
 
 	check1Changed(ellipse->changeEnabled());
 
@@ -1310,8 +1310,8 @@ TQPtrList<TQCanvasItem> BlackHole::moveableItems() const
 BlackHoleTimer::BlackHoleTimer(Ball *ball, double speed, int msec)
 	: m_speed(speed), m_ball(ball)
 {
-	TQTimer::singleShot(msec, this, TQT_SLOT(mySlot()));
-	TQTimer::singleShot(msec / 2, this, TQT_SLOT(myMidSlot()));
+	TQTimer::singleShot(msec, this, TQ_SLOT(mySlot()));
+	TQTimer::singleShot(msec / 2, this, TQ_SLOT(myMidSlot()));
 }
 
 void BlackHoleTimer::mySlot()
@@ -1344,8 +1344,8 @@ bool BlackHole::place(Ball *ball, bool /*wasCenter*/)
 	double magnitude = Vector(TQPoint(x(), y()), TQPoint(exitItem->x(), exitItem->y())).magnitude();
 	BlackHoleTimer *timer = new BlackHoleTimer(ball, speed, magnitude * 2.5 - speed * 35 + 500);
 
-	connect(timer, TQT_SIGNAL(eject(Ball *, double)), this, TQT_SLOT(eject(Ball *, double)));
-	connect(timer, TQT_SIGNAL(halfway()), this, TQT_SLOT(halfway()));
+	connect(timer, TQ_SIGNAL(eject(Ball *, double)), this, TQ_SLOT(eject(Ball *, double)));
+	connect(timer, TQ_SIGNAL(halfway()), this, TQ_SLOT(halfway()));
 
 	playSound("blackhole");
 	return false;
@@ -1510,7 +1510,7 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent)
 	deg->setValue(blackHole->curExitDeg());
 	deg->setWrapping(true);
 	layout->addWidget(deg);
-	connect(deg, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(degChanged(int)));
+	connect(deg, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(degChanged(int)));
 
 	layout->addStretch();
 
@@ -1519,7 +1519,7 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent)
 	KDoubleNumInput *min = new KDoubleNumInput(this);
 	min->setRange(0, 8, 1, true);
 	hlayout->addWidget(min);
-	connect(min, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(minChanged(double)));
+	connect(min, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(minChanged(double)));
 	min->setValue(blackHole->minSpeed());
 
 	hlayout = new TQHBoxLayout(layout, spacingHint());
@@ -1527,7 +1527,7 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent)
 	KDoubleNumInput *max = new KDoubleNumInput(this);
 	max->setRange(1, 10, 1, true);
 	hlayout->addWidget(max);
-	connect(max, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(maxChanged(double)));
+	connect(max, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(maxChanged(double)));
 	max->setValue(blackHole->maxSpeed());
 }
 
@@ -1965,13 +1965,13 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent)
 	hlayout->addWidget(new TQLabel(i18n("Course name: "), this));
 	KLineEdit *nameEdit = new KLineEdit(holeInfo->untranslatedName(), this);
 	hlayout->addWidget(nameEdit);
-	connect(nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &)));
+	connect(nameEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(nameChanged(const TQString &)));
 
 	hlayout = new TQHBoxLayout(layout, spacingHint());
 	hlayout->addWidget(new TQLabel(i18n("Course author: "), this));
 	KLineEdit *authorEdit = new KLineEdit(holeInfo->author(), this);
 	hlayout->addWidget(authorEdit);
-	connect(authorEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(authorChanged(const TQString &)));
+	connect(authorEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(authorChanged(const TQString &)));
 
 	layout->addStretch();
 
@@ -1980,7 +1980,7 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent)
 	TQSpinBox *par = new TQSpinBox(1, 15, 1, this);
 	par->setValue(holeInfo->par());
 	hlayout->addWidget(par);
-	connect(par, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(parChanged(int)));
+	connect(par, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(parChanged(int)));
 	hlayout->addStretch();
 
 	hlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
@@ -1990,12 +1990,12 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent)
 	maxstrokes->setSpecialValueText(i18n("Unlimited"));
 	maxstrokes->setValue(holeInfo->maxStrokes());
 	hlayout->addWidget(maxstrokes);
-	connect(maxstrokes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxStrokesChanged(int)));
+	connect(maxstrokes, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(maxStrokesChanged(int)));
 
 	TQCheckBox *check = new TQCheckBox(i18n("Show border walls"), this);
 	check->setChecked(holeInfo->borderWalls());
 	layout->addWidget(check);
-	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(borderWallsChanged(bool)));
+	connect(check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(borderWallsChanged(bool)));
 }
 
 void HoleConfig::authorChanged(const TQString &newauthor)
@@ -2284,15 +2284,15 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi
 	addBorderWall(TQPoint(width - margin - 1, margin), TQPoint(width - margin - 1, height - margin));
 
 	timer = new TQTimer(this);
-	connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()));
+	connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()));
 	timerMsec = 300;
 
 	fastTimer = new TQTimer(this);
-	connect(fastTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fastTimeout()));
+	connect(fastTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fastTimeout()));
 	fastTimerMsec = 11;
 
 	autoSaveTimer = new TQTimer(this);
-	connect(autoSaveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoSaveTimeout()));
+	connect(autoSaveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoSaveTimeout()));
 	autoSaveMsec = 5 * 1000 * 60; // 5 min autosave
 
 	// setUseAdvancedPutting() sets maxStrength!
@@ -2300,7 +2300,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi
 
 	putting = false;
 	putterTimer = new TQTimer(this);
-	connect(putterTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(putterTimeout()));
+	connect(putterTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(putterTimeout()));
 	putterTimerMsec = 20;
 }
 
@@ -2808,7 +2808,7 @@ void KolfGame::timeout()
 	if (curState == Stopped && inPlay)
 	{
 		inPlay = false;
-		TQTimer::singleShot(0, this, TQT_SLOT(shotDone()));
+		TQTimer::singleShot(0, this, TQ_SLOT(shotDone()));
 	}
 
 	if (curState == Holed && inPlay)
@@ -2842,12 +2842,12 @@ void KolfGame::timeout()
 				(*curPlayer).addStrokeToHole(curHole);
 				emit scoreChanged((*curPlayer).id(), curHole, (*curPlayer).score(curHole));
 			}
-			TQTimer::singleShot(600, this, TQT_SLOT(holeDone()));
+			TQTimer::singleShot(600, this, TQ_SLOT(holeDone()));
 		}
 		else
 		{
 			inPlay = false;
-			TQTimer::singleShot(0, this, TQT_SLOT(shotDone()));
+			TQTimer::singleShot(0, this, TQ_SLOT(shotDone()));
 		}
 	}
 }
@@ -3216,11 +3216,11 @@ void KolfGame::shotDone()
 			if (allPlayersDone())
 			{
 				startNextHole();
-				TQTimer::singleShot(100, this, TQT_SLOT(emitMax()));
+				TQTimer::singleShot(100, this, TQ_SLOT(emitMax()));
 				return;
 			}
 
-			TQTimer::singleShot(100, this, TQT_SLOT(emitMax()));
+			TQTimer::singleShot(100, this, TQ_SLOT(emitMax()));
 		}
 	}
 
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 7151a197..856a023a 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -79,75 +79,75 @@ Kolf::~Kolf()
 
 void Kolf::initGUI()
 {
-	newAction = KStdGameAction::gameNew(this, TQT_SLOT(newGame()), actionCollection());
+	newAction = KStdGameAction::gameNew(this, TQ_SLOT(newGame()), actionCollection());
 	newAction->setText(newAction->text() + TQString("..."));
 
-	endAction = KStdGameAction::end(this, TQT_SLOT(closeGame()), actionCollection());
-	printAction = KStdGameAction::print(this, TQT_SLOT(print()), actionCollection());
+	endAction = KStdGameAction::end(this, TQ_SLOT(closeGame()), actionCollection());
+	printAction = KStdGameAction::print(this, TQ_SLOT(print()), actionCollection());
 
-	(void) KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection());
-	saveAction = KStdAction::save(this, TQT_SLOT(save()), actionCollection(), "game_save");
+	(void) KStdGameAction::quit(this, TQ_SLOT(close()), actionCollection());
+	saveAction = KStdAction::save(this, TQ_SLOT(save()), actionCollection(), "game_save");
 	saveAction->setText(i18n("Save &Course"));
-	saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection(), "game_save_as");
+	saveAsAction = KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection(), "game_save_as");
 	saveAsAction->setText(i18n("Save &Course As..."));
 
-	saveGameAction = new TDEAction(i18n("&Save Game"), 0, this, TQT_SLOT(saveGame()), actionCollection(), "savegame");
-	saveGameAsAction = new TDEAction(i18n("&Save Game As..."), 0, this, TQT_SLOT(saveGameAs()), actionCollection(), "savegameas");
+	saveGameAction = new TDEAction(i18n("&Save Game"), 0, this, TQ_SLOT(saveGame()), actionCollection(), "savegame");
+	saveGameAsAction = new TDEAction(i18n("&Save Game As..."), 0, this, TQ_SLOT(saveGameAs()), actionCollection(), "savegameas");
 
-	loadGameAction = KStdGameAction::load(this, TQT_SLOT(loadGame()), actionCollection());
+	loadGameAction = KStdGameAction::load(this, TQ_SLOT(loadGame()), actionCollection());
 	loadGameAction->setText(i18n("Load Saved Game..."));
 
-	highScoreAction = KStdGameAction::highscores(this, TQT_SLOT(showHighScores()), actionCollection());
+	highScoreAction = KStdGameAction::highscores(this, TQ_SLOT(showHighScores()), actionCollection());
 
-	editingAction = new TDEToggleAction(i18n("&Edit"), "pencil", CTRL+Key_E, this, TQT_SLOT(emptySlot()), actionCollection(), "editing");
-	newHoleAction = new TDEAction(i18n("&New"), "document-new", CTRL+SHIFT+Key_N, this, TQT_SLOT(emptySlot()), actionCollection(), "newhole");
-	clearHoleAction = new TDEAction(KStdGuiItem::clear().text(), "locationbar_erase", CTRL+Key_Delete, this, TQT_SLOT(emptySlot()), actionCollection(), "clearhole");
-	resetHoleAction = new TDEAction(i18n("&Reset"), CTRL+Key_R, this, TQT_SLOT(emptySlot()), actionCollection(), "resethole");
-	undoShotAction = KStdAction::undo(this, TQT_SLOT(emptySlot()), actionCollection(), "undoshot");
+	editingAction = new TDEToggleAction(i18n("&Edit"), "pencil", CTRL+Key_E, this, TQ_SLOT(emptySlot()), actionCollection(), "editing");
+	newHoleAction = new TDEAction(i18n("&New"), "document-new", CTRL+SHIFT+Key_N, this, TQ_SLOT(emptySlot()), actionCollection(), "newhole");
+	clearHoleAction = new TDEAction(KStdGuiItem::clear().text(), "locationbar_erase", CTRL+Key_Delete, this, TQ_SLOT(emptySlot()), actionCollection(), "clearhole");
+	resetHoleAction = new TDEAction(i18n("&Reset"), CTRL+Key_R, this, TQ_SLOT(emptySlot()), actionCollection(), "resethole");
+	undoShotAction = KStdAction::undo(this, TQ_SLOT(emptySlot()), actionCollection(), "undoshot");
 	undoShotAction->setText(i18n("&Undo Shot"));
-	//replayShotAction = new TDEAction(i18n("&Replay Shot"), 0, this, TQT_SLOT(emptySlot()), actionCollection(), "replay");
+	//replayShotAction = new TDEAction(i18n("&Replay Shot"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "replay");
 
-	holeAction = new TDEListAction(i18n("Switch to Hole"), 0, this, TQT_SLOT(emptySlot()), actionCollection(), "switchhole");
-	nextAction = new TDEAction(i18n("&Next Hole"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward), this, TQT_SLOT(emptySlot()), actionCollection(), "nexthole");
-	prevAction = new TDEAction(i18n("&Previous Hole"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back), this, TQT_SLOT(emptySlot()), actionCollection(), "prevhole");
-	firstAction = new TDEAction(i18n("&First Hole"), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQT_SLOT(emptySlot()), actionCollection(), "firsthole");
-	lastAction = new TDEAction(i18n("&Last Hole"), CTRL+SHIFT+Key_End, this, TQT_SLOT(emptySlot()), actionCollection(), "lasthole");
-	randAction = new TDEAction(i18n("&Random Hole"), "goto", 0, this, TQT_SLOT(emptySlot()), actionCollection(), "randhole");
+	holeAction = new TDEListAction(i18n("Switch to Hole"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "switchhole");
+	nextAction = new TDEAction(i18n("&Next Hole"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward), this, TQ_SLOT(emptySlot()), actionCollection(), "nexthole");
+	prevAction = new TDEAction(i18n("&Previous Hole"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back), this, TQ_SLOT(emptySlot()), actionCollection(), "prevhole");
+	firstAction = new TDEAction(i18n("&First Hole"), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), this, TQ_SLOT(emptySlot()), actionCollection(), "firsthole");
+	lastAction = new TDEAction(i18n("&Last Hole"), CTRL+SHIFT+Key_End, this, TQ_SLOT(emptySlot()), actionCollection(), "lasthole");
+	randAction = new TDEAction(i18n("&Random Hole"), "goto", 0, this, TQ_SLOT(emptySlot()), actionCollection(), "randhole");
 
-	useMouseAction = new TDEToggleAction(i18n("Enable &Mouse for Moving Putter"), 0, this, TQT_SLOT(emptySlot()), actionCollection(), "usemouse");
+	useMouseAction = new TDEToggleAction(i18n("Enable &Mouse for Moving Putter"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "usemouse");
 	useMouseAction->setCheckedState(i18n("Disable &Mouse for Moving Putter"));
-	connect(useMouseAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useMouseChanged(bool)));
+	connect(useMouseAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useMouseChanged(bool)));
 	TDEConfig *config = kapp->config();
 	config->setGroup("Settings");
 	useMouseAction->setChecked(config->readBoolEntry("useMouse", true));
 
-	useAdvancedPuttingAction = new TDEToggleAction(i18n("Enable &Advanced Putting"), 0, this, TQT_SLOT(emptySlot()), actionCollection(), "useadvancedputting");
+	useAdvancedPuttingAction = new TDEToggleAction(i18n("Enable &Advanced Putting"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "useadvancedputting");
 	useAdvancedPuttingAction->setCheckedState(i18n("Disable &Advanced Putting"));
-	connect(useAdvancedPuttingAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useAdvancedPuttingChanged(bool)));
+	connect(useAdvancedPuttingAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useAdvancedPuttingChanged(bool)));
 	useAdvancedPuttingAction->setChecked(config->readBoolEntry("useAdvancedPutting", false));
 
-	showInfoAction = new TDEToggleAction(i18n("Show &Info"), "application-vnd.tde.info", CTRL+Key_I, this, TQT_SLOT(emptySlot()), actionCollection(), "showinfo");
+	showInfoAction = new TDEToggleAction(i18n("Show &Info"), "application-vnd.tde.info", CTRL+Key_I, this, TQ_SLOT(emptySlot()), actionCollection(), "showinfo");
 	showInfoAction->setCheckedState(i18n("Hide &Info"));
-	connect(showInfoAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showInfoChanged(bool)));
+	connect(showInfoAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showInfoChanged(bool)));
 	showInfoAction->setChecked(config->readBoolEntry("showInfo", false));
 
-	showGuideLineAction = new TDEToggleAction(i18n("Show Putter &Guideline"), 0, this, TQT_SLOT(emptySlot()), actionCollection(), "showguideline");
+	showGuideLineAction = new TDEToggleAction(i18n("Show Putter &Guideline"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "showguideline");
 	showGuideLineAction->setCheckedState(i18n("Hide Putter &Guideline"));
-	connect(showGuideLineAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showGuideLineChanged(bool)));
+	connect(showGuideLineAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showGuideLineChanged(bool)));
 	showGuideLineAction->setChecked(config->readBoolEntry("showGuideLine", true));
 
-	TDEToggleAction *act=new TDEToggleAction(i18n("Enable All Dialog Boxes"), 0, this, TQT_SLOT(enableAllMessages()), actionCollection(), "enableAll");
+	TDEToggleAction *act=new TDEToggleAction(i18n("Enable All Dialog Boxes"), 0, this, TQ_SLOT(enableAllMessages()), actionCollection(), "enableAll");
 	act->setCheckedState(i18n("Disable All Dialog Boxes"));
 
-	soundAction = new TDEToggleAction(i18n("Play &Sounds"), 0, this, TQT_SLOT(emptySlot()), actionCollection(), "audio-x-generic");
-	connect(soundAction, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(soundChanged(bool)));
+	soundAction = new TDEToggleAction(i18n("Play &Sounds"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "audio-x-generic");
+	connect(soundAction, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(soundChanged(bool)));
 	soundAction->setChecked(config->readBoolEntry("sound", true));
 
-	(void) new TDEAction(i18n("&Reload Plugins"), 0, this, TQT_SLOT(initPlugins()), actionCollection(), "reloadplugins");
-	(void) new TDEAction(i18n("Show &Plugins"), 0, this, TQT_SLOT(showPlugins()), actionCollection(), "showplugins");
+	(void) new TDEAction(i18n("&Reload Plugins"), 0, this, TQ_SLOT(initPlugins()), actionCollection(), "reloadplugins");
+	(void) new TDEAction(i18n("Show &Plugins"), 0, this, TQ_SLOT(showPlugins()), actionCollection(), "showplugins");
 
-	aboutAction = new TDEAction(i18n("&About Course"), 0, this, TQT_SLOT(emptySlot()), actionCollection(), "aboutcourse");
-	tutorialAction = new TDEAction(i18n("&Tutorial"), 0, this, TQT_SLOT(tutorial()), actionCollection(), "tutorial");
+	aboutAction = new TDEAction(i18n("&About Course"), 0, this, TQ_SLOT(emptySlot()), actionCollection(), "aboutcourse");
+	tutorialAction = new TDEAction(i18n("&Tutorial"), 0, this, TQ_SLOT(tutorial()), actionCollection(), "tutorial");
 
 	statusBar();
 	setupGUI();
@@ -223,40 +223,40 @@ void Kolf::startNewGame()
 	game = new KolfGame(obj, &players, filename, dummy);
 	game->setStrict(competition);
 
-	connect(game, TQT_SIGNAL(newHole(int)), scoreboard, TQT_SLOT(newHole(int)));
-	connect(game, TQT_SIGNAL(scoreChanged(int, int, int)), scoreboard, TQT_SLOT(setScore(int, int, int)));
-	connect(game, TQT_SIGNAL(parChanged(int, int)), scoreboard, TQT_SLOT(parChanged(int, int)));
-	connect(game, TQT_SIGNAL(modifiedChanged(bool)), this, TQT_SLOT(updateModified(bool)));
-	connect(game, TQT_SIGNAL(newPlayersTurn(Player *)), this, TQT_SLOT(newPlayersTurn(Player *)));
-	connect(game, TQT_SIGNAL(holesDone()), this, TQT_SLOT(gameOver()));
-	connect(game, TQT_SIGNAL(checkEditing()), this, TQT_SLOT(checkEditing()));
-	connect(game, TQT_SIGNAL(editingStarted()), this, TQT_SLOT(editingStarted()));
-	connect(game, TQT_SIGNAL(editingEnded()), this, TQT_SLOT(editingEnded()));
-	connect(game, TQT_SIGNAL(inPlayStart()), this, TQT_SLOT(inPlayStart()));
-	connect(game, TQT_SIGNAL(inPlayEnd()), this, TQT_SLOT(inPlayEnd()));
-	connect(game, TQT_SIGNAL(maxStrokesReached(const TQString &)), this, TQT_SLOT(maxStrokesReached(const TQString &)));
-	connect(game, TQT_SIGNAL(largestHole(int)), this, TQT_SLOT(updateHoleMenu(int)));
-	connect(game, TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(titleChanged(const TQString &)));
-	connect(game, TQT_SIGNAL(newStatusText(const TQString &)), this, TQT_SLOT(newStatusText(const TQString &)));
-	connect(game, TQT_SIGNAL(currentHole(int)), this, TQT_SLOT(setCurrentHole(int)));
-	connect(holeAction, TQT_SIGNAL(activated(const TQString &)), game, TQT_SLOT(switchHole(const TQString &)));
-	connect(nextAction, TQT_SIGNAL(activated()), game, TQT_SLOT(nextHole()));
-	connect(prevAction, TQT_SIGNAL(activated()), game, TQT_SLOT(prevHole()));
-	connect(firstAction, TQT_SIGNAL(activated()), game, TQT_SLOT(firstHole()));
-	connect(lastAction, TQT_SIGNAL(activated()), game, TQT_SLOT(lastHole()));
-	connect(randAction, TQT_SIGNAL(activated()), game, TQT_SLOT(randHole()));
-	connect(editingAction, TQT_SIGNAL(activated()), game, TQT_SLOT(toggleEditMode()));
-	connect(newHoleAction, TQT_SIGNAL(activated()), game, TQT_SLOT(addNewHole()));
-	connect(clearHoleAction, TQT_SIGNAL(activated()), game, TQT_SLOT(clearHole()));
-	connect(resetHoleAction, TQT_SIGNAL(activated()), game, TQT_SLOT(resetHole()));
-	connect(undoShotAction, TQT_SIGNAL(activated()), game, TQT_SLOT(undoShot()));
-	//connect(replayShotAction, TQT_SIGNAL(activated()), game, TQT_SLOT(replay()));
-	connect(aboutAction, TQT_SIGNAL(activated()), game, TQT_SLOT(showInfoDlg()));
-	connect(useMouseAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setUseMouse(bool)));
-	connect(useAdvancedPuttingAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setUseAdvancedPutting(bool)));
-	connect(soundAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setSound(bool)));
-	connect(showGuideLineAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setShowGuideLine(bool)));
-	connect(showInfoAction, TQT_SIGNAL(toggled(bool)), game, TQT_SLOT(setShowInfo(bool)));
+	connect(game, TQ_SIGNAL(newHole(int)), scoreboard, TQ_SLOT(newHole(int)));
+	connect(game, TQ_SIGNAL(scoreChanged(int, int, int)), scoreboard, TQ_SLOT(setScore(int, int, int)));
+	connect(game, TQ_SIGNAL(parChanged(int, int)), scoreboard, TQ_SLOT(parChanged(int, int)));
+	connect(game, TQ_SIGNAL(modifiedChanged(bool)), this, TQ_SLOT(updateModified(bool)));
+	connect(game, TQ_SIGNAL(newPlayersTurn(Player *)), this, TQ_SLOT(newPlayersTurn(Player *)));
+	connect(game, TQ_SIGNAL(holesDone()), this, TQ_SLOT(gameOver()));
+	connect(game, TQ_SIGNAL(checkEditing()), this, TQ_SLOT(checkEditing()));
+	connect(game, TQ_SIGNAL(editingStarted()), this, TQ_SLOT(editingStarted()));
+	connect(game, TQ_SIGNAL(editingEnded()), this, TQ_SLOT(editingEnded()));
+	connect(game, TQ_SIGNAL(inPlayStart()), this, TQ_SLOT(inPlayStart()));
+	connect(game, TQ_SIGNAL(inPlayEnd()), this, TQ_SLOT(inPlayEnd()));
+	connect(game, TQ_SIGNAL(maxStrokesReached(const TQString &)), this, TQ_SLOT(maxStrokesReached(const TQString &)));
+	connect(game, TQ_SIGNAL(largestHole(int)), this, TQ_SLOT(updateHoleMenu(int)));
+	connect(game, TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(titleChanged(const TQString &)));
+	connect(game, TQ_SIGNAL(newStatusText(const TQString &)), this, TQ_SLOT(newStatusText(const TQString &)));
+	connect(game, TQ_SIGNAL(currentHole(int)), this, TQ_SLOT(setCurrentHole(int)));
+	connect(holeAction, TQ_SIGNAL(activated(const TQString &)), game, TQ_SLOT(switchHole(const TQString &)));
+	connect(nextAction, TQ_SIGNAL(activated()), game, TQ_SLOT(nextHole()));
+	connect(prevAction, TQ_SIGNAL(activated()), game, TQ_SLOT(prevHole()));
+	connect(firstAction, TQ_SIGNAL(activated()), game, TQ_SLOT(firstHole()));
+	connect(lastAction, TQ_SIGNAL(activated()), game, TQ_SLOT(lastHole()));
+	connect(randAction, TQ_SIGNAL(activated()), game, TQ_SLOT(randHole()));
+	connect(editingAction, TQ_SIGNAL(activated()), game, TQ_SLOT(toggleEditMode()));
+	connect(newHoleAction, TQ_SIGNAL(activated()), game, TQ_SLOT(addNewHole()));
+	connect(clearHoleAction, TQ_SIGNAL(activated()), game, TQ_SLOT(clearHole()));
+	connect(resetHoleAction, TQ_SIGNAL(activated()), game, TQ_SLOT(resetHole()));
+	connect(undoShotAction, TQ_SIGNAL(activated()), game, TQ_SLOT(undoShot()));
+	//connect(replayShotAction, TQ_SIGNAL(activated()), game, TQ_SLOT(replay()));
+	connect(aboutAction, TQ_SIGNAL(activated()), game, TQ_SLOT(showInfoDlg()));
+	connect(useMouseAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setUseMouse(bool)));
+	connect(useAdvancedPuttingAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setUseAdvancedPutting(bool)));
+	connect(soundAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setSound(bool)));
+	connect(showGuideLineAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setShowGuideLine(bool)));
+	connect(showInfoAction, TQ_SIGNAL(toggled(bool)), game, TQ_SLOT(setShowInfo(bool)));
 
 	game->setUseMouse(useMouseAction->isChecked());
 	game->setUseAdvancedPutting(useAdvancedPuttingAction->isChecked());
@@ -356,7 +356,7 @@ void Kolf::closeGame()
 	titleChanged(TQString());
 	updateModified(false);
 
-	TQTimer::singleShot(100, this, TQT_SLOT(createSpacer()));
+	TQTimer::singleShot(100, this, TQ_SLOT(createSpacer()));
 }
 
 void Kolf::createSpacer()
@@ -463,7 +463,7 @@ void Kolf::gameOver()
 		scoreDialog->show();
 	}
 
-	TQTimer::singleShot(700, this, TQT_SLOT(closeGame()));
+	TQTimer::singleShot(700, this, TQ_SLOT(closeGame()));
 }
 
 void Kolf::showHighScores()
@@ -564,7 +564,7 @@ void Kolf::openURL(KURL url)
 			return;
 		}
 
-		TQTimer::singleShot(10, this, TQT_SLOT(startNewGame()));
+		TQTimer::singleShot(10, this, TQ_SLOT(startNewGame()));
 	}
 	else
 		closeGame();
@@ -594,10 +594,10 @@ void Kolf::editingStarted()
 {
 	delete editor;
 	editor = new Editor(obj, dummy, "Editor");
-	connect(editor, TQT_SIGNAL(addNewItem(Object *)), game, TQT_SLOT(addNewObject(Object *)));
-	connect(editor, TQT_SIGNAL(changed()), game, TQT_SLOT(setModified()));
-	connect(editor, TQT_SIGNAL(addNewItem(Object *)), this, TQT_SLOT(setHoleFocus()));
-	connect(game, TQT_SIGNAL(newSelectedItem(CanvasItem *)), editor, TQT_SLOT(setItem(CanvasItem *)));
+	connect(editor, TQ_SIGNAL(addNewItem(Object *)), game, TQ_SLOT(addNewObject(Object *)));
+	connect(editor, TQ_SIGNAL(changed()), game, TQ_SLOT(setModified()));
+	connect(editor, TQ_SIGNAL(addNewItem(Object *)), this, TQ_SLOT(setHoleFocus()));
+	connect(game, TQ_SIGNAL(newSelectedItem(CanvasItem *)), editor, TQ_SLOT(setItem(CanvasItem *)));
 
 	scoreboard->hide();
 
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 1754cf1b..d42da4a6 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -52,7 +52,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 	addButton = new KPushButton(i18n("&New Player"), playerPage);
 	bigLayout->addWidget(addButton);
 
-	connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addPlayer()));
+	connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addPlayer()));
 
 	scroller = new TQScrollView(playerPage);
 	bigLayout->addWidget(scroller);
@@ -92,7 +92,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 		TQVBoxLayout *coursePageLayout = new TQVBoxLayout(coursePage, marginHint(), spacingHint());
 
 		KURLLabel *coursesLink = new KURLLabel("http://web.mit.edu/~jasonkb/www/kolf/", "http://web.mit.edu/~jasonkb/www/kolf/", coursePage);
-		connect(coursesLink, TQT_SIGNAL(leftClickedURL(const TQString &)), kapp, TQT_SLOT(invokeBrowser(const TQString &)));
+		connect(coursesLink, TQ_SIGNAL(leftClickedURL(const TQString &)), kapp, TQ_SLOT(invokeBrowser(const TQString &)));
 		coursePageLayout->addWidget(coursesLink);
 
 		TQHBoxLayout *hlayout = new TQHBoxLayout(coursePageLayout, spacingHint());
@@ -131,8 +131,8 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 		hlayout->addWidget(courseList);
 		courseList->insertStringList(nameList);
 		courseList->setCurrentItem(curItem);
-		connect(courseList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(courseSelected(int)));
-		connect(courseList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
+		connect(courseList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(courseSelected(int)));
+		connect(courseList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged()));
 
 		TQVBoxLayout *detailLayout = new TQVBoxLayout(hlayout, spacingHint());
 		name = new TQLabel(coursePage);
@@ -148,7 +148,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 
 		detailLayout->addStretch();
 		KPushButton *scores = new KPushButton(i18n("Highscores"), coursePage);
-		connect(scores, TQT_SIGNAL(clicked()), this, TQT_SLOT(showHighscores()));
+		connect(scores, TQ_SIGNAL(clicked()), this, TQ_SLOT(showHighscores()));
 		detailLayout->addWidget(scores);
 
 		detailLayout->addStretch();
@@ -158,11 +158,11 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 
 		KPushButton *addCourseButton = new KPushButton(i18n("Add..."), coursePage);
 		minorLayout->addWidget(addCourseButton);
-		connect(addCourseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCourse()));
+		connect(addCourseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCourse()));
 
 		remove = new KPushButton(i18n("Remove"), coursePage);
 		minorLayout->addWidget(remove);
-		connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCourse()));
+		connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCourse()));
 
 		courseSelected(curItem);
 		selectionChanged();
@@ -289,7 +289,7 @@ void NewGameDialog::addPlayer()
 
 	editors.append(new PlayerEditor(i18n("Player %1").arg(editors.count() + 1), *startColors.at(editors.count()), layout));
 	editors.last()->show();
-	connect(editors.last(), TQT_SIGNAL(deleteEditor(PlayerEditor *)), this, TQT_SLOT(deleteEditor(PlayerEditor *)));
+	connect(editors.last(), TQ_SIGNAL(deleteEditor(PlayerEditor *)), this, TQ_SLOT(deleteEditor(PlayerEditor *)));
 
 	enableButtons();
 }
@@ -336,7 +336,7 @@ PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *par
 	remove->setAutoMask(true);
 	layout->addWidget(remove);
 	remove->setBackgroundPixmap(grass);
-	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeMe()));
+	connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeMe()));
 }
 
 void PlayerEditor::removeMe()
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index 58e62deb..19d0f6dd 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -69,7 +69,7 @@ PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent)
 
 	layout->addStretch();
 
-	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(numberChanged(int)));
+	connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(numberChanged(int)));
 }
 
 void PoolBallConfig::numberChanged(int newNumber)
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index 5a57d98a..b7ef7a75 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -84,7 +84,7 @@ TestConfig::TestConfig(Test *test, TQWidget *parent)
 
 	layout->addStretch();
 
-	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(switchEveryChanged(int)));
+	connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(switchEveryChanged(int)));
 }
 
 void TestConfig::switchEveryChanged(int news)
diff --git a/kolf/slope.cpp b/kolf/slope.cpp
index 82708d0f..d3e3835e 100644
--- a/kolf/slope.cpp
+++ b/kolf/slope.cpp
@@ -534,14 +534,14 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent)
 	gradient->insertStringList(items);
 	gradient->setCurrentText(curText);
 	layout->addWidget(gradient);
-	connect(gradient, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setGradient(const TQString &)));
+	connect(gradient, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setGradient(const TQString &)));
 
 	layout->addStretch();
 
 	TQCheckBox *reversed = new TQCheckBox(i18n("Reverse direction"), this);
 	reversed->setChecked(slope->isReversed());
 	layout->addWidget(reversed);
-	connect(reversed, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setReversed(bool)));
+	connect(reversed, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setReversed(bool)));
 
 	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
 	hlayout->addWidget(new TQLabel(i18n("Grade:"), this));
@@ -549,13 +549,13 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent)
 	grade->setRange(0, 8, 1, true);
 	grade->setValue(slope->curGrade());
 	hlayout->addWidget(grade);
-	connect(grade, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(gradeChanged(double)));
+	connect(grade, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(gradeChanged(double)));
 
 	TQCheckBox *stuck = new TQCheckBox(i18n("Unmovable"), this);
 	TQWhatsThis::add(stuck, i18n("Whether or not this slope can be moved by other objects, like floaters."));
 	stuck->setChecked(slope->isStuckOnGround());
 	layout->addWidget(stuck);
-	connect(stuck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStuckOnGround(bool)));
+	connect(stuck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStuckOnGround(bool)));
 }
 
 void SlopeConfig::setGradient(const TQString &text)