diff --git a/exception/vexception.h b/exception/vexception.h index 94b064d21..5a68cbad7 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -29,7 +29,7 @@ class VException : public QException { public: VException(const QString &what); - VException(const VException &e):what(e.What()){} + VException(const VException &e):what(e.What()){} virtual ~VException() Q_DECL_NOEXCEPT_EXPR(true){} inline void raise() const { throw *this; } inline VException *clone() const { return new VException(*this); } diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 396affed0..1b6fc5077 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -30,7 +30,8 @@ class VToolBisector : public VToolLinePoint public: VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, - const qint64 &thirdPointId, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const qint64 &thirdPointId, const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint, const qreal& length); virtual void setDialog(); diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index f67bcbf49..71a2c30b3 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -30,7 +30,8 @@ class VToolShoulderPoint : public VToolLinePoint public: VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, - const qint64 &pShoulder, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const qint64 &pShoulder, const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, const qreal &length); diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 7a8e9c8d5..f1ca4c913 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -59,9 +59,9 @@ VModelingArc* VModelingArc::Create(QSharedPointer &dialog, VDomDocume return Create(0, center, radius, f1, f2, doc, data, Document::FullParse, Tool::FromGui); } -VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, - const QString &f1, const QString &f2, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) +VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, + const QString &f2, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, const Tool::Sources &typeCreation) { VModelingArc *toolArc = 0; qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index d29840403..ed454812c 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -39,7 +39,8 @@ public: static VModelingBisector* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 272dcbe68..0d7cb96ef 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -31,7 +31,8 @@ class VModelingLine: public VModelingTool, public QGraphicsLineItem Q_OBJECT public: VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + qint64 secondPoint, const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingLine* Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index 12b55cf83..93282c731 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -32,7 +32,8 @@ public: VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, - const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingLineIntersect* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index a6a965cde..50fd4eb1f 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -32,7 +32,8 @@ public: VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, - const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingPointOfContact* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index d1ffd0640..5806b5fc2 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -91,7 +91,8 @@ VModelingSpline *VModelingSpline::Create(QSharedPointer &dialog, V VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation) { VModelingSpline *spl = 0; VSpline spline = VSpline(data->DataModelingPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index 04d07348c..0b69d5dcf 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -32,8 +32,8 @@ class VModelingSpline:public VModelingTool, public QGraphicsPathItem { Q_OBJECT public: - VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, - QGraphicsItem * parent = 0 ); + VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); static VModelingSpline* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSpline* Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index c91e3bbc7..975b8acd8 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -24,8 +24,8 @@ const QString VModelingSplinePath::TagName = QStringLiteral("spline"); const QString VModelingSplinePath::ToolType = QStringLiteral("path"); -VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, - QGraphicsItem *parent) +VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), controlPoints(QVector()) { diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 141bf5317..a93925bb2 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -36,7 +36,8 @@ public: virtual void setDialog(); static VModelingSplinePath* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; signals: