Rename a number of old tq methods that are no longer tq specific

19 files changed, 258 insertions, 258 deletions

diff --git a/kolf/ball.cpp b/kolf/ball.cpp
index 7235edf3..9ac849bc 100644
--- a/kolf/ball.cpp
+++ b/kolf/ball.cpp
@@ -33,7 +33,7 @@ Ball::Ball(TQCanvas *canvas)
 	//font.setPixelSize(10);
 	label = new TQCanvasText("", font, canvas);
 	label->setColor(white);
-	label->tqsetVisible(false);
+	label->setVisible(false);
 
 	// this sets z
 	setState(Stopped);
@@ -438,12 +438,12 @@ BallState Ball::currentState()
 
 void Ball::showInfo()
 {
-	label->tqsetVisible(isVisible());
+	label->setVisible(isVisible());
 }
 
 void Ball::hideInfo()
 {
-	label->tqsetVisible(false);
+	label->setVisible(false);
 }
 
 void Ball::setName(const TQString &name)
@@ -459,8 +459,8 @@ void Ball::setCanvas(TQCanvas *c)
 
 void Ball::setVisible(bool yes)
 {
-	TQCanvasEllipse::tqsetVisible(yes);
+	TQCanvasEllipse::setVisible(yes);
 
-	label->tqsetVisible(yes && game && game->isInfoShowing());
+	label->setVisible(yes && game && game->isInfoShowing());
 }
 
diff --git a/kolf/canvasitem.h b/kolf/canvasitem.h
index 16f3a930..6b789dfa 100644
--- a/kolf/canvasitem.h
+++ b/kolf/canvasitem.h
@@ -113,7 +113,7 @@ public:
 	 */
 	virtual void clean() {};
 	/**
-	 * scale factor changed (game->scaleFactor(), the world matrix is game->tqworldMatrix())
+	 * scale factor changed (game->scaleFactor(), the world matrix is game->worldMatrix())
 	 * NOTE: not used in Kolf 1.1, which comes with KDE 3.1.
 	 */
 	virtual void scaleChanged() {};
diff --git a/kolf/config.cpp b/kolf/config.cpp
index 0d9aafae..b67e12cd 100644
--- a/kolf/config.cpp
+++ b/kolf/config.cpp
@@ -1,5 +1,5 @@
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdialog.h>
 #include <klocale.h>
@@ -36,8 +36,8 @@ void Config::changed()
 MessageConfig::MessageConfig(TQString text, TQWidget *parent, const char *name)
 	: Config(parent, name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
-	tqlayout->addWidget(new TQLabel(text, this));
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	layout->addWidget(new TQLabel(text, this));
 }
 
 DefaultConfig::DefaultConfig(TQWidget *parent, const char *name)
diff --git a/kolf/editor.cpp b/kolf/editor.cpp
index ab8b1d0c..2746a0e4 100644
--- a/kolf/editor.cpp
+++ b/kolf/editor.cpp
@@ -2,7 +2,7 @@
 #include <klistbox.h>
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 #include <tqframe.h>
 
@@ -15,13 +15,13 @@ Editor::Editor(ObjectList *list, TQWidget *parent, const char *name)
 	this->list = list;
 	config = 0;
 
-	htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
-	vtqlayout->addWidget(new TQLabel(i18n("Add object:"), this));
+	TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
+	vlayout->addWidget(new TQLabel(i18n("Add object:"), this));
 	listbox = new KListBox(this, "Listbox");
-	vtqlayout->addWidget(listbox);
-	htqlayout->setStretchFactor(vtqlayout, 2);
+	vlayout->addWidget(listbox);
+	hlayout->setStretchFactor(vlayout, 2);
 
 	TQStringList items;
 	Object *obj = 0;
@@ -49,8 +49,8 @@ void Editor::setItem(CanvasItem *item)
 	if (!config)
 		return;
 	config->ctorDone();
-	htqlayout->addWidget(config);
-	htqlayout->setStretchFactor(config, 2);
+	hlayout->addWidget(config);
+	hlayout->setStretchFactor(config, 2);
 	config->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 	config->setLineWidth(1);
 	config->show();
diff --git a/kolf/editor.h b/kolf/editor.h
index 8ee1b93a..e61e73cf 100644
--- a/kolf/editor.h
+++ b/kolf/editor.h
@@ -30,7 +30,7 @@ private slots:
 
 private:
 	ObjectList *list;
-	TQHBoxLayout *htqlayout;
+	TQHBoxLayout *hlayout;
 	KListBox *listbox;
 	Config *config;
 };
diff --git a/kolf/floater.cpp b/kolf/floater.cpp
index fe6e6344..ff42398a 100644
--- a/kolf/floater.cpp
+++ b/kolf/floater.cpp
@@ -257,14 +257,14 @@ FloaterConfig::FloaterConfig(Floater *floater, TQWidget *parent)
 	: BridgeConfig(floater, parent)
 {
 	this->floater = floater;
-	m_vtqlayout->addStretch();
+	m_vlayout->addStretch();
 
-	m_vtqlayout->addWidget(new TQLabel(i18n("Moving speed"), this));
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Slow"), this));
+	m_vlayout->addWidget(new TQLabel(i18n("Moving speed"), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Slow"), this));
 	TQSlider *slider = new TQSlider(0, 20, 2, floater->curSpeed(), Qt::Horizontal, this);
-	htqlayout->addWidget(slider);
-	htqlayout->addWidget(new TQLabel(i18n("Fast"), this));
+	hlayout->addWidget(slider);
+	hlayout->addWidget(new TQLabel(i18n("Fast"), this));
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int)));
 }
 
diff --git a/kolf/game.cpp b/kolf/game.cpp
index 9ff1ed73..7554d173 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -15,7 +15,7 @@
 #include <kprinter.h>
 #include <kstandarddirs.h>
 
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcanvas.h>
 #include <tqcheckbox.h>
 #include <tqcolor.h>
@@ -25,7 +25,7 @@
 #include <tqfontmetrics.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
@@ -58,12 +58,12 @@
 
 inline TQString makeGroup(int id, int hole, TQString name, int x, int y)
 {
-	return TQString("%1-%2@%3,%4|%5").tqarg(hole).tqarg(name).tqarg(x).tqarg(y).tqarg(id);
+	return TQString("%1-%2@%3,%4|%5").arg(hole).arg(name).arg(x).arg(y).arg(id);
 }
 
 inline TQString makeStateGroup(int id, const TQString &name)
 {
-	return TQString("%1|%2").tqarg(name).tqarg(id);
+	return TQString("%1|%2").arg(name).arg(id);
 }
 
 /////////////////////////
@@ -144,9 +144,9 @@ void Arrow::setZ(double newz)
 
 void Arrow::setVisible(bool yes)
 {
-	TQCanvasLine::tqsetVisible(yes);
-	line1->tqsetVisible(yes);
-	line2->tqsetVisible(yes);
+	TQCanvasLine::setVisible(yes);
+	line1->setVisible(yes);
+	line2->setVisible(yes);
 }
 
 void Arrow::moveBy(double dx, double dy)
@@ -197,23 +197,23 @@ BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent)
 {
 	this->bridge = bridge;
 
-	m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
-	TQGridLayout *tqlayout = new TQGridLayout(m_vtqlayout, 2, 3, spacingHint());
-	tqlayout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0);
+	m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQGridLayout *layout = new TQGridLayout(m_vlayout, 2, 3, spacingHint());
+	layout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0);
 	top = new TQCheckBox(i18n("&Top"), this);
-	tqlayout->addWidget(top, 0, 1);
+	layout->addWidget(top, 0, 1);
 	connect(top, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(topWallChanged(bool)));
 	top->setChecked(bridge->topWallVisible());
 	bot = new TQCheckBox(i18n("&Bottom"), this);
-	tqlayout->addWidget(bot, 1, 1);
+	layout->addWidget(bot, 1, 1);
 	connect(bot, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(botWallChanged(bool)));
 	bot->setChecked(bridge->botWallVisible());
 	left = new TQCheckBox(i18n("&Left"), this);
-	tqlayout->addWidget(left, 1, 0);
+	layout->addWidget(left, 1, 0);
 	connect(left, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(leftWallChanged(bool)));
 	left->setChecked(bridge->leftWallVisible());
 	right = new TQCheckBox(i18n("&Right"), this);
