Modernize a bit filter (part2)

mainly by using for-range loops + some algo simplifications

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

5 files changed, 53 insertions, 79 deletions

diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 1219e3cf21d9..85be228fa7eb 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -112,36 +112,31 @@ void TypeDetectionExporter::doExport( const Reference< XOutputStream >& xOS,  co
             xHandler->ignorableWhitespace ( sWhiteSpace );
             xHandler->startElement( sNode, xAttrList );
 
-            XMLFilterVector::const_iterator aIter( rFilters.begin() );
-            while( aIter != rFilters.end() )
+            for (auto const& filter : rFilters)
             {
-                const filter_info_impl* pFilter = (*aIter);
-
                 xAttrList = pAttrList = new ::comphelper::AttributeList;
-                pAttrList->AddAttribute( sName, sCdataAttribute, pFilter->maType );
+                pAttrList->AddAttribute( sName, sCdataAttribute, filter->maType );
                 xHandler->ignorableWhitespace ( sWhiteSpace );
                 xHandler->startElement( sNode, xAttrList );
                 OUString sValue("0");
                 sValue += sComma;
                 sValue += sComma;
-                if( !pFilter->maDocType.isEmpty() )
+                if( !filter->maDocType.isEmpty() )
                 {
                     sValue += sDocTypePrefix;
-                    sValue += pFilter->maDocType;
+                    sValue += filter->maDocType;
                 }
                 sValue += sComma;
                 sValue += sComma;
-                sValue += pFilter->maExtension;
+                sValue += filter->maExtension;
                 sValue += sComma;
-                sValue += OUString::number( pFilter->mnDocumentIconID );
+                sValue += OUString::number( filter->mnDocumentIconID );
                 sValue += sComma;
 
                 addProperty( xHandler, sData, sValue );
-                addLocaleProperty( xHandler, sUIName, pFilter->maInterfaceName );
+                addLocaleProperty( xHandler, sUIName, filter->maInterfaceName );
                 xHandler->ignorableWhitespace ( sWhiteSpace );
                 xHandler->endElement( sNode );
-
-                ++aIter;
             }
 
             xHandler->ignorableWhitespace ( sWhiteSpace );
@@ -155,53 +150,49 @@ void TypeDetectionExporter::doExport( const Reference< XOutputStream >& xOS,  co
             xHandler->ignorableWhitespace ( sWhiteSpace );
             xHandler->startElement( sNode, xAttrList );
 
-            XMLFilterVector::const_iterator aIter( rFilters.begin() );
-            while( aIter != rFilters.end() )
+            for (auto const& filter : rFilters)
             {
-                const filter_info_impl* pFilter = (*aIter);
-
                 xAttrList = pAttrList = new ::comphelper::AttributeList;
-                pAttrList->AddAttribute( sName, sCdataAttribute, pFilter->maFilterName );
+                pAttrList->AddAttribute( sName, sCdataAttribute, filter->maFilterName );
                 xHandler->ignorableWhitespace ( sWhiteSpace );
                 xHandler->startElement( sNode, xAttrList );
-                addLocaleProperty( xHandler, sUIName, pFilter->maInterfaceName );
+                addLocaleProperty( xHandler, sUIName, filter->maInterfaceName );
 
                 OUString sValue("0");
                 sValue += sComma;
-                sValue += pFilter->maType;
+                sValue += filter->maType;
                 sValue += sComma;
-                sValue += pFilter->maDocumentService;
+                sValue += filter->maDocumentService;
                 sValue += sComma;
                 sValue += sFilterAdaptorService;
                 sValue += sComma;
-                sValue += OUString::number( pFilter->maFlags );
+                sValue += OUString::number( filter->maFlags );
                 sValue += sComma;
                 sValue += sXSLTFilterService;
                 sValue += sDelim;
-                sValue += OUString::boolean( pFilter->mbNeedsXSLT2 );
+                sValue += OUString::boolean( filter->mbNeedsXSLT2 );
                 sValue += sDelim;
 
-                const application_info_impl* pAppInfo = getApplicationInfo( pFilter->maExportService );
+                const application_info_impl* pAppInfo = getApplicationInfo( filter->maExportService );
                 sValue += pAppInfo->maXMLImporter;
                 sValue += sDelim;
                 sValue += pAppInfo->maXMLExporter;
                 sValue += sDelim;
 
-                sValue += createRelativeURL( pFilter->maFilterName, pFilter->maImportXSLT );
+                sValue += createRelativeURL( filter->maFilterName, filter->maImportXSLT );
                 sValue += sDelim;
-                sValue += createRelativeURL( pFilter->maFilterName, pFilter->maExportXSLT );
+                sValue += createRelativeURL( filter->maFilterName, filter->maExportXSLT );
                 sValue += sDelim;
                 // entry DTD obsolete and removed, but delimiter kept
                 sValue += sDelim;
-                sValue += pFilter->maComment;
+                sValue += filter->maComment;
                 sValue += sComma;
                 sValue += "0";
                 sValue += sComma;
-                sValue += createRelativeURL( pFilter->maFilterName, pFilter->maImportTemplate );
+                sValue += createRelativeURL( filter->maFilterName, filter->maImportTemplate );
                 addProperty( xHandler, sData, sValue );
                 xHandler->ignorableWhitespace ( sWhiteSpace );
                 xHandler->endElement( sNode );
-                ++aIter;
             }
 
             xHandler->endElement( sNode );
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 07c200d90dc8..bdfd039e5875 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -69,20 +69,18 @@ void TypeDetectionImporter::doImport( const Reference< XComponentContext >& rxCo
 void TypeDetectionImporter::fillFilterVector(  XMLFilterVector& rFilters )
 {
     // create filter infos from imported filter nodes
-    NodeVector::iterator aIter = maFilterNodes.begin();
-    while( aIter != maFilterNodes.end() )
+    for (auto const& filterNode : maFilterNodes)
     {
-        filter_info_impl* pFilter = createFilterForNode( *aIter );
+        filter_info_impl* pFilter = createFilterForNode(filterNode);
         if( pFilter )
             rFilters.push_back( pFilter );
 
-        delete *aIter++;
+        delete filterNode;
     }
 
     // now delete type nodes
-    aIter = maTypeNodes.begin();
-    while( aIter != maTypeNodes.end() )
-        delete *aIter++;
+    for (auto const& typeNode : maTypeNodes)
+        delete typeNode;
 }
 
 static OUString getSubdata( int index, sal_Unicode delimiter, const OUString& rData )
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 1b92af47f6c5..deb83c62ec43 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -168,21 +168,18 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
             xIfc->getByHierarchicalName( "/" ) >>= xRootFolder;
 
             // export filters files
-            XMLFilterVector::const_iterator aIter( rFilters.begin() );
-            while( aIter != rFilters.end() )
+            for (auto const& filter : rFilters)
             {
-                const filter_info_impl* pFilter = (*aIter);
-
-                Reference< XInterface > xFilterRoot( addFolder( xRootFolder, xFactory, pFilter->maFilterName ) );
+                Reference< XInterface > xFilterRoot( addFolder( xRootFolder, xFactory, filter->maFilterName ) );
 
                 if( xFilterRoot.is() )
                 {
-                    if( !pFilter->maExportXSLT.isEmpty() )
-                        addFile( xFilterRoot, xFactory, pFilter->maExportXSLT );
+                    if( !filter->maExportXSLT.isEmpty() )
+                        addFile( xFilterRoot, xFactory, filter->maExportXSLT );
                     try
                     {
-                        if( !pFilter->maImportXSLT.isEmpty() )
-                            addFile( xFilterRoot, xFactory, pFilter->maImportXSLT );
+                        if( !filter->maImportXSLT.isEmpty() )
+                            addFile( xFilterRoot, xFactory, filter->maImportXSLT );
                     }
                     catch(const css::container::ElementExistException&)
                     {
@@ -191,11 +188,9 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
                         OSL_FAIL( "XMLFilterJarHelper::same named xslt filter exception!" );
                     }
 
-                    if( !pFilter->maImportTemplate.isEmpty() )
-                        addFile( xFilterRoot, xFactory, pFilter->maImportTemplate );
+                    if( !filter->maImportTemplate.isEmpty() )
+                        addFile( xFilterRoot, xFactory, filter->maImportTemplate );
                 }
-
-                ++aIter;
             }
 
             // create TypeDetection.xcu
@@ -274,19 +269,17 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
 
                     // copy all files used by the filters imported from the
                     // typedetection to office/user/xslt
-                    XMLFilterVector::iterator aIter( aFilters.begin() );
-                    while( aIter != aFilters.end() )
+                    for (auto const& filter : aFilters)
                     {
-                        if( copyFiles( xIfc, (*aIter) ) )
+                        if( copyFiles( xIfc, filter ) )
                         {
-                            rFilters.push_back( *aIter );
+                            rFilters.push_back(filter);
                         }
                         else
                         {
                             // failed to copy all files
-                            delete *aIter;
+                            delete filter;
                         }
-                        ++aIter;
                     }
                 }
             }
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index fa0f745ff89c..0806d605ebf4 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -935,18 +935,15 @@ void XMLFilterSettingsDialog::onOpen()
         aJarHelper.openPackage( aURL, aFilters );
 
         int nFilters = 0;
-        XMLFilterVector::iterator aIter( aFilters.begin() );
-        while( aIter != aFilters.end() )
+        for (auto const& filter : aFilters)
         {
-            filter_info_impl* pInfo = (*aIter++);
-
-            if( insertOrEdit( pInfo ) )
+            if( insertOrEdit(filter) )
             {
-                aFilterName = pInfo->maFilterName;
+                aFilterName = filter->maFilterName;
                 nFilters++;
             }
 
-            delete pInfo;
+            delete filter;
         }
 
         disposeFilterList();
@@ -1005,10 +1002,9 @@ bool XMLFilterSettingsDialog::EventNotify( NotifyEvent& rNEvt )
 
 void XMLFilterSettingsDialog::disposeFilterList()
 {
-    std::vector< filter_info_impl* >::iterator aIter( maFilterVector.begin() );
-    while( aIter != maFilterVector.end() )
+    for (auto const& filter : maFilterVector)
     {
-        delete *aIter++;
+        delete filter;
     }
     maFilterVector.clear();
 
@@ -1259,13 +1255,12 @@ std::vector< application_info_impl* >& getApplicationInfos()
 const application_info_impl* getApplicationInfo( const OUString& rServiceName )
 {
     std::vector< application_info_impl* >& rInfos = getApplicationInfos();
-    for (std::vector< application_info_impl* >::const_iterator aIter( rInfos.begin() ), aEnd( rInfos.end() );
-        aIter != aEnd ; ++aIter)
+    for (auto const& info : rInfos)
     {
-        if( rServiceName == (*aIter)->maXMLExporter ||
-            rServiceName == (*aIter)->maXMLImporter)
+        if( rServiceName == info->maXMLExporter ||
+            rServiceName == info->maXMLImporter)
         {
-            return (*aIter);
+            return info;
         }
     }
     return nullptr;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index 0ada6268b69c..a86e68a67f6b 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -34,10 +34,9 @@ XMLFilterTabPageBasic::XMLFilterTabPageBasic(vcl::Window* pParent)
     m_pEDDescription->set_height_request(m_pEDDescription->GetTextHeight() * 4);
 
     std::vector< application_info_impl* >& rInfos = getApplicationInfos();
-    std::vector< application_info_impl* >::iterator aIter( rInfos.begin() );
-    while( aIter != rInfos.end() )
+    for (auto const& info : rInfos)
     {
-        OUString aEntry( (*aIter++)->maDocumentUIName );
+        OUString aEntry( info->maDocumentUIName );
         m_pCBApplication->InsertEntry( aEntry );
     }
 }
@@ -104,17 +103,15 @@ void XMLFilterTabPageBasic::FillInfo( filter_info_impl* pInfo )
         if( !pInfo->maDocumentService.isEmpty() )
         {
             std::vector< application_info_impl* >& rInfos = getApplicationInfos();
-            std::vector< application_info_impl* >::iterator aIter( rInfos.begin() );
-            while( aIter != rInfos.end() )
+            for (auto const& info : rInfos)
             {
-                if( pInfo->maDocumentService == (*aIter)->maDocumentUIName )
+                if( pInfo->maDocumentService == info->maDocumentUIName )
                 {
-                    pInfo->maDocumentService = (*aIter)->maDocumentService;
-                    pInfo->maExportService = (*aIter)->maXMLExporter;
-                    pInfo->maImportService = (*aIter)->maXMLImporter;
+                    pInfo->maDocumentService = info->maDocumentService;
+                    pInfo->maExportService = info->maXMLExporter;
+                    pInfo->maImportService = info->maXMLImporter;
                     break;
                 }
-                ++aIter;
             }
         }
     }