Use for-range loops in comphelper and configmgr

Change-Id: I91033395cb30a4ba9e65adb89712b3c70a39a508
Reviewed-on: https://gerrit.libreoffice.org/50396Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

comphelper/qa/unit/syntaxhighlighttest.cxx

@@ -107,12 +107,11 @@ void SyntaxHighlightTest::testBasic()
         aBasicString, aPortions );
 
     sal_Int32 prevEnd = 0;
-    for(std::vector<HighlightPortion>::const_iterator itr =
-            aPortions.begin(), itrEnd = aPortions.end(); itr != itrEnd; ++itr)
+    for (auto const& portion : aPortions)
     {
-        CPPUNIT_ASSERT_EQUAL(prevEnd, itr->nBegin);
-        CPPUNIT_ASSERT(itr->nBegin < itr->nEnd);
-        prevEnd = itr->nEnd;
+        CPPUNIT_ASSERT_EQUAL(prevEnd, portion.nBegin);
+        CPPUNIT_ASSERT(portion.nBegin < portion.nEnd);
+        prevEnd = portion.nEnd;
     }
     CPPUNIT_ASSERT_EQUAL(aBasicString.getLength(), prevEnd);
 }

comphelper/source/container/enumerablemap.cxx

@@ -556,13 +556,9 @@ namespace comphelper
     {
         ComponentMethodGuard aGuard( *this );
         impl_checkValue_throw( _value );
-
-        for (   KeyedValues::const_iterator mapping = m_aData.m_pValues->begin();
-                mapping != m_aData.m_pValues->end();
-                ++mapping
-            )
+        for (auto const& value : *m_aData.m_pValues)
         {
-            if ( mapping->second == _value )
+            if ( value.second == _value )
                 return true;
         }
         return false;

comphelper/source/misc/configuration.cxx

@@ -229,10 +229,10 @@ void comphelper::ConfigurationListener::removeListener(ConfigurationListenerProp
 
 void comphelper::ConfigurationListener::dispose()
 {
-    for (auto it = maListeners.begin(); it != maListeners.end(); ++it)
+    for (auto const& listener : maListeners)
     {
-        mxConfig->removePropertyChangeListener( (*it)->maName, this );
-        (*it)->dispose();
+        mxConfig->removePropertyChangeListener( listener->maName, this );
+        listener->dispose();
     }
     maListeners.clear();
 }
@@ -252,13 +252,13 @@ void SAL_CALL comphelper::ConfigurationListener::propertyChange(
         comphelper::SolarMutex::get() );
 
     assert( rEvt.Source == mxConfig );
-    for ( auto it = maListeners.begin(); it != maListeners.end(); ++it )
+    for (auto const& listener : maListeners)
     {
-        if ( (*it)->maName == rEvt.PropertyName )
+        if ( listener->maName == rEvt.PropertyName )
         {
             // ignore rEvt.NewValue - in theory it could be stale => not set.
-            css::uno::Any aValue = mxConfig->getPropertyValue( (*it)->maName );
-            (*it)->setProperty( aValue );
+            css::uno::Any aValue = mxConfig->getPropertyValue( listener->maName );
+            listener->setProperty( aValue );
         }
     }
 }

comphelper/source/misc/namedvaluecollection.cxx

@@ -126,13 +126,10 @@ namespace comphelper
 
     NamedValueCollection& NamedValueCollection::merge( const NamedValueCollection& _rAdditionalValues, bool _bOverwriteExisting )
     {
-        for (   NamedValueRepository::const_iterator namedValue = _rAdditionalValues.m_pImpl->aValues.begin();
-                namedValue != _rAdditionalValues.m_pImpl->aValues.end();
-                ++namedValue
-            )
+        for (auto const& value : _rAdditionalValues.m_pImpl->aValues)
         {
-            if ( _bOverwriteExisting || !impl_has( namedValue->first ) )
-                impl_put( namedValue->first, namedValue->second );
+            if ( _bOverwriteExisting || !impl_has( value.first ) )
+                impl_put( value.first, value.second );
         }
 
         return *this;
@@ -154,9 +151,9 @@ namespace comphelper
     std::vector< OUString > NamedValueCollection::getNames() const
     {
         std::vector< OUString > aNames;
-        for ( NamedValueRepository::const_iterator it = m_pImpl->aValues.begin(), end = m_pImpl->aValues.end(); it != end; ++it )
+        for (auto const& value : m_pImpl->aValues)
         {
-            aNames.push_back( it->first );
+            aNames.push_back( value.first );
         }
         return aNames;
     }

comphelper/source/misc/sequenceashashmap.cxx

@@ -204,13 +204,10 @@ const css::uno::Sequence< css::beans::PropertyValue > SequenceAsHashMap::getAsCo
 
 bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const
 {
-    const_iterator pCheck;
-    for (  pCheck  = rCheck.begin();
-           pCheck != rCheck.end()  ;
-         ++pCheck                  )
+    for (auto const& elem : rCheck)
     {
-        const OUString& sCheckName  = pCheck->first;
-        const css::uno::Any&   aCheckValue = pCheck->second;
+        const OUString& sCheckName  = elem.first;
+        const css::uno::Any&   aCheckValue = elem.second;
               const_iterator   pFound      = find(sCheckName);
 
         if (pFound == end())
@@ -226,13 +223,10 @@ bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const
 
 void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate)
 {
-    const_iterator pUpdate;
-    for (  pUpdate  = rUpdate.begin();
-           pUpdate != rUpdate.end()  ;
-         ++pUpdate                   )
+    for (auto const& elem : rUpdate)
     {
-        const OUString& sName  = pUpdate->first;
-        const css::uno::Any&   aValue = pUpdate->second;
+        const OUString& sName  = elem.first;
+        const css::uno::Any&   aValue = elem.second;
 
         (*this)[sName] = aValue;
     }

comphelper/source/property/ChainablePropertySetInfo.cxx

@@ -59,14 +59,15 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties()
         maProperties.realloc ( nSize );
         Property* pProperties = maProperties.getArray();
 
-        for (PropertyInfoHash::const_iterator aIter(maMap.begin()), aEnd(maMap.end()); aIter != aEnd; ++aIter, ++pProperties)
+        for (auto const& elem : maMap)
         {
-            PropertyInfo const * pInfo = (*aIter).second;
+            PropertyInfo const * pInfo = elem.second;
 
             pProperties->Name = pInfo->maName;
             pProperties->Handle = pInfo->mnHandle;
             pProperties->Type = pInfo->maType;
             pProperties->Attributes = pInfo->mnAttributes;
+            ++pProperties;
         }
     }
     return maProperties;

comphelper/source/property/MasterPropertySetInfo.cxx

@@ -68,14 +68,15 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties()
         maProperties.realloc ( nSize );
         Property* pProperties = maProperties.getArray();
 
-        for (PropertyDataHash::const_iterator aIter(maMap.begin()), aEnd(maMap.end()) ; aIter != aEnd; ++aIter, ++pProperties)
+        for (auto const& elem : maMap)
         {
-            PropertyInfo const * pInfo = (*aIter).second->mpInfo;
+            PropertyInfo const * pInfo = elem.second->mpInfo;
 
             pProperties->Name = pInfo->maName;
             pProperties->Handle = pInfo->mnHandle;
             pProperties->Type = pInfo->maType;
             pProperties->Attributes = pInfo->mnAttributes;
+            ++pProperties;
         }
     }
     return maProperties;

comphelper/source/xml/attributelist.cxx

@@ -77,11 +77,10 @@ OUString SAL_CALL  AttributeList::getValueByIndex(sal_Int16 i)
 
 OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName )
 {
-    std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
-
-    for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
-        if( (*ii).sName == sName ) {
-            return (*ii).sType;
+    for (auto const& attribute : m_pImpl->vecAttribute)
+    {
+        if( attribute.sName == sName ) {
+            return attribute.sType;
         }
     }
     return OUString();
@@ -89,11 +88,10 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName )
 
 OUString SAL_CALL AttributeList::getValueByName(const OUString& sName)
 {
-    std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
-
-    for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
-        if( (*ii).sName == sName ) {
-            return (*ii).sValue;
+    for (auto const& attribute : m_pImpl->vecAttribute)
+    {
+        if( attribute.sName == sName ) {
+            return attribute.sValue;
         }
     }
     return OUString();

comphelper/source/xml/xmltools.cxx

@@ -62,10 +62,9 @@ namespace
     {
         static_assert(sizeof(aChaffEncoder) == 256, "this has to cover all chars");
 
-        for (std::vector<sal_uInt8>::iterator aI = rChaff.begin(), aEnd = rChaff.end();
-            aI != aEnd; ++aI)
+        for (auto & elem : rChaff)
         {
-            *aI = aChaffEncoder[*aI];
+            elem = aChaffEncoder[elem];
         }
     }
 }

configmgr/source/components.cxx

@@ -130,10 +130,9 @@ bool canRemoveFromLayer(int layer, rtl::Reference< Node > const & node) {
     switch (node->kind()) {
     case Node::KIND_LOCALIZED_PROPERTY:
     case Node::KIND_GROUP:
-        for (NodeMap::const_iterator i(node->getMembers().begin());
-             i != node->getMembers().end(); ++i)
+        for (auto const& member : node->getMembers())
         {
-            if (!canRemoveFromLayer(layer, i->second)) {
+            if (!canRemoveFromLayer(layer, member.second)) {
                 return false;
             }
         }
@@ -241,19 +240,21 @@ void Components::initGlobalBroadcaster(
     rtl::Reference< RootAccess > const & exclude, Broadcaster * broadcaster)
 {
     //TODO: Iterate only over roots w/ listeners:
-    for (WeakRootSet::iterator i(roots_.begin()); i != roots_.end(); ++i) {
+    for (auto const& elemRoot : roots_)
+    {
         rtl::Reference< RootAccess > root;
-        if ((*i)->acquireCounting() > 1) {
-            root.set(*i); // must not throw
+        if (elemRoot->acquireCounting() > 1) {
+            root.set(elemRoot); // must not throw
         }
-        (*i)->releaseNondeleting();
+        elemRoot->releaseNondeleting();
         if (root.is()) {
             if (root != exclude) {
                 std::vector<OUString> path(root->getAbsolutePath());
                 Modifications::Node const * mods = &modifications.getRoot();
-                for (auto j(path.begin()); j != path.end(); ++j) {
+                for (auto const& pathElem : path)
+                {
                     Modifications::Node::Children::const_iterator k(
-                        mods->children.find(*j));
+                        mods->children.find(pathElem));
                     if (k == mods->children.end()) {
                         mods = nullptr;
                         break;
@@ -362,9 +363,10 @@ void Components::removeExtensionXcuFile(
             rtl::Reference< Node > parent;
             NodeMap const * map = &data_.getComponents();
             rtl::Reference< Node > node;
-            for (auto j(i->begin()); j != i->end(); ++j) {
+            for (auto const& j : *i)
+            {
                 parent = node;
-                node = map->findNode(Data::NO_LAYER, *j);
+                node = map->findNode(Data::NO_LAYER, j);
                 if (!node.is()) {
                     break;
                 }
@@ -638,8 +640,9 @@ Components::~Components()
         flushModifications();
     }
 
-    for (WeakRootSet::iterator i(roots_.begin()); i != roots_.end(); ++i) {
-        (*i)->setAlive(false);
+    for (auto const& rootElem : roots_)
+    {
+        rootElem->setAlive(false);
     }
 }
 

configmgr/source/nodemap.cxx

@@ -33,8 +33,9 @@ void NodeMap::cloneInto(NodeMap * target) const
 {
     assert(target != nullptr && target->empty());
     NodeMapImpl clone(maImpl);
-    for (NodeMapImpl::iterator i(clone.begin()); i != clone.end(); ++i) {
-        i->second = i->second->clone(true);
+    for (auto & elem : clone)
+    {
+        elem.second = elem.second->clone(true);
     }
     std::swap(clone, target->maImpl);
     target->clearCache();

configmgr/source/partial.cxx

@@ -68,13 +68,12 @@ Partial::Partial(
     // * Inner node, !startInclude: contains in-/excluded sub-trees
     // * Leaf node, startInclude: an include starts here
     // * Leaf node, !startInclude: an exclude starts here
-    for (std::set< OUString >::const_iterator i(includedPaths.begin());
-         i != includedPaths.end(); ++i)
+    for (auto const& includedPath : includedPaths)
     {
         sal_Int32 n = 0;
         for (Node * p = &root_;;) {
             OUString seg;
-            bool end = parseSegment(*i, &n, &seg);
+            bool end = parseSegment(includedPath, &n, &seg);
             p = &p->children[seg];
             if (p->startInclude) {
                 break;
@@ -86,13 +85,12 @@ Partial::Partial(
             }
         }
     }
-    for (std::set< OUString >::const_iterator i(excludedPaths.begin());
-         i != excludedPaths.end(); ++i)
+    for (auto const& excludedPath : excludedPaths)
     {
         sal_Int32 n = 0;
         for (Node * p = &root_;;) {
             OUString seg;
-            bool end = parseSegment(*i, &n, &seg);
+            bool end = parseSegment(excludedPath, &n, &seg);
             if (end) {
                 p->children[seg].clear();
                 break;
@@ -120,8 +118,9 @@ Partial::Containment Partial::contains(std::vector<OUString> const & path) const
     // ** If there is no startInclude along its trace: => CONTAINS_SUBNODES
     Node const * p = &root_;
     bool bIncludes = false;
-    for (auto i(path.begin()); i != path.end(); ++i) {
-        Node::Children::const_iterator j(p->children.find(*i));
+    for (auto const& elemPath : path)
+    {
+        Node::Children::const_iterator j(p->children.find(elemPath));
         if (j == p->children.end()) {
             return p->startInclude ? CONTAINS_NODE : CONTAINS_NOT;
         }

configmgr/source/rootaccess.cxx

@@ -80,13 +80,12 @@ void RootAccess::initBroadcaster(
         modifications, broadcaster, changesListeners_.empty() ? nullptr : &changes);
     if (!changes.empty()) {
         css::util::ChangesSet set(comphelper::containerToSequence(changes));
-        for (ChangesListeners::iterator i(changesListeners_.begin());
-             i != changesListeners_.end(); ++i)
+        for (auto const& changesListener : changesListeners_)
         {
             cppu::OWeakObject* pSource = static_cast< cppu::OWeakObject * >(this);
             css::uno::Reference< css::uno::XInterface > xBase( pSource, css::uno::UNO_QUERY );
             broadcaster->addChangesNotification(
-                *i,
+                changesListener,
                 css::util::ChangesEvent(
                     pSource, css::uno::Any( xBase ), set));
         }
@@ -267,11 +266,10 @@ void RootAccess::addSupportedServiceNames(
 
 void RootAccess::initDisposeBroadcaster(Broadcaster * broadcaster) {
     assert(broadcaster != nullptr);
-    for (ChangesListeners::iterator i(changesListeners_.begin());
-         i != changesListeners_.end(); ++i)
+    for (auto const& changesListener : changesListeners_)
     {
         broadcaster->addDisposeNotification(
-            i->get(),
+            changesListener.get(),
             css::lang::EventObject(static_cast< cppu::OWeakObject * >(this)));
     }
     Access::initDisposeBroadcaster(broadcaster);

configmgr/source/writemodfile.cxx

@@ -334,10 +334,9 @@ void writeNode(
         handle.writeString("<prop oor:name=\"");
         writeAttributeValue(handle, name);
         handle.writeString("\" oor:op=\"fuse\">");
-        for (NodeMap::const_iterator i(node->getMembers().begin());
-             i != node->getMembers().end(); ++i)
+        for (auto const& member : node->getMembers())
         {
-            writeNode(components, handle, node, i->first, i->second);
+            writeNode(components, handle, node, member.first, member.second);
         }
         handle.writeString("</prop>");
         break;
@@ -380,10 +379,9 @@ void writeNode(
             handle.writeString("\" oor:op=\"replace");
         }
         handle.writeString("\">");
-        for (NodeMap::const_iterator i(node->getMembers().begin());
-             i != node->getMembers().end(); ++i)
+        for (auto const& member : node->getMembers())
         {
-            writeNode(components, handle, node, i->first, i->second);
+            writeNode(components, handle, node, member.first, member.second);
         }
         handle.writeString("</node>");
         break;

configmgr/source/xcsparser.cxx

@@ -67,40 +67,38 @@ void merge(
         case Node::KIND_LOCALIZED_VALUE:
             break; //TODO: merge certain parts?
         case Node::KIND_GROUP:
-            for (NodeMap::const_iterator i2(update->getMembers().begin());
-                 i2 != update->getMembers().end(); ++i2)
+            for (auto const& updateMember : update->getMembers())
             {
                 NodeMap & members = original->getMembers();
-                NodeMap::iterator i1(members.find(i2->first));
+                NodeMap::iterator i1(members.find(updateMember.first));
                 if (i1 == members.end()) {
-                    if (i2->second->kind() == Node::KIND_PROPERTY &&
+                    if (updateMember.second->kind() == Node::KIND_PROPERTY &&
                         static_cast< GroupNode * >(
                             original.get())->isExtensible())
                     {
-                        members.insert(*i2);
+                        members.insert(updateMember);
                     }
-                } else if (i2->second->kind() == i1->second->kind()) {
-                    merge(i1->second, i2->second);
+                } else if (updateMember.second->kind() == i1->second->kind()) {
+                    merge(i1->second, updateMember.second);
                 }
             }
             break;
         case Node::KIND_SET:
-            for (NodeMap::const_iterator i2(update->getMembers().begin());
-                 i2 != update->getMembers().end(); ++i2)
+            for (auto const& updateMember : update->getMembers())
             {
                 NodeMap & members = original->getMembers();
-                NodeMap::iterator i1(members.find(i2->first));
+                NodeMap::iterator i1(members.find(updateMember.first));
                 if (i1 == members.end()) {
                     if (static_cast< SetNode * >(original.get())->
-                        isValidTemplate(i2->second->getTemplateName()))
+                        isValidTemplate(updateMember.second->getTemplateName()))
                     {
-                        members.insert(*i2);
+                        members.insert(updateMember);
                     }
-                } else if (i2->second->kind() == i1->second->kind() &&
-                           (i2->second->getTemplateName() ==
+                } else if (updateMember.second->kind() == i1->second->kind() &&
+                           (updateMember.second->getTemplateName() ==
                             i1->second->getTemplateName()))
                 {
-                    merge(i1->second, i2->second);
+                    merge(i1->second, updateMember.second);
                 }
             }
             break;