From 23966513c70561a8d0654890c94be2b9cd4039d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= Date: Thu, 4 Aug 2022 03:00:08 +0200 Subject: [PATCH] [TechDraw] Remove uneeded redefinitions of inherited functions --- .../TechDraw/Gui/ViewProviderAnnotation.cpp | 19 --------------- src/Mod/TechDraw/Gui/ViewProviderAnnotation.h | 5 ---- src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp | 19 --------------- src/Mod/TechDraw/Gui/ViewProviderBalloon.h | 4 ---- .../Gui/ViewProviderCosmeticExtension.cpp | 5 ---- .../Gui/ViewProviderCosmeticExtension.h | 3 --- .../TechDraw/Gui/ViewProviderDimension.cpp | 13 ---------- src/Mod/TechDraw/Gui/ViewProviderDimension.h | 3 --- .../TechDraw/Gui/ViewProviderDrawingView.cpp | 11 --------- .../TechDraw/Gui/ViewProviderDrawingView.h | 3 --- .../TechDraw/Gui/ViewProviderGeomHatch.cpp | 19 --------------- src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h | 3 --- src/Mod/TechDraw/Gui/ViewProviderHatch.cpp | 24 ------------------- src/Mod/TechDraw/Gui/ViewProviderHatch.h | 5 ---- src/Mod/TechDraw/Gui/ViewProviderImage.cpp | 19 --------------- src/Mod/TechDraw/Gui/ViewProviderImage.h | 3 --- src/Mod/TechDraw/Gui/ViewProviderLeader.cpp | 5 ---- src/Mod/TechDraw/Gui/ViewProviderLeader.h | 1 - .../TechDraw/Gui/ViewProviderProjGroup.cpp | 21 ---------------- src/Mod/TechDraw/Gui/ViewProviderProjGroup.h | 4 ---- .../Gui/ViewProviderProjGroupItem.cpp | 11 --------- .../TechDraw/Gui/ViewProviderProjGroupItem.h | 2 -- src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp | 5 ---- src/Mod/TechDraw/Gui/ViewProviderRichAnno.h | 1 - .../TechDraw/Gui/ViewProviderSpreadsheet.cpp | 24 ------------------- .../TechDraw/Gui/ViewProviderSpreadsheet.h | 6 ----- src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp | 19 --------------- src/Mod/TechDraw/Gui/ViewProviderSymbol.h | 5 ---- src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp | 19 --------------- src/Mod/TechDraw/Gui/ViewProviderTemplate.h | 4 ---- src/Mod/TechDraw/Gui/ViewProviderTile.cpp | 24 ------------------- src/Mod/TechDraw/Gui/ViewProviderTile.h | 6 ----- src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp | 23 ------------------ src/Mod/TechDraw/Gui/ViewProviderViewClip.h | 5 ---- src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp | 19 --------------- src/Mod/TechDraw/Gui/ViewProviderViewPart.h | 4 ---- .../TechDraw/Gui/ViewProviderViewSection.cpp | 24 ------------------- .../TechDraw/Gui/ViewProviderViewSection.h | 7 ------ src/Mod/TechDraw/Gui/ViewProviderWeld.cpp | 24 ------------------- src/Mod/TechDraw/Gui/ViewProviderWeld.h | 5 ---- 40 files changed, 426 deletions(-) diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp index 6180ad9935..9b57a63b2e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.cpp @@ -47,25 +47,6 @@ ViewProviderAnnotation::~ViewProviderAnnotation() { } -void ViewProviderAnnotation::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDrawingView::attach(pcFeat); -} - -void ViewProviderAnnotation::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - -std::vector ViewProviderAnnotation::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - - return StrList; -} - void ViewProviderAnnotation::updateData(const App::Property* prop) { if (prop == &(getViewObject()->Text) || diff --git a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h index 1e9e77f7b8..642f72a14a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h +++ b/src/Mod/TechDraw/Gui/ViewProviderAnnotation.h @@ -42,12 +42,7 @@ public: /// destructor virtual ~ViewProviderAnnotation(); - - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; virtual void updateData(const App::Property*); virtual TechDraw::DrawViewAnnotation* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp index 4541c86088..efa3bf4781 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp @@ -70,25 +70,6 @@ ViewProviderBalloon::~ViewProviderBalloon() { } -void ViewProviderBalloon::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDrawingView::attach(pcFeat); -} - -void ViewProviderBalloon::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - -std::vector ViewProviderBalloon::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - - return StrList; -} - bool ViewProviderBalloon::doubleClicked(void) { startDefaultEditMode(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h index 70940f08bb..81d802a6fb 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.h +++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.h @@ -50,11 +50,7 @@ public: App::PropertyBool LineVisible; App::PropertyColor Color; - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; virtual void updateData(const App::Property*); virtual void onChanged(const App::Property* p); virtual void setupContextMenu(QMenu*, QObject*, const char*); diff --git a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp index 447b1ff4ed..8359f8a490 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.cpp @@ -50,11 +50,6 @@ QIcon ViewProviderCosmeticExtension::extensionMergeGreyableOverlayIcons(const QI return mergedicon; } -void ViewProviderCosmeticExtension::extensionUpdateData(const App::Property* prop) -{ - Gui::ViewProviderExtension::extensionUpdateData(prop); -} - namespace Gui { EXTENSION_PROPERTY_SOURCE_TEMPLATE(TechDrawGui::ViewProviderCosmeticExtensionPython, TechDrawGui::ViewProviderCosmeticExtension) diff --git a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h index c20d6c48fd..508d03271c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderCosmeticExtension.h @@ -38,9 +38,6 @@ public: virtual ~ViewProviderCosmeticExtension() = default; virtual QIcon extensionMergeGreyableOverlayIcons(const QIcon & orig) const override; - - virtual void extensionUpdateData(const App::Property*) override; - }; typedef Gui::ViewProviderExtensionPythonT ViewProviderCosmeticExtensionPython; diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp index 7ec74f81a1..d775c8eb6a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp @@ -102,19 +102,6 @@ void ViewProviderDimension::attach(App::DocumentObject *pcFeat) } } -void ViewProviderDimension::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - -std::vector ViewProviderDimension::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - - return StrList; -} - bool ViewProviderDimension::doubleClicked(void) { startDefaultEditMode(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.h b/src/Mod/TechDraw/Gui/ViewProviderDimension.h index a3b7ce27da..92f53198f5 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.h @@ -68,10 +68,7 @@ public: App::PropertyFloat GapFactorASME; virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; virtual void updateData(const App::Property*); virtual void onChanged(const App::Property* p); virtual void setupContextMenu(QMenu*, QObject*, const char*); diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index 13ee7a9eb0..c11a29cf45 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -84,17 +84,6 @@ void ViewProviderDrawingView::attach(App::DocumentObject *pcFeat) } } -void ViewProviderDrawingView::setDisplayMode(const char* ModeName) -{ - ViewProviderDocumentObject::setDisplayMode(ModeName); -} - -std::vector ViewProviderDrawingView::getDisplayModes(void) const -{ - std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); - return StrList; -} - void ViewProviderDrawingView::onChanged(const App::Property *prop) { App::DocumentObject* obj = getObject(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index a8b30c8cbb..7283c90c15 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -53,10 +53,7 @@ public: App::PropertyBool KeepLabel; virtual void attach(App::DocumentObject *) override; - virtual void setDisplayMode(const char* ModeName) override; virtual bool useNewSelectionModel(void) const override {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const override; /// Hide the object in the view virtual void hide(void) override; /// Show the object in the view diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp index daef49c1c3..26298b15d5 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp @@ -70,25 +70,6 @@ ViewProviderGeomHatch::~ViewProviderGeomHatch() { } -void ViewProviderGeomHatch::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDocumentObject::attach(pcFeat); -} - -void ViewProviderGeomHatch::setDisplayMode(const char* ModeName) -{ - ViewProviderDocumentObject::setDisplayMode(ModeName); -} - -std::vector ViewProviderGeomHatch::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); - - return StrList; -} - bool ViewProviderGeomHatch::setEdit(int ModNum) { Q_UNUSED(ModNum); diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h index a34f34595b..9c0e9d9773 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.h @@ -51,15 +51,12 @@ 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 override; diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp index f093edd14c..b4dfe7c872 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp @@ -71,25 +71,6 @@ ViewProviderHatch::~ViewProviderHatch() { } -void ViewProviderHatch::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDocumentObject::attach(pcFeat); -} - -void ViewProviderHatch::setDisplayMode(const char* ModeName) -{ - ViewProviderDocumentObject::setDisplayMode(ModeName); -} - -std::vector ViewProviderHatch::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); - - return StrList; -} - bool ViewProviderHatch::setEdit(int ModNum) { if (ModNum != ViewProvider::Default) { @@ -134,11 +115,6 @@ void ViewProviderHatch::onChanged(const App::Property* prop) } } -void ViewProviderHatch::updateData(const App::Property* prop) -{ - Gui::ViewProviderDocumentObject::updateData(prop); -} - TechDraw::DrawHatch* ViewProviderHatch::getViewObject() const { return dynamic_cast(pcObject); diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.h b/src/Mod/TechDraw/Gui/ViewProviderHatch.h index dfa04bb505..182cea7005 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.h +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.h @@ -49,16 +49,11 @@ public: App::PropertyColor HatchColor; App::PropertyFloatConstraint HatchScale; - virtual void attach(App::DocumentObject *) override; - virtual void setDisplayMode(const char* ModeName) override; virtual bool useNewSelectionModel(void) const override {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const 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 void updateData(const App::Property*) override; virtual bool canDelete(App::DocumentObject* obj) const override; TechDraw::DrawHatch* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp index c669b2fb0c..775743b05f 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderImage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderImage.cpp @@ -49,25 +49,6 @@ ViewProviderImage::~ViewProviderImage() { } -void ViewProviderImage::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDrawingView::attach(pcFeat); -} - -void ViewProviderImage::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - -std::vector ViewProviderImage::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - - return StrList; -} - void ViewProviderImage::updateData(const App::Property* prop) { if (prop == &(getViewObject()->Width) || diff --git a/src/Mod/TechDraw/Gui/ViewProviderImage.h b/src/Mod/TechDraw/Gui/ViewProviderImage.h index e176883a46..0c1e218cfc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderImage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderImage.h @@ -43,11 +43,8 @@ public: App::PropertyBool Crop; //crop to feature width x height - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; virtual void updateData(const App::Property*); virtual void onChanged(const App::Property *prop); diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp index 1426e9d145..57d9069e91 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp @@ -77,11 +77,6 @@ ViewProviderLeader::~ViewProviderLeader() { } -void ViewProviderLeader::attach(App::DocumentObject *pcFeat) -{ - ViewProviderDrawingView::attach(pcFeat); -} - bool ViewProviderLeader::setEdit(int ModNum) { // Base::Console().Message("VPL::setEdit(%d)\n",ModNum); diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.h b/src/Mod/TechDraw/Gui/ViewProviderLeader.h index 66973e49fe..151b4c1f9e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.h +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.h @@ -52,7 +52,6 @@ public: App::PropertyEnumeration LineStyle; App::PropertyColor Color; - virtual void attach(App::DocumentObject *); /* virtual void setDisplayMode(const char* ModeName);*/ virtual bool useNewSelectionModel(void) const {return false;} /* virtual std::vector getDisplayModes(void) const;*/ diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp index 02abdaabcc..4fccb9ebcb 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp @@ -59,17 +59,6 @@ ViewProviderProjGroup::~ViewProviderProjGroup() { } -void ViewProviderProjGroup::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDrawingView::attach(pcFeat); -} - -void ViewProviderProjGroup::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - std::vector ViewProviderProjGroup::getDisplayModes(void) const { // get the modes of the father @@ -78,16 +67,6 @@ std::vector ViewProviderProjGroup::getDisplayModes(void) const return StrList; } -void ViewProviderProjGroup::updateData(const App::Property* prop) -{ - ViewProviderDrawingView::updateData(prop); - } - -void ViewProviderProjGroup::onChanged(const App::Property *prop) -{ - ViewProviderDrawingView::onChanged(prop); -} - void ViewProviderProjGroup::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { Q_UNUSED(menu); diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h index a8cbd6c612..2a71deb48c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.h @@ -39,8 +39,6 @@ public: ViewProviderProjGroup(); /// constructor ~ViewProviderProjGroup(); /// destructor - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} /// returns a list of all possible modes virtual std::vector getDisplayModes(void) const; @@ -51,12 +49,10 @@ public: /// Is called by the tree if the user double click on the object virtual bool doubleClicked(void); void setupContextMenu(QMenu*, QObject*, const char*); - virtual void updateData(const App::Property*); TechDraw::DrawProjGroup* getObject() const; virtual TechDraw::DrawProjGroup* getViewObject() const; void unsetEdit(int ModNum); - virtual void onChanged(const App::Property *prop); virtual bool onDelete(const std::vector &); virtual bool canDelete(App::DocumentObject* obj) const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp index 203fdba422..6464009977 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.cpp @@ -51,17 +51,6 @@ ViewProviderProjGroupItem::~ViewProviderProjGroupItem() { } -void ViewProviderProjGroupItem::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderViewPart::attach(pcFeat); -} - -void ViewProviderProjGroupItem::setDisplayMode(const char* ModeName) -{ - ViewProviderViewPart::setDisplayMode(ModeName); -} - std::vector ViewProviderProjGroupItem::getDisplayModes(void) const { // get the modes of the father diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h index a374bd591f..671d80ca74 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroupItem.h @@ -40,8 +40,6 @@ public: ViewProviderProjGroupItem(); ~ViewProviderProjGroupItem(); - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} /// returns a list of all possible modes virtual std::vector getDisplayModes(void) const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp index 08e5b7a1eb..ca64d12f55 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp @@ -72,11 +72,6 @@ ViewProviderRichAnno::~ViewProviderRichAnno() { } -void ViewProviderRichAnno::attach(App::DocumentObject *pcFeat) -{ - ViewProviderDrawingView::attach(pcFeat); -} - bool ViewProviderRichAnno::setEdit(int ModNum) { // Base::Console().Message("VPRA::setEdit(%d)\n",ModNum); diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h index b58b235bf8..1e1fc8d647 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h +++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.h @@ -50,7 +50,6 @@ public: App::PropertyEnumeration LineStyle; App::PropertyColor LineColor; - virtual void attach(App::DocumentObject *); virtual bool useNewSelectionModel(void) const {return false;} virtual void updateData(const App::Property*); virtual void onChanged(const App::Property* p); diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp index 30128fd422..2ca84e002d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.cpp @@ -45,30 +45,6 @@ ViewProviderSpreadsheet::~ViewProviderSpreadsheet() { } -void ViewProviderSpreadsheet::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderSymbol::attach(pcFeat); -} - -void ViewProviderSpreadsheet::setDisplayMode(const char* ModeName) -{ - ViewProviderSymbol::setDisplayMode(ModeName); -} - -std::vector ViewProviderSpreadsheet::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderSymbol::getDisplayModes(); - - return StrList; -} - -void ViewProviderSpreadsheet::updateData(const App::Property* prop) -{ - ViewProviderSymbol::updateData(prop); -} - TechDraw::DrawViewSpreadsheet* ViewProviderSpreadsheet::getViewObject() const { return dynamic_cast(pcObject); diff --git a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h index fe67fffeee..d4204296b0 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h +++ b/src/Mod/TechDraw/Gui/ViewProviderSpreadsheet.h @@ -41,13 +41,7 @@ public: /// destructor virtual ~ViewProviderSpreadsheet(); - - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; - virtual void updateData(const App::Property*); virtual TechDraw::DrawViewSpreadsheet* getViewObject() const; }; diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp index d07597bef4..684569ae86 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.cpp @@ -46,25 +46,6 @@ ViewProviderSymbol::~ViewProviderSymbol() { } -void ViewProviderSymbol::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDrawingView::attach(pcFeat); -} - -void ViewProviderSymbol::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - -std::vector ViewProviderSymbol::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - - return StrList; -} - void ViewProviderSymbol::updateData(const App::Property* prop) { if (prop == &getViewObject()->Scale) { diff --git a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h index 4d31d378c0..6f46936ec6 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderSymbol.h +++ b/src/Mod/TechDraw/Gui/ViewProviderSymbol.h @@ -43,12 +43,7 @@ public: /// destructor virtual ~ViewProviderSymbol(); - - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; virtual void updateData(const App::Property*); virtual TechDraw::DrawViewSymbol* getViewObject() const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp index e8bf65f920..681ce6e40f 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.cpp @@ -67,25 +67,6 @@ ViewProviderTemplate::~ViewProviderTemplate() { } -void ViewProviderTemplate::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDocumentObject::attach(pcFeat); -} - -void ViewProviderTemplate::setDisplayMode(const char* ModeName) -{ - ViewProviderDocumentObject::setDisplayMode(ModeName); -} - -std::vector ViewProviderTemplate::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); - - return StrList; -} - void ViewProviderTemplate::updateData(const App::Property* prop) { if (getTemplate()->isDerivedFrom(TechDraw::DrawSVGTemplate::getClassTypeId())) { diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplate.h b/src/Mod/TechDraw/Gui/ViewProviderTemplate.h index 2fbb149ef2..c7bac8e429 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplate.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplate.h @@ -42,11 +42,7 @@ public: /// destructor virtual ~ViewProviderTemplate(); - virtual void attach(App::DocumentObject *) override; - virtual void setDisplayMode(const char* ModeName) override; virtual bool useNewSelectionModel(void) const override {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const override; virtual void updateData(const App::Property*) override; virtual void onChanged(const App::Property *prop) override; virtual void hide(void) override; diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp index fd8c0dfc0c..b3036bc81e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTile.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTile.cpp @@ -45,30 +45,6 @@ ViewProviderTile::~ViewProviderTile() { } -void ViewProviderTile::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDocumentObject::attach(pcFeat); -} - -void ViewProviderTile::setDisplayMode(const char* ModeName) -{ - ViewProviderDocumentObject::setDisplayMode(ModeName); -} - -std::vector ViewProviderTile::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDocumentObject::getDisplayModes(); - - return StrList; -} - -void ViewProviderTile::updateData(const App::Property* prop) -{ - ViewProviderDocumentObject::updateData(prop); -} - //TechDraw::DrawTile* ViewProviderTile::getViewObject() const //{ // return dynamic_cast(pcObject); diff --git a/src/Mod/TechDraw/Gui/ViewProviderTile.h b/src/Mod/TechDraw/Gui/ViewProviderTile.h index 815a9ec67b..93c0355628 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTile.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTile.h @@ -38,13 +38,7 @@ public: /// destructor virtual ~ViewProviderTile(); - - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; - virtual void updateData(const App::Property*); virtual bool canDelete(App::DocumentObject *obj) const; /* virtual TechDraw::DrawTile* getViewObject() const;*/ diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp index fbd4736f3b..7dd4fb23be 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp @@ -50,29 +50,6 @@ ViewProviderViewClip::~ViewProviderViewClip() { } -void ViewProviderViewClip::updateData(const App::Property* prop) -{ - ViewProviderDrawingView::updateData(prop); -} - -void ViewProviderViewClip::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDrawingView::attach(pcFeat); -} - -void ViewProviderViewClip::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - -std::vector ViewProviderViewClip::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList; - return StrList; -} - std::vector ViewProviderViewClip::claimChildren(void) const { // Collect any child views diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h index dfe78f3fc2..f0a78b0526 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewClip.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewClip.h @@ -41,15 +41,10 @@ public: /// destructor virtual ~ViewProviderViewClip(); - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; virtual TechDraw::DrawViewClip* getViewObject() const; TechDraw::DrawViewClip* getObject() const; - virtual void updateData(const App::Property* prop); /// Hide the object in the view virtual void hide(void); diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp index 720f790c55..563221fec0 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp @@ -127,11 +127,6 @@ ViewProviderViewPart::~ViewProviderViewPart() } -void ViewProviderViewPart::updateData(const App::Property* prop) -{ - ViewProviderDrawingView::updateData(prop); -} - void ViewProviderViewPart::onChanged(const App::Property* prop) { if (prop == &(LineWidth) || @@ -172,20 +167,6 @@ void ViewProviderViewPart::attach(App::DocumentObject *pcFeat) ViewProviderDrawingView::attach(pcFeat); } -void ViewProviderViewPart::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - -std::vector ViewProviderViewPart::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - - return StrList; -} - - std::vector ViewProviderViewPart::claimChildren(void) const { // Collect any child Document Objects and put them in the right place in the Feature tree diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h index efa468d4c0..4c72c31338 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.h @@ -61,10 +61,7 @@ public: static const char* LineStyleEnums[]; virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; virtual bool onDelete(const std::vector &); virtual bool canDelete(App::DocumentObject* obj) const; virtual bool setEdit(int ModNum); @@ -73,7 +70,6 @@ public: public: virtual void onChanged(const App::Property *prop); - virtual void updateData(const App::Property*); virtual void handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property * prop); App::Color prefSectionColor(void); App::Color prefHighlightColor(void); diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp index bfee0a20a5..4049970762 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.cpp @@ -76,25 +76,6 @@ ViewProviderViewSection::~ViewProviderViewSection() { } -void ViewProviderViewSection::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderViewPart::attach(pcFeat); -} - -void ViewProviderViewSection::setDisplayMode(const char* ModeName) -{ - ViewProviderViewPart::setDisplayMode(ModeName); -} - -std::vector ViewProviderViewSection::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderViewPart::getDisplayModes(); - - return StrList; -} - //for VP properties void ViewProviderViewSection::onChanged(const App::Property* prop) { @@ -123,11 +104,6 @@ void ViewProviderViewSection::updateData(const App::Property* prop) ViewProviderViewPart::updateData(prop); } -std::vector ViewProviderViewSection::claimChildren(void) const -{ - return ViewProviderViewPart::claimChildren(); -} - void ViewProviderViewSection::updateGraphic(void) { // redraw QGIVP diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h index c9873f7657..3e34a873bc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewSection.h +++ b/src/Mod/TechDraw/Gui/ViewProviderViewSection.h @@ -48,19 +48,12 @@ public: App::PropertyColor GeomHatchColor; App::PropertyFloat WeightPattern; - - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; virtual void updateData(const App::Property*); virtual void onChanged(const App::Property *prop); virtual bool setEdit(int ModNum); virtual void unsetEdit(int ModNum); virtual bool doubleClicked(void); - virtual std::vector claimChildren(void) const; - void updateGraphic(void); void getParameters(void); virtual bool canDelete(App::DocumentObject* obj) const; diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp index f682499697..e47d2a6eeb 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.cpp @@ -63,30 +63,6 @@ ViewProviderWeld::~ViewProviderWeld() { } -void ViewProviderWeld::attach(App::DocumentObject *pcFeat) -{ - // call parent attach method - ViewProviderDrawingView::attach(pcFeat); -} - -void ViewProviderWeld::setDisplayMode(const char* ModeName) -{ - ViewProviderDrawingView::setDisplayMode(ModeName); -} - -std::vector ViewProviderWeld::getDisplayModes(void) const -{ - // get the modes of the father - std::vector StrList = ViewProviderDrawingView::getDisplayModes(); - - return StrList; -} - -void ViewProviderWeld::updateData(const App::Property* prop) -{ - ViewProviderDrawingView::updateData(prop); -} - void ViewProviderWeld::onChanged(const App::Property* p) { QGIView* qgiv = getQView(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderWeld.h b/src/Mod/TechDraw/Gui/ViewProviderWeld.h index e2b08fd1e3..9a21ed021a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderWeld.h +++ b/src/Mod/TechDraw/Gui/ViewProviderWeld.h @@ -46,12 +46,7 @@ public: App::PropertyLength FontSize; App::PropertyLength TileFontSize; - virtual void attach(App::DocumentObject *); - virtual void setDisplayMode(const char* ModeName); virtual bool useNewSelectionModel(void) const {return false;} - /// returns a list of all possible modes - virtual std::vector getDisplayModes(void) const; - virtual void updateData(const App::Property*); virtual void onChanged(const App::Property* p); virtual std::vector claimChildren(void) const; virtual bool setEdit(int ModNum);