From c0a802b59e1edddeb0b621e15137f5058299efd7 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Fri, 10 Apr 2015 10:44:13 +0100
Subject: Audit and correct misc. clears -> disposeAndClears.

Anything that used to be 'delete'd should be disposeAndCleared()
in the new world.
---
 xmlsecurity/source/dialogs/certificatechooser.cxx      | 2 +-
 xmlsecurity/source/dialogs/certificateviewer.cxx       | 2 +-
 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 2 +-
 xmlsecurity/source/dialogs/macrosecurity.cxx           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'xmlsecurity')

diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index f6c8cc9f9bbc..28050b6b5e44 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -86,7 +86,7 @@ CertificateChooser::~CertificateChooser()
 
 void CertificateChooser::dispose()
 {
-    m_pCertLB.clear();
+    m_pCertLB.disposeAndClear();
     m_pViewBtn.clear();
     m_pOKBtn.clear();
     ModalDialog::dispose();
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 544e859febe2..5c77f69e2d1d 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -299,8 +299,8 @@ CertificateViewerDetailsTP::~CertificateViewerDetailsTP()
 void CertificateViewerDetailsTP::dispose()
 {
     Clear();
+    m_pElementsLB.disposeAndClear();
     m_pElementsLBContainer.clear();
-    m_pElementsLB.clear();
     m_pValueDetails.clear();
     CertificateViewerTP::dispose();
 }
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 03e9cfc26842..9cfde2bec778 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -240,10 +240,10 @@ DigitalSignaturesDialog::~DigitalSignaturesDialog()
 
 void DigitalSignaturesDialog::dispose()
 {
+    m_pSignaturesLB.disposeAndClear();
     m_pHintDocFT.clear();
     m_pHintBasicFT.clear();
     m_pHintPackageFT.clear();
-    m_pSignaturesLB.clear();
     m_pSigsValidImg.clear();
     m_pSigsValidFI.clear();
     m_pSigsInvalidImg.clear();
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 9a7a0685215f..6ff60ac94dbd 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -435,7 +435,7 @@ MacroSecurityTrustedSourcesTP::~MacroSecurityTrustedSourcesTP()
 
 void MacroSecurityTrustedSourcesTP::dispose()
 {
-    m_pTrustCertLB.clear();
+    m_pTrustCertLB.disposeAndClear();
     m_pTrustCertROFI.clear();
     m_pViewCertPB.clear();
     m_pRemoveCertPB.clear();
-- 
cgit