-	tqlayout->addWidget(right, 1, 2);
+	layout->addWidget(right, 1, 2);
 	connect(right, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rightWallChanged(bool)));
 	right->setChecked(bridge->rightWallVisible());
 }
@@ -264,10 +264,10 @@ Bridge::Bridge(TQRect rect, TQCanvas *canvas)
 	setWallZ(z() + 0.01);
 	setWallColor(color);
 
-	topWall->tqsetVisible(false);
-	botWall->tqsetVisible(false);
-	leftWall->tqsetVisible(false);
-	rightWall->tqsetVisible(false);
+	topWall->setVisible(false);
+	botWall->setVisible(false);
+	leftWall->setVisible(false);
+	rightWall->setVisible(false);
 
 	point = new RectPoint(color, this, canvas);
 	editModeChanged(false);
@@ -321,7 +321,7 @@ void Bridge::aboutToDie()
 
 void Bridge::editModeChanged(bool changed)
 {
-	point->tqsetVisible(changed);
+	point->setVisible(changed);
 	moveBy(0, 0);
 }
 
@@ -405,18 +405,18 @@ WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent)
 	: BridgeConfig(windmill, parent)
 {
 	this->windmill = windmill;
-	m_vtqlayout->addStretch();
+	m_vlayout->addStretch();
 
 	TQCheckBox *check = new TQCheckBox(i18n("Windmill on bottom"), this);
 	check->setChecked(windmill->bottom());
 	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(endChanged(bool)));
-	m_vtqlayout->addWidget(check);
+	m_vlayout->addWidget(check);
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Slow"), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Slow"), this));
 	TQSlider *slider = new TQSlider(1, 10, 1, windmill->curSpeed(), Qt::Horizontal, this);
-	htqlayout->addWidget(slider);
-	htqlayout->addWidget(new TQLabel(i18n("Fast"), this));
+	hlayout->addWidget(slider);
+	hlayout->addWidget(new TQLabel(i18n("Fast"), this));
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int)));
 
 	endChanged(check->isChecked());
@@ -454,7 +454,7 @@ Windmill::Windmill(TQRect rect, TQCanvas *canvas)
 {
 	guard = new WindmillGuard(canvas);
 	guard->setPen(TQPen(black, 5));
-	guard->tqsetVisible(true);
+	guard->setVisible(true);
 	guard->setAlwaysShow(true);
 	setSpeed(5);
 	guard->setZ(wallZ() + .1);
@@ -467,8 +467,8 @@ Windmill::Windmill(TQRect rect, TQCanvas *canvas)
 	right->setAlwaysShow(true);
 	left->setZ(wallZ());
 	right->setZ(wallZ());
-	left->tqsetVisible(true);
-	right->tqsetVisible(true);
+	left->setVisible(true);
+	right->setVisible(true);
 
 	setTopWallVisible(false);
 	setBotWallVisible(false);
@@ -629,12 +629,12 @@ void Sign::draw(TQPainter &painter)
 	TQSimpleRichText txt(m_text, kapp->font());
 	const int indent = wallPen().width() + 3;
 	txt.setWidth(width() - 2*indent);
-	TQColorGroup tqcolorGroup;
-	tqcolorGroup.setColor(TQColorGroup::Foreground, black);
-	tqcolorGroup.setColor(TQColorGroup::Text, black);
-	tqcolorGroup.setColor(TQColorGroup::Background, black);
-	tqcolorGroup.setColor(TQColorGroup::Base, black);
-	txt.draw(&painter, x() + indent, y(), TQRect(x() + indent, y(), width() - indent, height() - indent), tqcolorGroup);
+	TQColorGroup colorGroup;
+	colorGroup.setColor(TQColorGroup::Foreground, black);
+	colorGroup.setColor(TQColorGroup::Text, black);
+	colorGroup.setColor(TQColorGroup::Background, black);
+	colorGroup.setColor(TQColorGroup::Base, black);
+	txt.draw(&painter, x() + indent, y(), TQRect(x() + indent, y(), width() - indent, height() - indent), colorGroup);
 }
 
 /////////////////////////
@@ -643,10 +643,10 @@ SignConfig::SignConfig(Sign *sign, TQWidget *parent)
 	: BridgeConfig(sign, parent)
 {
 	this->sign = sign;
-	m_vtqlayout->addStretch();
-	m_vtqlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this));
+	m_vlayout->addStretch();
+	m_vlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this));
 	KLineEdit *name = new KLineEdit(sign->text(), this);
-	m_vtqlayout->addWidget(name);
+	m_vlayout->addWidget(name);
 	connect(name, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &)));
 }
 
@@ -663,20 +663,20 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent)
 {
 	this->ellipse = ellipse;
 
-	m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
 	TQCheckBox *check = new TQCheckBox(i18n("Enable show/hide"), this);
-	m_vtqlayout->addWidget(check);
+	m_vlayout->addWidget(check);
 	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(check1Changed(bool)));
 	check->setChecked(ellipse->changeEnabled());
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint());
 	slow1 = new TQLabel(i18n("Slow"), this);
-	htqlayout->addWidget(slow1);
+	hlayout->addWidget(slow1);
 	slider1 = new TQSlider(1, 100, 5, 100 - ellipse->changeEvery(), Qt::Horizontal, this);
-	htqlayout->addWidget(slider1);
+	hlayout->addWidget(slider1);
 	fast1 = new TQLabel(i18n("Fast"), this);
-	htqlayout->addWidget(fast1);
+	hlayout->addWidget(fast1);
 
 	connect(slider1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(value1Changed(int)));
 
@@ -684,7 +684,7 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent)
 
 	// TODO add slider2 and friends and make it possible for ellipses to grow and contract
 
-	m_vtqlayout->addStretch();
+	m_vlayout->addStretch();
 }
 
 void EllipseConfig::value1Changed(int news)
@@ -733,7 +733,7 @@ Ellipse::Ellipse(TQCanvas *canvas)
 	setChangeEnabled(false);
 	setChangeEvery(50);
 	count = 0;
-	tqsetVisible(true);
+	setVisible(true);
 
 	point = new RectPoint(black, this, canvas);
 	point->setSizeFactor(2.0);
@@ -750,7 +750,7 @@ void Ellipse::setChangeEnabled(bool changeEnabled)
 	setAnimated(m_changeEnabled);
 
 	if (!m_changeEnabled)
-		tqsetVisible(true);
+		setVisible(true);
 }
 
 TQPtrList<TQCanvasItem> Ellipse::moveableItems() const
@@ -775,7 +775,7 @@ void Ellipse::moveBy(double dx, double dy)
 
 void Ellipse::editModeChanged(bool changed)
 {
-	point->tqsetVisible(changed);
+	point->setVisible(changed);
 	moveBy(0, 0);
 }
 
@@ -788,7 +788,7 @@ void Ellipse::advance(int phase)
 		if (count > (m_changeEvery + 10) * 1.8)
 			count = 0;
 		if (count == 0)
-			tqsetVisible(!isVisible());
+			setVisible(!isVisible());
 
 		count++;
 	}
@@ -819,7 +819,7 @@ Config *Ellipse::config(TQWidget *parent)
 
 void Ellipse::aboutToSave()
 {
-	tqsetVisible(true);
+	setVisible(true);
 	dontHide = true;
 }
 
