7 files changed, 25 insertions, 16 deletions

diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 81c0d277f..4f358c8e7 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -439,7 +439,7 @@ void ChatTab::loadFromLogFile(std::string name)
     {
         std::list<std::string> list;
         chatLogger->loadLast(name, list, 5);
-        std::list<std::string>::iterator i = list.begin();
+        std::list<std::string>::const_iterator i = list.begin();
         while (i != list.end())
         {
             std::string line = "##9" + *i;
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index 33e3790a0..0a64a7142 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -67,7 +67,7 @@ void FlowContainer::widgetResized(const gcn::Event &event A_UNUSED)
 
     int i = 0;
     height = 0;
-    for (WidgetList::iterator it = mWidgets.begin();
+    for (WidgetList::const_iterator it = mWidgets.begin();
          it != mWidgets.end(); ++it)
     {
         int x = i % mGridWidth * mBoxWidth;
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 91b674018..3d6d24868 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -479,7 +479,7 @@ void ItemContainer::updateMatrix()
             break;
     }
 
-    std::vector<ItemIdPair*>::iterator iter;
+    std::vector<ItemIdPair*>::const_iterator iter;
     for (iter = sortedItems.begin(); iter != sortedItems.end(); ++iter)
     {
         if (j >= mGridRows)
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index a14b416ce..52b92d0bc 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -86,12 +86,12 @@ void LayoutCell::computeSizes()
     if (mType != ARRAY)
         return;
 
-    std::vector< std::vector< LayoutCell * > >::iterator
+    std::vector <std::vector <LayoutCell *> >::const_iterator
         i = mArray->mCells.begin();
 
     while (i != mArray->mCells.end())
     {
-        std::vector< LayoutCell * >::iterator j = i->begin();
+        std::vector <LayoutCell *>::const_iterator j = i->begin();
         while (j != i->end())
         {
             LayoutCell *cell = *j;
@@ -113,7 +113,8 @@ LayoutArray::LayoutArray(): mSpacing(4)
 
 LayoutArray::~LayoutArray()
 {
-    std::vector< std::vector< LayoutCell * > >::iterator i = mCells.begin();
+    std::vector <std::vector <LayoutCell *> >::iterator
+        i = mCells.begin();
     while (i != mCells.end())
     {
         std::vector< LayoutCell * >::iterator j = i->begin();
@@ -154,7 +155,8 @@ void LayoutArray::resizeGrid(int w, int h)
     if (extW)
         mSizes[0].resize(w, Layout::AUTO_DEF);
 
-    std::vector< std::vector< LayoutCell * > >::iterator i = mCells.begin();
+    std::vector <std::vector <LayoutCell *> >::iterator
+        i = mCells.begin();
     while (i != mCells.end())
     {
         i->resize(w, 0);
diff --git a/src/gui/widgets/setuptabscroll.cpp b/src/gui/widgets/setuptabscroll.cpp
index 30bb66469..e9917b090 100644
--- a/src/gui/widgets/setuptabscroll.cpp
+++ b/src/gui/widgets/setuptabscroll.cpp
@@ -90,25 +90,31 @@ void SetupTabScroll::addControl(SetupItem *widget, std::string event)
 
 void SetupTabScroll::apply()
 {
-    std::map<std::string, SetupItem*>::iterator iter;
+    std::map<std::string, SetupItem*>::const_iterator iter;
     for (iter = mItems.begin(); iter != mItems.end(); ++ iter)
-        (*iter).second->apply((*iter).first);
+    {
+        if ((*iter).second)
+            (*iter).second->apply((*iter).first);
+    }
 }
 
 void SetupTabScroll::cancel()
 {
-    std::map<std::string, SetupItem*>::iterator iter;
+    std::map<std::string, SetupItem*>::const_iterator iter;
     for (iter = mItems.begin(); iter != mItems.end(); ++ iter)
-        (*iter).second->cancel((*iter).first);
+    {
+        if ((*iter).second)
+            (*iter).second->cancel((*iter).first);
+    }
 }
 
 void SetupTabScroll::externalUpdated()
 {
-    std::map<std::string, SetupItem*>::iterator iter;
+    std::map<std::string, SetupItem*>::const_iterator iter;
     for (iter = mItems.begin(); iter != mItems.end(); ++ iter)
     {
         SetupItem *widget = (*iter).second;
-        if (!widget->isMainConfig())
+        if (widget && !widget->isMainConfig())
             (*iter).second->externalUpdated((*iter).first);
     }
 }
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index ea6b4d520..5e79b7c19 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -73,8 +73,9 @@ void VertContainer::clear()
 
 void VertContainer::widgetResized(const gcn::Event &event A_UNUSED)
 {
-    for (std::vector<gcn::Widget*>::iterator it = mResizableWidgets.begin();
-        it != mResizableWidgets.end(); ++ it)
+    for (std::vector<gcn::Widget*>::const_iterator
+         it = mResizableWidgets.begin();
+         it != mResizableWidgets.end(); ++ it)
     {
         (*it)->setWidth(getWidth());
     }
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 4435496a7..9709f4c8a 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -373,7 +373,7 @@ void Window::widgetHidden(const gcn::Event &event A_UNUSED)
     if (!mFocusHandler)
         return;
 
-    for (it = mWidgets.begin(); it != mWidgets.end(); it++)
+    for (it = mWidgets.begin(); it != mWidgets.end(); ++ it)
     {
         if (mFocusHandler->isFocused(*it))
             mFocusHandler->focusNone();