From 9f8a47b605d16f9257f84423ab991f95f320cb0d Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 4 Aug 2018 16:52:57 +0200 Subject: [PATCH] add protected default constructor of SelectionFilterGate to simplifiy writing of sub-classes --- src/Gui/SelectionFilter.cpp | 5 +++++ src/Gui/SelectionFilter.h | 3 +++ src/Mod/Part/Gui/TaskFaceColors.cpp | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Gui/SelectionFilter.cpp b/src/Gui/SelectionFilter.cpp index a2fc8cc1fc..f443093be4 100644 --- a/src/Gui/SelectionFilter.cpp +++ b/src/Gui/SelectionFilter.cpp @@ -62,6 +62,11 @@ SelectionFilterGate::SelectionFilterGate(SelectionFilter* filter) Filter = filter; } +SelectionFilterGate::SelectionFilterGate() +{ + Filter = nullptr; +} + SelectionFilterGate::~SelectionFilterGate() { delete Filter; diff --git a/src/Gui/SelectionFilter.h b/src/Gui/SelectionFilter.h index 6490c2d690..0e77c4599c 100644 --- a/src/Gui/SelectionFilter.h +++ b/src/Gui/SelectionFilter.h @@ -108,6 +108,9 @@ public: ~SelectionFilterGate(); virtual bool allow(App::Document*,App::DocumentObject*, const char*); +protected: + SelectionFilterGate(); + protected: SelectionFilter *Filter; }; diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp index 4987c29e4c..1bf9033b22 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.cpp +++ b/src/Mod/Part/Gui/TaskFaceColors.cpp @@ -75,7 +75,7 @@ namespace PartGui { const App::DocumentObject* object; public: FaceSelection(const App::DocumentObject* obj) - : Gui::SelectionFilterGate((Gui::SelectionFilter*)0), object(obj) + : Gui::SelectionFilterGate(), object(obj) { } bool allow(App::Document* /*pDoc*/, App::DocumentObject*pObj, const char*sSubName)