aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code style error.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2013-11-07 16:44:55 +02:00
parent 3119c75981
commit 3c12ffacca
12 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
exception/vexception.h
View File

@ -29,7 +29,7 @@ class VException : public QException
{ {
public: public:
VException(const QString &what); 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){} virtual ~VException() Q_DECL_NOEXCEPT_EXPR(true){}
inline void raise() const { throw *this; } inline void raise() const { throw *this; }
inline VException *clone() const { return new VException(*this); } inline VException *clone() const { return new VException(*this); }

3
tools/drawTools/vtoolbisector.h
View File

@ -30,7 +30,8 @@ class VToolBisector : public VToolLinePoint
public: public:
VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine,
const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, 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, static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint,
const qreal& length); const qreal& length);
virtual void setDialog(); virtual void setDialog();

3
tools/drawTools/vtoolshoulderpoint.h
View File

@ -30,7 +30,8 @@ class VToolShoulderPoint : public VToolLinePoint
public: public:
VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine,
const QString &formula, const qint64 &p1Line, const qint64 &p2Line, 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(); virtual void setDialog();
static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder,
const qreal &length); const qreal &length);

6
tools/modelingTools/vmodelingarc.cpp
View File

@ -59,9 +59,9 @@ VModelingArc* VModelingArc::Create(QSharedPointer<DialogArc> &dialog, VDomDocume
return Create(0, center, radius, f1, f2, doc, data, Document::FullParse, Tool::FromGui); return Create(0, center, radius, f1, f2, doc, data, Document::FullParse, Tool::FromGui);
} }
VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 &center, const QString &radius, VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 &center, const QString &radius, const QString &f1,
const QString &f1, const QString &f2, VDomDocument *doc, const QString &f2, VDomDocument *doc, VContainer *data,
VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) const Document::Documents &parse, const Tool::Sources &typeCreation)
{ {
VModelingArc *toolArc = 0; VModelingArc *toolArc = 0;
qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; qreal calcRadius = 0, calcF1 = 0, calcF2 = 0;

3
tools/modelingTools/vmodelingbisector.h
View File

@ -39,7 +39,8 @@ public:
static VModelingBisector* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, static VModelingBisector* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId,
const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine,
const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, 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; static const QString ToolType;
public slots: public slots:
virtual void FullUpdateFromFile(); virtual void FullUpdateFromFile();

3
tools/modelingTools/vmodelingline.h
View File

@ -31,7 +31,8 @@ class VModelingLine: public VModelingTool, public QGraphicsLineItem
Q_OBJECT Q_OBJECT
public: public:
VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, 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(); virtual void setDialog();
static VModelingLine* Create(QSharedPointer<DialogLine> &dialog, VDomDocument *doc, VContainer *data); static VModelingLine* Create(QSharedPointer<DialogLine> &dialog, VDomDocument *doc, VContainer *data);
static VModelingLine* Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, static VModelingLine* Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint,

3
tools/modelingTools/vmodelinglineintersect.h
View File

@ -32,7 +32,8 @@ public:
VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id,
const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line1, const qint64 &p2Line1,
const qint64 &p1Line2, const qint64 &p2Line2, const qint64 &p1Line2, const qint64 &p2Line2,
const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); const Tool::Sources &typeCreation,
QGraphicsItem * parent = 0);
virtual void setDialog(); virtual void setDialog();
static VModelingLineIntersect* Create(QSharedPointer<DialogLineIntersect> &dialog, VDomDocument *doc, static VModelingLineIntersect* Create(QSharedPointer<DialogLineIntersect> &dialog, VDomDocument *doc,
VContainer *data); VContainer *data);

3
tools/modelingTools/vmodelingpointofcontact.h
View File

@ -32,7 +32,8 @@ public:
VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id,
const QString &radius, const qint64 &center, const QString &radius, const qint64 &center,
const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &firstPointId, const qint64 &secondPointId,
const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); const Tool::Sources &typeCreation,
QGraphicsItem * parent = 0);
virtual void setDialog(); virtual void setDialog();
static VModelingPointOfContact* Create(QSharedPointer<DialogPointOfContact> &dialog, VDomDocument *doc, static VModelingPointOfContact* Create(QSharedPointer<DialogPointOfContact> &dialog, VDomDocument *doc,
VContainer *data); VContainer *data);

3
tools/modelingTools/vmodelingspline.cpp
View File

@ -91,7 +91,8 @@ VModelingSpline *VModelingSpline::Create(QSharedPointer<DialogSpline> &dialog, V
VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4,
const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1,
const qreal &angle2, const qreal &kCurve, VDomDocument *doc, 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; VModelingSpline *spl = 0;
VSpline spline = VSpline(data->DataModelingPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); VSpline spline = VSpline(data->DataModelingPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve);

4
tools/modelingTools/vmodelingspline.h
View File

@ -32,8 +32,8 @@ class VModelingSpline:public VModelingTool, public QGraphicsPathItem
{ {
Q_OBJECT Q_OBJECT
public: public:
VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id,
QGraphicsItem * parent = 0 ); const Tool::Sources &typeCreation, QGraphicsItem * parent = 0 );
virtual void setDialog(); virtual void setDialog();
static VModelingSpline* Create(QSharedPointer<DialogSpline> &dialog, VDomDocument *doc, VContainer *data); static VModelingSpline* Create(QSharedPointer<DialogSpline> &dialog, VDomDocument *doc, VContainer *data);
static VModelingSpline* Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, static VModelingSpline* Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1,

4
tools/modelingTools/vmodelingsplinepath.cpp
View File

@ -24,8 +24,8 @@
const QString VModelingSplinePath::TagName = QStringLiteral("spline"); const QString VModelingSplinePath::TagName = QStringLiteral("spline");
const QString VModelingSplinePath::ToolType = QStringLiteral("path"); const QString VModelingSplinePath::ToolType = QStringLiteral("path");
VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id,
QGraphicsItem *parent) const Tool::Sources &typeCreation, QGraphicsItem *parent)
:VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer<DialogSplinePath>()), :VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer<DialogSplinePath>()),
controlPoints(QVector<VControlPointSpline *>()) controlPoints(QVector<VControlPointSpline *>())
{ {

3
tools/modelingTools/vmodelingsplinepath.h
View File

@ -36,7 +36,8 @@ public:
virtual void setDialog(); virtual void setDialog();
static VModelingSplinePath* Create(QSharedPointer<DialogSplinePath> &dialog, VDomDocument *doc, VContainer *data); static VModelingSplinePath* Create(QSharedPointer<DialogSplinePath> &dialog, VDomDocument *doc, VContainer *data);
static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, 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 TagName;
static const QString ToolType; static const QString ToolType;
signals: signals: