From 8b0de7504f260a45ed3ffbeb146571acbbb1434b Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Mon, 2 Mar 2015 21:20:09 +0200
Subject: [PATCH] Coverity Scan.

--HG--
branch : release
---
 src/app/tools/drawTools/vtoolpoint.cpp | 14 ++++++++++++-
 src/libs/vlayout/vcontour.cpp          | 11 ++--------
 src/libs/vlayout/vposition.cpp         | 28 ++++++++++++++------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp
index 18e6fc444..9beb5b8e9 100644
--- a/src/app/tools/drawTools/vtoolpoint.cpp
+++ b/src/app/tools/drawTools/vtoolpoint.cpp
@@ -28,10 +28,13 @@
 
 #include "vtoolpoint.h"
 #include <QKeyEvent>
+#include <QLoggingCategory>
 #include "../../geometry/vpointf.h"
 #include "../../visualization/vgraphicssimpletextitem.h"
 #include "../../undocommands/movelabel.h"
 
+Q_LOGGING_CATEGORY(vToolPoint, "v.toolPoint")
+
 const QString VToolPoint::TagName = QStringLiteral("point");
 
 //---------------------------------------------------------------------------------------------------------------------
@@ -79,12 +82,21 @@ void VToolPoint::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
 //---------------------------------------------------------------------------------------------------------------------
 QString VToolPoint::name() const
 {
-    return VAbstractTool::data.GeometricObject<VPointF>(id)->name();
+    try
+    {
+        return VAbstractTool::data.GeometricObject<VPointF>(id)->name();
+    }
+    catch (const VExceptionBadId &e)
+    {
+        qCDebug(vToolPoint)<<"Error!"<<"Couldn't get point name."<<e.ErrorMessage()<<e.DetailedInformation();
+        return QString("");// Return empty string for property browser
+    }
 }
 
 //---------------------------------------------------------------------------------------------------------------------
 void VToolPoint::setName(const QString &name)
 {
+    // Don't know if need check name here.
     QSharedPointer<VGObject> obj = VAbstractTool::data.GetGObject(id);
     obj->setName(name);
     SaveOption(obj);
diff --git a/src/libs/vlayout/vcontour.cpp b/src/libs/vlayout/vcontour.cpp
index d4763ede5..8f08a3c73 100644
--- a/src/libs/vlayout/vcontour.cpp
+++ b/src/libs/vlayout/vcontour.cpp
@@ -239,15 +239,8 @@ QLineF VContour::GlobalEdge(int i) const
             return QLineF();
         }
 
-        if (n <= 0)
-        {
-            return axis;
-        }
-        else
-        {
-            const qreal nShift = axis.length()/n;
-            return QLineF(nShift*(i-1), 0, nShift*i, 0);
-        }
+        const qreal nShift = axis.length()/n;
+        return QLineF(nShift*(i-1), 0, nShift*i, 0);
     }
     else
     {
diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp
index de0472f01..47748944b 100644
--- a/src/libs/vlayout/vposition.cpp
+++ b/src/libs/vlayout/vposition.cpp
@@ -580,22 +580,24 @@ QVector<QPointF> VPosition::CutEdge(const QLineF &edge, unsigned int shift)
         points.append(edge.p1());
         points.append(edge.p2());
     }
-
-    const int n = qFloor(edge.length()/shift);
-
-    if (n <= 0)
-    {
-        points.append(edge.p1());
-        points.append(edge.p2());
-    }
     else
     {
-        const qreal nShift = edge.length()/n;
-        for (int i = 1; i <= n+1; ++i)
+        const int n = qFloor(edge.length()/shift);
+
+        if (n <= 0)
         {
-            QLineF l1 = edge;
-            l1.setLength(nShift*(i-1));
-            points.append(l1.p2());
+            points.append(edge.p1());
+            points.append(edge.p2());
+        }
+        else
+        {
+            const qreal nShift = edge.length()/n;
+            for (int i = 1; i <= n+1; ++i)
+            {
+                QLineF l1 = edge;
+                l1.setLength(nShift*(i-1));
+                points.append(l1.p2());
+            }
         }
     }
     return points;