@@ -860,7 +860,7 @@ bool Puddle::collision(Ball *ball, long int /*id*/)
 	if (ball->isVisible())
 	{
 		TQCanvasRectangle i(TQRect(ball->x(), ball->y(), 1, 1), canvas());
-		i.tqsetVisible(true);
+		i.setVisible(true);
 
 		// is center of ball in?
 		if (i.collidesWith(this)/* && ball->curVector().magnitude() < 4*/)
@@ -868,7 +868,7 @@ bool Puddle::collision(Ball *ball, long int /*id*/)
 			playSound("puddle");
 			ball->setAddStroke(ball->addStroke() + 1);
 			ball->setPlaceOnGround(true);
-			ball->tqsetVisible(false);
+			ball->setVisible(false);
 			ball->setState(Stopped);
 			ball->setVelocity(0, 0);
 			if (game && game->curBall() == ball)
@@ -911,7 +911,7 @@ Sand::Sand(TQCanvas *canvas)
 bool Sand::collision(Ball *ball, long int /*id*/)
 {
 	TQCanvasRectangle i(TQRect(ball->x(), ball->y(), 1, 1), canvas());
-	i.tqsetVisible(true);
+	i.setVisible(true);
 
 	// is center of ball in?
 	if (i.collidesWith(this)/* && ball->curVector().magnitude() < 4*/)
@@ -954,12 +954,12 @@ Putter::Putter(TQCanvas *canvas)
 
 void Putter::showInfo()
 {
-	guideLine->tqsetVisible(isVisible());
+	guideLine->setVisible(isVisible());
 }
 
 void Putter::hideInfo()
 {
-	guideLine->tqsetVisible(m_showGuideLine? isVisible() : false);
+	guideLine->setVisible(m_showGuideLine? isVisible() : false);
 }
 
 void Putter::moveBy(double dx, double dy)
@@ -976,8 +976,8 @@ void Putter::setShowGuideLine(bool yes)
 
 void Putter::setVisible(bool yes)
 {
-	TQCanvasLine::tqsetVisible(yes);
-	guideLine->tqsetVisible(m_showGuideLine? yes : false);
+	TQCanvasLine::setVisible(yes);
+	guideLine->setVisible(m_showGuideLine? yes : false);
 }
 
 void Putter::setOrigin(int _x, int _y)
@@ -1002,11 +1002,11 @@ void Putter::go(Direction d, Amount amount)
 	{
 		case Forwards:
 			len -= 1;
-			guideLine->tqsetVisible(false);
+			guideLine->setVisible(false);
 			break;
 		case Backwards:
 			len += 1;
-			guideLine->tqsetVisible(false);
+			guideLine->setVisible(false);
 			break;
 		case D_Left:
 			angle += addition;
@@ -1085,7 +1085,7 @@ void Bumper::moveBy(double dx, double dy)
 
 void Bumper::editModeChanged(bool changed)
 {
-	inside->tqsetVisible(!changed);
+	inside->setVisible(!changed);
 }
 
 void Bumper::advance(int phase)
@@ -1166,7 +1166,7 @@ HoleResult Hole::result(TQPoint p, double s, bool * /*wasCenter*/)
 		return Result_Miss;
 
 	TQCanvasRectangle i(TQRect(p, TQSize(1, 1)), canvas());
-	i.tqsetVisible(true);
+	i.setVisible(true);
 
 	// is center of ball in cup?
 	if (i.collidesWith(this))
@@ -1238,7 +1238,7 @@ BlackHole::BlackHole(TQCanvas *canvas)
 	setSize(width(), width() / .8);
 	const float factor = 1.3;
 	outside->setSize(width() * factor, height() * factor);
-	outside->tqsetVisible(true);
+	outside->setVisible(true);
 
 	moveBy(0, 0);
 
@@ -1249,7 +1249,7 @@ void BlackHole::showInfo()
 {
 	delete infoLine;
 	infoLine = new TQCanvasLine(canvas());
-	infoLine->tqsetVisible(true);
+	infoLine->setVisible(true);
 	infoLine->setPen(TQPen(exitItem->pen().color(), 2));
 	infoLine->setZ(10000);
 	infoLine->setPoints(x(), y(), exitItem->x(), exitItem->y());
@@ -1277,7 +1277,7 @@ void BlackHole::updateInfo()
 {
 	if (infoLine)
 	{
-		infoLine->tqsetVisible(true);
+		infoLine->setVisible(true);
 		infoLine->setPoints(x(), y(), exitItem->x(), exitItem->y());
 		exitItem->showInfo();
 	}
@@ -1338,7 +1338,7 @@ bool BlackHole::place(Ball *ball, bool /*wasCenter*/)
 
 	ball->setVelocity(0, 0);
 	ball->setState(Stopped);
-	ball->tqsetVisible(false);
+	ball->setVisible(false);
 	ball->setForceStillGoing(true);
 
 	double magnitude = Vector(TQPoint(x(), y()), TQPoint(exitItem->x(), exitItem->y())).magnitude();
@@ -1367,7 +1367,7 @@ void BlackHole::eject(Ball *ball, double speed)
 	ball->setVector(v);
 
 	ball->setForceStillGoing(false);
-	ball->tqsetVisible(true);
+	ball->setVisible(true);
 	ball->setState(Rolling);
 
 	runs++;
@@ -1418,7 +1418,7 @@ void BlackHole::finishMe()
 	}
 
 	exitItem->setPoints(start.x(), start.y(), end.x(), end.y());
-	exitItem->tqsetVisible(true);
+	exitItem->setVisible(true);
 }
 
 void BlackHole::save(KConfig *cfg)
@@ -1439,7 +1439,7 @@ BlackHoleExit::BlackHoleExit(BlackHole *blackHole, TQCanvas *canvas)
 	setZ(blackHole->z());
 	arrow->setZ(z() - .00001);
 	updateArrowLength();
-	arrow->tqsetVisible(false);
+	arrow->setVisible(false);
 }
 
 void BlackHoleExit::aboutToDie()
@@ -1484,12 +1484,12 @@ void BlackHoleExit::editModeChanged(bool editing)
 
 void BlackHoleExit::showInfo()
 {
-	arrow->tqsetVisible(true);
+	arrow->setVisible(true);
 }
 
 void BlackHoleExit::hideInfo()
 {
-	arrow->tqsetVisible(false);
+	arrow->setVisible(false);
 }
 
 Config *BlackHoleExit::config(TQWidget *parent)
@@ -1503,30 +1503,30 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent)
 	: Config(parent)
 {
 	this->blackHole = blackHole;
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
-	tqlayout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this));
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	layout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this));
 	TQSpinBox *deg = new TQSpinBox(0, 359, 10, this);
 	deg->setSuffix(TQString(" ") + i18n("degrees"));
 	deg->setValue(blackHole->curExitDeg());
 	deg->setWrapping(true);
-	tqlayout->addWidget(deg);
+	layout->addWidget(deg);
 	connect(deg, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(degChanged(int)));
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this));
 	KDoubleNumInput *min = new KDoubleNumInput(this);
 	min->setRange(0, 8, 1, true);
-	htqlayout->addWidget(min);
+	hlayout->addWidget(min);
 	connect(min, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(minChanged(double)));
 	min->setValue(blackHole->minSpeed());
 
-	htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
+	hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
 	KDoubleNumInput *max = new KDoubleNumInput(this);
 	max->setRange(1, 10, 1, true);
-	htqlayout->addWidget(max);
+	hlayout->addWidget(max);
 	connect(max, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(maxChanged(double)));
 	max->setValue(blackHole->maxSpeed());
 }
@@ -1639,7 +1639,7 @@ void WallPoint::updateVisible()
 void WallPoint::editModeChanged(bool changed)
 {
 	editing = changed;
-	tqsetVisible(true);
+	setVisible(true);
 	if (!editing)
 		updateVisible();
 }
@@ -1741,8 +1741,8 @@ Wall::Wall(TQCanvas *canvas)
 
 	startItem = new WallPoint(true, this, canvas);
 	endItem = new WallPoint(false, this, canvas);
-	startItem->tqsetVisible(true);
-	endItem->tqsetVisible(true);
+	startItem->setVisible(true);
+	endItem->setVisible(true);
 	setPen(TQPen(darkRed, 3));
 
 	setPoints(-15, 10, 15, -5);
@@ -1777,10 +1777,10 @@ void Wall::setAlwaysShow(bool yes)
 
 void Wall::setVisible(bool yes)
 {
-	TQCanvasLine::tqsetVisible(yes);
+	TQCanvasLine::setVisible(yes);
 
-	startItem->tqsetVisible(yes);
-	endItem->tqsetVisible(yes);
+	startItem->setVisible(yes);
+	endItem->setVisible(yes);
 	startItem->updateVisible();
 	endItem->updateVisible();
 }
@@ -1959,42 +1959,42 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent)
 {
 	this->holeInfo = holeInfo;
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Course name: "), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Course name: "), this));
 	KLineEdit *nameEdit = new KLineEdit(holeInfo->untranslatedName(), this);
-	htqlayout->addWidget(nameEdit);
+	hlayout->addWidget(nameEdit);
 	connect(nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &)));
 
