diff --git a/src/libs/ifc/schema.qrc b/src/libs/ifc/schema.qrc index 85c0a825d..6a0edbcae 100644 --- a/src/libs/ifc/schema.qrc +++ b/src/libs/ifc/schema.qrc @@ -19,6 +19,7 @@ schema/pattern/v0.3.3.xsd schema/pattern/v0.3.4.xsd schema/pattern/v0.3.5.xsd + schema/pattern/v0.3.6.xsd schema/standard_measurements/v0.3.0.xsd schema/standard_measurements/v0.4.0.xsd schema/standard_measurements/v0.4.1.xsd @@ -28,6 +29,5 @@ schema/individual_measurements/v0.3.1.xsd schema/individual_measurements/v0.3.2.xsd schema/individual_measurements/v0.3.3.xsd - schema/pattern/v0.3.6.xsd diff --git a/src/libs/vpatterndb/vgrainlinegeometry.cpp b/src/libs/vpatterndb/vgrainlinegeometry.cpp index fb519bf84..860ee5321 100644 --- a/src/libs/vpatterndb/vgrainlinegeometry.cpp +++ b/src/libs/vpatterndb/vgrainlinegeometry.cpp @@ -64,7 +64,7 @@ QString VGrainlineGeometry::GetLength() const //--------------------------------------------------------------------------------------------------------------------- -void VGrainlineGeometry::SetLength(QString qsLen) +void VGrainlineGeometry::SetLength(const QString& qsLen) { m_qsLength = qsLen; } @@ -78,7 +78,7 @@ QString VGrainlineGeometry::GetRotation() const //--------------------------------------------------------------------------------------------------------------------- -void VGrainlineGeometry::SetRotation(QString qsRot) +void VGrainlineGeometry::SetRotation(const QString& qsRot) { m_qsRotation = qsRot; } diff --git a/src/libs/vpatterndb/vgrainlinegeometry.h b/src/libs/vpatterndb/vgrainlinegeometry.h index d4a2f8fff..0b27c3adf 100644 --- a/src/libs/vpatterndb/vgrainlinegeometry.h +++ b/src/libs/vpatterndb/vgrainlinegeometry.h @@ -48,9 +48,9 @@ public: QPointF GetPos() const; void SetPos(const QPointF& ptPos); QString GetLength() const; - void SetLength(QString qsLen); + void SetLength(const QString& qsLen); QString GetRotation() const; - void SetRotation(QString qsRot); + void SetRotation(const QString& qsRot); bool IsVisible() const; void SetVisible(bool bVisible); diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index 5c096c2cf..6240d5545 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -830,7 +830,7 @@ void DialogDetail::ClearFields() //--------------------------------------------------------------------------------------------------------------------- void DialogDetail::SetValue(QObject *pobjSender) { - QLineEdit* pleSender = dynamic_cast(pobjSender); + QLineEdit* pleSender = qobject_cast(pobjSender); SCASSERT(pleSender != 0); QString qsFormula = pleSender->text().simplified(); diff --git a/src/libs/vtools/tools/tools.pri b/src/libs/vtools/tools/tools.pri index 833e3d73d..57d4bb1a3 100644 --- a/src/libs/vtools/tools/tools.pri +++ b/src/libs/vtools/tools/tools.pri @@ -50,10 +50,10 @@ HEADERS += \ $$PWD/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h \ $$PWD/drawTools/toolcurve/vtoolcubicbezier.h \ $$PWD/drawTools/toolcurve/vtoolcubicbezierpath.h \ - $$PWD/drawTools/operation/vtoolrotation.h \ - $$PWD/vtextgraphicsitem.h \ - $$PWD/vgrainlineitem.h \ - $$PWD/drawTools/operation/flipping/vtoolflippingbyline.h \ + $$PWD/drawTools/operation/vtoolrotation.h \ + $$PWD/vtextgraphicsitem.h \ + $$PWD/vgrainlineitem.h \ + $$PWD/drawTools/operation/flipping/vtoolflippingbyline.h \ $$PWD/drawTools/operation/vabstractoperation.h \ $$PWD/drawTools/operation/flipping/vtoolflippingbyaxis.h \ $$PWD/drawTools/operation/flipping/vabstractflipping.h @@ -106,8 +106,8 @@ SOURCES += \ $$PWD/drawTools/toolcurve/vtoolcubicbezierpath.cpp \ $$PWD/drawTools/operation/vtoolrotation.cpp \ $$PWD/vtextgraphicsitem.cpp \ - $$PWD/vgrainlineitem.cpp \ - $$PWD/drawTools/operation/flipping/vtoolflippingbyline.cpp \ + $$PWD/vgrainlineitem.cpp \ + $$PWD/drawTools/operation/flipping/vtoolflippingbyline.cpp \ $$PWD/drawTools/operation/vabstractoperation.cpp \ $$PWD/drawTools/operation/flipping/vtoolflippingbyaxis.cpp \ $$PWD/drawTools/operation/flipping/vabstractflipping.cpp diff --git a/src/libs/vtools/tools/vgrainlineitem.cpp b/src/libs/vtools/tools/vgrainlineitem.cpp index 684944a08..d0dbc0a83 100644 --- a/src/libs/vtools/tools/vgrainlineitem.cpp +++ b/src/libs/vtools/tools/vgrainlineitem.cpp @@ -29,12 +29,12 @@ #include #include -#include #include #include #include #include "../vmisc/def.h" +#include "../vmisc/vmath.h" #include "vgrainlineitem.h"