QgsFeatureListModel inherits QSortFilterProxyModel

m-kuhn · m-kuhn · commit 14cefe3d3afe · 2018-05-17T08:48:43.000+02:00
diff --git 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
@@ -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
@@ -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 )

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`
`12`	`12`
`13`		`-class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel`
	`13`	`+class QgsFeatureListModel : QSortFilterProxyModel, QgsFeatureModel`
`14`	`14`	`{`
`15`	`15`
`16`	`16`	`%TypeHeaderCode`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@`
`23`	`23`	`#include <QSettings>`
`24`	`24`
`25`	`25`	`QgsFeatureListModel::QgsFeatureListModel( QgsAttributeTableFilterModel sourceModel, QObject parent )`
`26`		`- : QAbstractProxyModel( parent )`
`27`		`- , mInjectNull( false )`
	`26`	`+ : QSortFilterProxyModel( parent )`
`28`	`27`	`{`
`29`	`28`	`setSourceModel( sourceModel );`
`30`	`29`	`}`