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

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

1 files changed, 21 insertions, 21 deletions

diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 36bb795e..8ee1f7c7 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -16,7 +16,7 @@
 #include <tqevent.h>
 #include <tqframe.h>
 #include <tqpen.h>
-#include <layout.h>
+#include <tqlayout.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);
-	layout = new TQVBox(scroller->viewport());
+	tqlayout = 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(layout);
+	scroller->addChild(tqlayout);
 
 	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 *hlayout = new TQHBoxLayout(coursePageLayout, spacingHint());
+		TQHBoxLayout *htqlayout = 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);
-		hlayout->addWidget(courseList);
+		htqlayout->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(hlayout, spacingHint());
+		TQVBoxLayout *detailLayout = new TQVBoxLayout(htqlayout, 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 *vlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint());
+	TQVBoxLayout *vtqlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint());
 
 	mode = new TQCheckBox(i18n("&Strict mode"), optionsPage);
-	vlayout->addWidget(mode);
+	vtqlayout->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);
-	vlayout->addWidget(desc);
+	vtqlayout->addWidget(desc);
 }
 
 void NewGameDialog::slotOk()
@@ -212,11 +212,11 @@ void NewGameDialog::courseSelected(int index)
 
 	CourseInfo &curinfo = info[currentCourse];
 
-	name->setText(TQString("<strong>%1</strong>").arg(curinfo.name));
+	name->setText(TQString("<strong>%1</strong>").tqarg(curinfo.name));
 
-	author->setText(i18n("By %1").arg(curinfo.author));
-	par->setText(i18n("Par %1").arg(curinfo.par));
-	holes->setText(i18n("%1 Holes").arg(curinfo.holes));
+	author->setText(i18n("By %1").tqarg(curinfo.author));
+	par->setText(i18n("Par %1").tqarg(curinfo.par));
+	holes->setText(i18n("%1 Holes").tqarg(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").arg(info[currentCourse].name));
+	scoreDialog->setComment(i18n("High Scores for %1").tqarg(info[currentCourse].name));
 	scoreDialog->show();
 }
 
@@ -253,7 +253,7 @@ void NewGameDialog::selectionChanged()
 
 void NewGameDialog::addCourse()
 {
-	TQStringList files = KFileDialog::getOpenFileNames(":kourses", TQString::fromLatin1("application/x-kourse"), this, i18n("Pick Kolf Course"));
+	TQStringList files = KFileDialog::getOpenFileNames(":kourses", TQString::tqfromLatin1("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").arg(editors.count() + 1), *startColors.at(editors.count()), layout));
+	editors.append(new PlayerEditor(i18n("Player %1").tqarg(editors.count() + 1), *startColors.at(editors.count()), tqlayout));
 	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 *layout = new TQHBoxLayout(this, KDialogBase::spacingHint());
+	TQHBoxLayout *tqlayout = 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);
-	layout->addWidget(editor);
+	tqlayout->addWidget(editor);
 	editor->setFrame(false);
 	editor->setText(startName);
-	layout->addStretch();
-	layout->addWidget(colorButton = new KColorButton(startColor, this));
+	tqlayout->addStretch();
+	tqlayout->addWidget(colorButton = new KColorButton(startColor, this));
 	colorButton->setAutoMask(true);
 	colorButton->setBackgroundPixmap(grass);
 
 	KPushButton *remove = new KPushButton(i18n("Remove"), this);
 	remove->setAutoMask(true);
-	layout->addWidget(remove);
+	tqlayout->addWidget(remove);
 	remove->setBackgroundPixmap(grass);
 	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeMe()));
 }