diff -r 29bc9c36ad5f -r 4665bfe25470 QTfrontend/teamselect.cpp --- a/QTfrontend/teamselect.cpp Sun Jan 21 19:51:02 2007 +0000 +++ b/QTfrontend/teamselect.cpp Sun Jan 21 19:53:25 2007 +0000 @@ -28,10 +28,10 @@ void TeamSelWidget::addTeam(HWTeam team) { - if(team.netTeam) { + if(team.isNetTeam()) { framePlaying->addTeam(team, true); curPlayingTeams.push_back(team); - QObject::connect(framePlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)), + connect(framePlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)), this, SLOT(netTeamStatusChanged(const HWTeam&))); } else { frameDontPlaying->addTeam(team, false); @@ -41,12 +41,27 @@ } } +void TeamSelWidget::hhNumChanged(const HWTeam& team) +{ + QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); + itPlay->numHedgehogs=team.numHedgehogs; + emit hhogsNumChanged(team); +} + +void TeamSelWidget::changeHHNum(const HWTeam& team) +{ + QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); + itPlay->numHedgehogs=team.numHedgehogs; + + framePlaying->setHHNum(team); +} + void TeamSelWidget::removeNetTeam(const HWTeam& team) { for(;;) { - list::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); + QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); if(itPlay==curPlayingTeams.end()) break; - if(itPlay->netTeam) { + if(itPlay->isNetTeam()) { QObject::disconnect(framePlaying->getTeamWidget(*itPlay), SIGNAL(teamStatusChanged(HWTeam))); framePlaying->removeTeam(team); curPlayingTeams.erase(itPlay); @@ -57,7 +72,7 @@ void TeamSelWidget::netTeamStatusChanged(const HWTeam& team) { - list::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); + QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); } @@ -68,8 +83,8 @@ void TeamSelWidget::changeTeamStatus(HWTeam team) { - list::iterator itDontPlay=std::find(curDontPlayingTeams.begin(), curDontPlayingTeams.end(), team); - list::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); + QList::iterator itDontPlay=std::find(curDontPlayingTeams.begin(), curDontPlayingTeams.end(), team); + QList::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team); bool willBePlaying=itDontPlay!=curDontPlayingTeams.end(); @@ -101,6 +116,8 @@ pRemoveTeams->removeTeam(team); QObject::connect(pAddTeams->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)), this, SLOT(changeTeamStatus(HWTeam))); + if(willBePlaying) connect(framePlaying->getTeamWidget(team), SIGNAL(hhNmChanged(const HWTeam&)), + this, SLOT(hhNumChanged(const HWTeam&))); QSize szh=pAddTeams->sizeHint(); QSize szh1=pRemoveTeams->sizeHint(); @@ -138,7 +155,7 @@ void TeamSelWidget::resetPlayingTeams(const QList& teamslist) { - list::iterator it; + QList::iterator it; for(it=curPlayingTeams.begin(); it!=curPlayingTeams.end(); it++) { framePlaying->removeTeam(*it); } @@ -159,7 +176,7 @@ return std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team)!=curPlayingTeams.end(); } -list TeamSelWidget::getPlayingTeams() const +QList TeamSelWidget::getPlayingTeams() const { return curPlayingTeams; }