diff -r 96d10dcd6d84 -r cc3eb9b7230f QTfrontend/team.h --- a/QTfrontend/team.h Fri Oct 28 13:10:46 2011 +0200 +++ b/QTfrontend/team.h Fri Oct 28 19:20:35 2011 +0400 @@ -42,14 +42,17 @@ }; // class representing a team -class HWTeam +class HWTeam : public QObject { + Q_OBJECT + public: // constructors HWTeam(const QString & teamname); HWTeam(const QStringList& strLst); HWTeam(); + HWTeam(const HWTeam & other); // file operations static HWTeam loadFromFile(const QString & teamName); @@ -93,9 +96,9 @@ QStringList teamGameConfig(quint32 InitHealth) const; // comparison operators - bool operator==(const HWTeam& t1) const; - bool operator<(const HWTeam& t1) const; - + bool operator == (const HWTeam& t1) const; + bool operator < (const HWTeam& t1) const; + HWTeam & operator = (const HWTeam & other); private: @@ -109,11 +112,11 @@ QString m_flag; QString m_voicepack; HWHog m_hedgehogs[HEDGEHOGS_PER_TEAM]; - unsigned int m_difficulty; + quint8 m_difficulty; BindAction m_binds[BINDS_NUMBER]; // class members that contain info for the current game setup - unsigned char m_numHedgehogs; + quint8 m_numHedgehogs; QColor m_color; bool m_isNetTeam; QString m_owner; @@ -123,8 +126,6 @@ unsigned int m_rounds; unsigned int m_wins; unsigned int AchievementProgress[MAX_ACHIEVEMENTS]; - - }; #endif