Merge pull request #15007 from armano2/6.x

Cleanup some whitespaces and change some codestyle

src/server/game/Calendar/CalendarMgr.h

@@ -167,7 +167,7 @@ struct CalendarInvite
         void SetStatusTime(time_t statusTime) { _statusTime = statusTime; }
         time_t GetStatusTime() const { return _statusTime; }
 
-        void SetText(const std::string& text) { _text = text; }
+        void SetText(std::string const& text) { _text = text; }
         std::string GetText() const { return _text; }
 
         void SetStatus(CalendarInviteStatus status) { _status = status; }
@@ -224,10 +224,10 @@ struct CalendarEvent
         void SetGuildId(ObjectGuid::LowType guildId) { _guildId = guildId; }
         ObjectGuid::LowType GetGuildId() const { return _guildId; }
 
-        void SetTitle(const std::string& title) { _title = title; }
+        void SetTitle(std::string const& title) { _title = title; }
         std::string GetTitle() const { return _title; }
 
-        void SetDescription(const std::string& description) { _description = description; }
+        void SetDescription(std::string const& description) { _description = description; }
         std::string GetDescription() const { return _description; }
 
         void SetType(CalendarEventType type) { _type = type; }

src/server/game/Grids/Cells/Cell.h

@@ -117,4 +117,3 @@ private:
 };
 
 #endif
-

src/server/game/Grids/Cells/CellImpl.h

@@ -178,4 +178,3 @@ inline void Cell::VisitCircle(TypeContainerVisitor<T, CONTAINER>& visitor, Map&
     }
 }
 #endif
-

src/server/game/Grids/Grid.h

@@ -141,4 +141,3 @@ class Grid
         //ActiveGridObjects m_activeGridObjects;
 };
 #endif
-

src/server/game/Grids/GridLoader.h

@@ -75,4 +75,3 @@ class GridLoader
 };
 */
 #endif
-

src/server/game/Grids/GridRefManager.h

@@ -39,4 +39,3 @@ class GridRefManager : public RefManager<GridRefManager<OBJECT>, OBJECT>
         iterator rend() { return iterator(NULL); }
 };
 #endif
-

src/server/game/Grids/GridReference.h

@@ -50,4 +50,3 @@ class GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
         GridReference* next() { return (GridReference*)Reference<GridRefManager<OBJECT>, OBJECT>::next(); }
 };
 #endif
-

src/server/game/Grids/GridStates.cpp

@@ -61,4 +61,3 @@ void RemovalState::Update(Map& map, NGridType& grid, GridInfo& info, uint32 diff
         }
     }
 }
-

src/server/game/Grids/NGrid.h

@@ -191,4 +191,3 @@ class NGrid
         bool i_GridObjectDataLoaded;
 };
 #endif
-

src/server/game/Warden/Warden.cpp

@@ -192,14 +192,14 @@ std::string Warden::Penalty(WardenCheck* check /*= NULL*/)
 
     switch (action)
     {
-    case WARDEN_ACTION_LOG:
-        return "None";
-        break;
-    case WARDEN_ACTION_KICK:
-        _session->KickPlayer();
-        return "Kick";
-        break;
-    case WARDEN_ACTION_BAN:
+        case WARDEN_ACTION_LOG:
+            return "None";
+            break;
+        case WARDEN_ACTION_KICK:
+            _session->KickPlayer();
+            return "Kick";
+            break;
+        case WARDEN_ACTION_BAN:
         {
             std::stringstream duration;
             duration << sWorld->getIntConfig(CONFIG_WARDEN_CLIENT_BAN_DURATION) << "s";
@@ -215,8 +215,8 @@ std::string Warden::Penalty(WardenCheck* check /*= NULL*/)
 
             return "Ban";
         }
-    default:
-        break;
+        default:
+            break;
     }
     return "Undefined";
 }

src/server/game/Weather/Weather.cpp

@@ -97,7 +97,7 @@ bool Weather::ReGenerate()
     time_t gtime = sWorld->GetGameTime();
     struct tm ltime;
     localtime_r(&gtime, &ltime);
-    uint32 season = ((ltime.tm_yday - 78 + 365)/91)%4;
+    uint32 season = ((ltime.tm_yday - 78 + 365) / 91) % 4;
 
     static char const* seasonName[WEATHER_SEASONS] = { "spring", "summer", "fall", "winter" };
 
@@ -152,8 +152,8 @@ bool Weather::ReGenerate()
 
     // At this point, only weather that isn't doing anything remains but that have weather data
     uint32 chance1 = m_weatherChances->data[season].rainChance;
-    uint32 chance2 = chance1+ m_weatherChances->data[season].snowChance;
-    uint32 chance3 = chance2+ m_weatherChances->data[season].stormChance;
+    uint32 chance2 = chance1 + m_weatherChances->data[season].snowChance;
+    uint32 chance3 = chance2 + m_weatherChances->data[season].stormChance;
 
     uint32 rnd = urand(0, 99);
     if (rnd <= chance1)
@@ -316,4 +316,3 @@ WeatherState Weather::GetWeatherState() const
             return WEATHER_STATE_FINE;
     }
 }
-