diff --git a/src/controls/QskSkinManager.cpp b/src/controls/QskSkinManager.cpp
index 807753c1..a2bc7d29 100644
--- a/src/controls/QskSkinManager.cpp
+++ b/src/controls/QskSkinManager.cpp
@@ -292,7 +292,7 @@ namespace
             m_skinMap.clear();
 
             // first we try all factories, that have been added manually
-            for ( auto it = m_factoryMap.begin(); it != m_factoryMap.end(); ++it )
+            for ( auto it = m_factoryMap.constBegin(); it != m_factoryMap.constEnd(); ++it )
             {
                 const auto& data = it.value();
 
@@ -301,7 +301,7 @@ namespace
             }
 
             // all factories from plugins are following
-            for ( auto it = m_factoryMap.begin(); it != m_factoryMap.end(); ++it )
+            for ( auto it = m_factoryMap.constBegin(); it != m_factoryMap.constEnd(); ++it )
             {
                 const auto& data = it.value();
                 if ( data.loader )
diff --git a/src/graphic/QskGraphicProviderMap.cpp b/src/graphic/QskGraphicProviderMap.cpp
index a7a49043..bdd37f92 100644
--- a/src/graphic/QskGraphicProviderMap.cpp
+++ b/src/graphic/QskGraphicProviderMap.cpp
@@ -28,7 +28,8 @@ QskGraphicProviderMap::QskGraphicProviderMap()
 
 QskGraphicProviderMap::~QskGraphicProviderMap()
 {
-    for ( auto it = m_data->hashTab.begin(); it != m_data->hashTab.end(); ++it )
+    const auto& hashTab = m_data->hashTab;
+    for ( auto it = hashTab.constBegin(); it != hashTab.constEnd(); ++it )
         delete it.value();
 }