Replace if by switch

qgis · Aug 28, 2017 · f27764d · f27764d
1 parent b6e42c7
commit f27764d
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2263,17 +2263,26 @@ bool QgsVectorLayer::changeGeometry( QgsFeatureId fid, const QgsGeometry &geom )
 
 bool QgsVectorLayer::changeAttributeValue( QgsFeatureId fid, int field, const QVariant &newValue, const QVariant &oldValue )
 {
-  if ( fields().fieldOrigin( field ) == QgsFields::OriginJoin )
+  switch ( fields().fieldOrigin( field ) )
   {
-    return mJoinBuffer->changeAttributeValue( fid, field, newValue, oldValue );
-  }
-  else
-  {
-    if ( !mEditBuffer || !mDataProvider )
+    case QgsFields::OriginJoin:
+      return mJoinBuffer->changeAttributeValue( fid, field, newValue, oldValue );
+
+    case QgsFields::OriginProvider:
+    case QgsFields::OriginEdit:
+    case QgsFields::OriginExpression:
+    {
+      if ( !mEditBuffer || !mDataProvider )
+        return false;
+      else
+        return mEditBuffer->changeAttributeValue( fid, field, newValue, oldValue );
+    }
+
+    case QgsFields::OriginUnknown:
       return false;
-    else
-      return mEditBuffer->changeAttributeValue( fid, field, newValue, oldValue );
   }
+
+  return false;
 }
 
 bool QgsVectorLayer::addAttribute( const QgsField &field )