QmlDesigner: Use lambdas for transactions

Using lambdas we do not have to repeat the try catch block all
over again.
This also avoids sublte mistakes when catching the exception.

Change-Id: I514fa9b64f43ef08fdc27bf702ec2b173ab1dfd6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

src/plugins/qmldesigner/components/componentcore/layoutingridlayout.cpp

@@ -185,17 +185,16 @@ void LayoutInGridLayout::doIt()
         if (qmlItemNode.hasInstanceParentItem()) {
 
             ModelNode layoutNode;
-            {
+
-                RewriterTransaction transaction(m_selectionContext.view(), QByteArrayLiteral("LayoutInGridLayout1"));
+            m_selectionContext.view()->executeInTransaction("LayoutInGridLayout1",[this, &layoutNode, layoutType](){
                 QTC_ASSERT(m_selectionContext.view()->model()->hasNodeMetaInfo(layoutType), return);
 
                 NodeMetaInfo metaInfo = m_selectionContext.view()->model()->metaInfo(layoutType);
                 layoutNode = m_selectionContext.view()->createModelNode(layoutType, metaInfo.majorVersion(), metaInfo.minorVersion());
                 reparentTo(layoutNode, m_parentNode);
-            }
+            });
 
-            {
+            m_selectionContext.view()->executeInTransaction("LayoutInGridLayout2", [this, layoutNode](){
-                RewriterTransaction transaction(m_selectionContext.view(), QByteArrayLiteral("LayoutInGridLayout2"));
 
                 fillEmptyCells();
 
@@ -208,7 +207,7 @@ void LayoutInGridLayout::doIt()
                 reparentToNodeAndRemovePositionForModelNodes(layoutNode, sortedSelectedNodes);
                 setSizeAsPreferredSize(sortedSelectedNodes);
                 setSpanning(layoutNode);
-            }
+            });
         }
     }
 }

src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp

@@ -240,9 +240,7 @@ void changeOrder(const SelectionContext &selectionState, OderAction orderAction)
     if (!modelNode.parentProperty().isNodeListProperty())
         return;
 
-    try {
+    selectionState.view()->executeInTransaction("DesignerActionManager|raise",[orderAction, selectionState, modelNode](){
-        RewriterTransaction transaction(selectionState.view(), QByteArrayLiteral("DesignerActionManager|raise"));
-
         ModelNode modelNode = selectionState.currentSingleSelectedNode();
         NodeListProperty parentProperty = modelNode.parentProperty().toNodeListProperty();
         const int index = parentProperty.indexOf(modelNode);
@@ -255,11 +253,7 @@ void changeOrder(const SelectionContext &selectionState, OderAction orderAction)
             if (index > 0)
                 parentProperty.slide(index, index - 1);
         }
-
+    });
-        transaction.commit();
-    } catch (const RewritingException &e) { //better save then sorry
-         e.showException();
-    }
 }
 
 void raise(const SelectionContext &selectionState)
@@ -328,16 +322,13 @@ void resetSize(const SelectionContext &selectionState)
     if (!selectionState.view())
         return;
 
-    try {
+    selectionState.view()->executeInTransaction("DesignerActionManager|resetSize",[selectionState](){
-        RewriterTransaction transaction(selectionState.view(), QByteArrayLiteral("DesignerActionManager|resetSize"));
         foreach (ModelNode node, selectionState.selectedModelNodes()) {
             QmlItemNode itemNode(node);
             itemNode.removeProperty("width");
             itemNode.removeProperty("height");
         }
-    } catch (const RewritingException &e) { //better save then sorry
+    });
-        e.showException();
-    }
 }
 
 void resetPosition(const SelectionContext &selectionState)
@@ -345,17 +336,13 @@ void resetPosition(const SelectionContext &selectionState)
     if (!selectionState.view())
         return;
 
-    try {
+    selectionState.view()->executeInTransaction("DesignerActionManager|resetPosition",[selectionState](){
-        RewriterTransaction transaction(selectionState.view(), QByteArrayLiteral("DesignerActionManager|resetPosition"));
         foreach (ModelNode node, selectionState.selectedModelNodes()) {
             QmlItemNode itemNode(node);
             itemNode.removeProperty("x");
             itemNode.removeProperty("y");
         }
-        transaction.commit();
+    });
-    } catch (const RewritingException &e) { //better save then sorry
-        e.showException();
-    }
 }
 
 void goIntoComponentOperation(const SelectionContext &selectionState)
@@ -372,11 +359,12 @@ void resetZ(const SelectionContext &selectionState)
     if (!selectionState.view())
         return;
 
-    RewriterTransaction transaction(selectionState.view(), QByteArrayLiteral("DesignerActionManager|resetZ"));
+    selectionState.view()->executeInTransaction("DesignerActionManager|resetZ",[selectionState](){
         foreach (ModelNode node, selectionState.selectedModelNodes()) {
             QmlItemNode itemNode(node);
             itemNode.removeProperty("z");
         }
+    });
 }
 
 static inline void backupPropertyAndRemove(const ModelNode &node, const PropertyName &propertyName)
@@ -404,9 +392,7 @@ void anchorsFill(const SelectionContext &selectionState)
     if (!selectionState.view())
         return;
 
-    try {
+    selectionState.view()->executeInTransaction("DesignerActionManager|anchorsFill",[selectionState](){
-        RewriterTransaction transaction(selectionState.view(), QByteArrayLiteral("DesignerActionManager|anchorsFill"));
-
         ModelNode modelNode = selectionState.currentSingleSelectedNode();
 
         QmlItemNode node = modelNode;
@@ -417,11 +403,7 @@ void anchorsFill(const SelectionContext &selectionState)
             backupPropertyAndRemove(modelNode, "width");
             backupPropertyAndRemove(modelNode, "height");
         }
-
+    });
-        transaction.commit();
-    } catch (const RewritingException &e) { //better save then sorry
-        e.showException();
-    }
 }
 
 void anchorsReset(const SelectionContext &selectionState)
@@ -429,8 +411,7 @@ void anchorsReset(const SelectionContext &selectionState)
     if (!selectionState.view())
         return;
 
-    RewriterTransaction transaction(selectionState.view(), QByteArrayLiteral("DesignerActionManager|anchorsReset"));
+    selectionState.view()->executeInTransaction("DesignerActionManager|anchorsReset",[selectionState](){
-
         ModelNode modelNode = selectionState.currentSingleSelectedNode();
 
         QmlItemNode node = modelNode;
@@ -442,6 +423,7 @@ void anchorsReset(const SelectionContext &selectionState)
             restoreProperty(node, "width");
             restoreProperty(node, "height");
         }
+    });
 }
 
 using LessThan = std::function<bool (const ModelNode &, const ModelNode&)>;
@@ -481,7 +463,7 @@ bool compareByGrid(const ModelNode &node1, const ModelNode &node2)
 
 static void layoutHelperFunction(const SelectionContext &selectionContext,
                                  const TypeName &layoutType,
-                                 LessThan lessThan)
+                                 const LessThan &lessThan)
 {
     if (!selectionContext.view()
             || !selectionContext.hasSingleSelectedModelNode()
@@ -492,10 +474,8 @@ static void layoutHelperFunction(const SelectionContext &selectionContext,
         const QmlItemNode qmlItemNode = QmlItemNode(selectionContext.firstSelectedModelNode());
 
         if (qmlItemNode.hasInstanceParentItem()) {
-
             ModelNode layoutNode;
-            {
+            selectionContext.view()->executeInTransaction("DesignerActionManager|layoutHelperFunction1",[=, &layoutNode](){
-                RewriterTransaction transaction(selectionContext.view(), QByteArrayLiteral("DesignerActionManager|layoutHelperFunction1"));
 
                 QmlItemNode parentNode = qmlItemNode.instanceParentItem();
 
@@ -504,10 +484,9 @@ static void layoutHelperFunction(const SelectionContext &selectionContext,
                 layoutNode = selectionContext.view()->createModelNode(layoutType, metaInfo.majorVersion(), metaInfo.minorVersion());
 
                 reparentTo(layoutNode, parentNode);
-            }
+            });
 
-            {
+            selectionContext.view()->executeInTransaction("DesignerActionManager|layoutHelperFunction2",[=](){
-                RewriterTransaction transaction(selectionContext.view(), QByteArrayLiteral("DesignerActionManager|layoutHelperFunction2"));
 
                 QList<ModelNode> sortedSelectedNodes =  selectionContext.selectedModelNodes();
                 Utils::sort(sortedSelectedNodes, lessThan);
@@ -516,7 +495,7 @@ static void layoutHelperFunction(const SelectionContext &selectionContext,
                 LayoutInGridLayout::reparentToNodeAndRemovePositionForModelNodes(layoutNode, sortedSelectedNodes);
                 if (layoutType.contains("Layout"))
                     LayoutInGridLayout::setSizeAsPreferredSize(sortedSelectedNodes);
-            }
+            });
         }
     }
 }
@@ -662,16 +641,9 @@ void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState
 
     if (!qmlObjectNode.isRootModelNode()) {
         isModelNodeRoot = false;
-        try {
+        qmlObjectNode.view()->executeInTransaction("NavigatorTreeModel:exportItem", [&qmlObjectNode](){
-            RewriterTransaction transaction =
-                    qmlObjectNode.view()->beginRewriterTransaction(QByteArrayLiteral("NavigatorTreeModel:exportItem"));
-
-            QmlObjectNode qmlObjectNode(modelNode);
             qmlObjectNode.ensureAliasExport();
-            transaction.commit();
+        });
-        }  catch (RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
-            exception.showException();
-        }
     }
 
     QString itemId = modelNode.id();
@@ -708,14 +680,10 @@ void addSignalHandlerOrGotoImplementation(const SelectionContext &selectionState
                 if (dialog->signal().isEmpty())
                     return;
 
-                try {
+                qmlObjectNode.view()->executeInTransaction("NavigatorTreeModel:exportItem", [=](){
-                    RewriterTransaction transaction =
-                            qmlObjectNode.view()->beginRewriterTransaction(QByteArrayLiteral("NavigatorTreeModel:exportItem"));
 
                     addSignal(typeName, itemId, dialog->signal(), isModelNodeRoot);
-                }  catch (RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
+                });
-                    exception.showException();
-                }
 
                 addSignal(typeName, itemId, dialog->signal(), isModelNodeRoot);
 
@@ -751,9 +719,7 @@ void removeLayout(const SelectionContext &selectionContext)
     if (!parent.isValid())
         return;
 
-    {
+    selectionContext.view()->executeInTransaction("DesignerActionManager|removeLayout", [selectionContext, &layoutItem, parent](){
-        RewriterTransaction transaction(selectionContext.view(), QByteArrayLiteral("DesignerActionManager|removeLayout"));
-
         foreach (const ModelNode &modelNode, selectionContext.currentSingleSelectedNode().directSubModelNodes()) {
             if (QmlItemNode::isValidQmlItemNode(modelNode)) {
 
@@ -772,7 +738,7 @@ void removeLayout(const SelectionContext &selectionContext)
                 parent.modelNode().defaultNodeListProperty().reparentHere(modelNode);
         }
         layoutItem.destroy();
-    }
+    });
 }
 
 void removePositioner(const SelectionContext &selectionContext)
@@ -826,9 +792,7 @@ void addItemToStackedContainer(const SelectionContext &selectionContext)
         }
     }
 
-    try {
+    view->executeInTransaction("DesignerActionManager:addItemToStackedContainer", [=](){
-        RewriterTransaction transaction =
-                view->beginRewriterTransaction(QByteArrayLiteral("DesignerActionManager:addItemToStackedContainer"));
 
         NodeMetaInfo itemMetaInfo = view->model()->metaInfo("QtQuick.Item", -1, -1);
         QTC_ASSERT(itemMetaInfo.isValid(), return);
@@ -853,11 +817,7 @@ void addItemToStackedContainer(const SelectionContext &selectionContext)
 
             }
         }
-
+    });
-        transaction.commit();
-    }  catch (RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
-        exception.showException();
-    }
 }
 
 PropertyName getIndexPropertyName(const ModelNode &modelNode)
