Commit 36f0edc9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Preferences: fix some memleaks and fix horrible video-filter bug. :D

parent 22dbf2bf
......@@ -518,5 +518,12 @@ void AdvPrefsPanel::apply()
c->doApply( p_intf );
}
}
void AdvPrefsPanel::clean()
{}
AdvPrefsPanel::~AdvPrefsPanel()
{
qDeleteAll( controls ); controls.clear();
}
......@@ -85,7 +85,7 @@ class AdvPrefsPanel : public QWidget
public:
AdvPrefsPanel( intf_thread_t *, QWidget *, PrefsItemData * );
AdvPrefsPanel( QWidget *);
virtual ~AdvPrefsPanel() {};
virtual ~AdvPrefsPanel();
void apply();
void clean();
private:
......
......@@ -606,8 +606,11 @@ ModuleListConfigControl::ModuleListConfigControl( vlc_object_t *_p_this,
QGridLayout *l, int &line) :
VStringConfigControl( _p_this, _p_item, _parent )
{
groupBox = NULL;
if( !p_item->psz_text ) return;
groupBox = new QGroupBox ( qtr(p_item->psz_text) );
text = new QLineEdit();
text = new QLineEdit;
QGridLayout *layoutGroupBox = new QGridLayout( groupBox );
finish( bycat );
......@@ -641,8 +644,7 @@ ModuleListConfigControl::~ModuleListConfigControl()
{
delete *it;
}
delete groupBox;
delete text;
if( groupBox ) delete groupBox;
}
#define CHECKBOX_LISTS \
......
......@@ -40,6 +40,8 @@
#include <QUrl>
#include <QVBoxLayout>
#include <QtAlgorithms>
#include <string>
#define ICON_HEIGHT 64
......@@ -571,13 +573,7 @@ void SPrefsPanel::updateAudioOptions( int number)
SPrefsPanel::~SPrefsPanel()
{
QList<ConfigControl *>::Iterator conf_it;
for( conf_it = controls.begin() ; conf_it != controls.end() ; conf_it++ )
{
ConfigControl *c = qobject_cast<ConfigControl *>(*conf_it);
delete c;
}
controls.clear();
qDeleteAll( controls ); controls.clear();
}
void SPrefsPanel::updateAudioVolume( int volume )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment