Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-02-07 12:12:23 +01:00
Code Issues Releases Wiki Activity

Fix C4456 Warnings.

Browse Source 
"C4456 declaration hides previous local declaration."
These arise from repeated declarations of the same name.
This commit is contained in:
James Crook
2018-10-10 17:28:50 +01:00
parent 43402438f8
commit 5fd95dd131
25 changed files with 198 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/DirManager.cpp
View File

@@ -611,7 +611,7 @@ bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const
if (b) {
if (moving || !b->IsLocked()) {
auto result = b->GetFileName();
auto oldPath = result.name.GetFullPath();
oldPath = result.name.GetFullPath();
if (!oldPath.empty())
wxRemoveFile( oldPath );
}
@@ -945,7 +945,7 @@ void DirManager::BalanceInfoDel(const wxString &file)
if(--dirTopPool[topnum]<1){
// do *not* erase the hash entry from dirTopPool
// *do* DELETE the actual directory
wxString dir=(projFull != wxT("")? projFull: mytemp);
dir=(projFull != wxT("")? projFull: mytemp);
dir += wxFILE_SEP_PATH;
dir += file.Mid(0,3);
wxFileName::Rmdir(dir);
@@ -1506,10 +1506,10 @@ bool DirManager::EnsureSafeFilename(const wxFileName &fName)
else
{
//point the aliases to the NEW filename.
BlockHash::iterator iter = mBlockFileHash.begin();
while (iter != mBlockFileHash.end())
BlockHash::iterator iter2 = mBlockFileHash.begin();
while (iter2 != mBlockFileHash.end())
{
BlockFilePtr b = iter->second.lock();
BlockFilePtr b = iter2->second.lock();
if (b) {
auto ab = static_cast< AliasBlockFile * > ( &*b );
auto db = static_cast< ODDecodeBlockFile * > ( &*b );
@@ -1525,7 +1525,7 @@ bool DirManager::EnsureSafeFilename(const wxFileName &fName)
db->ChangeAudioFile(wxFileNameWrapper{ renamedFileName });
}
}
++iter;
++iter2;
}
}