From 576eb4299a00bc053db35414406f46372a0f70f2 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:42:31 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1157643 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- konquest/gamecore.h | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'konquest/gamecore.h') diff --git a/konquest/gamecore.h b/konquest/gamecore.h index c8c7c39a..03683a08 100644 --- a/konquest/gamecore.h +++ b/konquest/gamecore.h @@ -3,10 +3,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include // Board Size Constants #define BOARD_ROWS 16 @@ -111,20 +111,20 @@ class Player : public QObject { public: - Player( QString newName, QColor color, int number, bool isAi ); + Player( TQString newName, TQColor color, int number, bool isAi ); virtual ~Player(); enum { NEUTRAL_PLAYER_NUMBER = -1 }; public: - QString &getName(); - QString getColoredName(); - QColor &getColor(); + TQString &getName(); + TQString getColoredName(); + TQColor &getColor(); bool isNeutral(); - QPtrList &getAttackList(); + TQPtrList &getAttackList(); // factory functions - static Player *createPlayer( QString newName, QColor newColor, int playerNum, bool isAi ); + static Player *createPlayer( TQString newName, TQColor newColor, int playerNum, bool isAi ); static Player *createNeutralPlayer(); bool NewAttack( Planet *sourcePlanet, Planet *destPlanet, int shipCount, int departureTurn ); @@ -135,13 +135,13 @@ public: void setInPlay( bool ); private: - QString name; - QColor color; + TQString name; + TQColor color; int playerNum; bool inPlay; bool aiPlayer; - QPtrList attackList; + TQPtrList attackList; // statistics counters int shipsBuilt; @@ -177,7 +177,7 @@ class Planet : public QObject private: - Planet( QString planetName, Sector &newParentSector, + Planet( TQString planetName, Sector &newParentSector, Player *initialOwner, int newProd, double newKillP, double newMorale ); @@ -185,13 +185,13 @@ public: virtual ~Planet(); static Planet *createPlayerPlanet( Sector &parentSector, - Player *initialOwner, QString planetName ); + Player *initialOwner, TQString planetName ); static Planet *createNeutralPlanet( Sector &parentSector, - Player *initialOwner, QString planetName ); + Player *initialOwner, TQString planetName ); Sector &getSector() const; Player *getPlayer() const; - const QString &getName() const; + const TQString &getName() const; DefenseFleet &getFleet(); double getKillPercentage(); @@ -211,7 +211,7 @@ signals: void selected(); private: - QString name; + TQString name; Player *owner; Sector &parentSector; DefenseFleet homeFleet; @@ -279,8 +279,8 @@ public: const int getRows() const; const int getColumns() const; - void populateMap( QPtrList &players, Player *neutral, - int numNeutralPlanets, QPtrList &thePlanets ); + void populateMap( TQPtrList &players, Player *neutral, + int numNeutralPlanets, TQPtrList &thePlanets ); void clearMap(); bool selectedSector( int &x, int &y ) const; @@ -318,13 +318,13 @@ protected: //--------------------------------------------------------------------------------- // Typedefs //--------------------------------------------------------------------------------- -typedef QPoint Coordinate; // Gotta start using this instead of int x,y crap -typedef QPtrList AttackFleetList; -typedef QPtrListIterator AttackFleetListIterator; -typedef QPtrList PlayerList; -typedef QPtrList PlanetList; -typedef QPtrListIterator PlayerListIterator; -typedef QPtrListIterator PlanetListIterator; +typedef TQPoint Coordinate; // Gotta start using this instead of int x,y crap +typedef TQPtrList AttackFleetList; +typedef TQPtrListIterator AttackFleetListIterator; +typedef TQPtrList PlayerList; +typedef TQPtrList PlanetList; +typedef TQPtrListIterator PlayerListIterator; +typedef TQPtrListIterator PlanetListIterator; #endif // _GAMECORE_H_ -- cgit v1.2.1