Simplify containers iterations in test..tools

Use range-based loop or replace with STL functions.

Change-Id: If8fac9236a4696c8e56c0e81c60c429782581b96
Reviewed-on: https://gerrit.libreoffice.org/62262
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

9 files changed, 53 insertions, 84 deletions

diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 69bc6b94fb48..1235e6c09889 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -707,10 +707,9 @@ Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getCo
     ::std::vector< Reference< XControlModel > > aUnindexedModels;
         // will be the container of all models which do not have a tab index property
 
-    UnoControlModelHolderVector::const_iterator aLoop = maModels.begin();
-    for ( ; aLoop != maModels.end(); ++aLoop )
+    for ( const auto& rModel : maModels )
     {
-        Reference< XControlModel > xModel( aLoop->first );
+        Reference< XControlModel > xModel( rModel.first );
 
         // see if the model has a TabIndex property
         Reference< XPropertySet > xControlProps( xModel, UNO_QUERY );
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index d6eb98d3b0bd..00a34fc696c2 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -287,32 +287,23 @@ private:
         }
 
         // fire removal notifications
-        for (   ::std::vector< ContainerEvent >::const_iterator event = aRemovedColumns.begin();
-                event != aRemovedColumns.end();
-                ++event
-            )
+        for (const auto& rEvent : aRemovedColumns)
         {
-            m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, *event );
+            m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, rEvent );
         }
 
         // fire insertion notifications
-        for (   ::std::vector< ContainerEvent >::const_iterator event = aInsertedColumns.begin();
-                event != aInsertedColumns.end();
-                ++event
-            )
+        for (const auto& rEvent : aInsertedColumns)
         {
-            m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, *event );
+            m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, rEvent );
         }
 
         // dispose removed columns
