Cosmetic: Multiple cosmetic changes

- Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '('
- Added missing space after a comma and remove space before comma (with some exceptions)
- Remove trailing spaces
- Convert tab to spaces

Note: Only affects files with extension "cpp" and "h" under /src/server

4 files changed, 68 insertions, 68 deletions

diff --git a/src/server/shared/Utilities/EventProcessor.cpp b/src/server/shared/Utilities/EventProcessor.cpp
index 3f9123b3e46..56dcad2516b 100755
--- a/src/server/shared/Utilities/EventProcessor.cpp
+++ b/src/server/shared/Utilities/EventProcessor.cpp
@@ -71,17 +71,17 @@ void EventProcessor::KillAllEvents(bool force)
 
         i_old->second->to_Abort = true;
         i_old->second->Abort(m_time);
-        if(force || i_old->second->IsDeletable())
+        if (force || i_old->second->IsDeletable())
         {
             delete i_old->second;
 
-            if(!force)                                      // need per-element cleanup
+            if (!force)                                      // need per-element cleanup
                 m_events.erase (i_old);
         }
     }
 
     // fast clear event list (in force case)
-    if(force)
+    if (force)
         m_events.clear();
 }
 
diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
index f768a3ab68c..cd623c62132 100755
--- a/src/server/shared/Utilities/ServiceWin32.cpp
+++ b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -80,7 +80,7 @@ bool WinServiceInstall()
             if (service)
             {
                 advapi32 = GetModuleHandle("ADVAPI32.DLL");
-                if(!advapi32)
+                if (!advapi32)
                 {
                     CloseServiceHandle(service);
                     CloseServiceHandle(serviceControlManager);
@@ -232,7 +232,7 @@ void WINAPI ServiceMain(DWORD argc, char *argv[])
 
         m_ServiceStatus = 1;
         argc = 1;
-        main(argc , argv);
+        main(argc, argv);
 
         // service was stopped
         serviceStatus.dwCurrentState = SERVICE_STOP_PENDING;
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index 7d3a6f7ed58..187258e41b3 100755
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -128,9 +128,9 @@ void stripLineInvisibleChars(std::string &str)
     bool space = false;
     for (size_t pos = 0; pos < str.size(); ++pos)
     {
-        if(invChars.find(str[pos])!=std::string::npos)
+        if (invChars.find(str[pos])!=std::string::npos)
         {
-            if(!space)
+            if (!space)
             {
                 str[wpos++] = ' ';
                 space = true;
@@ -138,7 +138,7 @@ void stripLineInvisibleChars(std::string &str)
         }
         else
         {
-            if(wpos!=pos)
+            if (wpos!=pos)
                 str[wpos++] = str[pos];
             else
                 ++wpos;
@@ -146,9 +146,9 @@ void stripLineInvisibleChars(std::string &str)
         }
     }
 
-    if(wpos < str.size())
+    if (wpos < str.size())
         str.erase(wpos, str.size());
-    if(str.find("|TInterface")!=std::string::npos)
+    if (str.find("|TInterface")!=std::string::npos)
         str.clear();
 
 }
@@ -161,15 +161,15 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText, bool hoursOnly)
     uint64 days    = timeInSecs / DAY;
 
     std::ostringstream ss;
-    if(days)
+    if (days)
         ss << days << (shortText ? "d " : " Day(s) ");
-    if(hours || hoursOnly)
+    if (hours || hoursOnly)
         ss << hours << (shortText ? "h " : " Hour(s) ");
-    if(!hoursOnly)
+    if (!hoursOnly)
     {
-        if(minutes)
+        if (minutes)
             ss << minutes << (shortText ? "m " : " Minute(s) ");
-        if(secs || (!days && !hours && !minutes) )
+        if (secs || (!days && !hours && !minutes) )
             ss << secs << (shortText ? "s" : " Second(s).");
     }
 
@@ -184,14 +184,14 @@ uint32 TimeStringToSecs(const std::string& timestring)
 
     for (std::string::const_iterator itr = timestring.begin(); itr != timestring.end(); ++itr)
     {
-        if(isdigit(*itr))
+        if (isdigit(*itr))
         {
             buffer*=10;
             buffer+= (*itr)-'0';
         }
         else
         {
-            switch(*itr)
+            switch (*itr)
             {
                 case 'd': multiplier = DAY;     break;
                 case 'h': multiplier = HOUR;    break;
@@ -225,7 +225,7 @@ std::string TimeToTimestampStr(time_t t)
 /// Check if the string is a valid ip address representation
 bool IsIPAddress(char const* ipaddress)
 {
-    if(!ipaddress)
+    if (!ipaddress)
         return false;
 
     // Let the big boys do it.
@@ -270,7 +270,7 @@ void utf8truncate(std::string& utf8str, size_t len)
     try
     {
         size_t wlen = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size());
-        if(wlen <= len)
+        if (wlen <= len)
             return;
 
         std::wstring wstr;
@@ -291,9 +291,9 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize)
     try
     {
         size_t len = utf8::distance(utf8str, utf8str+csize);
-        if(len > wsize)
+        if (len > wsize)
         {
-            if(wsize > 0)
+            if (wsize > 0)
                 wstr[0] = L'\0';
             wsize = 0;
             return false;
@@ -305,7 +305,7 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize)
     }
     catch(std::exception)
     {
-        if(wsize > 0)
+        if (wsize > 0)
             wstr[0] = L'\0';
         wsize = 0;
         return false;
@@ -384,7 +384,7 @@ typedef wchar_t const* const* wstrlist;
 std::wstring GetMainPartOfName(std::wstring wname, uint32 declension)
 {
     // supported only Cyrillic cases
-    if(wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5)
+    if (wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5)
         return wname;
 
     // Important: end length must be <= MAX_INTERNAL_PLAYER_NAME-MAX_PLAYER_NAME (3 currently)
@@ -419,7 +419,7 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension)
     {
         size_t len = size_t((*itr)[-1]);                    // get length from string size field
 
-        if(wname.substr(wname.size()-len, len)==*itr)
+        if (wname.substr(wname.size()-len, len)==*itr)
             return wname.substr(0, wname.size()-len);
     }
 
@@ -430,7 +430,7 @@ bool utf8ToConsole(const std::string& utf8str, std::string& conStr)
 {
 #if PLATFORM == PLATFORM_WINDOWS
     std::wstring wstr;
-    if(!Utf8toWStr(utf8str, wstr))
+    if (!Utf8toWStr(utf8str, wstr))
         return false;
 
     conStr.resize(wstr.size());
@@ -462,13 +462,13 @@ bool Utf8FitTo(const std::string& str, std::wstring search)
 {
     std::wstring temp;
 
-    if(!Utf8toWStr(str, temp))
+    if (!Utf8toWStr(str, temp))
         return false;
 
     // converting to lower case
     wstrToLower( temp );
 
-    if(temp.find(search) == std::wstring::npos)
+    if (temp.find(search) == std::wstring::npos)
         return false;
 
     return true;
@@ -509,7 +509,7 @@ void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result)
         {
             unsigned char nibble = 0x0F & (bytes[i]>>((1-j)*4));
             char encodedNibble;
-            if(nibble < 0x0A)
+            if (nibble < 0x0A)
                 encodedNibble = '0'+nibble;
             else
                 encodedNibble = 'A'+nibble-0x0A;
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index a91bfe3faa5..8ded45a7bb6 100755
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -188,60 +188,60 @@ void utf8truncate(std::string& utf8str, size_t len);
 
 inline bool isBasicLatinCharacter(wchar_t wchar)
 {
-    if(wchar >= L'a' && wchar <= L'z')                      // LATIN SMALL LETTER A - LATIN SMALL LETTER Z
+    if (wchar >= L'a' && wchar <= L'z')                      // LATIN SMALL LETTER A - LATIN SMALL LETTER Z
         return true;
-    if(wchar >= L'A' && wchar <= L'Z')                      // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z
+    if (wchar >= L'A' && wchar <= L'Z')                      // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z
         return true;
     return false;
 }
 
 inline bool isExtendedLatinCharacter(wchar_t wchar)
 {
-    if(isBasicLatinCharacter(wchar))
+    if (isBasicLatinCharacter(wchar))
         return true;
-    if(wchar >= 0x00C0 && wchar <= 0x00D6)                  // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS
+    if (wchar >= 0x00C0 && wchar <= 0x00D6)                  // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS
         return true;
-    if(wchar >= 0x00D8 && wchar <= 0x00DF)                  // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN
+    if (wchar >= 0x00D8 && wchar <= 0x00DF)                  // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN
         return true;
-    if(wchar == 0x00DF)                                     // LATIN SMALL LETTER SHARP S
+    if (wchar == 0x00DF)                                     // LATIN SMALL LETTER SHARP S
         return true;
-    if(wchar >= 0x00E0 && wchar <= 0x00F6)                  // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS
+    if (wchar >= 0x00E0 && wchar <= 0x00F6)                  // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS
         return true;
-    if(wchar >= 0x00F8 && wchar <= 0x00FE)                  // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN
+    if (wchar >= 0x00F8 && wchar <= 0x00FE)                  // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN
         return true;
-    if(wchar >= 0x0100 && wchar <= 0x012F)                  // LATIN CAPITAL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK
+    if (wchar >= 0x0100 && wchar <= 0x012F)                  // LATIN CAPITAL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK
         return true;
-    if(wchar == 0x1E9E)                                     // LATIN CAPITAL LETTER SHARP S
+    if (wchar == 0x1E9E)                                     // LATIN CAPITAL LETTER SHARP S
         return true;
     return false;
 }
 
 inline bool isCyrillicCharacter(wchar_t wchar)
 {
-    if(wchar >= 0x0410 && wchar <= 0x044F)                  // CYRILLIC CAPITAL LETTER A - CYRILLIC SMALL LETTER YA
+    if (wchar >= 0x0410 && wchar <= 0x044F)                  // CYRILLIC CAPITAL LETTER A - CYRILLIC SMALL LETTER YA
         return true;
-    if(wchar == 0x0401 || wchar == 0x0451)                  // CYRILLIC CAPITAL LETTER IO, CYRILLIC SMALL LETTER IO
+    if (wchar == 0x0401 || wchar == 0x0451)                  // CYRILLIC CAPITAL LETTER IO, CYRILLIC SMALL LETTER IO
         return true;
     return false;
 }
 
 inline bool isEastAsianCharacter(wchar_t wchar)
 {
-    if(wchar >= 0x1100 && wchar <= 0x11F9)                  // Hangul Jamo
+    if (wchar >= 0x1100 && wchar <= 0x11F9)                  // Hangul Jamo
         return true;
-    if(wchar >= 0x3041 && wchar <= 0x30FF)                  // Hiragana + Katakana
+    if (wchar >= 0x3041 && wchar <= 0x30FF)                  // Hiragana + Katakana
         return true;
-    if(wchar >= 0x3131 && wchar <= 0x318E)                  // Hangul Compatibility Jamo
+    if (wchar >= 0x3131 && wchar <= 0x318E)                  // Hangul Compatibility Jamo
         return true;
-    if(wchar >= 0x31F0 && wchar <= 0x31FF)                  // Katakana Phonetic Ext.
+    if (wchar >= 0x31F0 && wchar <= 0x31FF)                  // Katakana Phonetic Ext.
         return true;
-    if(wchar >= 0x3400 && wchar <= 0x4DB5)                  // CJK Ideographs Ext. A
+    if (wchar >= 0x3400 && wchar <= 0x4DB5)                  // CJK Ideographs Ext. A
         return true;
-    if(wchar >= 0x4E00 && wchar <= 0x9FC3)                  // Unified CJK Ideographs
+    if (wchar >= 0x4E00 && wchar <= 0x9FC3)                  // Unified CJK Ideographs
         return true;
-    if(wchar >= 0xAC00 && wchar <= 0xD7A3)                  // Hangul Syllables
+    if (wchar >= 0xAC00 && wchar <= 0xD7A3)                  // Hangul Syllables
         return true;
-    if(wchar >= 0xFF01 && wchar <= 0xFFEE)                  // Halfwidth forms
+    if (wchar >= 0xFF01 && wchar <= 0xFFEE)                  // Halfwidth forms
         return true;
     return false;
 }
@@ -273,7 +273,7 @@ inline bool isNumericOrSpace(wchar_t wchar)
 inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace)
 {
     for (size_t i = 0; i < wstr.size(); ++i)
-        if(!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
+        if (!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
             return false;
     return true;
 }
@@ -281,7 +281,7 @@ inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace)
 inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace)
 {
     for (size_t i = 0; i < wstr.size(); ++i)
-        if(!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
+        if (!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
             return false;
     return true;
 }
@@ -289,7 +289,7 @@ inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace)
 inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace)
 {
     for (size_t i = 0; i < wstr.size(); ++i)
-        if(!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
+        if (!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
             return false;
     return true;
 }
@@ -297,29 +297,29 @@ inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace)
 inline bool isEastAsianString(std::wstring wstr, bool numericOrSpace)
 {
     for (size_t i = 0; i < wstr.size(); ++i)
-        if(!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
+        if (!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i])))
             return false;
     return true;
 }
 
 inline wchar_t wcharToUpper(wchar_t wchar)
 {
-    if(wchar >= L'a' && wchar <= L'z')                      // LATIN SMALL LETTER A - LATIN SMALL LETTER Z
+    if (wchar >= L'a' && wchar <= L'z')                      // LATIN SMALL LETTER A - LATIN SMALL LETTER Z
         return wchar_t(uint16(wchar)-0x0020);
-    if(wchar == 0x00DF)                                     // LATIN SMALL LETTER SHARP S
+    if (wchar == 0x00DF)                                     // LATIN SMALL LETTER SHARP S
         return wchar_t(0x1E9E);
-    if(wchar >= 0x00E0 && wchar <= 0x00F6)                  // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS
+    if (wchar >= 0x00E0 && wchar <= 0x00F6)                  // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS
         return wchar_t(uint16(wchar)-0x0020);
-    if(wchar >= 0x00F8 && wchar <= 0x00FE)                  // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN
+    if (wchar >= 0x00F8 && wchar <= 0x00FE)                  // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN
         return wchar_t(uint16(wchar)-0x0020);
-    if(wchar >= 0x0101 && wchar <= 0x012F)                  // LATIN SMALL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK (only %2=1)
+    if (wchar >= 0x0101 && wchar <= 0x012F)                  // LATIN SMALL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK (only %2=1)
     {
-        if(wchar % 2 == 1)
+        if (wchar % 2 == 1)
             return wchar_t(uint16(wchar)-0x0001);
     }
-    if(wchar >= 0x0430 && wchar <= 0x044F)                  // CYRILLIC SMALL LETTER A - CYRILLIC SMALL LETTER YA
+    if (wchar >= 0x0430 && wchar <= 0x044F)                  // CYRILLIC SMALL LETTER A - CYRILLIC SMALL LETTER YA
         return wchar_t(uint16(wchar)-0x0020);
-    if(wchar == 0x0451)                                     // CYRILLIC SMALL LETTER IO
+    if (wchar == 0x0451)                                     // CYRILLIC SMALL LETTER IO
         return wchar_t(0x0401);
 
     return wchar;
@@ -332,22 +332,22 @@ inline wchar_t wcharToUpperOnlyLatin(wchar_t wchar)
 
 inline wchar_t wcharToLower(wchar_t wchar)
 {
-    if(wchar >= L'A' && wchar <= L'Z')                      // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z
+    if (wchar >= L'A' && wchar <= L'Z')                      // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z
         return wchar_t(uint16(wchar)+0x0020);
-    if(wchar >= 0x00C0 && wchar <= 0x00D6)                  // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS
+    if (wchar >= 0x00C0 && wchar <= 0x00D6)                  // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS
         return wchar_t(uint16(wchar)+0x0020);
-    if(wchar >= 0x00D8 && wchar <= 0x00DE)                  // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN
+    if (wchar >= 0x00D8 && wchar <= 0x00DE)                  // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN
         return wchar_t(uint16(wchar)+0x0020);
-    if(wchar >= 0x0100 && wchar <= 0x012E)                  // LATIN CAPITAL LETTER A WITH MACRON - LATIN CAPITAL LETTER I WITH OGONEK (only %2=0)
+    if (wchar >= 0x0100 && wchar <= 0x012E)                  // LATIN CAPITAL LETTER A WITH MACRON - LATIN CAPITAL LETTER I WITH OGONEK (only %2=0)
     {
-        if(wchar % 2 == 0)
+        if (wchar % 2 == 0)
             return wchar_t(uint16(wchar)+0x0001);
     }
-    if(wchar == 0x1E9E)                                     // LATIN CAPITAL LETTER SHARP S
+    if (wchar == 0x1E9E)                                     // LATIN CAPITAL LETTER SHARP S
         return wchar_t(0x00DF);
-    if(wchar == 0x0401)                                     // CYRILLIC CAPITAL LETTER IO
+    if (wchar == 0x0401)                                     // CYRILLIC CAPITAL LETTER IO
         return wchar_t(0x0451);
-    if(wchar >= 0x0410 && wchar <= 0x042F)                  // CYRILLIC CAPITAL LETTER A - CYRILLIC CAPITAL LETTER YA
+    if (wchar >= 0x0410 && wchar <= 0x042F)                  // CYRILLIC CAPITAL LETTER A - CYRILLIC CAPITAL LETTER YA
         return wchar_t(uint16(wchar)+0x0020);
 
     return wchar;