libretro/Play-
1
0
Fork 0
mirror of https://github.com/libretro/Play-.git synced 2025-03-03 00:46:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use unique_ptr.

Browse Source
This commit is contained in:
Jean-Philip Desjardins 2017-09-05 17:31:50 -04:00
parent 044a4341a6
commit f8356a2d0b
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/ui_win32/VFSManagerWnd.cpp
View File

@ -58,23 +58,15 @@ CVFSManagerWnd::CVFSManagerWnd(HWND hParent)
RefreshLayout();
m_devices[0] = new CDirectoryDevice("mc0", PREF_PS2_MC0_DIRECTORY);
m_devices[1] = new CDirectoryDevice("mc1", PREF_PS2_MC1_DIRECTORY);
m_devices[2] = new CDirectoryDevice("host", PREF_PS2_HOST_DIRECTORY);
m_devices[3] = new CCdrom0Device();
m_devices[0] = std::make_unique<CDirectoryDevice>("mc0", PREF_PS2_MC0_DIRECTORY);
m_devices[1] = std::make_unique<CDirectoryDevice>("mc1", PREF_PS2_MC1_DIRECTORY);
m_devices[2] = std::make_unique<CDirectoryDevice>("host", PREF_PS2_HOST_DIRECTORY);
m_devices[3] = std::make_unique<CCdrom0Device>();
CreateListColumns();
UpdateList();
}
CVFSManagerWnd::~CVFSManagerWnd()
{
for(const auto& devicePair : m_devices)
{
delete devicePair.second;
}
}
long CVFSManagerWnd::OnCommand(unsigned short nID, unsigned short nCmd, HWND hSender)
{
if(hSender == m_pOk->m_hWnd)
@ -104,7 +96,7 @@ LRESULT CVFSManagerWnd::OnNotify(WPARAM wParam, NMHDR* pHDR)
const auto deviceIterator = m_devices.find(m_pList->GetItemData(nSel));
if(deviceIterator != m_devices.end())
{
auto device = deviceIterator->second;
const auto& device = deviceIterator->second;
if(device->RequestModification(m_hWnd))
{
UpdateList();
@ -158,7 +150,7 @@ void CVFSManagerWnd::UpdateList()
{
for(const auto& devicePair : m_devices)
{
auto device = devicePair.second;
const auto& device = devicePair.second;
auto key = devicePair.first;
unsigned int index = m_pList->FindItemData(key);
@ -183,7 +175,7 @@ void CVFSManagerWnd::Save()
{
for(const auto& devicePair : m_devices)
{
auto device = devicePair.second;
const auto& device = devicePair.second;
device->Save();
}
}

6
Source/ui_win32/VFSManagerWnd.h
View File

@ -2,6 +2,7 @@
#include <string>
#include <map>
#include <memory>
#include "win32/ModalWindow.h"
#include "win32/Button.h"
#include "win32/ListView.h"
@ -11,7 +12,7 @@ class CVFSManagerWnd : public Framework::Win32::CModalWindow
{
public:
CVFSManagerWnd(HWND);
~CVFSManagerWnd();
virtual ~CVFSManagerWnd() = default;
protected:
long OnCommand(unsigned short, unsigned short, HWND) override;
@ -65,7 +66,8 @@ private:
unsigned int m_nBindingType;
};
typedef std::map<unsigned int, CDevice*> DeviceList;
typedef std::unique_ptr<CDevice> DevicePtr;
typedef std::map<unsigned int, DevicePtr> DeviceList;
void RefreshLayout();
void CreateListColumns();