From 2cd932627c67fa961686e47b244c7a1c4122cfed Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 27 Dec 2022 23:45:43 +0100 Subject: [PATCH] Fixed some memory leaks --- src/lay/lay/layMacroEditorPage.cc | 4 ++-- src/layui/layui/layBookmarksView.cc | 6 +++--- src/layui/layui/layNetlistBrowser.cc | 6 ++++++ src/layui/layui/layNetlistBrowser.h | 1 + src/layui/layui/rdbMarkerBrowser.cc | 14 +++++++++++++- src/layui/layui/rdbMarkerBrowser.h | 2 ++ src/tl/tl/tlGlobPattern.cc | 6 ++++++ src/tl/tl/tlGlobPattern.h | 5 +++++ 8 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc index 7f18cd9bf..3796a9427 100644 --- a/src/lay/lay/layMacroEditorPage.cc +++ b/src/lay/lay/layMacroEditorPage.cc @@ -226,8 +226,8 @@ MacroEditorHighlighters::scheme_for (lym::Macro::Interpreter lang, const std::st // ---------------------------------------------------------------------------------------------- // MacroEditorExecutionModel implementation -MacroEditorExecutionModel::MacroEditorExecutionModel (QObject * /*parent*/) - : m_current_line (-1), m_run_mode (false), m_interpreter (lym::Macro::None) +MacroEditorExecutionModel::MacroEditorExecutionModel (QObject *parent) + : QObject (parent), m_current_line (-1), m_run_mode (false), m_interpreter (lym::Macro::None) { // .. nothing yet .. } diff --git a/src/layui/layui/layBookmarksView.cc b/src/layui/layui/layBookmarksView.cc index 70b4ec351..ce9af3b87 100644 --- a/src/layui/layui/layBookmarksView.cc +++ b/src/layui/layui/layBookmarksView.cc @@ -39,8 +39,8 @@ class BookmarkListModel : public QAbstractItemModel { public: - BookmarkListModel (const lay::BookmarkList *bookmarks) - : mp_bookmarks (bookmarks) + BookmarkListModel (QObject *parent, const lay::BookmarkList *bookmarks) + : QAbstractItemModel (parent), mp_bookmarks (bookmarks) { // .. nothing yet .. } @@ -103,7 +103,7 @@ BookmarksView::BookmarksView (LayoutViewBase *view, QWidget *parent, const char mp_bookmarks = new QListView (this); layout->addWidget (mp_bookmarks); - mp_bookmarks->setModel (new BookmarkListModel (&view->bookmarks ())); + mp_bookmarks->setModel (new BookmarkListModel (this, &view->bookmarks ())); mp_bookmarks->setSelectionMode (QAbstractItemView::ExtendedSelection); mp_bookmarks->setContextMenuPolicy (Qt::CustomContextMenu); diff --git a/src/layui/layui/layNetlistBrowser.cc b/src/layui/layui/layNetlistBrowser.cc index d51b17c58..1a3634a4c 100644 --- a/src/layui/layui/layNetlistBrowser.cc +++ b/src/layui/layui/layNetlistBrowser.cc @@ -110,6 +110,12 @@ NetlistBrowserConfigPage::NetlistBrowserConfigPage (QWidget *parent) connect (mp_ui->cbx_window, SIGNAL (currentIndexChanged (int)), this, SLOT (window_changed (int))); } +NetlistBrowserConfigPage::~NetlistBrowserConfigPage () +{ + delete mp_ui; + mp_ui = 0; +} + void NetlistBrowserConfigPage::setup (lay::Dispatcher *root) { diff --git a/src/layui/layui/layNetlistBrowser.h b/src/layui/layui/layNetlistBrowser.h index 1bea24283..b3423c4de 100644 --- a/src/layui/layui/layNetlistBrowser.h +++ b/src/layui/layui/layNetlistBrowser.h @@ -54,6 +54,7 @@ class NetlistBrowserConfigPage public: NetlistBrowserConfigPage (QWidget *parent); + ~NetlistBrowserConfigPage (); virtual void setup (lay::Dispatcher *root); virtual void commit (lay::Dispatcher *root); diff --git a/src/layui/layui/rdbMarkerBrowser.cc b/src/layui/layui/rdbMarkerBrowser.cc index c7ff4e6d1..c7fd0aa4b 100644 --- a/src/layui/layui/rdbMarkerBrowser.cc +++ b/src/layui/layui/rdbMarkerBrowser.cc @@ -138,6 +138,12 @@ MarkerBrowserConfigPage::MarkerBrowserConfigPage (QWidget *parent) connect (mp_ui->cbx_window, SIGNAL (currentIndexChanged (int)), this, SLOT (window_changed (int))); } +MarkerBrowserConfigPage::~MarkerBrowserConfigPage () +{ + delete mp_ui; + mp_ui = 0; +} + void MarkerBrowserConfigPage::setup (lay::Dispatcher *root) { @@ -196,7 +202,13 @@ MarkerBrowserConfigPage2::MarkerBrowserConfigPage2 (QWidget *parent) mp_ui->setupUi (this); } -void +MarkerBrowserConfigPage2::~MarkerBrowserConfigPage2 () +{ + delete mp_ui; + mp_ui = 0; +} + +void MarkerBrowserConfigPage2::setup (lay::Dispatcher *root) { // marker color diff --git a/src/layui/layui/rdbMarkerBrowser.h b/src/layui/layui/rdbMarkerBrowser.h index 0c0a21f04..dda42b0c2 100644 --- a/src/layui/layui/rdbMarkerBrowser.h +++ b/src/layui/layui/rdbMarkerBrowser.h @@ -51,6 +51,7 @@ class MarkerBrowserConfigPage public: MarkerBrowserConfigPage (QWidget *parent); + ~MarkerBrowserConfigPage (); virtual void setup (lay::Dispatcher *root); virtual void commit (lay::Dispatcher *root); @@ -69,6 +70,7 @@ class MarkerBrowserConfigPage2 public: MarkerBrowserConfigPage2 (QWidget *parent); + ~MarkerBrowserConfigPage2 (); virtual void setup (lay::Dispatcher *root); virtual void commit (lay::Dispatcher *root); diff --git a/src/tl/tl/tlGlobPattern.cc b/src/tl/tl/tlGlobPattern.cc index d3acb5ff0..fc5399b53 100644 --- a/src/tl/tl/tlGlobPattern.cc +++ b/src/tl/tl/tlGlobPattern.cc @@ -719,6 +719,12 @@ GlobPattern::GlobPattern (const GlobPattern &other) operator= (other); } +GlobPattern::~GlobPattern () +{ + delete mp_op; + mp_op = 0; +} + GlobPattern & GlobPattern::operator= (const GlobPattern &other) { diff --git a/src/tl/tl/tlGlobPattern.h b/src/tl/tl/tlGlobPattern.h index c30bbfba1..5f06edfb6 100644 --- a/src/tl/tl/tlGlobPattern.h +++ b/src/tl/tl/tlGlobPattern.h @@ -58,6 +58,11 @@ public: */ GlobPattern (const GlobPattern &other); + /** + * @brief Destructor + */ + ~GlobPattern (); + /** * @brief Assignment */