From 14cefe3d3afe2eac90789e735c65e3fd72e42754 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Tue, 15 May 2018 11:58:10 +0200
Subject: [PATCH] QgsFeatureListModel inherits QSortFilterProxyModel

---
 .../attributetable/qgsfeaturelistmodel.sip.in              | 2 +-
 src/gui/attributetable/qgsfeaturelistmodel.cpp             | 3 +--
 src/gui/attributetable/qgsfeaturelistmodel.h               | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python/gui/auto_generated/attributetable/qgsfeaturelistmodel.sip.in b/python/gui/auto_generated/attributetable/qgsfeaturelistmodel.sip.in
index 9aafd523b8b6..f7b3d76a6a14 100644
--- a/python/gui/auto_generated/attributetable/qgsfeaturelistmodel.sip.in
+++ b/python/gui/auto_generated/attributetable/qgsfeaturelistmodel.sip.in
@@ -10,7 +10,7 @@
 
 
 
-class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel
+class QgsFeatureListModel : QSortFilterProxyModel, QgsFeatureModel
 {
 
 %TypeHeaderCode
diff --git a/src/gui/attributetable/qgsfeaturelistmodel.cpp b/src/gui/attributetable/qgsfeaturelistmodel.cpp
index e1e705fc9f89..564afdd8ae9f 100644
--- a/src/gui/attributetable/qgsfeaturelistmodel.cpp
+++ b/src/gui/attributetable/qgsfeaturelistmodel.cpp
@@ -23,8 +23,7 @@
 #include <QSettings>
 
 QgsFeatureListModel::QgsFeatureListModel( QgsAttributeTableFilterModel *sourceModel, QObject *parent )
-  : QAbstractProxyModel( parent )
-  , mInjectNull( false )
+  : QSortFilterProxyModel( parent )
 {
   setSourceModel( sourceModel );
 }
diff --git a/src/gui/attributetable/qgsfeaturelistmodel.h b/src/gui/attributetable/qgsfeaturelistmodel.h
index d51361092c82..bb67202c9b0d 100644
--- a/src/gui/attributetable/qgsfeaturelistmodel.h
+++ b/src/gui/attributetable/qgsfeaturelistmodel.h
@@ -18,7 +18,7 @@
 #include "qgsexpression.h"
 #include "qgis.h"
 
-#include <QAbstractProxyModel>
+#include <QSortFilterProxyModel>
 #include <QVariant>
 #include <QItemSelectionModel>
 
@@ -36,7 +36,7 @@ class QgsVectorLayerCache;
  * \ingroup gui
  * \class QgsFeatureListModel
  */
-class GUI_EXPORT QgsFeatureListModel : public QAbstractProxyModel, public QgsFeatureModel
+class GUI_EXPORT QgsFeatureListModel : public QSortFilterProxyModel, public QgsFeatureModel
 {
     Q_OBJECT
 
@@ -132,9 +132,10 @@ class GUI_EXPORT QgsFeatureListModel : public QAbstractProxyModel, public QgsFea
     mutable QgsExpression mDisplayExpression;
     QgsAttributeTableFilterModel *mFilterModel = nullptr;
     QString mParserErrorString;
-    bool mInjectNull;
+    bool mInjectNull = false;
     mutable QgsExpressionContext mExpressionContext;
     mutable QMap< QgsFeatureId, QList<QgsConditionalStyle> > mRowStylesMap;
+    bool mSortByDisplayExpression = false;
 };
 
 Q_DECLARE_METATYPE( QgsFeatureListModel::FeatureInfo )