piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

clang-modernize -use-nullptr

Browse Source 
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
This commit is contained in:
Tillmann Karras
2014-03-09 21:14:26 +01:00
parent f28116b7da
commit d802d39281
292 changed files with 1526 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/MemcardManager.cpp
View File

@ -113,8 +113,8 @@ END_EVENT_TABLE()
CMemcardManager::CMemcardManager(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
: wxDialog(parent, id, title, position, size, style)
{
memoryCard[SLOT_A]=NULL;
memoryCard[SLOT_B]=NULL;
memoryCard[SLOT_A]=nullptr;
memoryCard[SLOT_B]=nullptr;
mcmSettings.twoCardsLoaded = false;
if (!LoadSettings())
@ -135,12 +135,12 @@ CMemcardManager::~CMemcardManager()
if (memoryCard[SLOT_A])
{
delete memoryCard[SLOT_A];
memoryCard[SLOT_A] = NULL;
memoryCard[SLOT_A] = nullptr;
}
if (memoryCard[SLOT_B])
{
delete memoryCard[SLOT_B];
memoryCard[SLOT_B] = NULL;
memoryCard[SLOT_B] = nullptr;
}
SaveSettings();
}
@ -320,7 +320,7 @@ void CMemcardManager::ChangePath(int slot)
if (memoryCard[slot])
{
delete memoryCard[slot];
memoryCard[slot] = NULL;
memoryCard[slot] = nullptr;
}
mcmSettings.twoCardsLoaded = false;
m_MemcardPath[slot]->SetPath(wxEmptyString);
@ -598,14 +598,14 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
{
std::string path1, path2, mpath;
mpath = WxStrToStr(m_MemcardPath[slot]->GetPath());
SplitPath(mpath, &path1, &path2, NULL);
SplitPath(mpath, &path1, &path2, nullptr);
path1 += path2;
File::CreateDir(path1);
if(PanicYesNoT("Warning: This will overwrite any existing saves that are in the folder:\n"
"%s\nand have the same name as a file on your memcard\nContinue?", path1.c_str()))
for (int i = 0; i < DIRLEN; i++)
{
CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, NULL, path1), -1);
CopyDeleteSwitch(memoryCard[slot]->ExportGci(i, nullptr, path1), -1);
}
break;
}