C++: use postfix operator for interators (that's supposedly faster and a good practice).

modules/access/dshow/dshow.cpp

@@ -1014,7 +1014,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
         return VLC_EGENERIC;
 
     list<string>::iterator iter;
-    for( iter = list_devices.begin(); iter != list_devices.end(); iter++ )
+    for( iter = list_devices.begin(); iter != list_devices.end(); ++iter )
         msg_Dbg( p_this, "found device: %s", iter->c_str() );
 
     /* If no device name was specified, pick the 1st one */
@@ -2043,7 +2043,7 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
 
     list<string>::iterator iter;
     for( iter = list_devices.begin(), i = 2; iter != list_devices.end();
-         iter++, i++ )
+         ++iter, i++ )
     {
         p_item->ppsz_list[i] = strdup( iter->c_str() );
         p_item->ppsz_list_text[i] = NULL;

modules/demux/mkv/chapter_command.cpp

@@ -94,7 +94,7 @@ bool dvd_chapter_codec_c::Enter()
                 f_result |= sys.dvd_interpretor.Interpret( p_data );
             }
         }
-        index++;
+        ++index;
     }
     return f_result;
 }
@@ -117,7 +117,7 @@ bool dvd_chapter_codec_c::Leave()
                 f_result |= sys.dvd_interpretor.Interpret( p_data );
             }
         }
-        index++;
+        ++index;
     }
     return f_result;
 }
@@ -772,7 +772,7 @@ bool matroska_script_codec_c::Enter()
             msg_Dbg( &sys.demuxer, "Matroska Script enter command" );
             f_result |= interpretor.Interpret( (*index)->GetBuffer(), (*index)->GetSize() );
         }
-        index++;
+        ++index;
     }
     return f_result;
 }
@@ -788,7 +788,7 @@ bool matroska_script_codec_c::Leave()
             msg_Dbg( &sys.demuxer, "Matroska Script leave command" );
             f_result |= interpretor.Interpret( (*index)->GetBuffer(), (*index)->GetSize() );
         }
-        index++;
+        ++index;
     }
     return f_result;
 }

modules/demux/mkv/chapter_command.hpp

@@ -53,19 +53,19 @@ public:
         while ( indexe != enter_cmds.end() )
         {
             delete (*indexe);
-            indexe++;
+            ++indexe;
         }
         std::vector<KaxChapterProcessData*>::iterator indexl = leave_cmds.begin();
         while ( indexl != leave_cmds.end() )
         {
             delete (*indexl);
-            indexl++;
+            ++indexl;
         }
         std::vector<KaxChapterProcessData*>::iterator indexd = during_cmds.begin();
         while ( indexd != during_cmds.end() )
         {
             delete (*indexd);
-            indexd++;
+            ++indexd;
         }
     }
 

modules/demux/mkv/chapters.cpp

@@ -32,13 +32,13 @@ chapter_item_c::~chapter_item_c()
     while ( index != codecs.end() )
     {
         delete (*index);
-        index++;
+        ++index;
     }
     std::vector<chapter_item_c*>::iterator index_ = sub_chapters.begin();
     while ( index_ != sub_chapters.end() )
     {
         delete (*index_);
-        index_++;
+        ++index_;
     }
 }
 
@@ -91,7 +91,7 @@ chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id,
     {
         if ( match( **index ,p_cookie, i_cookie_size ) )
             return this;
-        index++;
+        ++index;
     }
  
     // sub-chapters
@@ -102,7 +102,7 @@ chapter_item_c *chapter_item_c::BrowseCodecPrivate( unsigned int codec_id,
         p_result = (*index2)->BrowseCodecPrivate( codec_id, match, p_cookie, i_cookie_size );
         if ( p_result != NULL )
             return p_result;
-        index2++;
+        ++index2;
     }
  
     return p_result;
@@ -158,7 +158,7 @@ std::string chapter_item_c::GetCodecName( bool f_for_title ) const
         result = (*index)->GetCodecName( f_for_title );
         if ( result != "" )
             break;
-        index++;
+        ++index;
     }
 
     return result;
@@ -174,7 +174,7 @@ int16 chapter_item_c::GetTitleNumber( ) const
         result = (*index)->GetTitleNumber( );
         if ( result >= 0 )
             break;
-        index++;
+        ++index;
     }
 
     return result;
