diff --git a/src/Preference.cpp b/src/Preference.cpp
index 50792ed0b5..7929ec6ed0 100644
--- a/src/Preference.cpp
+++ b/src/Preference.cpp
@@ -34,29 +34,29 @@ IPreference *IPreference::GetPreferenceByName( const RString &sName )
 
 void IPreference::LoadAllDefaults()
 {
-	FOREACHS_CONST( IPreference*, *m_Subscribers.m_pSubscribers, p )
-		(*p)->LoadDefault();
+	for (IPreference *p : *m_Subscribers.m_pSubscribers)
+		p->LoadDefault();
 }
 
 void IPreference::ReadAllPrefsFromNode( const XNode* pNode, bool bIsStatic )
 {
 	ASSERT( pNode != NULL );
-	FOREACHS_CONST( IPreference*, *m_Subscribers.m_pSubscribers, p )
-		(*p)->ReadFrom( pNode, bIsStatic );
+	for (IPreference *p : *m_Subscribers.m_pSubscribers)
+		p->ReadFrom( pNode, bIsStatic );
 }
 
 void IPreference::SavePrefsToNode( XNode* pNode )
 {
-	FOREACHS_CONST( IPreference*, *m_Subscribers.m_pSubscribers, p )
-		(*p)->WriteTo( pNode );
+	for (IPreference *p : *m_Subscribers.m_pSubscribers)
+		p->WriteTo( pNode );
 }
 
 void IPreference::ReadAllDefaultsFromNode( const XNode* pNode )
 {
 	if( pNode == NULL )
 		return;
-	FOREACHS_CONST( IPreference*, *m_Subscribers.m_pSubscribers, p )
-		(*p)->ReadDefaultFrom( pNode );
+	for (IPreference *p : *m_Subscribers.m_pSubscribers)
+		p->ReadDefaultFrom( pNode );
 }
 
 void IPreference::PushValue( lua_State *L ) const