diff -r 8ed6e810051a -r d38da7c19e43 QTfrontend/team.h --- a/QTfrontend/team.h Sun Sep 25 16:09:55 2011 +0200 +++ b/QTfrontend/team.h Sun Sep 25 19:30:10 2011 +0200 @@ -52,6 +52,7 @@ HWTeam(); // file operations + static HWTeam loadFromFile(const QString & teamName); bool loadFromFile(); bool deleteFile(); bool saveToFile(); @@ -66,18 +67,20 @@ QString grave() const; const HWHog & hedgehog(unsigned int idx) const; bool isNetTeam() const; + QString keyBind(unsigned int idx) const; QString name() const; unsigned char numHedgehogs() const; QString owner() const; QString voicepack() const; // attribute setters + void bindKey(unsigned int idx, const QString & key); void setColor(const QColor & color); void setDifficulty(unsigned int level); void setFlag(const QString & flag); void setFort(const QString & fort); void setGrave(const QString & grave); - void setHedgehog(unsigned int idx, const HWHog & hh); + void setHedgehog(unsigned int idx, HWHog hh); void setName(const QString & name); void setNumHedgehogs(unsigned char num); void setVoicepack(const QString & voicepack); @@ -86,10 +89,6 @@ void incRounds(); void incWins(); - // pages... wait... wth is THIS doing in this class? FIXME!!!! - void SetToPage(HWForm * hwform); - void GetFromPage(HWForm * hwform); - // convert team info into strings for further computation QStringList teamGameConfig(quint32 InitHealth) const; @@ -111,7 +110,7 @@ QString m_voicepack; HWHog m_hedgehogs[HEDGEHOGS_PER_TEAM]; unsigned int m_difficulty; - BindAction binds[BINDS_NUMBER]; + BindAction m_binds[BINDS_NUMBER]; // class members that contain info for the current game setup unsigned char m_numHedgehogs;