-	htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Course author: "), this));
+	hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Course author: "), this));
 	KLineEdit *authorEdit = new KLineEdit(holeInfo->author(), this);
-	htqlayout->addWidget(authorEdit);
+	hlayout->addWidget(authorEdit);
 	connect(authorEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(authorChanged(const TQString &)));
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
-	htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Par:"), this));
+	hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Par:"), this));
 	TQSpinBox *par = new TQSpinBox(1, 15, 1, this);
 	par->setValue(holeInfo->par());
-	htqlayout->addWidget(par);
+	hlayout->addWidget(par);
 	connect(par, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(parChanged(int)));
-	htqlayout->addStretch();
+	hlayout->addStretch();
 
-	htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
+	hlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
 	TQSpinBox *maxstrokes = new TQSpinBox(holeInfo->lowestMaxStrokes(), 30, 1, this);
 	TQWhatsThis::add(maxstrokes, i18n("Maximum number of strokes player can take on this hole."));
 	TQToolTip::add(maxstrokes, i18n("Maximum number of strokes"));
 	maxstrokes->setSpecialValueText(i18n("Unlimited"));
 	maxstrokes->setValue(holeInfo->maxStrokes());
-	htqlayout->addWidget(maxstrokes);
+	hlayout->addWidget(maxstrokes);
 	connect(maxstrokes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxStrokesChanged(int)));
 
 	TQCheckBox *check = new TQCheckBox(i18n("Show border walls"), this);
 	check->setChecked(holeInfo->borderWalls());
-	tqlayout->addWidget(check);
+	layout->addWidget(check);
 	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(borderWallsChanged(bool)));
 }
 
@@ -2212,7 +2212,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi
 		pic.load(locate("appdata", "pics/grass.png"));
 		TQPixmapCache::insert("grass", pic);
 	}
-	course->tqsetBackgroundPixmap(pic);
+	course->setBackgroundPixmap(pic);
 
 	setCanvas(course);
 	move(0, 0);
@@ -2225,7 +2225,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi
 	highlighter = new TQCanvasRectangle(course);
 	highlighter->setPen(TQPen(yellow, 1));
 	highlighter->setBrush(TQBrush(NoBrush));
-	highlighter->tqsetVisible(false);
+	highlighter->setVisible(false);
 	highlighter->setZ(10000);
 
 	// shows some info about hole
@@ -2237,14 +2237,14 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi
 	infoText->move(15, width/2);
 	infoText->setZ(10001);
 	infoText->setFont(font);
-	infoText->tqsetVisible(false);
+	infoText->setVisible(false);
 
 	// create the advanced putting indicator
 	strokeCircle = new StrokeCircle(course);
 	strokeCircle->move(width - 90, height - 90);
 	strokeCircle->setSize(80, 80);
 	strokeCircle->setThickness(8);
-	strokeCircle->tqsetVisible(false);
+	strokeCircle->setVisible(false);
 	strokeCircle->setValue(0);
 	strokeCircle->setMaxValue(360);
 
@@ -2252,7 +2252,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi
 	whiteBall = new Ball(course);
 	whiteBall->setGame(this);
 	whiteBall->setColor(white);
-	whiteBall->tqsetVisible(false);
+	whiteBall->setVisible(false);
 	whiteBall->setDoDetect(false);
 
 	int highestLog = 0;
@@ -2311,7 +2311,7 @@ void KolfGame::startFirstHole(int hole)
 	{
 		for (; scoreboardHoles < curHole; ++scoreboardHoles)
 		{
-			cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(scoreboardHoles + 1));
+			cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(scoreboardHoles + 1));
 			emit newHole(cfg->readNumEntry("par", 3));
 		}
 
@@ -2382,7 +2382,7 @@ void KolfGame::addBorderWall(TQPoint start, TQPoint end)
 {
 	Wall *wall = new Wall(course);
 	wall->setPoints(start.x(), start.y(), end.x(), end.y());
-	wall->tqsetVisible(true);
+	wall->setVisible(true);
 	wall->setGame(this);
 	wall->setZ(998.7);
 	borderWalls.append(wall);
@@ -2420,7 +2420,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e)
 			list.pop_front();
 
 		moving = false;
-		highlighter->tqsetVisible(false);
+		highlighter->setVisible(false);
 		selectedItem = 0;
 		movingItem = 0;
 
@@ -2458,7 +2458,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e)
 					setCursor(KCursor::sizeAllCursor());
 
 				emit newSelectedItem(citem);
-				highlighter->tqsetVisible(true);
+				highlighter->setVisible(true);
 				TQRect rect = selectedItem->boundingRect();
 				highlighter->move(rect.x() + 1, rect.y() + 1);
 				highlighter->setSize(rect.width(), rect.height());
@@ -2553,7 +2553,7 @@ void KolfGame::handleMouseMoveEvent(TQMouseEvent *e)
 	highlighter->moveBy(-(double)moveX, -(double)moveY);
 	movingItem->moveBy(-(double)moveX, -(double)moveY);
 	TQRect brect = movingItem->boundingRect();
-	emit newStatusText(TQString("%1x%2").tqarg(brect.x()).tqarg(brect.y()));
+	emit newStatusText(TQString("%1x%2").arg(brect.x()).arg(brect.y()));
 	storedMousePos = mouse;
 }
 
@@ -2608,7 +2608,7 @@ void KolfGame::keyPressEvent(TQKeyEvent *e)
 			putting = false;
 			stroking = false;
 			finishStroking = false;
-			strokeCircle->tqsetVisible(false);
+			strokeCircle->setVisible(false);
 			putterTimer->stop();
 			putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y());
 		break;
@@ -2701,7 +2701,7 @@ void KolfGame::puttPress()
 				strokeCircle->move(px + pw / 2 + 10, py + 10);
 			else
 				strokeCircle->move(px + pw / 2 + 10, py - 10 - strokeCircle->height());
-			strokeCircle->tqsetVisible(true);
+			strokeCircle->setVisible(true);
 		}
 		putterTimer->start(putterTimerMsec);
 	}
@@ -2741,7 +2741,7 @@ void KolfGame::keyReleaseEvent(TQKeyEvent *e)
 			{
 				lastDelId = citem->curId();
 
-				highlighter->tqsetVisible(false);
+				highlighter->setVisible(false);
 				items.removeRef(item);
 				citem->hideInfo();
 				citem->aboutToDelete();
@@ -2907,7 +2907,7 @@ void KolfGame::putterTimeout()
 			{
 				// aborted
 				putting = false;
-				strokeCircle->tqsetVisible(false);
+				strokeCircle->setVisible(false);
 			}
 			else if (strength > maxStrength || puttReverse)
 			{
@@ -2950,7 +2950,7 @@ void KolfGame::putterTimeout()
 					putter->go(Forwards);
 				else
 				{
-					strokeCircle->tqsetVisible(false);
+					strokeCircle->setVisible(false);
 					finishStroking = false;
 					putterTimer->stop();
 					putting = false;
@@ -3084,7 +3084,7 @@ void KolfGame::loadStateList()
 		if ((*curPlayer).id() == info.id)
 			ballMoved();
 		else
-			player.ball()->tqsetVisible(!info.beginningOfHole);
+			player.ball()->setVisible(!info.beginningOfHole);
 		player.setScoreForHole(info.score, curHole);
 		player.ball()->setState(info.state);
 		emit scoreChanged(info.id, curHole, info.score);
@@ -3136,7 +3136,7 @@ void KolfGame::shotDone()
 			const TQString placeOutside = i18n("Drop Outside of Hazard");
 			const TQString rehit = i18n("Rehit From Last Location");
 			options << placeOutside << rehit;
-			const TQString choice = KComboBoxDialog::getItem(i18n("What would you like to do for your next shot?"), i18n("%1 is in a Hazard").tqarg((*it).name()), options, placeOutside, "hazardOptions");
+			const TQString choice = KComboBoxDialog::getItem(i18n("What would you like to do for your next shot?"), i18n("%1 is in a Hazard").arg((*it).name()), options, placeOutside, "hazardOptions");
 
 			if (choice == placeOutside)
 			{
@@ -3186,7 +3186,7 @@ void KolfGame::shotDone()
 				}
 			}
 
-			ball->tqsetVisible(true);
+			ball->setVisible(true);
 			ball->setState(Stopped);
 
 			(*it).ball()->setDoDetect(true);
@@ -3207,7 +3207,7 @@ void KolfGame::shotDone()
 		if (curStrokes >= holeInfo.maxStrokes() && holeInfo.hasMaxStrokes())
 		{
 			ball->setState(Holed);
-			ball->tqsetVisible(false);
+			ball->setVisible(false);
 
 			// move to center in case he/she hit out
 			ball->move(width / 2, height / 2);
@@ -3236,7 +3236,7 @@ void KolfGame::shotDone()
 
 	emit newPlayersTurn(&(*curPlayer));
 
-	(*curPlayer).ball()->tqsetVisible(true);
+	(*curPlayer).ball()->setVisible(true);
 
 	putter->setAngle((*curPlayer).ball());
 	putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y());
@@ -3256,7 +3256,7 @@ void KolfGame::startBall(const Vector &vector)
 	playSound("hit");
 
 	emit inPlayStart();
-	putter->tqsetVisible(false);
+	putter->setVisible(false);
 
 	(*curPlayer).ball()->setState(Rolling);
 	(*curPlayer).ball()->setVector(vector);
@@ -3303,14 +3303,14 @@ void KolfGame::sayWhosGoing()
 {
 	if (players->count() >= 2)
 	{
-		KMessageBox::information(this, i18n("%1 will start off.").tqarg((*curPlayer).name()), i18n("New Hole"), "newHole");
+		KMessageBox::information(this, i18n("%1 will start off.").arg((*curPlayer).name()), i18n("New Hole"), "newHole");
 	}
 }
 
 void KolfGame::holeDone()
 {
 	for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it)
-		(*it).ball()->tqsetVisible(false);
+		(*it).ball()->setVisible(false);
 	startNextHole();
 	sayWhosGoing();
 }
@@ -3407,7 +3407,7 @@ void KolfGame::startNextHole()
 		if ((int)(*it).scores().count() < curHole)
 			(*it).addHole();
 		(*it).ball()->setVelocity(0, 0);
-		(*it).ball()->tqsetVisible(false);
+		(*it).ball()->setVisible(false);
 	}
 
 	emit newPlayersTurn(&(*curPlayer));
