Refactor code around constraints

Author: Withalion

app/attributes/fieldvalidator.cpp

@@ -12,8 +12,8 @@
 #include "featurelayerpair.h"
 #include "mixedattributevalue.h"
 
-#include "qgsfield.h"
-#include "qgsvectorlayerutils.h"
+#include <qgsfield.h>
+#include <qgsvectorlayerutils.h>
 
 #include <QRegularExpression>
 #include <QLocale>
@@ -56,7 +56,7 @@ FieldValidator::ValidationStatus FieldValidator::validate( const FeatureLayerPai
   if ( value.userType() == qMetaTypeId<MixedAttributeValue>() )
     return Valid;
 
-  bool isNumeric = item.editorWidgetType() == QStringLiteral( "Range" ) || field.isNumeric();
+  const bool isNumeric = item.editorWidgetType() == QStringLiteral( "Range" ) || field.isNumeric();
   if ( isNumeric )
   {
     state = validateNumericField( item, value, validationMessage );
@@ -76,7 +76,7 @@ FieldValidator::ValidationStatus FieldValidator::validate( const FeatureLayerPai
   // Continue to check hard and soft QGIS constraints
   QStringList errors;
 
-  bool hardConstraintSatisfied = QgsVectorLayerUtils::validateAttribute( pair.layer(),  pair.feature(), item.fieldIndex(), errors, QgsFieldConstraints::ConstraintStrengthHard );
+  const bool hardConstraintSatisfied = QgsVectorLayerUtils::validateAttribute( pair.layer(),  pair.feature(), item.fieldIndex(), errors, QgsFieldConstraints::ConstraintStrengthHard );
   if ( !hardConstraintSatisfied )
   {
     validationMessage = constructConstraintValidationMessage( item, errors );
@@ -85,7 +85,7 @@ FieldValidator::ValidationStatus FieldValidator::validate( const FeatureLayerPai
 
   errors.clear();
 
-  bool softConstraintSatisfied = QgsVectorLayerUtils::validateAttribute( pair.layer(),  pair.feature(), item.fieldIndex(), errors, QgsFieldConstraints::ConstraintStrengthSoft );
+  const bool softConstraintSatisfied = QgsVectorLayerUtils::validateAttribute( pair.layer(),  pair.feature(), item.fieldIndex(), errors, QgsFieldConstraints::ConstraintStrengthSoft );
   if ( !softConstraintSatisfied )
   {
     validationMessage = constructConstraintValidationMessage( item, errors );
@@ -102,7 +102,7 @@ FieldValidator::ValidationStatus FieldValidator::validateTextField( const FormIt
   // Check if the text is not too long for the field
   if ( field.length() > 0 )
   {
-    const int vLength = value.toString().length();
+    const int vLength = static_cast<int>( value.toString().length() );
 
     if ( vLength > field.length() )
     {
@@ -131,7 +131,7 @@ FieldValidator::ValidationStatus FieldValidator::validateNumericField( const For
 
   // in Qt 6 isNull() does not return true for true if the variant contained an object
   // of a builtin type with an isNull() method that returned true for that object.
-  // So isNull() for QVariant( QString() ) will return false and we need to handle this
+  // So isNull() for QVariant( QString() ) will return false, and we need to handle this
   // separately.
   if ( value.userType() == QVariant::String && value.toString().isEmpty() )
   {
@@ -140,7 +140,7 @@ FieldValidator::ValidationStatus FieldValidator::validateNumericField( const For
 
   QString errorMessage;
 
-  bool containsDecimals = value.toString().contains( QLocale().decimalPoint() ) || value.toString().contains( "." );
+  const bool containsDecimals = value.toString().contains( QLocale().decimalPoint() ) || value.toString().contains( "." );
 
   if ( !field.convertCompatible( value, &errorMessage ) )
   {
@@ -165,15 +165,15 @@ FieldValidator::ValidationStatus FieldValidator::validateNumericField( const For
     return Error;
   }
 
-  bool isRangeEditable = item.editorWidgetType() == QStringLiteral( "Range" ) &&
-                         item.editorWidgetConfig().value( QStringLiteral( "Style" ) ) == QStringLiteral( "SpinBox" );
+  const bool isRangeEditable = item.editorWidgetType() == QStringLiteral( "Range" ) &&
+                               item.editorWidgetConfig().value( QStringLiteral( "Style" ) ) == QStringLiteral( "SpinBox" );
 
   // Check min/max range
   if ( isRangeEditable )
   {
-    double min = item.editorWidgetConfig().value( "Min" ).toDouble();
-    double max = item.editorWidgetConfig().value( "Max" ).toDouble();
-    double val = value.toDouble();
+    const double min = item.editorWidgetConfig().value( "Min" ).toDouble();
+    const double max = item.editorWidgetConfig().value( "Max" ).toDouble();
+    const double val = value.toDouble();
 
     if ( val < min )
     {
@@ -211,15 +211,15 @@ QString FieldValidator::constructConstraintValidationMessage( const FormItem &it
    */
 
   const QgsField field = item.field();
-  QgsFieldConstraints fldCons = field.constraints();
+  const QgsFieldConstraints &fldCons = field.constraints();
   QStringList validationMessages;
 
-  bool hasNotNullConstraint = fldCons.constraints() & QgsFieldConstraints::ConstraintNotNull;
-  bool notNullViolated = unmetConstraints.contains( QStringLiteral( "value is NULL" ) );
+  const bool hasNotNullConstraint = fldCons.constraints() & QgsFieldConstraints::ConstraintNotNull;
+  const bool notNullViolated = unmetConstraints.contains( QStringLiteral( "value is NULL" ) );
 
   if ( hasNotNullConstraint && notNullViolated )
   {
-    QgsFieldConstraints::ConstraintStrength strength = fldCons.constraintStrength( QgsFieldConstraints::ConstraintNotNull );
+    const QgsFieldConstraints::ConstraintStrength strength = fldCons.constraintStrength( QgsFieldConstraints::ConstraintNotNull );
 
     if ( strength == QgsFieldConstraints::ConstraintStrengthHard )
     {
@@ -231,12 +231,12 @@ QString FieldValidator::constructConstraintValidationMessage( const FormItem &it
     }
   }
 
-  bool hasUniqueConstraint = fldCons.constraints() & QgsFieldConstraints::ConstraintUnique;
-  bool uniqueViolated = unmetConstraints.contains( QStringLiteral( "value is not unique" ) );
+  const bool hasUniqueConstraint = fldCons.constraints() & QgsFieldConstraints::ConstraintUnique;
+  const bool uniqueViolated = unmetConstraints.contains( QStringLiteral( "value is not unique" ) );
 
   if ( hasUniqueConstraint && uniqueViolated )
   {
-    QgsFieldConstraints::ConstraintStrength strength = fldCons.constraintStrength( QgsFieldConstraints::ConstraintUnique );
+    const QgsFieldConstraints::ConstraintStrength strength = fldCons.constraintStrength( QgsFieldConstraints::ConstraintUnique );
 
     if ( strength == QgsFieldConstraints::ConstraintStrengthHard )
     {
@@ -248,13 +248,13 @@ QString FieldValidator::constructConstraintValidationMessage( const FormItem &it
     }
   }
 
-  bool hasExpressionConstrain = fldCons.constraints() & QgsFieldConstraints::ConstraintExpression;
-  bool expressionViolated = unmetConstraints.filter( QRegularExpression( "(parser error|evaluation error|check failed)" ) ).size() > 0;
+  const bool hasExpressionConstrain = fldCons.constraints() & QgsFieldConstraints::ConstraintExpression;
+  const bool expressionViolated = !unmetConstraints.filter( QRegularExpression( "(parser error|evaluation error|check failed)" ) ).empty();
 
   if ( hasExpressionConstrain && expressionViolated )
   {
-    QgsFieldConstraints::ConstraintStrength strength = fldCons.constraintStrength( QgsFieldConstraints::ConstraintExpression );
-    bool containsDescription = !fldCons.constraintDescription().isEmpty();
+    const QgsFieldConstraints::ConstraintStrength strength = fldCons.constraintStrength( QgsFieldConstraints::ConstraintExpression );
+    const bool containsDescription = !fldCons.constraintDescription().isEmpty();
 
     if ( containsDescription )
     {
@@ -273,10 +273,10 @@ QString FieldValidator::constructConstraintValidationMessage( const FormItem &it
     }
   }
 
-  if ( validationMessages.size() )
+  if ( !validationMessages.empty() )
   {
     return validationMessages.join( QStringLiteral( "\n" ) ); // each message on new line
   }
 
-  return QString();
+  return {};
 }

app/attributes/fieldvalidator.h

@@ -10,7 +10,6 @@
 #ifndef FIELDVALIDATOR_H
 #define FIELDVALIDATOR_H
 
-#include <QString>
 #include <QVariant>
 #include <QObject>