Microoptimise opening attribute table - don't call sort on model when

no sort order set (cherry-picked from 381eef)
qgis · May 23, 2017 · 261eba0 · 261eba0
1 parent 8992eea
commit 261eba0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -214,7 +214,8 @@ void QgsAttributeTableFilterModel::setAttributeTableConfig( const QgsAttributeTa
     }
   }
 
-  sort( config.sortExpression(), config.sortOrder() );
+  if ( !config.sortExpression().isEmpty() )
+    sort( config.sortExpression(), config.sortOrder() );
 }
 
 void QgsAttributeTableFilterModel::sort( QString expression, Qt::SortOrder order )

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -253,7 +253,7 @@ void QgsAttributeTableModel::editCommandEnded()
 void QgsAttributeTableModel::attributeDeleted( int idx )
 {
   if ( mSortCacheAttributes.contains( idx ) )
-    prefetchSortData( "" );
+    prefetchSortData( QString() );
 }
 
 void QgsAttributeTableModel::layerDeleted()
@@ -767,7 +767,7 @@ void QgsAttributeTableModel::prefetchColumnData( int column )
 {
   if ( column == -1 || column >= mAttributes.count() )
   {
-    prefetchSortData( "" );
+    prefetchSortData( QString() );
   }
   else
   {