[Digikam-devel] branches/stable/extragear/graphics/digikamimageplugins

[Gilles Caulier]

SVN commit 488418 by cgilles:

Digikam from stable : fix memory leak : memory allocation are cleaned to close event only. This must be done too when user pressing ok or cancel !

CCMAIL: digikam-devel at kde.org

 M  +0 -5      adjustcurves/adjustcurves.cpp  
 M  +0 -4      adjustcurves/adjustcurves.h  
 M  +0 -5      adjustlevels/adjustlevels.cpp  
 M  +0 -4      adjustlevels/adjustlevels.h  
 M  +0 -5      channelmixer/channelmixer.cpp  
 M  +0 -4      channelmixer/channelmixer.h  
 M  +0 -5      whitebalance/imageeffect_whitebalance.cpp  
 M  +1 -5      whitebalance/imageeffect_whitebalance.h  


--- branches/stable/extragear/graphics/digikamimageplugins/adjustcurves/adjustcurves.cpp #488417:488418
@@ -294,13 +294,8 @@
 
 AdjustCurveDialog::~AdjustCurveDialog()
 {
-}
-
-void AdjustCurveDialog::closeEvent(QCloseEvent *e)
-{
     delete m_curvesWidget;
     delete m_curves;
-    e->accept();
 }
 
 void AdjustCurveDialog::slotSpotColorChanged(const QColor &color, bool release)
--- branches/stable/extragear/graphics/digikamimageplugins/adjustcurves/adjustcurves.h #488417:488418
@@ -56,10 +56,6 @@
     AdjustCurveDialog(QWidget *parent, uint *imageData, uint width, uint height);
     ~AdjustCurveDialog();
 
-protected:
-
-    void closeEvent(QCloseEvent *e);
-    
 private:
     
     enum ColorPicker
--- branches/stable/extragear/graphics/digikamimageplugins/adjustlevels/adjustlevels.cpp #488417:488418
@@ -371,13 +371,8 @@
 
 AdjustLevelDialog::~AdjustLevelDialog()
 {
-}
-
-void AdjustLevelDialog::closeEvent(QCloseEvent *e)
-{
     delete m_histogramWidget;
     delete m_levels;
-    e->accept();
 }
 
 void AdjustLevelDialog::slotSpotColorChanged(const QColor &color, bool release)
--- branches/stable/extragear/graphics/digikamimageplugins/adjustlevels/adjustlevels.h #488417:488418
@@ -55,10 +55,6 @@
     AdjustLevelDialog(QWidget *parent, uint *imageData, uint width, uint height);
     ~AdjustLevelDialog();
 
-protected:
-
-    void closeEvent(QCloseEvent *e);
-    
 private:
     
     enum HistogramScale
--- branches/stable/extragear/graphics/digikamimageplugins/channelmixer/channelmixer.cpp #488417:488418
@@ -272,17 +272,12 @@
 
 ChannelMixerDialog::~ChannelMixerDialog()
 {
-}
-
-void ChannelMixerDialog::closeEvent(QCloseEvent *e)
-{
     m_histogramWidget->stopHistogramComputation();
 
     if (m_destinationPreviewData) 
        delete [] m_destinationPreviewData;
        
     delete m_histogramWidget;
-    e->accept();
 }
 
 void ChannelMixerDialog::slotResetCurrentChannel()
--- branches/stable/extragear/graphics/digikamimageplugins/channelmixer/channelmixer.h #488417:488418
@@ -67,10 +67,6 @@
     Logarithmic
     };
 
-protected:
-
-    void closeEvent(QCloseEvent *e);
-    
 private:
     
     double                        m_redRedGain;
--- branches/stable/extragear/graphics/digikamimageplugins/whitebalance/imageeffect_whitebalance.cpp #488417:488418
@@ -378,17 +378,12 @@
 
 ImageEffect_WhiteBalance::~ImageEffect_WhiteBalance()
 {
-}
-
-void ImageEffect_WhiteBalance::closeEvent(QCloseEvent *e)
-{
     m_histogramWidget->stopHistogramComputation();
 
     if (m_destinationPreviewData) 
        delete [] m_destinationPreviewData;
        
     delete m_histogramWidget;
-    e->accept();
 }
 
 void ImageEffect_WhiteBalance::slotAutoAdjustExposure(void)
--- branches/stable/extragear/graphics/digikamimageplugins/whitebalance/imageeffect_whitebalance.h #488417:488418
@@ -59,12 +59,8 @@
     ImageEffect_WhiteBalance(QWidget* parent, uint *imageData, uint width, uint height);
     ~ImageEffect_WhiteBalance();
     
-protected:
+private:
 
-    void closeEvent(QCloseEvent *e);    
-
-private:    
-
     bool                          m_clipSat;
     bool                          m_overExp;
     bool                          m_WBind;