Merge pull request #1287 from simonsonc/reset-model

wonder-sk · wonder-sk · commit d3db42d91f88 · 2014-04-02T09:50:58.000+02:00
Use begin/endResetModel instead of reset
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 )

Original file line number	Diff line number	Diff line change
`@@ -308,9 +308,10 @@ QModelIndex QgsBrowserModel::findPath( QString path )`
`308`	`308`
`309`	`309`	`void QgsBrowserModel::reload()`
`310`	`310`	`{`
	`311`	`+ beginResetModel();`
`311`	`312`	`removeRootItems();`
`312`	`313`	`addRootItems();`
`313`		`- reset(); // Qt4.6 brings better methods beginResetModel + endResetModel`
	`314`	`+ endResetModel();`
`314`	`315`	`}`
`315`	`316`
`316`	`317`	`/* Refresh dir path */`
Original file line number	Diff line number	Diff line change
`@@ -1583,9 +1583,10 @@ QModelIndex QgsCptCityBrowserModel::findPath( QString path )`
`1583`	`1583`
`1584`	`1584`	`void QgsCptCityBrowserModel::reload()`
`1585`	`1585`	`{`
	`1586`	`+ beginResetModel();`
`1586`	`1587`	`removeRootItems();`
`1587`	`1588`	`addRootItems();`
`1588`		`- reset(); // Qt4.6 brings better methods beginResetModel + endResetModel`
	`1589`	`+ endResetModel();`
`1589`	`1590`	`}`
`1590`	`1591`
`1591`	`1592`	`/* Refresh dir path */`
Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,8 @@ void QgsAttributeTableModel::reload( const QModelIndex &index1, const QModelInde`
`660`	`660`
`661`	`661`	`void QgsAttributeTableModel::resetModel()`
`662`	`662`	`{`
`663`		`- reset();`
	`663`	`+ beginResetModel();`
	`664`	`+ endResetModel();`
`664`	`665`	`}`
`665`	`666`
`666`	`667`	`void QgsAttributeTableModel::executeAction( int action, const QModelIndex &idx ) const`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,8 @@ Qt::ItemFlags DockModel::flags( const QModelIndex &index ) const`
`121`	`121`
`122`	`122`	`void DockModel::resetModel()`
`123`	`123`	`{`
`124`		`- reset();`
	`124`	`+ beginResetModel();`
	`125`	`+ endResetModel();`
`125`	`126`	`}`
`126`	`127`
`127`	`128`	`void DockModel::reload( const QModelIndex &index1, const QModelIndex &index2 )`