Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 08:59:28 +02:00
Code Issues Releases Wiki Activity

"and" -> && "or" -> ||

Browse Source 
So Audacity compiles on older Visual Studio 2017.
This commit is contained in:
Fishbeck, John 2020-06-08 22:32:10 +01:00 committed by James Crook
parent a085057b66
commit d5266912ef
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/prefs/KeyConfigPrefs.cpp
View File

@ -381,7 +381,7 @@ bool KeyConfigPrefs::ContainsIllegalDups(
for (size_t i{ 0 }; i < mKeys.size(); i++) for (size_t i{ 0 }; i < mKeys.size(); i++)
{ {
if (mKeys[i] == EMPTY_SHORTCUT or mKeys[i] == NO_SHORTCUT) if (mKeys[i] == EMPTY_SHORTCUT || mKeys[i] == NO_SHORTCUT)
continue; continue;
if (seen.count(mKeys[i]) == 0) if (seen.count(mKeys[i]) == 0)
@ -391,7 +391,7 @@ bool KeyConfigPrefs::ContainsIllegalDups(
IndexesArray checkMe{ seen.at(mKeys[i]) }; IndexesArray checkMe{ seen.at(mKeys[i]) };
for (int index : checkMe) for (int index : checkMe)
{ {
if (mDefaultKeys[i] == EMPTY_SHORTCUT or if (mDefaultKeys[i] == EMPTY_SHORTCUT ||
mDefaultKeys[i] != mDefaultKeys[index]) mDefaultKeys[i] != mDefaultKeys[index])
{ {
fMatching = mManager->GetPrefixedLabelFromName(mNames[i]); fMatching = mManager->GetPrefixedLabelFromName(mNames[i]);
@ -423,8 +423,8 @@ TranslatableString KeyConfigPrefs::MergeWithExistingKeys(
for (size_t k{ 0 }; k < toAdd.size(); k++) for (size_t k{ 0 }; k < toAdd.size(); k++)
if (k == index) if (k == index)
continue; continue;
else if (toAdd[index] == mKeys[k] and else if (toAdd[index] == mKeys[k] &&
(mDefaultKeys[k] == EMPTY_SHORTCUT or (mDefaultKeys[k] == EMPTY_SHORTCUT ||
mDefaultKeys[k] != mDefaultKeys[index])) mDefaultKeys[k] != mDefaultKeys[index]))
return (int)k; return (int)k;