diff --git a/src/Mod/TechDraw/App/AppTechDraw.cpp b/src/Mod/TechDraw/App/AppTechDraw.cpp index 64fa01b40f..d722a8569f 100644 --- a/src/Mod/TechDraw/App/AppTechDraw.cpp +++ b/src/Mod/TechDraw/App/AppTechDraw.cpp @@ -77,7 +77,7 @@ PyMOD_INIT_FUNC(TechDraw) } catch(const Base::Exception& e) { PyErr_SetString(PyExc_ImportError, e.what()); - PyMOD_Return(0); + PyMOD_Return(nullptr); } PyObject* mod = TechDraw::initModule(); Base::Console().Log("Loading TechDraw module... done\n"); diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp index e65aa6c497..9e22bc6821 100644 --- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp +++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp @@ -419,8 +419,8 @@ private: Py::String dxfReturn; try { - App::DocumentObject* obj = 0; - TechDraw::DrawViewPart* dvp = 0; + App::DocumentObject* obj = nullptr; + TechDraw::DrawViewPart* dvp = nullptr; TechDraw::DXFOutput dxfOut; std::string dxfText; std::stringstream ss; @@ -477,8 +477,8 @@ private: std::string grpHead2 = "\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-miterlimit=\"4\">\n"; std::string grpTail = "\n"; try { - App::DocumentObject* obj = 0; - TechDraw::DrawViewPart* dvp = 0; + App::DocumentObject* obj = nullptr; + TechDraw::DrawViewPart* dvp = nullptr; TechDraw::SVGOutput svgOut; std::string svgText; std::stringstream ss; @@ -636,8 +636,8 @@ private: try { ImpExpDxfWrite writer(filePath); writer.init(); - App::DocumentObject* obj = 0; - TechDraw::DrawViewPart* dvp = 0; + App::DocumentObject* obj = nullptr; + TechDraw::DrawViewPart* dvp = nullptr; if (PyObject_TypeCheck(viewObj, &(TechDraw::DrawViewPartPy::Type))) { obj = static_cast(viewObj)->getDocumentObjectPtr(); dvp = static_cast(obj); @@ -670,8 +670,8 @@ private: try { ImpExpDxfWrite writer(filePath); writer.init(); - App::DocumentObject* obj = 0; - TechDraw::DrawPage* dp = 0; + App::DocumentObject* obj = nullptr; + TechDraw::DrawPage* dp = nullptr; if (PyObject_TypeCheck(pageObj, &(TechDraw::DrawPagePy::Type))) { obj = static_cast(pageObj)->getDocumentObjectPtr(); dp = static_cast(obj); @@ -1041,7 +1041,7 @@ private: Py::Object project(const Py::Tuple& args) { PyObject *pcObjShape; - PyObject *pcObjDir=0; + PyObject *pcObjDir=nullptr; if (!PyArg_ParseTuple(args.ptr(), "O!|O!", &(Part::TopoShapePy::Type), &pcObjShape, @@ -1066,7 +1066,7 @@ private: Py::Object projectEx(const Py::Tuple& args) { PyObject *pcObjShape; - PyObject *pcObjDir=0; + PyObject *pcObjDir=nullptr; if (!PyArg_ParseTuple(args.ptr(), "O!|O!", &(TopoShapePy::Type), &pcObjShape, @@ -1097,23 +1097,23 @@ private: Py::Object projectToSVG(const Py::Tuple& args, const Py::Dict& keys) { - static char* argNames[] = {"topoShape", "direction", "type", "tolerance", "vStyle", "v0Style", "v1Style", "hStyle", "h0Style", "h1Style", NULL}; - PyObject *pcObjShape = 0; - PyObject *pcObjDir = 0; - const char *extractionTypePy = 0; + static char* argNames[] = {"topoShape", "direction", "type", "tolerance", "vStyle", "v0Style", "v1Style", "hStyle", "h0Style", "h1Style", nullptr}; + PyObject *pcObjShape = nullptr; + PyObject *pcObjDir = nullptr; + const char *extractionTypePy = nullptr; ProjectionAlgos::ExtractionType extractionType = ProjectionAlgos::Plain; const float tol = 0.1f; - PyObject* vStylePy = 0; + PyObject* vStylePy = nullptr; ProjectionAlgos::XmlAttributes vStyle; - PyObject* v0StylePy = 0; + PyObject* v0StylePy = nullptr; ProjectionAlgos::XmlAttributes v0Style; - PyObject* v1StylePy = 0; + PyObject* v1StylePy = nullptr; ProjectionAlgos::XmlAttributes v1Style; - PyObject* hStylePy = 0; + PyObject* hStylePy = nullptr; ProjectionAlgos::XmlAttributes hStyle; - PyObject* h0StylePy = 0; + PyObject* h0StylePy = nullptr; ProjectionAlgos::XmlAttributes h0Style; - PyObject* h1StylePy = 0; + PyObject* h1StylePy = nullptr; ProjectionAlgos::XmlAttributes h1Style; // Get the arguments @@ -1167,8 +1167,8 @@ private: Py::Object projectToDXF(const Py::Tuple& args) { PyObject *pcObjShape; - PyObject *pcObjDir=0; - const char *type=0; + PyObject *pcObjDir=nullptr; + const char *type=nullptr; float scale=1.0f; float tol=0.1f; diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.cpp b/src/Mod/TechDraw/App/ArrowPropEnum.cpp index 1f1ac3aaff..a0b63fe344 100644 --- a/src/Mod/TechDraw/App/ArrowPropEnum.cpp +++ b/src/Mod/TechDraw/App/ArrowPropEnum.cpp @@ -38,7 +38,7 @@ const char* ArrowPropEnum::ArrowTypeEnums[]= { "Filled Arrow", "Fork", "Filled Triangle", "None", - NULL}; + nullptr}; const std::vector ArrowPropEnum::ArrowTypeIcons = { ":icons/arrowfilled.svg", ":icons/arrowopen.svg", diff --git a/src/Mod/TechDraw/App/CenterLinePyImp.cpp b/src/Mod/TechDraw/App/CenterLinePyImp.cpp index 823e3f140f..756bc0aedf 100644 --- a/src/Mod/TechDraw/App/CenterLinePyImp.cpp +++ b/src/Mod/TechDraw/App/CenterLinePyImp.cpp @@ -47,7 +47,7 @@ PyObject *CenterLinePy::PyMake(struct _typeobject *, PyObject *, PyObject *) // // never create such objects with the constructor PyErr_SetString(PyExc_RuntimeError, "You cannot create an instance of the abstract class 'CenterLine'."); - return 0; + return nullptr; } // constructor method @@ -59,17 +59,17 @@ int CenterLinePy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) PyObject* CenterLinePy::clone(PyObject *args) { if (!PyArg_ParseTuple(args, "")) - return NULL; + return nullptr; TechDraw::CenterLine* geom = this->getCenterLinePtr(); PyTypeObject* type = this->GetType(); - PyObject* cpy = 0; + PyObject* cpy = nullptr; // let the type object decide if (type->tp_new) - cpy = type->tp_new(type, this, 0); + cpy = type->tp_new(type, this, nullptr); if (!cpy) { PyErr_SetString(PyExc_TypeError, "failed to create clone of CenterLine"); - return 0; + return nullptr; } TechDraw::CenterLinePy* geompy = static_cast(cpy); @@ -86,17 +86,17 @@ PyObject* CenterLinePy::clone(PyObject *args) PyObject* CenterLinePy::copy(PyObject *args) { if (!PyArg_ParseTuple(args, "")) - return NULL; + return nullptr; TechDraw::CenterLine* geom = this->getCenterLinePtr(); PyTypeObject* type = this->GetType(); - PyObject* cpy = 0; + PyObject* cpy = nullptr; // let the type object decide if (type->tp_new) - cpy = type->tp_new(type, this, 0); + cpy = type->tp_new(type, this, nullptr); if (!cpy) { PyErr_SetString(PyExc_TypeError, "failed to create copy of CenterLine"); - return 0; + return nullptr; } TechDraw::CenterLinePy* geompy = static_cast(cpy); @@ -413,7 +413,7 @@ void CenterLinePy::setPoints(Py::Object arg) PyObject *CenterLinePy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int CenterLinePy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp index 137227473d..6de8e80263 100644 --- a/src/Mod/TechDraw/App/Cosmetic.cpp +++ b/src/Mod/TechDraw/App/Cosmetic.cpp @@ -288,7 +288,7 @@ void CosmeticVertex::createNewTag() static bool seeded = false; if (!seeded) { - ran.seed(static_cast(std::time(0))); + ran.seed(static_cast(std::time(nullptr))); seeded = true; } static boost::uuids::basic_random_generator gen(&ran); @@ -552,7 +552,7 @@ void CosmeticEdge::createNewTag() static bool seeded = false; if (!seeded) { - ran.seed(static_cast(std::time(0))); + ran.seed(static_cast(std::time(nullptr))); seeded = true; } static boost::uuids::basic_random_generator gen(&ran); @@ -1427,7 +1427,7 @@ void CenterLine::createNewTag() static bool seeded = false; if (!seeded) { - ran.seed(static_cast(std::time(0))); + ran.seed(static_cast(std::time(nullptr))); seeded = true; } static boost::uuids::basic_random_generator gen(&ran); @@ -1617,7 +1617,7 @@ void GeomFormat::createNewTag() static bool seeded = false; if (!seeded) { - ran.seed(static_cast(std::time(0))); + ran.seed(static_cast(std::time(nullptr))); seeded = true; } static boost::uuids::basic_random_generator gen(&ran); diff --git a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp index eca7b45d8a..30a9eb987d 100644 --- a/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp +++ b/src/Mod/TechDraw/App/CosmeticEdgePyImp.cpp @@ -61,7 +61,7 @@ PyObject *CosmeticEdgePy::PyMake(struct _typeobject *, PyObject *, PyObject *) // never create such objects with the constructor PyErr_SetString(PyExc_RuntimeError, "You cannot create an instance of the abstract class 'CosmeticEdge'."); - return 0; + return nullptr; } // constructor method @@ -74,17 +74,17 @@ int CosmeticEdgePy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) PyObject* CosmeticEdgePy::clone(PyObject *args) { if (!PyArg_ParseTuple(args, "")) - return NULL; + return nullptr; TechDraw::CosmeticEdge* geom = this->getCosmeticEdgePtr(); PyTypeObject* type = this->GetType(); - PyObject* cpy = 0; + PyObject* cpy = nullptr; // let the type object decide if (type->tp_new) - cpy = type->tp_new(type, this, 0); + cpy = type->tp_new(type, this, nullptr); if (!cpy) { PyErr_SetString(PyExc_TypeError, "failed to create clone of CosmeticEdge"); - return 0; + return nullptr; } TechDraw::CosmeticEdgePy* geompy = static_cast(cpy); @@ -101,17 +101,17 @@ PyObject* CosmeticEdgePy::clone(PyObject *args) PyObject* CosmeticEdgePy::copy(PyObject *args) { if (!PyArg_ParseTuple(args, "")) - return NULL; + return nullptr; TechDraw::CosmeticEdge* geom = this->getCosmeticEdgePtr(); PyTypeObject* type = this->GetType(); - PyObject* cpy = 0; + PyObject* cpy = nullptr; // let the type object decide if (type->tp_new) - cpy = type->tp_new(type, this, 0); + cpy = type->tp_new(type, this, nullptr); if (!cpy) { PyErr_SetString(PyExc_TypeError, "failed to create copy of CosmeticEdge"); - return 0; + return nullptr; } TechDraw::CosmeticEdgePy* geompy = static_cast(cpy); @@ -377,7 +377,7 @@ void CosmeticEdgePy::setCenter(Py::Object arg) PyObject *CosmeticEdgePy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int CosmeticEdgePy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/CosmeticExtension.cpp b/src/Mod/TechDraw/App/CosmeticExtension.cpp index 7f1e746a25..45ac0375c0 100644 --- a/src/Mod/TechDraw/App/CosmeticExtension.cpp +++ b/src/Mod/TechDraw/App/CosmeticExtension.cpp @@ -47,10 +47,10 @@ CosmeticExtension::CosmeticExtension() { static const char *cgroup = "Cosmetics"; - EXTENSION_ADD_PROPERTY_TYPE(CosmeticVertexes, (0), cgroup, App::Prop_Output, "CosmeticVertex Save/Restore"); - EXTENSION_ADD_PROPERTY_TYPE(CosmeticEdges, (0), cgroup, App::Prop_Output, "CosmeticEdge Save/Restore"); - EXTENSION_ADD_PROPERTY_TYPE(CenterLines ,(0),cgroup,App::Prop_Output,"Geometry format Save/Restore"); - EXTENSION_ADD_PROPERTY_TYPE(GeomFormats ,(0),cgroup,App::Prop_Output,"Geometry format Save/Restore"); + EXTENSION_ADD_PROPERTY_TYPE(CosmeticVertexes, (nullptr), cgroup, App::Prop_Output, "CosmeticVertex Save/Restore"); + EXTENSION_ADD_PROPERTY_TYPE(CosmeticEdges, (nullptr), cgroup, App::Prop_Output, "CosmeticEdge Save/Restore"); + EXTENSION_ADD_PROPERTY_TYPE(CenterLines ,(nullptr),cgroup,App::Prop_Output,"Geometry format Save/Restore"); + EXTENSION_ADD_PROPERTY_TYPE(GeomFormats ,(nullptr),cgroup,App::Prop_Output,"Geometry format Save/Restore"); initExtensionType(CosmeticExtension::getExtensionClassTypeId()); } diff --git a/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp b/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp index d90b6a9f80..de93599540 100644 --- a/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp +++ b/src/Mod/TechDraw/App/CosmeticExtensionPyImp.cpp @@ -43,7 +43,7 @@ std::string CosmeticExtensionPy::representation(void) const PyObject *CosmeticExtensionPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int CosmeticExtensionPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp index 41dfe07f28..c9cfd654e9 100644 --- a/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp +++ b/src/Mod/TechDraw/App/CosmeticVertexPyImp.cpp @@ -52,7 +52,7 @@ PyObject *CosmeticVertexPy::PyMake(struct _typeobject *, PyObject *, PyObject *) // never create such objects with the constructor PyErr_SetString(PyExc_RuntimeError, "You cannot create an instance of the abstract class 'CosmeticVertex'."); - return 0; + return nullptr; } // constructor method @@ -64,18 +64,18 @@ int CosmeticVertexPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) PyObject* CosmeticVertexPy::clone(PyObject *args) { if (!PyArg_ParseTuple(args, "")) - return NULL; + return nullptr; TechDraw::CosmeticVertex* geom = this->getCosmeticVertexPtr(); // geom->dump("CEPYI::clone"); PyTypeObject* type = this->GetType(); - PyObject* cpy = 0; + PyObject* cpy = nullptr; // let the type object decide if (type->tp_new) - cpy = type->tp_new(type, this, 0); + cpy = type->tp_new(type, this, nullptr); if (!cpy) { PyErr_SetString(PyExc_TypeError, "failed to create clone of CosmeticVertex"); - return 0; + return nullptr; } TechDraw::CosmeticVertexPy* geompy = static_cast(cpy); @@ -92,18 +92,18 @@ PyObject* CosmeticVertexPy::clone(PyObject *args) PyObject* CosmeticVertexPy::copy(PyObject *args) { if (!PyArg_ParseTuple(args, "")) - return NULL; + return nullptr; TechDraw::CosmeticVertex* geom = this->getCosmeticVertexPtr(); // geom->dump("CEPYI::copy"); PyTypeObject* type = this->GetType(); - PyObject* cpy = 0; + PyObject* cpy = nullptr; // let the type object decide if (type->tp_new) - cpy = type->tp_new(type, this, 0); + cpy = type->tp_new(type, this, nullptr); if (!cpy) { PyErr_SetString(PyExc_TypeError, "failed to create copy of CosmeticVertex"); - return 0; + return nullptr; } TechDraw::CosmeticVertexPy* geompy = static_cast(cpy); @@ -238,7 +238,7 @@ void CosmeticVertexPy::setStyle(Py::Object arg) PyObject *CosmeticVertexPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int CosmeticVertexPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawDimHelper.cpp b/src/Mod/TechDraw/App/DrawDimHelper.cpp index dac2467fc4..1fcb751a82 100644 --- a/src/Mod/TechDraw/App/DrawDimHelper.cpp +++ b/src/Mod/TechDraw/App/DrawDimHelper.cpp @@ -343,7 +343,7 @@ DrawViewDimension* DrawDimHelper::makeDistDim(DrawViewPart* dvp, TechDraw::DrawPage* page = dvp->findParentPage(); std::string pageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; App::Document* doc = dvp->getDocument(); std::string dimName = doc->getUniqueObjectName("Dimension"); if (extent) { diff --git a/src/Mod/TechDraw/App/DrawGeomHatch.cpp b/src/Mod/TechDraw/App/DrawGeomHatch.cpp index 3e9664d79b..a08ea73845 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatch.cpp +++ b/src/Mod/TechDraw/App/DrawGeomHatch.cpp @@ -94,7 +94,7 @@ DrawGeomHatch::DrawGeomHatch(void) { static const char *vgroup = "GeomHatch"; - ADD_PROPERTY_TYPE(Source,(0),vgroup,(App::PropertyType)(App::Prop_None),"The View + Face to be crosshatched"); + ADD_PROPERTY_TYPE(Source,(nullptr),vgroup,(App::PropertyType)(App::Prop_None),"The View + Face to be crosshatched"); Source.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(FilePattern ,(prefGeomHatchFile()),vgroup,App::Prop_None,"The crosshatch pattern file for this area"); ADD_PROPERTY_TYPE(PatIncluded, (""), vgroup,App::Prop_None, diff --git a/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp b/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp index 5df0c78f25..fc2b268dc0 100644 --- a/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawGeomHatchPyImp.cpp @@ -42,7 +42,7 @@ std::string DrawGeomHatchPy::representation(void) const PyObject *DrawGeomHatchPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawGeomHatchPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp index 82cecded34..5a077359dc 100644 --- a/src/Mod/TechDraw/App/DrawHatch.cpp +++ b/src/Mod/TechDraw/App/DrawHatch.cpp @@ -59,7 +59,7 @@ DrawHatch::DrawHatch(void) { static const char *vgroup = "Hatch"; - ADD_PROPERTY_TYPE(Source, (0), vgroup, (App::PropertyType)(App::Prop_None), "The View + Face to be hatched"); + ADD_PROPERTY_TYPE(Source, (nullptr), vgroup, (App::PropertyType)(App::Prop_None), "The View + Face to be hatched"); Source.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(HatchPattern, (prefSvgHatch()), vgroup, App::Prop_None, "The hatch pattern file for this area"); ADD_PROPERTY_TYPE(SvgIncluded, (""), vgroup,App::Prop_None, diff --git a/src/Mod/TechDraw/App/DrawHatchPyImp.cpp b/src/Mod/TechDraw/App/DrawHatchPyImp.cpp index 010e2c4f79..5f0d4dca95 100644 --- a/src/Mod/TechDraw/App/DrawHatchPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawHatchPyImp.cpp @@ -44,7 +44,7 @@ std::string DrawHatchPy::representation(void) const PyObject *DrawHatchPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawHatchPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.cpp b/src/Mod/TechDraw/App/DrawLeaderLine.cpp index 6904e47f86..bd37419a1d 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLine.cpp +++ b/src/Mod/TechDraw/App/DrawLeaderLine.cpp @@ -72,7 +72,7 @@ DrawLeaderLine::DrawLeaderLine(void) { static const char *group = "Leader"; - ADD_PROPERTY_TYPE(LeaderParent,(0),group,(App::PropertyType)(App::Prop_None), + ADD_PROPERTY_TYPE(LeaderParent,(nullptr),group,(App::PropertyType)(App::Prop_None), "View to which this leader is attached"); LeaderParent.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(WayPoints,(Base::Vector3d()) ,group, App::Prop_None, diff --git a/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp b/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp index 067118688b..a47bed2c28 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawLeaderLinePyImp.cpp @@ -45,7 +45,7 @@ std::string DrawLeaderLinePy::representation(void) const PyObject *DrawLeaderLinePy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawLeaderLinePy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawPage.cpp b/src/Mod/TechDraw/App/DrawPage.cpp index 8e992f2cac..96d72bc84c 100644 --- a/src/Mod/TechDraw/App/DrawPage.cpp +++ b/src/Mod/TechDraw/App/DrawPage.cpp @@ -71,7 +71,7 @@ PROPERTY_SOURCE(TechDraw::DrawPage, App::DocumentObject) const char* DrawPage::ProjectionTypeEnums[] = { "First Angle", "Third Angle", - NULL }; + nullptr }; DrawPage::DrawPage(void) { @@ -81,9 +81,9 @@ DrawPage::DrawPage(void) ADD_PROPERTY_TYPE(KeepUpdated, (Preferences::keepPagesUpToDate()), group, (App::PropertyType)(App::Prop_Output), "Keep page in sync with model"); - ADD_PROPERTY_TYPE(Template, (0), group, (App::PropertyType)(App::Prop_None), "Attached Template"); + ADD_PROPERTY_TYPE(Template, (nullptr), group, (App::PropertyType)(App::Prop_None), "Attached Template"); Template.setScope(App::LinkScope::Global); - ADD_PROPERTY_TYPE(Views, (0), group, (App::PropertyType)(App::Prop_None), "Attached Views"); + ADD_PROPERTY_TYPE(Views, (nullptr), group, (App::PropertyType)(App::Prop_None), "Attached Views"); Views.setScope(App::LinkScope::Global); // Projection Properties @@ -136,7 +136,7 @@ void DrawPage::onChanged(const App::Property* prop) const std::vector &vals = Views.getValues(); for(std::vector::const_iterator it = vals.begin(); it < vals.end(); ++it) { TechDraw::DrawView *view = dynamic_cast(*it); - if (view != NULL && view->ScaleType.isValue("Page")) { + if (view != nullptr && view->ScaleType.isValue("Page")) { if(std::abs(view->Scale.getValue() - Scale.getValue()) > FLT_EPSILON) { view->Scale.setValue(Scale.getValue()); } @@ -148,7 +148,7 @@ void DrawPage::onChanged(const App::Property* prop) const std::vector &vals = Views.getValues(); for(std::vector::const_iterator it = vals.begin(); it < vals.end(); ++it) { TechDraw::DrawProjGroup *view = dynamic_cast(*it); - if (view != NULL && view->ProjectionType.isValue("Default")) { + if (view != nullptr && view->ProjectionType.isValue("Default")) { view->ProjectionType.touch(); } } @@ -193,7 +193,7 @@ PyObject *DrawPage::getPyObject(void) bool DrawPage::hasValidTemplate() const { - App::DocumentObject *obj = 0; + App::DocumentObject *obj = nullptr; obj = Template.getValue(); if(obj && obj->isDerivedFrom(TechDraw::DrawTemplate::getClassTypeId())) { @@ -209,7 +209,7 @@ bool DrawPage::hasValidTemplate() const double DrawPage::getPageWidth() const { - App::DocumentObject *obj = 0; + App::DocumentObject *obj = nullptr; obj = Template.getValue(); if( obj && obj->isDerivedFrom(TechDraw::DrawTemplate::getClassTypeId()) ) { @@ -222,7 +222,7 @@ double DrawPage::getPageWidth() const double DrawPage::getPageHeight() const { - App::DocumentObject *obj = 0; + App::DocumentObject *obj = nullptr; obj = Template.getValue(); if(obj) { diff --git a/src/Mod/TechDraw/App/DrawPagePyImp.cpp b/src/Mod/TechDraw/App/DrawPagePyImp.cpp index ef8879baa4..882ef4fb05 100644 --- a/src/Mod/TechDraw/App/DrawPagePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawPagePyImp.cpp @@ -107,26 +107,26 @@ PyObject* DrawPagePy::requestPaint(PyObject* args) PyObject* DrawPagePy::getPageWidth(PyObject *) { PyErr_SetString(PyExc_NotImplementedError, "Not yet implemented"); - return 0; + return nullptr; } // double getPageHeight() const; PyObject* DrawPagePy::getPageHeight(PyObject *) { PyErr_SetString(PyExc_NotImplementedError, "Not yet implemented"); - return 0; + return nullptr; } // const char* getPageOrientation() const; PyObject* DrawPagePy::getPageOrientation(PyObject *) { PyErr_SetString(PyExc_NotImplementedError, "Not yet implemented"); - return 0; + return nullptr; } PyObject *DrawPagePy::getCustomAttributes(const char* ) const { - return 0; + return nullptr; } int DrawPagePy::setCustomAttributes(const char* , PyObject *) diff --git a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp index f2a2ba7d7a..b4b175509b 100644 --- a/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawParametricTemplatePyImp.cpp @@ -41,7 +41,7 @@ std::string DrawParametricTemplatePy::representation(void) const PyObject *DrawParametricTemplatePy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawParametricTemplatePy::setCustomAttributes(const char* attr, PyObject* obj) @@ -72,7 +72,7 @@ PyObject* DrawParametricTemplatePy::drawLine(PyObject *args) double x2, y2; if (!PyArg_ParseTuple(args, "dddd", &x1, &y1, &x2, &y2)) - return 0; + return nullptr; getDrawParametricTemplatePtr()->drawLine(x1,y1,x2,y2); diff --git a/src/Mod/TechDraw/App/DrawProjGroup.cpp b/src/Mod/TechDraw/App/DrawProjGroup.cpp index c1f4a9d30f..91d52f2b76 100644 --- a/src/Mod/TechDraw/App/DrawProjGroup.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroup.cpp @@ -58,7 +58,7 @@ using namespace TechDraw; const char* DrawProjGroup::ProjectionTypeEnums[] = {"First Angle", "Third Angle", "Default", //Use Page setting - NULL}; + nullptr}; PROPERTY_SOURCE(TechDraw::DrawProjGroup, TechDraw::DrawViewCollection) @@ -72,12 +72,12 @@ DrawProjGroup::DrawProjGroup(void) : GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); bool autoDist = hGrp->GetBool("AutoDist",true); - ADD_PROPERTY_TYPE(Source, (0), group, App::Prop_None, "Shape to view"); + ADD_PROPERTY_TYPE(Source, (nullptr), group, App::Prop_None, "Shape to view"); Source.setScope(App::LinkScope::Global); Source.setAllowExternal(true); - ADD_PROPERTY_TYPE(XSource, (0), group,App::Prop_None, "External 3D Shape to view"); + ADD_PROPERTY_TYPE(XSource, (nullptr), group,App::Prop_None, "External 3D Shape to view"); - ADD_PROPERTY_TYPE(Anchor, (0), group, App::Prop_None, "The root view to align projections with"); + ADD_PROPERTY_TYPE(Anchor, (nullptr), group, App::Prop_None, "The root view to align projections with"); Anchor.setScope(App::LinkScope::Global); ProjectionType.setEnums(ProjectionTypeEnums); @@ -267,7 +267,7 @@ TechDraw::DrawPage * DrawProjGroup::getPage(void) const double DrawProjGroup::calculateAutomaticScale() const { TechDraw::DrawPage *page = getPage(); - if (page == NULL) + if (page == nullptr) throw Base::RuntimeError("No page is assigned to this feature"); DrawProjGroupItem *viewPtrs[10]; @@ -285,7 +285,7 @@ double DrawProjGroup::calculateAutomaticScale() const // C++ Standard says casting bool to int gives 0 or 1 int numVertSpaces = (viewPtrs[0] || viewPtrs[3] || viewPtrs[7]) + (viewPtrs[2] || viewPtrs[5] || viewPtrs[9]) + - (viewPtrs[6] != NULL); + (viewPtrs[6] != nullptr); int numHorizSpaces = (viewPtrs[0] || viewPtrs[1] || viewPtrs[2]) + (viewPtrs[7] || viewPtrs[8] || viewPtrs[9]); @@ -369,7 +369,7 @@ App::DocumentObject * DrawProjGroup::getProjObj(const char *viewProjType) const } } - return 0; + return nullptr; } DrawProjGroupItem* DrawProjGroup::getProjItem(const char *viewProjType) const @@ -1093,7 +1093,7 @@ App::Enumeration DrawProjGroup::usedProjectionType(void) App::Enumeration ret(ProjectionTypeEnums, ProjectionType.getValueAsString()); if (ret.isValue("Default")) { TechDraw::DrawPage * page = getPage(); - if ( page != NULL ) { + if ( page != nullptr ) { ret.setValue(page->ProjectionType.getValueAsString()); } } diff --git a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp index 57ed0d6538..8155af34ff 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItem.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroupItem.cpp @@ -55,7 +55,7 @@ const char* DrawProjGroupItem::TypeEnums[] = {"Front", "FrontTopRight", "FrontBottomLeft", "FrontBottomRight", - NULL}; + nullptr}; PROPERTY_SOURCE(TechDraw::DrawProjGroupItem, TechDraw::DrawViewPart) diff --git a/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp index 8a1ce86180..661ed5b08b 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroupItemPyImp.cpp @@ -26,7 +26,7 @@ PyObject* DrawProjGroupItemPy::autoPosition(PyObject *args) PyObject *DrawProjGroupItemPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawProjGroupItemPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp index b2b58f02bd..b61f33707c 100644 --- a/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawProjGroupPyImp.cpp @@ -119,7 +119,7 @@ PyObject* DrawProjGroupPy::getXYPosition(PyObject* args) PyObject *DrawProjGroupPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawProjGroupPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawRichAnno.cpp b/src/Mod/TechDraw/App/DrawRichAnno.cpp index 2a6a7e1a42..58d52f6091 100644 --- a/src/Mod/TechDraw/App/DrawRichAnno.cpp +++ b/src/Mod/TechDraw/App/DrawRichAnno.cpp @@ -47,7 +47,7 @@ DrawRichAnno::DrawRichAnno(void) { static const char *group = "Text Block"; - ADD_PROPERTY_TYPE(AnnoParent,(0),group,(App::PropertyType)(App::Prop_None), + ADD_PROPERTY_TYPE(AnnoParent,(nullptr),group,(App::PropertyType)(App::Prop_None), "Object to which this annontation is attached"); ADD_PROPERTY_TYPE(AnnoText, (""), group, App::Prop_None, "Annotation text"); ADD_PROPERTY_TYPE(ShowFrame, (true), group, App::Prop_None, "Outline rectangle on/off"); diff --git a/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp b/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp index 852eb5a0b2..3897903f88 100644 --- a/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawRichAnnoPyImp.cpp @@ -45,7 +45,7 @@ std::string DrawRichAnnoPy::representation(void) const PyObject *DrawRichAnnoPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawRichAnnoPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp index bb8b0ad59f..3a78e202f4 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplate.cpp @@ -69,7 +69,7 @@ DrawSVGTemplate::DrawSVGTemplate() // PageResult points to a temporary file in tmp/FreeCAD-AB-CD-EF-.../myTemplate.svg // which is really copy of original Template with EditableFields replaced // When restoring saved document, Template is redundant/incorrect/not present - PageResult is the correct info. -wf- - ADD_PROPERTY_TYPE(PageResult, (0), group, App::Prop_Output, "Current SVG code for template"); + ADD_PROPERTY_TYPE(PageResult, (nullptr), group, App::Prop_Output, "Current SVG code for template"); ADD_PROPERTY_TYPE(Template, (""), group, App::Prop_Transient, "Template for the page"); //sb TemplateFileName??? // Width and Height properties shouldn't be set by the user diff --git a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp index 5823e3af7e..15bd483952 100644 --- a/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawSVGTemplatePyImp.cpp @@ -38,7 +38,7 @@ std::string DrawSVGTemplatePy::representation(void) const PyObject *DrawSVGTemplatePy::getCustomAttributes(const char* ) const { - return 0; + return nullptr; } int DrawSVGTemplatePy::setCustomAttributes(const char* attr, PyObject* obj) diff --git a/src/Mod/TechDraw/App/DrawTemplate.cpp b/src/Mod/TechDraw/App/DrawTemplate.cpp index 0b980085db..bbd17b98ce 100644 --- a/src/Mod/TechDraw/App/DrawTemplate.cpp +++ b/src/Mod/TechDraw/App/DrawTemplate.cpp @@ -48,7 +48,7 @@ PROPERTY_SOURCE(TechDraw::DrawTemplate, App::DocumentObject) const char* DrawTemplate::OrientationEnums[]= {"Portrait", "Landscape", - NULL}; + nullptr}; @@ -111,7 +111,7 @@ void DrawTemplate::onChanged(const App::Property* prop) App::DocumentObjectExecReturn *DrawTemplate::execute(void) { - DrawPage *page = 0; + DrawPage *page = nullptr; std::vector parent = getInList(); for (std::vector::iterator it = parent.begin(); it != parent.end(); ++it) { if ((*it)->getTypeId().isDerivedFrom(DrawPage::getClassTypeId())) { diff --git a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp index e3a0e53844..bdc53afe9a 100644 --- a/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawTemplatePyImp.cpp @@ -41,7 +41,7 @@ std::string DrawTemplatePy::representation(void) const PyObject *DrawTemplatePy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawTemplatePy::setCustomAttributes(const char* attr, PyObject* obj) diff --git a/src/Mod/TechDraw/App/DrawTile.cpp b/src/Mod/TechDraw/App/DrawTile.cpp index e31e6f0e34..f492cad0c7 100644 --- a/src/Mod/TechDraw/App/DrawTile.cpp +++ b/src/Mod/TechDraw/App/DrawTile.cpp @@ -47,7 +47,7 @@ DrawTile::DrawTile(void) { static const char *group = "Tile"; - ADD_PROPERTY_TYPE(TileParent,(0),group,(App::PropertyType)(App::Prop_None), + ADD_PROPERTY_TYPE(TileParent,(nullptr),group,(App::PropertyType)(App::Prop_None), "Object to which this tile is attached"); ADD_PROPERTY_TYPE(TileRow, (0), group, App::Prop_None, "Row in parent object\n 0 for arrow side, -1 for other side"); ADD_PROPERTY_TYPE(TileColumn, (0), group, App::Prop_None, "Column in parent object"); diff --git a/src/Mod/TechDraw/App/DrawTilePyImp.cpp b/src/Mod/TechDraw/App/DrawTilePyImp.cpp index 260e63dd55..a5048328d3 100644 --- a/src/Mod/TechDraw/App/DrawTilePyImp.cpp +++ b/src/Mod/TechDraw/App/DrawTilePyImp.cpp @@ -45,7 +45,7 @@ std::string DrawTilePy::representation(void) const PyObject *DrawTilePy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawTilePy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawTileWeld.cpp b/src/Mod/TechDraw/App/DrawTileWeld.cpp index 8d737d002e..2982fe3fa0 100644 --- a/src/Mod/TechDraw/App/DrawTileWeld.cpp +++ b/src/Mod/TechDraw/App/DrawTileWeld.cpp @@ -54,8 +54,8 @@ DrawTileWeld::DrawTileWeld(void) ADD_PROPERTY_TYPE(LeftText,(""),group,(App::PropertyType)(App::Prop_None), "Text before symbol"); - ADD_PROPERTY_TYPE(RightText, (0), group, App::Prop_None, "Text after symbol"); - ADD_PROPERTY_TYPE(CenterText, (0), group, App::Prop_None, "Text above/below symbol"); + ADD_PROPERTY_TYPE(RightText, (nullptr), group, App::Prop_None, "Text after symbol"); + ADD_PROPERTY_TYPE(CenterText, (nullptr), group, App::Prop_None, "Text above/below symbol"); ADD_PROPERTY_TYPE(SymbolFile, (prefSymbol()), group, App::Prop_None, "Symbol File"); ADD_PROPERTY_TYPE(SymbolIncluded, (""), group, App::Prop_None, "Embedded Symbol. System use only."); // n/a to end users diff --git a/src/Mod/TechDraw/App/DrawTileWeldPyImp.cpp b/src/Mod/TechDraw/App/DrawTileWeldPyImp.cpp index 2fd5fddca4..7c44f814b7 100644 --- a/src/Mod/TechDraw/App/DrawTileWeldPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawTileWeldPyImp.cpp @@ -45,7 +45,7 @@ std::string DrawTileWeldPy::representation(void) const PyObject *DrawTileWeldPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawTileWeldPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp index e81c394a7f..df9552a64d 100644 --- a/src/Mod/TechDraw/App/DrawView.cpp +++ b/src/Mod/TechDraw/App/DrawView.cpp @@ -64,7 +64,7 @@ using namespace TechDraw; const char* DrawView::ScaleTypeEnums[]= {"Page", "Automatic", "Custom", - NULL}; + nullptr}; App::PropertyFloatConstraint::Constraints DrawView::scaleRange = {Precision::Confusion(), std::numeric_limits::max(), (0.1)}; // increment by 0.1 @@ -293,8 +293,8 @@ int DrawView::countParentPages() const DrawPage* DrawView::findParentPage() const { // Get Feature Page - DrawPage *page = 0; - DrawViewCollection *collection = 0; + DrawPage *page = nullptr; + DrawViewCollection *collection = nullptr; std::vector parent = getInList(); for (std::vector::iterator it = parent.begin(); it != parent.end(); ++it) { if ((*it)->getTypeId().isDerivedFrom(DrawPage::getClassTypeId())) { @@ -318,8 +318,8 @@ std::vector DrawView::findAllParentPages() const { // Get Feature Page std::vector result; - DrawPage *page = 0; - DrawViewCollection *collection = 0; + DrawPage *page = nullptr; + DrawViewCollection *collection = nullptr; std::vector parent = getInList(); for (std::vector::iterator it = parent.begin(); it != parent.end(); ++it) { if ((*it)->getTypeId().isDerivedFrom(DrawPage::getClassTypeId())) { diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp index 6e194d37e2..45750502e5 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp @@ -53,7 +53,7 @@ const char* DrawViewAnnotation::TextStyleEnums[]= {"Normal", "Bold", "Italic", "Bold-Italic", - NULL}; + nullptr}; DrawViewAnnotation::DrawViewAnnotation(void) { diff --git a/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp b/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp index fcaacf7e40..3f97b734d4 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewAnnotationPyImp.cpp @@ -49,7 +49,7 @@ std::string DrawViewAnnotationPy::representation(void) const PyObject *DrawViewAnnotationPy::getCustomAttributes(const char* ) const { - return 0; + return nullptr; } int DrawViewAnnotationPy::setCustomAttributes(const char* , PyObject *) diff --git a/src/Mod/TechDraw/App/DrawViewArch.cpp b/src/Mod/TechDraw/App/DrawViewArch.cpp index b4d00d68b8..19cf844ce6 100644 --- a/src/Mod/TechDraw/App/DrawViewArch.cpp +++ b/src/Mod/TechDraw/App/DrawViewArch.cpp @@ -50,13 +50,13 @@ const char* DrawViewArch::RenderModeEnums[]= {"Wireframe", "Solid", "Coin", "Coin mono", - NULL}; + nullptr}; DrawViewArch::DrawViewArch(void) { static const char *group = "Arch view"; - ADD_PROPERTY_TYPE(Source ,(0),group,App::Prop_None,"SectionPlane or BuildingPart object for this view"); + ADD_PROPERTY_TYPE(Source ,(nullptr),group,App::Prop_None,"SectionPlane or BuildingPart object for this view"); Source.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(AllOn ,(false),group,App::Prop_None,"If hidden objects must be shown or not"); RenderMode.setEnums(RenderModeEnums); diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.cpp b/src/Mod/TechDraw/App/DrawViewBalloon.cpp index 0bad648181..fc0581e3dd 100644 --- a/src/Mod/TechDraw/App/DrawViewBalloon.cpp +++ b/src/Mod/TechDraw/App/DrawViewBalloon.cpp @@ -88,12 +88,12 @@ const char* DrawViewBalloon::balloonTypeEnums[]= {"Circular", "Square", "Rectangle", "Line", - NULL}; + nullptr}; DrawViewBalloon::DrawViewBalloon(void) { ADD_PROPERTY_TYPE(Text, (""), "", App::Prop_None, "The text to be displayed"); - ADD_PROPERTY_TYPE(SourceView, (0), "", (App::PropertyType)(App::Prop_None), "Source view for balloon"); + ADD_PROPERTY_TYPE(SourceView, (nullptr), "", (App::PropertyType)(App::Prop_None), "Source view for balloon"); ADD_PROPERTY_TYPE(OriginX, (0), "", (App::PropertyType)(App::Prop_None), "Balloon origin x"); ADD_PROPERTY_TYPE(OriginY, (0), "", (App::PropertyType)(App::Prop_None), "Balloon origin y"); diff --git a/src/Mod/TechDraw/App/DrawViewClip.cpp b/src/Mod/TechDraw/App/DrawViewClip.cpp index 1e44c9418e..d9f0fdabe9 100644 --- a/src/Mod/TechDraw/App/DrawViewClip.cpp +++ b/src/Mod/TechDraw/App/DrawViewClip.cpp @@ -53,7 +53,7 @@ DrawViewClip::DrawViewClip(void) ADD_PROPERTY_TYPE(Height ,(100),group,App::Prop_None,"The height of the view area of this clip"); ADD_PROPERTY_TYPE(Width ,(100),group,App::Prop_None,"The width of the view area of this clip"); ADD_PROPERTY_TYPE(ShowFrame ,(0) ,group,App::Prop_None,"Specifies if the clip frame appears on the page or not"); - ADD_PROPERTY_TYPE(Views ,(0) ,group,App::Prop_None,"The Views in this Clip group"); + ADD_PROPERTY_TYPE(Views ,(nullptr) ,group,App::Prop_None,"The Views in this Clip group"); Views.setScope(App::LinkScope::Global); // hide N/A properties diff --git a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp index 324bb5b55f..79f7e26f52 100644 --- a/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewClipPyImp.cpp @@ -49,7 +49,7 @@ PyObject* DrawViewClipPy::addView(PyObject* args) if (!PyArg_ParseTuple(args, "O!", &(App::DocumentObjectPy::Type), &pcDocObj)) { Base::Console().Error("Error: DrawViewClipPy::addView - Bad Arg - not DocumentObject\n"); - return NULL; + return nullptr; //TODO: sb PyErr?? //PyErr_SetString(PyExc_TypeError,"addView expects a DrawView"); //return -1; @@ -73,7 +73,7 @@ PyObject* DrawViewClipPy::removeView(PyObject* args) if (!PyArg_ParseTuple(args, "O!", &(App::DocumentObjectPy::Type), &pcDocObj)) { Base::Console().Error("Error: DrawViewClipPy::removeView - Bad Arg - not DocumentObject\n"); - return NULL; + return nullptr; //TODO: sb PyErr?? //PyErr_SetString(PyExc_TypeError,"removeView expects a DrawView"); //return -1; @@ -111,7 +111,7 @@ PyObject* DrawViewClipPy::getChildViewNames(PyObject* args) PyObject *DrawViewClipPy::getCustomAttributes(const char* ) const { - return 0; + return nullptr; } int DrawViewClipPy::setCustomAttributes(const char* , PyObject *) diff --git a/src/Mod/TechDraw/App/DrawViewCollection.cpp b/src/Mod/TechDraw/App/DrawViewCollection.cpp index eb10970211..9a93f747be 100644 --- a/src/Mod/TechDraw/App/DrawViewCollection.cpp +++ b/src/Mod/TechDraw/App/DrawViewCollection.cpp @@ -47,7 +47,7 @@ DrawViewCollection::DrawViewCollection() { nowUnsetting = false; static const char *group = "Collection"; - ADD_PROPERTY_TYPE(Views ,(0), group, App::Prop_None,"Collection Views"); + ADD_PROPERTY_TYPE(Views ,(nullptr), group, App::Prop_None,"Collection Views"); Views.setScope(App::LinkScope::Global); } diff --git a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp index 1827abfb56..cfbcbf3093 100644 --- a/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewCollectionPyImp.cpp @@ -74,7 +74,7 @@ PyObject* DrawViewCollectionPy::removeView(PyObject* args) PyObject *DrawViewCollectionPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawViewCollectionPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawViewDetail.cpp b/src/Mod/TechDraw/App/DrawViewDetail.cpp index f71234960a..35e68b0e33 100644 --- a/src/Mod/TechDraw/App/DrawViewDetail.cpp +++ b/src/Mod/TechDraw/App/DrawViewDetail.cpp @@ -106,7 +106,7 @@ DrawViewDetail::DrawViewDetail() { static const char *dgroup = "Detail"; - ADD_PROPERTY_TYPE(BaseView ,(0),dgroup,App::Prop_None,"2D View source for this Section"); + ADD_PROPERTY_TYPE(BaseView ,(nullptr),dgroup,App::Prop_None,"2D View source for this Section"); BaseView.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(AnchorPoint ,(0,0,0) ,dgroup,App::Prop_None,"Location of detail in BaseView"); ADD_PROPERTY_TYPE(Radius,(10.0),dgroup, App::Prop_None, "Size of detail area"); diff --git a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp index 23f0e39a0c..db71d5b27c 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtent.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimExtent.cpp @@ -68,9 +68,9 @@ DrawViewDimExtent::DrawViewDimExtent(void) //Cosmetic End points are stored in DVD::References2d App::PropertyLinkSubList Source3d; //Part::Feature & SubElements TBI - ADD_PROPERTY_TYPE(Source,(0,0),"",(App::PropertyType)(App::Prop_Output),"View (Edges) to dimension"); + ADD_PROPERTY_TYPE(Source,(nullptr,nullptr),"",(App::PropertyType)(App::Prop_Output),"View (Edges) to dimension"); Source.setScope(App::LinkScope::Global); - ADD_PROPERTY_TYPE(Source3d,(0,0),"",(App::PropertyType)(App::Prop_Output),"View (Edges) to dimension"); //TBI + ADD_PROPERTY_TYPE(Source3d,(nullptr,nullptr),"",(App::PropertyType)(App::Prop_Output),"View (Edges) to dimension"); //TBI Source3d.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(DirExtent ,(0),"",App::Prop_Output,"Horizontal / Vertical"); diff --git a/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp index e72589e2d4..4603b424d4 100644 --- a/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimExtentPyImp.cpp @@ -53,7 +53,7 @@ PyObject* DrawViewDimExtentPy::tbd(PyObject* args) PyObject *DrawViewDimExtentPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawViewDimExtentPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index be56256e21..fde86c1ba4 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -92,11 +92,11 @@ const char* DrawViewDimension::TypeEnums[]= {"Distance", "Diameter", "Angle", "Angle3Pt", - NULL}; + nullptr}; const char* DrawViewDimension::MeasureTypeEnums[]= {"True", "Projected", - NULL}; + nullptr}; // constraint to set the step size to 0.1 static const App::PropertyQuantityConstraint::Constraints ToleranceConstraint = { -DBL_MAX, DBL_MAX, 0.1 }; @@ -105,9 +105,9 @@ static const App::PropertyQuantityConstraint::Constraints PositiveConstraint = { DrawViewDimension::DrawViewDimension(void) { - ADD_PROPERTY_TYPE(References2D, (0,0), "", (App::Prop_None), "Projected Geometry References"); + ADD_PROPERTY_TYPE(References2D, (nullptr,nullptr), "", (App::Prop_None), "Projected Geometry References"); References2D.setScope(App::LinkScope::Global); - ADD_PROPERTY_TYPE(References3D, (0,0), "", (App::Prop_None), "3D Geometry References"); + ADD_PROPERTY_TYPE(References3D, (nullptr,nullptr), "", (App::Prop_None), "3D Geometry References"); References3D.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(FormatSpec, (getDefaultFormatSpec()), "Format", App::Prop_Output,"Dimension format"); @@ -175,7 +175,7 @@ DrawViewDimension::DrawViewDimension(void) DrawViewDimension::~DrawViewDimension() { delete measurement; - measurement = 0; + measurement = nullptr; } void DrawViewDimension::onChanged(const App::Property* prop) diff --git a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp index 44ef7e7092..80aed293cd 100644 --- a/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimensionPyImp.cpp @@ -117,7 +117,7 @@ PyObject* DrawViewDimensionPy::getArrowPositions(PyObject* args) } PyObject *DrawViewDimensionPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawViewDimensionPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawViewDraft.cpp b/src/Mod/TechDraw/App/DrawViewDraft.cpp index ff7341d3ab..1a3b1bfb06 100644 --- a/src/Mod/TechDraw/App/DrawViewDraft.cpp +++ b/src/Mod/TechDraw/App/DrawViewDraft.cpp @@ -51,7 +51,7 @@ DrawViewDraft::DrawViewDraft(void) { static const char *group = "Draft view"; - ADD_PROPERTY_TYPE(Source ,(0),group,App::Prop_None,"Draft object for this view"); + ADD_PROPERTY_TYPE(Source ,(nullptr),group,App::Prop_None,"Draft object for this view"); Source.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(LineWidth,(0.35),group,App::Prop_None,"Line width of this view. If Override Style is false, this value multiplies the object line width"); ADD_PROPERTY_TYPE(FontSize,(12.0),group,App::Prop_None,"Text size for this view"); diff --git a/src/Mod/TechDraw/App/DrawViewMulti.cpp b/src/Mod/TechDraw/App/DrawViewMulti.cpp index 2eecd5d0b1..6b407f54da 100644 --- a/src/Mod/TechDraw/App/DrawViewMulti.cpp +++ b/src/Mod/TechDraw/App/DrawViewMulti.cpp @@ -79,7 +79,7 @@ DrawViewMulti::DrawViewMulti() static const char *group = "Projection"; //properties that affect Geometry - ADD_PROPERTY_TYPE(Sources ,(0),group,App::Prop_None,"3D Shapes to view"); + ADD_PROPERTY_TYPE(Sources ,(nullptr),group,App::Prop_None,"3D Shapes to view"); Sources.setScope(App::LinkScope::Global); //Source is replaced by Sources in Multi Source.setStatus(App::Property::ReadOnly,true); diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index 92d683b053..04cedb1320 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -127,7 +127,7 @@ PROPERTY_SOURCE_WITH_EXTENSIONS(TechDraw::DrawViewPart, TechDraw::DrawView) DrawViewPart::DrawViewPart(void) : - geometryObject(0) + geometryObject(nullptr) { static const char *group = "Projection"; static const char *sgroup = "HLR Parameters"; @@ -142,10 +142,10 @@ DrawViewPart::DrawViewPart(void) : double defDist = hGrp->GetFloat("FocusDistance",100.0); //properties that affect Geometry - ADD_PROPERTY_TYPE(Source ,(0),group,App::Prop_None,"3D Shape to view"); + ADD_PROPERTY_TYPE(Source ,(nullptr),group,App::Prop_None,"3D Shape to view"); Source.setScope(App::LinkScope::Global); Source.setAllowExternal(true); - ADD_PROPERTY_TYPE(XSource ,(0),group,App::Prop_None,"External 3D Shape to view"); + ADD_PROPERTY_TYPE(XSource ,(nullptr),group,App::Prop_None,"External 3D Shape to view"); ADD_PROPERTY_TYPE(Direction ,(0.0,-1.0,0.0), @@ -724,11 +724,11 @@ TechDraw::BaseGeomPtr DrawViewPart::getGeomByIndex(int idx) const const std::vector &geoms = getEdgeGeometry(); if (geoms.empty()) { Base::Console().Log("INFO - getGeomByIndex(%d) - no Edge Geometry. Probably restoring?\n",idx); - return NULL; + return nullptr; } if ((unsigned)idx >= geoms.size()) { Base::Console().Log("INFO - getGeomByIndex(%d) - invalid index\n",idx); - return NULL; + return nullptr; } return geoms.at(idx); } @@ -739,11 +739,11 @@ TechDraw::VertexPtr DrawViewPart::getProjVertexByIndex(int idx) const const std::vector &geoms = getVertexGeometry(); if (geoms.empty()) { Base::Console().Log("INFO - getProjVertexByIndex(%d) - no Vertex Geometry. Probably restoring?\n",idx); - return NULL; + return nullptr; } if ((unsigned)idx >= geoms.size()) { Base::Console().Log("INFO - getProjVertexByIndex(%d) - invalid index\n",idx); - return NULL; + return nullptr; } return geoms.at(idx); } diff --git a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp index b4033dd0c1..4c2e67e39e 100644 --- a/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewPartPyImp.cpp @@ -788,7 +788,7 @@ PyObject* DrawViewPartPy::getVertexBySelection(PyObject *args) //============================================================================== PyObject *DrawViewPartPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawViewPartPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawViewPyImp.cpp b/src/Mod/TechDraw/App/DrawViewPyImp.cpp index 905e427168..74578f3845 100644 --- a/src/Mod/TechDraw/App/DrawViewPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewPyImp.cpp @@ -39,7 +39,7 @@ std::string DrawViewPy::representation(void) const PyObject *DrawViewPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawViewPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index 5730b9f41f..8787615754 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -100,13 +100,13 @@ const char* DrawViewSection::SectionDirEnums[]= {"Right", "Left", "Up", "Down", - NULL}; + nullptr}; const char* DrawViewSection::CutSurfaceEnums[]= {"Hide", "Color", "SvgHatch", "PatHatch", - NULL}; + nullptr}; //=========================================================================== @@ -121,7 +121,7 @@ DrawViewSection::DrawViewSection() static const char *fgroup = "Cut Surface Format"; ADD_PROPERTY_TYPE(SectionSymbol ,(""),sgroup,App::Prop_None,"The identifier for this section"); - ADD_PROPERTY_TYPE(BaseView ,(0),sgroup,App::Prop_None,"2D View source for this Section"); + ADD_PROPERTY_TYPE(BaseView ,(nullptr),sgroup,App::Prop_None,"2D View source for this Section"); BaseView.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(SectionNormal ,(0,0,1.0) ,sgroup,App::Prop_None, "Section Plane normal direction"); //direction of extrusion of cutting prism diff --git a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp index af55c417d9..68202f2f2d 100644 --- a/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp +++ b/src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp @@ -61,7 +61,7 @@ DrawViewSpreadsheet::DrawViewSpreadsheet(void) { static const char *vgroup = "Spreadsheet"; - ADD_PROPERTY_TYPE(Source ,(0),vgroup,App::Prop_None,"Spreadsheet to view"); + ADD_PROPERTY_TYPE(Source ,(nullptr),vgroup,App::Prop_None,"Spreadsheet to view"); Source.setScope(App::LinkScope::Global); ADD_PROPERTY_TYPE(CellStart ,("A1"),vgroup,App::Prop_None,"The top left cell of the range to display"); ADD_PROPERTY_TYPE(CellEnd ,("B2"),vgroup,App::Prop_None,"The bottom right cell of the range to display"); diff --git a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp index 8b43e20665..7d887a5cde 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbolPyImp.cpp @@ -71,7 +71,7 @@ PyObject* DrawViewSymbolPy::dumpSymbol(PyObject *args) PyObject *DrawViewSymbolPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawViewSymbolPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp index 26ed21e046..89b64ea559 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawWeldSymbol.cpp @@ -53,7 +53,7 @@ DrawWeldSymbol::DrawWeldSymbol(void) { static const char *group = "Weld Symbol"; - ADD_PROPERTY_TYPE(Leader,(0),group,(App::PropertyType)(App::Prop_None), "Parent Leader"); + ADD_PROPERTY_TYPE(Leader,(nullptr),group,(App::PropertyType)(App::Prop_None), "Parent Leader"); ADD_PROPERTY_TYPE(AllAround, (false), group, App::Prop_None, "All Around Symbol on/off"); ADD_PROPERTY_TYPE(FieldWeld, (false), group, App::Prop_None, "Field Weld Symbol on/off"); ADD_PROPERTY_TYPE(AlternatingWeld, (false), group, App::Prop_None, "Alternating Weld true/false"); diff --git a/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp b/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp index 15900e2fd4..4a4445d5f2 100644 --- a/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp +++ b/src/Mod/TechDraw/App/DrawWeldSymbolPyImp.cpp @@ -58,7 +58,7 @@ std::string DrawWeldSymbolPy::representation(void) const PyObject *DrawWeldSymbolPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int DrawWeldSymbolPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/FeatureProjection.cpp b/src/Mod/TechDraw/App/FeatureProjection.cpp index cdd150d796..a1a19e55c3 100644 --- a/src/Mod/TechDraw/App/FeatureProjection.cpp +++ b/src/Mod/TechDraw/App/FeatureProjection.cpp @@ -50,7 +50,7 @@ PROPERTY_SOURCE(TechDraw::FeatureProjection, Part::Feature) FeatureProjection::FeatureProjection() { static const char *group = "Projection"; - ADD_PROPERTY_TYPE(Source ,(0),group,App::Prop_None,"Shape to project"); + ADD_PROPERTY_TYPE(Source ,(nullptr),group,App::Prop_None,"Shape to project"); ADD_PROPERTY_TYPE(Direction ,(Base::Vector3d(0,0,1)),group,App::Prop_None,"Projection direction"); ADD_PROPERTY_TYPE(VCompound ,(true),group,App::Prop_None,"Projection parameter"); ADD_PROPERTY_TYPE(Rg1LineVCompound ,(true),group,App::Prop_None,"Projection parameter"); diff --git a/src/Mod/TechDraw/App/GeomFormatPyImp.cpp b/src/Mod/TechDraw/App/GeomFormatPyImp.cpp index 4a0d8f167b..0e7520d2ad 100644 --- a/src/Mod/TechDraw/App/GeomFormatPyImp.cpp +++ b/src/Mod/TechDraw/App/GeomFormatPyImp.cpp @@ -44,7 +44,7 @@ PyObject *GeomFormatPy::PyMake(struct _typeobject *, PyObject *, PyObject *) // // never create such objects with the constructor PyErr_SetString(PyExc_RuntimeError, "You cannot create an instance of the abstract class 'GeomFormat'."); - return 0; + return nullptr; } // constructor method @@ -56,17 +56,17 @@ int GeomFormatPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) PyObject* GeomFormatPy::clone(PyObject *args) { if (!PyArg_ParseTuple(args, "")) - return NULL; + return nullptr; TechDraw::GeomFormat* geom = this->getGeomFormatPtr(); PyTypeObject* type = this->GetType(); - PyObject* cpy = 0; + PyObject* cpy = nullptr; // let the type object decide if (type->tp_new) - cpy = type->tp_new(type, this, 0); + cpy = type->tp_new(type, this, nullptr); if (!cpy) { PyErr_SetString(PyExc_TypeError, "failed to create clone of GeomFormat"); - return 0; + return nullptr; } TechDraw::GeomFormatPy* geompy = static_cast(cpy); @@ -83,17 +83,17 @@ PyObject* GeomFormatPy::clone(PyObject *args) PyObject* GeomFormatPy::copy(PyObject *args) { if (!PyArg_ParseTuple(args, "")) - return NULL; + return nullptr; TechDraw::GeomFormat* geom = this->getGeomFormatPtr(); PyTypeObject* type = this->GetType(); - PyObject* cpy = 0; + PyObject* cpy = nullptr; // let the type object decide if (type->tp_new) - cpy = type->tp_new(type, this, 0); + cpy = type->tp_new(type, this, nullptr); if (!cpy) { PyErr_SetString(PyExc_TypeError, "failed to create copy of GeomFormat"); - return 0; + return nullptr; } TechDraw::GeomFormatPy* geompy = static_cast(cpy); @@ -115,7 +115,7 @@ Py::String GeomFormatPy::getTag(void) const PyObject *GeomFormatPy::getCustomAttributes(const char* /*attr*/) const { - return 0; + return nullptr; } int GeomFormatPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp index b81e6741e0..5c5663d916 100644 --- a/src/Mod/TechDraw/App/Geometry.cpp +++ b/src/Mod/TechDraw/App/Geometry.cpp @@ -1688,7 +1688,7 @@ void Vertex::createNewTag() static bool seeded = false; if (!seeded) { - ran.seed(static_cast(std::time(0))); + ran.seed(static_cast(std::time(nullptr))); seeded = true; } static boost::uuids::basic_random_generator gen(&ran); diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp index d078fbd0e5..b4e32a7904 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp @@ -102,7 +102,7 @@ PyMOD_INIT_FUNC(TechDrawGui) { if (!Gui::Application::Instance) { PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application."); - PyMOD_Return(0); + PyMOD_Return(nullptr); } // load dependent module try { @@ -110,7 +110,7 @@ PyMOD_INIT_FUNC(TechDrawGui) } catch(const Base::Exception& e) { PyErr_SetString(PyExc_ImportError, e.what()); - PyMOD_Return(0); + PyMOD_Return(nullptr); } PyObject* mod = TechDrawGui::initModule(); diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp index bd4035cd99..02b99fbc1c 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp @@ -174,9 +174,9 @@ private: PyMem_Free(name); try { - App::DocumentObject* obj = 0; - Gui::ViewProvider* vp = 0; - MDIViewPage* mdi = 0; + App::DocumentObject* obj = nullptr; + Gui::ViewProvider* vp = nullptr; + MDIViewPage* mdi = nullptr; if (PyObject_TypeCheck(pageObj, &(App::DocumentObjectPy::Type))) { obj = static_cast(pageObj)->getDocumentObjectPtr(); vp = Gui::Application::Instance->getViewProvider(obj); @@ -220,9 +220,9 @@ private: PyMem_Free(name); try { - App::DocumentObject* obj = 0; - Gui::ViewProvider* vp = 0; - MDIViewPage* mdi = 0; + App::DocumentObject* obj = nullptr; + Gui::ViewProvider* vp = nullptr; + MDIViewPage* mdi = nullptr; if (PyObject_TypeCheck(pageObj, &(App::DocumentObjectPy::Type))) { obj = static_cast(pageObj)->getDocumentObjectPtr(); vp = Gui::Application::Instance->getViewProvider(obj); @@ -326,8 +326,8 @@ private: } try { - App::DocumentObject* obj = 0; - Gui::ViewProvider* vp = 0; + App::DocumentObject* obj = nullptr; + Gui::ViewProvider* vp = nullptr; QGIView* qgiv = nullptr; if (PyObject_TypeCheck(viewPy, &(TechDraw::DrawViewPy::Type))) { obj = static_cast(viewPy)->getDocumentObjectPtr(); diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index 4b1bdbc722..2cfe2c82e2 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -322,7 +322,7 @@ void CmdTechDrawView::activated(int iMsg) std::string faceName; int resolve = 1; //mystery bool single = false; //mystery - auto selection = getSelection().getSelectionEx(0, + auto selection = getSelection().getSelectionEx(nullptr, App::DocumentObject::getClassTypeId(), resolve, single); @@ -601,7 +601,7 @@ void CmdTechDrawProjectionGroup::activated(int iMsg) std::string faceName; int resolve = 1; //mystery bool single = false; //mystery - auto selection = getSelection().getSelectionEx(0, + auto selection = getSelection().getSelectionEx(nullptr, App::DocumentObject::getClassTypeId(), resolve, single); @@ -976,8 +976,8 @@ void CmdTechDrawClipGroupAdd::activated(int iMsg) return; } - TechDraw::DrawViewClip* clip = 0; - TechDraw::DrawView* view = 0; + TechDraw::DrawViewClip* clip = nullptr; + TechDraw::DrawView* view = nullptr; std::vector::iterator itSel = selection.begin(); for (; itSel != selection.end(); itSel++) { if ((*itSel).getObject()->isDerivedFrom(TechDraw::DrawViewClip::getClassTypeId())) { diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index fc7ab8b4b2..c4b8930ffd 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -268,7 +268,7 @@ void CmdTechDrawRadiusDimension::activated(int iMsg) return; std::vector selection = getSelection().getSelectionEx(); - TechDraw::DrawViewPart * objFeat = 0; + TechDraw::DrawViewPart * objFeat = nullptr; std::vector SubNames; std::vector::iterator itSel = selection.begin(); @@ -281,7 +281,7 @@ void CmdTechDrawRadiusDimension::activated(int iMsg) TechDraw::DrawPage* page = objFeat->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; std::string FeatName = getUniqueObjectName("Dimension"); std::vector objs; @@ -390,7 +390,7 @@ void CmdTechDrawDiameterDimension::activated(int iMsg) return; std::vector selection = getSelection().getSelectionEx(); - TechDraw::DrawViewPart * objFeat = 0; + TechDraw::DrawViewPart * objFeat = nullptr; std::vector SubNames; std::vector::iterator itSel = selection.begin(); @@ -403,7 +403,7 @@ void CmdTechDrawDiameterDimension::activated(int iMsg) TechDraw::DrawPage* page = objFeat->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; std::string FeatName = getUniqueObjectName("Dimension"); std::vector objs; @@ -511,7 +511,7 @@ void CmdTechDrawLengthDimension::activated(int iMsg) return; std::vector selection = getSelection().getSelectionEx(); - TechDraw::DrawViewPart * objFeat = 0; + TechDraw::DrawViewPart * objFeat = nullptr; std::vector SubNames; std::vector::iterator itSel = selection.begin(); @@ -524,7 +524,7 @@ void CmdTechDrawLengthDimension::activated(int iMsg) TechDraw::DrawPage* page = objFeat->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; std::string FeatName = getUniqueObjectName("Dimension"); std::string dimType; @@ -614,7 +614,7 @@ void CmdTechDrawHorizontalDimension::activated(int iMsg) return; std::vector selection = getSelection().getSelectionEx(); - TechDraw::DrawViewPart * objFeat = 0; + TechDraw::DrawViewPart * objFeat = nullptr; std::vector SubNames; std::vector::iterator itSel = selection.begin(); @@ -627,7 +627,7 @@ void CmdTechDrawHorizontalDimension::activated(int iMsg) TechDraw::DrawPage* page = objFeat->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; std::string FeatName = getUniqueObjectName("Dimension"); std::string dimType; @@ -717,7 +717,7 @@ void CmdTechDrawVerticalDimension::activated(int iMsg) return; std::vector selection = getSelection().getSelectionEx(); - TechDraw::DrawViewPart * objFeat = 0; + TechDraw::DrawViewPart * objFeat = nullptr; std::vector SubNames; std::vector::iterator itSel = selection.begin(); @@ -730,7 +730,7 @@ void CmdTechDrawVerticalDimension::activated(int iMsg) TechDraw::DrawPage* page = objFeat->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; std::string FeatName = getUniqueObjectName("Dimension"); std::string dimType; @@ -818,7 +818,7 @@ void CmdTechDrawAngleDimension::activated(int iMsg) return; std::vector selection = getSelection().getSelectionEx(); - TechDraw::DrawViewPart * objFeat = 0; + TechDraw::DrawViewPart * objFeat = nullptr; std::vector SubNames; std::vector::iterator itSel = selection.begin(); @@ -831,7 +831,7 @@ void CmdTechDrawAngleDimension::activated(int iMsg) TechDraw::DrawPage* page = objFeat->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; std::string FeatName = getUniqueObjectName("Dimension"); std::vector objs; @@ -906,7 +906,7 @@ void CmdTechDraw3PtAngleDimension::activated(int iMsg) return; std::vector selection = getSelection().getSelectionEx(); - TechDraw::DrawViewPart * objFeat = 0; + TechDraw::DrawViewPart * objFeat = nullptr; std::vector SubNames; std::vector::iterator itSel = selection.begin(); @@ -919,7 +919,7 @@ void CmdTechDraw3PtAngleDimension::activated(int iMsg) TechDraw::DrawPage* page = objFeat->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; std::string FeatName = getUniqueObjectName("Dimension"); std::vector objs; @@ -1000,10 +1000,10 @@ void CmdTechDrawLinkDimension::activated(int iMsg) if (!result) return; - std::vector selection = getSelection().getSelectionEx(0, + std::vector selection = getSelection().getSelectionEx(nullptr, App::DocumentObject::getClassTypeId(),0); - App::DocumentObject* obj3D = 0; + App::DocumentObject* obj3D = nullptr; std::vector parts; std::vector subs; @@ -1362,7 +1362,7 @@ void CmdTechDrawLandmarkDimension::activated(int iMsg) std::string parentName = dvp->getNameInDocument(); std::string PageName = page->getNameInDocument(); - TechDraw::LandmarkDimension *dim = 0; + TechDraw::LandmarkDimension *dim = nullptr; std::string FeatName = getUniqueObjectName("LandmarkDim"); openCommand(QT_TRANSLATE_NOOP("Command", "Create Dimension")); diff --git a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp index f97a2535d2..36df204f26 100644 --- a/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandExtensionDims.cpp @@ -2281,7 +2281,7 @@ namespace TechDrawGui { { TechDraw::DrawPage* page = objFeat->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension* dim = 0; + TechDraw::DrawViewDimension* dim = nullptr; std::string FeatName = cmd->getUniqueObjectName("Dimension"); std::vector objs; std::vector subs; diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.h b/src/Mod/TechDraw/Gui/DlgPageChooser.h index d786276bd8..5e9675445c 100644 --- a/src/Mod/TechDraw/Gui/DlgPageChooser.h +++ b/src/Mod/TechDraw/Gui/DlgPageChooser.h @@ -34,7 +34,7 @@ class TechDrawGuiExport DlgPageChooser : public QDialog public: DlgPageChooser(const std::vector labels, const std::vector names, - QWidget* parent = 0, Qt::WindowFlags fl = Qt::WindowFlags()); + QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); ~DlgPageChooser(); std::string getSelection() const; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h index 797cca6287..118ad9cd3c 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h @@ -36,7 +36,7 @@ class DlgPrefsTechDrawAdvancedImp : public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgPrefsTechDrawAdvancedImp( QWidget* parent = 0 ); + DlgPrefsTechDrawAdvancedImp( QWidget* parent = nullptr ); ~DlgPrefsTechDrawAdvancedImp(); protected: diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h index a41ee54f44..c27b1c64eb 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h @@ -36,7 +36,7 @@ class DlgPrefsTechDrawAnnotationImp : public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgPrefsTechDrawAnnotationImp( QWidget* parent = 0 ); + DlgPrefsTechDrawAnnotationImp( QWidget* parent = nullptr ); ~DlgPrefsTechDrawAnnotationImp(); public Q_SLOTS: diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h index c6795f5e81..5ca8fafd10 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h @@ -36,7 +36,7 @@ class DlgPrefsTechDrawColorsImp : public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgPrefsTechDrawColorsImp( QWidget* parent = 0 ); + DlgPrefsTechDrawColorsImp( QWidget* parent = nullptr ); ~DlgPrefsTechDrawColorsImp(); protected: diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h index f030a2800b..1f72827feb 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h @@ -36,7 +36,7 @@ class DlgPrefsTechDrawDimensionsImp : public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgPrefsTechDrawDimensionsImp( QWidget* parent = 0 ); + DlgPrefsTechDrawDimensionsImp( QWidget* parent = nullptr ); ~DlgPrefsTechDrawDimensionsImp(); protected: diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h index d410c033bf..480edf86af 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h @@ -36,7 +36,7 @@ class DlgPrefsTechDrawGeneralImp : public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgPrefsTechDrawGeneralImp( QWidget* parent = 0 ); + DlgPrefsTechDrawGeneralImp( QWidget* parent = nullptr ); ~DlgPrefsTechDrawGeneralImp(); protected: diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h index f34b29a1aa..aa471e307b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h @@ -36,7 +36,7 @@ class DlgPrefsTechDrawHLRImp : public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgPrefsTechDrawHLRImp( QWidget* parent = 0 ); + DlgPrefsTechDrawHLRImp( QWidget* parent = nullptr ); ~DlgPrefsTechDrawHLRImp(); protected: diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h index fb6a1c7729..d3747547eb 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h @@ -36,7 +36,7 @@ class DlgPrefsTechDrawScaleImp : public Gui::Dialog::PreferencePage Q_OBJECT public: - DlgPrefsTechDrawScaleImp( QWidget* parent = 0 ); + DlgPrefsTechDrawScaleImp( QWidget* parent = nullptr ); ~DlgPrefsTechDrawScaleImp(); protected Q_SLOTS: diff --git a/src/Mod/TechDraw/Gui/Grabber3d.cpp b/src/Mod/TechDraw/Gui/Grabber3d.cpp index c0b43078bc..8f3660b483 100644 --- a/src/Mod/TechDraw/Gui/Grabber3d.cpp +++ b/src/Mod/TechDraw/Gui/Grabber3d.cpp @@ -123,7 +123,7 @@ double Grabber3d::copyActiveViewToSvgFile(App::Document* appDoc, pCam = nullptr; //make a view for rendering Svg - View3DInventor* view3DI = new View3DInventor(0, 0); //essentially an undisplayed mdi + View3DInventor* view3DI = new View3DInventor(nullptr, nullptr); //essentially an undisplayed mdi // view3DI->setWindowTitle(QString::fromUtf8("SvgRenderViewer")); //fluff // Gui::getMainWindow()->addWindow(view3DI); //just for debugging. comment for release. diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 7861939ab2..91650afb84 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -1157,7 +1157,7 @@ void MDIViewPage::setTreeToSceneSelect(void) QList sceneSel = m_qgSceneSelected; for (QList::iterator it = sceneSel.begin(); it != sceneSel.end(); ++it) { QGIView *itemView = dynamic_cast(*it); - if(itemView == 0) { + if(itemView == nullptr) { QGIEdge *edge = dynamic_cast(*it); if(edge) { QGraphicsItem*parent = edge->parentItem(); @@ -1332,7 +1332,7 @@ bool MDIViewPage::compareSelections(std::vector treeSel, Q for (auto sn:sceneSel){ QGIView *itemView = dynamic_cast(sn); - if(itemView == 0) { + if(itemView == nullptr) { QGIDatumLabel* dl = dynamic_cast(sn); QGIPrimPath* pp = dynamic_cast(sn); //count Vertex/Edge/Face if (pp != nullptr) { diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.h b/src/Mod/TechDraw/Gui/MDIViewPage.h index cf16ffb278..1cac4cb8e6 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.h +++ b/src/Mod/TechDraw/Gui/MDIViewPage.h @@ -59,7 +59,7 @@ class TechDrawGuiExport MDIViewPage : public Gui::MDIView, public Gui::Selection TYPESYSTEM_HEADER(); public: - MDIViewPage(ViewProviderPage *page, Gui::Document* doc, QWidget* parent = 0); + MDIViewPage(ViewProviderPage *page, Gui::Document* doc, QWidget* parent = nullptr); virtual ~MDIViewPage(); void addChildrenToPage(void); diff --git a/src/Mod/TechDraw/Gui/QGCustomBorder.h b/src/Mod/TechDraw/Gui/QGCustomBorder.h index 4968c5af85..256fcbe501 100644 --- a/src/Mod/TechDraw/Gui/QGCustomBorder.h +++ b/src/Mod/TechDraw/Gui/QGCustomBorder.h @@ -44,7 +44,7 @@ public: enum {Type = QGraphicsItem::UserType + 136}; int type() const { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); diff --git a/src/Mod/TechDraw/Gui/QGCustomClip.h b/src/Mod/TechDraw/Gui/QGCustomClip.h index ab3fb5e3bc..54c0342ad9 100644 --- a/src/Mod/TechDraw/Gui/QGCustomClip.h +++ b/src/Mod/TechDraw/Gui/QGCustomClip.h @@ -47,7 +47,7 @@ public: int type() const { return Type;} virtual QRectF boundingRect() const; - void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); virtual void setRect(QRectF r); diff --git a/src/Mod/TechDraw/Gui/QGCustomLabel.h b/src/Mod/TechDraw/Gui/QGCustomLabel.h index 75f13e9e6f..ef39694282 100644 --- a/src/Mod/TechDraw/Gui/QGCustomLabel.h +++ b/src/Mod/TechDraw/Gui/QGCustomLabel.h @@ -44,7 +44,7 @@ public: enum {Type = QGraphicsItem::UserType + 135}; int type() const { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); diff --git a/src/Mod/TechDraw/Gui/QGCustomRect.h b/src/Mod/TechDraw/Gui/QGCustomRect.h index b1db54a014..c554c000f6 100644 --- a/src/Mod/TechDraw/Gui/QGCustomRect.h +++ b/src/Mod/TechDraw/Gui/QGCustomRect.h @@ -44,7 +44,7 @@ public: enum {Type = QGraphicsItem::UserType + 133}; int type() const { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); diff --git a/src/Mod/TechDraw/Gui/QGCustomText.h b/src/Mod/TechDraw/Gui/QGCustomText.h index 3b1953e8b1..30d93fd9e3 100644 --- a/src/Mod/TechDraw/Gui/QGCustomText.h +++ b/src/Mod/TechDraw/Gui/QGCustomText.h @@ -46,7 +46,7 @@ public: enum {Type = QGraphicsItem::UserType + 130}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual QRectF boundingRect() const override; QRectF tightBoundingRect() const; QPointF tightBoundingAdjust() const; diff --git a/src/Mod/TechDraw/Gui/QGDisplayArea.h b/src/Mod/TechDraw/Gui/QGDisplayArea.h index 4797f4e160..4b606c4de7 100644 --- a/src/Mod/TechDraw/Gui/QGDisplayArea.h +++ b/src/Mod/TechDraw/Gui/QGDisplayArea.h @@ -45,7 +45,7 @@ public: int type() const { return Type;} virtual QRectF boundingRect() const; - void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); virtual void centerAt(QPointF centerPos); virtual void centerAt(double cX, double cY); diff --git a/src/Mod/TechDraw/Gui/QGEPath.cpp b/src/Mod/TechDraw/Gui/QGEPath.cpp index 703915f258..49951a7d37 100644 --- a/src/Mod/TechDraw/Gui/QGEPath.cpp +++ b/src/Mod/TechDraw/Gui/QGEPath.cpp @@ -208,7 +208,7 @@ void QGEPath::hoverEnterEvent(QGraphicsSceneHoverEvent *event) void QGEPath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { QGIView *view = dynamic_cast (parentItem()); - assert(view != 0); + assert(view != nullptr); Q_UNUSED(view); Q_EMIT hover(false); diff --git a/src/Mod/TechDraw/Gui/QGEPath.h b/src/Mod/TechDraw/Gui/QGEPath.h index 38fba56356..56ca1961b9 100644 --- a/src/Mod/TechDraw/Gui/QGEPath.h +++ b/src/Mod/TechDraw/Gui/QGEPath.h @@ -48,7 +48,7 @@ public: enum {Type = QGraphicsItem::UserType + 302}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; @@ -87,7 +87,7 @@ public: int type() const override { return Type;} virtual QRectF boundingRect() const override; virtual QPainterPath shape() const override; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; void inEdit(bool b) { m_inEdit = b; } bool inEdit(void) { return m_inEdit; } diff --git a/src/Mod/TechDraw/Gui/QGIArrow.h b/src/Mod/TechDraw/Gui/QGIArrow.h index 18da0234fe..fa513f1166 100644 --- a/src/Mod/TechDraw/Gui/QGIArrow.h +++ b/src/Mod/TechDraw/Gui/QGIArrow.h @@ -73,7 +73,7 @@ public: static double getPrefArrowSize(); static double getOverlapAdjust(int style, double size); - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); protected: QPainterPath makeFilledTriangle(double length, double width, bool flipped); diff --git a/src/Mod/TechDraw/Gui/QGICMark.h b/src/Mod/TechDraw/Gui/QGICMark.h index 78b35131e6..93b601a498 100644 --- a/src/Mod/TechDraw/Gui/QGICMark.h +++ b/src/Mod/TechDraw/Gui/QGICMark.h @@ -36,7 +36,7 @@ public: enum {Type = QGraphicsItem::UserType + 171}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual QRectF boundingRect() const override; virtual QPainterPath shape() const override; diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.h b/src/Mod/TechDraw/Gui/QGICenterLine.h index c018ccca1e..c4d25d0403 100644 --- a/src/Mod/TechDraw/Gui/QGICenterLine.h +++ b/src/Mod/TechDraw/Gui/QGICenterLine.h @@ -43,7 +43,7 @@ public: enum {Type = QGraphicsItem::UserType + 174}; int type() const { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); void setBounds(double x1,double y1,double x2,double y2); virtual void draw(); diff --git a/src/Mod/TechDraw/Gui/QGIDecoration.h b/src/Mod/TechDraw/Gui/QGIDecoration.h index 754c4a04af..1f653441fe 100644 --- a/src/Mod/TechDraw/Gui/QGIDecoration.h +++ b/src/Mod/TechDraw/Gui/QGIDecoration.h @@ -48,7 +48,7 @@ public: int type() const { return Type;} virtual QRectF boundingRect() const; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); virtual void draw(); void setWidth(double w); void setStyle(Qt::PenStyle s); diff --git a/src/Mod/TechDraw/Gui/QGIDimLines.h b/src/Mod/TechDraw/Gui/QGIDimLines.h index 84158f49dd..898be3843e 100644 --- a/src/Mod/TechDraw/Gui/QGIDimLines.h +++ b/src/Mod/TechDraw/Gui/QGIDimLines.h @@ -50,7 +50,7 @@ public: //double getLineWidth() { return m_lineWidth; } //void setLineWidth(double w); //QPainterPath shape() const; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr) override; protected: //QVariant itemChange(GraphicsItemChange change, const QVariant &value); diff --git a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp index 73d8b9a6d1..42c52625f2 100644 --- a/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp +++ b/src/Mod/TechDraw/Gui/QGIDrawingTemplate.cpp @@ -48,7 +48,7 @@ using namespace TechDrawGui; QGIDrawingTemplate::QGIDrawingTemplate(QGraphicsScene *scene) : QGITemplate(scene), - pathItem(0) + pathItem(nullptr) { pathItem = new QGraphicsPathItem; @@ -63,7 +63,7 @@ QGIDrawingTemplate::QGIDrawingTemplate(QGraphicsScene *scene) : QGITemplate(scen QGIDrawingTemplate::~QGIDrawingTemplate() { - pathItem = 0; + pathItem = nullptr; } QVariant QGIDrawingTemplate::itemChange(GraphicsItemChange change, const QVariant &value) @@ -82,7 +82,7 @@ TechDraw::DrawParametricTemplate * QGIDrawingTemplate::getParametricTemplate() if(pageTemplate && pageTemplate->isDerivedFrom(TechDraw::DrawParametricTemplate::getClassTypeId())) return static_cast(pageTemplate); else - return 0; + return nullptr; } void QGIDrawingTemplate::draw() diff --git a/src/Mod/TechDraw/Gui/QGIEdge.h b/src/Mod/TechDraw/Gui/QGIEdge.h index 510b1d0a89..5ee7da3963 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.h +++ b/src/Mod/TechDraw/Gui/QGIEdge.h @@ -39,7 +39,7 @@ public: int type() const override { return Type;} virtual QRectF boundingRect() const override; virtual QPainterPath shape() const override; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; int getProjIndex() const { return projIndex; } diff --git a/src/Mod/TechDraw/Gui/QGIFace.h b/src/Mod/TechDraw/Gui/QGIFace.h index d5b5e8996c..c34873895a 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.h +++ b/src/Mod/TechDraw/Gui/QGIFace.h @@ -56,7 +56,7 @@ public: int type() const override { return Type;} QRectF boundingRect() const override; QPainterPath shape() const override; - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; public: enum fillMode { diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.h b/src/Mod/TechDraw/Gui/QGIHighlight.h index 0e36945edf..7c9ad91fa3 100644 --- a/src/Mod/TechDraw/Gui/QGIHighlight.h +++ b/src/Mod/TechDraw/Gui/QGIHighlight.h @@ -55,7 +55,7 @@ public: virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = 0 ) override; + QWidget * widget = nullptr ) override; void setBounds(double x1,double y1,double x2,double y2); void setReference(char* sym); diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.h b/src/Mod/TechDraw/Gui/QGILeaderLine.h index 8c2269eccb..774cbabda3 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.h +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.h @@ -63,7 +63,7 @@ public: int type() const override { return Type;} virtual void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = 0 ) override; + QWidget * widget = nullptr ) override; virtual QRectF boundingRect() const override; virtual QPainterPath shape(void) const override; diff --git a/src/Mod/TechDraw/Gui/QGIMatting.h b/src/Mod/TechDraw/Gui/QGIMatting.h index 9de6719b37..3d59ab2000 100644 --- a/src/Mod/TechDraw/Gui/QGIMatting.h +++ b/src/Mod/TechDraw/Gui/QGIMatting.h @@ -50,7 +50,7 @@ public: enum {Type = QGraphicsItem::UserType + 205}; int type() const { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); virtual QRectF boundingRect() const; virtual void setSize(double w, double h) {m_height = h; m_width = w;} diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.h b/src/Mod/TechDraw/Gui/QGIPrimPath.h index b7b0316176..e4ae6b26a8 100644 --- a/src/Mod/TechDraw/Gui/QGIPrimPath.h +++ b/src/Mod/TechDraw/Gui/QGIPrimPath.h @@ -44,7 +44,7 @@ public: enum {Type = QGraphicsItem::UserType + 170}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual QPainterPath shape() const override { return path(); } void setHighlighted(bool state); diff --git a/src/Mod/TechDraw/Gui/QGIProjGroup.cpp b/src/Mod/TechDraw/Gui/QGIProjGroup.cpp index e8f2efcaff..8589ba93bd 100644 --- a/src/Mod/TechDraw/Gui/QGIProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/QGIProjGroup.cpp @@ -193,7 +193,7 @@ QGIView * QGIProjGroup::getAnchorQItem() const return view; } } - return 0; + return nullptr; } void QGIProjGroup::updateView(bool update) diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp index d5e0c5286c..eddfc2f04a 100644 --- a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp @@ -372,7 +372,7 @@ void QGIRichAnno::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) { QString text = QString::fromUtf8(annotation->AnnoText.getValue()); - QDialog dialog(0); + QDialog dialog(nullptr); dialog.setWindowTitle(QObject::tr("Rich text editor")); dialog.setMinimumWidth(400); dialog.setMinimumHeight(400); diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.h b/src/Mod/TechDraw/Gui/QGIRichAnno.h index 552793cf9c..34b715b06f 100644 --- a/src/Mod/TechDraw/Gui/QGIRichAnno.h +++ b/src/Mod/TechDraw/Gui/QGIRichAnno.h @@ -68,7 +68,7 @@ public: int type() const override { return Type;} virtual void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = 0 ) override; + QWidget * widget = nullptr ) override; virtual QRectF boundingRect() const override; virtual QPainterPath shape(void) const override; diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp index 5f09dd15ef..ae64d6b80b 100644 --- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp +++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp @@ -127,7 +127,7 @@ TechDraw::DrawSVGTemplate * QGISVGTemplate::getSVGTemplate() if(pageTemplate && pageTemplate->isDerivedFrom(TechDraw::DrawSVGTemplate::getClassTypeId())) return static_cast(pageTemplate); else - return 0; + return nullptr; } void QGISVGTemplate::draw() diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.h b/src/Mod/TechDraw/Gui/QGISectionLine.h index 39b1d4abd6..567d7aee2b 100644 --- a/src/Mod/TechDraw/Gui/QGISectionLine.h +++ b/src/Mod/TechDraw/Gui/QGISectionLine.h @@ -47,7 +47,7 @@ public: enum {Type = QGraphicsItem::UserType + 172}; int type() const { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); void setEnds(Base::Vector3d l1, Base::Vector3d l2); void setBounds(double x1,double y1,double x2,double y2); diff --git a/src/Mod/TechDraw/Gui/QGITemplate.cpp b/src/Mod/TechDraw/Gui/QGITemplate.cpp index f1dd8ef449..83477bd7f9 100644 --- a/src/Mod/TechDraw/Gui/QGITemplate.cpp +++ b/src/Mod/TechDraw/Gui/QGITemplate.cpp @@ -37,7 +37,7 @@ using namespace TechDrawGui; QGITemplate::QGITemplate(QGraphicsScene *scene) : QGraphicsItemGroup(), - pageTemplate(0) + pageTemplate(nullptr) { setHandlesChildEvents(false); setCacheMode(QGraphicsItem::NoCache); @@ -48,7 +48,7 @@ QGITemplate::QGITemplate(QGraphicsScene *scene) : QGraphicsItemGroup(), QGITemplate::~QGITemplate() { - pageTemplate = 0; + pageTemplate = nullptr; } QVariant QGITemplate::itemChange(GraphicsItemChange change, const QVariant &value) @@ -58,7 +58,7 @@ QVariant QGITemplate::itemChange(GraphicsItemChange change, const QVariant &valu void QGITemplate::setTemplate(TechDraw::DrawTemplate *obj) { - if(obj == 0) + if(obj == nullptr) return; pageTemplate = obj; diff --git a/src/Mod/TechDraw/Gui/QGITile.h b/src/Mod/TechDraw/Gui/QGITile.h index 73333495fc..e172ee9600 100644 --- a/src/Mod/TechDraw/Gui/QGITile.h +++ b/src/Mod/TechDraw/Gui/QGITile.h @@ -58,7 +58,7 @@ public: enum {Type = QGraphicsItem::UserType + 325}; int type(void) const { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ); + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ); virtual QRectF boundingRect() const; void setTileTextLeft(std::string s); diff --git a/src/Mod/TechDraw/Gui/QGIVertex.h b/src/Mod/TechDraw/Gui/QGIVertex.h index 2c04657ee5..59410ef083 100644 --- a/src/Mod/TechDraw/Gui/QGIVertex.h +++ b/src/Mod/TechDraw/Gui/QGIVertex.h @@ -36,7 +36,7 @@ public: enum {Type = QGraphicsItem::UserType + 105}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; int getProjIndex() const { return projIndex; } diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp index 70c7f2d2e3..0094c8fc57 100644 --- a/src/Mod/TechDraw/Gui/QGIView.cpp +++ b/src/Mod/TechDraw/Gui/QGIView.cpp @@ -396,7 +396,7 @@ TechDraw::DrawView * QGIView::getViewObject() const void QGIView::setViewFeature(TechDraw::DrawView *obj) { - if(obj == 0) + if(obj == nullptr) return; viewObj = obj; @@ -611,7 +611,7 @@ QGIView* QGIView::getQGIVByName(std::string name) } } } - return 0; + return nullptr; } /* static */ diff --git a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp index d8e3c6571c..c1ad8cfa0a 100644 --- a/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewAnnotation.cpp @@ -204,7 +204,7 @@ void QGIViewAnnotation::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) } } - QDialog dialog(0); + QDialog dialog(nullptr); dialog.setWindowTitle(tr("Text")); Gui::PropertyListEditor editor(&dialog); diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp index 6a06f65beb..5201d9fb11 100644 --- a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp @@ -183,7 +183,7 @@ void QGIBalloonLabel::hoverEnterEvent(QGraphicsSceneHoverEvent *event) void QGIBalloonLabel::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { QGIView *view = dynamic_cast (parentItem()); - assert(view != 0); + assert(view != nullptr); Q_UNUSED(view); Q_EMIT hover(false); @@ -374,7 +374,7 @@ void QGIViewBalloon::hover(bool state) void QGIViewBalloon::setViewPartFeature(TechDraw::DrawViewBalloon *balloon) { // Base::Console().Message("QGIVB::setViewPartFeature()\n"); - if(balloon == 0) + if(balloon == nullptr) return; setViewFeature(static_cast(balloon)); diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.h b/src/Mod/TechDraw/Gui/QGIViewBalloon.h index c140529164..434a748438 100644 --- a/src/Mod/TechDraw/Gui/QGIViewBalloon.h +++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.h @@ -138,7 +138,7 @@ public: virtual void updateView(bool update = false) override; virtual void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = 0 ) override; + QWidget * widget = nullptr ) override; QString getLabelText(void); void placeBalloon(QPointF pos); diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index bec2fe6862..1b18272d73 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -551,7 +551,7 @@ void QGIViewDimension::hover(bool state) void QGIViewDimension::setViewPartFeature(TechDraw::DrawViewDimension *obj) { // Base::Console().Message("QGIVD::setViewPartFeature()\n"); - if(obj == 0) + if(obj == nullptr) return; setViewFeature(static_cast(obj)); diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.h b/src/Mod/TechDraw/Gui/QGIViewDimension.h index c0fc99149a..9411b231ef 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.h +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.h @@ -153,7 +153,7 @@ public: virtual QRectF boundingRect() const override; virtual void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = 0 ) override; + QWidget * widget = nullptr ) override; TechDraw::DrawViewDimension *dvDimension; virtual void drawBorder() override; diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.h b/src/Mod/TechDraw/Gui/QGIViewPart.h index 2d693efa31..a193bd6243 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.h +++ b/src/Mod/TechDraw/Gui/QGIViewPart.h @@ -55,7 +55,7 @@ public: int type() const override { return Type;} virtual void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = 0 ) override; + QWidget * widget = nullptr ) override; void toggleCache(bool state) override; diff --git a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h index fb9b474edc..a2abf92a8b 100644 --- a/src/Mod/TechDraw/Gui/QGIWeldSymbol.h +++ b/src/Mod/TechDraw/Gui/QGIWeldSymbol.h @@ -69,7 +69,7 @@ public: int type() const override { return Type;} virtual void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = 0 ) override; + QWidget * widget = nullptr ) override; virtual QRectF boundingRect() const override; virtual QPainterPath shape(void) const override; double getEdgeFuzz(void) const; diff --git a/src/Mod/TechDraw/Gui/QGMText.h b/src/Mod/TechDraw/Gui/QGMText.h index 20d5b27154..a3d979574b 100644 --- a/src/Mod/TechDraw/Gui/QGMText.h +++ b/src/Mod/TechDraw/Gui/QGMText.h @@ -53,7 +53,7 @@ public: int type() const override { return Type;} virtual void paint( QPainter * painter, const QStyleOptionGraphicsItem * option, - QWidget * widget = 0 ) override; + QWidget * widget = nullptr ) override; virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; virtual void showBox(bool b) { m_showBox = b; } diff --git a/src/Mod/TechDraw/Gui/QGTracker.h b/src/Mod/TechDraw/Gui/QGTracker.h index fff277782b..41df76ad4b 100644 --- a/src/Mod/TechDraw/Gui/QGTracker.h +++ b/src/Mod/TechDraw/Gui/QGTracker.h @@ -50,7 +50,7 @@ public: enum {Type = QGraphicsItem::UserType + 210}; int type() const override { return Type;} - virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0 ) override; + virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = nullptr ) override; virtual QPainterPath shape() const override; virtual QRectF boundingRect() const override; diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp index 8295cb99d8..6f21729c97 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.cpp +++ b/src/Mod/TechDraw/Gui/QGVPage.cpp @@ -126,10 +126,10 @@ using namespace TechDrawGui; QGVPage::QGVPage(ViewProviderPage *vp, QGraphicsScene* s, QWidget *parent) : QGraphicsView(parent), - pageTemplate(0), + pageTemplate(nullptr), m_renderer(Native), drawBkg(true), - m_vpPage(0), + m_vpPage(nullptr), balloonPlacing(false), panningActive(false), m_showGrid(false) @@ -276,7 +276,7 @@ int QGVPage::addQView(QGIView *view) ourScene->addItem(view); // Find if it belongs to a parent - QGIView *parent = 0; + QGIView *parent = nullptr; parent = findParent(view); QPointF viewPos(Rez::guiX(view->getViewObject()->X.getValue()), @@ -461,7 +461,7 @@ QGIView * QGVPage::addViewBalloon(TechDraw::DrawViewBalloon *balloon) vBalloon->setViewPartFeature(balloon); vBalloon->dvBalloon = balloon; - QGIView *parent = 0; + QGIView *parent = nullptr; parent = findParent(vBalloon); if (parent) { @@ -522,7 +522,7 @@ QGIView * QGVPage::addViewDimension(TechDraw::DrawViewDimension *dim) dimGroup->dvDimension = dim; // Find if it belongs to a parent - QGIView *parent = 0; + QGIView *parent = nullptr; parent = findParent(dimGroup); if(parent) { @@ -554,7 +554,7 @@ QGIView * QGVPage::addViewLeader(TechDraw::DrawLeaderLine *leader) leaderGroup->setLeaderFeature(leader); - QGIView *parent = 0; + QGIView *parent = nullptr; parent = findParent(leaderGroup); if(parent) { @@ -636,7 +636,7 @@ QGIView * QGVPage::findQViewForDocObj(App::DocumentObject *obj) const return *it; } } - return 0; + return nullptr; } //! find the graphic for DocumentObject with name @@ -675,7 +675,7 @@ QGIView * QGVPage::findParent(QGIView *view) const // } //If type is dimension we check references first - TechDraw::DrawViewDimension *dim = 0; + TechDraw::DrawViewDimension *dim = nullptr; dim = dynamic_cast(myFeat); if(dim) { std::vector objs = dim->References2D.getValues(); @@ -692,7 +692,7 @@ QGIView * QGVPage::findParent(QGIView *view) const } //If type is balloon we check references first - TechDraw::DrawViewBalloon *balloon = 0; + TechDraw::DrawViewBalloon *balloon = nullptr; balloon = dynamic_cast(myFeat); if(balloon) { @@ -710,10 +710,10 @@ QGIView * QGVPage::findParent(QGIView *view) const // Check if part of view collection for(std::vector::const_iterator it = qviews.begin(); it != qviews.end(); ++it) { - QGIViewCollection *grp = 0; + QGIViewCollection *grp = nullptr; grp = dynamic_cast(*it); if(grp) { - TechDraw::DrawViewCollection *collection = 0; + TechDraw::DrawViewCollection *collection = nullptr; collection = dynamic_cast(grp->getViewObject()); if(collection) { std::vector objs = collection->Views.getValues(); @@ -727,7 +727,7 @@ QGIView * QGVPage::findParent(QGIView *view) const } //If type is LeaderLine we check LeaderParent - TechDraw::DrawLeaderLine *lead = 0; + TechDraw::DrawLeaderLine *lead = nullptr; lead = dynamic_cast(myFeat); if(lead) { @@ -768,7 +768,7 @@ void QGVPage::removeTemplate() if(pageTemplate) { scene()->removeItem(pageTemplate); pageTemplate->deleteLater(); - pageTemplate = 0; + pageTemplate = nullptr; } } void QGVPage::setRenderer(RendererType type) diff --git a/src/Mod/TechDraw/Gui/QGVPage.h b/src/Mod/TechDraw/Gui/QGVPage.h index 1a1e661d3c..ea0b1d3f3c 100644 --- a/src/Mod/TechDraw/Gui/QGVPage.h +++ b/src/Mod/TechDraw/Gui/QGVPage.h @@ -73,7 +73,7 @@ class TechDrawGuiExport QGVPage : public QGraphicsView public: enum RendererType { Native, OpenGL, Image }; - QGVPage(ViewProviderPage *vp, QGraphicsScene* s, QWidget *parent = 0); + QGVPage(ViewProviderPage *vp, QGraphicsScene* s, QWidget *parent = nullptr); virtual ~QGVPage(); void setRenderer(RendererType type = Native); diff --git a/src/Mod/TechDraw/Gui/SymbolChooser.h b/src/Mod/TechDraw/Gui/SymbolChooser.h index ce8006cb79..49ffd118b2 100644 --- a/src/Mod/TechDraw/Gui/SymbolChooser.h +++ b/src/Mod/TechDraw/Gui/SymbolChooser.h @@ -35,7 +35,7 @@ class TechDrawGuiExport SymbolChooser : public QDialog Q_OBJECT public: - SymbolChooser(QWidget *parent = 0, + SymbolChooser(QWidget *parent = nullptr, QString startDir = QString(), QString source = QString()); diff --git a/src/Mod/TechDraw/Gui/TaskActiveView.cpp b/src/Mod/TechDraw/Gui/TaskActiveView.cpp index 9922aa593c..b1ff716fc0 100644 --- a/src/Mod/TechDraw/Gui/TaskActiveView.cpp +++ b/src/Mod/TechDraw/Gui/TaskActiveView.cpp @@ -212,7 +212,7 @@ TaskDlgActiveView::TaskDlgActiveView(TechDraw::DrawPage* page) { widget = new TaskActiveView(page); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_ActiveView"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.cpp b/src/Mod/TechDraw/Gui/TaskBalloon.cpp index c64d2a9b63..ea2b2ecc5c 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.cpp +++ b/src/Mod/TechDraw/Gui/TaskBalloon.cpp @@ -214,7 +214,7 @@ TaskDlgBalloon::TaskDlgBalloon(QGIViewBalloon *parent, ViewProviderBalloon *ball TaskDialog() { widget = new TaskBalloon(parent, balloonVP); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_Balloon"), widget->windowTitle(), true, 0); + taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_Balloon"), widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); setAutoCloseOnTransactionChange(true); diff --git a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp index 9a6d680293..01b18bf562 100644 --- a/src/Mod/TechDraw/Gui/TaskCenterLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCenterLine.cpp @@ -521,7 +521,7 @@ TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat, { widget = new TaskCenterLine(partFeat,page,subNames, editMode); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_FaceCenterLine"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); setAutoCloseOnTransactionChange(true); @@ -535,7 +535,7 @@ TaskDlgCenterLine::TaskDlgCenterLine(TechDraw::DrawViewPart* partFeat, { widget = new TaskCenterLine(partFeat,page, edgeName, editMode); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_FaceCenterLine"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); setAutoCloseOnTransactionChange(true); diff --git a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp index d9345fb984..ccb106f2db 100644 --- a/src/Mod/TechDraw/Gui/TaskCosVertex.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosVertex.cpp @@ -361,7 +361,7 @@ TaskDlgCosVertex::TaskDlgCosVertex(TechDraw::DrawViewPart* baseFeat, { widget = new TaskCosVertex(baseFeat, page); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-LeaderLine"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp index cbd6900cbc..254aef42f5 100644 --- a/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskCosmeticLine.cpp @@ -291,7 +291,7 @@ TaskDlgCosmeticLine::TaskDlgCosmeticLine(TechDraw::DrawViewPart* partFeat, { widget = new TaskCosmeticLine(partFeat, points, is3d); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-line2points"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } @@ -302,7 +302,7 @@ TaskDlgCosmeticLine::TaskDlgCosmeticLine(TechDraw::DrawViewPart* partFeat, { widget = new TaskCosmeticLine(partFeat, edgeName); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-line2points"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp index 9fbbdef103..d14c952abc 100644 --- a/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp +++ b/src/Mod/TechDraw/Gui/TaskCustomizeFormat.cpp @@ -246,7 +246,7 @@ TaskDlgCustomizeFormat::TaskDlgCustomizeFormat(App::DocumentObject * object) { widget = new TaskCustomizeFormat(object); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_ExtensionCustomizeFormat"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskDetail.cpp b/src/Mod/TechDraw/Gui/TaskDetail.cpp index 526872c06e..c288db92a8 100644 --- a/src/Mod/TechDraw/Gui/TaskDetail.cpp +++ b/src/Mod/TechDraw/Gui/TaskDetail.cpp @@ -661,7 +661,7 @@ TaskDlgDetail::TaskDlgDetail(TechDraw::DrawViewPart* baseFeat) { widget = new TaskDetail(baseFeat); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_DetailView"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } @@ -671,7 +671,7 @@ TaskDlgDetail::TaskDlgDetail(TechDraw::DrawViewDetail* detailFeat) { widget = new TaskDetail(detailFeat); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_DetailView"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskDimension.cpp b/src/Mod/TechDraw/Gui/TaskDimension.cpp index 0879234b45..d44c75f278 100644 --- a/src/Mod/TechDraw/Gui/TaskDimension.cpp +++ b/src/Mod/TechDraw/Gui/TaskDimension.cpp @@ -377,7 +377,7 @@ std::pair TaskDimension::getAngleFromSelection() result.first = 0.0; result.second = true; std::vector selection = Gui::Selection().getSelectionEx(); - TechDraw::DrawViewPart * objFeat = 0; + TechDraw::DrawViewPart * objFeat = nullptr; std::vector SubNames; if (!selection.empty()) { objFeat = static_cast (selection.front().getObject()); @@ -419,7 +419,7 @@ TaskDlgDimension::TaskDlgDimension(QGIViewDimension *parent, ViewProviderDimensi TaskDialog() { widget = new TaskDimension(parent, dimensionVP); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_Dimension"), widget->windowTitle(), true, 0); + taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_Dimension"), widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); setAutoCloseOnTransactionChange(true); diff --git a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp index b20db5969e..53feb78d17 100644 --- a/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/TaskGeomHatch.cpp @@ -218,7 +218,7 @@ TaskDlgGeomHatch::TaskDlgGeomHatch(TechDraw::DrawGeomHatch* inHatch, TechDrawGui { widget = new TaskGeomHatch(inHatch,inVp, mode); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_TreeView"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskHatch.cpp b/src/Mod/TechDraw/Gui/TaskHatch.cpp index b3d37d3b13..cf09c9c00d 100644 --- a/src/Mod/TechDraw/Gui/TaskHatch.cpp +++ b/src/Mod/TechDraw/Gui/TaskHatch.cpp @@ -173,7 +173,7 @@ TaskDlgHatch::TaskDlgHatch(TechDraw::DrawHatch* inHatch, TechDrawGui::ViewProvid { widget = new TaskHatch(inHatch, inVp, mode); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_TreeView"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp index c5cdf0dc3c..96e83036a0 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp @@ -872,7 +872,7 @@ TaskDlgLeaderLine::TaskDlgLeaderLine(TechDraw::DrawView* baseFeat, { widget = new TaskLeaderLine(baseFeat,page); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-LeaderLine"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } @@ -882,7 +882,7 @@ TaskDlgLeaderLine::TaskDlgLeaderLine(TechDrawGui::ViewProviderLeader* leadVP) { widget = new TaskLeaderLine(leadVP); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-LeaderLine"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp index 04468e505c..f12dd1512e 100644 --- a/src/Mod/TechDraw/Gui/TaskLineDecor.cpp +++ b/src/Mod/TechDraw/Gui/TaskLineDecor.cpp @@ -436,7 +436,7 @@ TaskDlgLineDecor::TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat, { widget = new TaskLineDecor(partFeat, edgeNames); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-DecorateLine"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); if (edgeNames.empty()) { @@ -447,7 +447,7 @@ TaskDlgLineDecor::TaskDlgLineDecor(TechDraw::DrawViewPart* partFeat, if (parent != nullptr) { restore = new TaskRestoreLines(partFeat, parent); restoreBox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/techdraw-DecorateLine"), - tr("Restore Invisible Lines"), true, 0); + tr("Restore Invisible Lines"), true, nullptr); restoreBox->groupLayout()->addWidget(restore); Content.push_back(restoreBox); } diff --git a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp index dcee281d8b..b18d0933e3 100644 --- a/src/Mod/TechDraw/Gui/TaskLinkDim.cpp +++ b/src/Mod/TechDraw/Gui/TaskLinkDim.cpp @@ -210,7 +210,7 @@ void TaskLinkDim::updateDims() std::string DimName = dim->getNameInDocument(); Gui::Command::doCommand(Gui::Command::Gui,"App.activeDocument().%s.MeasureType = \'%s\'", DimName.c_str(),measureType.c_str()); - dim->References3D.setValue(0,""); //DVD.References3D + dim->References3D.setValue(nullptr,""); //DVD.References3D dim->clear3DMeasurements(); //DVD.measurement.References3D } } @@ -267,7 +267,7 @@ TaskDlgLinkDim::TaskDlgLinkDim(std::vector parts,std::vect { widget = new TaskLinkDim(parts,subs,page); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_LinkDimension"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp index c2508f13d8..d2cddc20be 100644 --- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp @@ -436,7 +436,7 @@ const char * TaskProjGroup::viewChkIndexToCStr(int index) // First Angle: FBRight B FBL // Right F L Rear // FTRight T FTL - assert (multiView != NULL); + assert (multiView != nullptr); bool thirdAngle = multiView->usedProjectionType().isValue("Third Angle"); switch(index) { @@ -450,12 +450,12 @@ const char * TaskProjGroup::viewChkIndexToCStr(int index) case 7: return (thirdAngle ? "FrontBottomLeft" : "FrontTopRight"); case 8: return (thirdAngle ? "Bottom" : "Top"); case 9: return (thirdAngle ? "FrontBottomRight" : "FrontTopLeft"); - default: return NULL; + default: return nullptr; } } void TaskProjGroup::setupViewCheckboxes(bool addConnections) { - if ( multiView == NULL ) { + if ( multiView == nullptr ) { return; } @@ -479,7 +479,7 @@ void TaskProjGroup::setupViewCheckboxes(bool addConnections) } const char *viewStr = viewChkIndexToCStr(i); - if ( viewStr != NULL && multiView->hasProjection(viewStr) ) { + if ( viewStr != nullptr && multiView->hasProjection(viewStr) ) { box->setCheckState(Qt::Checked); } else { box->setCheckState(Qt::Unchecked); @@ -577,7 +577,7 @@ TaskDlgProjGroup::TaskDlgProjGroup(TechDraw::DrawProjGroup* featView, bool mode) //viewProvider = dynamic_cast(featView); widget = new TaskProjGroup(featView,mode); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_ProjectionGroup"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskProjection.cpp b/src/Mod/TechDraw/Gui/TaskProjection.cpp index 0991e4964b..ffee7ee49a 100644 --- a/src/Mod/TechDraw/Gui/TaskProjection.cpp +++ b/src/Mod/TechDraw/Gui/TaskProjection.cpp @@ -132,7 +132,7 @@ TaskDlgProjection::TaskDlgProjection() : TaskDialog() { widget = new TaskProjection(); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_ProjectShape"), widget->windowTitle(), true, 0); + taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_ProjectShape"), widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); setAutoCloseOnTransactionChange(true); diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp index 8691b18106..d55b45cab7 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp @@ -277,7 +277,7 @@ void TaskRichAnno::onEditorClicked(bool b) { // Base::Console().Message("TL::onEditorClicked(%d)\n",b); Q_UNUSED(b); - m_textDialog = new QDialog(0); + m_textDialog = new QDialog(nullptr); QString leadText = ui->teAnnoText->toHtml(); QString plainText = ui->teAnnoText->toPlainText(); // Base::Console().Message("TRA::onEditorClicked - leadText: %s** plainText: %s**\n", @@ -578,7 +578,7 @@ TaskDlgRichAnno::TaskDlgRichAnno(TechDraw::DrawView* baseFeat, { widget = new TaskRichAnno(baseFeat,page); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_RichTextAnnotation"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } @@ -588,7 +588,7 @@ TaskDlgRichAnno::TaskDlgRichAnno(TechDrawGui::ViewProviderRichAnno* leadVP) { widget = new TaskRichAnno(leadVP); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_RichTextAnnotation"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskSectionView.cpp b/src/Mod/TechDraw/Gui/TaskSectionView.cpp index 717a8188c3..86d46c0ea6 100644 --- a/src/Mod/TechDraw/Gui/TaskSectionView.cpp +++ b/src/Mod/TechDraw/Gui/TaskSectionView.cpp @@ -601,7 +601,7 @@ TaskDlgSectionView::TaskDlgSectionView(TechDraw::DrawViewPart* base) : { widget = new TaskSectionView(base); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_SectionView"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } @@ -611,7 +611,7 @@ TaskDlgSectionView::TaskDlgSectionView(TechDraw::DrawViewSection* section) : { widget = new TaskSectionView(section); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_SectionView"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp index 54c58284fd..bbadbb49f1 100644 --- a/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp +++ b/src/Mod/TechDraw/Gui/TaskSelectLineAttributes.cpp @@ -381,7 +381,7 @@ TaskDlgSelectLineAttributes::TaskDlgSelectLineAttributes(lineAttributes * ptActi { widget = new TaskSelectLineAttributes(ptActiveAttributes); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("TechDraw_ExtensionSelectLineAttributes"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp index ced63629cf..d393cf3292 100644 --- a/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp +++ b/src/Mod/TechDraw/Gui/TaskWeldingSymbol.cpp @@ -686,7 +686,7 @@ TaskDlgWeldingSymbol::TaskDlgWeldingSymbol(TechDraw::DrawLeaderLine* leader) { widget = new TaskWeldingSymbol(leader); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_WeldSymbol"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } @@ -696,7 +696,7 @@ TaskDlgWeldingSymbol::TaskDlgWeldingSymbol(TechDraw::DrawWeldSymbol* weld) { widget = new TaskWeldingSymbol(weld); taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("actions/TechDraw_WeldSymbol"), - widget->windowTitle(), true, 0); + widget->windowTitle(), true, nullptr); taskbox->groupLayout()->addWidget(widget); Content.push_back(taskbox); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp index d3b41e38d4..5627fb4e36 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.cpp @@ -48,10 +48,10 @@ using namespace TechDrawGui; using namespace TechDraw; const char *ViewProviderDimension::StandardAndStyleEnums[]= - { "ISO Oriented", "ISO Referencing", "ASME Inlined", "ASME Referencing", NULL }; + { "ISO Oriented", "ISO Referencing", "ASME Inlined", "ASME Referencing", nullptr }; const char *ViewProviderDimension::RenderingExtentEnums[]= - { "None", "Minimal", "Confined", "Reduced", "Normal", "Expanded", NULL }; + { "None", "Minimal", "Confined", "Reduced", "Normal", "Expanded", nullptr }; PROPERTY_SOURCE(TechDrawGui::ViewProviderDimension, TechDrawGui::ViewProviderDrawingView) diff --git a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp index eb0e384c79..4e95d8d0dd 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderGeomHatch.cpp @@ -94,7 +94,7 @@ bool ViewProviderGeomHatch::setEdit(int ModNum) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); TaskDlgGeomHatch *projDlg = qobject_cast(dlg); if (projDlg && (projDlg->getViewProvider() != this)) - projDlg = 0; // somebody left task panel open + projDlg = nullptr; // somebody left task panel open // clear the selection (convenience) Gui::Selection().clearSelection(); @@ -193,8 +193,8 @@ TechDraw::DrawGeomHatch* ViewProviderGeomHatch::getViewObject() const Gui::MDIView *ViewProviderGeomHatch::getMDIView() const { auto obj = getViewObject(); - if(!obj) return 0; + if(!obj) return nullptr; auto vp = Gui::Application::Instance->getViewProvider(obj->getSourceView()); - if(!vp) return 0; + if(!vp) return nullptr; return vp->getMDIView(); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp index e88987ca46..fd74b9b2f8 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderHatch.cpp @@ -96,7 +96,7 @@ bool ViewProviderHatch::setEdit(int ModNum) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); TaskDlgHatch *projDlg = qobject_cast(dlg); if (projDlg && (projDlg->getViewProvider() != this)) - projDlg = 0; // somebody left task panel open + projDlg = nullptr; // somebody left task panel open // clear the selection (convenience) Gui::Selection().clearSelection(); @@ -163,8 +163,8 @@ bool ViewProviderHatch::canDelete(App::DocumentObject *obj) const Gui::MDIView *ViewProviderHatch::getMDIView() const { auto obj = getViewObject(); - if(!obj) return 0; + if(!obj) return nullptr; auto vp = Gui::Application::Instance->getViewProvider(obj->getSourceView()); - if(!vp) return 0; + if(!vp) return nullptr; return vp->getMDIView(); } diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp index 2091b2118b..1cb24cfbad 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp @@ -56,7 +56,7 @@ const char* ViewProviderLeader::LineStyleEnums[] = { "NoLine", "Dot", "DashDot", "DashDotDot", - NULL }; + nullptr }; //************************************************************************** // Construction/Destruction diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index 0c7f276c29..053a5b2597 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -77,7 +77,7 @@ PROPERTY_SOURCE(TechDrawGui::ViewProviderPage, Gui::ViewProviderDocumentObject) // Construction/Destruction ViewProviderPage::ViewProviderPage() - : m_mdiView(0), + : m_mdiView(nullptr), m_docReady(true), m_pageName(""), m_graphicsView(nullptr) @@ -313,7 +313,7 @@ std::vector ViewProviderPage::claimChildren(void) const { std::vector temp; - App::DocumentObject *templateFeat = 0; + App::DocumentObject *templateFeat = nullptr; templateFeat = getDrawPage()->Template.getValue(); if (templateFeat) { @@ -379,7 +379,7 @@ MDIViewPage* ViewProviderPage::getMDIViewPage() const { if (m_mdiView.isNull()) { Base::Console().Log("INFO - ViewProviderPage::getMDIViewPage has no m_mdiView!\n"); - return 0; + return nullptr; } else { return m_mdiView; } diff --git a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp index 30fe18f55d..8c71b5dc6d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderProjGroup.cpp @@ -103,7 +103,7 @@ bool ViewProviderProjGroup::setEdit(int ModNum) Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); TaskDlgProjGroup *projDlg = qobject_cast(dlg); if (projDlg && projDlg->getViewProvider() != this) - projDlg = 0; // another sketch left open its task panel + projDlg = nullptr; // another sketch left open its task panel // clear the selection (convenience) Gui::Selection().clearSelection(); diff --git a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp index 9f72b5ec77..6c8afbadfc 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderRichAnno.cpp @@ -50,7 +50,7 @@ const char* ViewProviderRichAnno::LineStyleEnums[] = { "NoLine", "Dot", "DashDot", "DashDotDot", - NULL }; + nullptr }; //************************************************************************** // Construction/Destruction diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp index 233935f8d4..7aa6c9cc4e 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp @@ -64,7 +64,7 @@ const char* ViewProviderViewPart::LineStyleEnums[] = { "NoLine", "Dot", "DashDot", "DashDotDot", - NULL }; + nullptr }; //************************************************************************** // Construction/Destruction diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.cpp b/src/Mod/TechDraw/Gui/mrichtextedit.cpp index 43759f3b43..b3f9c20f14 100644 --- a/src/Mod/TechDraw/Gui/mrichtextedit.cpp +++ b/src/Mod/TechDraw/Gui/mrichtextedit.cpp @@ -62,7 +62,7 @@ using namespace TechDraw; MRichTextEdit::MRichTextEdit(QWidget *parent, QString textIn) : QWidget(parent) { setupUi(this); - m_lastBlockList = 0; + m_lastBlockList = nullptr; #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) f_textedit->setTabStopWidth(40); #else @@ -536,7 +536,7 @@ void MRichTextEdit::slotCursorPositionChanged() { if (m_lastBlockList && (l == m_lastBlockList || - (l != 0 && m_lastBlockList != 0 && l->format().style() == m_lastBlockList->format().style()) ) ) { + (l != nullptr && m_lastBlockList != nullptr && l->format().style() == m_lastBlockList->format().style()) ) ) { return; } m_lastBlockList = l; diff --git a/src/Mod/TechDraw/Gui/mrichtextedit.h b/src/Mod/TechDraw/Gui/mrichtextedit.h index 0e81846fe5..17fba1c035 100644 --- a/src/Mod/TechDraw/Gui/mrichtextedit.h +++ b/src/Mod/TechDraw/Gui/mrichtextedit.h @@ -38,7 +38,7 @@ class MRichTextEdit : public QWidget, protected Ui::MRichTextEdit { Q_OBJECT public: - MRichTextEdit(QWidget *parent = 0, QString textIn = QString() ); + MRichTextEdit(QWidget *parent = nullptr, QString textIn = QString() ); QString toPlainText() const { return f_textedit->toPlainText(); } QString toHtml() const;