[GUIDialogPictureInfo] Use unique_ptr for exif info

xbmc · Jun 22, 2024 · 6a6f589 · 6a6f589
1 parent 5a1495b
commit 6a6f589
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/xbmc/pictures/GUIDialogPictureInfo.cpp b/xbmc/pictures/GUIDialogPictureInfo.cpp
@@ -24,17 +24,12 @@
 #define SLIDESHOW_STRING_BASE 21800 - SLIDESHOW_LABELS_START
 
 CGUIDialogPictureInfo::CGUIDialogPictureInfo(void)
- : CGUIDialog(WINDOW_DIALOG_PICTURE_INFO, "DialogPictureInfo.xml")
+ : CGUIDialog(WINDOW_DIALOG_PICTURE_INFO, "DialogPictureInfo.xml"),
+ m_pictureInfo{std::make_unique<CFileItemList>()}
 {
- m_pictureInfo = new CFileItemList;
  m_loadType = KEEP_IN_MEMORY;
 }
 
-CGUIDialogPictureInfo::~CGUIDialogPictureInfo(void)
-{
- delete m_pictureInfo;
-}
-
 void CGUIDialogPictureInfo::SetPicture(CFileItem *item)
 {
  CServiceBroker::GetGUI()->GetInfoManager().GetInfoProviders().GetPicturesInfoProvider().SetCurrentSlide(item);
@@ -102,7 +97,7 @@ void CGUIDialogPictureInfo::UpdatePictureInfo()
  m_pictureInfo->Add(item);
  }
  }
- CGUIMessage msg(GUI_MSG_LABEL_BIND, GetID(), CONTROL_PICTURE_INFO, 0, 0, m_pictureInfo);
+ CGUIMessage msg(GUI_MSG_LABEL_BIND, GetID(), CONTROL_PICTURE_INFO, 0, 0, m_pictureInfo.get());
  OnMessage(msg);
 }
 

diff --git a/xbmc/pictures/GUIDialogPictureInfo.h b/xbmc/pictures/GUIDialogPictureInfo.h
@@ -10,14 +10,16 @@
 
 #include "guilib/GUIDialog.h"
 
+#include <memory>
+
 class CFileItemList;
 
 class CGUIDialogPictureInfo :
  public CGUIDialog
 {
 public:
  CGUIDialogPictureInfo(void);
- ~CGUIDialogPictureInfo(void) override;
+ ~CGUIDialogPictureInfo(void) = default;
  void SetPicture(CFileItem *item);
  void FrameMove() override;
 
@@ -27,6 +29,6 @@ class CGUIDialogPictureInfo :
  bool OnAction(const CAction& action) override;
  void UpdatePictureInfo();
 
- CFileItemList* m_pictureInfo;
+ std::unique_ptr<CFileItemList> m_pictureInfo;
  std::string m_currentPicture;
 };