From 3e33f184b47705feea9f73f35034797c8b802acb Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 18 Aug 2024 14:00:31 +0200 Subject: [PATCH] Core: Rename ViewProviderPythonFeature to ViewProviderFeaturePython Fixes #15888 --- src/App/FeaturePython.cpp | 4 +- src/App/FeaturePython.h | 1 - src/Gui/Application.cpp | 6 +- src/Gui/CMakeLists.txt | 4 +- src/Gui/ViewProviderDocumentObjectGroup.cpp | 2 +- src/Gui/ViewProviderDocumentObjectGroup.h | 4 +- ...ture.cpp => ViewProviderFeaturePython.cpp} | 140 +++++++++--------- ...nFeature.h => ViewProviderFeaturePython.h} | 120 +++++++-------- src/Gui/ViewProviderGeoFeatureGroup.cpp | 2 +- src/Gui/ViewProviderGeoFeatureGroup.h | 4 +- src/Gui/ViewProviderLink.cpp | 2 +- src/Gui/ViewProviderLink.h | 4 +- src/Gui/ViewProviderMaterialObject.cpp | 2 +- src/Gui/ViewProviderMaterialObject.h | 4 +- src/Gui/ViewProviderPart.cpp | 2 +- src/Gui/ViewProviderPart.h | 4 +- src/Gui/ViewProviderPlacement.cpp | 2 +- src/Gui/ViewProviderPlacement.h | 4 +- src/Mod/CAM/Gui/ViewProviderArea.cpp | 4 +- src/Mod/CAM/Gui/ViewProviderArea.h | 6 +- src/Mod/CAM/Gui/ViewProviderPath.cpp | 2 +- src/Mod/CAM/Gui/ViewProviderPath.h | 4 +- src/Mod/CAM/Gui/ViewProviderPathCompound.cpp | 2 +- src/Mod/CAM/Gui/ViewProviderPathCompound.h | 2 +- src/Mod/Draft/draftviewproviders/view_base.py | 2 +- src/Mod/Drawing/Gui/ViewProviderView.cpp | 2 +- src/Mod/Drawing/Gui/ViewProviderView.h | 3 +- src/Mod/Fem/App/FemAnalysis.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderAnalysis.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderAnalysis.h | 4 +- src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemConstraint.h | 4 +- src/Mod/Fem/Gui/ViewProviderFemMesh.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemMesh.h | 4 +- src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemMeshShape.h | 4 +- src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h | 2 +- src/Mod/Fem/Gui/ViewProviderResult.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderResult.h | 4 +- src/Mod/Fem/Gui/ViewProviderSolver.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderSolver.h | 4 +- src/Mod/Mesh/Gui/ViewProviderPython.cpp | 2 +- src/Mod/Mesh/Gui/ViewProviderPython.h | 4 +- src/Mod/Part/Gui/ViewProvider2DObject.cpp | 2 +- src/Mod/Part/Gui/ViewProvider2DObject.h | 4 +- src/Mod/Part/Gui/ViewProviderPython.cpp | 4 +- src/Mod/Part/Gui/ViewProviderPython.h | 6 +- src/Mod/PartDesign/Gui/ViewProvider.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProvider.h | 4 +- .../Gui/ViewProviderShapeBinder.cpp | 2 +- .../PartDesign/Gui/ViewProviderShapeBinder.h | 4 +- src/Mod/Points/Gui/ViewProvider.cpp | 2 +- src/Mod/Points/Gui/ViewProvider.h | 4 +- src/Mod/Sketcher/Gui/ViewProviderPython.cpp | 4 +- src/Mod/Sketcher/Gui/ViewProviderPython.h | 6 +- .../Gui/ViewProviderSpreadsheet.cpp | 2 +- .../Spreadsheet/Gui/ViewProviderSpreadsheet.h | 4 +- 57 files changed, 217 insertions(+), 217 deletions(-) rename src/Gui/{ViewProviderPythonFeature.cpp => ViewProviderFeaturePython.cpp} (87%) rename src/Gui/{ViewProviderPythonFeature.h => ViewProviderFeaturePython.h} (83%) diff --git a/src/App/FeaturePython.cpp b/src/App/FeaturePython.cpp index aa6553a2fe..fa9c7018e9 100644 --- a/src/App/FeaturePython.cpp +++ b/src/App/FeaturePython.cpp @@ -607,7 +607,7 @@ bool FeaturePythonImp::editProperty(const char *name) namespace App { PROPERTY_SOURCE_TEMPLATE(App::FeaturePython, App::DocumentObject) template<> const char* App::FeaturePython::getViewProviderName() const { - return "Gui::ViewProviderPythonFeature"; + return "Gui::ViewProviderFeaturePython"; } template<> PyObject* App::FeaturePython::getPyObject() { if (PythonObject.is(Py::_None())) { @@ -625,7 +625,7 @@ template class AppExport FeaturePythonT; namespace App { PROPERTY_SOURCE_TEMPLATE(App::GeometryPython, App::GeoFeature) template<> const char* App::GeometryPython::getViewProviderName() const { - return "Gui::ViewProviderPythonGeometry"; + return "Gui::ViewProviderGeometryPython"; } // explicit template instantiation template class AppExport FeaturePythonT; diff --git a/src/App/FeaturePython.h b/src/App/FeaturePython.h index 144d1f73ed..d57747bfbb 100644 --- a/src/App/FeaturePython.h +++ b/src/App/FeaturePython.h @@ -209,7 +209,6 @@ public: /// returns the type name of the ViewProvider const char* getViewProviderName() const override { return FeatureT::getViewProviderName(); - //return "Gui::ViewProviderPythonFeature"; } App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj, diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index 7b7c2fc31e..89793a71cc 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -119,7 +119,7 @@ #include "ViewProviderPlacement.h" #include "ViewProviderPlane.h" #include "ViewProviderPart.h" -#include "ViewProviderPythonFeature.h" +#include "ViewProviderFeaturePython.h" #include "ViewProviderTextDocument.h" #include "ViewProviderTextureExtension.h" #include "ViewProviderVRMLObject.h" @@ -1928,8 +1928,8 @@ void Application::initTypes() Gui::ViewProviderVRMLObject ::init(); Gui::ViewProviderAnnotation ::init(); Gui::ViewProviderAnnotationLabel ::init(); - Gui::ViewProviderPythonFeature ::init(); - Gui::ViewProviderPythonGeometry ::init(); + Gui::ViewProviderFeaturePython ::init(); + Gui::ViewProviderGeometryPython ::init(); Gui::ViewProviderPlacement ::init(); Gui::ViewProviderPlacementPython ::init(); Gui::ViewProviderOriginFeature ::init(); diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 04dda813d1..8c7a2ffb36 100644 --- a/src/Gui/CMakeLists.txt +++ b/src/Gui/CMakeLists.txt @@ -947,7 +947,7 @@ SET(Viewprovider_CPP_SRCS ViewProviderImagePlane.cpp ViewProviderInventorObject.cpp ViewProviderPyImp.cpp - ViewProviderPythonFeature.cpp + ViewProviderFeaturePython.cpp ViewProviderVRMLObject.cpp ViewProviderBuilder.cpp ViewProviderPlacement.cpp @@ -984,7 +984,7 @@ SET(Viewprovider_SRCS ViewProviderGeometryObject.h ViewProviderImagePlane.h ViewProviderInventorObject.h - ViewProviderPythonFeature.h + ViewProviderFeaturePython.h ViewProviderVRMLObject.h ViewProviderBuilder.h ViewProviderPlacement.h diff --git a/src/Gui/ViewProviderDocumentObjectGroup.cpp b/src/Gui/ViewProviderDocumentObjectGroup.cpp index 0fcf0ad108..59ae34965c 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.cpp +++ b/src/Gui/ViewProviderDocumentObjectGroup.cpp @@ -91,5 +91,5 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderDocumentObjectGroupPython, Gui::ViewPr /// @endcond // explicit template instantiation -template class GuiExport ViewProviderPythonFeatureT; +template class GuiExport ViewProviderFeaturePythonT; } diff --git a/src/Gui/ViewProviderDocumentObjectGroup.h b/src/Gui/ViewProviderDocumentObjectGroup.h index 2053e2cfbd..ef640546c9 100644 --- a/src/Gui/ViewProviderDocumentObjectGroup.h +++ b/src/Gui/ViewProviderDocumentObjectGroup.h @@ -25,7 +25,7 @@ #include "ViewProviderDocumentObject.h" #include "ViewProviderGroupExtension.h" -#include "ViewProviderPythonFeature.h" +#include "ViewProviderFeaturePython.h" namespace Gui { @@ -58,7 +58,7 @@ private: std::vector nodes; }; -using ViewProviderDocumentObjectGroupPython = ViewProviderPythonFeatureT; +using ViewProviderDocumentObjectGroupPython = ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Gui/ViewProviderPythonFeature.cpp b/src/Gui/ViewProviderFeaturePython.cpp similarity index 87% rename from src/Gui/ViewProviderPythonFeature.cpp rename to src/Gui/ViewProviderFeaturePython.cpp index c9b7e02274..6e84997913 100644 --- a/src/Gui/ViewProviderPythonFeature.cpp +++ b/src/Gui/ViewProviderFeaturePython.cpp @@ -37,7 +37,7 @@ #include #include -#include "ViewProviderPythonFeature.h" +#include "ViewProviderFeaturePython.h" #include "Application.h" #include "BitmapFactory.h" #include "Document.h" @@ -46,7 +46,7 @@ #include "ViewProviderDocumentObjectPy.h" -FC_LOG_LEVEL_INIT("ViewProviderPythonFeature", true, true) +FC_LOG_LEVEL_INIT("ViewProviderFeaturePython", true, true) using namespace Gui; @@ -55,14 +55,14 @@ namespace sp = std::placeholders; // ---------------------------------------------------------------------------- -ViewProviderPythonFeatureImp::ViewProviderPythonFeatureImp( +ViewProviderFeaturePythonImp::ViewProviderFeaturePythonImp( ViewProviderDocumentObject* vp, App::PropertyPythonObject &proxy) : object(vp) , Proxy(proxy) { } -ViewProviderPythonFeatureImp::~ViewProviderPythonFeatureImp() +ViewProviderFeaturePythonImp::~ViewProviderFeaturePythonImp() { Base::PyGILStateLocker lock; #undef FC_PY_ELEMENT @@ -76,7 +76,7 @@ ViewProviderPythonFeatureImp::~ViewProviderPythonFeatureImp() } } -void ViewProviderPythonFeatureImp::init(PyObject *pyobj) { +void ViewProviderFeaturePythonImp::init(PyObject *pyobj) { Base::PyGILStateLocker lock; has__object__ = !!PyObject_HasAttrString(pyobj, "__object__"); @@ -88,7 +88,7 @@ void ViewProviderPythonFeatureImp::init(PyObject *pyobj) { #define FC_PY_CALL_CHECK(_name) _FC_PY_CALL_CHECK(_name,return(NotImplemented)) -QIcon ViewProviderPythonFeatureImp::getIcon() const +QIcon ViewProviderFeaturePythonImp::getIcon() const { _FC_PY_CALL_CHECK(getIcon,return(QIcon())); @@ -152,7 +152,7 @@ QIcon ViewProviderPythonFeatureImp::getIcon() const return {}; } -bool ViewProviderPythonFeatureImp::claimChildren(std::vector &children) const +bool ViewProviderFeaturePythonImp::claimChildren(std::vector &children) const { _FC_PY_CALL_CHECK(claimChildren,return(false)); @@ -179,8 +179,8 @@ bool ViewProviderPythonFeatureImp::claimChildren(std::vector ViewProviderPythonFeatureImp::getSelectionShape(const char* /*Element*/) const +std::vector ViewProviderFeaturePythonImp::getSelectionShape(const char* /*Element*/) const { return {}; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::setEdit(int ModNum) +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::setEdit(int ModNum) { FC_PY_CALL_CHECK(setEdit) @@ -388,8 +388,8 @@ ViewProviderPythonFeatureImp::setEdit(int ModNum) return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::unsetEdit(int ModNum) +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::unsetEdit(int ModNum) { FC_PY_CALL_CHECK(unsetEdit) @@ -429,8 +429,8 @@ ViewProviderPythonFeatureImp::unsetEdit(int ModNum) return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::setEditViewer(View3DInventorViewer *viewer, int ModNum) +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::setEditViewer(View3DInventorViewer *viewer, int ModNum) { FC_PY_CALL_CHECK(setEditViewer) @@ -454,8 +454,8 @@ ViewProviderPythonFeatureImp::setEditViewer(View3DInventorViewer *viewer, int Mo return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::unsetEditViewer(View3DInventorViewer *viewer) +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::unsetEditViewer(View3DInventorViewer *viewer) { FC_PY_CALL_CHECK(unsetEditViewer) @@ -479,8 +479,8 @@ ViewProviderPythonFeatureImp::unsetEditViewer(View3DInventorViewer *viewer) return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::doubleClicked() +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::doubleClicked() { FC_PY_CALL_CHECK(doubleClicked) @@ -512,7 +512,7 @@ ViewProviderPythonFeatureImp::doubleClicked() return Rejected; } -bool ViewProviderPythonFeatureImp::setupContextMenu(QMenu* menu) +bool ViewProviderFeaturePythonImp::setupContextMenu(QMenu* menu) { _FC_PY_CALL_CHECK(setupContextMenu,return(false)); @@ -548,7 +548,7 @@ bool ViewProviderPythonFeatureImp::setupContextMenu(QMenu* menu) return true; } -void ViewProviderPythonFeatureImp::attach(App::DocumentObject *pcObject) +void ViewProviderFeaturePythonImp::attach(App::DocumentObject *pcObject) { _FC_PY_CALL_CHECK(attach,return); @@ -574,7 +574,7 @@ void ViewProviderPythonFeatureImp::attach(App::DocumentObject *pcObject) } } -void ViewProviderPythonFeatureImp::updateData(const App::Property* prop) +void ViewProviderFeaturePythonImp::updateData(const App::Property* prop) { if(py_updateData.isNone()) return; @@ -606,7 +606,7 @@ void ViewProviderPythonFeatureImp::updateData(const App::Property* prop) } } -void ViewProviderPythonFeatureImp::onChanged(const App::Property* prop) +void ViewProviderFeaturePythonImp::onChanged(const App::Property* prop) { if(py_onChanged.isNone()) return; @@ -638,11 +638,11 @@ void ViewProviderPythonFeatureImp::onChanged(const App::Property* prop) } } -void ViewProviderPythonFeatureImp::startRestoring() +void ViewProviderFeaturePythonImp::startRestoring() { } -void ViewProviderPythonFeatureImp::finishRestoring() +void ViewProviderFeaturePythonImp::finishRestoring() { Base::PyGILStateLocker lock; try { @@ -660,8 +660,8 @@ void ViewProviderPythonFeatureImp::finishRestoring() } } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::onDelete(const std::vector & sub) +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::onDelete(const std::vector & sub) { FC_PY_CALL_CHECK(onDelete); @@ -698,8 +698,8 @@ ViewProviderPythonFeatureImp::onDelete(const std::vector & sub) } } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canDelete(App::DocumentObject *obj) const +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canDelete(App::DocumentObject *obj) const { FC_PY_CALL_CHECK(canDelete); @@ -720,8 +720,8 @@ ViewProviderPythonFeatureImp::canDelete(App::DocumentObject *obj) const } } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canAddToSceneGraph() const +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canAddToSceneGraph() const { FC_PY_CALL_CHECK(canAddToSceneGraph); @@ -740,7 +740,7 @@ ViewProviderPythonFeatureImp::canAddToSceneGraph() const return Accepted; } -bool ViewProviderPythonFeatureImp::getDefaultDisplayMode(std::string &mode) const +bool ViewProviderFeaturePythonImp::getDefaultDisplayMode(std::string &mode) const { _FC_PY_CALL_CHECK(getDefaultDisplayMode,return(0)); @@ -763,7 +763,7 @@ bool ViewProviderPythonFeatureImp::getDefaultDisplayMode(std::string &mode) cons return true; } -std::vector ViewProviderPythonFeatureImp::getDisplayModes() const +std::vector ViewProviderFeaturePythonImp::getDisplayModes() const { std::vector modes; _FC_PY_CALL_CHECK(getDisplayModes,return(modes)); @@ -800,7 +800,7 @@ std::vector ViewProviderPythonFeatureImp::getDisplayModes() const return modes; } -std::string ViewProviderPythonFeatureImp::setDisplayMode(const char* ModeName) +std::string ViewProviderFeaturePythonImp::setDisplayMode(const char* ModeName) { _FC_PY_CALL_CHECK(setDisplayMode,return(ModeName)); @@ -820,8 +820,8 @@ std::string ViewProviderPythonFeatureImp::setDisplayMode(const char* ModeName) return ModeName; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canDragObjects() const +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canDragObjects() const { FC_PY_CALL_CHECK(canDragObjects); @@ -842,8 +842,8 @@ ViewProviderPythonFeatureImp::canDragObjects() const return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canDragObject(App::DocumentObject* obj) const +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canDragObject(App::DocumentObject* obj) const { FC_PY_CALL_CHECK(canDragObject); @@ -866,8 +866,8 @@ ViewProviderPythonFeatureImp::canDragObject(App::DocumentObject* obj) const return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::dragObject(App::DocumentObject* obj) +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::dragObject(App::DocumentObject* obj) { FC_PY_CALL_CHECK(dragObject); @@ -900,8 +900,8 @@ ViewProviderPythonFeatureImp::dragObject(App::DocumentObject* obj) return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canDropObjects() const +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canDropObjects() const { FC_PY_CALL_CHECK(canDropObjects); @@ -922,8 +922,8 @@ ViewProviderPythonFeatureImp::canDropObjects() const return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canDropObject(App::DocumentObject* obj) const +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canDropObject(App::DocumentObject* obj) const { FC_PY_CALL_CHECK(canDropObject); @@ -946,8 +946,8 @@ ViewProviderPythonFeatureImp::canDropObject(App::DocumentObject* obj) const return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::dropObject(App::DocumentObject* obj) +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::dropObject(App::DocumentObject* obj) { FC_PY_CALL_CHECK(dropObject); @@ -978,8 +978,8 @@ ViewProviderPythonFeatureImp::dropObject(App::DocumentObject* obj) return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canDragAndDropObject(App::DocumentObject *obj) const +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canDragAndDropObject(App::DocumentObject *obj) const { FC_PY_CALL_CHECK(canDragAndDropObject); @@ -1001,8 +1001,8 @@ ViewProviderPythonFeatureImp::canDragAndDropObject(App::DocumentObject *obj) con return Rejected; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canDropObjectEx(App::DocumentObject* obj, +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canDropObjectEx(App::DocumentObject* obj, App::DocumentObject *owner, const char *subname, const std::vector &elements) const { FC_PY_CALL_CHECK(canDropObjectEx); @@ -1033,7 +1033,7 @@ ViewProviderPythonFeatureImp::canDropObjectEx(App::DocumentObject* obj, return Rejected; } -bool ViewProviderPythonFeatureImp::dropObjectEx(App::DocumentObject* obj, App::DocumentObject *owner, +bool ViewProviderFeaturePythonImp::dropObjectEx(App::DocumentObject* obj, App::DocumentObject *owner, const char *subname, const std::vector &elements,std::string &ret) { _FC_PY_CALL_CHECK(dropObjectEx, return(false)); @@ -1065,8 +1065,8 @@ bool ViewProviderPythonFeatureImp::dropObjectEx(App::DocumentObject* obj, App::D return true; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::isShow() const +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::isShow() const { FC_PY_CALL_CHECK(isShow); @@ -1088,8 +1088,8 @@ ViewProviderPythonFeatureImp::isShow() const } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::canRemoveChildrenFromRoot() const { +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::canRemoveChildrenFromRoot() const { FC_PY_CALL_CHECK(canRemoveChildrenFromRoot); @@ -1109,7 +1109,7 @@ ViewProviderPythonFeatureImp::canRemoveChildrenFromRoot() const { return Rejected; } -bool ViewProviderPythonFeatureImp::getDropPrefix(std::string &prefix) const { +bool ViewProviderFeaturePythonImp::getDropPrefix(std::string &prefix) const { _FC_PY_CALL_CHECK(getDropPrefix,return(false)); @@ -1132,8 +1132,8 @@ bool ViewProviderPythonFeatureImp::getDropPrefix(std::string &prefix) const { return true; } -ViewProviderPythonFeatureImp::ValueT -ViewProviderPythonFeatureImp::replaceObject( +ViewProviderFeaturePythonImp::ValueT +ViewProviderFeaturePythonImp::replaceObject( App::DocumentObject *oldObj, App::DocumentObject *newObj) { if(!oldObj || !oldObj->isAttachedToDocument() @@ -1160,7 +1160,7 @@ ViewProviderPythonFeatureImp::replaceObject( return Rejected; } -bool ViewProviderPythonFeatureImp::getLinkedViewProvider( +bool ViewProviderFeaturePythonImp::getLinkedViewProvider( ViewProviderDocumentObject *&vp, std::string *subname, bool recursive) const { _FC_PY_CALL_CHECK(getLinkedViewProvider,return(false)); @@ -1202,7 +1202,7 @@ bool ViewProviderPythonFeatureImp::getLinkedViewProvider( return true; } -bool ViewProviderPythonFeatureImp::editProperty(const char *name) +bool ViewProviderFeaturePythonImp::editProperty(const char *name) { _FC_PY_CALL_CHECK(editProperty,return false); Base::PyGILStateLocker lock; @@ -1227,17 +1227,17 @@ bool ViewProviderPythonFeatureImp::editProperty(const char *name) // --------------------------------------------------------- namespace Gui { -PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderPythonFeature, Gui::ViewProviderDocumentObject) +PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderFeaturePython, Gui::ViewProviderDocumentObject) // explicit template instantiation -template class GuiExport ViewProviderPythonFeatureT; +template class GuiExport ViewProviderFeaturePythonT; } // --------------------------------------------------------- namespace Gui { -PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderPythonGeometry, Gui::ViewProviderGeometryObject) +PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderGeometryPython, Gui::ViewProviderGeometryObject) // explicit template instantiation -template class GuiExport ViewProviderPythonFeatureT; +template class GuiExport ViewProviderFeaturePythonT; } diff --git a/src/Gui/ViewProviderPythonFeature.h b/src/Gui/ViewProviderFeaturePython.h similarity index 83% rename from src/Gui/ViewProviderPythonFeature.h rename to src/Gui/ViewProviderFeaturePython.h index d074f5198b..4133022050 100644 --- a/src/Gui/ViewProviderPythonFeature.h +++ b/src/Gui/ViewProviderFeaturePython.h @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef GUI_VIEWPROVIDERPYTHONFEATURE_H -#define GUI_VIEWPROVIDERPYTHONFEATURE_H +#ifndef GUI_VIEWPROVIDERFEATUREPYTHON_H +#define GUI_VIEWPROVIDERFEATUREPYTHON_H #include #include @@ -37,7 +37,7 @@ class SoNode; namespace Gui { -class GuiExport ViewProviderPythonFeatureImp +class GuiExport ViewProviderFeaturePythonImp { public: enum ValueT { @@ -47,9 +47,9 @@ public: }; /// constructor. - ViewProviderPythonFeatureImp(ViewProviderDocumentObject*, App::PropertyPythonObject &); + ViewProviderFeaturePythonImp(ViewProviderDocumentObject*, App::PropertyPythonObject &); /// destructor. - ~ViewProviderPythonFeatureImp(); + ~ViewProviderFeaturePythonImp(); // Returns the icon QIcon getIcon() const; @@ -193,18 +193,18 @@ public: }; template -class ViewProviderPythonFeatureT : public ViewProviderT +class ViewProviderFeaturePythonT : public ViewProviderT { - PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPythonFeatureT); + PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderFeaturePythonT); public: /// constructor. - ViewProviderPythonFeatureT() { + ViewProviderFeaturePythonT() { ADD_PROPERTY(Proxy,(Py::Object())); - imp = new ViewProviderPythonFeatureImp(this,Proxy); + imp = new ViewProviderFeaturePythonImp(this,Proxy); } /// destructor. - ~ViewProviderPythonFeatureT() override { + ~ViewProviderFeaturePythonT() override { delete imp; } @@ -243,9 +243,9 @@ public: //@{ bool useNewSelectionModel() const override { switch(imp->useNewSelectionModel()) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::useNewSelectionModel(); @@ -253,9 +253,9 @@ public: } bool getElementPicked(const SoPickedPoint *pp, std::string &subname) const override { auto ret = imp->getElementPicked(pp,subname); - if(ret == ViewProviderPythonFeatureImp::NotImplemented) + if(ret == ViewProviderFeaturePythonImp::NotImplemented) return ViewProviderT::getElementPicked(pp,subname); - else if(ret == ViewProviderPythonFeatureImp::Accepted) + else if(ret == ViewProviderFeaturePythonImp::Accepted) return true; return false; } @@ -273,9 +273,9 @@ public: } bool getDetailPath(const char *name, SoFullPath *path, bool append,SoDetail *&det) const override { auto ret = imp->getDetailPath(name,path,append,det); - if(ret == ViewProviderPythonFeatureImp::NotImplemented) + if(ret == ViewProviderFeaturePythonImp::NotImplemented) return ViewProviderT::getDetailPath(name,path,append,det); - return ret == ViewProviderPythonFeatureImp::Accepted; + return ret == ViewProviderFeaturePythonImp::Accepted; } std::vector getSelectionShape(const char* Element) const override { return ViewProviderT::getSelectionShape(Element); @@ -298,9 +298,9 @@ public: } bool onDelete(const std::vector & sub) override { switch(imp->onDelete(sub)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::onDelete(sub); @@ -308,9 +308,9 @@ public: } bool canDelete(App::DocumentObject *obj) const override { switch(imp->canDelete(obj)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::canDelete(obj); @@ -335,9 +335,9 @@ public: /// Returns true if the view provider generally supports dragging objects bool canDragObjects() const override { switch (imp->canDragObjects()) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::canDragObjects(); @@ -346,9 +346,9 @@ public: /// Check whether the object can be removed from the view provider by drag and drop bool canDragObject(App::DocumentObject* obj) const override { switch (imp->canDragObject(obj)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::canDragObject(obj); @@ -358,8 +358,8 @@ public: void dragObject(App::DocumentObject* obj) override { App::AutoTransaction committer; switch (imp->dragObject(obj)) { - case ViewProviderPythonFeatureImp::Accepted: - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Accepted: + case ViewProviderFeaturePythonImp::Rejected: return; default: return ViewProviderT::dragObject(obj); @@ -368,9 +368,9 @@ public: /// Returns true if the view provider generally accepts dropping of objects bool canDropObjects() const override { switch (imp->canDropObjects()) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::canDropObjects(); @@ -379,9 +379,9 @@ public: /// Check whether the object can be dropped to the view provider by drag and drop bool canDropObject(App::DocumentObject* obj) const override { switch (imp->canDropObject(obj)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::canDropObject(obj); @@ -391,8 +391,8 @@ public: void dropObject(App::DocumentObject* obj) override { App::AutoTransaction committer; switch (imp->dropObject(obj)) { - case ViewProviderPythonFeatureImp::Accepted: - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Accepted: + case ViewProviderFeaturePythonImp::Rejected: return; default: return ViewProviderT::dropObject(obj); @@ -401,9 +401,9 @@ public: /** Return false to force drop only operation for a give object*/ bool canDragAndDropObject(App::DocumentObject *obj) const override { switch (imp->canDragAndDropObject(obj)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::canDragAndDropObject(obj); @@ -413,9 +413,9 @@ public: const char *subname, const std::vector &elements) const override { switch (imp->canDropObjectEx(obj,owner,subname,elements)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::canDropObjectEx(obj,owner,subname,elements); @@ -438,9 +438,9 @@ public: /// Returns true if the icon must always appear enabled in the tree view bool isShow() const override { switch(imp->isShow()) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::isShow(); @@ -470,9 +470,9 @@ public: bool canRemoveChildrenFromRoot() const override { switch(imp->canRemoveChildrenFromRoot()) { - case ViewProviderPythonFeatureImp::NotImplemented: + case ViewProviderFeaturePythonImp::NotImplemented: return ViewProviderT::canRemoveChildrenFromRoot(); - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; default: return false; @@ -485,9 +485,9 @@ public: bool canAddToSceneGraph() const override { switch(imp->canAddToSceneGraph()) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::canAddToSceneGraph(); @@ -522,9 +522,9 @@ protected: bool setEdit(int ModNum) override { switch (imp->setEdit(ModNum)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::setEdit(ModNum); @@ -534,19 +534,19 @@ protected: void unsetEdit(int ModNum) override { switch (imp->unsetEdit(ModNum)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: default: return ViewProviderT::unsetEdit(ModNum); } } void setEditViewer(View3DInventorViewer *viewer, int ModNum) override { - if (imp->setEditViewer(viewer,ModNum) == ViewProviderPythonFeatureImp::NotImplemented) + if (imp->setEditViewer(viewer,ModNum) == ViewProviderFeaturePythonImp::NotImplemented) ViewProviderT::setEditViewer(viewer,ModNum); } void unsetEditViewer(View3DInventorViewer *viewer) override { - if (imp->unsetEditViewer(viewer) == ViewProviderPythonFeatureImp::NotImplemented) + if (imp->unsetEditViewer(viewer) == ViewProviderFeaturePythonImp::NotImplemented) ViewProviderT::unsetEditViewer(viewer); } @@ -560,9 +560,9 @@ protected: int replaceObject(App::DocumentObject *oldObj, App::DocumentObject *newObj) override { App::AutoTransaction committer; switch (imp->replaceObject(oldObj,newObj)) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return 1; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return 0; default: return ViewProviderT::replaceObject(oldObj,newObj); @@ -594,9 +594,9 @@ protected: { App::AutoTransaction committer; switch (imp->doubleClicked()) { - case ViewProviderPythonFeatureImp::Accepted: + case ViewProviderFeaturePythonImp::Accepted: return true; - case ViewProviderPythonFeatureImp::Rejected: + case ViewProviderFeaturePythonImp::Rejected: return false; default: return ViewProviderT::doubleClicked(); @@ -609,13 +609,13 @@ protected: } public: - ViewProviderPythonFeatureT(const ViewProviderPythonFeatureT&) = delete; - ViewProviderPythonFeatureT(ViewProviderPythonFeatureT&&) = delete; - ViewProviderPythonFeatureT& operator= (const ViewProviderPythonFeatureT&) = delete; - ViewProviderPythonFeatureT& operator= (ViewProviderPythonFeatureT&&) = delete; + ViewProviderFeaturePythonT(const ViewProviderFeaturePythonT&) = delete; + ViewProviderFeaturePythonT(ViewProviderFeaturePythonT&&) = delete; + ViewProviderFeaturePythonT& operator= (const ViewProviderFeaturePythonT&) = delete; + ViewProviderFeaturePythonT& operator= (ViewProviderFeaturePythonT&&) = delete; private: - ViewProviderPythonFeatureImp* imp; + ViewProviderFeaturePythonImp* imp; App::PropertyPythonObject Proxy; mutable std::string defaultMode; std::string viewerMode; @@ -623,10 +623,10 @@ private: }; // Special Feature-Python classes -using ViewProviderPythonFeature = ViewProviderPythonFeatureT; -using ViewProviderPythonGeometry = ViewProviderPythonFeatureT; +using ViewProviderFeaturePython = ViewProviderFeaturePythonT; +using ViewProviderGeometryPython = ViewProviderFeaturePythonT; } // namespace Gui -#endif // GUI_VIEWPROVIDERPYTHONFEATURE_H +#endif // GUI_VIEWPROVIDERFEATUREPYTHON_H diff --git a/src/Gui/ViewProviderGeoFeatureGroup.cpp b/src/Gui/ViewProviderGeoFeatureGroup.cpp index ca0fd9825c..d60a2fc90d 100644 --- a/src/Gui/ViewProviderGeoFeatureGroup.cpp +++ b/src/Gui/ViewProviderGeoFeatureGroup.cpp @@ -47,5 +47,5 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderGeoFeatureGroupPython, Gui::ViewProvid /// @endcond // explicit template instantiation -template class GuiExport ViewProviderPythonFeatureT; +template class GuiExport ViewProviderFeaturePythonT; } diff --git a/src/Gui/ViewProviderGeoFeatureGroup.h b/src/Gui/ViewProviderGeoFeatureGroup.h index 182cb2318a..a365ed91e8 100644 --- a/src/Gui/ViewProviderGeoFeatureGroup.h +++ b/src/Gui/ViewProviderGeoFeatureGroup.h @@ -28,7 +28,7 @@ #include "ViewProviderDocumentObject.h" #include "ViewProviderGeoFeatureGroupExtension.h" -#include "ViewProviderPythonFeature.h" +#include "ViewProviderFeaturePython.h" namespace Gui { @@ -44,7 +44,7 @@ public: ~ViewProviderGeoFeatureGroup() override; }; -using ViewProviderGeoFeatureGroupPython = ViewProviderPythonFeatureT; +using ViewProviderGeoFeatureGroupPython = ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Gui/ViewProviderLink.cpp b/src/Gui/ViewProviderLink.cpp index e7f6c25b1f..ecb2b1cd74 100644 --- a/src/Gui/ViewProviderLink.cpp +++ b/src/Gui/ViewProviderLink.cpp @@ -3446,5 +3446,5 @@ void ViewProviderLink::setTransformation(const SbMatrix &rcMatrix) namespace Gui { PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderLinkPython, Gui::ViewProviderLink) -template class GuiExport ViewProviderPythonFeatureT; +template class GuiExport ViewProviderFeaturePythonT; } diff --git a/src/Gui/ViewProviderLink.h b/src/Gui/ViewProviderLink.h index 73258a6f51..fc296f2561 100644 --- a/src/Gui/ViewProviderLink.h +++ b/src/Gui/ViewProviderLink.h @@ -28,7 +28,7 @@ #include "SoFCUnifiedSelection.h" #include "ViewProviderDocumentObject.h" #include "ViewProviderExtension.h" -#include "ViewProviderPythonFeature.h" +#include "ViewProviderFeaturePython.h" class SoBase; @@ -339,7 +339,7 @@ protected: mutable qint64 overlayCacheKey; }; -using ViewProviderLinkPython = ViewProviderPythonFeatureT; +using ViewProviderLinkPython = ViewProviderFeaturePythonT; } //namespace Gui diff --git a/src/Gui/ViewProviderMaterialObject.cpp b/src/Gui/ViewProviderMaterialObject.cpp index a4a3b7bcda..7f22cd0272 100644 --- a/src/Gui/ViewProviderMaterialObject.cpp +++ b/src/Gui/ViewProviderMaterialObject.cpp @@ -73,5 +73,5 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderMaterialObjectPython, Gui::ViewProvide /// @endcond // explicit template instantiation -template class GuiExport ViewProviderPythonFeatureT; +template class GuiExport ViewProviderFeaturePythonT; } diff --git a/src/Gui/ViewProviderMaterialObject.h b/src/Gui/ViewProviderMaterialObject.h index fa8714b031..e1cb6b0814 100644 --- a/src/Gui/ViewProviderMaterialObject.h +++ b/src/Gui/ViewProviderMaterialObject.h @@ -26,7 +26,7 @@ #include "ViewProviderDocumentObject.h" -#include "ViewProviderPythonFeature.h" +#include "ViewProviderFeaturePython.h" namespace Gui { @@ -49,7 +49,7 @@ public: }; -using ViewProviderMaterialObjectPython = ViewProviderPythonFeatureT; +using ViewProviderMaterialObjectPython = ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Gui/ViewProviderPart.cpp b/src/Gui/ViewProviderPart.cpp index 4543dcbf32..96f4066e7f 100644 --- a/src/Gui/ViewProviderPart.cpp +++ b/src/Gui/ViewProviderPart.cpp @@ -144,5 +144,5 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderPartPython, Gui::ViewProviderPart) /// @endcond // explicit template instantiation -template class GuiExport ViewProviderPythonFeatureT; +template class GuiExport ViewProviderFeaturePythonT; } diff --git a/src/Gui/ViewProviderPart.h b/src/Gui/ViewProviderPart.h index 32ec4f1af5..c75e355191 100644 --- a/src/Gui/ViewProviderPart.h +++ b/src/Gui/ViewProviderPart.h @@ -25,7 +25,7 @@ #include "ViewProviderDragger.h" #include "ViewProviderOriginGroup.h" -#include "ViewProviderPythonFeature.h" +#include "ViewProviderFeaturePython.h" namespace Gui { @@ -61,7 +61,7 @@ protected: }; -using ViewProviderPartPython = ViewProviderPythonFeatureT; +using ViewProviderPartPython = ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Gui/ViewProviderPlacement.cpp b/src/Gui/ViewProviderPlacement.cpp index d1f4f6c4f8..0f3511c2c8 100644 --- a/src/Gui/ViewProviderPlacement.cpp +++ b/src/Gui/ViewProviderPlacement.cpp @@ -138,6 +138,6 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderPlacementPython, Gui::ViewProviderPlac /// @endcond // explicit template instantiation -template class GuiExport ViewProviderPythonFeatureT; +template class GuiExport ViewProviderFeaturePythonT; } diff --git a/src/Gui/ViewProviderPlacement.h b/src/Gui/ViewProviderPlacement.h index 8852bdf170..0c8e83af3d 100644 --- a/src/Gui/ViewProviderPlacement.h +++ b/src/Gui/ViewProviderPlacement.h @@ -25,7 +25,7 @@ #include "AxisOrigin.h" #include "ViewProviderGeometryObject.h" -#include "ViewProviderPythonFeature.h" +#include "ViewProviderFeaturePython.h" class SoFontStyle; @@ -67,7 +67,7 @@ protected: }; -using ViewProviderPlacementPython = ViewProviderPythonFeatureT; +using ViewProviderPlacementPython = ViewProviderFeaturePythonT; } //namespace Gui diff --git a/src/Mod/CAM/Gui/ViewProviderArea.cpp b/src/Mod/CAM/Gui/ViewProviderArea.cpp index 2254445318..b559b67a10 100644 --- a/src/Mod/CAM/Gui/ViewProviderArea.cpp +++ b/src/Mod/CAM/Gui/ViewProviderArea.cpp @@ -190,7 +190,7 @@ PROPERTY_SOURCE_TEMPLATE(PathGui::ViewProviderAreaViewPython, PathGui::ViewProvi /// @endcond // explicit template instantiation -template class PathGuiExport ViewProviderPythonFeatureT; -template class PathGuiExport ViewProviderPythonFeatureT; +template class PathGuiExport ViewProviderFeaturePythonT; +template class PathGuiExport ViewProviderFeaturePythonT; } diff --git a/src/Mod/CAM/Gui/ViewProviderArea.h b/src/Mod/CAM/Gui/ViewProviderArea.h index 6877beae96..fd02803330 100644 --- a/src/Mod/CAM/Gui/ViewProviderArea.h +++ b/src/Mod/CAM/Gui/ViewProviderArea.h @@ -23,7 +23,7 @@ #ifndef PATH_ViewProviderArea_H #define PATH_ViewProviderArea_H -#include +#include #include #include @@ -52,7 +52,7 @@ public: void dropObject(App::DocumentObject*) override; }; -using ViewProviderAreaPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderAreaPython = Gui::ViewProviderFeaturePythonT; class PathGuiExport ViewProviderAreaView : public PartGui::ViewProviderPlaneParametric @@ -75,7 +75,7 @@ public: void dropObject(App::DocumentObject*) override; }; -using ViewProviderAreaViewPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderAreaViewPython = Gui::ViewProviderFeaturePythonT; } //namespace PathGui diff --git a/src/Mod/CAM/Gui/ViewProviderPath.cpp b/src/Mod/CAM/Gui/ViewProviderPath.cpp index 0be6dd03af..096326767c 100644 --- a/src/Mod/CAM/Gui/ViewProviderPath.cpp +++ b/src/Mod/CAM/Gui/ViewProviderPath.cpp @@ -727,5 +727,5 @@ PROPERTY_SOURCE_TEMPLATE(PathGui::ViewProviderPathPython, PathGui::ViewProviderP /// @endcond // explicit template instantiation -template class PathGuiExport ViewProviderPythonFeatureT; +template class PathGuiExport ViewProviderFeaturePythonT; } diff --git a/src/Mod/CAM/Gui/ViewProviderPath.h b/src/Mod/CAM/Gui/ViewProviderPath.h index e8bed73f27..49fb3d88bd 100644 --- a/src/Mod/CAM/Gui/ViewProviderPath.h +++ b/src/Mod/CAM/Gui/ViewProviderPath.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -117,7 +117,7 @@ protected: }; - using ViewProviderPathPython = Gui::ViewProviderPythonFeatureT; + using ViewProviderPathPython = Gui::ViewProviderFeaturePythonT; } //namespace PathGui diff --git a/src/Mod/CAM/Gui/ViewProviderPathCompound.cpp b/src/Mod/CAM/Gui/ViewProviderPathCompound.cpp index 9c6061ab77..6641dcb4b4 100644 --- a/src/Mod/CAM/Gui/ViewProviderPathCompound.cpp +++ b/src/Mod/CAM/Gui/ViewProviderPathCompound.cpp @@ -87,5 +87,5 @@ PROPERTY_SOURCE_TEMPLATE(PathGui::ViewProviderPathCompoundPython, PathGui::ViewP /// @endcond // explicit template instantiation -template class PathGuiExport ViewProviderPythonFeatureT; +template class PathGuiExport ViewProviderFeaturePythonT; } diff --git a/src/Mod/CAM/Gui/ViewProviderPathCompound.h b/src/Mod/CAM/Gui/ViewProviderPathCompound.h index 88471db0a8..c7ab64b138 100644 --- a/src/Mod/CAM/Gui/ViewProviderPathCompound.h +++ b/src/Mod/CAM/Gui/ViewProviderPathCompound.h @@ -48,7 +48,7 @@ protected: }; -using ViewProviderPathCompoundPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderPathCompoundPython = Gui::ViewProviderFeaturePythonT; } //namespace PathGui diff --git a/src/Mod/Draft/draftviewproviders/view_base.py b/src/Mod/Draft/draftviewproviders/view_base.py index a3d49bc029..4e6e0983b6 100644 --- a/src/Mod/Draft/draftviewproviders/view_base.py +++ b/src/Mod/Draft/draftviewproviders/view_base.py @@ -56,7 +56,7 @@ class ViewProviderDraft(object): vobj : a base C++ view provider The view provider of the scripted object (`obj.ViewObject`), which commonly may be of types `PartGui::ViewProvider2DObjectPython`, - `PartGui::ViewProviderPython`, or `Gui::ViewProviderPythonFeature`. + `PartGui::ViewProviderPython`, or `Gui::ViewProviderFeaturePython`. A basic view provider is instantiated during the creation of the base C++ object, for example, diff --git a/src/Mod/Drawing/Gui/ViewProviderView.cpp b/src/Mod/Drawing/Gui/ViewProviderView.cpp index 445844e160..63263f3883 100644 --- a/src/Mod/Drawing/Gui/ViewProviderView.cpp +++ b/src/Mod/Drawing/Gui/ViewProviderView.cpp @@ -127,7 +127,7 @@ PROPERTY_SOURCE_TEMPLATE(DrawingGui::ViewProviderDrawingViewPython, /// @endcond // explicit template instantiation -template class DrawingGuiExport ViewProviderPythonFeatureT; +template class DrawingGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Drawing/Gui/ViewProviderView.h b/src/Mod/Drawing/Gui/ViewProviderView.h index 01f8d8e1c0..c935aa2bf2 100644 --- a/src/Mod/Drawing/Gui/ViewProviderView.h +++ b/src/Mod/Drawing/Gui/ViewProviderView.h @@ -24,6 +24,7 @@ #define DRAWINGGUI_VIEWPROVIDERVIEW_H #include +#include namespace DrawingGui @@ -63,7 +64,7 @@ public: //@} }; -using ViewProviderDrawingViewPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderDrawingViewPython = Gui::ViewProviderFeaturePythonT; class DrawingGuiExport ViewProviderDrawingClip: public Gui::ViewProviderDocumentObjectGroup { diff --git a/src/Mod/Fem/App/FemAnalysis.cpp b/src/Mod/Fem/App/FemAnalysis.cpp index ff31baedda..a28cbe1317 100644 --- a/src/Mod/Fem/App/FemAnalysis.cpp +++ b/src/Mod/Fem/App/FemAnalysis.cpp @@ -97,7 +97,7 @@ PROPERTY_SOURCE_TEMPLATE(Fem::FeaturePython, Fem::DocumentObject) template<> const char* Fem::FeaturePython::getViewProviderName() const { - return "Gui::ViewProviderPythonFeature"; + return "Gui::ViewProviderFeaturePython"; } template<> PyObject* Fem::FeaturePython::getPyObject() diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp index 48f3f1c3e6..be13a5addd 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp @@ -367,5 +367,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderFemAnalysisPython, FemGui::ViewProv /// @endcond // explicit template instantiation -template class FemGuiExport ViewProviderPythonFeatureT; +template class FemGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h index 1d3da46d70..f0a4e4eee9 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h @@ -24,7 +24,7 @@ #define FEM_ViewProviderAnalysis_H #include -#include +#include #include #include @@ -115,7 +115,7 @@ private: ViewProviderFemHighlighter extension; }; -using ViewProviderFemAnalysisPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderFemAnalysisPython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp index b28c5566a4..606e748bf5 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp @@ -305,5 +305,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderFemConstraintPython, FemGui::ViewPr /// @endcond // explicit template instantiation -template class FemGuiExport ViewProviderPythonFeatureT; +template class FemGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h index 6c1f61b0bb..6b7bdc0ff3 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemConstraint.h +++ b/src/Mod/Fem/Gui/ViewProviderFemConstraint.h @@ -26,7 +26,7 @@ #define GUI_VIEWPROVIDERFEMCONSTRAINT_H #include -#include +#include #include #include @@ -136,7 +136,7 @@ inline void ViewProviderFemConstraint::setRotateSymbol(bool rotate) rotateSymbol = rotate; } -using ViewProviderFemConstraintPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderFemConstraintPython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp index f96d1f3a1c..243d7633a6 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp @@ -3170,5 +3170,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderFemMeshPython, FemGui::ViewProvider /// @endcond // explicit template instantiation -template class FemGuiExport ViewProviderPythonFeatureT; +template class FemGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h index 92eaa76f22..32b60caff9 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include class SoCoordinate3; @@ -185,7 +185,7 @@ private: class Private; }; -using ViewProviderFemMeshPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderFemMeshPython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp index 62e82d664c..6fc0256642 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp @@ -51,6 +51,6 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderFemMeshShapeBasePython, FemGui::ViewProviderFemMeshShapeBase) // explicit template instantiation -template class FemGuiExport ViewProviderPythonFeatureT; +template class FemGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h index 5c52f1b4f7..6301263426 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.h @@ -24,7 +24,7 @@ #ifndef FEM_ViewProviderFemMeshShape_H #define FEM_ViewProviderFemMeshShape_H -#include +#include #include "ViewProviderFemMesh.h" @@ -58,7 +58,7 @@ public: }; using ViewProviderFemMeshShapeBasePython = - Gui::ViewProviderPythonFeatureT; + Gui::ViewProviderFeaturePythonT; } // namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h index a4df722186..69236ad349 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h @@ -23,7 +23,7 @@ #ifndef FEM_VIEWPROVIDERFEMPOSTPIPELINE_H #define FEM_VIEWPROVIDERFEMPOSTPIPELINE_H -#include +#include #include #include "ViewProviderFemPostObject.h" diff --git a/src/Mod/Fem/Gui/ViewProviderResult.cpp b/src/Mod/Fem/Gui/ViewProviderResult.cpp index 27b8f8a79b..05deced184 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.cpp +++ b/src/Mod/Fem/Gui/ViewProviderResult.cpp @@ -46,5 +46,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderResultPython, FemGui::ViewProviderR /// @endcond // explicit template instantiation -template class FemGuiExport ViewProviderPythonFeatureT; +template class FemGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Fem/Gui/ViewProviderResult.h b/src/Mod/Fem/Gui/ViewProviderResult.h index 41792756a9..3868356060 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.h +++ b/src/Mod/Fem/Gui/ViewProviderResult.h @@ -25,7 +25,7 @@ #define FEM_ViewProviderResult_H #include -#include +#include #include namespace FemGui @@ -49,7 +49,7 @@ public: } }; -using ViewProviderResultPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderResultPython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.cpp b/src/Mod/Fem/Gui/ViewProviderSolver.cpp index 6b9bedd8bd..e3d3e4f03f 100644 --- a/src/Mod/Fem/Gui/ViewProviderSolver.cpp +++ b/src/Mod/Fem/Gui/ViewProviderSolver.cpp @@ -77,5 +77,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderSolverPython, FemGui::ViewProviderS /// @endcond // explicit template instantiation -template class FemGuiExport ViewProviderPythonFeatureT; +template class FemGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Fem/Gui/ViewProviderSolver.h b/src/Mod/Fem/Gui/ViewProviderSolver.h index 483a678b1e..0027bb2c93 100644 --- a/src/Mod/Fem/Gui/ViewProviderSolver.h +++ b/src/Mod/Fem/Gui/ViewProviderSolver.h @@ -23,7 +23,7 @@ #ifndef FEM_ViewProviderSolver_H #define FEM_ViewProviderSolver_H -#include +#include #include @@ -61,7 +61,7 @@ public: bool canDelete(App::DocumentObject* obj) const override; }; -using ViewProviderSolverPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderSolverPython = Gui::ViewProviderFeaturePythonT; } // namespace FemGui diff --git a/src/Mod/Mesh/Gui/ViewProviderPython.cpp b/src/Mod/Mesh/Gui/ViewProviderPython.cpp index 23cdd0d758..f8501f3ffc 100644 --- a/src/Mod/Mesh/Gui/ViewProviderPython.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderPython.cpp @@ -33,5 +33,5 @@ PROPERTY_SOURCE_TEMPLATE(MeshGui::ViewProviderPython, MeshGui::ViewProviderMeshF /// @endcond // explicit template instantiation -template class MeshGuiExport ViewProviderPythonFeatureT; +template class MeshGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Mesh/Gui/ViewProviderPython.h b/src/Mod/Mesh/Gui/ViewProviderPython.h index 4117965dc5..37a0c90da3 100644 --- a/src/Mod/Mesh/Gui/ViewProviderPython.h +++ b/src/Mod/Mesh/Gui/ViewProviderPython.h @@ -24,13 +24,13 @@ #ifndef MESHGUI_VIEWPROVIDERPYTHON_H #define MESHGUI_VIEWPROVIDERPYTHON_H -#include +#include #include namespace MeshGui { -using ViewProviderPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderPython = Gui::ViewProviderFeaturePythonT; } // namespace MeshGui diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp index dfde26fa89..5963d6e6d4 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp +++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp @@ -346,5 +346,5 @@ PROPERTY_SOURCE_TEMPLATE(PartGui::ViewProvider2DObjectPython, PartGui::ViewProvi /// @endcond // explicit template instantiation -template class PartGuiExport ViewProviderPythonFeatureT; +template class PartGuiExport ViewProviderFeaturePythonT; } diff --git a/src/Mod/Part/Gui/ViewProvider2DObject.h b/src/Mod/Part/Gui/ViewProvider2DObject.h index b55644fb44..6438d0de6d 100644 --- a/src/Mod/Part/Gui/ViewProvider2DObject.h +++ b/src/Mod/Part/Gui/ViewProvider2DObject.h @@ -26,7 +26,7 @@ #include "ViewProvider.h" #include -#include +#include class TopoDS_Shape; class TopoDS_Face; @@ -98,7 +98,7 @@ private: float MaxY; }; -using ViewProvider2DObjectPython = Gui::ViewProviderPythonFeatureT; +using ViewProvider2DObjectPython = Gui::ViewProviderFeaturePythonT; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderPython.cpp b/src/Mod/Part/Gui/ViewProviderPython.cpp index f31c11efe9..84e9ff2225 100644 --- a/src/Mod/Part/Gui/ViewProviderPython.cpp +++ b/src/Mod/Part/Gui/ViewProviderPython.cpp @@ -84,13 +84,13 @@ PROPERTY_SOURCE_TEMPLATE(PartGui::ViewProviderPython, PartGui::ViewProviderPart) /// @endcond // explicit template instantiation -template class PartGuiExport ViewProviderPythonFeatureT; +template class PartGuiExport ViewProviderFeaturePythonT; /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(PartGui::ViewProviderCustomPython, PartGui::ViewProviderCustom) /// @endcond // explicit template instantiation -template class PartGuiExport ViewProviderPythonFeatureT; +template class PartGuiExport ViewProviderFeaturePythonT; } diff --git a/src/Mod/Part/Gui/ViewProviderPython.h b/src/Mod/Part/Gui/ViewProviderPython.h index 450a9473f2..ac9b6883fa 100644 --- a/src/Mod/Part/Gui/ViewProviderPython.h +++ b/src/Mod/Part/Gui/ViewProviderPython.h @@ -24,7 +24,7 @@ #ifndef PARTGUI_VIEWPROVIDERPYTHON_H #define PARTGUI_VIEWPROVIDERPYTHON_H -#include +#include #include namespace PartGui { @@ -45,8 +45,8 @@ protected: std::map propView; }; -using ViewProviderPython = Gui::ViewProviderPythonFeatureT; -using ViewProviderCustomPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderPython = Gui::ViewProviderFeaturePythonT; +using ViewProviderCustomPython = Gui::ViewProviderFeaturePythonT; } // namespace PartGui diff --git a/src/Mod/PartDesign/Gui/ViewProvider.cpp b/src/Mod/PartDesign/Gui/ViewProvider.cpp index f50818d0e7..92129f31ed 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.cpp +++ b/src/Mod/PartDesign/Gui/ViewProvider.cpp @@ -314,6 +314,6 @@ PROPERTY_SOURCE_TEMPLATE(PartDesignGui::ViewProviderPython, PartDesignGui::ViewP /// @endcond // explicit template instantiation -template class PartDesignGuiExport ViewProviderPythonFeatureT; +template class PartDesignGuiExport ViewProviderFeaturePythonT; } diff --git a/src/Mod/PartDesign/Gui/ViewProvider.h b/src/Mod/PartDesign/Gui/ViewProvider.h index 98bae5ca2a..9b8e16c38d 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.h +++ b/src/Mod/PartDesign/Gui/ViewProvider.h @@ -26,7 +26,7 @@ #include #include "ViewProviderBody.h" -#include +#include #include "Gui/ViewProviderSuppressibleExtension.h" #include @@ -93,7 +93,7 @@ protected: bool isSetTipIcon{false}; }; -using ViewProviderPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderPython = Gui::ViewProviderFeaturePythonT; } // namespace PartDesignGui diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp index 5743261360..f2790e6c0c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp @@ -440,5 +440,5 @@ std::vector ViewProviderSubShapeBinder::claimChildren() co namespace Gui { PROPERTY_SOURCE_TEMPLATE(PartDesignGui::ViewProviderSubShapeBinderPython, PartDesignGui::ViewProviderSubShapeBinder) -template class PartDesignGuiExport ViewProviderPythonFeatureT; +template class PartDesignGuiExport ViewProviderFeaturePythonT; } diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h index 9a1836afe4..cdaea2b2bc 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h @@ -23,7 +23,7 @@ #ifndef PARTGUI_ViewProviderShapeBinder_H #define PARTGUI_ViewProviderShapeBinder_H -#include +#include #include #include @@ -84,7 +84,7 @@ private: void updatePlacement(bool transaction); }; -using ViewProviderSubShapeBinderPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderSubShapeBinderPython = Gui::ViewProviderFeaturePythonT; } // namespace PartDesignGui diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp index 36423a85ed..8d85dd09f2 100644 --- a/src/Mod/Points/Gui/ViewProvider.cpp +++ b/src/Mod/Points/Gui/ViewProvider.cpp @@ -670,7 +670,7 @@ PROPERTY_SOURCE_TEMPLATE(PointsGui::ViewProviderPython, PointsGui::ViewProviderS /// @endcond // explicit template instantiation -template class PointsGuiExport ViewProviderPythonFeatureT; +template class PointsGuiExport ViewProviderFeaturePythonT; } // namespace Gui // ------------------------------------------------- diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h index f0991996d3..1c9fa35e8c 100644 --- a/src/Mod/Points/Gui/ViewProvider.h +++ b/src/Mod/Points/Gui/ViewProvider.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include @@ -173,7 +173,7 @@ protected: SoIndexedPointSet* pcPoints; }; -using ViewProviderPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderPython = Gui::ViewProviderFeaturePythonT; } // namespace PointsGui diff --git a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp index 1e9cb8c0ef..ae8ea6f687 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp @@ -88,12 +88,12 @@ PROPERTY_SOURCE_TEMPLATE(SketcherGui::ViewProviderPython, SketcherGui::ViewProvi /// @endcond // explicit template instantiation -template class SketcherGuiExport ViewProviderPythonFeatureT; +template class SketcherGuiExport ViewProviderFeaturePythonT; /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(SketcherGui::ViewProviderCustomPython, SketcherGui::ViewProviderCustom) /// @endcond // explicit template instantiation -template class SketcherGuiExport ViewProviderPythonFeatureT; +template class SketcherGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Sketcher/Gui/ViewProviderPython.h b/src/Mod/Sketcher/Gui/ViewProviderPython.h index a331f49758..507ea490a6 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderPython.h +++ b/src/Mod/Sketcher/Gui/ViewProviderPython.h @@ -23,7 +23,7 @@ #ifndef SketcherGui_VIEWPROVIDERPYTHON_H #define SketcherGui_VIEWPROVIDERPYTHON_H -#include +#include #include @@ -46,8 +46,8 @@ protected: std::map propView; }; -using ViewProviderPython = Gui::ViewProviderPythonFeatureT; -using ViewProviderCustomPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderPython = Gui::ViewProviderFeaturePythonT; +using ViewProviderCustomPython = Gui::ViewProviderFeaturePythonT; } // namespace SketcherGui diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp index 3f4fa32224..c0bc26ee90 100644 --- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp +++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp @@ -230,5 +230,5 @@ PROPERTY_SOURCE_TEMPLATE(SpreadsheetGui::ViewProviderSheetPython, SpreadsheetGui /// @endcond // explicit template instantiation -template class SpreadsheetGuiExport ViewProviderPythonFeatureT; +template class SpreadsheetGuiExport ViewProviderFeaturePythonT; } // namespace Gui diff --git a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h index eed33c61ee..ab301d3840 100644 --- a/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h +++ b/src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include @@ -90,7 +90,7 @@ private: QPointer view; }; -using ViewProviderSheetPython = Gui::ViewProviderPythonFeatureT; +using ViewProviderSheetPython = Gui::ViewProviderFeaturePythonT; } // namespace SpreadsheetGui