summaryrefslogtreecommitdiffstats
path: root/kolf/objects
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:58:26 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:58:26 +0000
commit838baf3f99ec5ab81b063eb5449a3381d860f377 (patch)
treedd31abcfde08ca92e4623b8f50b3d762a87c997a /kolf/objects
parent2bf598bafa22fac4126fc8842df6b0119aadc0e9 (diff)
downloadtdegames-838baf3f99ec5ab81b063eb5449a3381d860f377.tar.gz
tdegames-838baf3f99ec5ab81b063eb5449a3381d860f377.zip
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
Diffstat (limited to 'kolf/objects')
-rw-r--r--kolf/objects/poolball/poolball.cpp18
-rw-r--r--kolf/objects/poolball/poolball.h7
-rw-r--r--kolf/objects/test/test.cpp30
-rw-r--r--kolf/objects/test/test.h7
4 files changed, 32 insertions, 30 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);
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index d417f552..38a40f22 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -14,7 +14,7 @@
#include "test.h"
K_EXPORT_COMPONENT_FACTORY(libkolftest, TestFactory)
-TQObject *TestFactory::createObject (TQObject * /*parent*/, const char * /*name*/, const char * /*classname*/, const TQStringList & /*args*/)
+TQObject *TestFactory::createObject (TQObject * /*tqparent*/, const char * /*name*/, const char * /*classname*/, const TQStringList & /*args*/)
{ return new TestObj; }
Test::Test(TQCanvas *canvas)
@@ -39,9 +39,9 @@ void Test::advance(int phase)
if (count % m_switchEvery == 0)
{
// random color
- const TQColor myColor((QRgb)(kapp->random() % 0x01000000));
+ 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));
@@ -65,24 +65,24 @@ void Test::load(KConfig *cfg)
setSwitchEvery(cfg->readNumEntry("switchEvery", 50));
}
-TestConfig::TestConfig(Test *test, TQWidget *parent)
- : Config(parent), m_test(test)
+TestConfig::TestConfig(Test *test, TQWidget *tqparent)
+ : Config(tqparent), 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)));
}
@@ -96,9 +96,9 @@ void TestConfig::switchEveryChanged(int news)
changed();
}
-Config *Test::config(TQWidget *parent)
+Config *Test::config(TQWidget *tqparent)
{
- return new TestConfig(this, parent);
+ return new TestConfig(this, tqparent);
}
#include "test.moc"
diff --git a/kolf/objects/test/test.h b/kolf/objects/test/test.h
index 06e9f30a..690a7e84 100644
--- a/kolf/objects/test/test.h
+++ b/kolf/objects/test/test.h
@@ -11,14 +11,14 @@
class KConfig;
-class TestFactory : KLibFactory { Q_OBJECT public: TQObject *createObject(TQObject *, const char *, const char *, const TQStringList & = TQStringList()); };
+class TestFactory : KLibFactory { TQ_OBJECT public: TQObject *createObject(TQObject *, const char *, const char *, const TQStringList & = TQStringList()); };
class Test : public TQCanvasEllipse, public CanvasItem
{
public:
Test(TQCanvas *canvas);
- virtual Config *config(TQWidget *parent);
+ virtual Config *config(TQWidget *tqparent);
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
@@ -35,9 +35,10 @@ private:
class TestConfig : public Config
{
Q_OBJECT
+ TQ_OBJECT
public:
- TestConfig(Test *test, TQWidget *parent);
+ TestConfig(Test *test, TQWidget *tqparent);
private slots:
void switchEveryChanged(int news);