Merge branch 'master' into master

1 files changed, 24 insertions, 27 deletions

diff --git a/src/chat_interface.h b/src/chat_interface.h
index 5cbb8a927..5dc3d3880 100644
--- a/src/chat_interface.h
+++ b/src/chat_interface.h
@@ -24,59 +24,56 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <queue>
 #include "irrlichttypes.h"
 
-enum ChatEventType
-{
+enum ChatEventType {
 	CET_CHAT,
 	CET_NICK_ADD,
 	CET_NICK_REMOVE,
 	CET_TIME_INFO,
 };
 
-class ChatEvent
-{
+class ChatEvent {
 protected:
 	ChatEvent(ChatEventType a_type) { type = a_type; }
-
 public:
 	ChatEventType type;
 };
 
-struct ChatEventTimeInfo : public ChatEvent
-{
-	ChatEventTimeInfo(u64 a_game_time, u32 a_time) :
-			ChatEvent(CET_TIME_INFO), game_time(a_game_time), time(a_time)
-	{
-	}
+struct ChatEventTimeInfo : public ChatEvent {
+	ChatEventTimeInfo(
+		u64 a_game_time,
+		u32 a_time) :
+	ChatEvent(CET_TIME_INFO),
+	game_time(a_game_time),
+	time(a_time)
+	{}
 
 	u64 game_time;
 	u32 time;
 };
 
-struct ChatEventNick : public ChatEvent
-{
+struct ChatEventNick : public ChatEvent {
 	ChatEventNick(ChatEventType a_type,
-			const std::string &a_nick) :
-			ChatEvent(a_type), // one of CET_NICK_ADD, CET_NICK_REMOVE
-			nick(a_nick)
-	{
-	}
+		const std::string &a_nick) :
+	ChatEvent(a_type), // one of CET_NICK_ADD, CET_NICK_REMOVE
+	nick(a_nick)
+	{}
 
 	std::string nick;
 };
 
-struct ChatEventChat : public ChatEvent
-{
-	ChatEventChat(const std::string &a_nick, const std::wstring &an_evt_msg) :
-			ChatEvent(CET_CHAT), nick(a_nick), evt_msg(an_evt_msg)
-	{
-	}
+struct ChatEventChat : public ChatEvent {
+	ChatEventChat(const std::string &a_nick,
+		const std::wstring &an_evt_msg) :
+	ChatEvent(CET_CHAT),
+	nick(a_nick),
+	evt_msg(an_evt_msg)
+	{}
 
 	std::string nick;
 	std::wstring evt_msg;
 };
 
-struct ChatInterface
-{
-	MutexedQueue<ChatEvent *> command_queue;  // chat backend --> server
+struct ChatInterface {
+	MutexedQueue<ChatEvent *> command_queue; // chat backend --> server
 	MutexedQueue<ChatEvent *> outgoing_queue; // server --> chat backend
 };