Rename obsolete tq methods to standard names

14 files changed, 110 insertions, 110 deletions

diff --git a/kolf/config.cpp b/kolf/config.cpp
index 0d9aafae..7c333755 100644
--- a/kolf/config.cpp
+++ b/kolf/config.cpp
@@ -36,8 +36,8 @@ void Config::changed()
 MessageConfig::MessageConfig(TQString text, TQWidget *parent, const char *name)
 	: Config(parent, name)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
-	tqlayout->addWidget(new TQLabel(text, this));
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	layout->addWidget(new TQLabel(text, this));
 }
 
 DefaultConfig::DefaultConfig(TQWidget *parent, const char *name)
diff --git a/kolf/editor.cpp b/kolf/editor.cpp
index ab8b1d0c..ae9cde32 100644
--- a/kolf/editor.cpp
+++ b/kolf/editor.cpp
@@ -15,13 +15,13 @@ Editor::Editor(ObjectList *list, TQWidget *parent, const char *name)
 	this->list = list;
 	config = 0;
 
-	htqlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, KDialog::spacingHint());
-	vtqlayout->addWidget(new TQLabel(i18n("Add object:"), this));
+	TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint());
+	vlayout->addWidget(new TQLabel(i18n("Add object:"), this));
 	listbox = new KListBox(this, "Listbox");
-	vtqlayout->addWidget(listbox);
-	htqlayout->setStretchFactor(vtqlayout, 2);
+	vlayout->addWidget(listbox);
+	hlayout->setStretchFactor(vlayout, 2);
 
 	TQStringList items;
 	Object *obj = 0;
@@ -49,8 +49,8 @@ void Editor::setItem(CanvasItem *item)
 	if (!config)
 		return;
 	config->ctorDone();
-	htqlayout->addWidget(config);
-	htqlayout->setStretchFactor(config, 2);
+	hlayout->addWidget(config);
+	hlayout->setStretchFactor(config, 2);
 	config->setFrameStyle(TQFrame::Box | TQFrame::Raised);
 	config->setLineWidth(1);
 	config->show();
diff --git a/kolf/editor.h b/kolf/editor.h
index 8ee1b93a..e61e73cf 100644
--- a/kolf/editor.h
+++ b/kolf/editor.h
@@ -30,7 +30,7 @@ private slots:
 
 private:
 	ObjectList *list;
-	TQHBoxLayout *htqlayout;
+	TQHBoxLayout *hlayout;
 	KListBox *listbox;
 	Config *config;
 };
diff --git a/kolf/floater.cpp b/kolf/floater.cpp
index fe6e6344..ff42398a 100644
--- a/kolf/floater.cpp
+++ b/kolf/floater.cpp
@@ -257,14 +257,14 @@ FloaterConfig::FloaterConfig(Floater *floater, TQWidget *parent)
 	: BridgeConfig(floater, parent)
 {
 	this->floater = floater;
-	m_vtqlayout->addStretch();
+	m_vlayout->addStretch();
 
-	m_vtqlayout->addWidget(new TQLabel(i18n("Moving speed"), this));
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Slow"), this));
+	m_vlayout->addWidget(new TQLabel(i18n("Moving speed"), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Slow"), this));
 	TQSlider *slider = new TQSlider(0, 20, 2, floater->curSpeed(), Qt::Horizontal, this);
-	htqlayout->addWidget(slider);
-	htqlayout->addWidget(new TQLabel(i18n("Fast"), this));
+	hlayout->addWidget(slider);
+	hlayout->addWidget(new TQLabel(i18n("Fast"), this));
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int)));
 }
 
diff --git a/kolf/game.cpp b/kolf/game.cpp
index a9a33f03..80ede233 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -197,23 +197,23 @@ BridgeConfig::BridgeConfig(Bridge *bridge, TQWidget *parent)
 {
 	this->bridge = bridge;
 
-	m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
-	TQGridLayout *tqlayout = new TQGridLayout(m_vtqlayout, 2, 3, spacingHint());
-	tqlayout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0);
+	m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQGridLayout *layout = new TQGridLayout(m_vlayout, 2, 3, spacingHint());
+	layout->addWidget(new TQLabel(i18n("Walls on:"), this), 0, 0);
 	top = new TQCheckBox(i18n("&Top"), this);
