hide setting and value control in setSortOrder

luipir · luipir · commit a924915b00cc · 2017-05-10T15:13:47.000+02:00
diff --git a/src/core/qgsattributetableconfig.cpp b/src/core/qgsattributetableconfig.cpp
@@ -197,13 +197,8 @@ void QgsAttributeTableConfig::readXml( const QDomNode &node )
   }
 
   mSortExpression = configNode.toElement().attribute( QStringLiteral( "sortExpression" ) );
-  mSortOrder = static_cast<Qt::SortOrder>( configNode.toElement().attribute( QStringLiteral( "sortOrder" ) ).toInt() );
-  // fix https://hub.qgis.org/issues/15803
-  // because static_cast give umpredictable value if value is not in the enum range
-  if ( mSortOrder != Qt::AscendingOrder && mSortOrder != Qt::DescendingOrder )
-  {
-    mSortOrder = Qt::AscendingOrder;
-  }
+  Qt::SortOrder sortOrder = static_cast<Qt::SortOrder>( configNode.toElement().attribute( QStringLiteral( "sortOrder" ) ).toInt() );
+  setSortOrder( sortOrder );
 }
 
 QString QgsAttributeTableConfig::sortExpression() const

Original file line number	Diff line number	Diff line change
`@@ -197,13 +197,8 @@ void QgsAttributeTableConfig::readXml( const QDomNode &node )`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`mSortExpression = configNode.toElement().attribute( QStringLiteral( "sortExpression" ) );`
`200`		`- mSortOrder = static_cast<Qt::SortOrder>( configNode.toElement().attribute( QStringLiteral( "sortOrder" ) ).toInt() );`
`201`		`- // fix https://hub.qgis.org/issues/15803`
`202`		`- // because static_cast give umpredictable value if value is not in the enum range`
`203`		`- if ( mSortOrder != Qt::AscendingOrder && mSortOrder != Qt::DescendingOrder )`
`204`		`- {`
`205`		`- mSortOrder = Qt::AscendingOrder;`
`206`		`- }`
	`200`	`+ Qt::SortOrder sortOrder = static_cast<Qt::SortOrder>( configNode.toElement().attribute( QStringLiteral( "sortOrder" ) ).toInt() );`
	`201`	`+ setSortOrder( sortOrder );`
`207`	`202`	`}`
`208`	`203`
`209`	`204`	`QString QgsAttributeTableConfig::sortExpression() const`