summaryrefslogtreecommitdiffstats
path: root/kolf/game.h
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/game.h
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/game.h')
-rw-r--r--kolf/game.h49
1 files changed, 29 insertions, 20 deletions
diff --git a/kolf/game.h b/kolf/game.h
index f3dfea35..3bcaaaf5 100644
--- a/kolf/game.h
+++ b/kolf/game.h
@@ -104,7 +104,7 @@ private:
};
typedef TQValueList<Player> PlayerList;
-class Arrow : public QCanvasLine
+class Arrow : public TQCanvasLine
{
public:
Arrow(TQCanvas *canvas);
@@ -142,7 +142,7 @@ public:
RectPoint(TQColor color, RectItem *, TQCanvas *canvas);
void dontMove() { dontmove = true; }
virtual void moveBy(double dx, double dy);
- virtual Config *config(TQWidget *parent);
+ virtual Config *config(TQWidget *tqparent);
virtual bool deleteable() const { return false; }
virtual bool cornerResize() const { return true; }
virtual CanvasItem *itemToDelete() { return dynamic_cast<CanvasItem *>(rect); }
@@ -181,7 +181,7 @@ public:
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
- virtual Config *config(TQWidget *parent);
+ virtual Config *config(TQWidget *tqparent);
protected:
RectPoint *point;
@@ -195,6 +195,7 @@ private:
class EllipseConfig : public Config
{
Q_OBJECT
+ TQ_OBJECT
public:
EllipseConfig(Ellipse *ellipse, TQWidget *);
@@ -206,7 +207,7 @@ private slots:
void check2Changed(bool on);
protected:
- TQVBoxLayout *m_vlayout;
+ TQVBoxLayout *m_vtqlayout;
private:
TQLabel *slow1;
@@ -317,9 +318,10 @@ class BlackHole;
class BlackHoleConfig : public Config
{
Q_OBJECT
+ TQ_OBJECT
public:
- BlackHoleConfig(BlackHole *blackHole, TQWidget *parent);
+ BlackHoleConfig(BlackHole *blackHole, TQWidget *tqparent);
private slots:
void degChanged(int);
@@ -344,15 +346,16 @@ public:
virtual void hideInfo();
void updateArrowAngle();
void updateArrowLength();
- virtual Config *config(TQWidget *parent);
+ virtual Config *config(TQWidget *tqparent);
BlackHole *blackHole;
protected:
Arrow *arrow;
};
-class BlackHoleTimer : public QObject
+class BlackHoleTimer : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
BlackHoleTimer(Ball *ball, double speed, int msec);
@@ -372,6 +375,7 @@ protected:
class BlackHole : public TQObject, public Hole
{
Q_OBJECT
+ TQ_OBJECT
public:
BlackHole(TQCanvas *canvas);
@@ -382,7 +386,7 @@ public:
virtual bool place(Ball *ball, bool wasCenter);
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
- virtual Config *config(TQWidget *parent) { return new BlackHoleConfig(this, parent); }
+ virtual Config *config(TQWidget *tqparent) { return new BlackHoleConfig(this, tqparent); }
virtual TQPtrList<TQCanvasItem> moveableItems() const;
double minSpeed() const { return m_minSpeed; }
double maxSpeed() const { return m_maxSpeed; }
@@ -475,11 +479,11 @@ public:
virtual bool collision(Ball *ball, long int id);
virtual CanvasItem *itemToDelete() { return wall; }
virtual void clean();
- virtual Config *config(TQWidget *parent) { return wall->config(parent); }
+ virtual Config *config(TQWidget *tqparent) { return wall->config(tqparent); }
void dontMove() { dontmove = true; };
void updateVisible();
- Wall *parentWall() { return wall; }
+ Wall *tqparentWall() { return wall; }
protected:
Wall *wall;
@@ -541,6 +545,7 @@ class Bridge;
class BridgeConfig : public Config
{
Q_OBJECT
+ TQ_OBJECT
public:
BridgeConfig(Bridge *bridge, TQWidget *);
@@ -552,7 +557,7 @@ protected slots:
void rightWallChanged(bool);
protected:
- TQVBoxLayout *m_vlayout;
+ TQVBoxLayout *m_vtqlayout;
TQCheckBox *top;
TQCheckBox *bot;
TQCheckBox *left;
@@ -576,7 +581,7 @@ public:
void doSave(KConfig *cfg);
virtual void newSize(int width, int height);
virtual void setGame(KolfGame *game);
- virtual Config *config(TQWidget *parent) { return new BridgeConfig(this, parent); }
+ virtual Config *config(TQWidget *tqparent) { return new BridgeConfig(this, tqparent); }
void setSize(int width, int height);
virtual TQPtrList<TQCanvasItem> moveableItems() const;
@@ -613,9 +618,10 @@ class Sign;
class SignConfig : public BridgeConfig
{
Q_OBJECT
+ TQ_OBJECT
public:
- SignConfig(Sign *sign, TQWidget *parent);
+ SignConfig(Sign *sign, TQWidget *tqparent);
private slots:
void textChanged(const TQString &);
@@ -631,7 +637,7 @@ public:
TQString text() const { return m_text; }
virtual void draw(TQPainter &painter);
virtual bool vStrut() const { return false; }
- virtual Config *config(TQWidget *parent) { return new SignConfig(this, parent); }
+ virtual Config *config(TQWidget *tqparent) { return new SignConfig(this, tqparent); }
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
@@ -661,9 +667,10 @@ protected:
class WindmillConfig : public BridgeConfig
{
Q_OBJECT
+ TQ_OBJECT
public:
- WindmillConfig(Windmill *windmill, TQWidget *parent);
+ WindmillConfig(Windmill *windmill, TQWidget *tqparent);
private slots:
void speedChanged(int news);
@@ -681,7 +688,7 @@ public:
virtual void save(KConfig *cfg);
virtual void load(KConfig *cfg);
virtual void setGame(KolfGame *game);
- virtual Config *config(TQWidget *parent) { return new WindmillConfig(this, parent); }
+ virtual Config *config(TQWidget *tqparent) { return new WindmillConfig(this, tqparent); }
void setSize(int width, int height);
virtual void moveBy(double dx, double dy);
void setSpeed(int news);
@@ -708,6 +715,7 @@ class HoleInfo;
class HoleConfig : public Config
{
Q_OBJECT
+ TQ_OBJECT
public:
HoleConfig(HoleInfo *holeInfo, TQWidget *);
@@ -741,7 +749,7 @@ public:
TQString name() const { return m_name; }
TQString untranslatedName() const { return m_untranslatedName; }
- virtual Config *config(TQWidget *parent) { return new HoleConfig(this, parent); }
+ virtual Config *config(TQWidget *tqparent) { return new HoleConfig(this, tqparent); }
void borderWallsChanged(bool yes);
bool borderWalls() const { return m_borderWalls; }
@@ -755,7 +763,7 @@ private:
int m_lowestMaxStrokes;
};
-class StrokeCircle : public QCanvasItem
+class StrokeCircle : public TQCanvasItem
{
public:
StrokeCircle(TQCanvas *canvas);
@@ -790,12 +798,13 @@ struct KDE_EXPORT CourseInfo
unsigned int par;
};
-class KDE_EXPORT KolfGame : public QCanvasView
+class KDE_EXPORT KolfGame : public TQCanvasView
{
Q_OBJECT
+ TQ_OBJECT
public:
- KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *parent=0, const char *name=0 );
+ KolfGame(ObjectList *obj, PlayerList *players, TQString filename, TQWidget *tqparent=0, const char *name=0 );
~KolfGame();
void setObjects(ObjectList *obj) { this->obj = obj; }
void setFilename(const TQString &filename);