TQt4 port kdegames

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 13 insertions, 12 deletions

diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index c2fe0718..18d3ca5b 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -54,20 +54,20 @@ void PoolBall::draw(TQPainter &p)
 	Ball::draw(p);
 }
 
-PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *parent)
-	: Config(parent), m_poolBall(poolBall)
+PoolBallConfig::PoolBallConfig(PoolBall *poolBall, TQWidget *tqparent)
+	: Config(tqparent), 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)));
 }
@@ -78,9 +78,9 @@ void PoolBallConfig::numberChanged(int newNumber)
 	changed();
 }
 
-Config *PoolBall::config(TQWidget *parent)
+Config *PoolBall::config(TQWidget *tqparent)
 {
-	return new PoolBallConfig(this, parent);
+	return new PoolBallConfig(this, tqparent);
 }
 
 #include "poolball.moc"
diff --git a/kolf/objects/poolball/poolball.h b/kolf/objects/poolball/poolball.h
index 82b1dd68..312e1996 100644
--- a/kolf/objects/poolball/poolball.h
+++ b/kolf/objects/poolball/poolball.h
@@ -15,7 +15,7 @@
 class StateDB;
 class KConfig;
 
-class PoolBallFactory : KLibFactory { Q_OBJECT public: TQObject *createObject(TQObject *, const char *, const char *, const TQStringList & = TQStringList()); };
+class PoolBallFactory : KLibFactory { TQ_OBJECT public: TQObject *createObject(TQObject *, const char *, const char *, const TQStringList & = TQStringList()); };
 
 class PoolBall : public Ball
 {
@@ -24,7 +24,7 @@ public:
 
 	virtual bool deleteable() const { return true; }
 
-	virtual Config *config(TQWidget *parent);
+	virtual Config *config(TQWidget *tqparent);
 	virtual void saveState(StateDB *);
 	virtual void save(KConfig *cfg);
 	virtual void loadState(StateDB *);
@@ -42,9 +42,10 @@ private:
 class PoolBallConfig : public Config
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	PoolBallConfig(PoolBall *poolBall, TQWidget *parent);
+	PoolBallConfig(PoolBall *poolBall, TQWidget *tqparent);
 
 private slots:
 	void numberChanged(int);