[Kde-imaging] extragear/libs/kipi-plugins/metadataedit

Valerio Fuoglio valerio.fuoglio at kdemail.net
Thu Nov 16 20:34:07 CET 2006


SVN commit 605452 by vfuoglio:

Fixed memory leaks (KHelpMenu unallocate about data)

CCMAIL: kde-imaging at kde.org

 M  +14 -9     exifeditdialog.cpp  
 M  +9 -4      iptceditdialog.cpp  


--- trunk/extragear/libs/kipi-plugins/metadataedit/exifeditdialog.cpp #605451:605452
@@ -69,6 +69,8 @@
         isReadOnly    = false;
         interface     = 0;
 
+        about         = 0;
+
         page_caption  = 0;
         page_datetime = 0;
         page_lens     = 0;
@@ -96,7 +98,7 @@
     QFrame               *page_device;
     QFrame               *page_light;
     QFrame               *page_adjust;
-    
+
     KURL::List            urls;
 
     KURL::List::iterator  currItem;
@@ -109,6 +111,8 @@
     EXIFAdjust           *adjustPage;
 
     KIPI::Interface      *interface;
+
+    KIPIPlugins::KPAboutData *about;
 };
 
 EXIFEditDialog::EXIFEditDialog(QWidget* parent, KURL::List urls, KIPI::Interface *iface)
@@ -153,16 +157,16 @@
     // ---------------------------------------------------------------
     // About data and help button.
 
-    KIPIPlugins::KPAboutData * about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"),
-                                           NULL,
-                                           KAboutData::License_GPL,
-                                           I18N_NOOP("A Plugin to edit pictures metadata"),
-                                           "(c) 2006, Gilles Caulier");
+    d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"),
+                                            NULL,
+                                            KAboutData::License_GPL,
+                                            I18N_NOOP("A Plugin to edit pictures metadata"),
+                                            "(c) 2006, Gilles Caulier");
 
-    about->addAuthor("Gilles Caulier", I18N_NOOP("Author and Maintainer"),
-                     "caulier dot gilles at kdemail dot net");
+    d->about->addAuthor("Gilles Caulier", I18N_NOOP("Author and Maintainer"),
+                        "caulier dot gilles at kdemail dot net");
 
-    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+    KHelpMenu* helpMenu = new KHelpMenu(this, d->about, false);
     helpMenu->menu()->removeItemAt(0);
     helpMenu->menu()->insertItem(i18n("Edit Metadata Handbook"),
                                  this, SLOT(slotHelp()), 0, -1, 0);
@@ -196,6 +200,7 @@
 
 EXIFEditDialog::~EXIFEditDialog()
 {
+    delete d->about;
     delete d;
 }
 
--- trunk/extragear/libs/kipi-plugins/metadataedit/iptceditdialog.cpp #605451:605452
@@ -72,6 +72,8 @@
         page_origin   = 0;
         page_datetime = 0;
 
+        about         = 0;
+
         captionPage   = 0;
         subjectsPage  = 0;
         keywordsPage  = 0;
@@ -99,6 +101,8 @@
 
     KURL::List::iterator  currItem;
 
+    KIPIPlugins::KPAboutData *about;
+
     IPTCCaption          *captionPage;
     IPTCSubjects         *subjectsPage;
     IPTCKeywords         *keywordsPage;
@@ -158,16 +162,16 @@
     // ---------------------------------------------------------------
     // About data and help button.
 
-    KIPIPlugins::KPAboutData * about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"),
+    d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"),
                                             NULL,
                                             KAboutData::License_GPL,
                                             I18N_NOOP("A Plugin to edit pictures metadata"),
                                             "(c) 2006, Gilles Caulier");
 
-    about->addAuthor("Gilles Caulier", I18N_NOOP("Author and Maintainer"),
-                     "caulier dot gilles at kdemail dot net");
+    d->about->addAuthor("Gilles Caulier", I18N_NOOP("Author and Maintainer"),
+                        "caulier dot gilles at kdemail dot net");
 
-    KHelpMenu* helpMenu = new KHelpMenu(this, about, false);
+    KHelpMenu* helpMenu = new KHelpMenu(this, d->about, false);
     helpMenu->menu()->removeItemAt(0);
     helpMenu->menu()->insertItem(i18n("Edit Metadata Handbook"),
                                  this, SLOT(slotHelp()), 0, -1, 0);
@@ -207,6 +211,7 @@
 
 IPTCEditDialog::~IPTCEditDialog()
 {
+    delete d->about;
     delete d;
 }
 


More information about the Kde-imaging mailing list