From b352c12afab91aa7f4363ff8a4e583357a885ac3 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Mon, 27 May 2019 19:14:07 +0300
Subject: [PATCH] Fixing regression in method DialogTool::GetNodeName.

--HG--
branch : release
---
 ChangeLog.txt                                |  1 +
 src/libs/vtools/dialogs/tools/dialogtool.cpp | 12 ++++++------
 src/libs/vtools/dialogs/tools/dialogtool.h   |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8a188594a..4d3b71c80 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -25,6 +25,7 @@
 - [#967] Variable must not include new line character.
 - German translation for Inno setup script.
 - [#971] Group operation do not work with VCubicBezierPath.
+- Regression in method DialogTool::GetNodeName.
 
 # Version 0.6.1 October 23, 2018
 - [#885] Regression. Broken support for multi size measurements.
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.cpp b/src/libs/vtools/dialogs/tools/dialogtool.cpp
index e231e3781..661b2d608 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp
@@ -624,7 +624,7 @@ QFont DialogTool::NodeFont(QFont font, bool nodeExcluded)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
+QString DialogTool::GetNodeName(const VPieceNode &node, bool showPassmarkDetails) const
 {
     const QSharedPointer<VGObject> obj = data->GetGObject(node.GetId());
     QString name = obj->name();
@@ -634,14 +634,14 @@ QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
         int bias = 0;
         qApp->TrVars()->VariablesToUser(name, 0, obj->name(), bias);
 
-        if (showDetails && node.GetReverse())
+        if (node.GetReverse())
         {
-            name = QLatin1String("- ") + name;
+            name = QStringLiteral("- ") + name;
         }
     }
     else
     {
-        if (showDetails && node.IsPassmark())
+        if (showPassmarkDetails && node.IsPassmark())
         {
             switch(node.GetPassmarkLineType())
             {
@@ -655,7 +655,7 @@ QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
                     name += QLatin1Literal("|||");
                     break;
                 case PassmarkLineType::TMark:
-                    name += QString("┴");
+                    name += QStringLiteral("┴");
                     break;
                 case PassmarkLineType::VMark:
                     name += QLatin1Char('^');
@@ -665,7 +665,7 @@ QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
             }
         }
 
-        if (showDetails && not node.IsCheckUniqueness())
+        if (not node.IsCheckUniqueness())
         {
             name = QLatin1Char('[') + name + QLatin1Char(']');
         }
diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h
index 2f22b624b..d87aaaecb 100644
--- a/src/libs/vtools/dialogs/tools/dialogtool.h
+++ b/src/libs/vtools/dialogs/tools/dialogtool.h
@@ -284,7 +284,7 @@ protected:
     static QString   DialogWarningIcon();
     static QFont     NodeFont(QFont font, bool nodeExcluded = false);
 
-    QString          GetNodeName(const VPieceNode &node, bool showDetails = false) const;
+    QString          GetNodeName(const VPieceNode &node, bool showPassmarkDetails = false) const;
     void             NewNodeItem(QListWidget *listWidget, const VPieceNode &node, bool showPassmark = true);
 
     void             InitNodeAngles(QComboBox *box);