From 38e60d59055cae95ad5de4c8e6b3f9d339f86685 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Wed, 4 Nov 2020 14:50:17 +0200
Subject: [PATCH] Fix name for history with alias.

---
 src/libs/vgeometry/vabstractarc.cpp             |  9 ++++++++-
 src/libs/vgeometry/vabstractcubicbezier.cpp     |  9 ++++++++-
 src/libs/vgeometry/vabstractcubicbezierpath.cpp | 10 +++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/libs/vgeometry/vabstractarc.cpp b/src/libs/vgeometry/vabstractarc.cpp
index 592a12a6c..3aee72f97 100644
--- a/src/libs/vgeometry/vabstractarc.cpp
+++ b/src/libs/vgeometry/vabstractarc.cpp
@@ -182,7 +182,14 @@ QString VAbstractArc::NameForHistory(const QString &toolName) const
         name += QString("_%1").arg(GetDuplicate());
     }
 
-    return not GetAlias().isEmpty() ? QString("%1 (%2)").arg(GetAlias(), name) : name;
+    QString alias;
+
+    if (not GetAliasSuffix().isEmpty())
+    {
+        alias = QString("%1 %2").arg(toolName, GetAliasSuffix());
+    }
+
+    return not alias.isEmpty() ? QString("%1 (%2)").arg(alias, name) : name;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vgeometry/vabstractcubicbezier.cpp b/src/libs/vgeometry/vabstractcubicbezier.cpp
index 1efcbfacc..3f2831de7 100644
--- a/src/libs/vgeometry/vabstractcubicbezier.cpp
+++ b/src/libs/vgeometry/vabstractcubicbezier.cpp
@@ -476,7 +476,14 @@ QString VAbstractCubicBezier::NameForHistory(const QString &toolName) const
         name += QString("_%1").arg(GetDuplicate());
     }
 
-    return not GetAlias().isEmpty() ? QString("%1 (%2)").arg(GetAlias(), name) : name;
+    QString alias;
+
+    if (not GetAliasSuffix().isEmpty())
+    {
+        alias = QString("%1 %2").arg(toolName, GetAliasSuffix());
+    }
+
+    return not alias.isEmpty() ? QString("%1 (%2)").arg(alias, name) : name;
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vgeometry/vabstractcubicbezierpath.cpp b/src/libs/vgeometry/vabstractcubicbezierpath.cpp
index 65c3951ce..3a9144e6d 100644
--- a/src/libs/vgeometry/vabstractcubicbezierpath.cpp
+++ b/src/libs/vgeometry/vabstractcubicbezierpath.cpp
@@ -265,7 +265,15 @@ QString VAbstractCubicBezierPath::NameForHistory(const QString &toolName) const
             name += QString("_%1").arg(GetDuplicate());
         }
     }
-    return name;
+
+    QString alias;
+
+    if (not GetAliasSuffix().isEmpty())
+    {
+        alias = QString("%1 %2").arg(toolName, GetAliasSuffix());
+    }
+
+    return not alias.isEmpty() ? QString("%1 (%2)").arg(alias, name) : name;
 }
 
 //---------------------------------------------------------------------------------------------------------------------