From 63700ad28a847320280be8b78c101e6a5c2f4209 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 4 Feb 2014 19:19:48 -0500 Subject: [PATCH 1/3] Change some for+iterator loops in GeckoCode.cpp and GeckoCodeConfig.cpp into foreach loops. --- Source/Core/Core/GeckoCode.cpp | 37 +++++++++++----------------- Source/Core/Core/GeckoCode.h | 6 ++--- Source/Core/Core/GeckoCodeConfig.cpp | 21 +++++----------- 3 files changed, 24 insertions(+), 40 deletions(-) diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index 023bceac46..e27afd6b9f 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -17,14 +17,12 @@ namespace Gecko // return true if a code exists bool GeckoCode::Exist(u32 address, u32 data) { - std::vector::const_iterator - codes_iter = codes.begin(), - codes_end = codes.end(); - for (; codes_iter != codes_end; ++codes_iter) + for (const GeckoCode::Code& code : codes) { - if (codes_iter->address == address && codes_iter->data == data) + if (code.address == address && code.data == data) return true; } + return false; } @@ -35,14 +33,13 @@ bool GeckoCode::Compare(GeckoCode compare) const return false; unsigned int exist = 0; - std::vector::const_iterator - codes_iter = codes.begin(), - codes_end = codes.end(); - for (; codes_iter != codes_end; ++codes_iter) + + for (const GeckoCode::Code& code : codes) { - if (compare.Exist(codes_iter->address, codes_iter->data)) + if (compare.Exist(code.address, code.data)) exist++; } + return exist == codes.size(); } @@ -56,17 +53,15 @@ void SetActiveCodes(const std::vector& gcodes) std::lock_guard lk(active_codes_lock); active_codes.clear(); + // add enabled codes - std::vector::const_iterator - gcodes_iter = gcodes.begin(), - gcodes_end = gcodes.end(); - for (; gcodes_iter!=gcodes_end; ++gcodes_iter) + for (const GeckoCode& geckoCode : gcodes) { - if (gcodes_iter->enabled) + if (geckoCode.enabled) { // TODO: apply modifiers // TODO: don't need description or creator string, just takin up memory - active_codes.push_back(*gcodes_iter); + active_codes.push_back(geckoCode); } } @@ -101,14 +96,12 @@ bool InstallCodeHandler() std::lock_guard lk(active_codes_lock); int i = 0; - std::vector::iterator - gcodes_iter = active_codes.begin(), - gcodes_end = active_codes.end(); - for (; gcodes_iter!=gcodes_end; ++gcodes_iter) + + for (GeckoCode& activeCode : active_codes) { - if (gcodes_iter->enabled) + if (activeCode.enabled) { - for (auto& code : gcodes_iter->codes) + for (GeckoCode::Code& code : activeCode.codes) { // Make sure we have enough memory to hold the code list if ((codelist_location + 24 + i) < 0x80003000) diff --git a/Source/Core/Core/GeckoCode.h b/Source/Core/Core/GeckoCode.h index 5bd3814e66..ec027dcd9d 100644 --- a/Source/Core/Core/GeckoCode.h +++ b/Source/Core/Core/GeckoCode.h @@ -31,9 +31,9 @@ namespace Gecko u32 GetAddress() const; }; - std::vector codes; - std::string name, creator; - std::vector notes; + std::vector codes; + std::string name, creator; + std::vector notes; bool enabled; bool user_defined; diff --git a/Source/Core/Core/GeckoCodeConfig.cpp b/Source/Core/Core/GeckoCodeConfig.cpp index b6059ef090..e5e64968f5 100644 --- a/Source/Core/Core/GeckoCodeConfig.cpp +++ b/Source/Core/Core/GeckoCodeConfig.cpp @@ -115,23 +115,17 @@ void SaveGeckoCode(std::vector& lines, std::vector& en lines.push_back(name); // save all the code lines - std::vector::const_iterator - codes_iter = gcode.codes.begin(), - codes_end = gcode.codes.end(); - for (; codes_iter!=codes_end; ++codes_iter) + for (const GeckoCode::Code& code : gcode.codes) { //ss << std::hex << codes_iter->address << ' ' << codes_iter->data; //lines.push_back(StringFromFormat("%08X %08X", codes_iter->address, codes_iter->data)); - lines.push_back(codes_iter->original_line); + lines.push_back(code.original_line); //ss.clear(); } // save the notes - std::vector::const_iterator - notes_iter = gcode.notes.begin(), - notes_end = gcode.notes.end(); - for (; notes_iter!=notes_end; ++notes_iter) - lines.push_back(std::string("*") + *notes_iter); + for (const std::string& note : gcode.notes) + lines.push_back(std::string("*") + note); } void SaveCodes(IniFile& inifile, const std::vector& gcodes) @@ -139,12 +133,9 @@ void SaveCodes(IniFile& inifile, const std::vector& gcodes) std::vector lines; std::vector enabledLines; - std::vector::const_iterator - gcodes_iter = gcodes.begin(), - gcodes_end = gcodes.end(); - for (; gcodes_iter!=gcodes_end; ++gcodes_iter) + for (const GeckoCode& geckoCode : gcodes) { - SaveGeckoCode(lines, enabledLines, *gcodes_iter); + SaveGeckoCode(lines, enabledLines, geckoCode); } inifile.SetLines("Gecko", lines); From a73a600343173cadf3cb957e2a5be4a3207bd735 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 4 Feb 2014 19:30:46 -0500 Subject: [PATCH 2/3] Fix name conventions of some of the foreach loop variables. --- Source/Core/Core/GeckoCode.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index e27afd6b9f..92c6fd4bd9 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -55,13 +55,13 @@ void SetActiveCodes(const std::vector& gcodes) active_codes.clear(); // add enabled codes - for (const GeckoCode& geckoCode : gcodes) + for (const GeckoCode& gecko_code : gcodes) { - if (geckoCode.enabled) + if (gecko_code.enabled) { // TODO: apply modifiers // TODO: don't need description or creator string, just takin up memory - active_codes.push_back(geckoCode); + active_codes.push_back(gecko_code); } } @@ -97,11 +97,11 @@ bool InstallCodeHandler() int i = 0; - for (GeckoCode& activeCode : active_codes) + for (GeckoCode& active_code : active_codes) { - if (activeCode.enabled) + if (active_code.enabled) { - for (GeckoCode::Code& code : activeCode.codes) + for (GeckoCode::Code& code : active_code.codes) { // Make sure we have enough memory to hold the code list if ((codelist_location + 24 + i) < 0x80003000) From 8039963858edef4fa037945437a0f326d296e059 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 4 Feb 2014 19:44:02 -0500 Subject: [PATCH 3/3] Add const qualifiers to two foreach loop variables for consistency. Also fix a vector include I happened to notice. Should be "" not "vector" --- Source/Core/Core/GeckoCode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/GeckoCode.cpp b/Source/Core/Core/GeckoCode.cpp index 92c6fd4bd9..cfb9e35a70 100644 --- a/Source/Core/Core/GeckoCode.cpp +++ b/Source/Core/Core/GeckoCode.cpp @@ -7,11 +7,11 @@ #include "Thread.h" #include "HW/Memmap.h" #include "ConfigManager.h" - -#include "vector" #include "PowerPC/PowerPC.h" #include "CommonPaths.h" +#include + namespace Gecko { // return true if a code exists @@ -97,11 +97,11 @@ bool InstallCodeHandler() int i = 0; - for (GeckoCode& active_code : active_codes) + for (const GeckoCode& active_code : active_codes) { if (active_code.enabled) { - for (GeckoCode::Code& code : active_code.codes) + for (const GeckoCode::Code& code : active_code.codes) { // Make sure we have enough memory to hold the code list if ((codelist_location + 24 + i) < 0x80003000)