kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketch: modernize C++: use override

Browse Source
This commit is contained in:
wmayer
2023-08-04 12:20:10 +02:00
committed by wwmayer
parent 6f142d250a
commit 6ff3ee9951
24 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/Mod/Sketcher/Gui/Command.cpp
View File

@@ -1187,23 +1187,24 @@ class CmdSketcherGrid: public Gui::Command
{
public:
CmdSketcherGrid();
virtual ~CmdSketcherGrid()
~CmdSketcherGrid() override
{}
virtual const char* className() const override
const char* className() const override
{
return "CmdSketcherGrid";
}
virtual void languageChange() override;
void languageChange() override;
protected:
virtual void activated(int iMsg) override;
virtual bool isActive(void) override;
virtual Gui::Action* createAction(void) override;
void activated(int iMsg) override;
bool isActive() override;
Gui::Action* createAction() override;
private:
void updateIcon(bool value);
void updateInactiveHandlerIcon();
public:
CmdSketcherGrid(const CmdSketcherGrid&) = delete;
CmdSketcherGrid(CmdSketcherGrid&&) = delete;
CmdSketcherGrid& operator=(const CmdSketcherGrid&) = delete;
@@ -1435,19 +1436,23 @@ class CmdSketcherSnap: public Gui::Command, public ParameterGrp::ObserverType
{
public:
CmdSketcherSnap();
virtual ~CmdSketcherSnap();
virtual const char* className() const override
~CmdSketcherSnap() override;
CmdSketcherSnap(const CmdSketcherSnap&) = delete;
CmdSketcherSnap(CmdSketcherSnap&&) = delete;
CmdSketcherSnap& operator=(const CmdSketcherSnap&) = delete;
CmdSketcherSnap& operator=(CmdSketcherSnap&&) = delete;
const char* className() const override
{
return "CmdSketcherSnap";
}
virtual void languageChange() override;
void languageChange() override;
void OnChange(Base::Subject<const char*>& rCaller, const char* sReason) override;
protected:
virtual void activated(int iMsg) override;
virtual bool isActive(void) override;
virtual Gui::Action* createAction(void) override;
void activated(int iMsg) override;
bool isActive() override;
Gui::Action* createAction() override;
private:
void updateIcon(bool value);
@@ -1458,11 +1463,6 @@ private:
"User parameter:BaseApp/Preferences/Mod/Sketcher/Snap");
}
CmdSketcherSnap(const CmdSketcherSnap&) = delete;
CmdSketcherSnap(CmdSketcherSnap&&) = delete;
CmdSketcherSnap& operator=(const CmdSketcherSnap&) = delete;
CmdSketcherSnap& operator=(CmdSketcherSnap&&) = delete;
bool snapEnabled = true;
};
@@ -1696,18 +1696,22 @@ class CmdRenderingOrder: public Gui::Command, public ParameterGrp::ObserverType
public:
CmdRenderingOrder();
virtual ~CmdRenderingOrder();
virtual const char* className() const override
~CmdRenderingOrder() override;
CmdRenderingOrder(const CmdRenderingOrder&) = delete;
CmdRenderingOrder(CmdRenderingOrder&&) = delete;
CmdRenderingOrder& operator=(const CmdRenderingOrder&) = delete;
CmdRenderingOrder& operator=(CmdRenderingOrder&&) = delete;
const char* className() const override
{
return "CmdRenderingOrder";
}
virtual void languageChange() override;
void languageChange() override;
void OnChange(Base::Subject<const char*>& rCaller, const char* sReason) override;
protected:
virtual void activated(int iMsg) override;
virtual bool isActive(void) override;
virtual Gui::Action* createAction(void) override;
void activated(int iMsg) override;
bool isActive() override;
Gui::Action* createAction() override;
private:
void updateIcon();
@@ -1718,11 +1722,6 @@ private:
"User parameter:BaseApp/Preferences/Mod/Sketcher/General");
}
CmdRenderingOrder(const CmdRenderingOrder&) = delete;
CmdRenderingOrder(CmdRenderingOrder&&) = delete;
CmdRenderingOrder& operator=(const CmdRenderingOrder&) = delete;
CmdRenderingOrder& operator=(CmdRenderingOrder&&) = delete;
ElementType TopElement = ElementType::Normal;
};

2
src/Mod/Sketcher/Gui/DrawSketchHandler.h
View File

@@ -56,7 +56,7 @@ class CurveConverter final: public ParameterGrp::ObserverType
public:
CurveConverter();
~CurveConverter();
~CurveConverter() override;
std::vector<Base::Vector2d> toVector2D(const Part::Geometry* geometry);

4
src/Mod/Sketcher/Gui/DrawSketchHandlerArc.h
View File