-        for (   ::std::vector< ContainerEvent >::const_iterator event = aRemovedColumns.begin();
-                event != aRemovedColumns.end();
-                ++event
-            )
+        for (const auto& rEvent : aRemovedColumns)
         {
             try
             {
-                const Reference< XComponent > xColComp( event->Element, UNO_QUERY_THROW );
+                const Reference< XComponent > xColComp( rEvent.Element, UNO_QUERY_THROW );
                 xColComp->dispose();
             }
             catch( const Exception& )
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index e613878a3166..35252453c2cc 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -444,8 +444,8 @@ private:
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
 
         RowData& rRowData = impl_getRowDataAccess_throw( i_rowIndex, m_nColumnCount );
-        for ( RowData::iterator cell = rRowData.begin(); cell != rRowData.end(); ++cell )
-            cell->second = i_value;
+        for ( auto& rCell : rRowData )
+            rCell.second = i_value;
     }
 
 
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 9f7edd97a369..f17ae53c14c0 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -375,13 +375,10 @@ void lcl_clear( STLCONTAINER& i_container )
 
     void lcl_decrementValuesGreaterThan( ::std::vector< ::sal_Int32 > & io_indexMap, sal_Int32 const i_threshold )
     {
-        for (   ::std::vector< ::sal_Int32 >::iterator loop = io_indexMap.begin();
-                loop != io_indexMap.end();
-                ++loop
-            )
+        for ( auto& rIndex : io_indexMap )
         {
-            if ( *loop >= i_threshold )
-                --*loop;
+            if ( rIndex >= i_threshold )
+                --rIndex;
         }
     }
 
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 48e7902b2a93..1807c2200394 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -232,9 +232,9 @@ static void lcl_throwIndexOutOfBoundsException( )
           while ( bIncrement )
           {
               bIncrement = false;
-              for ( RoadmapItemHolderList::iterator i = maRoadmapItems.begin(); i < maRoadmapItems.end(); ++i )
+              for ( const auto& rRoadmapItem : maRoadmapItems )
               {
-                CurRoadmapItem = *i;
+                CurRoadmapItem = rRoadmapItem;
                 Reference< XPropertySet > xPropertySet( CurRoadmapItem, UNO_QUERY );
                 aAny = xPropertySet->getPropertyValue("ID");
                 aAny >>= n_CurItemID;
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index 0c5cd4347b6b..84838061cbdd 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -264,9 +264,8 @@ MutableTreeNode::MutableTreeNode( const MutableTreeDataModelRef& xModel, const A
 
 MutableTreeNode::~MutableTreeNode()
 {
-    TreeNodeVector::iterator aIter( maChildren.begin() );
-    while( aIter != maChildren.end() )
-        (*aIter++)->setParent(nullptr);
+    for( auto& rChild : maChildren )
+        rChild->setParent(nullptr);
 }
 
 void MutableTreeNode::setParent( MutableTreeNode* pParent )
@@ -336,8 +335,7 @@ void SAL_CALL MutableTreeNode::insertChildByIndex( sal_Int32 nChildIndex, const
     xImpl->mbIsInserted = true;
 
     TreeNodeVector::iterator aIter( maChildren.begin() );
-    while( (nChildIndex-- > 0) && (aIter != maChildren.end()) )
-        ++aIter;
+    std::advance(aIter, nChildIndex);
 
     maChildren.insert( aIter, xImpl );
     xImpl->setParent( this );
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 28dac1716889..a52eaf80e6fc 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -644,13 +644,9 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
     // setting peer properties may result in an attempt to acquire the solar mutex, 'cause the peers
     // usually don't have an own mutex but use the SolarMutex instead.
     // To prevent deadlocks resulting from this, we do this without our own mutex locked
-    std::vector< PropertyValue >::iterator aEnd = aPeerPropertiesToSet.end();
-    for (   std::vector< PropertyValue >::iterator aLoop = aPeerPropertiesToSet.begin();
-            aLoop != aEnd;
-            ++aLoop
-        )
+    for (const auto& rProp : aPeerPropertiesToSet)
     {
-        ImplSetPeerProperty( aLoop->Name, aLoop->Value );
+        ImplSetPeerProperty( rProp.Name, rProp.Value );
     }
 
 }
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 7311a184ed48..86ad983ff8e1 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -175,11 +175,11 @@ void UnoControlHolderList::getControls( uno::Sequence< uno::Reference< awt::XCon
 {
     _out_rControls.realloc( maControls.size() );
     uno::Reference< awt::XControl >* pControls = _out_rControls.getArray();
-    for (   ControlMap::const_iterator loop = maControls.begin();
-            loop != maControls.end();
-            ++loop, ++pControls
-        )
-        *pControls = loop->second->getControl();
+    for (const auto& rEntry : maControls)
+    {
+        *pControls = rEntry.second->getControl();
+        ++pControls;
+    }
 }
 
 
@@ -187,36 +187,30 @@ void UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rIde
 {
     _out_rIdentifiers.realloc( maControls.size() );
     sal_Int32* pIndentifiers = _out_rIdentifiers.getArray();
-    for (   ControlMap::const_iterator loop = maControls.begin();
-            loop != maControls.end();
-            ++loop, ++pIndentifiers
-        )
-        *pIndentifiers = loop->first;
+    for (const auto& rEntry : maControls)
+    {
+        *pIndentifiers = rEntry.first;
+        ++pIndentifiers;
+    }
 }
 
 
 uno::Reference< awt::XControl > UnoControlHolderList::getControlForName( const OUString& _rName ) const
 {
-    for (   ControlMap::const_iterator loop = maControls.begin();
-            loop != maControls.end();
-            ++loop
-        )
-        if ( loop->second->getName() == _rName )
-            return loop->second->getControl();
+    auto loop = std::find_if(maControls.begin(), maControls.end(),
+        [&_rName](const ControlMap::value_type& rEntry) { return rEntry.second->getName() == _rName; });
+    if (loop != maControls.end())
+        return loop->second->getControl();
     return uno::Reference< awt::XControl >();
 }
 
 
 UnoControlHolderList::ControlIdentifier UnoControlHolderList::getControlIdentifier( const uno::Reference< awt::XControl >& _rxControl )
 {
-    for (   ControlMap::iterator loop = maControls.begin();
-            loop != maControls.end();
-            ++loop
-        )
-    {
-        if ( loop->second->getControl().get() == _rxControl.get() )
-            return loop->first;
-    }
+    auto loop = std::find_if(maControls.begin(), maControls.end(),
+        [&_rxControl](const ControlMap::value_type& rEntry) { return rEntry.second->getControl().get() == _rxControl.get(); });
+    if (loop != maControls.end())
+        return loop->first;
     return -1;
 }
 
@@ -284,13 +278,8 @@ OUString UnoControlHolderList::impl_getFreeName_throw()
     for ( ControlIdentifier candidateId = 0; candidateId < ::std::numeric_limits< ControlIdentifier >::max(); ++candidateId )
     {
         OUString candidateName( "control_" + OUString::number( candidateId ) );
-        ControlMap::const_iterator loop = maControls.begin();
-        for ( ; loop != maControls.end(); ++loop )
-        {
-            if ( loop->second->getName() == candidateName )
-                break;
-        }
-        if ( loop == maControls.end() )
+        if ( std::none_of(maControls.begin(), maControls.end(),
+                [&candidateName](const ControlMap::value_type& rEntry) { return rEntry.second->getName() == candidateName; }) )
             return candidateName;
     }
     throw uno::RuntimeException("out of identifiers" );
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index e27ec6da790e..b59d4ce0e22d 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -140,8 +140,8 @@ css::uno::Sequence<sal_Int32> UnoControlModel::ImplGetPropertyIds() const
     css::uno::Sequence<sal_Int32>  aIDs( nIDs );
     sal_Int32* pIDs = aIDs.getArray();
     sal_uInt32 n = 0;
-    for ( ImplPropertyTable::const_iterator it = maData.begin(); it != maData.end(); ++it )
-        pIDs[n++] = it->first;
+    for ( const auto& rData : maData )
+        pIDs[n++] = rData.first;
     return aIDs;
 }
 
@@ -408,11 +408,10 @@ void UnoControlModel::ImplRegisterProperty( sal_uInt16 nPropId )
 
 void UnoControlModel::ImplRegisterProperties( const std::vector< sal_uInt16 > &rIds )
 {
-    std::vector< sal_uInt16 >::const_iterator iter;
-    for( iter = rIds.begin(); iter != rIds.end(); ++iter)
+    for (const auto& rId : rIds)
     {
-        if( !ImplHasProperty( *iter ) )
-            ImplRegisterProperty( *iter, ImplGetDefaultValue( *iter ) );
+        if( !ImplHasProperty( rId ) )
+            ImplRegisterProperty( rId, ImplGetDefaultValue( rId ) );
     }
 }
 
@@ -538,12 +537,12 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt
 
     std::set<sal_uInt16> aProps;
 
-    for (ImplPropertyTable::const_iterator it = maData.begin(); it != maData.end(); ++it )
+    for (const auto& rData : maData)
     {
-        if ( ( ( GetPropertyAttribs( it->first ) & css::beans::PropertyAttribute::TRANSIENT ) == 0 )
-            && ( getPropertyState( GetPropertyName( it->first ) ) != css::beans::PropertyState_DEFAULT_VALUE ) )
+        if ( ( ( GetPropertyAttribs( rData.first ) & css::beans::PropertyAttribute::TRANSIENT ) == 0 )
+            && ( getPropertyState( GetPropertyName( rData.first ) ) != css::beans::PropertyState_DEFAULT_VALUE ) )
         {
-            aProps.insert( it->first );
+            aProps.insert( rData.first );
         }
     }
 
@@ -552,13 +551,13 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt
     // Save FontProperty always in the old format (due to missing distinction
     // between 5.0 and 5.1)
     OutStream->writeLong( ( aProps.find( BASEPROPERTY_FONTDESCRIPTOR ) != aProps.end() ) ? ( nProps + 3 ) : nProps );
-    for ( std::set<sal_uInt16>::const_iterator it = aProps.begin(); it != aProps.end(); ++it )
+    for ( const auto& rProp : aProps )
     {
         sal_Int32 nPropDataBeginMark = xMark->createMark();
         OutStream->writeLong( 0 ); // DataLen
 
-        const css::uno::Any* pProp = &(maData[*it]);
-        OutStream->writeShort( *it );
+        const css::uno::Any* pProp = &(maData[rProp]);
+        OutStream->writeShort( rProp );
 
         bool bVoid = pProp->getValueType().getTypeClass() == css::uno::TypeClass_VOID;
 
@@ -687,7 +686,7 @@ void UnoControlModel::write( const css::uno::Reference< css::io::XObjectOutputSt
                 SAL_WARN( "toolkit", "UnoControlModel::write: don't know how to handle a property of type '"
                           << rType.getTypeName()
                           << "'.\n(Currently handling property '"
-                          << GetPropertyName( *it )
+                          << GetPropertyName( rProp )
                           << "'.)");
             }
 #endif