diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h
index 6b30e6590..addcb9599 100644
--- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h
+++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.h
@@ -33,7 +33,7 @@
 
 #include "vabstractflipping.h"
 
-struct VToolFlippingByAxisInitData : public VAbstractOperationInitData
+struct VToolFlippingByAxisInitData : VAbstractOperationInitData
 {
     VToolFlippingByAxisInitData()
         : VAbstractOperationInitData(),
diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h
index 397dc47f3..c62edada8 100644
--- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h
+++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.h
@@ -33,7 +33,7 @@
 
 #include "vabstractflipping.h"
 
-struct VToolFlippingByLineInitData : public VAbstractOperationInitData
+struct VToolFlippingByLineInitData : VAbstractOperationInitData
 {
     VToolFlippingByLineInitData()
         : VAbstractOperationInitData(),
diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h
index 8426a9d91..f9055ae00 100644
--- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h
+++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h
@@ -50,7 +50,7 @@ struct DestinationItem
     bool showLabel;
 };
 
-struct VAbstractOperationInitData : public VAbstractToolInitData
+struct VAbstractOperationInitData : VAbstractToolInitData
 {
     VAbstractOperationInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.h b/src/libs/vtools/tools/drawTools/operation/vtoolmove.h
index 6043ddd6c..99733b1d9 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.h
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.h
@@ -45,7 +45,7 @@
 template <class T> class QSharedPointer;
 class VFormula;
 
-struct VToolMoveInitData : public VAbstractOperationInitData
+struct VToolMoveInitData : VAbstractOperationInitData
 {
     VToolMoveInitData()
         : VAbstractOperationInitData(),
diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h
index 7d8729d77..98445d676 100644
--- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h
+++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.h
@@ -45,7 +45,7 @@
 template <class T> class QSharedPointer;
 class VFormula;
 
-struct VToolRotationInitData : public VAbstractOperationInitData
+struct VToolRotationInitData : VAbstractOperationInitData
 {
     VToolRotationInitData()
         : VAbstractOperationInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
index 569bedb0f..5d02c22a5 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h
@@ -54,7 +54,7 @@
 class VControlPointSpline;
 template <class T> class QSharedPointer;
 
-struct VAbstractSplineInitData : public VAbstractToolInitData
+struct VAbstractSplineInitData : VAbstractToolInitData
 {
     VAbstractSplineInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h
index 031fac3b9..9892fac37 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.h
@@ -43,7 +43,7 @@
 class VFormula;
 template <class T> class QSharedPointer;
 
-struct VToolArcInitData : public VAbstractSplineInitData
+struct VToolArcInitData : VAbstractSplineInitData
 {
     VToolArcInitData()
         : VAbstractSplineInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h
index b2accec77..c1f1c18e1 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.h
@@ -43,7 +43,7 @@
 class VFormula;
 template <class T> class QSharedPointer;
 
-struct VToolArcWithLengthInitData : public VAbstractSplineInitData
+struct VToolArcWithLengthInitData : VAbstractSplineInitData
 {
     VToolArcWithLengthInitData()
         : VAbstractSplineInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h
index 58d79e597..e746ec056 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.h
@@ -46,7 +46,7 @@ template <class T> class QSharedPointer;
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
 
-struct VToolCubicBezierInitData : public VAbstractToolInitData
+struct VToolCubicBezierInitData : VAbstractToolInitData
 {
     VToolCubicBezierInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h
index 82aeaee37..da63d4ccc 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.h
@@ -46,7 +46,7 @@ template <class T> class QSharedPointer;
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_GCC("-Weffc++")
 
-struct VToolCubicBezierPathInitData : public VAbstractToolInitData
+struct VToolCubicBezierPathInitData : VAbstractToolInitData
 {
     VToolCubicBezierPathInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h
index dcd327a32..5adbbf7f2 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.h
@@ -43,7 +43,7 @@
 class VFormula;
 template <class T> class QSharedPointer;
 
-struct VToolEllipticalArcInitData : public VAbstractSplineInitData
+struct VToolEllipticalArcInitData : VAbstractSplineInitData
 {
     VToolEllipticalArcInitData()
         : VAbstractSplineInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h
index 6c1688827..c2c2a6791 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolSplineInitData : public VAbstractSplineInitData
+struct VToolSplineInitData : VAbstractSplineInitData
 {
     VToolSplineInitData()
         : VAbstractSplineInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h
index 06548fe82..cf4fc2ee1 100644
--- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h
+++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.h
@@ -46,7 +46,7 @@
 class VSplinePath;
 template <class T> class QSharedPointer;
 
-struct VToolSplinePathInitData : public VAbstractSplineInitData
+struct VToolSplinePathInitData : VAbstractSplineInitData
 {
     VToolSplinePathInitData()
         : VAbstractSplineInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h
index 2729f5be9..be2fceaa7 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolTrueDartsInitData : public VAbstractToolInitData
+struct VToolTrueDartsInitData : VAbstractToolInitData
 {
     VToolTrueDartsInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h
index 92ffb4610..c5980696f 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h
@@ -43,7 +43,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolCutArcInitData : public VToolSinglePointInitData
+struct VToolCutArcInitData : VToolSinglePointInitData
 {
     VToolCutArcInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h
index 793345cfe..6eeab3982 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h
@@ -43,7 +43,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolCutSplineInitData : public VToolSinglePointInitData
+struct VToolCutSplineInitData : VToolSinglePointInitData
 {
     VToolCutSplineInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h
index d9630c902..70936c2ad 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h
@@ -44,7 +44,7 @@
 class VSplinePath;
 template <class T> class QSharedPointer;
 
-struct VToolCutSplinePathInitData : public VToolSinglePointInitData
+struct VToolCutSplinePathInitData : VToolSinglePointInitData
 {
     VToolCutSplinePathInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h
index 99387deaf..30dd08ff4 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.h
@@ -43,7 +43,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolAlongLineInitData : public VToolLinePointInitData
+struct VToolAlongLineInitData : VToolLinePointInitData
 {
     VToolAlongLineInitData()
         : VToolLinePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h
index b90e3c0b8..4a7b96672 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolBisectorInitData : public VToolLinePointInitData
+struct VToolBisectorInitData : VToolLinePointInitData
 {
     VToolBisectorInitData()
         : VToolLinePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h
index 5dcd41537..1ce6d122b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.h
@@ -46,7 +46,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolCurveIntersectAxisInitData : public VToolLinePointInitData
+struct VToolCurveIntersectAxisInitData : VToolLinePointInitData
 {
     VToolCurveIntersectAxisInitData()
         : VToolLinePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h
index 3e594ca4b..40f9ad336 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolEndLineInitData : public VToolLinePointInitData
+struct VToolEndLineInitData : VToolLinePointInitData
 {
     VToolEndLineInitData()
         : VToolLinePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h
index e4ca01e92..933582dd1 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.h
@@ -45,7 +45,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolHeightInitData : public VToolLinePointInitData
+struct VToolHeightInitData : VToolLinePointInitData
 {
     VToolHeightInitData()
         : VToolLinePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h
index 1b431a16a..0359c1c8b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.h
@@ -46,7 +46,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolLineIntersectAxisInitData : public VToolLinePointInitData
+struct VToolLineIntersectAxisInitData : VToolLinePointInitData
 {
     VToolLineIntersectAxisInitData()
         : VToolLinePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h
index 41e575161..c68ba9125 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h
@@ -42,7 +42,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolLinePointInitData : public VToolSinglePointInitData
+struct VToolLinePointInitData : VToolSinglePointInitData
 {
     VToolLinePointInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h
index 7e72f93ed..c02675b5b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolNormalInitData : public VToolLinePointInitData
+struct VToolNormalInitData : VToolLinePointInitData
 {
     VToolNormalInitData()
         : VToolLinePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h
index 2f6f8f3d2..023f5602b 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolShoulderPointInitData : public VToolLinePointInitData
+struct VToolShoulderPointInitData : VToolLinePointInitData
 {
     VToolShoulderPointInitData()
         : VToolLinePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h
index 95f4b43b7..74b00645d 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h
@@ -45,7 +45,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolBasePointInitData : public VToolSinglePointInitData
+struct VToolBasePointInitData : VToolSinglePointInitData
 {
     VToolBasePointInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h
index c7d448a48..1c9128ac1 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.h
@@ -43,7 +43,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolLineIntersectInitData : public VToolSinglePointInitData
+struct VToolLineIntersectInitData : VToolSinglePointInitData
 {
     VToolLineIntersectInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h
index b96d9af39..922b3a9e6 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolPointFromArcAndTangentInitData : public VToolSinglePointInitData
+struct VToolPointFromArcAndTangentInitData : VToolSinglePointInitData
 {
     VToolPointFromArcAndTangentInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h
index bbea0433a..1afa6186d 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.h
@@ -45,7 +45,7 @@
 class VFormula;
 template <class T> class QSharedPointer;
 
-struct VToolPointFromCircleAndTangentInitData : public VToolSinglePointInitData
+struct VToolPointFromCircleAndTangentInitData : VToolSinglePointInitData
 {
     VToolPointFromCircleAndTangentInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h
index 1e99a46af..505557701 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.h
@@ -45,7 +45,7 @@
 class VFormula;
 template <class T> class QSharedPointer;
 
-struct VToolPointOfContactInitData : public VToolSinglePointInitData
+struct VToolPointOfContactInitData : VToolSinglePointInitData
 {
     VToolPointOfContactInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h
index fafc52a5e..aac69c78f 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.h
@@ -43,7 +43,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolPointOfIntersectionInitData : public VToolSinglePointInitData
+struct VToolPointOfIntersectionInitData : VToolSinglePointInitData
 {
     VToolPointOfIntersectionInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h
index 42ce8431c..0f8ad1709 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolPointOfIntersectionArcsInitData : public VToolSinglePointInitData
+struct VToolPointOfIntersectionArcsInitData : VToolSinglePointInitData
 {
     VToolPointOfIntersectionArcsInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h
index 80e265fa4..73ad66a83 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.h
@@ -45,7 +45,7 @@
 class VFormula;
 template <class T> class QSharedPointer;
 
-struct VToolPointOfIntersectionCirclesInitData : public VToolSinglePointInitData
+struct VToolPointOfIntersectionCirclesInitData : VToolSinglePointInitData
 {
     VToolPointOfIntersectionCirclesInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h
index 492ff896c..8adbeb678 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.h
@@ -45,7 +45,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolPointOfIntersectionCurvesInitData : public VToolSinglePointInitData
+struct VToolPointOfIntersectionCurvesInitData : VToolSinglePointInitData
 {
     VToolPointOfIntersectionCurvesInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h
index 0a2797a82..2a878de7a 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolSinglePointInitData : public VAbstractToolInitData
+struct VToolSinglePointInitData : VAbstractToolInitData
 {
     VToolSinglePointInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h
index e601958d9..3419b2b2d 100644
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.h
@@ -44,7 +44,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolTriangleInitData : public VToolSinglePointInitData
+struct VToolTriangleInitData : VToolSinglePointInitData
 {
     VToolTriangleInitData()
         : VToolSinglePointInitData(),
diff --git a/src/libs/vtools/tools/drawTools/vtoolline.h b/src/libs/vtools/tools/drawTools/vtoolline.h
index b05718adb..5e323b28d 100644
--- a/src/libs/vtools/tools/drawTools/vtoolline.h
+++ b/src/libs/vtools/tools/drawTools/vtoolline.h
@@ -45,7 +45,7 @@
 
 template <class T> class QSharedPointer;
 
-struct VToolLineInitData : public VAbstractToolInitData
+struct VToolLineInitData : VAbstractToolInitData
 {
     VToolLineInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.h b/src/libs/vtools/tools/nodeDetails/vabstractnode.h
index d833e946e..79d866af0 100644
--- a/src/libs/vtools/tools/nodeDetails/vabstractnode.h
+++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.h
@@ -41,7 +41,7 @@
 
 enum class ParentType : bool {Scene, Item};
 
-struct VAbstractNodeInitData : public VAbstractToolInitData
+struct VAbstractNodeInitData : VAbstractToolInitData
 {
     VAbstractNodeInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.h b/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.h
index ae6bd0607..83abc8ad8 100644
--- a/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.h
+++ b/src/libs/vtools/tools/nodeDetails/vtoolpiecepath.h
@@ -35,7 +35,7 @@
 
 class DialogTool;
 
-struct VToolPiecePathInitData : public VAbstractNodeInitData
+struct VToolPiecePathInitData : VAbstractNodeInitData
 {
     VToolPiecePathInitData()
         : VAbstractNodeInitData(),
diff --git a/src/libs/vtools/tools/nodeDetails/vtoolpin.h b/src/libs/vtools/tools/nodeDetails/vtoolpin.h
index 4d6c615cc..da98558fb 100644
--- a/src/libs/vtools/tools/nodeDetails/vtoolpin.h
+++ b/src/libs/vtools/tools/nodeDetails/vtoolpin.h
@@ -35,7 +35,7 @@
 
 class DialogTool;
 
-struct VToolPinInitData : public VAbstractNodeInitData
+struct VToolPinInitData : VAbstractNodeInitData
 {
     VToolPinInitData()
         : VAbstractNodeInitData(),
diff --git a/src/libs/vtools/tools/vtoolseamallowance.h b/src/libs/vtools/tools/vtoolseamallowance.h
index d71834f44..096338499 100644
--- a/src/libs/vtools/tools/vtoolseamallowance.h
+++ b/src/libs/vtools/tools/vtoolseamallowance.h
@@ -41,7 +41,7 @@
 class DialogTool;
 class VNoBrushScalePathItem;
 
-struct VToolSeamAllowanceInitData : public VAbstractToolInitData
+struct VToolSeamAllowanceInitData : VAbstractToolInitData
 {
     VToolSeamAllowanceInitData()
         : VAbstractToolInitData(),
diff --git a/src/libs/vtools/tools/vtooluniondetails.h b/src/libs/vtools/tools/vtooluniondetails.h
index a135dd8e6..4a78d2779 100644
--- a/src/libs/vtools/tools/vtooluniondetails.h
+++ b/src/libs/vtools/tools/vtooluniondetails.h
@@ -47,7 +47,7 @@
 
 class DialogTool;
 
-struct VToolUnionDetailsInitData : public VAbstractToolInitData
+struct VToolUnionDetailsInitData : VAbstractToolInitData
 {
     VToolUnionDetailsInitData()
         : VAbstractToolInitData(),