From 533250bc34ba3a694ac47c0993a13edd57450c2e Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Sat, 4 Nov 2023 21:40:17 +0100 Subject: [PATCH] Sketcher Gui: clang-tidy diagnostic errors --- src/Gui/Notifications.h | 2 ++ src/Mod/Sketcher/App/SketchAnalysis.h | 2 ++ src/Mod/Sketcher/Gui/CommandConstraints.cpp | 6 +++--- src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h | 4 ++++ src/Mod/Sketcher/Gui/DrawSketchHandler.h | 7 +++++-- src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h | 8 ++++++++ .../Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h | 8 ++++++++ .../Gui/DrawSketchHandlerArcOfHyperbola.h | 7 +++++++ .../Gui/DrawSketchHandlerArcOfParabola.h | 12 +++++++++++- src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h | 7 +++++++ .../DrawSketchHandlerBSplineByInterpolation.h | 7 +++++++ .../Sketcher/Gui/DrawSketchHandlerCarbonCopy.h | 15 ++++++++++++++- src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h | 11 +++++++++++ src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h | 7 +++++++ src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h | 8 ++++++++ src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h | 16 +++++++++++++++- src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h | 9 ++++++++- src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h | 7 +++++++ src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h | 9 +++++++++ src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h | 14 +++++++++++++- src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h | 5 +++++ src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h | 9 +++++++++ .../Sketcher/Gui/DrawSketchHandlerRectangle.h | 8 ++++++++ src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h | 15 +++++++++++++-- .../Sketcher/Gui/DrawSketchHandlerSplitting.h | 8 ++++++++ src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h | 13 ++++++++++++- .../Gui/EditModeConstraintCoinManager.cpp | 6 ++---- .../Sketcher/Gui/EditModeConstraintCoinManager.h | 2 +- src/Mod/Sketcher/Gui/SnapManager.h | 9 ++++++++- src/Mod/Sketcher/Gui/TaskSketcherConstraints.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 2 +- src/Mod/Sketcher/Gui/VisualLayer.h | 6 ++++++ 32 files changed, 230 insertions(+), 21 deletions(-) diff --git a/src/Gui/Notifications.h b/src/Gui/Notifications.h index a46452b4c1..39bd54cb98 100644 --- a/src/Gui/Notifications.h +++ b/src/Gui/Notifications.h @@ -33,6 +33,8 @@ namespace Gui { + class ViewProviderDocumentObject; + /** Methods to seamlessly provide intrusive or non-intrusive notifications of error, warning, * messages, translated notifications, or untranslated notifications originating in a given * document object. diff --git a/src/Mod/Sketcher/App/SketchAnalysis.h b/src/Mod/Sketcher/App/SketchAnalysis.h index c2c951fc99..9f575219c9 100644 --- a/src/Mod/Sketcher/App/SketchAnalysis.h +++ b/src/Mod/Sketcher/App/SketchAnalysis.h @@ -27,6 +27,8 @@ #include #include +#include + #include #include "Analyse.h" diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 2142e8dd73..e43cde4d60 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -793,7 +793,6 @@ int SketchSelection::setUp() return -1; } - SketchObj = static_cast(selection[0].getObject()); SketchSubNames = selection[0].getSubNames(); } else if (selection.size() == 2) { @@ -2164,6 +2163,9 @@ protected: const Part::Geometry* geom = Obj->getGeometry(GeoId); + if(!geom) + return; + if (geom && isArcOfCircle(*geom)) { auto arc = static_cast(geom); radius = arc->getRadius(); @@ -5408,8 +5410,6 @@ void CmdSketcherConstrainDistanceY::activated(int iMsg) Base::Vector3d pnt = Obj->getPoint(GeoId1, PosId1); double ActY = pnt.y; - arebothpointsorsegmentsfixed = isPointOrSegmentFixed(Obj, GeoId1); - openCommand(QT_TRANSLATE_NOOP("Command", "Add fixed y-coordinate constraint")); Gui::cmdAppObjectArgs(selection[0].getObject(), "addConstraint(Sketcher.Constraint('DistanceY',%d,%d,%f))", diff --git a/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h b/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h index 5118598dec..52d2ce580c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchDefaultHandler.h @@ -33,9 +33,11 @@ #include #include #include +#include #include #include "DrawSketchHandler.h" +#include "ViewProviderSketch.h" #include "Utils.h" @@ -387,6 +389,8 @@ public: ConstructionMethodT constructionmethod = static_cast(0)) : ConstructionMethodMachine(constructionmethod) , sugConstraints(PInitAutoConstraintSize) + , avoidRedundants(true) + , continuousMode(true) { applyCursor(); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.h b/src/Mod/Sketcher/Gui/DrawSketchHandler.h index cebeb7a8ae..a41880c912 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.h @@ -23,8 +23,12 @@ #ifndef SKETCHERGUI_DrawSketchHandler_H #define SKETCHERGUI_DrawSketchHandler_H +#include +#include + #include +#include #include #include #include @@ -32,8 +36,7 @@ #include "AutoConstraint.h" - -class QPixmap; +class QWidget; namespace Sketcher { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h index eeb28b6e6a..d1efbaf317 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h @@ -24,8 +24,16 @@ #define SKETCHERGUI_DrawSketchHandlerArc_H #include +#include +#include + +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" using namespace std; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h index 8139f19729..8e53bdc466 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h @@ -24,8 +24,16 @@ #define SKETCHERGUI_DrawSketchHandlerArcOfEllipse_H #include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h index 61e65b93d6..c3054e61a4 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h @@ -26,8 +26,15 @@ #include #include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h index 544fb912c6..79a90dc7bc 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h @@ -23,10 +23,20 @@ #ifndef SKETCHERGUI_DrawSketchHandlerArcOfParabola_H #define SKETCHERGUI_DrawSketchHandlerArcOfParabola_H -#include "GeometryCreationMode.h" +#include #include +#include +#include + +#include + +#include "DrawSketchHandler.h" +#include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" + namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h index 4e36c1abe8..1cf608168c 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h @@ -27,8 +27,15 @@ #include #include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h index 1401e08edc..f919d98bd6 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h @@ -27,8 +27,15 @@ #include #include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h index e7d39a912c..073b206fae 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h @@ -23,9 +23,22 @@ #ifndef SKETCHERGUI_DrawSketchHandlerCarbonCopy_H #define SKETCHERGUI_DrawSketchHandlerCarbonCopy_H -#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h index 1443b8ecd0..803c542d11 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h @@ -23,7 +23,18 @@ #ifndef SKETCHERGUI_DrawSketchHandlerCircle_H #define SKETCHERGUI_DrawSketchHandlerCircle_H +#include +#include +#include + +#include + +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h index 81859cef74..161395b7bd 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h @@ -28,8 +28,15 @@ #include #include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h index da3c128a29..4d1560f70a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h @@ -24,8 +24,16 @@ #define SKETCHERGUI_DrawSketchHandlerExtend_H #include +#include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h index c15abdeecf..0f9dfcca3a 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h @@ -23,9 +23,23 @@ #ifndef SKETCHERGUI_DrawSketchHandlerExternal_H #define SKETCHERGUI_DrawSketchHandlerExternal_H -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h index 3e6fb02bbf..c479169914 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h @@ -24,9 +24,16 @@ #define SKETCHERGUI_DrawSketchHandlerFillet_H #include +#include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" - +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h index 65a5e98891..6b39634a49 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h @@ -24,6 +24,13 @@ #ifndef SKETCHERGUI_DrawSketchHandlerLine_H #define SKETCHERGUI_DrawSketchHandlerLine_H +#include +#include +#include +#include + +#include + #include "DrawSketchDefaultWidgetController.h" #include "DrawSketchControllableHandler.h" diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h index 9cff7bca47..1adf4a1895 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h @@ -23,12 +23,21 @@ #ifndef SKETCHERGUI_DrawSketchHandlerLineSet_H #define SKETCHERGUI_DrawSketchHandlerLineSet_H +#include + #include #include #include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h index c988708b8d..134dd28843 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerOffset.h @@ -24,6 +24,8 @@ #ifndef SKETCHERGUI_DrawSketchHandlerOffset_H #define SKETCHERGUI_DrawSketchHandlerOffset_H +#include + #include #include #include @@ -36,13 +38,23 @@ #include #include +#include + +#include +#include +#include +#include + +#include + +#include + #include "DrawSketchDefaultWidgetController.h" #include "DrawSketchControllableHandler.h" #include "GeometryCreationMode.h" #include "Utils.h" -#include using namespace Sketcher; diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h index 33aa5d304a..9d8ed1bff0 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h @@ -23,7 +23,12 @@ #ifndef SKETCHERGUI_DrawSketchHandlerPoint_H #define SKETCHERGUI_DrawSketchHandlerPoint_H +#include #include +#include +#include + +#include #include "GeometryCreationMode.h" diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h index 8e15ab6624..ea68da2597 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h @@ -24,6 +24,15 @@ #ifndef SKETCHERGUI_DrawSketchHandlerPolygon_H #define SKETCHERGUI_DrawSketchHandlerPolygon_H +#include + +#include +#include +#include +#include + +#include + #include "GeometryCreationMode.h" #include "Utils.h" diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h index 36a8dbba1d..02079526db 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h @@ -24,6 +24,14 @@ #ifndef SKETCHERGUI_DrawSketchHandlerRectangle_H #define SKETCHERGUI_DrawSketchHandlerRectangle_H +#include + +#include +#include +#include +#include + +#include #include "DrawSketchDefaultWidgetController.h" #include "DrawSketchControllableHandler.h" diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h index 32c903d3ae..6dd04f399b 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h @@ -23,9 +23,20 @@ #ifndef SKETCHERGUI_DrawSketchHandlerSlot_H #define SKETCHERGUI_DrawSketchHandlerSlot_H -#include +#include +#include + +#include +#include +#include + +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui @@ -208,7 +219,7 @@ public: lastCons = sugConstr2.back(); } - ostringstream snapCon = ostringstream(""); + std::ostringstream snapCon = std::ostringstream(""); if (SnapMode == SNAP_MODE_Straight) { snapCon << "conList.append(Sketcher.Constraint('"; if (SnapDir == SNAP_DIR_Horz) { diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h index 59dfd499c1..77572ab080 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h @@ -24,8 +24,16 @@ #define SKETCHERGUI_DrawSketchHandlerSplitting_H #include +#include +#include +#include +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h index 8aa73ee176..041215bb35 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h @@ -23,9 +23,20 @@ #ifndef SKETCHERGUI_DrawSketchHandlerTrimming_H #define SKETCHERGUI_DrawSketchHandlerTrimming_H -#include +#include +#include +#include +#include +#include +#include + +#include + +#include "DrawSketchHandler.h" #include "GeometryCreationMode.h" +#include "Utils.h" +#include "ViewProviderSketch.h" namespace SketcherGui diff --git a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp index 8a0b18198c..8445600800 100644 --- a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp +++ b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.cpp @@ -1195,7 +1195,7 @@ Restart: || Constr->Second == GeoEnum::GeoUndef); SbVec3f p0; - double startangle, range, endangle; + double startangle, range; if (Constr->Second != GeoEnum::GeoUndef) { Base::Vector3d dir1, dir2; if (Constr->Third == GeoEnum::GeoUndef) { // angle between two lines @@ -1278,8 +1278,6 @@ Restart: range = atan2(dir1.x * dir2.y - dir1.y * dir2.x, dir1.x * dir2.x + dir1.y * dir2.y); } - - endangle = startangle + range; } else if (Constr->First != GeoEnum::GeoUndef) { const Part::Geometry* geo = @@ -1293,13 +1291,13 @@ Restart: Base::Vector3d dir = lineSeg->getEndPoint() - lineSeg->getStartPoint(); startangle = 0.; range = atan2(dir.y, dir.x); - endangle = startangle + range; } else if (geo->getTypeId() == Part::GeomArcOfCircle::getClassTypeId()) { const Part::GeomArcOfCircle* arc = static_cast(geo); p0 = Base::convertTo(arc->getCenter()); + double endangle; arc->getRange(startangle, endangle, /*emulateCCWXY=*/true); range = endangle - startangle; } diff --git a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h index 147154170f..657bd6adbb 100644 --- a/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h +++ b/src/Mod/Sketcher/Gui/EditModeConstraintCoinManager.h @@ -34,6 +34,7 @@ #include #include +#include #include "EditModeCoinManagerParameters.h" @@ -60,7 +61,6 @@ class Geometry; namespace Sketcher { -class Constraint; class PropertyConstraintList; }; // namespace Sketcher diff --git a/src/Mod/Sketcher/Gui/SnapManager.h b/src/Mod/Sketcher/Gui/SnapManager.h index 7b1e1af1c3..b068648b83 100644 --- a/src/Mod/Sketcher/Gui/SnapManager.h +++ b/src/Mod/Sketcher/Gui/SnapManager.h @@ -24,9 +24,16 @@ #ifndef SKETCHERGUI_SnapManager_H #define SKETCHERGUI_SnapManager_H - #include +#include +#include + +namespace Part +{ +class GeomLineSegment; +class GeomArcOfCircle; +} // namespace Part namespace SketcherGui { diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h index 8d5cb2bf0a..91947832a1 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.h @@ -100,7 +100,7 @@ public: protected: void changeEvent(QEvent* e) override; - virtual void languageChange(); + void languageChange(); private: using filterItemRepr = diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index cb1b9d079c..249d05dd88 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -229,7 +229,7 @@ public: protected: void changeEvent(QEvent* e) override; - virtual void languageChange(); + void languageChange(); private: using filterItemRepr = diff --git a/src/Mod/Sketcher/Gui/VisualLayer.h b/src/Mod/Sketcher/Gui/VisualLayer.h index 2a609bfd9f..eb8683d68e 100644 --- a/src/Mod/Sketcher/Gui/VisualLayer.h +++ b/src/Mod/Sketcher/Gui/VisualLayer.h @@ -26,6 +26,12 @@ #include #include +namespace Base +{ +class Writer; +class XMLReader; +} // namespace Base + namespace SketcherGui {