@@ -3429,7 +3429,7 @@ void KolfGame::startNextHole()
 
 		for (; scoreboardHoles < curHole; ++scoreboardHoles)
 		{
-			cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(scoreboardHoles + 1));
+			cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(scoreboardHoles + 1));
 			emit newHole(cfg->readNumEntry("par", 3));
 		}
 
@@ -3437,7 +3437,7 @@ void KolfGame::startNextHole()
 		updateShowInfo();
 
 		// this is from shotDone()
-		(*curPlayer).ball()->tqsetVisible(true);
+		(*curPlayer).ball()->setVisible(true);
 		putter->setOrigin((*curPlayer).ball()->x(), (*curPlayer).ball()->y());
 		updateMouse();
 
@@ -3451,11 +3451,11 @@ void KolfGame::startNextHole()
 
 void KolfGame::showInfo()
 {
-	TQString text = i18n("Hole %1: par %2, maximum %3 strokes").tqarg(curHole).tqarg(holeInfo.par()).tqarg(holeInfo.maxStrokes());
+	TQString text = i18n("Hole %1: par %2, maximum %3 strokes").arg(curHole).arg(holeInfo.par()).arg(holeInfo.maxStrokes());
 	infoText->move((width - TQFontMetrics(infoText->font()).width(text)) / 2, infoText->y());
 	infoText->setText(text);
 	// I hate this text! Let's not show it
-	//infoText->tqsetVisible(true);
+	//infoText->setVisible(true);
 
 	emit newStatusText(text);
 }
@@ -3463,9 +3463,9 @@ void KolfGame::showInfo()
 void KolfGame::showInfoDlg(bool addDontShowAgain)
 {
 	KMessageBox::information(parentWidget(),
-	i18n("Course name: %1").tqarg(holeInfo.name()) + TQString("\n")
-	+ i18n("Created by %1").tqarg(holeInfo.author()) + TQString("\n")
-	+ i18n("%1 holes").tqarg(highestHole),
+	i18n("Course name: %1").arg(holeInfo.name()) + TQString("\n")
+	+ i18n("Created by %1").arg(holeInfo.author()) + TQString("\n")
+	+ i18n("%1 holes").arg(highestHole),
 	i18n("Course Information"),
 	addDontShowAgain? holeInfo.name() + TQString(" ") + holeInfo.author() : TQString());
 }
@@ -3473,7 +3473,7 @@ void KolfGame::showInfoDlg(bool addDontShowAgain)
 void KolfGame::hideInfo()
 {
 	infoText->setText("");
-	infoText->tqsetVisible(false);
+	infoText->setVisible(false);
 
 	emit newStatusText(TQString());
 }
@@ -3514,7 +3514,7 @@ void KolfGame::openFile()
 	holeInfo.setUntranslatedName(cfg->readEntryUntranslated("Name", holeInfo.untranslatedName()));
 	emit titleChanged(holeInfo.name());
 
-	cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(curHole));
+	cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(curHole));
 	curPar = cfg->readNumEntry("par", 3);
 	holeInfo.setPar(curPar);
 	holeInfo.borderWallsChanged(cfg->readBoolEntry("borderWalls", holeInfo.borderWalls()));
@@ -3593,7 +3593,7 @@ void KolfGame::openFile()
 			newItem->move(x, y);
 			canvasItem->firstMove(x, y);
 
-			newItem->tqsetVisible(true);
+			newItem->setVisible(true);
 
 			// make things actually show
 			if (!hasFinalLoad)
@@ -3616,7 +3616,7 @@ void KolfGame::openFile()
 
 	if (!missingPlugins.empty())
 	{
-		KMessageBox::informationList(this, TQString("<p>&lt;http://katzbrown.com/kolf/Plugins/&gt;</p><p>") + i18n("This hole uses the following plugins, which you do not have installed:") + TQString("</p>"), missingPlugins, TQString(), TQString("%1 warning").tqarg(holeInfo.untranslatedName() + TQString::number(curHole)));
+		KMessageBox::informationList(this, TQString("<p>&lt;http://katzbrown.com/kolf/Plugins/&gt;</p><p>") + i18n("This hole uses the following plugins, which you do not have installed:") + TQString("</p>"), missingPlugins, TQString(), TQString("%1 warning").arg(holeInfo.untranslatedName() + TQString::number(curHole)));
 	}
 
 	lastDelId = -1;
@@ -3634,7 +3634,7 @@ void KolfGame::openFile()
 		clearHole();
 		setModified(false);
 		for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it)
-			(*it).ball()->tqsetVisible(false);
+			(*it).ball()->setVisible(false);
 
 		return;
 	}
@@ -3719,7 +3719,7 @@ void KolfGame::addNewObject(Object *newObj)
 {
 	TQCanvasItem *newItem = newObj->newObject(course);
 	items.append(newItem);
-	newItem->tqsetVisible(true);
+	newItem->setVisible(true);
 
 	CanvasItem *canvasItem = dynamic_cast<CanvasItem *>(newItem);
 	if (!canvasItem)
@@ -3826,11 +3826,11 @@ void KolfGame::addNewHole()
 
 	// make sure even the current player isn't showing
 	for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it)
-		(*it).ball()->tqsetVisible(false);
+		(*it).ball()->setVisible(false);
 
-	whiteBall->tqsetVisible(editing);
-	highlighter->tqsetVisible(false);
-	putter->tqsetVisible(!editing);
+	whiteBall->setVisible(editing);
+	highlighter->setVisible(false);
+	putter->setVisible(!editing);
 	inPlay = false;
 
 	// add default objects
@@ -3995,7 +3995,7 @@ void KolfGame::save()
 	}
 
 	// save where ball starts (whiteBall tells all)
-	cfg->setGroup(TQString("%1-ball@%2,%3").tqarg(curHole).tqarg((int)whiteBall->x()).tqarg((int)whiteBall->y()));
+	cfg->setGroup(TQString("%1-ball@%2,%3").arg(curHole).arg((int)whiteBall->x()).arg((int)whiteBall->y()));
 	cfg->writeEntry("dummykey", true);
 
 	cfg->setGroup("0-course@-50,-50");
