Minor refactoring.

--HG--
branch : develop

src/libs/ifc/xml/vabstractpattern.cpp

@@ -768,11 +768,14 @@ VPieceNode VAbstractPattern::ParseSANode(const QDomElement &domElement)
     const QString t = VDomDocument::GetParametrString(domElement, AttrType, VAbstractPattern::NodePoint);
     Tool tool;
 
-    const QStringList types = QStringList() << VAbstractPattern::NodePoint
+    const QStringList types
-                                            << VAbstractPattern::NodeArc
+    {
-                                            << VAbstractPattern::NodeSpline
+        VAbstractPattern::NodePoint,
-                                            << VAbstractPattern::NodeSplinePath
+        VAbstractPattern::NodeArc,
-                                            << VAbstractPattern::NodeElArc;
+        VAbstractPattern::NodeSpline,
+        VAbstractPattern::NodeSplinePath,
+        VAbstractPattern::NodeElArc
+    };
 
     switch (types.indexOf(t))
     {

src/libs/vformat/vmeasurements.cpp

@@ -462,14 +462,7 @@ bool VMeasurements::IsReadOnly() const
 //---------------------------------------------------------------------------------------------------------------------
 void VMeasurements::SetReadOnly(bool ro)
 {
-    if (ro)
+    setTagText(TagReadOnly, ro ? trueStr : falseStr);
-    {
-        setTagText(TagReadOnly, trueStr);
-    }
-    else
-    {
-        setTagText(TagReadOnly, falseStr);
-    }
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/tools/vtoolseamallowance.cpp

@@ -1428,7 +1428,7 @@ void VToolSeamAllowance::ShowOptions()
 //---------------------------------------------------------------------------------------------------------------------
 void VToolSeamAllowance::ToggleInLayout(bool checked)
 {
-    TogglePieceInLayout *togglePrint = new TogglePieceInLayout(m_id, checked, &(VAbstractTool::data), doc);
+    auto togglePrint = new TogglePieceInLayout(m_id, checked, &(VAbstractTool::data), doc);
     connect(togglePrint, &TogglePieceInLayout::Toggled, doc, &VAbstractPattern::CheckInLayoutList);
     qApp->getUndoStack()->push(togglePrint);
 }

src/libs/vtools/undocommands/saveplacelabeloptions.cpp

@@ -115,19 +115,10 @@ bool SavePlaceLabelOptions::mergeWith(const QUndoCommand *command)
     const SavePlaceLabelOptions *saveCommand = static_cast<const SavePlaceLabelOptions *>(command);
     SCASSERT(saveCommand != nullptr);
 
-    if (saveCommand->LabelId() != nodeId)
+    if (saveCommand->LabelId() != nodeId || m_newLabel.GetCenterPoint() != saveCommand->NewLabel().GetCenterPoint())
     {
         return false;
     }
-    else
-    {
-        const VPlaceLabelItem candidate = saveCommand->NewLabel();
-
-        if (m_newLabel.GetCenterPoint() != candidate.GetCenterPoint())
-        {
-            return false;
-        }
-    }
 
     m_newLabel = saveCommand->NewLabel();
     return true;

src/libs/vtools/undocommands/vundocommand.h

@@ -43,24 +43,26 @@
 
 Q_DECLARE_LOGGING_CATEGORY(vUndo)
 
-enum class UndoCommand: char { AddPatternPiece,
+enum class UndoCommand: char
-                               AddToCalc,
+{
-                               MoveSpline,
+    AddPatternPiece,
-                               MoveSplinePath,
+    AddToCalc,
-                               MoveSPoint,
+    MoveSpline,
-                               SaveToolOptions,
+    MoveSplinePath,
-                               SaveDetailOptions,
+    MoveSPoint,
-                               SavePieceOptions,
+    SaveToolOptions,
-                               SavePiecePathOptions,
+    SaveDetailOptions,
-                               SavePlaceLabelOptions,
+    SavePieceOptions,
-                               MovePiece,
+    SavePiecePathOptions,
-                               DeleteTool,
+    SavePlaceLabelOptions,
-                               DeletePatternPiece,
+    MovePiece,
-                               RenamePP,
+    DeleteTool,
-                               MoveLabel,
+    DeletePatternPiece,
-                               MoveDoubleLabel,
+    RenamePP,
-                               RotationMoveLabel
+    MoveLabel,
-                             };
+    MoveDoubleLabel,
+    RotationMoveLabel
+ };
 
 class VPattern;