@@ -969,9 +929,8 @@ void addTabBarToStackedContainer(const SelectionContext &selectionContext)
     const PropertyName indexPropertyName = getIndexPropertyName(container);
     QTC_ASSERT(container.metaInfo().hasProperty(indexPropertyName), return);
 
-    try {
+    view->executeInTransaction("DesignerActionManager:addItemToStackedContainer",
-        RewriterTransaction transaction =
+                               [view, container, containerItemNode, tabBarMetaInfo, tabButtonMetaInfo, indexPropertyName](){
-                view->beginRewriterTransaction(QByteArrayLiteral("DesignerActionManager:addItemToStackedContainer"));
 
         ModelNode tabBarNode =
                 view->createModelNode("QtQuick.Controls.TabBar",
@@ -1003,11 +962,8 @@ void addTabBarToStackedContainer(const SelectionContext &selectionContext)
         container.removeProperty(indexPropertyName);
         const QString expression = id + "." + QString::fromLatin1(indexPropertyName);
         container.bindingProperty(indexPropertyName).setExpression(expression);
+    });
 
-        transaction.commit();
-    }  catch (RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
-        exception.showException();
-    }
 }
 
 bool addImageToProject(const QStringList &fileNames, const QString &defaultDirectory)

src/plugins/qmldesigner/components/integration/designdocument.cpp

@@ -365,18 +365,13 @@ void DesignDocument::deleteSelected()
     if (!currentModel())
         return;
 
-    try {
+    rewriterView()->executeInTransaction("DesignDocument::deleteSelected", [this](){
-        RewriterTransaction transaction(rewriterView(), QByteArrayLiteral("DesignDocument::deleteSelected"));
         QList<ModelNode> toDelete = view()->selectedModelNodes();
         foreach (ModelNode node, toDelete) {
             if (node.isValid() && !node.isRootNode() && QmlObjectNode::isValidQmlObjectNode(node))
                 QmlObjectNode(node).destroy();
         }
-
+    });
-        transaction.commit();
-    } catch (const RewritingException &e) {
-        e.showException();
-    }
 }
 
 void DesignDocument::copySelected()
@@ -465,11 +460,9 @@ void DesignDocument::paste()
             }
         }
 
+        rewriterView()->executeInTransaction("DesignDocument::paste1", [this, &view, selectedNodes, targetNode](){
             QList<ModelNode> pastedNodeList;
 
-        try {
-            RewriterTransaction transaction(rewriterView(), QByteArrayLiteral("DesignDocument::paste1"));
-
             int offset = double(qrand()) / RAND_MAX * 20 - 10;
 
             foreach (const ModelNode &node, selectedNodes) {
@@ -481,14 +474,10 @@ void DesignDocument::paste()
             }
 
             view.setSelectedModelNodes(pastedNodeList);
-            transaction.commit();
+        });
-        } catch (const RewritingException &e) {
-            qWarning() << e.description(); //silent error
-        }
-    } else {
-        try {
-            RewriterTransaction transaction(rewriterView(), QByteArrayLiteral("DesignDocument::paste2"));
 
+    } else {
+        rewriterView()->executeInTransaction("DesignDocument::paste1", [this, &view, selectedNodes, rootNode](){
             currentModel()->attachView(&view);
             ModelNode pastedNode(view.insertModel(rootNode));
             ModelNode targetNode;
@@ -514,15 +503,9 @@ void DesignDocument::paste()
             } else {
                 qWarning() << "Cannot reparent to" << targetNode;
             }
-
-            transaction.commit();
-            NodeMetaInfo::clearCache();
-
             view.setSelectedModelNodes({pastedNode});
-            transaction.commit();
+        });
-        } catch (const RewritingException &e) {
+        NodeMetaInfo::clearCache();
-            qWarning() << e.description(); //silent error
-        }
     }
 }
 

src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp

@@ -545,10 +545,9 @@ void NavigatorTreeModel::handleItemLibraryImageDrop(const QMimeData *mimeData, i
 void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty &parentProperty, const QList<ModelNode> &modelNodes, int targetIndex)
 {
     QTC_ASSERT(m_view, return);
-    try {
-        const TypeName propertyQmlType = parentProperty.parentModelNode().metaInfo().propertyTypeName(parentProperty.name());
 
-        RewriterTransaction transaction = m_view->beginRewriterTransaction(QByteArrayLiteral("NavigatorTreeModel::moveNodesInteractive"));
+    m_view->executeInTransaction("NavigatorTreeModel::moveNodesInteractive",[this, &parentProperty, modelNodes, targetIndex](){
+        const TypeName propertyQmlType = parentProperty.parentModelNode().metaInfo().propertyTypeName(parentProperty.name());
         foreach (const ModelNode &modelNode, modelNodes) {
             if (modelNode.isValid()
                     && modelNode != parentProperty.parentModelNode()
@@ -565,10 +564,7 @@ void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty &parentProper
                 }
             }
         }
-        transaction.commit();
+    });
-    }  catch (const RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
-        exception.showException();
-    }
 }
 
 Qt::DropActions NavigatorTreeModel::supportedDropActions() const

src/plugins/qmldesigner/components/navigator/navigatorview.cpp

@@ -198,16 +198,10 @@ void NavigatorView::handleChangedExport(const ModelNode &modelNode, bool exporte
     if (rootNode.hasProperty(modelNodeId))
         rootNode.removeProperty(modelNodeId);
     if (exported) {
-        try {
+        executeInTransaction("NavigatorTreeModel:exportItem", [this, modelNode](){
-            RewriterTransaction transaction =
-                    beginRewriterTransaction(QByteArrayLiteral("NavigatorTreeModel:exportItem"));
-
             QmlObjectNode qmlObjectNode(modelNode);
             qmlObjectNode.ensureAliasExport();
-            transaction.commit();
+        });
-        }  catch (RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
-            exception.showException();
-        }
     }
 }
 

src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp

@@ -36,7 +36,7 @@
 #include <variantproperty.h>
 #include <abstractview.h>
 #include <nodemetainfo.h>
-#include <rewritertransaction.h>
+#include <exception.h>
 
 #include <utils/qtcassert.h>
 
@@ -147,17 +147,15 @@ void GradientModel::addGradient()
         return;
 
     if (!m_itemNode.modelNode().hasNodeProperty(gradientPropertyName().toUtf8())) {
-        try {
-
-            QColor color = m_itemNode.instanceValue("color").value<QColor>();
-
-            if (!color.isValid())
-                color = QColor(Qt::white);
 
         if (m_gradientTypeName != "Gradient")
             ensureShapesImport();
 
-            QmlDesigner::RewriterTransaction transaction = view()->beginRewriterTransaction(QByteArrayLiteral("GradientModel::addGradient"));
+        view()->executeInTransaction("GradientModel::addGradient", [this](){
+            QColor color = m_itemNode.instanceValue("color").value<QColor>();
+
+            if (!color.isValid())
+                color = QColor(Qt::white);
 
             QmlDesigner::ModelNode gradientNode = createGradientNode();
 
@@ -172,11 +170,7 @@ void GradientModel::addGradient()
             gradientStopNode.variantProperty("position").setValue(1.0);
             gradientStopNode.variantProperty("color").setValue(QColor(Qt::black));
             gradientNode.nodeListProperty("stops").reparentHere(gradientStopNode);
-
+        });
-        } catch (const QmlDesigner::Exception &e) {
-            e.showException();
-        }
-
     }
     setupModel();
 
