diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp index 93c8dd2cc4..189742c0e3 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp @@ -181,7 +181,6 @@ void ViewProviderGeomHatch::updateGraphic(void) } } - void ViewProviderGeomHatch::getParameters(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() @@ -198,6 +197,14 @@ void ViewProviderGeomHatch::getParameters(void) WeightPattern.setValue(weight); } +bool ViewProviderGeomHatch::canDelete(App::DocumentObject *obj) const +{ + // deletion of hatches don't destroy anything + // thus we can pass this action + Q_UNUSED(obj) + return true; +} + TechDraw::DrawGeomHatch* ViewProviderGeomHatch::getViewObject() const { return dynamic_cast(pcObject); diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h index 2917bf0f29..83c1b610f7 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h @@ -28,7 +28,6 @@ #include #include #include - #include @@ -52,19 +51,18 @@ public: App::PropertyFloat WeightPattern; App::PropertyColor ColorPattern; - virtual void attach(App::DocumentObject *) override; virtual void updateData(const App::Property*) override; virtual void onChanged(const App::Property *prop) override; virtual bool setEdit(int ModNum) override; virtual void unsetEdit(int ModNum) override; virtual bool doubleClicked(void) override; - virtual bool useNewSelectionModel(void) const override {return false;} virtual void setDisplayMode(const char* ModeName) override; virtual std::vector getDisplayModes(void) const override; void updateGraphic(void); void getParameters(void); + virtual bool canDelete(App::DocumentObject* obj) const; TechDraw::DrawGeomHatch* getViewObject() const; @@ -73,5 +71,4 @@ public: } // namespace TechDrawGui - #endif // DRAWINGGUI_VIEWPROVIDERHATCH_H diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp index e2f30d10ee..983d83d4f7 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp @@ -113,6 +113,7 @@ void ViewProviderHatch::onChanged(const App::Property* prop) } } } + void ViewProviderHatch::updateData(const App::Property* prop) { Gui::ViewProviderDocumentObject::updateData(prop); @@ -123,6 +124,14 @@ TechDraw::DrawHatch* ViewProviderHatch::getViewObject() const return dynamic_cast(pcObject); } +bool ViewProviderHatch::canDelete(App::DocumentObject *obj) const +{ + // deletion of hatches don't destroy anything + // thus we can pass this action + Q_UNUSED(obj) + return true; +} + Gui::MDIView *ViewProviderHatch::getMDIView() const { auto obj = getViewObject(); @@ -131,4 +140,3 @@ Gui::MDIView *ViewProviderHatch::getMDIView() const if(!vp) return 0; return vp->getMDIView(); } - diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.h b/src/Mod/TechDraw/Gui/ViewProviderHatch.h index d27358340a..c5e5b7825a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.h @@ -54,6 +54,7 @@ public: virtual std::vector getDisplayModes(void) const override; virtual void onChanged(const App::Property* prop) override; virtual void updateData(const App::Property*) override; + virtual bool canDelete(App::DocumentObject* obj) const; TechDraw::DrawHatch* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp index 203cf9160b..e6688706dc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp @@ -236,8 +236,8 @@ bool ViewProviderLeader::onDelete(const std::vector &) { // a leader line cannot be deleted if it has a child weld symbol - // get childs - auto childs = claimChildren(); + // get childs + auto childs = claimChildren(); if (!childs.empty()) { QString bodyMessage; @@ -258,7 +258,7 @@ bool ViewProviderLeader::canDelete(App::DocumentObject *obj) const { // deletions of Leader line objects don't destroy anything // thus we can pass this action - // that the parent view cannot be deleted is handled + // that the parent view cannot be deleted is handled // in its onDelete() function Q_UNUSED(obj) return true;