From d4a1422123923b123305171930bc056d937c485f Mon Sep 17 00:00:00 2001 From: Ray Lehtiniemi Date: Fri, 10 Apr 2009 14:43:43 +0000 Subject: [PATCH] [valgrind] fix memleak Signed-off-by: Ray Lehtiniemi svn path=/trunk/kdenlive/; revision=3273 --- src/trackview.cpp | 19 +++++++++---------- src/trackview.h | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/trackview.cpp b/src/trackview.cpp index 8ec56a80..6e193b37 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -43,8 +43,7 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : m_doc(doc) { - view = new Ui::TimeLine_UI(); - view->setupUi(this); + view.setupUi(this); m_scene = new CustomTrackScene(doc); m_trackview = new CustomTrackView(doc, m_scene, parent); @@ -55,7 +54,7 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : m_ruler = new CustomRuler(doc->timecode(), m_trackview); connect(m_ruler, SIGNAL(zoneMoved(int, int)), this, SIGNAL(zoneMoved(int, int))); QHBoxLayout *layout = new QHBoxLayout; - view->ruler_frame->setLayout(layout); + view.ruler_frame->setLayout(layout); int left_margin; int right_margin; layout->getContentsMargins(&left_margin, 0, &right_margin, 0); @@ -64,21 +63,21 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : QHBoxLayout *tracksLayout = new QHBoxLayout; tracksLayout->setContentsMargins(0, 0, 0, 0); - view->tracks_frame->setLayout(tracksLayout); + view.tracks_frame->setLayout(tracksLayout); - view->headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - view->headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + view.headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + view.headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_headersLayout = new QVBoxLayout; m_headersLayout->setContentsMargins(0, 0, 0, 0); m_headersLayout->setSpacing(0); - view->headers_container->setLayout(m_headersLayout); + view.headers_container->setLayout(m_headersLayout); - connect(view->headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); + connect(view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); tracksLayout->addWidget(m_trackview); - connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), view->headers_area->verticalScrollBar(), SLOT(setValue(int))); + connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), view.headers_area->verticalScrollBar(), SLOT(setValue(int))); connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders())); parseDocument(m_doc->toXml()); @@ -419,7 +418,7 @@ void TrackView::slotRebuildTrackHeaders() connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int))); m_headersLayout->addWidget(header); } - view->headers_container->adjustSize(); + view.headers_container->adjustSize(); } diff --git a/src/trackview.h b/src/trackview.h index 69646e4f..4c76dbb5 100644 --- a/src/trackview.h +++ b/src/trackview.h @@ -66,7 +66,7 @@ public slots: void slotSetZone(QPoint p); private: - Ui::TimeLine_UI *view; + Ui::TimeLine_UI view; CustomRuler *m_ruler; CustomTrackView *m_trackview; QList m_invalidProducers; -- 2.39.2