@@ -4003,7 +4003,7 @@ void KolfGame::save()
 	cfg->writeEntry("Name", holeInfo.untranslatedName());
 
 	// save hole info
-	cfg->setGroup(TQString("%1-hole@-50,-50|0").tqarg(curHole));
+	cfg->setGroup(TQString("%1-hole@-50,-50|0").arg(curHole));
 	cfg->writeEntry("par", holeInfo.par());
 	cfg->writeEntry("maxstrokes", holeInfo.maxStrokes());
 	cfg->writeEntry("borderWalls", holeInfo.borderWalls());
@@ -4066,16 +4066,16 @@ void KolfGame::toggleEditMode()
 	{
 		// curplayer shouldn't be hidden no matter what
 		if ((*it).ball()->beginningOfHole() && it != curPlayer)
-			(*it).ball()->tqsetVisible(false);
+			(*it).ball()->setVisible(false);
 		else
-			(*it).ball()->tqsetVisible(!editing);
+			(*it).ball()->setVisible(!editing);
 	}
 
-	whiteBall->tqsetVisible(editing);
-	highlighter->tqsetVisible(false);
+	whiteBall->setVisible(editing);
+	highlighter->setVisible(false);
 
 	// shouldn't see putter whilst editing
-	putter->tqsetVisible(!editing);
+	putter->setVisible(!editing);
 
 	if (editing)
 		autoSaveTimer->start(autoSaveMsec);
@@ -4103,7 +4103,7 @@ void KolfGame::playSound(TQString file, double vol)
 			}
 		}
 
-		file = soundDir + file + TQString::tqfromLatin1(".wav");
+		file = soundDir + file + TQString::fromLatin1(".wav");
 
 		// not needed when all of the files are in the distribution
 		//if (!TQFile::exists(file))
@@ -4160,7 +4160,7 @@ void KolfGame::print(KPrinter &pr)
 
 	if (pr.option("kde-kolf-title") == "true")
 	{
-		TQString text = i18n("%1 - Hole %2; by %3").tqarg(holeInfo.name()).tqarg(curHole).tqarg(holeInfo.author());
+		TQString text = i18n("%1 - Hole %2; by %3").arg(holeInfo.name()).arg(curHole).arg(holeInfo.author());
 		TQFont font(kapp->font());
 		font.setPointSize(18);
 		TQRect rect = TQFontMetrics(font).boundingRect(text);
@@ -4183,7 +4183,7 @@ void KolfGame::setBorderWalls(bool showing)
 {
 	Wall *wall = 0;
 	for (wall = borderWalls.first(); wall; wall = borderWalls.next())
-		wall->tqsetVisible(showing);
+		wall->setVisible(showing);
 }
 
 void KolfGame::setUseAdvancedPutting(bool yes)
@@ -4219,7 +4219,7 @@ void KolfGame::courseInfo(CourseInfo &info, const TQString& filename)
 	unsigned int par= 0;
 	while (1)
 	{
-		TQString group = TQString("%1-hole@-50,-50|0").tqarg(hole);
+		TQString group = TQString("%1-hole@-50,-50|0").arg(hole);
 		if (!cfg.hasGroup(group))
 		{
 			hole--;
diff --git a/kolf/game.h b/kolf/game.h
index e1766802..8a634d47 100644
--- a/kolf/game.h
+++ b/kolf/game.h
@@ -14,7 +14,7 @@
 #include <tqpainter.h>
 #include <tqcolor.h>
 #include <tqframe.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 #include <tqpen.h>
 #include <tqpoint.h>
@@ -207,7 +207,7 @@ private slots:
 	void check2Changed(bool on);
 
 protected:
-	TQVBoxLayout *m_vtqlayout;
+	TQVBoxLayout *m_vlayout;
 
 private:
 	TQLabel *slow1;
@@ -557,7 +557,7 @@ protected slots:
 	void rightWallChanged(bool);
 
 protected:
-	TQVBoxLayout *m_vtqlayout;
+	TQVBoxLayout *m_vlayout;
 	TQCheckBox *top;
 	TQCheckBox *bot;
 	TQCheckBox *left;
diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp
index 99d86cf8..7a6f5c34 100644
--- a/kolf/kcomboboxdialog.cpp
+++ b/kolf/kcomboboxdialog.cpp
@@ -24,7 +24,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 #include <kcombobox.h>
@@ -124,8 +124,8 @@ TQString KComboBoxDialog::getText(const TQString &_caption, const TQString &_tex
 	KHistoryCombo * const box = dlg.comboBox();
 	box->setEditable(true);
 
-	const TQString historyItem = TQString("%1History").tqarg(configName);
-	const TQString completionItem = TQString("%1Completion").tqarg(configName);
+	const TQString historyItem = TQString("%1History").arg(configName);
+	const TQString completionItem = TQString("%1Completion").arg(configName);
 
 	if(!configName.isNull())
 	{
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 5e0ce023..0c9d9724 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -32,7 +32,7 @@
 #include <tqfileinfo.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 
 #include <stdlib.h>
@@ -65,7 +65,7 @@ Kolf::Kolf()
 	filename = TQString();
 	dummy = new TQWidget(this);
 	setCentralWidget(dummy);
-	tqlayout = new TQGridLayout(dummy, 3, 1);
+	layout = new TQGridLayout(dummy, 3, 1);
 
 	resize(420, 480);
 }
@@ -176,7 +176,7 @@ void Kolf::startNewGame()
 	players.clear();
 	delete scoreboard;
 	scoreboard = new ScoreBoard(dummy, "Score Board");
-	tqlayout->addWidget(scoreboard, 1, 0);
+	layout->addWidget(scoreboard, 1, 0);
 	scoreboard->show();
 
 	if (loadedGame.isNull())
@@ -264,7 +264,7 @@ void Kolf::startNewGame()
 	game->setShowGuideLine(showGuideLineAction->isChecked());
 	game->setSound(soundAction->isChecked());
 
-	tqlayout->addWidget(game, 0, 0, AlignCenter);
+	layout->addWidget(game, 0, 0, AlignCenter);
 
 	game->show();
 	game->setFocus();
@@ -372,7 +372,7 @@ void Kolf::createSpacer()
 	spacer = new KolfGame(obj, &spacerPlayers, KGlobal::dirs()->findResource("appdata", "intro"), dummy);
 	spacer->setSound(false);
 	spacer->startFirstHole(1);
-	tqlayout->addWidget(spacer, 0, 0, AlignCenter);
+	layout->addWidget(spacer, 0, 0, AlignCenter);
 	spacer->hidePutter();
 	spacer->ignoreEvents(true);
 
@@ -431,10 +431,10 @@ void Kolf::gameOver()
 		if (names.count() > 1)
 		{
 			TQString winners = names.join(i18n(" and "));
-			KMessageBox::information(this, i18n("%1 tied").tqarg(winners));
+			KMessageBox::information(this, i18n("%1 tied").arg(winners));
 		}
 		else
-			KMessageBox::information(this, i18n("%1 won!").tqarg(names.first()));
+			KMessageBox::information(this, i18n("%1 won!").arg(names.first()));
 	}
 
 	if (competition)
@@ -459,7 +459,7 @@ void Kolf::gameOver()
 			scoreDialog->addScore((*it).score, info, false, true);
 		}
 
-		scoreDialog->setComment(i18n("High Scores for %1").tqarg(courseInfo.name));
+		scoreDialog->setComment(i18n("High Scores for %1").arg(courseInfo.name));
 		scoreDialog->show();
 	}
 
@@ -475,7 +475,7 @@ void Kolf::showHighScores()
 	game->courseInfo(courseInfo, game->curFilename());
 
 	scoreDialog->setConfigGroup(courseInfo.untranslatedName + TQString(" Highscores"));
-	scoreDialog->setComment(i18n("High Scores for %1").tqarg(courseInfo.name));
+	scoreDialog->setComment(i18n("High Scores for %1").arg(courseInfo.name));
 	scoreDialog->show();
 }
 