@@ -189,7 +189,7 @@ int64_t chapter_item_c::RefreshChapters( bool b_ordered, int64_t i_prev_user_tim
     while ( index != sub_chapters.end() )
     {
         i_user_time = (*index)->RefreshChapters( b_ordered, i_user_time );
-        index++;
+        ++index;
     }
 
     if ( b_ordered )
@@ -243,7 +243,7 @@ chapter_item_c *chapter_item_c::FindTimecode( mtime_t i_user_timecode, const cha
         while ( index != sub_chapters.end() && ((p_current == NULL && psz_result == NULL) || (p_current != NULL && (!b_found || psz_result == NULL))))
         {
             psz_result = (*index)->FindTimecode( i_user_timecode, p_current, b_found );
-            index++;
+            ++index;
         }
  
         if ( psz_result == NULL )
@@ -263,7 +263,7 @@ bool chapter_item_c::ParentOf( const chapter_item_c & item ) const
     {
         if ( (*index)->ParentOf( item ) )
             return true;
-        index++;
+        ++index;
     }
 
     return false;
@@ -276,7 +276,7 @@ bool chapter_item_c::Enter( bool b_do_subs )
     while ( index != codecs.end() )
     {
         f_result |= (*index)->Enter();
-        index++;
+        ++index;
     }
 
     if ( b_do_subs )
@@ -286,7 +286,7 @@ bool chapter_item_c::Enter( bool b_do_subs )
         while ( index_ != sub_chapters.end() )
         {
             f_result |= (*index_)->Enter( true );
-            index_++;
+            ++index_;
         }
     }
     return f_result;
@@ -300,7 +300,7 @@ bool chapter_item_c::Leave( bool b_do_subs )
     while ( index != codecs.end() )
     {
         f_result |= (*index)->Leave();
-        index++;
+        ++index;
     }
 
     if ( b_do_subs )
@@ -310,7 +310,7 @@ bool chapter_item_c::Leave( bool b_do_subs )
         while ( index_ != sub_chapters.end() )
         {
             f_result |= (*index_)->Leave( true );
-            index_++;
+            ++index_;
         }
     }
     b_is_leaving = false;

modules/gui/qt4/components/preferences_widgets.cpp

@@ -707,7 +707,7 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
 
     int boxline = 0;
     for( QVector<checkBoxListItem*>::iterator it = modules.begin();
-            it != modules.end(); it++ )
+            it != modules.end(); ++it )
     {
         layoutGroupBox->addWidget( (*it)->checkBox, boxline++, 0 );
     }
@@ -731,7 +731,7 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
 ModuleListConfigControl::~ModuleListConfigControl()
 {
     for( QVector<checkBoxListItem*>::iterator it = modules.begin();
-            it != modules.end(); it++ )
+            it != modules.end(); ++it )
     {
         delete *it;
     }
@@ -811,7 +811,7 @@ QString ModuleListConfigControl::getValue()
 void ModuleListConfigControl::hide()
 {
     for( QVector<checkBoxListItem*>::iterator it = modules.begin();
-         it != modules.end(); it++ )
+         it != modules.end(); ++it )
     {
         (*it)->checkBox->hide();
     }
@@ -821,7 +821,7 @@ void ModuleListConfigControl::hide()
 void ModuleListConfigControl::show()
 {
     for( QVector<checkBoxListItem*>::iterator it = modules.begin();
-         it != modules.end(); it++ )
+         it != modules.end(); ++it )
     {
         (*it)->checkBox->show();
     }
