From 3b7d55f3c194ecdd4b9f43ab550efb9003f87cbb Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Sat, 18 Dec 2021 20:28:28 -0800 Subject: [PATCH] refactor: avoid "using namespace" --- Source/Core/Core/Slippi/SlippiPremadeText.h | 126 ++++++++++---------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/Source/Core/Core/Slippi/SlippiPremadeText.h b/Source/Core/Core/Slippi/SlippiPremadeText.h index 6e614181e4..5f43cba06a 100644 --- a/Source/Core/Core/Slippi/SlippiPremadeText.h +++ b/Source/Core/Core/Slippi/SlippiPremadeText.h @@ -11,8 +11,6 @@ #include "Common/Logging/Log.h" #include "Common/StringUtil.h" -using namespace std; - class SlippiPremadeText { public: @@ -48,7 +46,7 @@ public: CHAT_MSG_CHAT_DISABLED = 0x10, }; - unordered_map premadeTextsParams = { + std::unordered_map premadeTextsParams = { {CHAT_MSG_U_PAD_UP, "ggs"}, {CHAT_MSG_U_PAD_LEFT, "one more"}, @@ -73,7 +71,7 @@ public: {CHAT_MSG_CHAT_DISABLED, "player has chat disabled"}, }; - unordered_map premadeTexts = { + std::unordered_map premadeTexts = { {SPT_CHAT_P1, "%s:%s"}, {SPT_CHAT_P2, "%s:%s"}, {SPT_CHAT_P3, "%s:%s"}, @@ -85,16 +83,16 @@ public: // This is just a map of delimiters and temporary replacements to remap them before the name is // converted to Slippi Premade Text format - unordered_map unsupportedStringMap = { + std::unordered_map unsupportedStringMap = { {"<", "\\"}, {">", "`"}, {",", ""}, // DELETE U+007F }; // TODO: use va_list to handle any no. or args - string GetPremadeTextString(u8 textId) { return premadeTexts[textId]; } + std::string GetPremadeTextString(u8 textId) { return premadeTexts[textId]; } - vector GetPremadeTextData(u8 textId, ...) + std::vector GetPremadeTextData(u8 textId, ...) { - string format = GetPremadeTextString(textId); + std::string format = GetPremadeTextString(textId); char str[400]; va_list args; va_start(args, textId); @@ -102,10 +100,10 @@ public: va_end(args); // INFO_LOG(SLIPPI, "%s", str); - vector data = {}; - vector empty = {}; + std::vector data = {}; + std::vector empty = {}; - vector matches = vector(); + std::vector matches = std::vector(); // NOTE: This code is converted from HSDRaw C# code // Fuck Regex, current cpp version does not support positive lookaheads to match this pattern @@ -121,7 +119,7 @@ public: } } - string match; + std::string match; for (int m = 0; m < matches.size(); m++) { match = matches[m]; @@ -129,10 +127,10 @@ public: auto splittedMatches = split(match, ","); if (splittedMatches.size() == 0) continue; - string firstMatch = splittedMatches[0]; + std::string firstMatch = splittedMatches[0]; auto utfMatch = UTF8ToUTF32(firstMatch); - pair> key = findCodeKey(firstMatch); + std::pair> key = findCodeKey(firstMatch); if (key.first != TEXT_OP_CODE::CUSTOM_NULL) { if (splittedMatches.size() - 1 != strlen(key.second.second.c_str())) @@ -140,8 +138,8 @@ public: data.push_back((u8)key.first); - string res; - string res2; + std::string res; + std::string res2; for (int j = 0; j < strlen(key.second.second.c_str()); j++) { switch (key.second.second.c_str()[j]) @@ -174,11 +172,11 @@ public: } else { - // process string otherwise + // process std::string otherwise if (splittedMatches.size() >= 2 && firstMatch == "CHR") { - string res3 = splittedMatches[1]; + std::string res3 = splittedMatches[1]; trim(res3); u16 ch = (u16)atoi(res3.c_str()); if (ch) @@ -279,40 +277,40 @@ private: }; - vector>> OPCODES; - unordered_map> CODES = { - {TEXT_OP_CODE::CENTERED, pair("CENTER", "")}, - {TEXT_OP_CODE::RESET_CENTERED, pair("/CENTER", "")}, - {TEXT_OP_CODE::CLEAR_COLOR, pair("/COLOR", "")}, - {TEXT_OP_CODE::COLOR, pair("COLOR", "bbb")}, - {TEXT_OP_CODE::END, pair("END", "")}, - {TEXT_OP_CODE::FITTING, pair("FIT", "")}, - {TEXT_OP_CODE::KERNING, pair("KERN", "")}, - {TEXT_OP_CODE::LEFT_ALIGNED, pair("LEFT", "")}, - {TEXT_OP_CODE::LINE_BREAK, pair("BR", "")}, - {TEXT_OP_CODE::NO_FITTING, pair("/FIT", "")}, - {TEXT_OP_CODE::NO_KERNING, pair("/KERN", "")}, - {TEXT_OP_CODE::OFFSET, pair("OFFSET", "ss")}, - {TEXT_OP_CODE::RESET, pair("RESET", "")}, - {TEXT_OP_CODE::RESET_LEFT_ALIGN, pair("/LEFT", "")}, - {TEXT_OP_CODE::RESET_RIGHT_ALIGN, pair("/RIGHT", "")}, - {TEXT_OP_CODE::RESET_SCALING, pair("/SCALE", "")}, - {TEXT_OP_CODE::RESET_TEXTBOX, pair("/TEXTBOX", "")}, - {TEXT_OP_CODE::RIGHT_ALIGNED, pair("/RIGHT", "")}, - {TEXT_OP_CODE::SCALING, pair("SCALE", "bbbb")}, - {TEXT_OP_CODE::SET_TEXTBOX, pair("TEXTBOX", "ss")}, - {TEXT_OP_CODE::UNKNOWN_02, pair("UNK02", "")}, - {TEXT_OP_CODE::UNKNOWN_04, pair("UNK04", "")}, - {TEXT_OP_CODE::UNKNOWN_05, pair("UNK05", "s")}, - {TEXT_OP_CODE::UNKNOWN_06, pair("UNK06", "ss")}, - {TEXT_OP_CODE::UNKNOWN_08, pair("UNK08", "")}, - {TEXT_OP_CODE::UNKNOWN_09, pair("UNK09", "")}, - {TEXT_OP_CODE::SPACE, pair("S", "")}, + std::vector>> OPCODES; + std::unordered_map> CODES = { + {TEXT_OP_CODE::CENTERED, std::pair("CENTER", "")}, + {TEXT_OP_CODE::RESET_CENTERED, std::pair("/CENTER", "")}, + {TEXT_OP_CODE::CLEAR_COLOR, std::pair("/COLOR", "")}, + {TEXT_OP_CODE::COLOR, std::pair("COLOR", "bbb")}, + {TEXT_OP_CODE::END, std::pair("END", "")}, + {TEXT_OP_CODE::FITTING, std::pair("FIT", "")}, + {TEXT_OP_CODE::KERNING, std::pair("KERN", "")}, + {TEXT_OP_CODE::LEFT_ALIGNED, std::pair("LEFT", "")}, + {TEXT_OP_CODE::LINE_BREAK, std::pair("BR", "")}, + {TEXT_OP_CODE::NO_FITTING, std::pair("/FIT", "")}, + {TEXT_OP_CODE::NO_KERNING, std::pair("/KERN", "")}, + {TEXT_OP_CODE::OFFSET, std::pair("OFFSET", "ss")}, + {TEXT_OP_CODE::RESET, std::pair("RESET", "")}, + {TEXT_OP_CODE::RESET_LEFT_ALIGN, std::pair("/LEFT", "")}, + {TEXT_OP_CODE::RESET_RIGHT_ALIGN, std::pair("/RIGHT", "")}, + {TEXT_OP_CODE::RESET_SCALING, std::pair("/SCALE", "")}, + {TEXT_OP_CODE::RESET_TEXTBOX, std::pair("/TEXTBOX", "")}, + {TEXT_OP_CODE::RIGHT_ALIGNED, std::pair("/RIGHT", "")}, + {TEXT_OP_CODE::SCALING, std::pair("SCALE", "bbbb")}, + {TEXT_OP_CODE::SET_TEXTBOX, std::pair("TEXTBOX", "ss")}, + {TEXT_OP_CODE::UNKNOWN_02, std::pair("UNK02", "")}, + {TEXT_OP_CODE::UNKNOWN_04, std::pair("UNK04", "")}, + {TEXT_OP_CODE::UNKNOWN_05, std::pair("UNK05", "s")}, + {TEXT_OP_CODE::UNKNOWN_06, std::pair("UNK06", "ss")}, + {TEXT_OP_CODE::UNKNOWN_08, std::pair("UNK08", "")}, + {TEXT_OP_CODE::UNKNOWN_09, std::pair("UNK09", "")}, + {TEXT_OP_CODE::SPACE, std::pair("S", "")}, }; - pair> findCodeKey(string p) + std::pair> findCodeKey(std::string p) { - unordered_map>::iterator it; + std::unordered_map>::iterator it; for (it = CODES.begin(); it != CODES.end(); it++) { @@ -321,34 +319,35 @@ private: return *it; } } - return pair>(TEXT_OP_CODE::CUSTOM_NULL, - pair("", "")); + return std::pair>( + TEXT_OP_CODE::CUSTOM_NULL, std::pair("", "")); } - vector>> DeserializeCodes(vector data) + std::vector>> DeserializeCodes(std::vector data) { - vector>> d = vector>>(); + std::vector>> d = + std::vector>>(); for (int i = 0; i < data.size();) { auto opcode = (TEXT_OP_CODE)data[i++]; - vector param = vector(0); + std::vector param = std::vector(0); int textCode = (u8)opcode; if ((textCode >> 4) == 2) - param = vector{(u16)(((textCode << 8) | (data[i++] & 0xFF)) & 0xFFF)}; + param = std::vector{(u16)(((textCode << 8) | (data[i++] & 0xFF)) & 0xFFF)}; else if ((textCode >> 4) == 4) - param = vector{(u16)(((textCode << 8) | (data[i++] & 0xFF)) & 0xFFF)}; + param = std::vector{(u16)(((textCode << 8) | (data[i++] & 0xFF)) & 0xFFF)}; else if (!CODES.count(opcode)) { ERROR_LOG_FMT(SLIPPI, "Opcode Not Supported!"); } else { - pair code = CODES[opcode]; + std::pair code = CODES[opcode]; auto p = code.second.c_str(); - param = vector(strlen(p)); + param = std::vector(strlen(p)); for (int j = 0; j < param.size(); j++) { switch (p[j]) @@ -363,7 +362,8 @@ private: } } - pair> c = pair>(opcode, param); + std::pair> c = + std::pair>(opcode, param); d.push_back(c); if (opcode == TEXT_OP_CODE::END) @@ -394,16 +394,16 @@ private: rtrim(s); } - vector split(const string& str, const string& delim) + std::vector split(const std::string& str, const std::string& delim) { - vector tokens; + std::vector tokens; size_t prev = 0, pos = 0; do { pos = str.find(delim, prev); - if (pos == string::npos) + if (pos == std::string::npos) pos = str.length(); - string token = str.substr(prev, pos - prev); + std::string token = str.substr(prev, pos - prev); if (!token.empty()) tokens.push_back(token); prev = pos + delim.length();