From 1a8f06ed260a7cee3ffdbdfd332ffd80a554a040 Mon Sep 17 00:00:00 2001
From: Salvatore Larosa <lrssvtml@gmail.com>
Date: Fri, 6 Jul 2018 13:23:06 +0200
Subject: [PATCH] resolve conflict

---
 src/core/qgsvectordataprovider.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
index 432a58ab1691..f116dc66b65b 100644
--- a/src/core/qgsvectordataprovider.cpp
+++ b/src/core/qgsvectordataprovider.cpp
@@ -297,22 +297,22 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
                           QVariant::typeToName( field.type() ) )
                     .arg( field.length() )
                     .arg( field.precision() ), 2 );
-  for ( i = 0; i < mNativeTypes.size(); i++ )
+  Q_FOREACH ( const NativeType &nativeType, mNativeTypes )
   {
     QgsDebugMsgLevel( QString( "native field type = %1 min length = %2 max length = %3 min precision = %4 max precision = %5" )
-                      .arg( QVariant::typeToName( mNativeTypes[i].mType ) )
-                      .arg( mNativeTypes[i].mMinLen )
-                      .arg( mNativeTypes[i].mMaxLen )
-                      .arg( mNativeTypes[i].mMinPrec )
-                      .arg( mNativeTypes[i].mMaxPrec ), 2 );
+                      .arg( QVariant::typeToName( nativeType.mType ) )
+                      .arg( nativeType.mMinLen )
+                      .arg( nativeType.mMaxLen )
+                      .arg( nativeType.mMinPrec )
+                      .arg( nativeType.mMaxPrec ), 2 );
 
-    if ( field.type() != mNativeTypes[i].mType )
+    if ( field.type() != nativeType.mType )
       continue;
 
     if ( field.length() == -1 )
     {
       // source length unlimited
-      if ( mNativeTypes[i].mMinLen > -1 || mNativeTypes[i].mMaxLen > -1 )
+      if ( nativeType.mMinLen > -1 || nativeType.mMaxLen > -1 )
       {
         // destination limited
         continue;
@@ -321,8 +321,8 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
     else
     {
       // source length limited
-      if ( mNativeTypes[i].mMinLen > -1 && mNativeTypes[i].mMaxLen > -1 &&
-           ( field.length() < mNativeTypes[i].mMinLen || field.length() > mNativeTypes[i].mMaxLen ) )
+      if ( nativeType.mMinLen > -1 && nativeType.mMaxLen > -1 &&
+           ( field.length() < nativeType.mMinLen || field.length() > nativeType.mMaxLen ) )
       {
         // source length exceeds destination limits
         continue;
@@ -332,7 +332,7 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
     if ( field.precision() == -1 )
     {
       // source precision unlimited / n/a
-      if ( mNativeTypes[i].mMinPrec > -1 || mNativeTypes[i].mMaxPrec > -1 )
+      if ( nativeType.mMinPrec > -1 || nativeType.mMaxPrec > -1 )
       {
         // destination limited
         continue;
@@ -341,8 +341,8 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
     else
     {
       // source precision unlimited / n/a
-      if ( mNativeTypes[i].mMinPrec > -1 && mNativeTypes[i].mMaxPrec > -1 &&
-           ( field.precision() < mNativeTypes[i].mMinPrec || field.precision() > mNativeTypes[i].mMaxPrec ) )
+      if ( nativeType.mMinPrec > -1 && nativeType.mMaxPrec > -1 &&
+           ( field.precision() < nativeType.mMinPrec || field.precision() > nativeType.mMaxPrec ) )
       {
         // source precision exceeds destination limits
         continue;