diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-05-24 21:50:50 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-29 10:17:25 +0200 |
| commit | eb39185acba01250240c289b1b3e64892f615357 (patch) | |
| tree | 7c311e026408c5cd897c94653dc385c2aa5ab222 /src | |
| parent | 186bdec01a62dcc407e21873a6c6a0c484d5df62 (diff) | |
QGraphicsWidget: replace manual memory management with unique_ptr
Change-Id: Ib63812cf1e63e33dff5016d37a37f18bf9aa6ee0
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/graphicsview/qgraphicswidget_p.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/graphicsview/qgraphicswidget_p.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp index cc08b1c566..fd47f444ea 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.cpp +++ b/src/widgets/graphicsview/qgraphicswidget_p.cpp @@ -110,8 +110,6 @@ QGraphicsWidgetPrivate::QGraphicsWidgetPrivate() QGraphicsWidgetPrivate::~QGraphicsWidgetPrivate() { - // Remove any lazily allocated data - delete windowData; } /*! @@ -147,7 +145,7 @@ void QGraphicsWidgetPrivate::ensureWindowFrameMargins() const void QGraphicsWidgetPrivate::ensureWindowData() { if (!windowData) - windowData = new WindowData; + windowData = qt_make_unique<WindowData>(); } void QGraphicsWidgetPrivate::setPalette_helper(const QPalette &palette) diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 5e0fdb693b..e4cc2c3016 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -190,7 +190,8 @@ public: , buttonMouseOver(false) , buttonSunken(false) {} - } *windowData; + }; + std::unique_ptr<WindowData> windowData; void ensureWindowData(); bool setWindowFrameMargins; |