diff options
author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-11-08 13:54:04 +0100 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-11-08 14:13:32 +0100 |
commit | cfb59b052a294c4063284352f7f797cb30e98c4d (patch) | |
tree | c603d476879f9a648117439f27927d2aeb9dacd3 | |
parent | 26cd5e1601f85983a17ff082124eccf38683c9c3 (diff) |
Fix memory leaks.
Migrated from r71 of the RCT repo.
Reviewed-by: owolff
-rw-r--r-- | library/remotecontrolwidget.cpp | 2 | ||||
-rw-r--r-- | library/toolbox.cpp | 9 | ||||
-rw-r--r-- | library/toolbox.h | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/library/remotecontrolwidget.cpp b/library/remotecontrolwidget.cpp index ae6646f..92d5528 100644 --- a/library/remotecontrolwidget.cpp +++ b/library/remotecontrolwidget.cpp @@ -85,7 +85,7 @@ RemoteControlWidget::RemoteControlWidget(QWidget *parent) RemoteControlWidget::~RemoteControlWidget() { - + delete mManhattanStyle; } void RemoteControlWidget::changeFilters() diff --git a/library/toolbox.cpp b/library/toolbox.cpp index 584f537..f116937 100644 --- a/library/toolbox.cpp +++ b/library/toolbox.cpp @@ -63,15 +63,16 @@ ToolBox::ToolBox(bool pagesOpenOnInsertion, QWidget *parent) setWidgetResizable(true); // Some styles have extra up/down buttons in the scrollbar. We only support // the plain scrollbars and therefore force the style to be derived from cleanlooks for them. - QStyle *forceScrollbarStyle = new ScrollBarStyle; - setStyle(forceScrollbarStyle); - verticalScrollBar()->setStyle(forceScrollbarStyle); + mForceScrollbarStyle = new ScrollBarStyle; + setStyle(mForceScrollbarStyle); + verticalScrollBar()->setStyle(mForceScrollbarStyle); setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); setWidget(contentWidget); } ToolBox::~ToolBox() { + delete mForceScrollbarStyle; } bool ToolBox::addPage(ToolBoxPage *page) @@ -198,6 +199,7 @@ ToolBoxPage::ToolBoxPage(QWidget *parent) ToolBoxPage::~ToolBoxPage() { + qDeleteAll(mOptions); } void ToolBoxPage::setOptions(const QList<OptionsItem *> &options) @@ -205,6 +207,7 @@ void ToolBoxPage::setOptions(const QList<OptionsItem *> &options) foreach (const OptionsItem *option, mOptions) { disconnect(option, SIGNAL(advancedButtonClicked(OptionsItem*)), this, SLOT(toggleAdvanced(OptionsItem *))); + delete option; } mOptions = options; diff --git a/library/toolbox.h b/library/toolbox.h index 8e8d18b..9ee30bd 100644 --- a/library/toolbox.h +++ b/library/toolbox.h @@ -73,6 +73,9 @@ private: private slots: void processPageMinimalInputWidth(int newWidth); + +private: + QStyle *mForceScrollbarStyle; }; class REMOTECONTROLWIDGETSHARED_EXPORT ToolBoxPage : public QFrame @@ -83,7 +86,9 @@ public: explicit ToolBoxPage(QWidget *parent = 0); virtual ~ToolBoxPage(); + // takes ownership void setOptions(const QList<OptionsItem *> &options); + void setTitle(const QString &title); protected slots: |