From e8bf8a80e39626b993da1eb21a2d14916777d503 Mon Sep 17 00:00:00 2001
From: Valentina Zhuravska <none@none>
Date: Sun, 28 Feb 2016 21:24:56 +0200
Subject: [PATCH] Changed QString("%1").arg() to QString().number() in VArc

--HG--
branch : feature
---
 src/libs/vgeometry/varc.cpp           |  2 +-
 src/libs/vgeometry/varc_p.h           | 11 +++++++----
 src/libs/vgeometry/vellipticalarc.cpp |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/libs/vgeometry/varc.cpp b/src/libs/vgeometry/varc.cpp
index 7014cf795..c26b2de72 100644
--- a/src/libs/vgeometry/varc.cpp
+++ b/src/libs/vgeometry/varc.cpp
@@ -354,7 +354,7 @@ void VArc::FindF2(qreal length)
     startAngle.setAngle(d->f1 + arcAngle);// We use QLineF just because it is easy way correct angle value
 
     d->f2 = startAngle.angle();
-    d->formulaF2 = QString("%1").arg(d->f2);
+    d->formulaF2 = QString().number(qApp->fromPixel(d->f2));
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/libs/vgeometry/varc_p.h b/src/libs/vgeometry/varc_p.h
index b11f1399c..841349ff1 100644
--- a/src/libs/vgeometry/varc_p.h
+++ b/src/libs/vgeometry/varc_p.h
@@ -31,6 +31,7 @@
 
 #include <QSharedData>
 #include "vgeometrydef.h"
+#include <../vmisc/vabstractapplication.h>
 #include "vpointf.h"
 
 #ifdef Q_CC_GNU
@@ -54,8 +55,10 @@ public:
     {}
 
     VArcData(VPointF center, qreal radius, qreal f1, qreal f2)
-        : f1(f1), formulaF1(QString("%1").arg(f1)), f2(f2), formulaF2(QString("%1").arg(f2)), radius(radius),
-          formulaRadius(QString("%1").arg(radius)), center(center), isFlipped(false), formulaLength()
+        : f1(f1), formulaF1(QString().number(qApp->fromPixel(f1))),
+          f2(f2), formulaF2(QString().number(qApp->fromPixel(f2))),
+          radius(radius), formulaRadius(QString().number(qApp->fromPixel(radius))),
+          center(center), isFlipped(false), formulaLength()
     {}
 
     VArcData (QString formulaLength, VPointF center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1 )
@@ -64,8 +67,8 @@ public:
     {}
 
     VArcData(VPointF center, qreal radius, qreal f1)
-        : f1(f1), formulaF1(QString("%1").arg(f1)), f2(0), formulaF2("0"), radius(radius),
-          formulaRadius(QString("%1").arg(radius)), center(center), isFlipped(false), formulaLength()
+        : f1(f1), formulaF1(QString().number(qApp->fromPixel(f1))), f2(0), formulaF2("0"), radius(radius),
+          formulaRadius(QString().number(qApp->fromPixel(radius))), center(center), isFlipped(false), formulaLength()
     {}
 
     VArcData(const VArcData &arc)
diff --git a/src/libs/vgeometry/vellipticalarc.cpp b/src/libs/vgeometry/vellipticalarc.cpp
index 8db3ad1a6..c6c2528c0 100644
--- a/src/libs/vgeometry/vellipticalarc.cpp
+++ b/src/libs/vgeometry/vellipticalarc.cpp
@@ -432,8 +432,8 @@ void VEllipticalArc::FindF2(qreal length)
         d->f2 = endAngle;
         lenBez = GetLength();
     }
-    d->formulaF2 = QString("%1").arg(d->f2);
-    d->formulaLength = QString("%1").arg(lenBez);
+    d->formulaF2 = QString().number(qApp->fromPixel(d->f2));
+    d->formulaLength = QString().number(qApp->fromPixel(lenBez));
 }
 
 //---------------------------------------------------------------------------------------------------------------------