@@ -244,18 +238,18 @@ qreal GradientModel::getPosition(int index) const
 void GradientModel::removeStop(int index)
 {
     if (index < rowCount() - 1 && index != 0) {
-        QmlDesigner::RewriterTransaction transaction = view()->beginRewriterTransaction(QByteArrayLiteral("GradientModel::removeStop"));
+        view()->executeInTransaction("GradientModel::removeStop", [this, index](){
             QmlDesigner::ModelNode gradientNode =  m_itemNode.modelNode().nodeProperty(gradientPropertyName().toUtf8()).modelNode();
             QmlDesigner::QmlObjectNode stop = gradientNode.nodeListProperty("stops").at(index);
             if (stop.isValid()) {
                 stop.destroy();
                 setupModel();
             }
+        });
     }
     qWarning() << Q_FUNC_INFO << "invalid index";
 }
 
-
 void GradientModel::deleteGradient()
 {
     if (!m_itemNode.isValid())
@@ -385,7 +379,11 @@ void GradientModel::ensureShapesImport()
 {
     if (!hasShapesImport()) {
         QmlDesigner::Import timelineImport = QmlDesigner::Import::createLibraryImport("QtQuick.Shapes", "1.0");
+        try {
             model()->changeImports({timelineImport}, {});
+        } catch (const QmlDesigner::Exception &) {
+            QTC_ASSERT(false, return);
+        }
     }
 }
 

src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.cpp

@@ -152,22 +152,14 @@ void PropertyEditorContextObject::toogleExportAlias()
         PropertyName modelNodeId = selectedNode.id().toUtf8();
         ModelNode rootModelNode = rewriterView->rootModelNode();
 
-        try {
+        rewriterView->executeInTransaction("PropertyEditorContextObject:toogleExportAlias", [&objectNode, &rootModelNode, modelNodeId](){
-            RewriterTransaction transaction =
-                    rewriterView->beginRewriterTransaction(QByteArrayLiteral("PropertyEditorContextObject:toogleExportAlias"));
-
             if (!objectNode.isAliasExported())
                 objectNode.ensureAliasExport();
             else
                 if (rootModelNode.hasProperty(modelNodeId))
                     rootModelNode.removeProperty(modelNodeId);
-
+        });
-            transaction.commit();
-        }  catch (RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
-            exception.showException();
     }
-    }
-
 }
 
 void PropertyEditorContextObject::changeTypeName(const QString &typeName)
@@ -181,12 +173,9 @@ void PropertyEditorContextObject::changeTypeName(const QString &typeName)
 
     QTC_ASSERT(!rewriterView->selectedModelNodes().isEmpty(), return);
 
+    rewriterView->executeInTransaction("PropertyEditorContextObject:changeTypeName", [this, rewriterView, typeName](){
         ModelNode selectedNode = rewriterView->selectedModelNodes().constFirst();
 
-    try {
-        RewriterTransaction transaction =
-                rewriterView->beginRewriterTransaction(QByteArrayLiteral("PropertyEditorContextObject:changeTypeName"));
-
         NodeMetaInfo metaInfo = m_model->metaInfo(typeName.toLatin1());
         if (!metaInfo.isValid()) {
             Core::AsynchronousMessageBox::warning(tr("Invalid Type"),  tr("%1 is an invalid type.").arg(typeName));
@@ -196,13 +185,7 @@ void PropertyEditorContextObject::changeTypeName(const QString &typeName)
             rewriterView->changeRootNodeType(metaInfo.typeName(), metaInfo.majorVersion(), metaInfo.minorVersion());
         else
             selectedNode.changeType(metaInfo.typeName(), metaInfo.majorVersion(), metaInfo.minorVersion());
-
+    });
-        transaction.commit();
-    }  catch (RewritingException &exception) { //better safe than sorry! There always might be cases where we fail
-        exception.showException();
-    }
-
-
 }
 
 void PropertyEditorContextObject::insertKeyframe(const QString &propertyName)

src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp

@@ -235,9 +235,7 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
     if (!m_selectedNode.isValid())
         return;
 
-    RewriterTransaction transaction = beginRewriterTransaction(QByteArrayLiteral("PropertyEditorView::changeExpression"));
+    executeInTransaction("PropertyEditorView::changeExpression", [this, name](){
-
-    try {
         PropertyName underscoreName(name);
         underscoreName.replace('.', '_');
 
@@ -253,7 +251,6 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
             if (qmlObjectNode.modelNode().metaInfo().propertyTypeName(name) == "QColor") {
                 if (QColor(value->expression().remove('"')).isValid()) {
                     qmlObjectNode.setVariantProperty(name, QColor(value->expression().remove('"')));
-                    transaction.commit(); //committing in the try block
                     return;
                 }
             } else if (qmlObjectNode.modelNode().metaInfo().propertyTypeName(name) == "bool") {
@@ -263,7 +260,6 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
                         qmlObjectNode.setVariantProperty(name, true);
                     else
                         qmlObjectNode.setVariantProperty(name, false);
-                    transaction.commit(); //committing in the try block
                     return;
                 }
             } else if (qmlObjectNode.modelNode().metaInfo().propertyTypeName(name) == "int") {
@@ -271,7 +267,6 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
                 int intValue = value->expression().toInt(&ok);
                 if (ok) {
                     qmlObjectNode.setVariantProperty(name, intValue);
-                    transaction.commit(); //committing in the try block
                     return;
                 }
             } else if (qmlObjectNode.modelNode().metaInfo().propertyTypeName(name) == "qreal") {
@@ -279,7 +274,6 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
                 qreal realValue = value->expression().toDouble(&ok);
                 if (ok) {
                     qmlObjectNode.setVariantProperty(name, realValue);
-                    transaction.commit(); //committing in the try block
                     return;
                 }
             }
@@ -291,12 +285,7 @@ void PropertyEditorView::changeExpression(const QString &propertyName)
         if (qmlObjectNode.expression(name) != value->expression() || !qmlObjectNode.propertyAffectedByCurrentState(name))
             qmlObjectNode.setBindingProperty(name, value->expression());
 
-        transaction.commit(); //committing in the try block
+    }); /* end of transaction */
-    }
-
-    catch (const RewritingException &e) {
-        e.showException();
-    }
 }
 
 void PropertyEditorView::exportPopertyAsAlias(const QString &name)
@@ -310,9 +299,7 @@ void PropertyEditorView::exportPopertyAsAlias(const QString &name)
     if (!m_selectedNode.isValid())
         return;
 
-    RewriterTransaction transaction = beginRewriterTransaction(QByteArrayLiteral("PropertyEditorView::exportPopertyAsAlias"));
+    executeInTransaction("PropertyEditorView::exportPopertyAsAlias", [this, name](){
-
-    try {
         const QString id = m_selectedNode.validId();
         QString upperCasePropertyName = name;
         upperCasePropertyName.replace(0, 1, upperCasePropertyName.at(0).toUpper());
@@ -326,11 +313,7 @@ void PropertyEditorView::exportPopertyAsAlias(const QString &name)
             return;
         }
         rootModelNode().bindingProperty(propertyName).setDynamicTypeNameAndExpression("alias", id + "." + name);
-
+    });
-        transaction.commit(); //committing in the try block
-    } catch (const RewritingException &e) {
-        e.showException();
-    }
 }
 
 void PropertyEditorView::removeAliasExport(const QString &name)
@@ -344,9 +327,7 @@ void PropertyEditorView::removeAliasExport(const QString &name)
     if (!m_selectedNode.isValid())
         return;
 
-    RewriterTransaction transaction = beginRewriterTransaction(QByteArrayLiteral("PropertyEditorView::exportPopertyAsAlias"));
+    executeInTransaction("PropertyEditorView::exportPopertyAsAlias", [this, name](){
-
-    try {
         const QString id = m_selectedNode.validId();
 
         for (const BindingProperty &property : rootModelNode().bindingProperties())
@@ -354,10 +335,7 @@ void PropertyEditorView::removeAliasExport(const QString &name)
                 rootModelNode().removeProperty(property.name());
                 break;
             }
-        transaction.commit(); //committing in the try block
+    });
-    } catch (const RewritingException &e) {
-        e.showException();
-    }
 }
 
 bool PropertyEditorView::locked() const

src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp

@@ -292,9 +292,9 @@ void QmlAnchorBindingProxy::setDefaultRelativeRightTarget()
     }
 }
 
-RewriterTransaction QmlAnchorBindingProxy::beginRewriterTransaction(const QByteArray &identifier)
+bool QmlAnchorBindingProxy::executeInTransaction(const QByteArray &identifier, const AbstractView::OperationBlock &lambda)
 {
-     return m_qmlItemNode.modelNode().view()->beginRewriterTransaction(identifier);
+    return m_qmlItemNode.modelNode().view()->executeInTransaction(identifier, lambda);
 }
 
 bool QmlAnchorBindingProxy::hasParent() const
@@ -361,20 +361,11 @@ void QmlAnchorBindingProxy::setTopTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setTopTarget", [this, newTarget](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setTopTarget"));
-
         m_topTarget = newTarget;
-
         setDefaultRelativeTopTarget();
-
         anchorTop();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit topTargetChanged();
 }
@@ -393,18 +384,12 @@ void QmlAnchorBindingProxy::setBottomTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setBottomTarget", [this, newTarget](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setBottomTarget"));
-
         m_bottomTarget = newTarget;
         setDefaultRelativeBottomTarget();
         anchorBottom();
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit bottomTargetChanged();
 }
@@ -422,18 +407,11 @@ void QmlAnchorBindingProxy::setLeftTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setLeftTarget", [this, newTarget](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setLeftTarget"));
-
         m_leftTarget = newTarget;
         setDefaultRelativeLeftTarget();
         anchorLeft();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit leftTargetChanged();
 }
