From 8d0473410b343552e7d5ddd0b6eb2da3419e645e Mon Sep 17 00:00:00 2001 From: Tats Date: Sun, 1 Dec 2013 00:16:33 -0500 Subject: [PATCH] Removed some of the "normal" pointers and replaced them by smart pointer to prevent memory problems --- MainWindow.cpp | 12 ++++++------ Mapping.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/MainWindow.cpp b/MainWindow.cpp index 30ccac3..d9067d9 100644 --- a/MainWindow.cpp +++ b/MainWindow.cpp @@ -176,11 +176,11 @@ void MainWindow::addQuad() Q_CHECK_PTR(texture); // Create input and output quads. - Quad* outputQuad = Util::createQuadForTexture(texture.get(), sourceCanvas->width(), sourceCanvas->height()); - Quad* inputQuad = Util::createQuadForTexture(texture.get(), sourceCanvas->width(), sourceCanvas->height()); + Shape::ptr outputQuad = Shape::ptr(Util::createQuadForTexture(texture.get(), sourceCanvas->width(), sourceCanvas->height())); + Shape::ptr inputQuad = Shape::ptr(Util::createQuadForTexture(texture.get(), sourceCanvas->width(), sourceCanvas->height())); // Create texture mapping. - int mappingId = mappingManager->addMapping(Mapping::ptr(new TextureMapping(paint.get(), outputQuad, inputQuad))); + int mappingId = mappingManager->addMapping(Mapping::ptr(new TextureMapping(paint, outputQuad, inputQuad))); addMappingItem(mappingId); } @@ -197,11 +197,11 @@ void MainWindow::addTriangle() Q_CHECK_PTR(texture); // Create input and output quads. - Triangle* outputTriangle = Util::createTriangleForTexture(texture.get(), sourceCanvas->width(), sourceCanvas->height()); - Triangle* inputTriangle = Util::createTriangleForTexture(texture.get(), sourceCanvas->width(), sourceCanvas->height()); + Shape::ptr outputTriangle = Shape::ptr(Util::createTriangleForTexture(texture.get(), sourceCanvas->width(), sourceCanvas->height())); + Shape::ptr inputTriangle = Shape::ptr(Util::createTriangleForTexture(texture.get(), sourceCanvas->width(), sourceCanvas->height())); // Create texture mapping. - int mappingId = mappingManager->addMapping(Mapping::ptr(new TextureMapping(paint.get(), inputTriangle, outputTriangle))); + int mappingId = mappingManager->addMapping(Mapping::ptr(new TextureMapping(paint, inputTriangle, outputTriangle))); addMappingItem(mappingId); } diff --git a/Mapping.h b/Mapping.h index 9f12fdf..cbef9e8 100644 --- a/Mapping.h +++ b/Mapping.h @@ -42,7 +42,7 @@ protected: public: typedef std::tr1::shared_ptr ptr; - Mapping(Paint* paint, Shape* shape) + Mapping(Paint::ptr paint, Shape::ptr shape) : _paint(paint), _shape(shape) {} virtual ~Mapping() {} @@ -67,9 +67,9 @@ private: Shape::ptr _inputShape; public: - TextureMapping(Paint* paint, - Shape* shape, - Shape* inputShape) + TextureMapping(Paint::ptr paint, + Shape::ptr shape, + Shape::ptr inputShape) : Mapping(paint, shape), _inputShape(inputShape) {}