@@ -537,7 +537,7 @@ void Kolf::saveGame()
 
 void Kolf::loadGame()
 {
-	loadedGame = KFileDialog::getOpenFileName(":savedkolf", TQString::tqfromLatin1("application/x-kolf"), this, i18n("Pick Kolf Saved Game"));
+	loadedGame = KFileDialog::getOpenFileName(":savedkolf", TQString::fromLatin1("application/x-kolf"), this, i18n("Pick Kolf Saved Game"));
 
 	if (loadedGame.isNull())
 		return;
@@ -572,7 +572,7 @@ void Kolf::openURL(KURL url)
 
 void Kolf::newPlayersTurn(Player *player)
 {
-	tempStatusBarText = i18n("%1's turn").tqarg(player->name());
+	tempStatusBarText = i18n("%1's turn").arg(player->name());
 
 	if (showInfoAction->isChecked())
 		statusBar()->message(tempStatusBarText, 5 * 1000);
@@ -601,7 +601,7 @@ void Kolf::editingStarted()
 
 	scoreboard->hide();
 
-	tqlayout->addWidget(editor, 1, 0);
+	layout->addWidget(editor, 1, 0);
 	editor->show();
 
 	clearHoleAction->setEnabled(true);
@@ -643,7 +643,7 @@ void Kolf::inPlayEnd()
 
 void Kolf::maxStrokesReached(const TQString &name)
 {
-	KMessageBox::sorry(this, i18n("%1's score has reached the maximum for this hole.").tqarg(name));
+	KMessageBox::sorry(this, i18n("%1's score has reached the maximum for this hole.").arg(name));
 }
 
 void Kolf::updateHoleMenu(int largest)
@@ -697,7 +697,7 @@ void Kolf::print()
 	KPrinter pr;
 	pr.addDialogPage(new PrintDialogPage());
 
-    if (pr.setup(this, i18n("Print %1 - Hole %2").tqarg(game->courseName()).tqarg(game->currentHole())))
+    if (pr.setup(this, i18n("Print %1 - Hole %2").arg(game->courseName()).arg(game->currentHole())))
 	{
 		pr.newPage();
 		if (game)
@@ -785,14 +785,14 @@ void Kolf::initPlugins()
 
 void Kolf::showPlugins()
 {
-	TQString text = TQString("<h2>%1</h2><ol>").tqarg(i18n("Currently Loaded Plugins"));
+	TQString text = TQString("<h2>%1</h2><ol>").arg(i18n("Currently Loaded Plugins"));
 	Object *object = 0;
 	for (object = plugins.first(); object; object = plugins.next())
 	{
 		text.append("<li>");
 		text.append(object->name());
 		text.append(" - ");
-		text.append(i18n("by %1").tqarg(object->author()));
+		text.append(i18n("by %1").arg(object->author()));
 		text.append("</li>");
 	}
 	text.append("</ol>");
diff --git a/kolf/kolf.h b/kolf/kolf.h
index 62892ea7..ea0f3c29 100644
--- a/kolf/kolf.h
+++ b/kolf/kolf.h
@@ -88,7 +88,7 @@ private:
 	TQString filename;
 	PlayerList players;
 	PlayerList spacerPlayers;
-	TQGridLayout *tqlayout;
+	TQGridLayout *layout;
 	ScoreBoard *scoreboard;
 	KToggleAction *editingAction;
 	KAction *newHoleAction;
diff --git a/kolf/main.cpp b/kolf/main.cpp
index 137121c4..4f15d026 100644
--- a/kolf/main.cpp
+++ b/kolf/main.cpp
@@ -57,16 +57,16 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
 			KolfGame::courseInfo(info, filename);
 
 			cout << info.name.latin1()
-			     << " - " << i18n("By %1").tqarg(info.author).latin1()
-			     << " - " << i18n("%1 holes").tqarg(info.holes).latin1()
-			     << " - " << i18n("par %1").tqarg(info.par).latin1()
+			     << " - " << i18n("By %1").arg(info.author).latin1()
+			     << " - " << i18n("%1 holes").arg(info.holes).latin1()
+			     << " - " << i18n("par %1").arg(info.par).latin1()
 			     << endl;
 
 			return 0;
 		}
 		else
 		{
-			KCmdLineArgs::usage(i18n("Course %1 does not exist.").tqarg(filename.latin1()));
+			KCmdLineArgs::usage(i18n("Course %1 does not exist.").arg(filename.latin1()));
 		}
 	}
 
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 8ee1f7c7..36bb795e 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -16,7 +16,7 @@
 #include <tqevent.h>
 #include <tqframe.h>
 #include <tqpen.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <klistbox.h>
 #include <tqstyle.h>
@@ -56,14 +56,14 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 
 	scroller = new TQScrollView(playerPage);
 	bigLayout->addWidget(scroller);
-	tqlayout = new TQVBox(scroller->viewport());
+	layout = new TQVBox(scroller->viewport());
 	if (!TQPixmapCache::find("grass", grass))
 	{
 		grass.load(locate("appdata", "pics/grass.png"));
 		TQPixmapCache::insert("grass", grass);
 	}
 	scroller->viewport()->setBackgroundPixmap(grass);
-	scroller->addChild(tqlayout);
+	scroller->addChild(layout);
 
 	TQMap<TQString, TQString> entries = config->entryMap("New Game Dialog");
 	unsigned int i = 0;
@@ -95,7 +95,7 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 		connect(coursesLink, TQT_SIGNAL(leftClickedURL(const TQString &)), kapp, TQT_SLOT(invokeBrowser(const TQString &)));
 		coursePageLayout->addWidget(coursesLink);
 
-		TQHBoxLayout *htqlayout = new TQHBoxLayout(coursePageLayout, spacingHint());
+		TQHBoxLayout *hlayout = new TQHBoxLayout(coursePageLayout, spacingHint());
 
 		// following use this group
 		config->setGroup("New Game Dialog Mode");
@@ -128,13 +128,13 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 		nameList.append(newName);
 
 		courseList = new KListBox(coursePage);
-		htqlayout->addWidget(courseList);
+		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()));
 
-		TQVBoxLayout *detailLayout = new TQVBoxLayout(htqlayout, spacingHint());
+		TQVBoxLayout *detailLayout = new TQVBoxLayout(hlayout, spacingHint());
 		name = new TQLabel(coursePage);
 		detailLayout->addWidget(name);
 		author = new TQLabel(coursePage);
@@ -170,15 +170,15 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 	
 	// options page
 	optionsPage = addPage(i18n("Options"), i18n("Game Options"));
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint());
+	TQVBoxLayout *vlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint());
 
 	mode = new TQCheckBox(i18n("&Strict mode"), optionsPage);
-	vtqlayout->addWidget(mode);
+	vlayout->addWidget(mode);
 	mode->setChecked(config->readBoolEntry("competition", false));
 
 	TQLabel *desc = new TQLabel(i18n("In strict mode, undo, editing, and switching holes is not allowed. This is generally for competition. Only in strict mode are highscores kept."), optionsPage);
 	desc->setTextFormat(RichText);
-	vtqlayout->addWidget(desc);
+	vlayout->addWidget(desc);
 }
 
 void NewGameDialog::slotOk()
@@ -212,11 +212,11 @@ void NewGameDialog::courseSelected(int index)
 
 	CourseInfo &curinfo = info[currentCourse];
 
-	name->setText(TQString("<strong>%1</strong>").tqarg(curinfo.name));
+	name->setText(TQString("<strong>%1</strong>").arg(curinfo.name));
 
-	author->setText(i18n("By %1").tqarg(curinfo.author));
-	par->setText(i18n("Par %1").tqarg(curinfo.par));
-	holes->setText(i18n("%1 Holes").tqarg(curinfo.holes));
+	author->setText(i18n("By %1").arg(curinfo.author));
+	par->setText(i18n("Par %1").arg(curinfo.par));
+	holes->setText(i18n("%1 Holes").arg(curinfo.holes));
 }
 
 void NewGameDialog::showHighscores()
@@ -224,7 +224,7 @@ void NewGameDialog::showHighscores()
 	KScoreDialog *scoreDialog = new KScoreDialog(KScoreDialog::Name | KScoreDialog::Custom1 | KScoreDialog::Score, this);
 	scoreDialog->addField(KScoreDialog::Custom1, i18n("Par"), "Par");
 	scoreDialog->setConfigGroup(info[currentCourse].untranslatedName + TQString(" Highscores"));
-	scoreDialog->setComment(i18n("High Scores for %1").tqarg(info[currentCourse].name));
+	scoreDialog->setComment(i18n("High Scores for %1").arg(info[currentCourse].name));
 	scoreDialog->show();
 }
 
