QgsFieldModel::layer() returns QgsVectorLayer

3nids · 3nids · commit 41cc509cbbe4 · 2014-05-02T07:56:34.000+02:00
diff --git a/python/gui/qgsfieldmodel.sip b/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
diff --git a/src/gui/qgsfieldcombobox.cpp b/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 )
diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/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 )
diff --git a/src/gui/qgsfieldmodel.h b/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

Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,7 @@ void QgsFieldComboBox::setLayer( QgsMapLayer *layer )`
`33`	`33`
`34`	`34`	`QgsVectorLayer *QgsFieldComboBox::layer()`
`35`	`35`	`{`
`36`		`- QgsMapLayer* layer = mFieldModel->layer();`
`37`		`- QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer );`
`38`		`- if ( vl )`
`39`		`- return vl;`
`40`		`- else`
`41`		`- return 0;`
	`36`	`+ return mFieldModel->layer();`
`42`	`37`	`}`
`43`	`38`
`44`	`39`	`void QgsFieldComboBox::setField( QString fieldName )`
Original file line number	Diff line number	Diff line change
`@@ -83,12 +83,7 @@ QString QgsFieldExpressionWidget::currentField( bool *isExpression )`
`83`	`83`
`84`	`84`	`QgsVectorLayer *QgsFieldExpressionWidget::layer()`
`85`	`85`	`{`
`86`		`- QgsMapLayer* layer = mFieldModel->layer();`
`87`		`- QgsVectorLayer* vl = dynamic_cast<QgsVectorLayer*>( layer );`
`88`		`- if ( vl )`
`89`		`- return vl;`
`90`		`- else`
`91`		`- return 0;`
	`86`	`+ return mFieldModel->layer();`
`92`	`87`	`}`
`93`	`88`
`94`	`89`	`void QgsFieldExpressionWidget::setLayer( QgsVectorLayer *layer )`