QgsFieldModel::layer() returns QgsVectorLayer

Author: 3nids

python/gui/qgsfieldmodel.sip

@@ -43,7 +43,7 @@ class QgsFieldModel : QAbstractItemModel
     void removeExpression();
 
     //! returns the currently used layer
-    QgsMapLayer* layer();
+    QgsVectorLayer* layer();
 
   public slots:
     //! set the layer of whch fields are displayed

src/gui/qgsfieldcombobox.cpp

@@ -33,12 +33,7 @@ void QgsFieldComboBox::setLayer( QgsMapLayer *layer )
 
 QgsVectorLayer *QgsFieldComboBox::layer()
 {
-  QgsMapLayer* layer = mFieldModel->layer();
-  QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer );
-  if ( vl )
-    return vl;
-  else
-    return 0;
+  return mFieldModel->layer();
 }
 
 void QgsFieldComboBox::setField( QString fieldName )

src/gui/qgsfieldexpressionwidget.cpp

@@ -83,12 +83,7 @@ QString QgsFieldExpressionWidget::currentField( bool *isExpression )
 
 QgsVectorLayer *QgsFieldExpressionWidget::layer()
 {
-  QgsMapLayer* layer = mFieldModel->layer();
-  QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer );
-  if ( vl )
-    return vl;
-  else
-    return 0;
+  return mFieldModel->layer();
 }
 
 void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )

src/gui/qgsfieldmodel.h

@@ -65,7 +65,7 @@ class GUI_EXPORT QgsFieldModel : public QAbstractItemModel
     void removeExpression();
 
     //! returns the currently used layer
-    QgsMapLayer* layer() {return mLayer;}
+    QgsVectorLayer* layer() {return mLayer;}
 
   public slots:
     //! set the layer of whch fields are displayed