Merge pull request #1287 from simonsonc/reset-model

Use begin/endResetModel instead of reset
qgis · Apr 2, 2014 · d3db42d · d3db42d
2 parents bc40ab6 + 29c8bc5
commit d3db42d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -308,9 +308,10 @@ QModelIndex QgsBrowserModel::findPath( QString path )
 
 void QgsBrowserModel::reload()
 {
+  beginResetModel();
   removeRootItems();
   addRootItems();
-  reset(); // Qt4.6 brings better methods beginResetModel + endResetModel
+  endResetModel();
 }
 
 /* Refresh dir path */

diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp
@@ -1583,9 +1583,10 @@ QModelIndex QgsCptCityBrowserModel::findPath( QString path )
 
 void QgsCptCityBrowserModel::reload()
 {
+  beginResetModel();
   removeRootItems();
   addRootItems();
-  reset(); // Qt4.6 brings better methods beginResetModel + endResetModel
+  endResetModel();
 }
 
 /* Refresh dir path */

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -660,7 +660,8 @@ void QgsAttributeTableModel::reload( const QModelIndex &index1, const QModelInde
 
 void QgsAttributeTableModel::resetModel()
 {
-  reset();
+  beginResetModel();
+  endResetModel();
 }
 
 void QgsAttributeTableModel::executeAction( int action, const QModelIndex &idx ) const

diff --git a/src/plugins/topology/dockModel.cpp b/src/plugins/topology/dockModel.cpp
@@ -121,7 +121,8 @@ Qt::ItemFlags DockModel::flags( const QModelIndex &index ) const
 
 void DockModel::resetModel()
 {
-  reset();
+  beginResetModel();
+  endResetModel();
 }
 
 void DockModel::reload( const QModelIndex &index1, const QModelIndex &index2 )