-	tqlayout->addWidget(top, 0, 1);
+	layout->addWidget(top, 0, 1);
 	connect(top, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(topWallChanged(bool)));
 	top->setChecked(bridge->topWallVisible());
 	bot = new TQCheckBox(i18n("&Bottom"), this);
-	tqlayout->addWidget(bot, 1, 1);
+	layout->addWidget(bot, 1, 1);
 	connect(bot, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(botWallChanged(bool)));
 	bot->setChecked(bridge->botWallVisible());
 	left = new TQCheckBox(i18n("&Left"), this);
-	tqlayout->addWidget(left, 1, 0);
+	layout->addWidget(left, 1, 0);
 	connect(left, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(leftWallChanged(bool)));
 	left->setChecked(bridge->leftWallVisible());
 	right = new TQCheckBox(i18n("&Right"), this);
-	tqlayout->addWidget(right, 1, 2);
+	layout->addWidget(right, 1, 2);
 	connect(right, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rightWallChanged(bool)));
 	right->setChecked(bridge->rightWallVisible());
 }
@@ -405,18 +405,18 @@ WindmillConfig::WindmillConfig(Windmill *windmill, TQWidget *parent)
 	: BridgeConfig(windmill, parent)
 {
 	this->windmill = windmill;
-	m_vtqlayout->addStretch();
+	m_vlayout->addStretch();
 
 	TQCheckBox *check = new TQCheckBox(i18n("Windmill on bottom"), this);
 	check->setChecked(windmill->bottom());
 	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(endChanged(bool)));
-	m_vtqlayout->addWidget(check);
+	m_vlayout->addWidget(check);
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Slow"), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Slow"), this));
 	TQSlider *slider = new TQSlider(1, 10, 1, windmill->curSpeed(), Qt::Horizontal, this);
-	htqlayout->addWidget(slider);
-	htqlayout->addWidget(new TQLabel(i18n("Fast"), this));
+	hlayout->addWidget(slider);
+	hlayout->addWidget(new TQLabel(i18n("Fast"), this));
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(speedChanged(int)));
 
 	endChanged(check->isChecked());
@@ -643,10 +643,10 @@ SignConfig::SignConfig(Sign *sign, TQWidget *parent)
 	: BridgeConfig(sign, parent)
 {
 	this->sign = sign;
-	m_vtqlayout->addStretch();
-	m_vtqlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this));
+	m_vlayout->addStretch();
+	m_vlayout->addWidget(new TQLabel(i18n("Sign HTML:"), this));
 	KLineEdit *name = new KLineEdit(sign->text(), this);
-	m_vtqlayout->addWidget(name);
+	m_vlayout->addWidget(name);
 	connect(name, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &)));
 }
 
@@ -663,20 +663,20 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent)
 {
 	this->ellipse = ellipse;
 
-	m_vtqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	m_vlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
 	TQCheckBox *check = new TQCheckBox(i18n("Enable show/hide"), this);
-	m_vtqlayout->addWidget(check);
+	m_vlayout->addWidget(check);
 	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(check1Changed(bool)));
 	check->setChecked(ellipse->changeEnabled());
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(m_vtqlayout, spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(m_vlayout, spacingHint());
 	slow1 = new TQLabel(i18n("Slow"), this);
-	htqlayout->addWidget(slow1);
+	hlayout->addWidget(slow1);
 	slider1 = new TQSlider(1, 100, 5, 100 - ellipse->changeEvery(), Qt::Horizontal, this);
-	htqlayout->addWidget(slider1);
+	hlayout->addWidget(slider1);
 	fast1 = new TQLabel(i18n("Fast"), this);
-	htqlayout->addWidget(fast1);
+	hlayout->addWidget(fast1);
 
 	connect(slider1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(value1Changed(int)));
 
@@ -684,7 +684,7 @@ EllipseConfig::EllipseConfig(Ellipse *ellipse, TQWidget *parent)
 
 	// TODO add slider2 and friends and make it possible for ellipses to grow and contract
 
-	m_vtqlayout->addStretch();
+	m_vlayout->addStretch();
 }
 
 void EllipseConfig::value1Changed(int news)
