summaryrefslogtreecommitdiffstats
path: root/konquest/gamecore.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 /konquest/gamecore.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 'konquest/gamecore.h')
-rw-r--r--konquest/gamecore.h23
1 files changed, 13 insertions, 10 deletions
diff --git a/konquest/gamecore.h b/konquest/gamecore.h
index 03683a08..80dab502 100644
--- a/konquest/gamecore.h
+++ b/konquest/gamecore.h
@@ -56,7 +56,7 @@ private:
// \--- class DefenseFleet
//**********************************************************
-class Fleet : public QObject
+class Fleet : public TQObject
{
public:
@@ -107,7 +107,7 @@ public:
// class Player
//**************************************************************
-class Player : public QObject
+class Player : public TQObject
{
public:
@@ -171,9 +171,10 @@ public:
// class Planet
//**************************************************************
-class Planet : public QObject
+class Planet : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
private:
@@ -184,9 +185,9 @@ private:
public:
virtual ~Planet();
- static Planet *createPlayerPlanet( Sector &parentSector,
+ static Planet *createPlayerPlanet( Sector &tqparentSector,
Player *initialOwner, TQString planetName );
- static Planet *createNeutralPlanet( Sector &parentSector,
+ static Planet *createNeutralPlanet( Sector &tqparentSector,
Player *initialOwner, TQString planetName );
Sector &getSector() const;
@@ -213,7 +214,7 @@ signals:
private:
TQString name;
Player *owner;
- Sector &parentSector;
+ Sector &tqparentSector;
DefenseFleet homeFleet;
double killPercentage;
@@ -225,15 +226,16 @@ private:
// class Sector
//***************************************************************
-class Sector : public QObject
+class Sector : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
// constructors
Sector();
- Sector( Map *parentMap, int xpos, int ypos );
+ Sector( Map *tqparentMap, int xpos, int ypos );
Sector( const Sector & );
// assignment operator (makes initialization easy)
@@ -259,7 +261,7 @@ protected slots:
protected:
Planet *planet; // a sector has 0 or 1 planets
- Map *parentMap;
+ Map *tqparentMap;
int x, y;
};
@@ -268,9 +270,10 @@ protected:
// class Map
//*****************************************************************
-class Map : public QObject
+class Map : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
Map();