[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/kipi-plugins
From:       Laurent Montel <montel () kde ! org>
Date:       2011-01-11 12:43:19
Message-ID: 20110111124319.866CCAC8B2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1213735 by mlaurent:

don't check pointer before to delete it


 M  +1 -1      flickrexport/flickrtalker.cpp  
 M  +0 -1      galleryexport/plugin_galleryexport.cpp  
 M  +0 -10     jpeglossless/plugin_jpeglossless.cpp  
 M  +1 -1      metadataedit/xmp/xmpsubjects.cpp  
 M  +0 -1      piwigoexport/plugin_piwigoexport.cpp  
 M  +1 -4      printimages/wizard.cpp  


--- trunk/extragear/graphics/kipi-plugins/flickrexport/flickrtalker.cpp #1213734:1213735
@@ -123,8 +123,8 @@
 {
     if (m_job)
         m_job->kill();
-    if (m_photoSetsList)
         delete m_photoSetsList;
+
 }
 
 /** Compute MD5 signature using url queries keys and values following Flickr notice:
--- trunk/extragear/graphics/kipi-plugins/galleryexport/plugin_galleryexport.cpp #1213734:1213735
@@ -91,7 +91,6 @@
 
 Plugin_GalleryExport::~Plugin_GalleryExport()
 {
-    if (mpGallery)
         delete mpGallery;
 }
 
--- trunk/extragear/graphics/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp #1213734:1213735
@@ -214,11 +214,8 @@
     d->current = 0;
     d->failed  = false;
 
-    if (d->progressDlg)
-    {
         delete d->progressDlg;
         d->progressDlg = 0;
-    }
 
     d->progressDlg = new KIPIPlugins::BatchProgressDialog(kapp->activeWindow(),
                         i18n("Flip images %1", title));
@@ -258,12 +255,8 @@
     d->current = 0;
     d->failed  = false;
 
-    if (d->progressDlg)
-    {
         delete d->progressDlg;
         d->progressDlg = 0;
-    }
-
     d->progressDlg = new KIPIPlugins::BatchProgressDialog(kapp->activeWindow(),
                         i18n("Rotate images %1", title));
 
@@ -291,11 +284,8 @@
     d->current = 0;
     d->failed  = false;
 
-    if (d->progressDlg)
-    {
         delete d->progressDlg;
         d->progressDlg = 0;
-    }
 
     d->progressDlg = new KIPIPlugins::BatchProgressDialog(kapp->activeWindow(),
                         i18n("Convert images to black & white"));
--- trunk/extragear/graphics/kipi-plugins/metadataedit/xmp/xmpsubjects.cpp #1213734:1213735
@@ -83,7 +83,7 @@
                                      "if you selected a standard XMP/NAA reference code."));
 
     // reset the note label, not used in XMP view
-    if (m_note) delete m_note;
+    delete m_note;
 
     m_subjectsCheck->setVisible(true);
 }
--- trunk/extragear/graphics/kipi-plugins/piwigoexport/plugin_piwigoexport.cpp #1213734:1213735
@@ -90,7 +90,6 @@
 
 Plugin_PiwigoExport::~Plugin_PiwigoExport()
 {
-    if (mpPiwigo)
         delete mpPiwigo;
 }
 
--- trunk/extragear/graphics/kipi-plugins/printimages/wizard.cpp #1213734:1213735
@@ -1466,14 +1466,13 @@
         text == i18n ( "Print to JPG" ) || 
         text == i18n ( "Print to gimp" ) )
     {
-        if (d->m_printer)
             delete d->m_printer;
+
         d->m_printer = new QPrinter();
         d->m_printer->setOutputFormat(QPrinter::PdfFormat);
     }
     else if (text == i18n ( "Print to PS" ))
     {
-        if (d->m_printer)
             delete d->m_printer;
         d->m_printer = new QPrinter();
         d->m_printer->setOutputFormat(QPrinter::PostScriptFormat);
@@ -1489,7 +1488,6 @@
             if (it->printerName () == text)
             {
                 kDebug() << "Chosen printer: " << it->printerName ();
-                if (d->m_printer)
                   delete d->m_printer;
                 d->m_printer = new QPrinter(*it);
             }
@@ -2275,7 +2273,6 @@
 
 void Wizard::pagesetupclicked()
 {
-    if (d->m_pDlg)
         delete d->m_pDlg;
     d->m_pDlg = new QPageSetupDialog (d->m_printer, this);
     // TODO next line should work but it doesn't because of a QT bug
[prev in list] [next in list] [prev in thread] [next in thread]