From f17a12d147f744865102aec958bdfe4f7eadf2a6 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Sun, 11 May 2014 21:15:32 +0300
Subject: [PATCH] Cppcheck.

--HG--
branch : develop
---
 src/app/container/calculator.cpp            | 1 -
 src/app/container/calculator.h              | 1 +
 src/app/dialogs/tools/dialogarc.cpp         | 1 +
 src/app/dialogs/tools/dialogarc.h           | 1 +
 src/app/geometry/vspline.cpp                | 2 ++
 src/app/geometry/vspline.h                  | 2 ++
 src/app/xml/vdomdocument.cpp                | 1 +
 src/libs/qmuparser/qmuparsertokenreader.cpp | 2 +-
 8 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/container/calculator.cpp b/src/app/container/calculator.cpp
index 8eb944deb..39d1700dd 100644
--- a/src/app/container/calculator.cpp
+++ b/src/app/container/calculator.cpp
@@ -290,7 +290,6 @@ qreal Calculator::find_var(QString s)
  * @brief serror report an error
  * @param error error code
  */
-// cppcheck-suppress functionStatic
 void Calculator::serror(qint32 error)
 {
     QString e[]=
diff --git a/src/app/container/calculator.h b/src/app/container/calculator.h
index 5068d0c4f..51e074865 100644
--- a/src/app/container/calculator.h
+++ b/src/app/container/calculator.h
@@ -87,6 +87,7 @@ private:
     static void arith(QChar o, qreal *r, qreal *h);
     static void unary(QChar o, qreal *r);
     qreal       find_var(QString s);
+    // cppcheck-suppress functionStatic
     void        serror(qint32 error);
     static char look_up(QString s);
     static bool isdelim(QChar c);
diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp
index 1344a1d52..bbb17d47b 100644
--- a/src/app/dialogs/tools/dialogarc.cpp
+++ b/src/app/dialogs/tools/dialogarc.cpp
@@ -163,6 +163,7 @@ void DialogArc::PutF2()
 }
 
 //---------------------------------------------------------------------------------------------------------------------
+// cppcheck-suppress unusedFunction
 void DialogArc::LineAngles()
 {
     ShowLineAngles();
diff --git a/src/app/dialogs/tools/dialogarc.h b/src/app/dialogs/tools/dialogarc.h
index 729d39f63..24840e2f2 100644
--- a/src/app/dialogs/tools/dialogarc.h
+++ b/src/app/dialogs/tools/dialogarc.h
@@ -121,6 +121,7 @@ public slots:
     /**
      * @brief LineAngles show variable angles of lines
      */
+    // cppcheck-suppress unusedFunction
     void          LineAngles();
     /**
      * @brief RadiusChanged after change formula of radius calculate value and show result
diff --git a/src/app/geometry/vspline.cpp b/src/app/geometry/vspline.cpp
index f3a8d935e..fda0556d4 100644
--- a/src/app/geometry/vspline.cpp
+++ b/src/app/geometry/vspline.cpp
@@ -110,6 +110,7 @@ QString VSpline::name() const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
+// cppcheck-suppress unusedFunction
 QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *intersectionPoint ) const
 {
     QVector<qreal> px;
@@ -588,6 +589,7 @@ QPainterPath VSpline::GetPath() const
 }
 
 //---------------------------------------------------------------------------------------------------------------------
+// cppcheck-suppress unusedFunction
 QVector<QPointF> VSpline::SplinePoints(const QPointF &p1, const QPointF &p4, qreal angle1, qreal angle2, qreal kAsm1,
                                        qreal kAsm2, qreal kCurve)
 {
diff --git a/src/app/geometry/vspline.h b/src/app/geometry/vspline.h
index 218bfaa4d..df47ebaa2 100644
--- a/src/app/geometry/vspline.h
+++ b/src/app/geometry/vspline.h
@@ -137,6 +137,7 @@ public:
      * @param intersectionPoint intersection point.
      * @return result intersection.
      */
+    // cppcheck-suppress unusedFunction
     QLineF::IntersectType CrossingSplLine(const QLineF &line, QPointF *intersectionPoint ) const;
     qreal           LengthT(qreal t) const;
     /**
@@ -171,6 +172,7 @@ public:
      * @param kCurve coefficient of curvature spline.
      * @return
      */
+    // cppcheck-suppress unusedFunction
     static QVector<QPointF> SplinePoints(const QPointF &p1, const QPointF &p4, qreal angle1, qreal angle2, qreal kAsm1,
                                          qreal kAsm2, qreal kCurve);
     /**
diff --git a/src/app/xml/vdomdocument.cpp b/src/app/xml/vdomdocument.cpp
index d5b57b219..81f52a123 100644
--- a/src/app/xml/vdomdocument.cpp
+++ b/src/app/xml/vdomdocument.cpp
@@ -48,6 +48,7 @@ public:
     qint64  line() const;
     qint64  column() const;
 protected:
+    // cppcheck-suppress unusedFunction
     virtual void handleMessage(QtMsgType type, const QString &description,
                                const QUrl &identifier, const QSourceLocation &sourceLocation)
     {
diff --git a/src/libs/qmuparser/qmuparsertokenreader.cpp b/src/libs/qmuparser/qmuparsertokenreader.cpp
index 8c4881ca3..e2d869c9b 100644
--- a/src/libs/qmuparser/qmuparsertokenreader.cpp
+++ b/src/libs/qmuparser/qmuparsertokenreader.cpp
@@ -568,7 +568,7 @@ bool QmuParserTokenReader::IsEOF ( token_type &a_Tok )
             {
                 qDebug() << "\n  "
                          << "  Code:" << e.GetCode() << "(" << e.GetMsg() << ")";
-                throw e;
+                throw;
             }
         }