@@ -451,18 +429,11 @@ void QmlAnchorBindingProxy::setRightTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setRightTarget", [this, newTarget](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setRightTarget"));
-
         m_rightTarget = newTarget;
         setDefaultRelativeRightTarget();
         anchorRight();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit rightTargetChanged();
 }
@@ -480,17 +451,10 @@ void QmlAnchorBindingProxy::setVerticalTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setVerticalTarget", [this, newTarget](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setVerticalTarget"));
-
         m_verticalTarget = newTarget;
         anchorVertical();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit verticalTargetChanged();
 }
@@ -508,17 +472,10 @@ void QmlAnchorBindingProxy::setHorizontalTarget(const QString &target)
     if (!newTarget.isValid())
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setHorizontalTarget", [this, newTarget](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setHorizontalTarget"));
-
         m_horizontalTarget = newTarget;
-        anchorHorizontal();\
+        anchorHorizontal();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit horizontalTargetChanged();
 }
@@ -531,18 +488,10 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetTop(QmlAnchorBindingProxy::Re
     if (target == m_relativeTopTarget)
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setRelativeAnchorTargetTop", [this, target](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetTop"));
-
         m_relativeTopTarget = target;
-
         anchorTop();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetTopChanged();
 }
@@ -555,19 +504,10 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetBottom(QmlAnchorBindingProxy:
     if (target == m_relativeBottomTarget)
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setRelativeAnchorTargetBottom", [this, target](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetBottom"));
-
         m_relativeBottomTarget = target;
-
-
         anchorBottom();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetBottomChanged();
 }
@@ -580,18 +520,11 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetLeft(QmlAnchorBindingProxy::R
     if (target == m_relativeLeftTarget)
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setRelativeAnchorTargetLeft", [this, target](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetLeft"));
-
         m_relativeLeftTarget = target;
-
         anchorLeft();
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetLeftChanged();
 }
@@ -604,18 +537,10 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetRight(QmlAnchorBindingProxy::
     if (target == m_relativeRightTarget)
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setRelativeAnchorTargetRight", [this, target](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetRight"));
-
         m_relativeRightTarget = target;
-
         anchorRight();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetRightChanged();
 
@@ -629,18 +554,11 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetVertical(QmlAnchorBindingProx
     if (target == m_relativeVerticalTarget)
         return;
 
-    try {
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetVertical"));
 
+    executeInTransaction("QmlAnchorBindingProxy::setRelativeAnchorTargetVertical", [this, target](){
         m_relativeVerticalTarget = target;
-
         anchorVertical();
-
+    });
-         transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetVerticalChanged();
 }
@@ -653,18 +571,10 @@ void QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal(QmlAnchorBindingPr
     if (target == m_relativeHorizontalTarget)
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal", [this, target](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setRelativeAnchorTargetHorizontal"));
-
         m_relativeHorizontalTarget = target;
-
         anchorHorizontal();
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetHorizontalChanged();
 }
@@ -709,12 +619,10 @@ int QmlAnchorBindingProxy::indexOfPossibleTargetItem(const QString &targetName)
     return possibleTargetItems().indexOf(targetName);
 }
 
