summaryrefslogtreecommitdiff
path: root/Source/Core/Common/StringUtil.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-03-10 23:40:16 +0100
committerPierre Bourdon <delroth@gmail.com>2014-03-10 23:40:16 +0100
commitede46556d9b5043113e19359fee97eb09f9c872c (patch)
tree54442e504fc06d44e80a7351be46a1fead5ad356 /Source/Core/Common/StringUtil.cpp
parent52ed10213d085caec6007ae3b3856e50f282c756 (diff)
parent31cfc73a09a8685cbab20502b4bc132e98e2feb5 (diff)
Merge pull request #155 from Parlane/codestyle_fixes
Fixes spacing for "for", "while", "switch" and "if"
Diffstat (limited to 'Source/Core/Common/StringUtil.cpp')
-rw-r--r--Source/Core/Common/StringUtil.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index 1919083162..9a42d35fd6 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -173,8 +173,8 @@ bool TryParse(const std::string &str, u32 *const output)
return false;
#if ULONG_MAX > UINT_MAX
- if (value >= 0x100000000ull
- && value <= 0xFFFFFFFF00000000ull)
+ if (value >= 0x100000000ull &&
+ value <= 0xFFFFFFFF00000000ull)
return false;
#endif
@@ -275,7 +275,7 @@ std::string TabsToSpaces(int tab_size, const std::string &in)
std::string ReplaceAll(std::string result, const std::string& src, const std::string& dest)
{
- while(1)
+ while (1)
{
size_t pos = result.find(src);
if (pos == std::string::npos) break;
@@ -336,8 +336,8 @@ std::string UriDecode(const std::string & sSrc)
if (*pSrc == '%')
{
char dec1, dec2;
- if (16 != (dec1 = HEX2DEC[*(pSrc + 1)])
- && 16 != (dec2 = HEX2DEC[*(pSrc + 2)]))
+ if (16 != (dec1 = HEX2DEC[*(pSrc + 1)]) &&
+ 16 != (dec2 = HEX2DEC[*(pSrc + 2)]))
{
*pEnd++ = (dec1 << 4) + dec2;
pSrc += 3;