@@ -47,7 +47,7 @@ public:
, endAngle(0)
, arcAngle(0)
{}
virtual ~DrawSketchHandlerArc()
~DrawSketchHandlerArc() override
{}
/// mode table
enum SelectMode
@@ -278,7 +278,7 @@ public:
, arcPos1(Sketcher::PointPos::none)
, arcPos2(Sketcher::PointPos::none)
{}
virtual ~DrawSketchHandler3PointArc()
~DrawSketchHandler3PointArc() override
{}
/// mode table
enum SelectMode

2
src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfEllipse.h
View File

@@ -46,7 +46,7 @@ public:
, arcAngle_t(0)
{}
virtual ~DrawSketchHandlerArcOfEllipse() = default;
~DrawSketchHandlerArcOfEllipse() override = default;
/// mode table
enum SelectMode

2
src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfHyperbola.h
View File

@@ -45,7 +45,7 @@ public:
, arcAngle_t(0)
{}
virtual ~DrawSketchHandlerArcOfHyperbola() = default;
~DrawSketchHandlerArcOfHyperbola() override = default;
/// mode table
enum SelectMode
{

2
src/Mod/Sketcher/Gui/DrawSketchHandlerArcOfParabola.h
View File

@@ -44,7 +44,7 @@ public:
, arcAngle_t(0)
{}
virtual ~DrawSketchHandlerArcOfParabola() = default;
~DrawSketchHandlerArcOfParabola() override = default;
/// mode table
enum SelectMode

2
src/Mod/Sketcher/Gui/DrawSketchHandlerBSpline.h
View File

@@ -50,7 +50,7 @@ public:
applyCursor();
}
virtual ~DrawSketchHandlerBSpline() = default;
~DrawSketchHandlerBSpline() override = default;
/// modes
enum SELECT_MODE

2
src/Mod/Sketcher/Gui/DrawSketchHandlerBSplineByInterpolation.h
View File

@@ -50,7 +50,7 @@ public:
applyCursor();
}
virtual ~DrawSketchHandlerBSplineByInterpolation() = default;
~DrawSketchHandlerBSplineByInterpolation() override = default;
/// modes
enum SELECT_MODE

4
src/Mod/Sketcher/Gui/DrawSketchHandlerCarbonCopy.h
View File