@@ -1503,30 +1503,30 @@ BlackHoleConfig::BlackHoleConfig(BlackHole *blackHole, TQWidget *parent)
 	: Config(parent)
 {
 	this->blackHole = blackHole;
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
-	tqlayout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this));
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	layout->addWidget(new TQLabel(i18n("Exiting ball angle:"), this));
 	TQSpinBox *deg = new TQSpinBox(0, 359, 10, this);
 	deg->setSuffix(TQString(" ") + i18n("degrees"));
 	deg->setValue(blackHole->curExitDeg());
 	deg->setWrapping(true);
-	tqlayout->addWidget(deg);
+	layout->addWidget(deg);
 	connect(deg, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(degChanged(int)));
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Minimum exit speed:"), this));
 	KDoubleNumInput *min = new KDoubleNumInput(this);
 	min->setRange(0, 8, 1, true);
-	htqlayout->addWidget(min);
+	hlayout->addWidget(min);
 	connect(min, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(minChanged(double)));
 	min->setValue(blackHole->minSpeed());
 
-	htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
+	hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
 	KDoubleNumInput *max = new KDoubleNumInput(this);
 	max->setRange(1, 10, 1, true);
-	htqlayout->addWidget(max);
+	hlayout->addWidget(max);
 	connect(max, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(maxChanged(double)));
 	max->setValue(blackHole->maxSpeed());
 }
@@ -1959,42 +1959,42 @@ HoleConfig::HoleConfig(HoleInfo *holeInfo, TQWidget *parent)
 {
 	this->holeInfo = holeInfo;
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Course name: "), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Course name: "), this));
 	KLineEdit *nameEdit = new KLineEdit(holeInfo->untranslatedName(), this);
-	htqlayout->addWidget(nameEdit);
+	hlayout->addWidget(nameEdit);
 	connect(nameEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &)));
 
-	htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Course author: "), this));
+	hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Course author: "), this));
 	KLineEdit *authorEdit = new KLineEdit(holeInfo->author(), this);
-	htqlayout->addWidget(authorEdit);
+	hlayout->addWidget(authorEdit);
 	connect(authorEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(authorChanged(const TQString &)));
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
-	htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Par:"), this));
+	hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Par:"), this));
 	TQSpinBox *par = new TQSpinBox(1, 15, 1, this);
 	par->setValue(holeInfo->par());
-	htqlayout->addWidget(par);
+	hlayout->addWidget(par);
 	connect(par, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(parChanged(int)));
-	htqlayout->addStretch();
+	hlayout->addStretch();
 
-	htqlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
+	hlayout->addWidget(new TQLabel(i18n("Maximum:"), this));
 	TQSpinBox *maxstrokes = new TQSpinBox(holeInfo->lowestMaxStrokes(), 30, 1, this);
 	TQWhatsThis::add(maxstrokes, i18n("Maximum number of strokes player can take on this hole."));
 	TQToolTip::add(maxstrokes, i18n("Maximum number of strokes"));
 	maxstrokes->setSpecialValueText(i18n("Unlimited"));
 	maxstrokes->setValue(holeInfo->maxStrokes());
-	htqlayout->addWidget(maxstrokes);
+	hlayout->addWidget(maxstrokes);
 	connect(maxstrokes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(maxStrokesChanged(int)));
 
 	TQCheckBox *check = new TQCheckBox(i18n("Show border walls"), this);
 	check->setChecked(holeInfo->borderWalls());
-	tqlayout->addWidget(check);
+	layout->addWidget(check);
 	connect(check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(borderWallsChanged(bool)));
 }
 
diff --git a/kolf/game.h b/kolf/game.h
index e1766802..136ac1d7 100644
--- a/kolf/game.h
+++ b/kolf/game.h
@@ -207,7 +207,7 @@ private slots:
 	void check2Changed(bool on);
 
 protected:
-	TQVBoxLayout *m_vtqlayout;
+	TQVBoxLayout *m_vlayout;
 
 private:
 	TQLabel *slow1;
@@ -557,7 +557,7 @@ protected slots:
 	void rightWallChanged(bool);
 
 protected:
-	TQVBoxLayout *m_vtqlayout;
+	TQVBoxLayout *m_vlayout;
 	TQCheckBox *top;
 	TQCheckBox *bot;
 	TQCheckBox *left;
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index fba028cb..246403b9 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -65,7 +65,7 @@ Kolf::Kolf()
 	filename = TQString();
 	dummy = new TQWidget(this);
 	setCentralWidget(dummy);
