update to trunk

(bzr r11950.1.161)

3 files changed, 8 insertions, 10 deletions

diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 894700046..97581aa83 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -313,7 +313,7 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
         Inkscape::Util::UnitTable::UnitMap::iterator iter = m.begin();
         while(iter != m.end()) {
             Gtk::RadioMenuItem *mi = Gtk::manage(new Gtk::RadioMenuItem(_sw_group));
-            mi->add(*(new Gtk::Label((*iter).first, 0.0, 0.5)));
+            mi->add(*(new Gtk::Label(iter->first, 0.0, 0.5)));
             _unit_mis = g_slist_append(_unit_mis, mi);
             Inkscape::Util::Unit const *u = new Inkscape::Util::Unit(unit_table.getUnit(iter->first));
             mi->signal_activate().connect(sigc::bind<Inkscape::Util::Unit>(sigc::mem_fun(*this, &SelectedStyle::on_popup_units), *u));
diff --git a/src/ui/widget/unit-menu.cpp b/src/ui/widget/unit-menu.cpp
index 111226774..684016471 100644
--- a/src/ui/widget/unit-menu.cpp
+++ b/src/ui/widget/unit-menu.cpp
@@ -33,11 +33,9 @@ bool UnitMenu::setUnitType(UnitType unit_type)
 {
     // Expand the unit widget with unit entries from the unit table
     UnitTable::UnitMap m = unit_table.units(unit_type);
-    UnitTable::UnitMap::iterator iter = m.begin();
-    while(iter != m.end()) {
-        Glib::ustring text = (*iter).first;
-        append(text);
-        ++iter;
+
+    for (UnitTable::UnitMap::iterator i = m.begin(); i != m.end(); ++i) {
+        append(i->first);
     }
     _type = unit_type;
     set_active_text(unit_table.primary(unit_type));
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index f9b0c3a44..155f3fafe 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -38,10 +38,10 @@ UnitTracker::UnitTracker(UnitType unit_type) :
     
     GtkTreeIter iter;
     UnitTable::UnitMap m = unit_table.units(unit_type);
-    UnitTable::UnitMap::iterator m_iter = m.begin();
-    while(m_iter != m.end()) {
-        Glib::ustring text = (*m_iter).first;
-        ++m_iter;
+    
+
+    for (UnitTable::UnitMap::iterator m_iter = m.begin(); m_iter != m.end(); ++m_iter) {
+        Glib::ustring text = m_iter->first;
         gtk_list_store_append(_store, &iter);
         gtk_list_store_set(_store, &iter, COLUMN_STRING, text.c_str(), -1);
     }