@@ -43,7 +43,7 @@ public:
, object(obj)
{}
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName)
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override
{
Q_UNUSED(sSubName);
@@ -109,7 +109,7 @@ class DrawSketchHandlerCarbonCopy: public DrawSketchHandler
{
public:
DrawSketchHandlerCarbonCopy() = default;
virtual ~DrawSketchHandlerCarbonCopy()
~DrawSketchHandlerCarbonCopy() override
{
Gui::Selection().rmvSelectionGate();
}

4
src/Mod/Sketcher/Gui/DrawSketchHandlerCircle.h
View File

@@ -38,7 +38,7 @@ public:
: Mode(STATUS_SEEK_First)
, EditCurve(34)
{}
virtual ~DrawSketchHandlerCircle()
~DrawSketchHandlerCircle() override
{}
/// mode table
enum SelectMode
@@ -188,7 +188,7 @@ public:
, radius(1)
, N(32.0)
{}
virtual ~DrawSketchHandler3PointCircle()
~DrawSketchHandler3PointCircle() override
{}
/// mode table
enum SelectMode

2
src/Mod/Sketcher/Gui/DrawSketchHandlerEllipse.h
View File

@@ -97,7 +97,7 @@ public:
, editCurve(33)
, fixedAxisLength(0)
{}
virtual ~DrawSketchHandlerEllipse()
~DrawSketchHandlerEllipse() override
{}
/// Mode table, describes what step of the process we are in
enum SelectMode

4
src/Mod/Sketcher/Gui/DrawSketchHandlerExtend.h
View File

@@ -44,7 +44,7 @@ public:
, disabled(false)
{}
bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName)
bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override
{
if (pObj != this->object)
return false;
@@ -86,7 +86,7 @@ public:
, Increment(0)
{}
virtual ~DrawSketchHandlerExtend()
~DrawSketchHandlerExtend() override
{
Gui::Selection().rmvSelectionGate();
}

4
src/Mod/Sketcher/Gui/DrawSketchHandlerExternal.h
View File

@@ -43,7 +43,7 @@ public:
, object(obj)
{}
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName)
bool allow(App::Document* pDoc, App::DocumentObject* pObj, const char* sSubName) override
{
Sketcher::SketchObject* sketch = static_cast<Sketcher::SketchObject*>(object);
@@ -102,7 +102,7 @@ class DrawSketchHandlerExternal: public DrawSketchHandler
{
public:
DrawSketchHandlerExternal() = default;
virtual ~DrawSketchHandlerExternal()
~DrawSketchHandlerExternal() override
{
Gui::Selection().rmvSelectionGate();
}

4
src/Mod/Sketcher/Gui/DrawSketchHandlerFillet.h
View File

@@ -43,7 +43,7 @@ public:
, object(obj)
{}
bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName)
bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override
{
if (pObj != this->object)
return false;
@@ -90,7 +90,7 @@ public:
, Mode(STATUS_SEEK_First)
, firstCurve(0)
{}
virtual ~DrawSketchHandlerFillet()
~DrawSketchHandlerFillet() override
{
Gui::Selection().rmvSelectionGate();
}

2
src/Mod/Sketcher/Gui/DrawSketchHandlerLine.h
View File

@@ -39,7 +39,7 @@ public:
: Mode(STATUS_SEEK_First)
, EditCurve(2)
{}
virtual ~DrawSketchHandlerLine()
~DrawSketchHandlerLine() override
{}
/// mode table
enum SelectMode

2
src/Mod/Sketcher/Gui/DrawSketchHandlerLineSet.h
View File

@@ -56,7 +56,7 @@ public:
, firstsegment(true)
{}
virtual ~DrawSketchHandlerLineSet() = default;
~DrawSketchHandlerLineSet() override = default;
/// mode table
enum SELECT_MODE

2
src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h
View File

@@ -39,7 +39,7 @@ public:
DrawSketchHandlerPoint()
: selectionDone(false)
{}
virtual ~DrawSketchHandlerPoint()
~DrawSketchHandlerPoint() override
{}
void mouseMove(Base::Vector2d onSketchPos) override

2
src/Mod/Sketcher/Gui/DrawSketchHandlerPolygon.h
View File

@@ -45,7 +45,7 @@ public:
, Mode(STATUS_SEEK_First)
, EditCurve(Corners + 1)
{}
virtual ~DrawSketchHandlerRegularPolygon()
~DrawSketchHandlerRegularPolygon() override
{}
/// mode table
enum SelectMode

4
src/Mod/Sketcher/Gui/DrawSketchHandlerRectangle.h
View File

@@ -47,7 +47,7 @@ public:
, EditCurve(5)
, constructionMethod(constrMethod)
{}
virtual ~DrawSketchHandlerBox()
~DrawSketchHandlerBox() override
{}
/// mode table
@@ -377,7 +377,7 @@ public:
, signY(1)
, EditCurve(37)
{}
virtual ~DrawSketchHandlerOblong()
~DrawSketchHandlerOblong() override
{}
/// mode table
enum BoxMode

2
src/Mod/Sketcher/Gui/DrawSketchHandlerSlot.h
View File

@@ -45,7 +45,7 @@ public:
, r(0)
, EditCurve(35)
{}
virtual ~DrawSketchHandlerSlot()
~DrawSketchHandlerSlot() override
{}
/// mode table
enum BoxMode

4
src/Mod/Sketcher/Gui/DrawSketchHandlerSplitting.h
View File

@@ -44,7 +44,7 @@ public:
, object(obj)
{}
bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName)
bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override
{
if (pObj != this->object)
return false;
@@ -81,7 +81,7 @@ class DrawSketchHandlerSplitting: public DrawSketchHandler
{
public:
DrawSketchHandlerSplitting() = default;
virtual ~DrawSketchHandlerSplitting()
~DrawSketchHandlerSplitting() override
{
Gui::Selection().rmvSelectionGate();
}

2
src/Mod/Sketcher/Gui/DrawSketchHandlerTrimming.h
View File

@@ -43,7 +43,7 @@ public:
, object(obj)
{}
bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName)
bool allow(App::Document* /*pDoc*/, App::DocumentObject* pObj, const char* sSubName) override
{
if (pObj != this->object)
return false;

2
src/Mod/Sketcher/Gui/ViewProviderSketch.h
View File

@@ -163,7 +163,7 @@ private:
{
public:
explicit ParameterObserver(ViewProviderSketch& client);
~ParameterObserver();
~ParameterObserver() override;
void initParameters();

4
src/Mod/Surface/Gui/Blending/ViewProviderBlendCurve.h
View File

@@ -30,10 +30,10 @@ namespace SurfaceGui
class ViewProviderBlendCurve: public PartGui::ViewProviderSpline
{
PROPERTY_HEADER(SurfaceGui::ViewProviderBlendCurve);
PROPERTY_HEADER_WITH_OVERRIDE(SurfaceGui::ViewProviderBlendCurve);
public:
QIcon getIcon() const;
QIcon getIcon() const override;
};
}//namespace SurfaceGui