aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2014-07-21 18:13:48 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2014-07-21 18:14:22 +0200
commit946ab3e8b71ad106c7e75fd78b96d70865b29d79 (patch)
tree58ddb80a4e2d1d9b5884e42fcfa178b7e19ed4ce /src
parentf4d065dee0c2f2cdc61af5b4b84f1e019881aa8f (diff)
Core: Kill again whitespace :(
Diffstat (limited to 'src')
-rw-r--r--src/server/authserver/Main.cpp2
-rw-r--r--src/server/authserver/Realms/RealmList.cpp2
-rw-r--r--src/server/authserver/Realms/RealmList.h2
-rw-r--r--src/server/game/Battlefield/BattlefieldMgr.h2
-rw-r--r--src/server/game/Globals/ObjectAccessor.cpp2
-rw-r--r--src/server/game/Instances/InstanceSaveMgr.h6
-rw-r--r--src/server/shared/Configuration/Config.cpp2
-rw-r--r--src/server/shared/Database/PreparedStatement.cpp2
-rw-r--r--src/server/shared/Logging/Log.cpp2
-rw-r--r--src/server/shared/Logging/Log.h2
-rw-r--r--src/server/shared/Threading/ProducerConsumerQueue.h4
-rw-r--r--src/server/worldserver/worldserver.conf.dist12
12 files changed, 20 insertions, 20 deletions
diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp
index 0f200db6af4..8b9779d2b07 100644
--- a/src/server/authserver/Main.cpp
+++ b/src/server/authserver/Main.cpp
@@ -114,7 +114,7 @@ int main(int argc, char** argv)
TC_LOG_ERROR("server.authserver", "Specified port out of allowed range (1-65535)");
return 1;
}
-
+
std::string bindIp = sConfigMgr->GetStringDefault("BindIP", "0.0.0.0");
AsyncAcceptor<AuthSession> authServer(_ioService, bindIp, port);
diff --git a/src/server/authserver/Realms/RealmList.cpp b/src/server/authserver/Realms/RealmList.cpp
index 4dd2ab96dd9..b5668da2028 100644
--- a/src/server/authserver/Realms/RealmList.cpp
+++ b/src/server/authserver/Realms/RealmList.cpp
@@ -39,7 +39,7 @@ void RealmList::Initialize(boost::asio::io_service& ioService, uint32 updateInte
UpdateRealms(true);
}
-void RealmList::UpdateRealm(uint32 id, const std::string& name, ip::address const& address, ip::address const& localAddr,
+void RealmList::UpdateRealm(uint32 id, const std::string& name, ip::address const& address, ip::address const& localAddr,
ip::address const& localSubmask, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float population, uint32 build)
{
// Create new if not exist or update existed
diff --git a/src/server/authserver/Realms/RealmList.h b/src/server/authserver/Realms/RealmList.h
index 64419351b57..b8630f23a0e 100644
--- a/src/server/authserver/Realms/RealmList.h
+++ b/src/server/authserver/Realms/RealmList.h
@@ -67,7 +67,7 @@ public:
static RealmList instance;
return &instance;
}
-
+
~RealmList();
void Initialize(boost::asio::io_service& ioService, uint32 updateInterval);
diff --git a/src/server/game/Battlefield/BattlefieldMgr.h b/src/server/game/Battlefield/BattlefieldMgr.h
index 65b63ea2952..f51a7177a88 100644
--- a/src/server/game/Battlefield/BattlefieldMgr.h
+++ b/src/server/game/Battlefield/BattlefieldMgr.h
@@ -32,7 +32,7 @@ class BattlefieldMgr
static BattlefieldMgr instance;
return &instance;
}
-
+
// create battlefield events
void InitBattlefield();
diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp
index ec33d8efbe1..931ec0e607d 100644
--- a/src/server/game/Globals/ObjectAccessor.cpp
+++ b/src/server/game/Globals/ObjectAccessor.cpp
@@ -209,7 +209,7 @@ Unit* ObjectAccessor::FindUnit(uint64 guid)
Player* ObjectAccessor::FindPlayerByName(std::string const& name)
{
boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock());
-
+
std::string nameStr = name;
std::transform(nameStr.begin(), nameStr.end(), nameStr.begin(), ::tolower);
HashMapHolder<Player>::MapType const& m = GetPlayers();
diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h
index 52e6a847211..0a2af4b73ee 100644
--- a/src/server/game/Instances/InstanceSaveMgr.h
+++ b/src/server/game/Instances/InstanceSaveMgr.h
@@ -80,10 +80,10 @@ class InstanceSave
/* online players bound to the instance (perm/solo)
does not include the members of the group unless they have permanent saves */
- void AddPlayer(Player* player)
- {
+ void AddPlayer(Player* player)
+ {
std::lock_guard<std::mutex> lock(_playerListLock);
- m_playerList.push_back(player);
+ m_playerList.push_back(player);
}
bool RemovePlayer(Player* player)
diff --git a/src/server/shared/Configuration/Config.cpp b/src/server/shared/Configuration/Config.cpp
index 5cd7ef52f82..ecebf30182e 100644
--- a/src/server/shared/Configuration/Config.cpp
+++ b/src/server/shared/Configuration/Config.cpp
@@ -103,6 +103,6 @@ std::list<std::string> ConfigMgr::GetKeysByString(std::string const& name)
for (const ptree::value_type& child : _config)
if (child.first.compare(0, name.length(), name) == 0)
keys.push_back(child.first);
-
+
return keys;
}
diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp
index fb1bfa687d0..be5591667be 100644
--- a/src/server/shared/Database/PreparedStatement.cpp
+++ b/src/server/shared/Database/PreparedStatement.cpp
@@ -447,7 +447,7 @@ std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern
//- Execution
PreparedStatementTask::PreparedStatementTask(PreparedStatement* stmt, bool async) :
m_stmt(stmt)
-{
+{
m_has_result = async; // If it's async, then there's a result
if (async)
m_result = new PreparedQueryResultPromise();
diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp
index 65cf930a634..a7b6b418cc4 100644
--- a/src/server/shared/Logging/Log.cpp
+++ b/src/server/shared/Logging/Log.cpp
@@ -278,7 +278,7 @@ void Log::write(LogMessage* msg) const
auto logOperation = std::shared_ptr<LogOperation>(new LogOperation(logger, msg));
_ioService->post(_strand->wrap([logOperation](){ logOperation->call(); }));
-
+
}
else
{
diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index 8ae8db5bf5f..78e7e012bbe 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -50,7 +50,7 @@ class Log
instance._ioService = ioService;
instance._strand = new boost::asio::strand(*ioService);
}
-
+
return &instance;
}
diff --git a/src/server/shared/Threading/ProducerConsumerQueue.h b/src/server/shared/Threading/ProducerConsumerQueue.h
index 3fefd27ba6e..98a0188b6b5 100644
--- a/src/server/shared/Threading/ProducerConsumerQueue.h
+++ b/src/server/shared/Threading/ProducerConsumerQueue.h
@@ -76,7 +76,7 @@ public:
{
_condition.wait(lock);
}
-
+
if (_queue.empty())
return;
@@ -106,6 +106,6 @@ public:
}
};
-#endif
+#endif
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 4e837d0a1ba..60a6537d0bd 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -145,7 +145,7 @@ BindIP = "0.0.0.0"
#
# ThreadPool
-# Description: Number of threads to be used for the global thread pool
+# Description: Number of threads to be used for the global thread pool
# The thread pool is currently used for the signal handler and remote access
# Default: 1
@@ -169,7 +169,7 @@ UseProcessors = 0
#
# ProcessPriority
# Description: Process priority setting for Windows and Linux based systems.
-# Details: On Linux, a nice value of -15 is used. (requires superuser).
+# Details: On Linux, a nice value of -15 is used. (requires superuser).
# On Windows, process is set to HIGH class.
# Default: 0 - (Normal)
# 1 - (High)
@@ -1078,7 +1078,7 @@ Account.PasswordChangeSecurity = 0
#
# BirthdayTime
-# Description: Set to date of project's birth in UNIX time. By default the date when
+# Description: Set to date of project's birth in UNIX time. By default the date when
# TrinityCore was started (Thu Oct 2, 2008)
# Default: 1222964635
#
@@ -2637,9 +2637,9 @@ UI.ShowQuestLevelsInDialogs = 0
# 1 - Prefix Timestamp to the text
# 2 - Prefix Log Level to the text
# 4 - Prefix Log Filter type to the text
-# 8 - Append timestamp to the log file name. Format: YYYY-MM-DD_HH-MM-SS
+# 8 - Append timestamp to the log file name. Format: YYYY-MM-DD_HH-MM-SS
# (Only used with Type = 2)
-# 16 - Make a backup of existing file before overwrite
+# 16 - Make a backup of existing file before overwrite
# (Only used with Mode = w)
#
# Colors (read as optional1 if Type = Console)
@@ -2756,7 +2756,7 @@ Log.Async.Enable = 0
#
# Allow.IP.Based.Action.Logging
-# Description: Logs actions, e.g. account login and logout to name a few, based on IP of
+# Description: Logs actions, e.g. account login and logout to name a few, based on IP of
# current session.
# Default: 0 - (Disabled)
# 1 - (Enabled)