--- a/QTfrontend/hwform.cpp Sun Sep 04 21:39:50 2011 +0400
+++ b/QTfrontend/hwform.cpp Sun Sep 04 21:40:47 2011 +0400
@@ -627,7 +627,7 @@
QStringList tmnames;
- foreach(HWTeam team, curTeamSelWidget->getDontPlayingTeams())
+ foreach(HWTeam team, curTeamSelWidget->getNotPlayingTeams())
tmnames += team.TeamName;
//UpdateTeamsLists(&tmnames); // FIXME: still need more work if teamname is updated while configuring
--- a/QTfrontend/teamselect.cpp Sun Sep 04 21:39:50 2011 +0400
+++ b/QTfrontend/teamselect.cpp Sun Sep 04 21:40:47 2011 +0400
@@ -44,7 +44,7 @@
this, SLOT(proxyTeamColorChanged(const HWTeam&)));
} else {
frameDontPlaying->addTeam(team, false);
- curDontPlayingTeams.push_back(team);
+ m_curNotPlayingTeams.push_back(team);
if(m_acceptOuter) {
connect(frameDontPlaying->getTeamWidget(team), SIGNAL(teamStatusChanged(HWTeam)),
this, SLOT(pre_changeTeamStatus(HWTeam)));
@@ -144,14 +144,14 @@
void TeamSelWidget::changeTeamStatus(HWTeam team)
{
- QList<HWTeam>::iterator itDontPlay=std::find(curDontPlayingTeams.begin(), curDontPlayingTeams.end(), team);
+ QList<HWTeam>::iterator itDontPlay=std::find(m_curNotPlayingTeams.begin(), m_curNotPlayingTeams.end(), team);
QList<HWTeam>::iterator itPlay=std::find(curPlayingTeams.begin(), curPlayingTeams.end(), team);
- bool willBePlaying=itDontPlay!=curDontPlayingTeams.end();
+ bool willBePlaying=itDontPlay!=m_curNotPlayingTeams.end();
if(!willBePlaying) {
// playing team => dont playing
- curDontPlayingTeams.push_back(*itPlay);
+ m_curNotPlayingTeams.push_back(*itPlay);
emit teamNotPlaying(*itPlay);
curPlayingTeams.erase(itPlay);
} else {
@@ -162,7 +162,7 @@
itDontPlay->teamColor=framePlaying->getNextColor();
curPlayingTeams.push_back(*itDontPlay);
if(!m_acceptOuter) emit teamWillPlay(*itDontPlay);
- curDontPlayingTeams.erase(itDontPlay);
+ m_curNotPlayingTeams.erase(itDontPlay);
}
FrameTeams* pRemoveTeams;
@@ -253,7 +253,7 @@
//frameDontPlaying->removeTeam(*it);
//}
frameDontPlaying->resetTeams();
- curDontPlayingTeams.clear();
+ m_curNotPlayingTeams.clear();
foreach(HWTeam team, teamslist)
addTeam(team);
@@ -269,9 +269,9 @@
return curPlayingTeams;
}
-QList<HWTeam> TeamSelWidget::getDontPlayingTeams() const
+QList<HWTeam> TeamSelWidget::getNotPlayingTeams() const
{
- return curDontPlayingTeams;
+ return m_curNotPlayingTeams;
}
void TeamSelWidget::pre_changeTeamStatus(HWTeam team)
--- a/QTfrontend/teamselect.h Sun Sep 04 21:39:50 2011 +0400
+++ b/QTfrontend/teamselect.h Sun Sep 04 21:40:47 2011 +0400
@@ -45,7 +45,7 @@
void resetPlayingTeams(const QList<HWTeam>& teamslist);
bool isPlaying(HWTeam team) const;
QList<HWTeam> getPlayingTeams() const;
- QList<HWTeam> getDontPlayingTeams() const;
+ QList<HWTeam> getNotPlayingTeams() const;
void setInteractivity(bool interactive);
public slots:
@@ -77,7 +77,7 @@
bool m_acceptOuter;
QList<HWTeam> curPlayingTeams;
- QList<HWTeam> curDontPlayingTeams;
+ QList<HWTeam> m_curNotPlayingTeams;
};
#endif // _TEAM_SELECT_INCLUDED