@@ -835,7 +835,7 @@ void ModuleListConfigControl::onUpdate()
     bool first = true;
 
     for( QVector<checkBoxListItem*>::iterator it = modules.begin();
-         it != modules.end(); it++ )
+         it != modules.end(); ++it )
     {
         if( (*it)->checkBox->isChecked() )
         {

modules/gui/qt4/components/simple_preferences.cpp

@@ -750,7 +750,7 @@ void SPrefsPanel::apply()
 {
     /* Generic save for ever panel */
     QList<ConfigControl *>::Iterator i;
-    for( i = controls.begin() ; i != controls.end() ; i++ )
+    for( i = controls.begin() ; i != controls.end() ; ++i )
     {
         ConfigControl *c = qobject_cast<ConfigControl *>(*i);
         c->doApply( p_intf );
@@ -867,7 +867,7 @@ void SPrefsPanel::changeStyle( QString s_style )
     QWidgetList::iterator it = widgets.begin();
     while( it != widgets.end() ) {
         (*it)->update();
-        it++;
+        ++it;
     };
 }
 

modules/gui/qt4/dialogs/vlm.cpp

@@ -886,7 +886,7 @@ void VLMWrapper::EditSchedule( const QString& name, const QString& input,
 void VLMDialog::toggleVisible()
 {
     QList<VLMAWidget *>::iterator it;
-    for( it = vlmItems.begin(); it != vlmItems.end(); it++ )
+    for( it = vlmItems.begin(); it != vlmItems.end(); ++it )
     {
         VLMAWidget *item =  *it;
         delete item;

modules/gui/skins2/controls/ctrl_list.cpp

@@ -212,7 +212,7 @@ void CtrlList::handleEvent( EvtGeneric &rEvent )
         {
             // Flag to know if the current item must be selected
             bool select = false;
-            for( it = m_rList.begin(); it != m_rList.end(); it++ )
+            for( it = m_rList.begin(); it != m_rList.end(); ++it )
             {
                 bool nextSelect = select;
                 if( index == yPos || &*it == m_pLastSelected )
@@ -236,7 +236,7 @@ void CtrlList::handleEvent( EvtGeneric &rEvent )
         else if( rEvent.getAsString().find( "mouse:left:down:ctrl" ) !=
                  string::npos )
         {
-            for( it = m_rList.begin(); it != m_rList.end(); it++ )
+            for( it = m_rList.begin(); it != m_rList.end(); ++it )
             {
                 if( index == yPos )
                 {
@@ -253,7 +253,7 @@ void CtrlList::handleEvent( EvtGeneric &rEvent )
         {
             // Flag to know if the current item must be selected
             bool select = false;
-            for( it = m_rList.begin(); it != m_rList.end(); it++ )
+            for( it = m_rList.begin(); it != m_rList.end(); ++it )
             {
                 bool nextSelect = select;
                 if( index == yPos ||  &*it == m_pLastSelected )
@@ -277,7 +277,7 @@ void CtrlList::handleEvent( EvtGeneric &rEvent )
         else if( rEvent.getAsString().find( "mouse:left:down" ) !=
                  string::npos )
         {
-            for( it = m_rList.begin(); it != m_rList.end(); it++ )
+            for( it = m_rList.begin(); it != m_rList.end(); ++it )
             {
                 if( index == yPos )
                 {
@@ -295,7 +295,7 @@ void CtrlList::handleEvent( EvtGeneric &rEvent )
         else if( rEvent.getAsString().find( "mouse:left:dblclick" ) !=
                  string::npos )
         {
-            for( it = m_rList.begin(); it != m_rList.end(); it++ )
+            for( it = m_rList.begin(); it != m_rList.end(); ++it )
             {
                 if( index == yPos )
                 {
@@ -383,7 +383,7 @@ void CtrlList::autoScroll()
     // Find the current playing stream
     int playIndex = 0;
     VarList::ConstIterator it;
-    for( it = m_rList.begin(); it != m_rList.end(); it++ )
+    for( it = m_rList.begin(); it != m_rList.end(); ++it )
     {
         if( (*it).m_playing )
         {
@@ -446,7 +446,7 @@ void CtrlList::makeImage()
                     m_pImage->fillRect( 0, yPos, width, rectHeight,
                                         m_selColor );
                 }
-                it++;
+                ++it;
             }
         }
     }
@@ -462,7 +462,7 @@ void CtrlList::makeImage()
             {
                 uint32_t color = ( (*it).m_selected ? m_selColor : bgColor );
                 m_pImage->fillRect( 0, yPos, width, rectHeight, color );
-                it++;
+                ++it;
             }
             else
             {
@@ -475,7 +475,7 @@ void CtrlList::makeImage()
 
     // Draw the items
     int yPos = 0;
-    for( it = m_rList[m_lastPos]; it != m_rList.end() && yPos < height; it++ )
+    for( it = m_rList[m_lastPos]; it != m_rList.end() && yPos < height; ++it )
     {
         UString *pStr = (UString*)(it->m_cString.get());
         uint32_t color = ( it->m_playing ? m_playColor : m_fgColor );

modules/gui/skins2/parser/builder.cpp

@@ -297,7 +297,7 @@ void Builder::addFont( const BuilderData::Font &rData )
         const string &sep = pOSFactory->getDirSeparator();
 
         list<string>::const_iterator it;
-        for( it = resPath.begin(); it != resPath.end(); it++ )
+        for( it = resPath.begin(); it != resPath.end(); ++it )
         {
             string path = (*it) + sep + "fonts" + sep + rData.m_fontFile;
             pFont = new FT2Font( getIntf(), path, rData.m_size );
@@ -1152,7 +1152,7 @@ GenericFont *Builder::getFont( const string &fontId )
         const string &sep = pOSFactory->getDirSeparator();
 
         list<string>::const_iterator it;
-        for( it = resPath.begin(); it != resPath.end(); it++ )
+        for( it = resPath.begin(); it != resPath.end(); ++it )
         {
             string path = (*it) + sep + "fonts" + sep + "FreeSans.ttf";
             pFont = new FT2Font( getIntf(), path, 12 );

modules/gui/skins2/parser/xmlparser.cpp

@@ -92,7 +92,7 @@ void XMLParser::LoadCatalog()
 
     // Try to load the catalog first (needed at least on win32 where
     // we don't have a default catalog)
-    for( it = resPath.begin(); it != resPath.end(); it++ )
+    for( it = resPath.begin(); it != resPath.end(); ++it )
     {
         string catalog_path = (*it) + sep + "skin.catalog";
         if( !stat( catalog_path.c_str(), &statBuf ) )
@@ -108,7 +108,7 @@ void XMLParser::LoadCatalog()
         xml_CatalogLoad( m_pXML, 0 );
     }
 
-    for( it = resPath.begin(); it != resPath.end(); it++ )
+    for( it = resPath.begin(); it != resPath.end(); ++it )
     {
         string path = (*it) + sep + "skin.dtd";
         if( !stat( path.c_str(), &statBuf ) )
@@ -180,7 +180,7 @@ bool XMLParser::parse()
                 {
                     free( (char *)it->first );
                     free( (char *)it->second );
-                    it++;
+                    ++it;
                 }
                 break;
             }

modules/gui/skins2/src/generic_layout.cpp

@@ -58,13 +58,13 @@ GenericLayout::~GenericLayout()
     delete m_pImage;
 
     list<Anchor*>::const_iterator it;
-    for( it = m_anchorList.begin(); it != m_anchorList.end(); it++ )
+    for( it = m_anchorList.begin(); it != m_anchorList.end(); ++it )
     {
         delete *it;
     }
 
     list<LayeredControl>::const_iterator iter;
-    for( iter = m_controlList.begin(); iter != m_controlList.end(); iter++ )
+    for( iter = m_controlList.begin(); iter != m_controlList.end(); ++iter )
     {
         CtrlGeneric *pCtrl = (*iter).m_pControl;
         pCtrl->unsetLayout();
@@ -112,7 +112,7 @@ void GenericLayout::addControl( CtrlGeneric *pControl,
         // Add the control in the list.
         // This list must remain sorted by layer order
         list<LayeredControl>::iterator it;
-        for( it = m_controlList.begin(); it != m_controlList.end(); it++ )
+        for( it = m_controlList.begin(); it != m_controlList.end(); ++it )
         {
             if( layer < (*it).m_layer )
             {
@@ -185,7 +185,7 @@ void GenericLayout::resize( int width, int height )
 
     // Notify all the controls that the size has changed and redraw them
     list<LayeredControl>::const_iterator iter;
-    for( iter = m_controlList.begin(); iter != m_controlList.end(); iter++ )
+    for( iter = m_controlList.begin(); iter != m_controlList.end(); ++iter )
     {
         iter->m_pControl->onResize();
     }
@@ -220,7 +220,7 @@ void GenericLayout::refreshRect( int x, int y, int width, int height )
     // Draw all the controls of the layout
     list<LayeredControl>::const_iterator iter;
     list<LayeredControl>::const_iterator iterVideo = m_controlList.end();
-    for( iter = m_controlList.begin(); iter != m_controlList.end(); iter++ )
+    for( iter = m_controlList.begin(); iter != m_controlList.end(); ++iter )
     {
         CtrlGeneric *pCtrl = (*iter).m_pControl;
         if( pCtrl->isVisible() )

modules/gui/skins2/src/theme.cpp

@@ -180,14 +180,14 @@ void Theme::saveConfig()
     map<string, TopWindowPtr>::const_iterator itWin;
     map<string, GenericLayoutPtr>::const_iterator itLay;
     ostringstream outStream;
-    for( itWin = m_windows.begin(); itWin != m_windows.end(); itWin++ )
+    for( itWin = m_windows.begin(); itWin != m_windows.end(); ++itWin )
     {
         TopWindow *pWin = itWin->second.get();
 
         // Find the layout id for this window
         string layoutId;
         const GenericLayout *pLayout = &pWin->getActiveLayout();
-        for( itLay = m_layouts.begin(); itLay != m_layouts.end(); itLay++ )
+        for( itLay = m_layouts.begin(); itLay != m_layouts.end(); ++itLay )
         {
             if( itLay->second.get() == pLayout )
             {

modules/gui/skins2/src/theme_repository.cpp

@@ -66,14 +66,14 @@ ThemeRepository::ThemeRepository( intf_thread_t *pIntf ): SkinObject( pIntf )
     OSFactory *pOsFactory = OSFactory::instance( pIntf );
     list<string> resPath = pOsFactory->getResourcePath();
     list<string>::const_iterator it;
-    for( it = resPath.begin(); it != resPath.end(); it++ )
+    for( it = resPath.begin(); it != resPath.end(); ++it )
     {
         parseDirectory( *it );
     }
 
     // retrieve skins from skins directories and locate default skins
     map<string,string>::const_iterator itmap, itdefault;
-    for( itmap = m_skinsMap.begin(); itmap != m_skinsMap.end(); itmap++ )
+    for( itmap = m_skinsMap.begin(); itmap != m_skinsMap.end(); ++itmap )
     {
         string name = itmap->first;
         string path = itmap->second;
@@ -223,7 +223,7 @@ void ThemeRepository::updateRepository()
     // add this new skins if not yet present in repository
     string current( psz_current );
     map<string,string>::const_iterator it;
-    for( it = m_skinsMap.begin(); it != m_skinsMap.end(); it++ )
+    for( it = m_skinsMap.begin(); it != m_skinsMap.end(); ++it )
     {
         if( it->second == current )
             break;

modules/gui/skins2/src/top_window.cpp

@@ -432,7 +432,7 @@ CtrlGeneric *TopWindow::findHitControl( int xPos, int yPos )
     CtrlGeneric *pNewHitControl = NULL;
 
     // Loop on the control list to find the uppest hit control
-    for( iter = ctrlList.rbegin(); iter != ctrlList.rend(); iter++ )
+    for( iter = ctrlList.rbegin(); iter != ctrlList.rend(); ++iter )
     {
         // Get the position of the control in the layout
         const Position *pos = (*iter).m_pControl->getPosition();

modules/gui/skins2/src/var_manager.cpp

@@ -37,7 +37,7 @@ VarManager::~VarManager()
 {
     // Delete the variables in the reverse order they were added
     list<string>::const_iterator it1;
-    for( it1 = m_varList.begin(); it1 != m_varList.end(); it1++ )
+    for( it1 = m_varList.begin(); it1 != m_varList.end(); ++it1 )
     {
         m_varMap.erase(*it1);
     }

modules/gui/skins2/src/vout_manager.cpp

@@ -105,7 +105,7 @@ void VoutManager::saveVoutConfig( )
     // Save width/height to be consistent across themes
     // and detach Video Controls
     vector<SavedWnd>::iterator it;
-    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); it++ )
+    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
     {
         if( (*it).pCtrlVideo )
         {
@@ -135,7 +135,7 @@ void VoutManager::restoreVoutConfig( bool b_success )
 
     // reattach vout(s) to Video Controls
     vector<SavedWnd>::iterator it;
-    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); it++ )
+    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
     {
         CtrlVideo* pCtrlVideo = getBestCtrlVideo();
         if( pCtrlVideo )
@@ -150,7 +150,7 @@ void VoutManager::restoreVoutConfig( bool b_success )
 void VoutManager::discardVout( CtrlVideo* pCtrlVideo )
 {
     vector<SavedWnd>::iterator it;
-    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); it++ )
+    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
     {
         if( (*it).pCtrlVideo == pCtrlVideo )
         {
@@ -168,7 +168,7 @@ void VoutManager::discardVout( CtrlVideo* pCtrlVideo )
 void VoutManager::requestVout( CtrlVideo* pCtrlVideo )
 {
     vector<SavedWnd>::iterator it;
-    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); it++ )
+    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
     {
         if( (*it).pCtrlVideo == NULL )
         {
@@ -186,7 +186,7 @@ CtrlVideo* VoutManager::getBestCtrlVideo( )
     // try to find an unused useable VideoControl
 
     vector<CtrlVideo*>::const_iterator it;
-    for( it = m_pCtrlVideoVec.begin(); it != m_pCtrlVideoVec.end(); it++ )
+    for( it = m_pCtrlVideoVec.begin(); it != m_pCtrlVideoVec.end(); ++it )
     {
         if( (*it)->isUseable() && !(*it)->isUsed() )
         {
@@ -236,7 +236,7 @@ void VoutManager::releaseWnd( vout_window_t *pWnd )
 {
     // remove vout thread from savedVec
     vector<SavedWnd>::iterator it;
-    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); it++ )
+    for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
     {
         if( (*it).pWnd == pWnd )
         {
@@ -267,7 +267,7 @@ void VoutManager::setSizeWnd( vout_window_t *pWnd, int width, int height )
                   width, height );
 
    vector<SavedWnd>::iterator it;
-   for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); it++ )
+   for( it = m_SavedWndVec.begin(); it != m_SavedWndVec.end(); ++it )
    {
        if( (*it).pWnd == pWnd )
        {

modules/gui/skins2/src/window_manager.cpp

@@ -75,7 +75,7 @@ void WindowManager::startMove( TopWindow &rWindow )
     {
         // Change the opacity of the moving windows
         WinSet_t::const_iterator it;
-        for( it = m_movingWindows.begin(); it != m_movingWindows.end(); it++ )
+        for( it = m_movingWindows.begin(); it != m_movingWindows.end(); ++it )
         {
             (*it)->setOpacity( m_moveAlpha );
         }
@@ -83,7 +83,7 @@ void WindowManager::startMove( TopWindow &rWindow )
         // FIXME: We need to refresh the windows, because if 2 windows overlap
         // and one of them becomes transparent, the other one is not refreshed
         // automatically. I don't know why... -- Ipkiss
-        for( it = m_allWindows.begin(); it != m_allWindows.end(); it++ )
+        for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
         {
             (*it)->refresh( 0, 0, (*it)->getWidth(), (*it)->getHeight() );
         }
@@ -100,7 +100,7 @@ void WindowManager::stopMove()
     {
         // Restore the opacity of the moving windows
         WinSet_t::const_iterator it;
-        for( it = m_movingWindows.begin(); it != m_movingWindows.end(); it++ )
+        for( it = m_movingWindows.begin(); it != m_movingWindows.end(); ++it )
         {
             (*it)->setOpacity( m_alpha );
         }
@@ -111,14 +111,14 @@ void WindowManager::stopMove()
 
     // Now we rebuild the dependencies.
     // Iterate through all the windows
-    for( itWin1 = m_allWindows.begin(); itWin1 != m_allWindows.end(); itWin1++ )
+    for( itWin1 = m_allWindows.begin(); itWin1 != m_allWindows.end(); ++itWin1 )
     {
         // Get the anchors of the layout associated to the window
         const AncList_t &ancList1 =
             (*itWin1)->getActiveLayout().getAnchorList();
 
         // Iterate through all the windows, starting with (*itWin1)
-        for( itWin2 = itWin1; itWin2 != m_allWindows.end(); itWin2++ )
+        for( itWin2 = itWin1; itWin2 != m_allWindows.end(); ++itWin2 )
         {
             // A window can't anchor itself...
             if( (*itWin2) == (*itWin1) )
@@ -127,10 +127,10 @@ void WindowManager::stopMove()
             // Now, check for anchoring between the 2 windows
             const AncList_t &ancList2 =
                 (*itWin2)->getActiveLayout().getAnchorList();
-            for( itAnc1 = ancList1.begin(); itAnc1 != ancList1.end(); itAnc1++ )
+            for( itAnc1 = ancList1.begin(); itAnc1 != ancList1.end(); ++itAnc1 )
             {
                 for( itAnc2 = ancList2.begin();
-                     itAnc2 != ancList2.end(); itAnc2++ )
+                     itAnc2 != ancList2.end(); ++itAnc2 )
                 {
                     if( (*itAnc1)->isHanging( **itAnc2 ) )
                     {
@@ -160,7 +160,7 @@ void WindowManager::move( TopWindow &rWindow, int left, int top ) const
 
     // Move all the windows
     WinSet_t::const_iterator it;
-    for( it = m_movingWindows.begin(); it != m_movingWindows.end(); it++ )
+    for( it = m_movingWindows.begin(); it != m_movingWindows.end(); ++it )
     {
         (*it)->move( (*it)->getLeft() + xOffset, (*it)->getTop() + yOffset );
     }
@@ -187,15 +187,15 @@ void WindowManager::startResize( GenericLayout &rLayout, Direction_t direction )
 
     // Iterate through all the hanged windows
     for( itWin = m_dependencies[rLayout.getWindow()].begin();
-         itWin != m_dependencies[rLayout.getWindow()].end(); itWin++ )
+         itWin != m_dependencies[rLayout.getWindow()].end(); ++itWin )
     {
         // Now, check for anchoring between the 2 windows
         const AncList_t &ancList2 =
             (*itWin)->getActiveLayout().getAnchorList();
-        for( itAnc1 = ancList1.begin(); itAnc1 != ancList1.end(); itAnc1++ )
+        for( itAnc1 = ancList1.begin(); itAnc1 != ancList1.end(); ++itAnc1 )
         {
             for( itAnc2 = ancList2.begin();
-                 itAnc2 != ancList2.end(); itAnc2++ )
+                 itAnc2 != ancList2.end(); ++itAnc2 )
             {
                 if( (*itAnc1)->isHanging( **itAnc2 ) )
                 {
@@ -285,7 +285,7 @@ void WindowManager::resize( GenericLayout &rLayout,
     if( m_direction == kResizeE ||
         m_direction == kResizeSE )
     {
-        for( it = m_resizeMovingE.begin(); it != m_resizeMovingE.end(); it++ )
+        for( it = m_resizeMovingE.begin(); it != m_resizeMovingE.end(); ++it )
         {
             (*it)->move( (*it)->getLeft() + xNewOffset,
                          (*it)->getTop() );
@@ -294,7 +294,7 @@ void WindowManager::resize( GenericLayout &rLayout,
     if( m_direction == kResizeE ||
         m_direction == kResizeSE )
     {
-        for( it = m_resizeMovingS.begin(); it != m_resizeMovingS.end(); it++ )
+        for( it = m_resizeMovingS.begin(); it != m_resizeMovingS.end(); ++it )
         {
             (*it)->move( (*it)->getLeft(),
                          (*it)->getTop( )+ yNewOffset );
@@ -304,7 +304,7 @@ void WindowManager::resize( GenericLayout &rLayout,
         m_direction == kResizeS ||
         m_direction == kResizeSE )
     {
-        for( it = m_resizeMovingSE.begin(); it != m_resizeMovingSE.end(); it++ )
+        for( it = m_resizeMovingSE.begin(); it != m_resizeMovingSE.end(); ++it )
         {
             (*it)->move( (*it)->getLeft() + xNewOffset,
                          (*it)->getTop() + yNewOffset );
@@ -360,7 +360,7 @@ void WindowManager::unmaximize( TopWindow &rWindow )
 void WindowManager::synchVisibility() const
 {
     WinSet_t::const_iterator it;
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); it++ )
+    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
     {
         // Show the window if it has to be visible
         if( (*it)->getVisibleVar().get() )
@@ -375,7 +375,7 @@ void WindowManager::saveVisibility()
 {
     WinSet_t::const_iterator it;
     m_savedWindows.clear();
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); it++ )
+    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
     {
         // Remember the window if it is visible
         if( (*it)->getVisibleVar().get() )
@@ -395,7 +395,7 @@ void WindowManager::restoreVisibility() const
     }
 
     WinSet_t::const_iterator it;
-    for( it = m_savedWindows.begin(); it != m_savedWindows.end(); it++)
+    for( it = m_savedWindows.begin(); it != m_savedWindows.end(); ++it )
     {
         (*it)->show();
     }
@@ -406,7 +406,7 @@ void WindowManager::raiseAll() const
 {
     // Raise all the windows
     WinSet_t::const_iterator it;
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); it++ )
+    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
     {
         (*it)->raise();
     }
@@ -417,7 +417,7 @@ void WindowManager::showAll( bool firstTime ) const
 {
     // Show all the windows
     WinSet_t::const_iterator it;
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); it++ )
+    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
     {
         // When the theme is opened for the first time,
         // only show the window if set as visible in the XML
@@ -432,7 +432,7 @@ void WindowManager::showAll( bool firstTime ) const
 void WindowManager::hideAll() const
 {
     WinSet_t::const_iterator it;
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); it++ )
+    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
     {
         (*it)->hide();
     }
@@ -447,7 +447,7 @@ void WindowManager::setOnTop( bool b_ontop )
 
     // set/unset the "on top" status
     WinSet_t::const_iterator it;
-    for( it = m_allWindows.begin(); it != m_allWindows.end(); it++ )
+    for( it = m_allWindows.begin(); it != m_allWindows.end(); ++it )
     {
         (*it)->toggleOnTop( b_ontop );
     }
@@ -471,7 +471,7 @@ void WindowManager::buildDependSet( WinSet_t &rWinSet,
     // Iterate through the anchored windows
     const WinSet_t &anchored = m_dependencies[pWindow];
     WinSet_t::const_iterator iter;
-    for( iter = anchored.begin(); iter != anchored.end(); iter++ )
+    for( iter = anchored.begin(); iter != anchored.end(); ++iter )
     {
         // Check that the window isn't already in the set before adding it
         if( rWinSet.find( *iter ) == rWinSet.end() )
@@ -492,7 +492,7 @@ void WindowManager::checkAnchors( TopWindow *pWindow,
     SkinsRect workArea = OSFactory::instance( getIntf() )->getWorkArea();
     // Iterate through the moving windows
     for( itMov = m_movingWindows.begin();
-         itMov != m_movingWindows.end(); itMov++ )
+         itMov != m_movingWindows.end(); ++itMov )
     {
         // Skip the invisible windows
         if( ! (*itMov)->getVisibleVar().get() )
@@ -528,7 +528,7 @@ void WindowManager::checkAnchors( TopWindow *pWindow,
 
     // Iterate through the moving windows
     for( itMov = m_movingWindows.begin();
-         itMov != m_movingWindows.end(); itMov++ )
+         itMov != m_movingWindows.end(); ++itMov )
     {
         // Skip the invisible windows
         if( ! (*itMov)->getVisibleVar().get() )
@@ -542,7 +542,7 @@ void WindowManager::checkAnchors( TopWindow *pWindow,
 
         // Iterate through the static windows
         for( itSta = m_allWindows.begin();
-             itSta != m_allWindows.end(); itSta++ )
+             itSta != m_allWindows.end(); ++itSta )
         {
             // Skip the moving windows and the invisible ones
             if( m_movingWindows.find( (*itSta) ) != m_movingWindows.end() ||
@@ -558,10 +558,10 @@ void WindowManager::checkAnchors( TopWindow *pWindow,
             // Check if there is an anchoring between one of the movAnchors
             // and one of the staAnchors
             for( itAncMov = movAnchors.begin();
-                 itAncMov != movAnchors.end(); itAncMov++ )
+                 itAncMov != movAnchors.end(); ++itAncMov )
             {
                 for( itAncSta = staAnchors.begin();
-                     itAncSta != staAnchors.end(); itAncSta++ )
+                     itAncSta != staAnchors.end(); ++itAncSta )
                 {
                     if( (*itAncSta)->canHang( **itAncMov, xOffset, yOffset ) )
                     {

modules/gui/skins2/x11/x11_dragdrop.cpp

@@ -82,7 +82,7 @@ void X11DragDrop::dndEnter( ldata_t data )
     // Find the right target
     m_target = None;
     list<string>::iterator it;
-    for( it = dataTypes.begin(); it != dataTypes.end(); it++ )
+    for( it = dataTypes.begin(); it != dataTypes.end(); ++it )
     {
         if( *it == "text/plain" || *it == "STRING" )
         {

modules/gui/skins2/x11/x11_timer.cpp

@@ -110,7 +110,7 @@ void X11TimerLoop::waitNextTimer()
 
     // Find the next timer to execute
     list<X11Timer*>::const_iterator timer;
-    for( timer = m_timers.begin(); timer != m_timers.end(); timer++ )
+    for( timer = m_timers.begin(); timer != m_timers.end(); ++timer )
     {
         mtime_t timerDate = (*timer)->getNextDate();
         if( timerDate < nextDate )

modules/services_discovery/upnp_intel.cpp

@@ -916,7 +916,7 @@ void MediaServerList::removeServer( const char* psz_udn )
             "Removing server '%s'", p_server->getFriendlyName() );
 
     std::vector<MediaServer*>::iterator it;
-    for ( it = _list.begin(); it != _list.end(); it++ )
+    for ( it = _list.begin(); it != _list.end(); ++it )
     {
         if ( *it == p_server )
         {