From cfdfe9251cae57e48d91b51f46c258d8361f442b Mon Sep 17 00:00:00 2001
From: Hugo Pereira Da Costa <hugo@oxygen-icons.org>
Date: Mon, 25 Jul 2011 17:04:28 +0200
Subject: [PATCH] git pull Revert "use QWeakPointer (and explicit deletion, if
 needed) instead of QSharedPointer"

This reverts commit 73da3a77f2041ac3de44842a162243c036fd32f9.
CCBUG: 277925
---
 .../config/oxygenexceptionlistwidget.cpp      | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/clients/oxygen/config/oxygenexceptionlistwidget.cpp b/clients/oxygen/config/oxygenexceptionlistwidget.cpp
index 51e18fe414..677513f6d9 100644
--- a/clients/oxygen/config/oxygenexceptionlistwidget.cpp
+++ b/clients/oxygen/config/oxygenexceptionlistwidget.cpp
@@ -27,7 +27,7 @@
 #include "oxygenexceptionlistwidget.moc"
 #include "oxygenexceptiondialog.h"
 
-#include <QtCore/QWeakPointer>
+#include <QtCore/QSharedPointer>
 #include <KLocale>
 #include <KMessageBox>
 
@@ -113,14 +113,13 @@ namespace Oxygen
     {
 
         // map dialog
-        QWeakPointer<ExceptionDialog> dialog( new ExceptionDialog( this ) );
-        dialog.data()->setException( _defaultConfiguration );
-        if( dialog.data()->exec() == QDialog::Rejected || !dialog ) return;
+        QSharedPointer<ExceptionDialog> dialog( new ExceptionDialog( this ) );
+        dialog->setException( _defaultConfiguration );
+        if( dialog->exec() == QDialog::Rejected ) return;
 
         // retrieve exception and check
-        Exception exception( dialog.data()->exception() );
+        Exception exception( dialog->exception() );
         if( !checkException( exception ) ) return;
-        delete dialog.data();
 
         // create new item
         model().add( exception );
@@ -150,13 +149,12 @@ namespace Oxygen
         Exception& exception( model().get( current ) );
 
         // create dialog
-        QWeakPointer<ExceptionDialog> dialog( new ExceptionDialog( this ) );
-        dialog.data()->setException( exception );
+        QSharedPointer<ExceptionDialog> dialog( new ExceptionDialog( this ) );
+        dialog->setException( exception );
 
         // map dialog
-        if( dialog.data()->exec() == QDialog::Rejected || !dialog ) return;
-        Exception newException = dialog.data()->exception();
-        delete dialog.data();
+        if( dialog->exec() == QDialog::Rejected ) return;
+        Exception newException = dialog->exception();
 
         // check if exception was changed
         if( exception == newException ) return;
@@ -312,11 +310,10 @@ namespace Oxygen
         {
 
             KMessageBox::error( this, i18n("Regular Expression syntax is incorrect") );
-            QWeakPointer<ExceptionDialog> dialog( new ExceptionDialog( this ) );
-            dialog.data()->setException( exception );
-            if( dialog.data()->exec() == QDialog::Rejected || !dialog ) return false;
-            exception = dialog.data()->exception();
-            delete dialog.data();
+            QSharedPointer<ExceptionDialog> dialog( new ExceptionDialog( this ) );
+            dialog->setException( exception );
+            if( dialog->exec() == QDialog::Rejected ) return false;
+            exception = dialog->exception();
 
         }