-	tqlayout = new TQGridLayout(dummy, 3, 1);
+	layout = 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");
-	tqlayout->addWidget(scoreboard, 1, 0);
+	layout->addWidget(scoreboard, 1, 0);
 	scoreboard->show();
 
 	if (loadedGame.isNull())
@@ -264,7 +264,7 @@ void Kolf::startNewGame()
 	game->setShowGuideLine(showGuideLineAction->isChecked());
 	game->setSound(soundAction->isChecked());
 
-	tqlayout->addWidget(game, 0, 0, AlignCenter);
+	layout->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);
-	tqlayout->addWidget(spacer, 0, 0, AlignCenter);
+	layout->addWidget(spacer, 0, 0, AlignCenter);
 	spacer->hidePutter();
 	spacer->ignoreEvents(true);
 
@@ -601,7 +601,7 @@ void Kolf::editingStarted()
 
 	scoreboard->hide();
 
-	tqlayout->addWidget(editor, 1, 0);
+	layout->addWidget(editor, 1, 0);
 	editor->show();
 
 	clearHoleAction->setEnabled(true);
diff --git a/kolf/kolf.h b/kolf/kolf.h
index 62892ea7..ea0f3c29 100644
--- a/kolf/kolf.h
+++ b/kolf/kolf.h
@@ -88,7 +88,7 @@ private:
 	TQString filename;
 	PlayerList players;
 	PlayerList spacerPlayers;
-	TQGridLayout *tqlayout;
+	TQGridLayout *layout;
 	ScoreBoard *scoreboard;
 	KToggleAction *editingAction;
 	KAction *newHoleAction;
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index 7251fa0c..493b00fd 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -56,14 +56,14 @@ NewGameDialog::NewGameDialog(bool enableCourses, TQWidget *parent, const char *_
 
 	scroller = new TQScrollView(playerPage);
 	bigLayout->addWidget(scroller);
-	tqlayout = new TQVBox(scroller->viewport());
+	layout = 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(tqlayout);
+	scroller->addChild(layout);
 
 	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 *htqlayout = new TQHBoxLayout(coursePageLayout, spacingHint());
+		TQHBoxLayout *hlayout = 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);
-		htqlayout->addWidget(courseList);
+		hlayout->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(htqlayout, spacingHint());
+		TQVBoxLayout *detailLayout = new TQVBoxLayout(hlayout, 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 *vtqlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint());
+	TQVBoxLayout *vlayout = new TQVBoxLayout(optionsPage, marginHint(), spacingHint());
 
 	mode = new TQCheckBox(i18n("&Strict mode"), optionsPage);
-	vtqlayout->addWidget(mode);
+	vlayout->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);
-	vtqlayout->addWidget(desc);
+	vlayout->addWidget(desc);
 }
 
 void NewGameDialog::slotOk()
@@ -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()), tqlayout));
+	editors.append(new PlayerEditor(i18n("Player %1").arg(editors.count() + 1), *startColors.at(editors.count()), layout));
 	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 *tqlayout = new TQHBoxLayout(this, KDialogBase::spacingHint());
+	TQHBoxLayout *layout = 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);
-	tqlayout->addWidget(editor);
+	layout->addWidget(editor);
 	editor->setFrame(false);
 	editor->setText(startName);
-	tqlayout->addStretch();
-	tqlayout->addWidget(colorButton = new KColorButton(startColor, this));
+	layout->addStretch();
+	layout->addWidget(colorButton = new KColorButton(startColor, this));
 	colorButton->setAutoMask(true);
 	colorButton->setBackgroundPixmap(grass);
 
 	KPushButton *remove = new KPushButton(i18n("Remove"), this);
 	remove->setAutoMask(true);
-	tqlayout->addWidget(remove);
+	layout->addWidget(remove);
 	remove->setBackgroundPixmap(grass);
 	connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeMe()));
 }
diff --git a/kolf/newgame.h b/kolf/newgame.h
index 4d0d1af5..9a8a7493 100644
--- a/kolf/newgame.h
+++ b/kolf/newgame.h
@@ -74,7 +74,7 @@ private slots:
 	void showHighscores();
 
 private:
