fixed some const/stl problems..

[hbs.git] / bs / bsview.cpp

diff --git a/bs/bsview.cpp b/bs/bsview.cpp
index ac969a3506c38bac22a96ac137fc45ed5bd4dc69..78f8340fe185bcc7568415518b190a0784e5cc7c 100644 (file)
--- a/bs/bsview.cpp
+++ b/bs/bsview.cpp
@@ -94,24 +94,24 @@ void BSView::slotDocumentChanged()
 {
        m_NumberView->clear();
        
-       map<QString, map<QString, map<QString, Fleet> > >& battles = m_doc->Battles();  
+       const map<QString, map<QString, map<QString, Fleet> > >& battles = m_doc->Battles();    
 
-       for (map<QString, map<QString, map<QString, Fleet> > >::iterator i = battles.begin(); i != battles.end(); i++)
+       for (map<QString, map<QString, map<QString, Fleet> > >::const_iterator i = battles.begin(); i != battles.end(); ++i)
        {
                QString b = (*i).first;
                QListViewItem* battle = new QListViewItem(m_NumberView, b);
 
-               for (map<QString, map<QString, Fleet> >::iterator j = battles[b].begin(); j != battles[b].end(); j++)
+               for (map<QString, map<QString, Fleet> >::const_iterator j = i->second.begin(); j != i->second.end(); ++j)
                {
                        QString g = (*j).first;
                        QListViewItem* group = new QListViewItem(battle, g);
                        int groupShips = 0;
 
-                       for (map<QString, Fleet>::iterator k = battles[b][g].begin(); k != battles[b][g].end(); k++)
+                       for (map<QString, Fleet>::const_iterator k = j->second.begin(); k != j->second.end(); ++k)
                        {       
-                               int ships = battles[b][g][(*k).first].NumberOfShips();
+                               int ships = k->second.NumberOfShips();
                                groupShips += ships;
-                               (void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(battles[b][g][(*k).first].ETA()));
+                               (void) new QListViewItem(group, (*k).first, QString("%1").arg(ships), QString("%1").arg(k->second.ETA()));
                        }
                        group->setText(1, QString("%1").arg(groupShips));
                }