Code layout

qgis · Apr 3, 2020 · 1ef0c65 · 1ef0c65
1 parent 8ac0a3d
commit 1ef0c65
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 44 deletions.
diff --git a/python/gui/auto_generated/qgsfieldmappingmodel.sip.in b/python/gui/auto_generated/qgsfieldmappingmodel.sip.in
@@ -50,9 +50,8 @@ the mapping expression is editable.
 Constructs a QgsFieldMappingModel from a set of ``sourceFields``
 and ``destinationFields``, initial values for the expressions can be
 optionally specified through ``expressions`` which is a map from the original
-field name to the corresponding expression.
-
-:param parent: parent object
+field name to the corresponding expression. A ``parent`` object
+can be also specified.
 %End
 
     QgsExpressionContextGenerator *contextGenerator() const;

diff --git a/python/gui/auto_generated/qgsfieldmappingwidget.sip.in b/python/gui/auto_generated/qgsfieldmappingwidget.sip.in
@@ -31,9 +31,8 @@ for each set of "destination" fields an expression defines how to obtain the val
 Constructs a QgsFieldMappingWidget from a set of ``sourceFields``
 and ``destinationFields``, initial values for the expressions can be
 optionally specified through ``expressions`` which is a map from the original
-field name to the corresponding expression.
-
-:param parent: parent object
+field name to the corresponding expression. A:param parent: object
+                                               can also be specified.
 %End
 
     void setDestinationEditable( bool editable );

diff --git a/src/gui/qgsfieldmappingmodel.cpp b/src/gui/qgsfieldmappingmodel.cpp
@@ -163,42 +163,40 @@ bool QgsFieldMappingModel::setData( const QModelIndex &index, const QVariant &va
   {
     if ( role == Qt::EditRole )
     {
-      Field &f { const_cast<Field &>( mMapping.at( index.row() ) ) };
+      Field &f = mMapping[index.row()];
       switch ( index.column() )
       {
-          {
-          case ColumnDataIndex::SourceExpression:
-          {
-            const QgsExpression exp { value.toString() };
-            f.expression = exp;
-            break;
-          }
-          case ColumnDataIndex::DestinationName:
-          {
-            f.field.setName( value.toString() );
-            break;
-          }
-          case ColumnDataIndex::DestinationType:
-          {
-            f.field.setType( static_cast<QVariant::Type>( value.toInt( ) ) );
-            break;
-          }
-          case ColumnDataIndex::DestinationLength:
-          {
-            bool ok;
-            const int length { value.toInt( &ok ) };
-            if ( ok )
-              f.field.setLength( length );
-            break;
-          }
-          case ColumnDataIndex::DestinationPrecision:
-          {
-            bool ok;
-            const int precision { value.toInt( &ok ) };
-            if ( ok )
-              f.field.setPrecision( precision );
-            break;
-          }
+        case ColumnDataIndex::SourceExpression:
+        {
+          const QgsExpression exp { value.toString() };
+          f.expression = exp;
+          break;
+        }
+        case ColumnDataIndex::DestinationName:
+        {
+          f.field.setName( value.toString() );
+          break;
+        }
+        case ColumnDataIndex::DestinationType:
+        {
+          f.field.setType( static_cast<QVariant::Type>( value.toInt( ) ) );
+          break;
+        }
+        case ColumnDataIndex::DestinationLength:
+        {
+          bool ok;
+          const int length { value.toInt( &ok ) };
+          if ( ok )
+            f.field.setLength( length );
+          break;
+        }
+        case ColumnDataIndex::DestinationPrecision:
+        {
+          bool ok;
+          const int precision { value.toInt( &ok ) };
+          if ( ok )
+            f.field.setPrecision( precision );
+          break;
         }
       }
       emit dataChanged( index, index );

diff --git a/src/gui/qgsfieldmappingmodel.h b/src/gui/qgsfieldmappingmodel.h
@@ -71,8 +71,8 @@ class GUI_EXPORT QgsFieldMappingModel: public QAbstractTableModel
      * Constructs a QgsFieldMappingModel from a set of \a sourceFields
      * and \a destinationFields, initial values for the expressions can be
      * optionally specified through \a expressions which is a map from the original
-     * field name to the corresponding expression.
-     * \param parent parent object
+     * field name to the corresponding expression. A \a parent object
+     * can be also specified.
      */
     QgsFieldMappingModel( const QgsFields &sourceFields = QgsFields(),
                           const QgsFields &destinationFields = QgsFields(),

diff --git a/src/gui/qgsfieldmappingwidget.h b/src/gui/qgsfieldmappingwidget.h
@@ -41,8 +41,8 @@ class GUI_EXPORT QgsFieldMappingWidget : public QWidget, private Ui::QgsFieldMap
      * Constructs a QgsFieldMappingWidget from a set of \a sourceFields
      * and \a destinationFields, initial values for the expressions can be
      * optionally specified through \a expressions which is a map from the original
-     * field name to the corresponding expression.
-     * \param parent parent object
+     * field name to the corresponding expression. A \param parent object
+     * can also be specified.
      */
     explicit QgsFieldMappingWidget( const QgsFields &sourceFields = QgsFields(),
                                     const QgsFields &destinationFields = QgsFields(),