From 793ab49556d8165d1e2a1916e79db7cf12084686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Tue, 23 Oct 2012 08:57:29 +0000 Subject: [PATCH] Fixed some valgrind warnings git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15707 383ad7c9-94d9-4d36-a494-682f7c89f535 --- PrimitivesGenerator.cc | 52 +++++++++++++++++++----------------------- PrimitivesGenerator.hh | 2 ++ 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/PrimitivesGenerator.cc b/PrimitivesGenerator.cc index 885ee3a..dbd554f 100644 --- a/PrimitivesGenerator.cc +++ b/PrimitivesGenerator.cc @@ -52,7 +52,8 @@ PrimitivesGeneratorPlugin::PrimitivesGeneratorPlugin() : triMesh_(0), polyMesh_(0), slices_(50), - stacks_(50) + stacks_(50), + primitivesMenu_(0) { } @@ -60,6 +61,10 @@ PrimitivesGeneratorPlugin::PrimitivesGeneratorPlugin() : PrimitivesGeneratorPlugin::~PrimitivesGeneratorPlugin() { + if ( OpenFlipper::Options::gui()) { + delete primitivesMenu_; + } + } void PrimitivesGeneratorPlugin::initializePlugin() @@ -80,53 +85,42 @@ void PrimitivesGeneratorPlugin::initializePlugin() void PrimitivesGeneratorPlugin::pluginsInitialized() { if ( OpenFlipper::Options::gui()) { - // Primitives Menu - QMenu *primitivesMenu; - emit getMenubarMenu(tr("&Primitives"), primitivesMenu, true ); + emit getMenubarMenu(tr("&Primitives"), primitivesMenu_, true ); - QIcon* icon; QAction* action; - action = primitivesMenu->addAction("Cube (Triangle Mesh)" ,this,SLOT(addTriangulatedCube())); - icon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_cube.png"); - action->setIcon(*icon); + action = primitivesMenu_->addAction("Cube (Triangle Mesh)" ,this,SLOT(addTriangulatedCube())); + action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_cube.png")); WhatsThisGenerator whatsThisGen("PrimitivesGenerator"); whatsThisGen.setWhatsThis(action,tr("Create a Cube."),"Cube"); - action = primitivesMenu->addAction("Dodecahedron" ,this,SLOT(addDodecahedron())); - icon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_dodecahedron.png"); - action->setIcon(*icon); + action = primitivesMenu_->addAction("Dodecahedron" ,this,SLOT(addDodecahedron())); + action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_dodecahedron.png")); whatsThisGen.setWhatsThis(action,tr("Create a Dodecahedron."), "Dodecahedron"); - action = primitivesMenu->addAction("Icosahedron" ,this,SLOT(addIcosahedron())); - icon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_icosahedron.png"); - action->setIcon(*icon); + action = primitivesMenu_->addAction("Icosahedron" ,this,SLOT(addIcosahedron())); + action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_icosahedron.png")); whatsThisGen.setWhatsThis(action,tr("Create a Icosahedron.","Icosahedron")); - action = primitivesMenu->addAction("Octahedron" ,this,SLOT(addOctahedron())); - icon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_octahedron.png"); - action->setIcon(*icon); + action = primitivesMenu_->addAction("Octahedron" ,this,SLOT(addOctahedron())); + action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_octahedron.png")); whatsThisGen.setWhatsThis(action,tr("Create an Octahedron."),"Octahedron"); - action = primitivesMenu->addAction("Pyramid" ,this,SLOT(addPyramid())); - icon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_pyramid.png"); - action->setIcon(*icon); + action = primitivesMenu_->addAction("Pyramid" ,this,SLOT(addPyramid())); + action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_pyramid.png")); whatsThisGen.setWhatsThis(action,tr("Create a Pyramid."),"Pyramid"); - action = primitivesMenu->addAction("Cylinder (Triangle Mesh)" ,this,SLOT(addTriangulatedCylinder())); - icon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_cylinder.png"); - action->setIcon(*icon); + action = primitivesMenu_->addAction("Cylinder (Triangle Mesh)" ,this,SLOT(addTriangulatedCylinder())); + action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_cylinder.png")); - action = primitivesMenu->addAction("Sphere",this,SLOT(addSphere())); - icon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_sphere.png"); - action->setIcon(*icon); + action = primitivesMenu_->addAction("Sphere",this,SLOT(addSphere())); + action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_sphere.png")); whatsThisGen.setWhatsThis(action,tr("Create a Sphere. "),"Sphere"); - action = primitivesMenu->addAction("Tetrahedron",this,SLOT(addTetrahedron())); - icon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_tetrahedron.png"); - action->setIcon(*icon); + action = primitivesMenu_->addAction("Tetrahedron",this,SLOT(addTetrahedron())); + action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_tetrahedron.png")); whatsThisGen.setWhatsThis(action,tr("Create a Tetrahedron."),"Tetrahedron"); } diff --git a/PrimitivesGenerator.hh b/PrimitivesGenerator.hh index ee0b482..63bf708 100644 --- a/PrimitivesGenerator.hh +++ b/PrimitivesGenerator.hh @@ -140,6 +140,8 @@ private: int slices_; int stacks_; + QMenu* primitivesMenu_; + }; #endif //PRIMITIVESGENERATORPLUGIN_HH -- GitLab