Remove additional unneeded tq method conversions

6 files changed, 39 insertions, 39 deletions

diff --git a/kolf/game.cpp b/kolf/game.cpp
index f590f0d2..a9a33f03 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -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);
 }
 
 /////////////////////////
@@ -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));
 		}
 
@@ -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;
 }
 
@@ -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)
 			{
@@ -3303,7 +3303,7 @@ 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");
 	}
 }
 
@@ -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));
 		}
 
@@ -3451,7 +3451,7 @@ 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
@@ -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());
 }
@@ -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()));
@@ -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;
@@ -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());
@@ -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);
@@ -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/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp
index 99d86cf8..5882e257 100644
--- a/kolf/kcomboboxdialog.cpp
+++ b/kolf/kcomboboxdialog.cpp
@@ -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 3707f12d..fba028cb 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -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();
 }
 
@@ -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);
@@ -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/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 6bd6951b..7251fa0c 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -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();
 }
 
@@ -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()), tqlayout));
 	editors.last()->show();
 	connect(editors.last(), TQT_SIGNAL(deleteEditor(PlayerEditor *)), this, TQT_SLOT(deleteEditor(PlayerEditor *)));
 
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index bb3af320..9a959694 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -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));