From 6d91374dffe0a9fda941231cefbd77e297aa6c97 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 21 Jan 2019 19:37:24 +0100
Subject: [PATCH] Simplify QPainter ownership in wxQtGraphicsContext

No real changes, just refactor the code to use more explicit
AttachPainter() when giving ownership of a new QPainter object to
wxQtGraphicsContext.

This method also allows to simplify wxQtImageContext as it doesn't need
to handle ownership on its own and can just leave it to the base class.

And m_ownsPainter can now be made private.
---
 src/qt/graphics.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/qt/graphics.cpp b/src/qt/graphics.cpp
index 5b2d32122e..7e0aaccac0 100644
--- a/src/qt/graphics.cpp
+++ b/src/qt/graphics.cpp
@@ -648,6 +648,14 @@ class WXDLLIMPEXP_CORE wxQtGraphicsContext : public wxGraphicsContext
     }
 
 protected:
+    // Use the specified painter and take ownership of it, i.e. it will be
+    // destroyed in this class dtor.
+    void AttachPainter(QPainter* painter)
+    {
+        m_qtPainter = painter;
+        m_ownsPainter = true;
+    }
+
     wxQtGraphicsContext(wxGraphicsRenderer* renderer)
         : wxGraphicsContext(renderer),
           m_qtPainter(NULL),
@@ -687,13 +695,6 @@ public:
 
 #endif
 
-    wxQtGraphicsContext(wxGraphicsRenderer* renderer, QPainter* painter, bool ownsPainter = true)
-        : wxGraphicsContext(renderer),
-          m_qtPainter(painter),
-          m_ownsPainter(ownsPainter)
-    {
-    }
-
     wxQtGraphicsContext(wxGraphicsRenderer* renderer, wxWindow *window)
         : wxGraphicsContext(renderer)
     {
@@ -1054,9 +1055,10 @@ protected:
     }
 
     QPainter* m_qtPainter;
-    bool m_ownsPainter;
 
 private:
+    bool m_ownsPainter;
+
     wxDECLARE_NO_COPY_CLASS(wxQtGraphicsContext);
 };
 
@@ -1064,8 +1066,9 @@ class wxQtMeasuringContext : public wxQtGraphicsContext
 {
 public:
     wxQtMeasuringContext(wxGraphicsRenderer* renderer)
-        : wxQtGraphicsContext(renderer, new QPainter())
+        : wxQtGraphicsContext(renderer)
     {
+        AttachPainter(new QPainter());
     }
 };
 
@@ -1078,15 +1081,13 @@ public:
     {
         const wxBitmap wxbitmap(image);
         m_pixmap = *wxbitmap.GetHandle();
-        m_qtPainter = new QPainter(&m_pixmap);
-        m_ownsPainter = false;
+        AttachPainter(new QPainter(&m_pixmap));
     }
 
     ~wxQtImageContext()
     {
         wxQtBitmapData bitmap(GetRenderer(), &m_pixmap);
         m_image = bitmap.DoConvertToImage();
-        delete m_qtPainter;
     }
 
 private: