Rename old tq methods that no longer need a unique name

6 files changed, 96 insertions, 96 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/game.cpp b/kolf/game.cpp
index 9ff1ed73..f590f0d2 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -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)
@@ -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);
 }
 
@@ -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);
 }
 
 /////////////////////////
@@ -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)
@@ -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();
 }
@@ -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;
@@ -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());
@@ -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);
@@ -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);
@@ -3310,7 +3310,7 @@ void KolfGame::sayWhosGoing()
 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));
@@ -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();
 
@@ -3455,7 +3455,7 @@ void KolfGame::showInfo()
 	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);
 }
@@ -3473,7 +3473,7 @@ void KolfGame::showInfoDlg(bool addDontShowAgain)
 void KolfGame::hideInfo()
 {
 	infoText->setText("");
-	infoText->tqsetVisible(false);
+	infoText->setVisible(false);
 
 	emit newStatusText(TQString());
 }
@@ -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)
@@ -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
@@ -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))
@@ -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)
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 5e0ce023..3707f12d 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -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;
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 8ee1f7c7..6bd6951b 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -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;
 
diff --git a/kolf/slope.cpp b/kolf/slope.cpp
index e18c3a88..9a2198f6 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);
 }