@@ -253,7 +253,7 @@ void NewGameDialog::selectionChanged()
 
 void NewGameDialog::addCourse()
 {
-	TQStringList files = KFileDialog::getOpenFileNames(":kourses", TQString::tqfromLatin1("application/x-kourse"), this, i18n("Pick Kolf Course"));
+	TQStringList files = KFileDialog::getOpenFileNames(":kourses", TQString::fromLatin1("application/x-kourse"), this, i18n("Pick Kolf Course"));
 
 	bool hasDuplicates = false;
 
@@ -287,7 +287,7 @@ void NewGameDialog::addPlayer()
 	if (editors.count() >= startColors.count())
 		return;
 
-	editors.append(new PlayerEditor(i18n("Player %1").tqarg(editors.count() + 1), *startColors.at(editors.count()), tqlayout));
+	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 *)));
 
@@ -314,7 +314,7 @@ void NewGameDialog::enableButtons()
 PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *parent, const char *_name)
 	: TQWidget(parent, _name)
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialogBase::spacingHint());
+	TQHBoxLayout *layout = new TQHBoxLayout(this, KDialogBase::spacingHint());
 
 	if (!TQPixmapCache::find("grass", grass))
 	{
@@ -324,17 +324,17 @@ PlayerEditor::PlayerEditor(TQString startName, TQColor startColor, TQWidget *par
 	setBackgroundPixmap(grass);
 
 	editor = new KLineEdit(this);
-	tqlayout->addWidget(editor);
+	layout->addWidget(editor);
 	editor->setFrame(false);
 	editor->setText(startName);
-	tqlayout->addStretch();
-	tqlayout->addWidget(colorButton = new KColorButton(startColor, this));
+	layout->addStretch();
+	layout->addWidget(colorButton = new KColorButton(startColor, this));
 	colorButton->setAutoMask(true);
 	colorButton->setBackgroundPixmap(grass);
 
 	KPushButton *remove = new KPushButton(i18n("Remove"), this);
 	remove->setAutoMask(true);
-	tqlayout->addWidget(remove);
+	layout->addWidget(remove);
 	remove->setBackgroundPixmap(grass);
 	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeMe()));
 }
diff --git a/kolf/newgame.h b/kolf/newgame.h
index 4d0d1af5..9a8a7493 100644
--- a/kolf/newgame.h
+++ b/kolf/newgame.h
@@ -74,7 +74,7 @@ private slots:
 	void showHighscores();
 
 private:
-	TQVBox *tqlayout;
+	TQVBox *layout;
 	KPushButton *addButton;
 	TQFrame *playerPage;
 	TQScrollView *scroller;
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index 10a26b9c..8c75bda3 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -1,8 +1,8 @@
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqcanvas.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpainter.h>
 
 #include <klocale.h>
@@ -57,17 +57,17 @@ void PoolBall::draw(TQPainter &p)
 PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent)
 	: Config(parent), m_poolBall(poolBall)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	TQLabel *num = new TQLabel(i18n("Number:"), this);
-	tqlayout->addWidget(num);
+	layout->addWidget(num);
 	KIntNumInput *slider = new KIntNumInput(m_poolBall->number(), this);
 	slider->setRange(1, 15);
-	tqlayout->addWidget(slider);
+	layout->addWidget(slider);
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(numberChanged(int)));
 }
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index bb3af320..03256a07 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -1,8 +1,8 @@
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqcanvas.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqslider.h>
 
 #include <klocale.h>
@@ -41,7 +41,7 @@ void Test::advance(int phase)
 			// random color
 			const TQColor myColor((TQRgb)(kapp->random() % 0x01000000));
 
-			// set the brush, so our tqshape is drawn
+			// set the brush, so our shape is drawn
 			// with the random color
 			setBrush(TQBrush(myColor));
 
@@ -68,21 +68,21 @@ void Test::load(KConfig *cfg)
 TestConfig::TestConfig(Test *test, TQWidget *parent)
 	: Config(parent), m_test(test)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
-	tqlayout->addWidget(new TQLabel(i18n("Flash speed"), this));
+	layout->addWidget(new TQLabel(i18n("Flash speed"), this));
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
 	TQLabel *slow = new TQLabel(i18n("Slow"), this);
-	htqlayout->addWidget(slow);
+	hlayout->addWidget(slow);
 	TQSlider *slider = new TQSlider(1, 100, 5, 101 - m_test->switchEvery(), Qt::Horizontal, this);
-	htqlayout->addWidget(slider);
+	hlayout->addWidget(slider);
 	TQLabel *fast = new TQLabel(i18n("Fast"), this);
-	htqlayout->addWidget(fast);
+	hlayout->addWidget(fast);
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(switchEveryChanged(int)));
 }
diff --git a/kolf/printdialogpage.cpp b/kolf/printdialogpage.cpp
index e60de7ea..d5b4e807 100644
--- a/kolf/printdialogpage.cpp
+++ b/kolf/printdialogpage.cpp
@@ -1,5 +1,5 @@
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwidget.h>
 
 #include <klocale.h>
@@ -13,11 +13,11 @@ PrintDialogPage::PrintDialogPage(TQWidget *parent, const char *name)
 {
 	setTitle(i18n("Kolf Options"));
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
 	titleCheck = new TQCheckBox(i18n("Draw title text"), this);
 	titleCheck->setChecked(true);
-	tqlayout->addWidget(titleCheck);
+	layout->addWidget(titleCheck);
 }
 
 void PrintDialogPage::getOptions(TQMap<TQString, TQString> &opts, bool /*incldef*/)
diff --git a/kolf/scoreboard.cpp b/kolf/scoreboard.cpp
index 717dbc36..74bf786f 100644
--- a/kolf/scoreboard.cpp
+++ b/kolf/scoreboard.cpp
@@ -1,7 +1,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtable.h>
 #include <tqwidget.h>
 #include <tqheader.h>
diff --git a/kolf/slope.cpp b/kolf/slope.cpp
index e18c3a88..a6a1abf1 100644
--- a/kolf/slope.cpp
+++ b/kolf/slope.cpp
@@ -71,7 +71,7 @@ void Slope::showInfo()
 		arrow->setZ(z() + .01);
 		arrow->setVisible(true);
 	}
-	text->tqsetVisible(true);
+	text->setVisible(true);
 }
 
 void Slope::hideInfo()
@@ -80,7 +80,7 @@ void Slope::hideInfo()
 	Arrow *arrow = 0;
 	for (arrow = arrows.first(); arrow; arrow = arrows.next())
 		arrow->setVisible(false);
-	text->tqsetVisible(false);
+	text->setVisible(false);
 }
 
 void Slope::aboutToDie()
@@ -179,7 +179,7 @@ void Slope::moveArrow()
 
 void Slope::editModeChanged(bool changed)
 {
-	point->tqsetVisible(changed);
+	point->setVisible(changed);
 	moveBy(0, 0);
 }
 
@@ -521,7 +521,7 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent)
 	: Config(parent)
 {
 	this->slope = slope;
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
 	KComboBox *gradient = new KComboBox(this);
 	TQStringList items;
 	TQString curText;
@@ -533,28 +533,28 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent)
 	}
 	gradient->insertStringList(items);
 	gradient->setCurrentText(curText);
-	tqlayout->addWidget(gradient);
+	layout->addWidget(gradient);
 	connect(gradient, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setGradient(const TQString &)));
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	TQCheckBox *reversed = new TQCheckBox(i18n("Reverse direction"), this);
 	reversed->setChecked(slope->isReversed());
-	tqlayout->addWidget(reversed);
+	layout->addWidget(reversed);
 	connect(reversed, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setReversed(bool)));
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Grade:"), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Grade:"), this));
 	KDoubleNumInput *grade = new KDoubleNumInput(this);
 	grade->setRange(0, 8, 1, true);
 	grade->setValue(slope->curGrade());
-	htqlayout->addWidget(grade);
+	hlayout->addWidget(grade);
 	connect(grade, TQT_SIGNAL(valueChanged(double)), this, TQT_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());
-	tqlayout->addWidget(stuck);
+	layout->addWidget(stuck);
 	connect(stuck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStuckOnGround(bool)));
 }