Merge pull request #32 from Artanidos/fix_memleaks_scenario_2

Fix mem-leak: delete menus & actions, unused Z origin label.
Artanidos · Dec 23, 2020 · 4b9a959 · 4b9a959
2 parents a957ed3 + 0ff789c
commit 4b9a959
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/src/App/widgets/animationitem.cpp b/src/App/widgets/animationitem.cpp
@@ -87,6 +87,7 @@ AnimationItem::~AnimationItem()
         }
         delete frame;
     }
+    delete m_contextMenu;
     delete m_keyframes;
     delete delAct;
     delete bringToFrontAct;

diff --git a/src/App/widgets/bitmap.cpp b/src/App/widgets/bitmap.cpp
@@ -50,11 +50,16 @@ Bitmap::Bitmap(QImage image, AnimationScene *scene)
     addMenu();
 }
 
+Bitmap::~Bitmap()
+{
+    delete m_exchangeBitmapAct;
+}
+
 void Bitmap::addMenu()
 {
-    QAction *exchangeBitmapAct = new QAction("Exchange Bitmap");
-    connect(exchangeBitmapAct, SIGNAL(triggered()), this, SLOT(exchangeBitmapAction()));
-    m_contextMenu->addAction(exchangeBitmapAct);
+    m_exchangeBitmapAct = new QAction("Exchange Bitmap");
+    connect(m_exchangeBitmapAct, SIGNAL(triggered()), this, SLOT(exchangeBitmapAction()));
+    m_contextMenu->addAction(m_exchangeBitmapAct);
 }
 
 void Bitmap::exchangeBitmapAction()

diff --git a/src/App/widgets/bitmap.h b/src/App/widgets/bitmap.h
@@ -21,6 +21,7 @@
 #ifndef BITMAP_H
 #define BITMAP_H
 
+#include <QAction>
 #include <QDomElement>
 #include <QImage>
 #include <QObject>
@@ -38,6 +39,7 @@ class  Bitmap : public AnimationItem
     Bitmap();
     Bitmap(QString filename, AnimationScene *scene);
     Bitmap(QImage img, AnimationScene *scene);
+    ~Bitmap();
 
     void paint( QPainter *paint, const QStyleOptionGraphicsItem *, QWidget *);
     QString getHtml(QString id, QString assetsPath) Q_DECL_OVERRIDE;
@@ -55,6 +57,7 @@ private slots:
 
 private:
     QImage m_image;
+    QAction *m_exchangeBitmapAct;
 
     void addMenu();
 };

diff --git a/src/App/widgets/itempropertyeditor.cpp b/src/App/widgets/itempropertyeditor.cpp
@@ -125,14 +125,12 @@ ItemPropertyEditor::ItemPropertyEditor(Timeline *timeline)
     QLabel *labelOrig = new QLabel("Origin");
     QLabel *labelOrigX = new QLabel("X");
     QLabel *labelOrigY = new QLabel("Y");
-    QLabel *labelOrigZ = new QLabel("Z");
     labelScaleX->setFixedWidth(15);
     labelScaleY->setFixedWidth(15);
     labelShearX->setFixedWidth(15);
     labelShearY->setFixedWidth(15);
     labelOrigX->setFixedWidth(15);
     labelOrigY->setFixedWidth(15);
-    labelOrigZ->setFixedWidth(15);
     m_scaleX = new QSpinBox();
     m_scaleX->setMinimum(-10000);
     m_scaleX->setMaximum(10000);

diff --git a/src/App/widgets/text.cpp b/src/App/widgets/text.cpp
@@ -87,6 +87,12 @@ Text::Text(QString text, AnimationScene *scene)
    setRect(0, 0, m_svg->boundingRect().width(), m_svg->boundingRect().height());
 }
 
+Text::~Text()
+{
+    delete m_renderer;
+    delete m_svg;
+}
+
 int Text::type() const
 {
     return Text::Type;

diff --git a/src/App/widgets/text.h b/src/App/widgets/text.h
@@ -43,6 +43,7 @@ class Text : public AnimationItem
 
 public:
     Text(QString text, AnimationScene *scene);
+    ~Text();
 
     void paint( QPainter *paint, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE;
     void scaleObjects() Q_DECL_OVERRIDE;

diff --git a/src/App/widgets/timeline.cpp b/src/App/widgets/timeline.cpp
@@ -130,6 +130,7 @@ Timeline::Timeline(AnimationScene *scene)
 
 Timeline::~Timeline()
 {
+    delete m_contextMenu;
     delete m_delAct;
     delete m_forwardAct;
     delete m_pauseAct;