From 41cc509cbbe45ab0c6aeff355d2e66a593c36dca Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Tue, 29 Apr 2014 08:41:52 +0200
Subject: [PATCH] QgsFieldModel::layer() returns QgsVectorLayer

---
 python/gui/qgsfieldmodel.sip         | 2 +-
 src/gui/qgsfieldcombobox.cpp         | 7 +------
 src/gui/qgsfieldexpressionwidget.cpp | 7 +------
 src/gui/qgsfieldmodel.h              | 2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/python/gui/qgsfieldmodel.sip b/python/gui/qgsfieldmodel.sip
index ee02feb2c3b..a37f3272ad3 100644
--- 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
index f7c3a609b62..c36f3e82be7 100644
--- 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
index 8b604b5aba2..0942dc1fa53 100644
--- 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
index 17ff2883540..27509dfa24f 100644
--- 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