Squashed commit of the topic/exceptions branch.

Contains some smaller fixes and renaming of macros. Looks big,
but isn't scary at all ;)

1 files changed, 1 insertions, 7 deletions

diff --git a/src/gui/painting/qprinterinfo_win.cpp b/src/gui/painting/qprinterinfo_win.cpp
index e047f5de9e..3f2c5104c0 100644
--- a/src/gui/painting/qprinterinfo_win.cpp
+++ b/src/gui/painting/qprinterinfo_win.cpp
@@ -69,7 +69,7 @@ private:
 
 static QPrinterInfoPrivate nullQPrinterInfoPrivate;
 
-class QPrinterInfoPrivateCleanup
+class QPrinterInfoPrivateDeleter
 {
 public:
     static inline void cleanup(QPrinterInfoPrivate *d)
@@ -77,12 +77,6 @@ public:
         if (d != &nullQPrinterInfoPrivate)
             delete d;
     }
-
-    static inline void reset(QPrinterInfoPrivate *&d, QPrinterInfoPrivate *other)
-    {
-        cleanup(d);
-        d = other;
-    }
 };
 
 /////////////////////////////////////////////////////////////////////////////