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

This reverts commit 97d1732e257f8700488d7ca1660ae7eba8fc6065.

2 files changed, 18 insertions, 18 deletions

diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index 8c75bda3..10a26b9c 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -1,8 +1,8 @@
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqcanvas.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 
 #include <klocale.h>
@@ -57,17 +57,17 @@ void PoolBall::draw(TQPainter &p)
 PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent)
 	: Config(parent), m_poolBall(poolBall)
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
-	layout->addStretch();
+	tqlayout->addStretch();
 
 	TQLabel *num = new TQLabel(i18n("Number:"), this);
-	layout->addWidget(num);
+	tqlayout->addWidget(num);
 	KIntNumInput *slider = new KIntNumInput(m_poolBall->number(), this);
 	slider->setRange(1, 15);
-	layout->addWidget(slider);
+	tqlayout->addWidget(slider);
 
-	layout->addStretch();
+	tqlayout->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 03256a07..bb3af320 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -1,8 +1,8 @@
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcolor.h>
 #include <tqcanvas.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 
 #include <klocale.h>
@@ -41,7 +41,7 @@ void Test::advance(int phase)
 			// random color
 			const TQColor myColor((TQRgb)(kapp->random() % 0x01000000));
 
-			// set the brush, so our shape is drawn
+			// set the brush, so our tqshape is drawn
 			// with the random color
 			setBrush(TQBrush(myColor));
 
@@ -68,21 +68,21 @@ void Test::load(KConfig *cfg)
 TestConfig::TestConfig(Test *test, TQWidget *parent)
 	: Config(parent), m_test(test)
 {
-	TQVBoxLayout *layout = new TQVBoxLayout(this, marginHint(), spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, marginHint(), spacingHint());
 
-	layout->addStretch();
+	tqlayout->addStretch();
 
-	layout->addWidget(new TQLabel(i18n("Flash speed"), this));
+	tqlayout->addWidget(new TQLabel(i18n("Flash speed"), this));
 
-	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, spacingHint());
+	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, spacingHint());
 	TQLabel *slow = new TQLabel(i18n("Slow"), this);
-	hlayout->addWidget(slow);
+	htqlayout->addWidget(slow);
 	TQSlider *slider = new TQSlider(1, 100, 5, 101 - m_test->switchEvery(), Qt::Horizontal, this);
-	hlayout->addWidget(slider);
+	htqlayout->addWidget(slider);
 	TQLabel *fast = new TQLabel(i18n("Fast"), this);
-	hlayout->addWidget(fast);
+	htqlayout->addWidget(fast);
 
-	layout->addStretch();
+	tqlayout->addStretch();
 
 	connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(switchEveryChanged(int)));
 }