[Kde-imaging] extragear/graphics/kipi-plugins

[Valerio Fuoglio]

SVN commit 874682 by vfuoglio:

Fixed bug 173276.
Patch by Andi Clemens (thanks Andi).

BUG: 173276
CCMAIL: kde-imaging at kde.org 



 M  +2 -1      NEWS  
 M  +16 -16    slideshow/common.cpp  
 M  +1 -1      slideshow/imageviewer.cpp  
 M  +1 -1      slideshow/listimageitems.cpp  
 M  +1 -1      slideshow/listsounditems.cpp  
 M  +1 -1      slideshow/maindialog.cpp  
 M  +2 -2      slideshow/playbackwidget.cpp  
 M  +2 -2      slideshow/plugin_slideshow.cpp  
 M  +6 -6      slideshow/slideshow.cpp  
 M  +1 -1      slideshow/slideshowconfig.cpp  
 M  +4 -4      slideshow/slideshowgl.cpp  
 M  +6 -6      slideshow/slideshowkb.cpp  
 M  +5 -5      slideshow/slideshowloader.cpp  
 M  +1 -1      slideshow/soundtrackdialog.cpp  


--- trunk/extragear/graphics/kipi-plugins/NEWS #874681:874682
@@ -9,7 +9,8 @@
 
 001 ==> 172283 : SlideShow          : SlideShow crashes host application 
 002 ==> 172337 : SlideShow          : Slideshow enhancements by ken-burns effects.
-003 ==> 
+003 ==> 173276 : SlideShow	    : digikam crashs after closing 
+004 ==> 
 
 v 0.2.0 - beta2
 ------------------------------------------------------------------------
--- trunk/extragear/graphics/kipi-plugins/slideshow/common.cpp #874681:874682
@@ -22,11 +22,11 @@
 
 // local includes
 #include "common.h"
- 
+
 namespace KIPISlideShowPlugin
 {
 
-SharedData::SharedData() 
+SharedData::SharedData()
 {
     interface = 0;
     delayMsMaxValue = 0;
@@ -57,7 +57,7 @@
 
     useMilliseconds = false;
     enableMouseWheel = false;
-    enableCache = false; 
+    enableCache = false;
     kbDisableFadeInOut = false;
     kbDisableCrossFade = false;
     cacheSize = 0;
@@ -68,24 +68,24 @@
     page_advanced = 0;
 }
 
-SharedData::~SharedData() 
+SharedData::~SharedData()
 {
-    if ( mainPage ) delete mainPage;
-    if ( captionPage ) delete captionPage;
-    if ( soundtrackPage ) delete soundtrackPage;
-    if ( advancedPage ) delete advancedPage;
-
-    if ( page_main ) delete page_main;
-    if ( page_caption ) delete page_caption;
-    if ( page_soundtrack ) delete page_soundtrack;
-    if ( page_advanced ) delete page_advanced;
-
-    if ( captionFont ) delete captionFont;
+//    if ( mainPage ) delete mainPage;
+//    if ( captionPage ) delete captionPage;
+//    if ( soundtrackPage ) delete soundtrackPage;
+//    if ( advancedPage ) delete advancedPage;
+//
+//    if ( page_main ) delete page_main;
+//    if ( page_caption ) delete page_caption;
+//    if ( page_soundtrack ) delete page_soundtrack;
+//    if ( page_advanced ) delete page_advanced;
+//
+//    if ( captionFont ) delete captionFont;
 }
 
 
 VolumeSlider::VolumeSlider(QWidget* parent)
-            : Phonon::VolumeSlider(parent) 
+            : Phonon::VolumeSlider(parent)
 {
 }
 
--- trunk/extragear/graphics/kipi-plugins/slideshow/imageviewer.cpp #874681:874682
@@ -49,7 +49,7 @@
 
 ImageViewer::~ImageViewer()
 {
-    delete m_svgRenderer;
+//    delete m_svgRenderer;
 }
 
 QImage ImageViewer::image() const
--- trunk/extragear/graphics/kipi-plugins/slideshow/listimageitems.cpp #874681:874682
@@ -59,7 +59,7 @@
 
 ImageItem::~ImageItem()
 {
-    if (m_thumbJob) delete m_thumbJob;
+//    if (m_thumbJob) delete m_thumbJob;
 }
 
 QString ImageItem::comments()
--- trunk/extragear/graphics/kipi-plugins/slideshow/listsounditems.cpp #874681:874682
@@ -60,7 +60,7 @@
 
 SoundItem::~SoundItem()
 {
-    delete m_mediaObject;
+//    delete m_mediaObject;
 }
 
 KUrl SoundItem::url()
--- trunk/extragear/graphics/kipi-plugins/slideshow/maindialog.cpp #874681:874682
@@ -69,7 +69,7 @@
 
 MainDialog::~MainDialog()
 {
-    if (m_thumbJob) delete m_thumbJob;
+//    if (m_thumbJob) delete m_thumbJob;
 }
 
 void MainDialog::readSettings()
--- trunk/extragear/graphics/kipi-plugins/slideshow/playbackwidget.cpp #874681:874682
@@ -113,8 +113,8 @@
     if (!m_urlList.empty())
     {
         m_mediaObject->stop();
-        delete m_mediaObject;
-        delete m_audioOutput;
+//        delete m_mediaObject;
+//        delete m_audioOutput;
     }
 }
 
