From 0bcc85e4d86f05d61439fd3c579a8d34d0056984 Mon Sep 17 00:00:00 2001 From: mnaumov Date: Fri, 23 Apr 2021 21:55:14 -0700 Subject: [PATCH] scope pointer --- .../UI/PropertyEditor/ThumbnailPropertyCtrl.cpp | 5 ++--- .../UI/PropertyEditor/ThumbnailPropertyCtrl.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp index 4a501484c2..bb9232435a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp @@ -109,7 +109,7 @@ namespace AzToolsFramework { QPoint position = mapToGlobal(pos() - QPoint(185, 0)); QSize size(180, 180); - m_thumbnailEnlarged = new Thumbnailer::ThumbnailWidget(); + m_thumbnailEnlarged.reset(new Thumbnailer::ThumbnailWidget()); m_thumbnailEnlarged->setFixedSize(size); m_thumbnailEnlarged->move(position); m_thumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint); @@ -124,8 +124,7 @@ namespace AzToolsFramework m_dropDownArrow->setPixmap(QPixmap(":/stylesheet/img/triangle0.png")); if (m_thumbnailEnlarged) { - delete m_thumbnailEnlarged; - m_thumbnailEnlarged = nullptr; + m_thumbnailEnlarged.reset(); } QWidget::leaveEvent(e); } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h index ee61deab07..428f24dbf6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.h @@ -57,7 +57,7 @@ namespace AzToolsFramework private: Thumbnailer::SharedThumbnailKey m_key; Thumbnailer::ThumbnailWidget* m_thumbnail = nullptr; - Thumbnailer::ThumbnailWidget* m_thumbnailEnlarged = nullptr; + QScopedPointer m_thumbnailEnlarged; QLabel* m_emptyThumbnail = nullptr; AspectRatioAwarePixmapWidget* m_dropDownArrow = nullptr; };