1 files changed, 13 insertions, 13 deletions

diff --git a/kolf/game.cpp b/kolf/game.cpp
index a6f02a79..32ebb9be 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -838,7 +838,7 @@ Puddle::Puddle(TQCanvas *canvas)
 	TQBrush brush;
 	TQPixmap pic;
 
-	if (!TQPixmapCache::tqfind("puddle", pic))
+	if (!TQPixmapCache::find("puddle", pic))
 	{
 		pic.load(locate("appdata", "pics/puddle.png"));
 		TQPixmapCache::insert("puddle", pic);
@@ -891,7 +891,7 @@ Sand::Sand(TQCanvas *canvas)
 	TQBrush brush;
 	TQPixmap pic;
 
-	if (!TQPixmapCache::tqfind("sand", pic))
+	if (!TQPixmapCache::find("sand", pic))
 	{
 		pic.load(locate("appdata", "pics/sand.png"));
 		TQPixmapCache::insert("sand", pic);
@@ -990,7 +990,7 @@ void Putter::setOrigin(int _x, int _y)
 
 void Putter::setAngle(Ball *ball)
 {
-	angle = angleMap.tqcontains(ball)? angleMap[ball] : 0;
+	angle = angleMap.contains(ball)? angleMap[ball] : 0;
 	finishMe();
 }
 
@@ -1182,7 +1182,7 @@ HoleResult Hole::result(TQPoint p, double s, bool * /*wasCenter*/)
 Cup::Cup(TQCanvas *canvas)
 	: Hole(TQColor("#808080"), canvas)
 {
-	if (!TQPixmapCache::tqfind("cup", pixmap))
+	if (!TQPixmapCache::find("cup", pixmap))
 	{
 		pixmap.load(locate("appdata", "pics/cup.png"));
 		TQPixmapCache::insert("cup", pixmap);
@@ -2207,7 +2207,7 @@ KolfGame::KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWi
 	course->resize(width, height);
 
 	TQPixmap pic;
-	if (!TQPixmapCache::tqfind("grass", pic))
+	if (!TQPixmapCache::find("grass", pic))
 	{
 		pic.load(locate("appdata", "pics/grass.png"));
 		TQPixmapCache::insert("grass", pic);
@@ -2430,7 +2430,7 @@ void KolfGame::handleMousePressEvent(TQMouseEvent *e)
 			return;
 		}
 		// only items we keep track of
-		if ((!(items.tqcontainsRef(list.first()) || list.first() == whiteBall || extraMoveable.tqcontainsRef(list.first()))))
+		if ((!(items.containsRef(list.first()) || list.first() == whiteBall || extraMoveable.containsRef(list.first()))))
 		{
 			emit newSelectedItem(&holeInfo);
 			return;
@@ -2785,7 +2785,7 @@ void KolfGame::timeout()
 	// later undo the shot
 	for (PlayerList::Iterator it = players->begin(); it != players->end(); ++it)
 	{
-		if (!course->rect().tqcontains(TQPoint((*it).ball()->x(), (*it).ball()->y())))
+		if (!course->rect().contains(TQPoint((*it).ball()->x(), (*it).ball()->y())))
 		{
 			(*it).ball()->setState(Stopped);
 
@@ -3533,12 +3533,12 @@ void KolfGame::openFile()
 		cfg->setGroup(*it);
 
 		const int len = (*it).length();
-		const int dashIndex = (*it).tqfind("-");
+		const int dashIndex = (*it).find("-");
 		const int holeNum = (*it).left(dashIndex).toInt();
 		if (holeNum > _highestHole)
 			_highestHole = holeNum;
 
-		const int atIndex = (*it).tqfind("@");
+		const int atIndex = (*it).find("@");
 		const TQString name = (*it).mid(dashIndex + 1, atIndex - (dashIndex + 1));
 
 		if (holeNum != curHole)
@@ -3552,8 +3552,8 @@ void KolfGame::openFile()
 		numItems++;
 
 
-		const int commaIndex = (*it).tqfind(",");
-		const int pipeIndex = (*it).tqfind("|");
+		const int commaIndex = (*it).find(",");
+		const int pipeIndex = (*it).find("|");
 		const int x = (*it).mid(atIndex + 1, commaIndex - (atIndex + 1)).toInt();
 		const int y = (*it).mid(commaIndex + 1, pipeIndex - (commaIndex + 1)).toInt();
 
@@ -3610,7 +3610,7 @@ void KolfGame::openFile()
 			break;
 		}
 
-		if (!loaded && name != "hole" && missingPlugins.tqcontains(name) <= 0)
+		if (!loaded && name != "hole" && missingPlugins.contains(name) <= 0)
 			missingPlugins.append(name);
 	}
 
@@ -3978,7 +3978,7 @@ void KolfGame::save()
 	// wipe out all groups from this hole
 	for (TQStringList::Iterator it = groups.begin(); it != groups.end(); ++it)
 	{
-		int holeNum = (*it).left((*it).tqfind("-")).toInt();
+		int holeNum = (*it).left((*it).find("-")).toInt();
 		if (holeNum == curHole)
 			cfg->deleteGroup(*it);
 	}