CVS commit by mlaurent: if (bla) delete bla; => delete bla; delete saver in destructor M +6 -2 kclock.cpp 1.8 M +2 -2 kclock.h 1.5 M +11 -6 kvm.cpp 1.10 M +4 -4 kvm.h 1.4 M +3 -3 lines.cpp 1.12 M +5 -0 lorenz.cpp 1.9 M +1 -0 lorenz.h 1.3 M +6 -0 wave.cpp 1.25 M +1 -1 wave.h 1.9 --- kdeartwork/kscreensaver/kdesavers/kclock.cpp #1.7:1.8 @@ -168,4 +168,8 @@ KClockSetup::KClockSetup(QWidget *parent } +KClockSetup::~KClockSetup() +{ + delete m_saver; +} void KClockSetup::readSettings() --- kdeartwork/kscreensaver/kdesavers/kclock.h #1.4:1.5 @@ -97,5 +97,5 @@ class KClockSetup : public KDialogBase public: KClockSetup(QWidget *parent = 0, const char *name = 0); - + ~KClockSetup(); protected: void readSettings(); --- kdeartwork/kscreensaver/kdesavers/kvm.cpp #1.9:1.10 @@ -323,4 +323,9 @@ kVmSetup::kVmSetup( QWidget *parent, con } +kVmSetup::~kVmSetup() +{ + delete saver; +} + void kVmSetup::readSettings() { --- kdeartwork/kscreensaver/kdesavers/kvm.h #1.3:1.4 @@ -77,5 +77,5 @@ class kVmSetup : public KDialogBase public: kVmSetup( QWidget *parent = NULL, const char *name = NULL ); - + ~kVmSetup(); protected: void readSettings(); --- kdeartwork/kscreensaver/kdesavers/lines.cpp #1.11:1.12 @@ -291,5 +291,5 @@ kLinesSaver::~kLinesSaver(){ QColor::leaveAllocContext(); QColor::destroyAllocContext(colorContext); - if(lines) delete lines; + delete lines; } @@ -362,5 +362,5 @@ void kLinesSaver::initialiseLines(){ uint i; int x1,y1,x2,y2; - if(lines) delete lines; + delete lines; lines=new Lines(numLines); lines->reset(); --- kdeartwork/kscreensaver/kdesavers/lorenz.cpp #1.8:1.9 @@ -148,4 +148,9 @@ KLorenzSetup::KLorenzSetup( QWidget *par } +KLorenzSetup::~KLorenzSetup() +{ + delete saver; +} + // read settings from config file void KLorenzSetup::readSettings() --- kdeartwork/kscreensaver/kdesavers/lorenz.h #1.2:1.3 @@ -59,4 +59,5 @@ class KLorenzSetup : public KDialogBase public: KLorenzSetup(QWidget *parent = 0, const char *name = 0 ); + ~KLorenzSetup(); protected: --- kdeartwork/kscreensaver/kdesavers/wave.cpp #1.24:1.25 @@ -70,4 +70,10 @@ KWaveSetup::KWaveSetup( QWidget *parent, } +KWaveSetup::~KWaveSetup( ) +{ + delete saver; +} + + // read settings from config file void KWaveSetup::readSettings() --- kdeartwork/kscreensaver/kdesavers/wave.h #1.8:1.9 @@ -75,5 +75,5 @@ class KWaveSetup : public SetupUi public: KWaveSetup( QWidget *parent = NULL, const char *name = NULL ); - + ~KWaveSetup( ); protected: void readSettings();