--- trunk/extragear/graphics/kipi-plugins/slideshow/plugin_slideshow.cpp #874681:874682
@@ -109,8 +109,8 @@
 
 Plugin_SlideShow::~Plugin_SlideShow()
 {
-    if (m_urlList)
-        delete m_urlList;
+//    if (m_urlList)
+//        delete m_urlList;
 }
 
 void Plugin_SlideShow::slotActivate()
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshow.cpp #874681:874682
@@ -168,9 +168,9 @@
 SlideShow::~SlideShow()
 {
     m_timer->stop();
-    delete m_timer;
+//    delete m_timer;
     m_mouseMoveTimer->stop();
-    delete m_mouseMoveTimer;
+//    delete m_mouseMoveTimer;
 
     if (m_painter->isActive())
         m_painter->end();
@@ -178,20 +178,20 @@
     if (m_intArray)
         delete [] m_intArray;
 
-    if (m_currImage)
-        delete m_currImage;
+//    if (m_currImage)
+//        delete m_currImage;
 
     if (m_imageLoader)
         delete m_imageLoader;
 
-    delete m_painter;
+//    delete m_painter;
 }
 
 void SlideShow::readSettings()
 {
-    
 
 
+
 }
 
 void SlideShow::registerEffects()
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshowconfig.cpp #874681:874682
@@ -52,7 +52,7 @@
 
     ~SlideShowConfigPrivate()
     {
-        if (config) delete config;
+//        if (config) delete config;
     }
 
     KIPIPlugins::KPAboutData* about;
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshowgl.cpp #874681:874682
@@ -175,10 +175,10 @@
 
 SlideShowGL::~SlideShowGL()
 {
-    delete m_timer;
-    delete m_mouseMoveTimer;
-    delete m_playbackWidget;
-    delete m_slidePlaybackWidget;
+//    delete m_timer;
+//    delete m_mouseMoveTimer;
+//    delete m_playbackWidget;
+//    delete m_slidePlaybackWidget;
 
     if (m_texture[0])
         glDeleteTextures(1, &m_texture[0]);
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshowkb.cpp #874681:874682
@@ -264,7 +264,7 @@
     delete m_image[0];
     delete m_image[1];
 
-    delete m_playbackWidget;
+//    delete m_playbackWidget;
 
     m_imageLoadThread->quit();
     bool terminated = m_imageLoadThread->wait(10000);
@@ -275,13 +275,13 @@
         terminated = m_imageLoadThread->wait(3000);
     }
 
-    if (terminated)
-        delete m_imageLoadThread;
+//    if (terminated)
+//        delete m_imageLoadThread;
 
-    delete m_mouseMoveTimer;
+//    delete m_mouseMoveTimer;
+//
+//    delete m_timer;
 
-    delete m_timer;
-
     delete m_screen;
 }
 
--- trunk/extragear/graphics/kipi-plugins/slideshow/slideshowloader.cpp #874681:874682
@@ -129,11 +129,11 @@
     m_threadLock->unlock();
 
 
-    delete(m_loadingThreads);
-    delete(m_loadedImages);
-
-    delete(m_imageLock);
-    delete(m_threadLock);
+//    delete(m_loadingThreads);
+//    delete(m_loadedImages);
+//
+//    delete(m_imageLock);
+//    delete(m_threadLock);
 }
 
 void SlideShowLoader::next()
--- trunk/extragear/graphics/kipi-plugins/slideshow/soundtrackdialog.cpp #874681:874682
@@ -56,7 +56,7 @@
 
 SoundtrackPreview::~SoundtrackPreview()
 {
-    delete m_playbackWidget;
+//    delete m_playbackWidget;
 }
 
 // ===================