-	TQVBox *tqlayout;
+	TQVBox *layout;
 	KPushButton *addButton;
 	TQFrame *playerPage;
 	TQScrollView *scroller;
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index 10a26b9c..c2fe0718 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -57,17 +57,17 @@ void PoolBall::draw(TQPainter &p)
 PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent)
 	: Config(parent), m_poolBall(poolBall)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	TQLabel *num = new TQLabel(i18n("Number:"), this);
-	tqlayout->addWidget(num);
+	layout->addWidget(num);
 	KIntNumInput *slider = new KIntNumInput(m_poolBall->number(), this);
 	slider->setRange(1, 15);
-	tqlayout->addWidget(slider);
+	layout->addWidget(slider);
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(numberChanged(int)));
 }
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index 9a959694..eabc2e7e 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -68,21 +68,21 @@ void Test::load(KConfig *cfg)
 TestConfig::TestConfig(Test *test, TQWidget *parent)
 	: Config(parent), m_test(test)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
-	tqlayout->addWidget(new TQLabel(i18n("Flash speed"), this));
+	layout->addWidget(new TQLabel(i18n("Flash speed"), this));
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
 	TQLabel *slow = new TQLabel(i18n("Slow"), this);
-	htqlayout->addWidget(slow);
+	hlayout->addWidget(slow);
 	TQSlider *slider = new TQSlider(1, 100, 5, 101 - m_test->switchEvery(), Qt::Horizontal, this);
-	htqlayout->addWidget(slider);
+	hlayout->addWidget(slider);
 	TQLabel *fast = new TQLabel(i18n("Fast"), this);
-	htqlayout->addWidget(fast);
+	hlayout->addWidget(fast);
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(switchEveryChanged(int)));
 }
diff --git a/kolf/printdialogpage.cpp b/kolf/printdialogpage.cpp
index e60de7ea..e8733c81 100644
--- a/kolf/printdialogpage.cpp
+++ b/kolf/printdialogpage.cpp
@@ -13,11 +13,11 @@ PrintDialogPage::PrintDialogPage(TQWidget *parent, const char *name)
 {
 	setTitle(i18n("Kolf Options"));
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
 	titleCheck = new TQCheckBox(i18n("Draw title text"), this);
 	titleCheck->setChecked(true);
-	tqlayout->addWidget(titleCheck);
+	layout->addWidget(titleCheck);
 }
 
 void PrintDialogPage::getOptions(TQMap<TQString, TQString> &opts, bool /*incldef*/)
diff --git a/kolf/slope.cpp b/kolf/slope.cpp
index 9a2198f6..a6a1abf1 100644
--- a/kolf/slope.cpp
+++ b/kolf/slope.cpp
@@ -521,7 +521,7 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent)
 	: Config(parent)
 {
 	this->slope = slope;
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
 	KComboBox *gradient = new KComboBox(this);
 	TQStringList items;
 	TQString curText;
@@ -533,28 +533,28 @@ SlopeConfig::SlopeConfig(Slope *slope, TQWidget *parent)
 	}
 	gradient->insertStringList(items);
 	gradient->setCurrentText(curText);
-	tqlayout->addWidget(gradient);
+	layout->addWidget(gradient);
 	connect(gradient, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setGradient(const TQString &)));
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	TQCheckBox *reversed = new TQCheckBox(i18n("Reverse direction"), this);
 	reversed->setChecked(slope->isReversed());
-	tqlayout->addWidget(reversed);
+	layout->addWidget(reversed);
 	connect(reversed, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setReversed(bool)));
 
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
-	htqlayout->addWidget(new TQLabel(i18n("Grade:"), this));
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
+	hlayout->addWidget(new TQLabel(i18n("Grade:"), this));
 	KDoubleNumInput *grade = new KDoubleNumInput(this);
 	grade->setRange(0, 8, 1, true);
 	grade->setValue(slope->curGrade());
-	htqlayout->addWidget(grade);
+	hlayout->addWidget(grade);
 	connect(grade, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(gradeChanged(double)));
 
 	TQCheckBox *stuck = new TQCheckBox(i18n("Unmovable"), this);
 	TQWhatsThis::add(stuck, i18n("Whether or not this slope can be moved by other objects, like floaters."));
 	stuck->setChecked(slope->isStuckOnGround());
-	tqlayout->addWidget(stuck);
+	layout->addWidget(stuck);
 	connect(stuck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStuckOnGround(bool)));
 }