diff --git a/src/libs/vdxf/dxflib/dl_creationinterface.h b/src/libs/vdxf/dxflib/dl_creationinterface.h index fa7d0688c..7683d76c6 100644 --- a/src/libs/vdxf/dxflib/dl_creationinterface.h +++ b/src/libs/vdxf/dxflib/dl_creationinterface.h @@ -47,9 +47,8 @@ class DXFLIB_EXPORT DL_CreationInterface { public: - DL_CreationInterface() : extrusion(), attributes() + DL_CreationInterface() : extrusion(new DL_Extrusion), attributes() { - extrusion = new DL_Extrusion; } virtual ~DL_CreationInterface() { diff --git a/src/libs/vdxf/dxflib/dl_entities.h b/src/libs/vdxf/dxflib/dl_entities.h index 2e2f01325..84c09b2ed 100644 --- a/src/libs/vdxf/dxflib/dl_entities.h +++ b/src/libs/vdxf/dxflib/dl_entities.h @@ -561,7 +561,7 @@ struct DXFLIB_EXPORT DL_SplineData */ struct DXFLIB_EXPORT DL_KnotData { - DL_KnotData() : k() {} + DL_KnotData() : k(0.0) {} /** * Constructor. * Parameters: see member variables. @@ -1366,7 +1366,7 @@ struct DXFLIB_EXPORT DL_HatchData /** * Default constructor. */ - DL_HatchData() : numLoops(), solid(), scale(), angle(), pattern(), originX(), originY() + DL_HatchData() : numLoops(0), solid(), scale(0.0), angle(0.0), pattern(), originX(0.0), originY(0.0) {} /** @@ -1415,7 +1415,8 @@ struct DXFLIB_EXPORT DL_HatchLoopData /** * Default constructor. */ - DL_HatchLoopData() : numEdges() {} + DL_HatchLoopData() : numEdges(0) + {} /** * Constructor. * Parameters: see member variables. diff --git a/src/libs/vdxf/dxflib/dl_extrusion.h b/src/libs/vdxf/dxflib/dl_extrusion.h index 3e6c78b78..0f1ab9790 100644 --- a/src/libs/vdxf/dxflib/dl_extrusion.h +++ b/src/libs/vdxf/dxflib/dl_extrusion.h @@ -44,11 +44,9 @@ public: /** * Default constructor. */ - DL_Extrusion() : direction(), elevation() + DL_Extrusion() : direction(new double[3]), elevation(0.0) { - direction = new double[3]; setDirection(0.0, 0.0, 1.0); - setElevation(0.0); } @@ -74,9 +72,8 @@ public: * world coordinate system */ DL_Extrusion(double dx, double dy, double dz, double elevation) - : direction(), elevation(elevation) + : direction(new double[3]), elevation(elevation) { - direction = new double[3]; setDirection(dx, dy, dz); } @@ -141,13 +138,14 @@ public: */ DL_Extrusion & operator = (const DL_Extrusion& extru) { - setDirection(extru.direction[0], extru.direction[1], extru.direction[2]); - setElevation(extru.elevation); - if ( &extru == this ) { return *this; } + setDirection(extru.direction[0], extru.direction[1], extru.direction[2]); + setElevation(extru.elevation); + + return *this; } diff --git a/src/libs/vdxf/dxflib/dl_writer.h b/src/libs/vdxf/dxflib/dl_writer.h index 85c3ac562..00515fded 100644 --- a/src/libs/vdxf/dxflib/dl_writer.h +++ b/src/libs/vdxf/dxflib/dl_writer.h @@ -62,9 +62,8 @@ public: /** * @param version DXF version. Defaults to DL_VERSION_2002. */ - DL_Writer(DL_Codes::version version) : m_handle(0x30), modelSpaceHandle(0), paperSpaceHandle(0), paperSpace0Handle(0), version() + DL_Writer(DL_Codes::version version) : m_handle(0x30), modelSpaceHandle(0), paperSpaceHandle(0), paperSpace0Handle(0), version(version) { - this->version = version; } virtual ~DL_Writer() {} diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index 1256fe05e..e4701a115 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -54,7 +54,7 @@ static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures() //--------------------------------------------------------------------------------------------------------------------- VDxfEngine::VDxfEngine() :QPaintEngine(svgEngineFeatures()), - size(), resolution(PrintDPI), fileName(), matrix(), dxf(), dw(), + size(), resolution(PrintDPI), fileName(), matrix(), dxf(nullptr), dw(nullptr), varMeasurement(VarMeasurement::Metric), varInsunits(VarInsunits::Centimeters) { }