-void QmlAnchorBindingProxy::resetLayout() {
+void QmlAnchorBindingProxy::resetLayout()
-
+{
-    try {
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::resetLayout"));
 
+    executeInTransaction("QmlAnchorBindingProxy::resetLayout", [this](){
         m_qmlItemNode.anchors().removeAnchors();
         m_qmlItemNode.anchors().removeMargins();
 
@@ -722,11 +630,7 @@ void QmlAnchorBindingProxy::resetLayout() {
         restoreProperty(modelNode(), "y");
         restoreProperty(modelNode(), "width");
         restoreProperty(modelNode(), "height");
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
         emit topAnchorChanged();
         emit bottomAnchorChanged();
@@ -743,10 +647,7 @@ void QmlAnchorBindingProxy::setBottomAnchor(bool anchor)
     if (bottomAnchored() == anchor)
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setBottomAnchor", [this, anchor](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setBottomAnchor"));
-
         if (!anchor) {
             removeBottomAnchor();
         } else {
@@ -756,10 +657,7 @@ void QmlAnchorBindingProxy::setBottomAnchor(bool anchor)
                 backupPropertyAndRemove(modelNode(), "height");
         }
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetBottomChanged();
     emit bottomAnchorChanged();
@@ -776,10 +674,8 @@ void QmlAnchorBindingProxy::setLeftAnchor(bool anchor)
     if (leftAnchored() == anchor)
         return;
 
-    try {
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setLeftAnchor"));
 
+    executeInTransaction("QmlAnchorBindingProxy::setLeftAnchor", [this, anchor](){
         if (!anchor) {
             removeLeftAnchor();
         } else {
@@ -791,10 +687,7 @@ void QmlAnchorBindingProxy::setLeftAnchor(bool anchor)
                 backupPropertyAndRemove(modelNode(), "width");
         }
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetLeftChanged();
     emit leftAnchorChanged();
@@ -810,10 +703,7 @@ void QmlAnchorBindingProxy::setRightAnchor(bool anchor)
     if (rightAnchored() == anchor)
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setRightAnchor", [this, anchor](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setRightAnchor"));
-
         if (!anchor) {
             removeRightAnchor();
         } else {
@@ -824,10 +714,7 @@ void QmlAnchorBindingProxy::setRightAnchor(bool anchor)
                 backupPropertyAndRemove(modelNode(), "width");
         }
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetRightChanged();
     emit rightAnchorChanged();
@@ -1026,10 +913,7 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor)
     if (topAnchored() == anchor)
         return;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setTopAnchor", [this, anchor](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setTopAnchor"));
-
         if (!anchor) {
             removeTopAnchor();
         } else {
@@ -1040,10 +924,7 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor)
             if (bottomAnchored())
                 backupPropertyAndRemove(modelNode(), "height");
         }
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit relativeAnchorTargetTopChanged();
     emit topAnchorChanged();
@@ -1052,70 +933,44 @@ void QmlAnchorBindingProxy::setTopAnchor(bool anchor)
 }
 
 void QmlAnchorBindingProxy::removeTopAnchor() {
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::removeTopAnchor", [this](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::removeTopAnchor"));
-
         m_qmlItemNode.anchors().removeAnchor(AnchorLineTop);
         m_qmlItemNode.anchors().removeMargin(AnchorLineTop);
 
         restoreProperty(modelNode(), "y");
         restoreProperty(modelNode(), "height");
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
-void QmlAnchorBindingProxy::removeBottomAnchor() {
+void QmlAnchorBindingProxy::removeBottomAnchor()
-    try {
+{
-        RewriterTransaction transaction = beginRewriterTransaction(
+    executeInTransaction("QmlAnchorBindingProxy::removeBottomAnchor", [this](){
-                    QByteArrayLiteral("QmlAnchorBindingProxy::removeBottomAnchor"));
-
         m_qmlItemNode.anchors().removeAnchor(AnchorLineBottom);
         m_qmlItemNode.anchors().removeMargin(AnchorLineBottom);
 
-
         restoreProperty(modelNode(), "height");
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
-void QmlAnchorBindingProxy::removeLeftAnchor() {
+void QmlAnchorBindingProxy::removeLeftAnchor()
-    try {
+{
-        RewriterTransaction transaction = beginRewriterTransaction(
+    executeInTransaction("QmlAnchorBindingProxy::removeLeftAnchor", [this](){
-                    QByteArrayLiteral("QmlAnchorBindingProxy::removeLeftAnchor"));
-
         m_qmlItemNode.anchors().removeAnchor(AnchorLineLeft);
         m_qmlItemNode.anchors().removeMargin(AnchorLineLeft);
 
         restoreProperty(modelNode(), "x");
         restoreProperty(modelNode(), "width");
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
-void QmlAnchorBindingProxy::removeRightAnchor() {
+void QmlAnchorBindingProxy::removeRightAnchor()
-    try {
+{
-        RewriterTransaction transaction = beginRewriterTransaction(
+    executeInTransaction("QmlAnchorBindingProxy::removeRightAnchor", [this](){
-                    QByteArrayLiteral("QmlAnchorBindingProxy::removeRightAnchor"));
-
         m_qmlItemNode.anchors().removeAnchor(AnchorLineRight);
         m_qmlItemNode.anchors().removeMargin(AnchorLineRight);
 
         restoreProperty(modelNode(), "width");
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
 void QmlAnchorBindingProxy::setVerticalCentered(bool centered)
@@ -1128,10 +983,7 @@ void QmlAnchorBindingProxy::setVerticalCentered(bool centered)
 
     m_locked = true;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setVerticalCentered", [this, centered](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setVerticalCentered"));
-
         if (!centered) {
             m_qmlItemNode.anchors().removeAnchor(AnchorLineVerticalCenter);
             m_qmlItemNode.anchors().removeMargin(AnchorLineVerticalCenter);
@@ -1141,10 +993,7 @@ void QmlAnchorBindingProxy::setVerticalCentered(bool centered)
             anchorVertical();
         }
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
     m_locked = false;
 
     emit relativeAnchorTargetVerticalChanged();
@@ -1161,10 +1010,7 @@ void QmlAnchorBindingProxy::setHorizontalCentered(bool centered)
 
     m_locked = true;
 
-    try {
+    executeInTransaction("QmlAnchorBindingProxy::setHorizontalCentered", [this, centered](){
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::setHorizontalCentered"));
-
         if (!centered) {
             m_qmlItemNode.anchors().removeAnchor(AnchorLineHorizontalCenter);
             m_qmlItemNode.anchors().removeMargin(AnchorLineHorizontalCenter);
@@ -1173,11 +1019,7 @@ void QmlAnchorBindingProxy::setHorizontalCentered(bool centered)
 
             anchorHorizontal();
         }
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
     m_locked = false;
 
     emit relativeAnchorTargetHorizontalChanged();
@@ -1256,12 +1098,7 @@ bool QmlAnchorBindingProxy::horizontalCentered()
 
 void QmlAnchorBindingProxy::fill()
 {
-
+    executeInTransaction("QmlAnchorBindingProxy::fill", [this](){
-    try {
-        RewriterTransaction transaction = beginRewriterTransaction(
-                    QByteArrayLiteral("QmlAnchorBindingProxy::fill"));
-
-
         backupPropertyAndRemove(modelNode(), "x");
         backupPropertyAndRemove(modelNode(), "y");
         backupPropertyAndRemove(modelNode(), "width");
@@ -1277,10 +1114,7 @@ void QmlAnchorBindingProxy::fill()
         m_qmlItemNode.anchors().removeMargin(AnchorLineTop);
         m_qmlItemNode.anchors().removeMargin(AnchorLineBottom);
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     emit topAnchorChanged();
     emit bottomAnchorChanged();

src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h

@@ -210,7 +210,7 @@ private:
     void setDefaultRelativeLeftTarget();
     void setDefaultRelativeRightTarget();
 
-    RewriterTransaction beginRewriterTransaction(const QByteArray &identifier);
+    bool executeInTransaction(const QByteArray &identifier, const AbstractView::OperationBlock &lambda);
 
     QmlItemNode targetIdToNode(const QString &id) const;
     QString idForNode(const QmlItemNode &qmlItemNode) const;

src/plugins/qmldesigner/designercore/include/abstractview.h

@@ -39,6 +39,8 @@
 #include <QObject>
 #include <QPointer>
 
+#include <functional>
+
 QT_BEGIN_NAMESPACE
 class QStyle;
 class QToolButton;
@@ -263,6 +265,9 @@ public:
     void activateTimelineRecording(const ModelNode &timeline);
     void deactivateTimelineRecording();
 
+    using OperationBlock = std::function<void()>;
+    bool executeInTransaction(const QByteArray &identifier, const OperationBlock &lambda);
+
 protected:
     void setModel(Model * model);
     void removeModel();

src/plugins/qmldesigner/designercore/model/abstractview.cpp

@@ -616,6 +616,20 @@ void AbstractView::deactivateTimelineRecording()
         model()->d->notifyCurrentTimelineChanged(ModelNode());
 }
 
+bool AbstractView::executeInTransaction(const QByteArray &identifier, const AbstractView::OperationBlock &lambda)
+{
+    try {
+        RewriterTransaction transaction = beginRewriterTransaction(identifier);
+        lambda();
+        transaction.commit();
+    } catch (const Exception &e) {
+        e.showException();
+        return false;
+    }
+
+    return true;
+}
+
 QList<ModelNode> AbstractView::allModelNodes() const
 {
     return toModelNodeList(model()->d->allNodes());

src/plugins/qmldesigner/designercore/model/modelmerger.cpp

@@ -178,9 +178,7 @@ void ModelMerger::replaceModel(const ModelNode &modelNode)
         view()->model()->changeImports(modelNode.model()->imports(), {});
         view()->model()->setFileUrl(modelNode.model()->fileUrl());
 
-    try {
+        view()->executeInTransaction("ModelMerger::replaceModel", [this, modelNode](){
-        RewriterTransaction transaction(view()->beginRewriterTransaction(QByteArrayLiteral("ModelMerger::replaceModel")));
-
             ModelNode rootNode(view()->rootModelNode());
 
             foreach (const PropertyName &propertyName, rootNode.propertyNames())
@@ -196,11 +194,7 @@ void ModelMerger::replaceModel(const ModelNode &modelNode)
             syncNodeProperties(rootNode, modelNode, idRenamingHash, view());
             syncNodeListProperties(rootNode, modelNode, idRenamingHash, view());
             m_view->changeRootNodeType(modelNode.type(), modelNode.majorVersion(), modelNode.minorVersion());
-
+        });
-        transaction.commit();
-    } catch (const RewritingException &e) {
-        qWarning() << e.description(); //silent error
-    }
 }
 
 } //namespace QmlDesigner

src/plugins/qmldesigner/designercore/model/qmlanchors.cpp

@@ -161,7 +161,7 @@ void QmlAnchors::setAnchor(AnchorLineType sourceAnchorLine,
                           const QmlItemNode &targetQmlItemNode,
                           AnchorLineType targetAnchorLine)
 {
-    RewriterTransaction transaction = qmlItemNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchors::setAnchor"));
+    qmlItemNode().view()->executeInTransaction("QmlAnchors::setAnchor", [this, sourceAnchorLine, targetQmlItemNode, targetAnchorLine](){
         if (qmlItemNode().isInBaseState()) {
             if ((qmlItemNode().nodeInstance().hasAnchor("anchors.fill") && (sourceAnchorLine & AnchorLineFill))
                     || ((qmlItemNode().nodeInstance().hasAnchor("anchors.centerIn") && (sourceAnchorLine & AnchorLineCenter)))) {
@@ -177,6 +177,7 @@ void QmlAnchors::setAnchor(AnchorLineType sourceAnchorLine,
                 targetExpression = targetExpression + QLatin1Char('.') + QString::fromLatin1(lineTypeToString(targetAnchorLine));
             qmlItemNode().modelNode().bindingProperty(propertyName).setExpression(targetExpression);
         }
+    });
 }
 
 bool detectHorizontalCycle(const ModelNode &node, QList<ModelNode> knownNodeList)
@@ -315,7 +316,7 @@ AnchorLine QmlAnchors::instanceAnchor(AnchorLineType sourceAnchorLine) const
 
 void QmlAnchors::removeAnchor(AnchorLineType sourceAnchorLine)
 {
-   RewriterTransaction transaction = qmlItemNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchors::removeAnchor"));
+    qmlItemNode().view()->executeInTransaction("QmlAnchors::removeAnchor", [this, sourceAnchorLine](){
         if (qmlItemNode().isInBaseState()) {
             const PropertyName propertyName = anchorPropertyName(sourceAnchorLine);
             if (qmlItemNode().nodeInstance().hasAnchor("anchors.fill") && (sourceAnchorLine & AnchorLineFill)) {
@@ -333,11 +334,12 @@ void QmlAnchors::removeAnchor(AnchorLineType sourceAnchorLine)
 
             qmlItemNode().modelNode().removeProperty(propertyName);
         }
+    });
 }
 
 void QmlAnchors::removeAnchors()
 {
-    RewriterTransaction transaction = qmlItemNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchors::removeAnchors"));
+    qmlItemNode().view()->executeInTransaction("QmlAnchors::removeAnchors", [this](){
         if (qmlItemNode().nodeInstance().hasAnchor("anchors.fill"))
             qmlItemNode().modelNode().removeProperty("anchors.fill");
         if (qmlItemNode().nodeInstance().hasAnchor("anchors.centerIn"))
@@ -356,6 +358,7 @@ void QmlAnchors::removeAnchors()
             qmlItemNode().modelNode().removeProperty("anchors.verticalCenter");
         if (qmlItemNode().nodeInstance().hasAnchor("anchors.baseline"))
             qmlItemNode().modelNode().removeProperty("anchors.baseline");
+    });
 }
 
 bool QmlAnchors::instanceHasAnchor(AnchorLineType sourceAnchorLine) const
@@ -532,13 +535,14 @@ void QmlAnchors::removeMargin(AnchorLineType sourceAnchorLineType)
 
 void QmlAnchors::removeMargins()
 {
-    RewriterTransaction transaction = qmlItemNode().view()->beginRewriterTransaction(QByteArrayLiteral("QmlAnchors::removeMargins"));
+    qmlItemNode().view()->executeInTransaction("QmlAnchors::removeMargins", [this](){
         removeMargin(AnchorLineLeft);
         removeMargin(AnchorLineRight);
         removeMargin(AnchorLineTop);
         removeMargin(AnchorLineBottom);
         removeMargin(AnchorLineHorizontalCenter);
         removeMargin(AnchorLineVerticalCenter);
+    });
 }
 
 void QmlAnchors::fill()

src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp

@@ -102,9 +102,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
 {
     QmlItemNode newQmlItemNode;
 
-    try {
+    view->executeInTransaction("QmlItemNode::createQmlItemNode", [=, &newQmlItemNode, &parentproperty](){
-        RewriterTransaction transaction = view->beginRewriterTransaction(QByteArrayLiteral("QmlItemNode::createQmlItemNode"));
-
         NodeMetaInfo metaInfo = view->model()->metaInfo(itemLibraryEntry.typeName());
 
         int minorVersion = metaInfo.minorVersion();
@@ -139,7 +137,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
             parentproperty.reparentHere(newQmlItemNode);
 
         if (!newQmlItemNode.isValid())
-            return newQmlItemNode;
+            return;
 
         newQmlItemNode.setId(view->generateNewId(itemLibraryEntry.name()));
 
@@ -150,10 +148,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
             newQmlItemNode.modelNode().variantProperty(propertyBindingEntry.first).setEnumeration(propertyBindingEntry.second.toUtf8());
 
         Q_ASSERT(newQmlItemNode.isValid());
-    }
+    });
-    catch (const RewritingException &e) {
-        e.showException();
-    }
 
     Q_ASSERT(newQmlItemNode.isValid());
 
@@ -174,10 +169,8 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, const QS
 {
     QmlItemNode newQmlItemNode;
 
-    if (parentproperty.isValid()) {
+    if (parentproperty.isValid() && view->model()->hasNodeMetaInfo("QtQuick.Image")) {
-        RewriterTransaction transaction = view->beginRewriterTransaction(QByteArrayLiteral("QmlItemNode::createQmlItemNodeFromImage"));
+        view->executeInTransaction("QmlItemNode::createQmlItemNodeFromImage", [=, &newQmlItemNode, &parentproperty](){
-
-        if (view->model()->hasNodeMetaInfo("QtQuick.Image")) {
             NodeMetaInfo metaInfo = view->model()->metaInfo("QtQuick.Image");
             QList<QPair<PropertyName, QVariant> > propertyPairList;
             propertyPairList.append({PropertyName("x"), QVariant(qRound(position.x()))});
@@ -200,8 +193,7 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, const QS
             newQmlItemNode.modelNode().variantProperty("fillMode").setEnumeration("Image.PreserveAspectFit");
 
             Q_ASSERT(newQmlItemNode.isValid());
-        }
+        });
-        Q_ASSERT(newQmlItemNode.isValid());
     }
 
     return newQmlItemNode;

src/plugins/qmldesigner/qmldesignerextension/connectioneditor/backendmodel.cpp

@@ -232,8 +232,6 @@ void BackendModel::addNewBackend()
 
         Import import = Import::createLibraryImport(importSplit.constFirst(), importSplit.constLast());
 
-        try {
-
         /* We cannot add an import and add a node from that import in a single transaction.
              * We need the import to have the meta info available.
              */
@@ -247,12 +245,11 @@ void BackendModel::addNewBackend()
 
         QTC_ASSERT(metaInfo.isValid(), return);
 
-            int minorVersion = metaInfo.minorVersion();
-            int majorVersion = metaInfo.majorVersion();
-
         /* Add a property for non singleton types. For singletons just adding the import is enough. */
         if (!dialog.isSingleton()) {
-                RewriterTransaction transaction = m_connectionView->beginRewriterTransaction("BackendModel::addNewBackend");
+            m_connectionView->executeInTransaction("BackendModel::addNewBackend", [=, &dialog](){
+                int minorVersion = metaInfo.minorVersion();
+                int majorVersion = metaInfo.majorVersion();
 
                 if (dialog.localDefinition()) {
                     ModelNode newNode = m_connectionView->createModelNode(metaInfo.typeName(), majorVersion, minorVersion);
@@ -263,14 +260,9 @@ void BackendModel::addNewBackend()
                     m_connectionView->rootModelNode().bindingProperty(
                                 propertyName.toUtf8()).setDynamicTypeNameAndExpression(typeName.toUtf8(), "null");
                 }
-                transaction.commit();
+            });
-            }
-
-        } catch (const Exception &e) {
-            e.showException();
         }
     }
-
     resetModel();
 }
 
@@ -279,11 +271,9 @@ void BackendModel::updatePropertyName(int rowNumber)
     const PropertyName newName = data(index(rowNumber, 1)).toString().toUtf8();
     const PropertyName oldName  = data(index(rowNumber, 0), Qt::UserRole + 1).toString().toUtf8();
 
+    m_connectionView->executeInTransaction("BackendModel::updatePropertyName", [this, newName, oldName](){
+
         ModelNode rootModelNode = m_connectionView->rootModelNode();
-
-    try {
-        RewriterTransaction transaction = m_connectionView->beginRewriterTransaction("BackendModel::updatePropertyName");
-
         if (rootModelNode.property(oldName).isNodeProperty()) {
 
             const TypeName typeName = rootModelNode.nodeProperty(oldName).dynamicTypeName();
@@ -306,12 +296,7 @@ void BackendModel::updatePropertyName(int rowNumber)
             qWarning() << Q_FUNC_INFO << oldName << newName << "failed...";
             QTC_ASSERT(false, return);
         }
-
+    });
-        transaction.commit();
-
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
 void BackendModel::handleDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)

src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.cpp

@@ -290,8 +290,6 @@ void BindingModel::addModelNode(const ModelNode &modelNode)
 
 void BindingModel::updateExpression(int row)
 {
-    BindingProperty bindingProperty = bindingPropertyForRow(row);
-
     const QString sourceNode = data(index(row, SourceModelNodeRow)).toString().trimmed();
     const QString sourceProperty = data(index(row, SourcePropertyNameRow)).toString().trimmed();
 
@@ -302,15 +300,10 @@ void BindingModel::updateExpression(int row)
         expression = sourceNode + QLatin1String(".") + sourceProperty;
     }
 
-    RewriterTransaction transaction =
+    connectionView()->executeInTransaction("BindingModel::updateExpression", [this, row, expression](){
-        connectionView()->beginRewriterTransaction(QByteArrayLiteral("BindingModel::updateExpression"));
+        BindingProperty bindingProperty = bindingPropertyForRow(row);
-    try {
         bindingProperty.setExpression(expression.trimmed());
-        transaction.commit(); //committing in the try block
+    });
-    } catch (Exception &e) {
-        m_exceptionError = e.description();
-        QTimer::singleShot(200, this, &BindingModel::handleException);
-    }
 }
 
 void BindingModel::updatePropertyName(int rowNumber)

src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.cpp

@@ -182,26 +182,21 @@ void ConnectionModel::updateSource(int row)
 void ConnectionModel::updateSignalName(int rowNumber)
 {
     SignalHandlerProperty signalHandlerProperty = signalHandlerPropertyForRow(rowNumber);
-
-    const PropertyName newName = data(index(rowNumber, TargetPropertyNameRow)).toString().toUtf8();
-    const QString source = signalHandlerProperty.source();
     ModelNode connectionNode = signalHandlerProperty.parentModelNode();
 
+    const PropertyName newName = data(index(rowNumber, TargetPropertyNameRow)).toString().toUtf8();
     if (!newName.isEmpty()) {
-        RewriterTransaction transaction =
+        connectionView()->executeInTransaction("ConnectionModel::updateSignalName", [=, &connectionNode](){
-            connectionView()->beginRewriterTransaction(QByteArrayLiteral("ConnectionModel::updateSignalName"));
+
-        try {
+            const QString source = signalHandlerProperty.source();
+
             connectionNode.signalHandlerProperty(newName).setSource(source);
             connectionNode.removeProperty(signalHandlerProperty.name());
-            transaction.commit(); //committing in the try block
+        });
-        } catch (Exception &e) { //better save then sorry
-            QMessageBox::warning(nullptr, tr("Error"), e.description());
-        }
 
         QStandardItem* idItem = item(rowNumber, 0);
         SignalHandlerProperty newSignalHandlerProperty = connectionNode.signalHandlerProperty(newName);
         updateCustomData(idItem, newSignalHandlerProperty);
-
     } else {
         qWarning() << "BindingModel::updatePropertyName invalid property name";
     }
@@ -214,14 +209,9 @@ void ConnectionModel::updateTargetNode(int rowNumber)
     ModelNode connectionNode = signalHandlerProperty.parentModelNode();
 
     if (!newTarget.isEmpty()) {
-        RewriterTransaction transaction =
+        connectionView()->executeInTransaction("ConnectionModel::updateTargetNode", [= ,&connectionNode](){
-            connectionView()->beginRewriterTransaction(QByteArrayLiteral("ConnectionModel::updateTargetNode"));
-        try {
             connectionNode.bindingProperty("target").setExpression(newTarget);
-            transaction.commit(); //committing in the try block
+        });
-        } catch (Exception &e) { //better save then sorry
-            QMessageBox::warning(nullptr, tr("Error"), e.description());
-        }
 
         QStandardItem* idItem = item(rowNumber, 0);
         updateCustomData(idItem, signalHandlerProperty);
@@ -259,9 +249,7 @@ void ConnectionModel::addConnection()
         NodeMetaInfo nodeMetaInfo = connectionView()->model()->metaInfo("QtQuick.Connections");
 
         if (nodeMetaInfo.isValid()) {
-            RewriterTransaction transaction =
+            connectionView()->executeInTransaction("ConnectionModel::addConnection", [=](){
-                connectionView()->beginRewriterTransaction(QByteArrayLiteral("ConnectionModel::addConnection"));
-            try {
                 ModelNode newNode = connectionView()->createModelNode("QtQuick.Connections",
                                                                       nodeMetaInfo.majorVersion(),
                                                                       nodeMetaInfo.minorVersion());
@@ -276,10 +264,7 @@ void ConnectionModel::addConnection()
                 } else {
                     newNode.bindingProperty("target").setExpression(QLatin1String("parent"));
                 }
-                transaction.commit();
+            });
-            } catch (Exception &e) { //better save then sorry
-                QMessageBox::warning(nullptr, tr("Error"), e.description());
-            }
         }
     }
 }

src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.cpp

@@ -464,19 +464,16 @@ void DynamicPropertiesModel::updatePropertyName(int rowNumber)
 
     BindingProperty bindingProperty = bindingPropertyForRow(rowNumber);
 
-    if (bindingProperty.isBindingProperty()) {
-        const QString expression = bindingProperty.expression();
-        const PropertyName dynamicPropertyType = bindingProperty.dynamicTypeName();
     ModelNode targetNode = bindingProperty.parentModelNode();
 
-        RewriterTransaction transaction = connectionView()->beginRewriterTransaction(QByteArrayLiteral("DynamicPropertiesModel::updatePropertyName"));
+    if (bindingProperty.isBindingProperty()) {
-        try {
+        connectionView()->executeInTransaction("DynamicPropertiesModel::updatePropertyName", [bindingProperty, newName, &targetNode](){
+            const QString expression = bindingProperty.expression();
+            const PropertyName dynamicPropertyType = bindingProperty.dynamicTypeName();
+
             targetNode.bindingProperty(newName).setDynamicTypeNameAndExpression(dynamicPropertyType, expression);
             targetNode.removeProperty(bindingProperty.name());
-            transaction.commit(); //committing in the try block
+        });
-        } catch (Exception &e) { //better save then sorry
-            QMessageBox::warning(nullptr, tr("Error"), e.description());
-        }
 
         updateCustomData(rowNumber, targetNode.bindingProperty(newName));
         return;
@@ -489,14 +486,10 @@ void DynamicPropertiesModel::updatePropertyName(int rowNumber)
         const PropertyName dynamicPropertyType = variantProperty.dynamicTypeName();
         ModelNode targetNode = variantProperty.parentModelNode();
 
-        RewriterTransaction transaction = connectionView()->beginRewriterTransaction(QByteArrayLiteral("DynamicPropertiesModel::updatePropertyName"));
+        connectionView()->executeInTransaction("DynamicPropertiesModel::updatePropertyName", [=](){
-        try {
             targetNode.variantProperty(newName).setDynamicTypeNameAndValue(dynamicPropertyType, value);
             targetNode.removeProperty(variantProperty.name());
-            transaction.commit(); //committing in the try block
+        });
-        } catch (Exception &e) { //better save then sorry
-            QMessageBox::warning(nullptr, tr("Error"), e.description());
-        }
 
         updateCustomData(rowNumber, targetNode.variantProperty(newName));
     }
@@ -519,14 +512,10 @@ void DynamicPropertiesModel::updatePropertyType(int rowNumber)
         const PropertyName propertyName = bindingProperty.name();
         ModelNode targetNode = bindingProperty.parentModelNode();
 
-        RewriterTransaction transaction = connectionView()->beginRewriterTransaction(QByteArrayLiteral("DynamicPropertiesModel::updatePropertyType"));
+        connectionView()->executeInTransaction("DynamicPropertiesModel::updatePropertyType", [=](){
-        try {
             targetNode.removeProperty(bindingProperty.name());
             targetNode.bindingProperty(propertyName).setDynamicTypeNameAndExpression(newType, expression);
-            transaction.commit(); //committing in the try block
+        });
-        } catch (Exception &e) { //better save then sorry
-            QMessageBox::warning(nullptr, tr("Error"), e.description());
-        }
 
         updateCustomData(rowNumber, targetNode.bindingProperty(propertyName));
         return;
@@ -539,18 +528,14 @@ void DynamicPropertiesModel::updatePropertyType(int rowNumber)
         ModelNode targetNode = variantProperty.parentModelNode();
         const PropertyName propertyName = variantProperty.name();
 
-        RewriterTransaction transaction = connectionView()->beginRewriterTransaction(QByteArrayLiteral("DynamicPropertiesModel::updatePropertyType"));
+        connectionView()->executeInTransaction("DynamicPropertiesModel::updatePropertyType", [=](){
-        try {
             targetNode.removeProperty(variantProperty.name());
             if (newType == "alias") { //alias properties have to be bindings
                 targetNode.bindingProperty(propertyName).setDynamicTypeNameAndExpression(newType, QLatin1String("none.none"));
             } else {
                 targetNode.variantProperty(propertyName).setDynamicTypeNameAndValue(newType, convertVariantForTypeName(value, newType));
             }
-            transaction.commit(); //committing in the try block
+        });
-        } catch (Exception &e) { //better save then sorry
-            QMessageBox::warning(nullptr, tr("Error"), e.description());
-        }
 
         updateCustomData(rowNumber, targetNode.variantProperty(propertyName));
 

src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.cpp

@@ -133,8 +133,7 @@ void PathItem::writePathToProperty()
 
     ModelNode pathNode = pathModelNode(formEditorItem());
 
-    RewriterTransaction rewriterTransaction = pathNode.view()->beginRewriterTransaction(QByteArrayLiteral("PathItem::writePathToProperty"));
+    pathNode.view()->executeInTransaction("PathItem::writePathToProperty", [this, &pathNode](){
-
         QList<ModelNode> pathSegmentNodes = pathNode.nodeListProperty("pathElements").toModelNodeList();
 
         foreach (ModelNode pathSegment, pathSegmentNodes)
@@ -159,19 +158,15 @@ void PathItem::writePathToProperty()
             writePathAttributes(pathNode, m_lastAttributes);
             writePathPercent(pathNode, m_lastPercent);
         }
-
+    });
-    rewriterTransaction.commit();
 }
 
 void PathItem::writePathAsCubicSegmentsOnly()
 {
-    try {
         PathUpdateDisabler pathUpdateDisabler(this);
 
         ModelNode pathNode = pathModelNode(formEditorItem());
-
+        pathNode.view()->executeInTransaction("PathItem::writePathAsCubicSegmentsOnly", [this, &pathNode](){
-        RewriterTransaction rewriterTransaction =
-                pathNode.view()->beginRewriterTransaction(QByteArrayLiteral("PathItem::writePathAsCubicSegmentsOnly"));
 
             QList<ModelNode> pathSegmentNodes = pathNode.nodeListProperty("pathElements").toModelNodeList();
 
@@ -192,11 +187,7 @@ void PathItem::writePathAsCubicSegmentsOnly()
                 writePathAttributes(pathNode, m_lastAttributes);
                 writePathPercent(pathNode, m_lastPercent);
             }
-
+        });
-        rewriterTransaction.commit();
-    }  catch (const RewritingException &e) {
-        e.showException();
-    }
 }
 
 void PathItem::setFormEditorItem(FormEditorItem *formEditorItem)

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/easingcurvedialog.cpp

@@ -202,22 +202,13 @@ bool EasingCurveDialog::apply()
         msgBox.exec();
         return false;
     }
-
-    try {
     AbstractView *view = m_frames.first().view();
-        RewriterTransaction transaction(view->beginRewriterTransaction("EasingCurveDialog::apply"));
 
+    return view->executeInTransaction("EasingCurveDialog::apply", [this, view](){
         auto expression = m_splineEditor->easingCurve().toString();
         for (const auto &frame : m_frames)
             frame.bindingProperty("easing.bezierCurve").setExpression(expression);
-
+    });
-        transaction.commit();
-        return true;
-    } catch (const RewritingException &e) {
-        e.showException();
-    }
-
-    return false;
 }
 
 void EasingCurveDialog::textChanged()

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineactions.cpp

@@ -48,28 +48,18 @@ TimelineActions::TimelineActions() = default;
 void TimelineActions::deleteAllKeyframesForTarget(const ModelNode &targetNode,
                                                   const QmlTimeline &timeline)
 {
-    try {
+    targetNode.view()->executeInTransaction("TimelineActions::deleteAllKeyframesForTarget", [=](){
-        RewriterTransaction transaction(targetNode.view()->beginRewriterTransaction(
-            "TimelineActions::deleteAllKeyframesForTarget"));
-
         if (timeline.isValid()) {
             for (auto frames : timeline.keyframeGroupsForTarget(targetNode))
                 frames.destroy();
         }
-
+    });
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
 void TimelineActions::insertAllKeyframesForTarget(const ModelNode &targetNode,
                                                   const QmlTimeline &timeline)
 {
-    try {
+    targetNode.view()->executeInTransaction("TimelineActions::insertAllKeyframesForTarget", [=](){
-        RewriterTransaction transaction(targetNode.view()->beginRewriterTransaction(
-            "TimelineGraphicsScene::insertAllKeyframesForTarget"));
-
         auto object = QmlObjectNode(targetNode);
         if (timeline.isValid() && object.isValid()) {
             for (auto frames : timeline.keyframeGroupsForTarget(targetNode)) {
@@ -78,10 +68,7 @@ void TimelineActions::insertAllKeyframesForTarget(const ModelNode &targetNode,
             }
         }
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
 void TimelineActions::copyAllKeyframesForTarget(const ModelNode &targetNode,
@@ -117,11 +104,10 @@ void TimelineActions::pasteKeyframesToTarget(const ModelNode &targetNode,
 
         pasteModel->detachView(&view);
 
-        try {
+        view.executeInTransaction("TimelineActions::pasteKeyframesToTarget", [=, &view](){
-            targetNode.view()->model()->attachView(&view);
 
-            RewriterTransaction transaction(
+
-                view.beginRewriterTransaction("TimelineActions::pasteKeyframesToTarget"));
+            targetNode.view()->model()->attachView(&view);
 
             ModelNode nonConstTargetNode = targetNode;
             nonConstTargetNode.validId();
@@ -144,11 +130,7 @@ void TimelineActions::pasteKeyframesToTarget(const ModelNode &targetNode,
                     timeline.modelNode().defaultNodeListProperty().reparentHere(newNode);
                 }
             }
-
+        });
-            transaction.commit();
-        } catch (const Exception &e) {
-            e.showException();
-        }
     }
 }
 
@@ -296,9 +278,7 @@ void TimelineActions::pasteKeyframes(AbstractView *timelineView, const QmlTimeli
 
     ModelNode rootNode = view.rootModelNode();
 
-    try {
+    timelineView->executeInTransaction("TimelineActions::pasteKeyframes", [=](){
-        RewriterTransaction transaction(
-            timelineView->beginRewriterTransaction("TimelineActions::pasteKeyframes"));
         if (isKeyframe(rootNode))
             pasteKeyframe(currentTime, rootNode, timelineView, timeline);
         else
@@ -308,10 +288,7 @@ void TimelineActions::pasteKeyframes(AbstractView *timelineView, const QmlTimeli
                               timelineView,
                               timeline);
 
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
 bool TimelineActions::clipboardContainsKeyframes()

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinegraphicsscene.cpp

@@ -663,26 +663,16 @@ void TimelineGraphicsScene::deleteKeyframeGroup(const ModelNode &group)
     if (!QmlTimelineKeyframeGroup::isValidQmlTimelineKeyframeGroup(group))
         return;
 
+    timelineView()->executeInTransaction("TimelineGraphicsScene::handleKeyframeGroupDeletion", [group](){
         ModelNode nonConst = group;
-
-    try {
-        RewriterTransaction transaction(timelineView()->beginRewriterTransaction(
-            "TimelineGraphicsScene::handleKeyframeGroupDeletion"));
-
         nonConst.destroy();
+    });
 
-        transaction.commit();
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
 void TimelineGraphicsScene::deleteKeyframes(const QList<ModelNode> &frames)
 {
-    try {
+    timelineView()->executeInTransaction("TimelineGraphicsScene::handleKeyframeDeletion", [frames](){
-        RewriterTransaction transaction(timelineView()->beginRewriterTransaction(
-            "TimelineGraphicsScene::handleKeyframeDeletion"));
-
         for (auto keyframe : frames) {
             if (keyframe.isValid()) {
                 ModelNode frame = keyframe;
@@ -692,10 +682,7 @@ void TimelineGraphicsScene::deleteKeyframes(const QList<ModelNode> &frames)
                     parent.destroy();
             }
         }
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 }
 
 void TimelineGraphicsScene::activateLayout()

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinemovetool.cpp

@@ -136,10 +136,7 @@ void TimelineMoveTool::mouseReleaseEvent(TimelineMovableAbstractItem *item,
             }
         }
 
-        try {
+        scene()->timelineView()->executeInTransaction("TimelineMoveTool::mouseReleaseEvent", [this, current](){
-            RewriterTransaction transaction(scene()->timelineView()->beginRewriterTransaction(
-                "TimelineMoveTool::mouseReleaseEvent"));
-
             current->commitPosition(mapToItem(current, current->rect().center()));
 
             if (current->asTimelineKeyframeItem()) {
@@ -152,12 +149,7 @@ void TimelineMoveTool::mouseReleaseEvent(TimelineMovableAbstractItem *item,
                     if (keyframe != current)
                         keyframe->commitPosition(mapToItem(current, keyframe->rect().center()));
             }
-
+        });
-            transaction.commit();
-
-        } catch (const Exception &e) {
-            e.showException();
-        }
     }
 }
 

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinepropertyitem.cpp

@@ -534,15 +534,9 @@ void TimelineKeyframeItem::commitPosition(const QPointF &point)
 
     blockUpdates();
 
-    try {
+    m_frame.view()->executeInTransaction("TimelineKeyframeItem::commitPosition", [this, frame](){
-        RewriterTransaction transaction(
-            m_frame.view()->beginRewriterTransaction("TimelineKeyframeItem::commitPosition"));
-
         m_frame.variantProperty("frame").setValue(frame);
-        transaction.commit();
+    });
-    } catch (const RewritingException &e) {
-        e.showException();
-    }
 
     enableUpdates();
 }

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesectionitem.cpp

@@ -821,20 +821,15 @@ void TimelineBarItem::commitPosition(const QPointF & /*point*/)
 {
     if (sectionItem()->view()) {
         if (m_handle != Location::Undefined) {
+            sectionItem()->view()->executeInTransaction("TimelineBarItem::commitPosition", [this](){
                 qreal scaleFactor = rect().width() / m_oldRect.width();
 
                 qreal moved = (rect().topLeft().x() - m_oldRect.topLeft().x()) / rulerScaling();
                 qreal supposedFirstFrame = qRound(sectionItem()->firstFrame() + moved);
 
-            try {
-                RewriterTransaction transaction(sectionItem()->view()->beginRewriterTransaction(
-                    "TimelineBarItem::commitPosition"));
                 sectionItem()->scaleAllFrames(scaleFactor);
                 sectionItem()->moveAllFrames(supposedFirstFrame - sectionItem()->firstFrame());
-                transaction.commit();
+            });
-            } catch (const RewritingException &e) {
-                e.showException();
-            }
         }
     }
 

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp

@@ -266,15 +266,13 @@ ModelNode TimelineSettingsModel::animationForTimelineAndState(const QmlTimeline
 
 void TimelineSettingsModel::updateTimeline(int row)
 {
+
+    timelineView()->executeInTransaction("TimelineSettingsModel::updateTimeline", [this, row](){
         QmlModelState modelState(stateForRow(row));
         QmlTimeline timeline(timelineForRow(row));
         ModelNode animation(animationForRow(row));
         QmlTimeline oldTimeline = timelineView()->timelineForState(modelState);
 
-    RewriterTransaction transaction = timelineView()->beginRewriterTransaction(
-        QByteArrayLiteral("TimelineSettingsModel::updateTimeline"));
-
-    try {
         if (modelState.isBaseState()) {
             if (oldTimeline.isValid())
                 oldTimeline.modelNode().variantProperty("enabled").setValue(false);
@@ -301,27 +299,20 @@ void TimelineSettingsModel::updateTimeline(int row)
                     propertyChanges.modelNode().variantProperty("enabled").setValue(true);
             }
         }
-
+    });
-    } catch (Exception &e) {
-        m_exceptionError = e.description();
-        QTimer::singleShot(200, this, &TimelineSettingsModel::handleException);
-    }
 
     resetRow(row);
 }
 
 void TimelineSettingsModel::updateAnimation(int row)
 {
+    timelineView()->executeInTransaction("TimelineSettingsModel::updateAnimation", [this, row](){
         QmlModelState modelState(stateForRow(row));
         QmlTimeline timeline(timelineForRow(row));
         ModelNode animation(animationForRow(row));
         QmlTimeline oldTimeline = timelineView()->timelineForState(modelState);
         ModelNode oldAnimation = animationForTimelineAndState(oldTimeline, modelState);
 
-    RewriterTransaction transaction = timelineView()->beginRewriterTransaction(
-        QByteArrayLiteral("TimelineSettingsModel::updateAnimation"));
-
-    try {
         if (modelState.isBaseState()) {
             if (oldAnimation.isValid())
                 oldAnimation.variantProperty("running").setValue(false);
@@ -353,27 +344,20 @@ void TimelineSettingsModel::updateAnimation(int row)
                     propertyChanges.modelNode().variantProperty("running").setValue(true);
             }
         }
-    } catch (Exception &e) {
+    });
-        m_exceptionError = e.description();
-        QTimer::singleShot(200, this, &TimelineSettingsModel::handleException);
-    }
-
     resetRow(row);
 }
 
 void TimelineSettingsModel::updateFixedFrameRow(int row)
 {
+    timelineView()->executeInTransaction("TimelineSettingsModel::updateFixedFrameRow", [this, row](){
         QmlModelState modelState(stateForRow(row));
         QmlTimeline timeline(timelineForRow(row));
 
         ModelNode animation = animationForTimelineAndState(timeline, modelState);
 
-    RewriterTransaction transaction = timelineView()->beginRewriterTransaction(
-        QByteArrayLiteral("TimelineSettingsModel::updateFixedFrameRow"));
-
         int fixedFrame = fixedFrameForRow(row);
 
-    try {
         if (modelState.isBaseState()) {
             if (animation.isValid())
                 animation.variantProperty("running").setValue(false);
@@ -390,10 +374,8 @@ void TimelineSettingsModel::updateFixedFrameRow(int row)
             if (propertyChanges.isValid())
                 propertyChanges.modelNode().variantProperty("currentFrame").setValue(fixedFrame);
         }
-    } catch (Exception &e) {
+
-        m_exceptionError = e.description();
+    });
-        QTimer::singleShot(200, this, &TimelineSettingsModel::handleException);
-    }
 
     resetRow(row);
 }

src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelineview.cpp

@@ -264,9 +264,7 @@ const QmlTimeline TimelineView::addNewTimeline()
 
     ModelNode timelineNode;
 
-    try {
+    executeInTransaction("TimelineView::addNewTimeline", [=, &timelineNode](){
-        RewriterTransaction transaction(beginRewriterTransaction("TimelineView::addNewTimeline"));
-
         bool hasTimelines = getTimelines().isEmpty();
 
         timelineNode = createModelNode(timelineType,
@@ -279,10 +277,7 @@ const QmlTimeline TimelineView::addNewTimeline()
         timelineNode.variantProperty("enabled").setValue(hasTimelines);
 
         rootModelNode().defaultNodeListProperty().reparentHere(timelineNode);
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     return QmlTimeline(timelineNode);
 }
@@ -300,10 +295,8 @@ ModelNode TimelineView::addAnimation(QmlTimeline timeline)
     QTC_ASSERT(metaInfo.isValid(), return ModelNode());
 
     ModelNode animationNode;
-    try {
-        RewriterTransaction transaction(
-            beginRewriterTransaction("TimelineSettingsDialog::addAnimation"));
 
+    executeInTransaction("TimelineView::addAnimation", [=, &animationNode](){
         animationNode = createModelNode(animationType,
                                         metaInfo.majorVersion(),
                                         metaInfo.minorVersion());
@@ -321,10 +314,7 @@ ModelNode TimelineView::addAnimation(QmlTimeline timeline)
 
         if (timeline.modelNode().hasProperty("currentFrame"))
             timeline.modelNode().removeProperty("currentFrame");
-        transaction.commit();
+    });
-    } catch (const Exception &e) {
-        e.showException();
-    }
 
     return animationNode;
 }
@@ -391,9 +381,7 @@ void TimelineView::insertKeyframe(const ModelNode &target, const PropertyName &p
     ModelNode targetNode = target;
     if (timeline.isValid() && targetNode.isValid()
             && QmlObjectNode::isValidQmlObjectNode(targetNode)) {
-        try {
+        executeInTransaction("TimelineView::insertKeyframe", [=, &timeline, &targetNode](){
-            RewriterTransaction transaction(
-                beginRewriterTransaction("TimelineView::insertKeyframe"));
 
             targetNode.validId();
 
@@ -408,10 +396,7 @@ void TimelineView::insertKeyframe(const ModelNode &target, const PropertyName &p
 
             timelineFrames.setValue(value, frame);
 
-            transaction.commit();
+        });
-        } catch (const Exception &e) {
-            e.showException();
-        }
     }
 }