std::list<int> to vector

Change-Id: I05d4531ac6d3daa8c996db374bc2a2425215dde8

3 files changed, 13 insertions, 15 deletions

diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 7f7069d5f015..6606327e8dc4 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -20,11 +20,6 @@
 #ifndef INCLUDED_VCL_INC_FONTMANAGER_HXX
 #define INCLUDED_VCL_INC_FONTMANAGER_HXX
 
-#include <list>
-#include <map>
-#include <set>
-#include <unordered_map>
-
 #include <vcl/dllapi.h>
 #include <vcl/helper.hxx>
 #include <vcl/timer.hxx>
@@ -33,7 +28,11 @@
 #include "salglyphid.hxx"
 #include "unx/fc_fontoptions.hxx"
 
+#include <list>
+#include <map>
+#include <set>
 #include <vector>
+#include <unordered_map>
 
 #include "config_dbus.h"
 
@@ -181,9 +180,9 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
 
         // font attributes
         int                                         m_nFamilyName;  // atom
-        std::list< int >                            m_aAliases;
+        std::vector< int >                          m_aAliases;
         int                                         m_nPSName;      // atom
-        OUString                               m_aStyleName;
+        OUString                                    m_aStyleName;
         FontItalic                                  m_eItalic;
         FontWidth                                   m_eWidth;
         FontWeight                                  m_eWeight;
diff --git a/vcl/unx/generic/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index 27851c19f563..e308db8018b7 100644
--- a/vcl/unx/generic/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -153,9 +153,9 @@ void FontCache::flush()
                     nSubEntry = 0;
 
                 aLine.append(OUStringToOString(pAtoms->getString( ATOM_FAMILYNAME, (*it)->m_nFamilyName), RTL_TEXTENCODING_UTF8));
-                for( ::std::list< int >::const_iterator name_it = (*it)->m_aAliases.begin(); name_it != (*it)->m_aAliases.end(); ++name_it )
+                for( int name : (*it)->m_aAliases )
                 {
-                    const OUString& rAdd( pAtoms->getString( ATOM_FAMILYNAME, *name_it ) );
+                    const OUString& rAdd( pAtoms->getString( ATOM_FAMILYNAME, name ) );
                     if( !rAdd.isEmpty() )
                     {
                         aLine.append(';');
@@ -567,7 +567,7 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print
         pRight->m_bUserOverride     != pLeft->m_bUserOverride
         )
         return false;
-    std::list< int >::const_iterator lit, rit;
+    std::vector< int >::const_iterator lit, rit;
     for( lit = pLeft->m_aAliases.begin(), rit = pRight->m_aAliases.begin();
          lit != pLeft->m_aAliases.end() && rit != pRight->m_aAliases.end() && (*lit) == (*rit);
          ++lit, ++rit )
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index e7e59aa80b41..a53278769be1 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -1234,9 +1234,8 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const
                 int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it );
                 if( nAlias != pFont->m_nFamilyName )
                 {
-                    std::list< int >::const_iterator al_it;
-                    for( al_it = pFont->m_aAliases.begin(); al_it != pFont->m_aAliases.end() && *al_it != nAlias; ++al_it )
-                        ;
+                    std::vector< int >::const_iterator al_it =
+                        std::find( pFont->m_aAliases.begin(), pFont->m_aAliases.end(), nAlias );
                     if( al_it == pFont->m_aAliases.end() )
                         pFont->m_aAliases.push_back( nAlias );
                 }
@@ -1539,8 +1538,8 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& r
     rInfo.m_bSubsettable = (pFont->m_eType == fonttype::TrueType); // TODO: rename to SfntType
 
     rInfo.m_aAliases.clear();
-    for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
-        rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
+    for( int i : pFont->m_aAliases )
+        rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, i ) );
 }
 
 void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const