# HG changeset patch # User unc0rr # Date 1315157990 -14400 # Node ID c09c50efe8b574ca4f38d56e7385b0b1daf348e4 # Parent e3a047e84e19ff2f0777e2173e978af0afd21b0c Replace iterators with simple declarative foreach (not tested if it works) diff -r e3a047e84e19 -r c09c50efe8b5 QTfrontend/chatwidget.cpp --- a/QTfrontend/chatwidget.cpp Sun Sep 04 13:36:59 2011 -0400 +++ b/QTfrontend/chatwidget.cpp Sun Sep 04 21:39:50 2011 +0400 @@ -400,9 +400,8 @@ void HWChatWidget::nickRemoved(const QString& nick) { - QList items = chatNicks->findItems(nick, Qt::MatchExactly); - QListIterator it(items); - while(it.hasNext()) chatNicks->takeItem(chatNicks->row(it.next())); + foreach(QListWidgetItem * item, chatNicks->findItems(nick, Qt::MatchExactly)) + chatNicks->takeItem(chatNicks->row(item)); emit nickCountUpdate(chatNicks->count()); } diff -r e3a047e84e19 -r c09c50efe8b5 QTfrontend/databrowser.cpp --- a/QTfrontend/databrowser.cpp Sun Sep 04 13:36:59 2011 -0400 +++ b/QTfrontend/databrowser.cpp Sun Sep 04 21:39:50 2011 +0400 @@ -26,6 +26,7 @@ else if(!requestedResources.contains(name)) { + qDebug() << "Requesting resource" << name.toString(); requestedResources.insert(name); QNetworkRequest newRequest(QUrl("http://www.hedgewars.org" + name.toString())); diff -r e3a047e84e19 -r c09c50efe8b5 QTfrontend/game.cpp --- a/QTfrontend/game.cpp Sun Sep 04 13:36:59 2011 -0400 +++ b/QTfrontend/game.cpp Sun Sep 04 21:39:50 2011 +0400 @@ -84,8 +84,7 @@ if (m_pTeamSelWidget) { - QListIterator it(m_pTeamSelWidget->getPlayingTeams()); - while(it.hasNext()) + foreach(HWTeam team, m_pTeamSelWidget->getPlayingTeams()) { HWProto::addStringToBuffer(buf, QString("eammloadt %1").arg(ammostr.mid(0, cAmmoNumber))); HWProto::addStringToBuffer(buf, QString("eammprob %1").arg(ammostr.mid(cAmmoNumber, cAmmoNumber))); @@ -93,7 +92,7 @@ HWProto::addStringToBuffer(buf, QString("eammreinf %1").arg(ammostr.mid(3 * cAmmoNumber, cAmmoNumber))); if(!gamecfg->schemeData(21).toBool()) HWProto::addStringToBuffer(buf, QString("eammstore")); HWProto::addStringListToBuffer(buf, - it.next().TeamGameConfig(gamecfg->getInitHealth())); + team.TeamGameConfig(gamecfg->getInitHealth())); ; } } @@ -392,9 +391,8 @@ if (m_pTeamSelWidget) { QByteArray buf; - QListIterator it(m_pTeamSelWidget->getPlayingTeams()); - while(it.hasNext()) - HWProto::addStringToBuffer(buf, QString("eteamgone %1").arg(it.next().TeamName)); + foreach(HWTeam team, m_pTeamSelWidget->getPlayingTeams()) + HWProto::addStringToBuffer(buf, QString("eteamgone %1").arg(team.TeamName)); RawSendIPC(buf); } } diff -r e3a047e84e19 -r c09c50efe8b5 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Sun Sep 04 13:36:59 2011 -0400 +++ b/QTfrontend/hwform.cpp Sun Sep 04 21:39:50 2011 +0400 @@ -626,8 +626,9 @@ } QStringList tmnames; - QListIterator it(curTeamSelWidget->getDontPlayingTeams()); - while(it.hasNext()) tmnames += it.next().TeamName; + + foreach(HWTeam team, curTeamSelWidget->getDontPlayingTeams()) + tmnames += team.TeamName; //UpdateTeamsLists(&tmnames); // FIXME: still need more work if teamname is updated while configuring UpdateTeamsLists(); diff -r e3a047e84e19 -r c09c50efe8b5 QTfrontend/teamselect.cpp --- a/QTfrontend/teamselect.cpp Sun Sep 04 13:36:59 2011 -0400 +++ b/QTfrontend/teamselect.cpp Sun Sep 04 21:39:50 2011 +0400 @@ -255,8 +255,8 @@ frameDontPlaying->resetTeams(); curDontPlayingTeams.clear(); - QListIterator it(teamslist); - while(it.hasNext()) addTeam(it.next()); + foreach(HWTeam team, teamslist) + addTeam(team); } bool TeamSelWidget::isPlaying(HWTeam team) const