diff --git a/libs/flake/tools/KoCreateShapeStrategy.cpp b/libs/flake/tools/KoCreateShapeStrategy.cpp
--- a/libs/flake/tools/KoCreateShapeStrategy.cpp
+++ b/libs/flake/tools/KoCreateShapeStrategy.cpp
@@ -120,7 +120,7 @@
         painter.translate(paintRect.left(), paintRect.top());
 
         if (painter.hasClipping())
-            paintRect = paintRect.intersect(painter.clipRegion().boundingRect());
+            paintRect = paintRect.intersected(painter.clipRegion().boundingRect());
 
         painter.setTransform(matrix, true);
         painter.drawPath(m_outline);
diff --git a/libs/flake/tools/KoShapeRubberSelectStrategy.cpp b/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
--- a/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
+++ b/libs/flake/tools/KoShapeRubberSelectStrategy.cpp
@@ -53,7 +53,7 @@
     paintRect = paintRect.normalized();
     paintRect.adjust(0., -0.5, 0.5, 0.);
     if (painter.hasClipping())
-        paintRect = paintRect.intersect(painter.clipRegion().boundingRect());
+        paintRect = paintRect.intersected(painter.clipRegion().boundingRect());
     painter.drawRect(paintRect);
 }
 
diff --git a/libs/kundo2/kundo2model.cpp b/libs/kundo2/kundo2model.cpp
--- a/libs/kundo2/kundo2model.cpp
+++ b/libs/kundo2/kundo2model.cpp
@@ -110,7 +110,8 @@
 
 void KUndo2Model::stackChanged()
 {
-    reset();
+    beginResetModel();
+    endResetModel(); // @todo: this call may be moved after the setCurrentIndex()
     m_sel_model->setCurrentIndex(selectedIndex(), QItemSelectionModel::ClearAndSelect);
 }
 
diff --git a/libs/widgets/KoLineStyleModel.cpp b/libs/widgets/KoLineStyleModel.cpp
--- a/libs/widgets/KoLineStyleModel.cpp
+++ b/libs/widgets/KoLineStyleModel.cpp
@@ -78,22 +78,25 @@
     // check if we select a standard or custom style
     if (style < Qt::CustomDashLine) {
         // a standard style
+        beginResetModel();
         m_hasTempStyle = false;
-        reset();
+        endResetModel();
         return style;
     } else if (style == Qt::CustomDashLine) {
         // a custom style -> check if already added
         int index = m_styles.indexOf(dashes, Qt::CustomDashLine);
         if (index < 0) {
             // not already added -> add temporarily
+            beginResetModel();
             m_tempStyle = dashes;
             m_hasTempStyle = true;
-            reset();
+            endResetModel();
             return m_styles.count();
         } else {
             // already added -> return index
+            beginResetModel();
             m_hasTempStyle = false;
-            reset();
+            endResetModel();
             return index;
         }
     }
diff --git a/libs/widgets/KoResourceModel.cpp b/libs/widgets/KoResourceModel.cpp
--- a/libs/widgets/KoResourceModel.cpp
+++ b/libs/widgets/KoResourceModel.cpp
@@ -141,16 +141,18 @@
 void KoResourceModel::doSafeLayoutReset(KoResource *activateAfterReformat)
 {
     emit beforeResourcesLayoutReset(activateAfterReformat);
-    reset();
+    beginResetModel();
+    endResetModel();
     emit afterResourcesLayoutReset();
 }
 
 void KoResourceModel::setColumnCount( int columnCount )
 {
     if (columnCount != m_columnCount) {
         emit beforeResourcesLayoutReset(0);
+        beginResetModel();
         m_columnCount = columnCount;
-        reset();
+        endResetModel();
         emit afterResourcesLayoutReset();
     }
 }