Make Qt exception safer.

Squashed commit of the branch haralds-haralds-qt-s60-topics/topic/exceptions,
which also contains the full history.

Rev-By: Harald Fernengel
Rev-By: Ralf Engels

1 files changed, 21 insertions, 11 deletions

diff --git a/src/gui/painting/qprinterinfo_mac.cpp b/src/gui/painting/qprinterinfo_mac.cpp
index ecd4b5b1a0..ae689f4d3b 100644
--- a/src/gui/painting/qprinterinfo_mac.cpp
+++ b/src/gui/painting/qprinterinfo_mac.cpp
@@ -65,6 +65,22 @@ private:
 
 static QPrinterInfoPrivate nullQPrinterInfoPrivate;
 
+class QPrinterInfoPrivateCleanup
+{
+public:
+    static inline void cleanup(QPrinterInfoPrivate *d)
+    {
+        if (d != &nullQPrinterInfoPrivate)
+            delete d;
+    }
+
+    static inline void reset(QPrinterInfoPrivate *&d, QPrinterInfoPrivate *other)
+    {
+        cleanup(d);
+        d = other;
+    }
+};
+
 extern QPrinter::PaperSize qSizeFTopaperSize(const QSizeF& size);
 
 /////////////////////////////////////////////////////////////////////////////
@@ -106,8 +122,8 @@ QPrinterInfo QPrinterInfo::defaultPrinter(){
 /////////////////////////////////////////////////////////////////////////////
 
 QPrinterInfo::QPrinterInfo(const QPrinter& prn)
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
     QList<QPrinterInfo> list = availablePrinters();
     for (int c = 0; c < list.size(); ++c) {
         if (prn.printerName() == list[c].printerName()) {
@@ -115,39 +131,33 @@ QPrinterInfo::QPrinterInfo(const QPrinter& prn)
             return;
         }
     }
-
-    *this = QPrinterInfo();
 }
 
 QPrinterInfo::~QPrinterInfo()
 {
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
 }
 
 QPrinterInfo::QPrinterInfo()
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
 }
 
 QPrinterInfo::QPrinterInfo(const QString& name)
+    : d_ptr(new QPrinterInfoPrivate(name))
 {
-    d_ptr = new QPrinterInfoPrivate(name);
     d_ptr->q_ptr = this;
 }
 
 QPrinterInfo::QPrinterInfo(const QPrinterInfo& src)
+    : d_ptr(&nullQPrinterInfoPrivate)
 {
-    d_ptr = &nullQPrinterInfoPrivate;
     *this = src;
 }
 
 QPrinterInfo& QPrinterInfo::operator=(const QPrinterInfo& src)
 {
     Q_ASSERT(d_ptr);
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
-    d_ptr = new QPrinterInfoPrivate(*src.d_ptr);
+    d_ptr.reset(new QPrinterInfoPrivate(*src.d_ptr));
     d_ptr->q_ptr = this;
     return *this;
 }