From f13a7627ae39be6ae7570ae10e41ac400e0c8d79 Mon Sep 17 00:00:00 2001 From: asapelkin Date: Thu, 24 Oct 2019 09:50:31 +0300 Subject: [PATCH] used make_shared and make_unique for creating shared pointers --- src/Gui/DAGView/DAGModel.cpp | 8 +++++--- src/Gui/DAGView/DAGView.cpp | 4 +++- src/Mod/Path/libarea/AreaOrderer.cpp | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 31ace8757b..c7be383396 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -46,6 +46,8 @@ #include #include +#include + #include #include @@ -105,8 +107,8 @@ Model::Model(QObject *parentIn, const Gui::Document &documentIn) : QGraphicsScen //underneath cursor. this->setItemIndexMethod(QGraphicsScene::NoIndex); - theGraph = std::shared_ptr(new Graph()); - graphLink = std::shared_ptr(new GraphLinkContainer()); + theGraph = std::make_shared(); + graphLink = std::make_shared(); setupViewConstants(); setupFilters(); @@ -488,7 +490,7 @@ void Model::updateSlot() boost::tie(edge, result) = boost::add_edge(currentVertex, otherVertex, *theGraph); if (result) { - (*theGraph)[edge].connector = std::shared_ptr(new QGraphicsPathItem()); + (*theGraph)[edge].connector = std::make_shared(); (*theGraph)[edge].connector->setZValue(0.0); } } diff --git a/src/Gui/DAGView/DAGView.cpp b/src/Gui/DAGView/DAGView.cpp index 501a424a22..5742f1e7ff 100644 --- a/src/Gui/DAGView/DAGView.cpp +++ b/src/Gui/DAGView/DAGView.cpp @@ -26,6 +26,8 @@ #include #endif +#include + #include #include @@ -70,7 +72,7 @@ void View::slotActiveDocument(const Document &documentIn) ModelMap::const_iterator it = modelMap.find(&documentIn); if (it == modelMap.end()) { - ModelMap::value_type entry(std::make_pair(&documentIn, std::shared_ptr(new Model(this, documentIn)))); + ModelMap::value_type entry(std::make_pair(&documentIn, std::make_shared(this, documentIn))); modelMap.insert(entry); this->setScene(entry.second.get()); } diff --git a/src/Mod/Path/libarea/AreaOrderer.cpp b/src/Mod/Path/libarea/AreaOrderer.cpp index d0732d0843..0df38b022a 100644 --- a/src/Mod/Path/libarea/AreaOrderer.cpp +++ b/src/Mod/Path/libarea/AreaOrderer.cpp @@ -28,6 +28,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "AreaOrderer.h" +#include #include "Area.h" using namespace std; @@ -132,7 +133,7 @@ void CInnerCurves::Unite(shared_ptr c) else { if(curve.IsClockwise())curve.Reverse(); - Insert(shared_ptr(new CCurve(curve))); + Insert(std::make_shared(curve)); } } }