1 files changed, 16 insertions, 16 deletions

diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 0c9d9724..5e0ce023 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -32,7 +32,7 @@
 #include <tqfileinfo.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 #include <stdlib.h>
@@ -65,7 +65,7 @@ Kolf::Kolf()
 	filename = TQString();
 	dummy = new TQWidget(this);
 	setCentralWidget(dummy);
-	layout = new TQGridLayout(dummy, 3, 1);
+	tqlayout = 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");
-	layout->addWidget(scoreboard, 1, 0);
+	tqlayout->addWidget(scoreboard, 1, 0);
 	scoreboard->show();
 
 	if (loadedGame.isNull())
@@ -264,7 +264,7 @@ void Kolf::startNewGame()
 	game->setShowGuideLine(showGuideLineAction->isChecked());
 	game->setSound(soundAction->isChecked());
 
-	layout->addWidget(game, 0, 0, AlignCenter);
+	tqlayout->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);
-	layout->addWidget(spacer, 0, 0, AlignCenter);
+	tqlayout->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").arg(winners));
+			KMessageBox::information(this, i18n("%1 tied").tqarg(winners));
 		}
 		else
-			KMessageBox::information(this, i18n("%1 won!").arg(names.first()));
+			KMessageBox::information(this, i18n("%1 won!").tqarg(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").arg(courseInfo.name));
+		scoreDialog->setComment(i18n("High Scores for %1").tqarg(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").arg(courseInfo.name));
+	scoreDialog->setComment(i18n("High Scores for %1").tqarg(courseInfo.name));
 	scoreDialog->show();
 }
 
@@ -537,7 +537,7 @@ void Kolf::saveGame()
 
 void Kolf::loadGame()
 {
-	loadedGame = KFileDialog::getOpenFileName(":savedkolf", TQString::fromLatin1("application/x-kolf"), this, i18n("Pick Kolf Saved Game"));
+	loadedGame = KFileDialog::getOpenFileName(":savedkolf", TQString::tqfromLatin1("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").arg(player->name());
+	tempStatusBarText = i18n("%1's turn").tqarg(player->name());
 
 	if (showInfoAction->isChecked())
 		statusBar()->message(tempStatusBarText, 5 * 1000);
@@ -601,7 +601,7 @@ void Kolf::editingStarted()
 
 	scoreboard->hide();
 
-	layout->addWidget(editor, 1, 0);
+	tqlayout->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.").arg(name));
+	KMessageBox::sorry(this, i18n("%1's score has reached the maximum for this hole.").tqarg(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").arg(game->courseName()).arg(game->currentHole())))
+    if (pr.setup(this, i18n("Print %1 - Hole %2").tqarg(game->courseName()).tqarg(game->currentHole())))
 	{
 		pr.newPage();
 		if (game)
@@ -785,14 +785,14 @@ void Kolf::initPlugins()
 
 void Kolf::showPlugins()
 {
-	TQString text = TQString("<h2>%1</h2><ol>").arg(i18n("Currently Loaded Plugins"));
+	TQString text = TQString("<h2>%1</h2><ol>").tqarg(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").arg(object->author()));
+		text.append(i18n("by %1").tqarg(object->author()));
 		text.append("</li>");
 	}
 	text.append("</ol>");