Formatting

2025-11-27 22:49:25 +02:00 · 2024-01-11 22:51:36 +02:00
parent c4db99a60d
commit 476a05fed3
11 changed files with 96 additions and 105 deletions
--- a/client/globalLobby/GlobalLobbyClient.cpp
+++ b/client/globalLobby/GlobalLobbyClient.cpp
@@ -11,15 +11,15 @@
 #include "StdInc.h"
 #include "GlobalLobbyClient.h"

-#include "GlobalLobbyWindow.h"
 #include "GlobalLobbyLoginWindow.h"
+#include "GlobalLobbyWindow.h"

 #include "../gui/CGuiHandler.h"
 #include "../gui/WindowHandler.h"
 #include "../windows/InfoWindows.h"

-#include "../../lib/MetaString.h"
 #include "../../lib/CConfigHandler.h"
+#include "../../lib/MetaString.h"
 #include "../../lib/TextOperations.h"
 #include "../../lib/network/NetworkClient.h"

@@ -124,7 +124,7 @@ void GlobalLobbyClient::receiveLoginSuccess(const JsonNode & json)

 void GlobalLobbyClient::receiveChatHistory(const JsonNode & json)
 {
-	for (auto const & entry : json["messages"].Vector())
+	for(const auto & entry : json["messages"].Vector())
 	{
 		std::string accountID = entry["accountID"].String();
 		std::string displayName = entry["displayName"].String();
@@ -257,4 +257,3 @@ std::shared_ptr<GlobalLobbyWindow> GlobalLobbyClient::createLobbyWindow()
 	lobbyWindowLock = lobbyWindowPtr;
 	return lobbyWindowPtr;
 }
-
--- a/client/globalLobby/GlobalLobbyClient.h
+++ b/client/globalLobby/GlobalLobbyClient.h
@@ -42,6 +42,7 @@ class GlobalLobbyClient : public INetworkClientListener, boost::noncopyable
 	void receiveChatHistory(const JsonNode & json);
 	void receiveChatMessage(const JsonNode & json);
 	void receiveActiveAccounts(const JsonNode & json);
+
 public:
 	explicit GlobalLobbyClient();
 	~GlobalLobbyClient();
--- a/client/globalLobby/GlobalLobbyLoginWindow.cpp
+++ b/client/globalLobby/GlobalLobbyLoginWindow.cpp
@@ -14,18 +14,18 @@
 #include "GlobalLobbyClient.h"
 #include "GlobalLobbyWindow.h"

-#include "../gui/CGuiHandler.h"
-#include "../gui/WindowHandler.h"
-#include "../widgets/TextControls.h"
-#include "../widgets/Images.h"
-#include "../widgets/Buttons.h"
-#include "../widgets/MiscWidgets.h"
 #include "../CGameInfo.h"
 #include "../CServerHandler.h"
+#include "../gui/CGuiHandler.h"
+#include "../gui/WindowHandler.h"
+#include "../widgets/Buttons.h"
+#include "../widgets/Images.h"
+#include "../widgets/MiscWidgets.h"
+#include "../widgets/TextControls.h"

+#include "../../lib/CConfigHandler.h"
 #include "../../lib/CGeneralTextHandler.h"
 #include "../../lib/MetaString.h"
-#include "../../lib/CConfigHandler.h"

 GlobalLobbyLoginWindow::GlobalLobbyLoginWindow()
 	: CWindowObject(BORDERED)
--- a/client/globalLobby/GlobalLobbyServerSetup.cpp
+++ b/client/globalLobby/GlobalLobbyServerSetup.cpp
@@ -11,17 +11,17 @@
 #include "StdInc.h"
 #include "GlobalLobbyServerSetup.h"

-#include "../gui/CGuiHandler.h"
-#include "../widgets/TextControls.h"
-#include "../widgets/Images.h"
-#include "../widgets/Buttons.h"
 #include "../CGameInfo.h"
 #include "../CServerHandler.h"
+#include "../gui/CGuiHandler.h"
 #include "../mainmenu/CMainMenu.h"
+#include "../widgets/Buttons.h"
+#include "../widgets/Images.h"
+#include "../widgets/TextControls.h"

+#include "../../lib/CConfigHandler.h"
 #include "../../lib/CGeneralTextHandler.h"
 #include "../../lib/MetaString.h"
-#include "../../lib/CConfigHandler.h"

 GlobalLobbyServerSetup::GlobalLobbyServerSetup()
 	: CWindowObject(BORDERED)
--- a/client/globalLobby/GlobalLobbyWidget.h
+++ b/client/globalLobby/GlobalLobbyWidget.h
@@ -16,6 +16,7 @@ class GlobalLobbyWindow;
 class GlobalLobbyWidget : public InterfaceObjectConfigurable
 {
 	GlobalLobbyWindow * window;
+
 public:
 	GlobalLobbyWidget(GlobalLobbyWindow * window);

--- a/client/globalLobby/GlobalLobbyWindow.cpp
+++ b/client/globalLobby/GlobalLobbyWindow.cpp
@@ -11,20 +11,20 @@
 #include "StdInc.h"
 #include "GlobalLobbyWindow.h"

-#include "GlobalLobbyWidget.h"
 #include "GlobalLobbyClient.h"
 #include "GlobalLobbyServerSetup.h"
+#include "GlobalLobbyWidget.h"

+#include "../CServerHandler.h"
 #include "../gui/CGuiHandler.h"
 #include "../gui/WindowHandler.h"
 #include "../widgets/TextControls.h"
-#include "../CServerHandler.h"

-#include "../../lib/MetaString.h"
 #include "../../lib/CConfigHandler.h"
+#include "../../lib/MetaString.h"

-GlobalLobbyWindow::GlobalLobbyWindow():
-	CWindowObject(BORDERED)
+GlobalLobbyWindow::GlobalLobbyWindow()
+	: CWindowObject(BORDERED)
 {
 	OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;
 	widget = std::make_shared<GlobalLobbyWidget>(this);
--- a/client/globalLobby/GlobalLobbyWindow.h
+++ b/client/globalLobby/GlobalLobbyWindow.h
@@ -26,5 +26,4 @@ public:
 	void doCreateGameRoom();

 	void onGameChatMessage(const std::string & sender, const std::string & message, const std::string & when);
-
 };
--- a/lobby/LobbyDatabase.cpp
+++ b/lobby/LobbyDatabase.cpp
@@ -330,20 +330,11 @@ void LobbyDatabase::insertAccessCookie(const std::string & accountID, const std:
 	insertAccessCookieStatement->executeOnce(accountID, accessCookieUUID);
 }

-void LobbyDatabase::updateAccessCookie(const std::string & accountID, const std::string & accessCookieUUID)
-{
+void LobbyDatabase::updateAccessCookie(const std::string & accountID, const std::string & accessCookieUUID) {}

-}
+void LobbyDatabase::updateAccountLoginTime(const std::string & accountID) {}

-void LobbyDatabase::updateAccountLoginTime(const std::string & accountID)
-{
-
-}
-
-void LobbyDatabase::updateActiveAccount(const std::string & accountID, bool isActive)
-{
-
-}
+void LobbyDatabase::updateActiveAccount(const std::string & accountID, bool isActive) {}

 std::string LobbyDatabase::getAccountDisplayName(const std::string & accountID)
 {
--- a/lobby/LobbyServer.cpp
+++ b/lobby/LobbyServer.cpp
@@ -13,11 +13,11 @@
 #include "LobbyDatabase.h"

 #include "../lib/JsonNode.h"
-#include "../lib/network/NetworkServer.h"
 #include "../lib/network/NetworkConnection.h"
+#include "../lib/network/NetworkServer.h"

-#include <boost/uuid/uuid_io.hpp>
 #include <boost/uuid/uuid_generators.hpp>
+#include <boost/uuid/uuid_io.hpp>

 static const auto accountCookieLifetime = std::chrono::hours(24 * 7);

@@ -29,7 +29,7 @@ bool LobbyServer::isAccountNameValid(const std::string & accountName)
 	if(accountName.size() < 20)
 		return false;

-	for (auto const & c : accountName)
+	for(const auto & c : accountName)
 		if(!std::isalnum(c))
 			return false;

@@ -44,7 +44,7 @@ std::string LobbyServer::sanitizeChatMessage(const std::string & inputString) co

 NetworkConnectionPtr LobbyServer::findAccount(const std::string & accountID)
 {
-	for (auto const & account : activeAccounts)
+	for(const auto & account : activeAccounts)
 		if(account.second.accountID == accountID)
 			return account.first;

@@ -53,7 +53,7 @@ NetworkConnectionPtr LobbyServer::findAccount(const std::string & accountID)

 NetworkConnectionPtr LobbyServer::findGameRoom(const std::string & gameRoomID)
 {
-	for (auto const & account : activeGameRooms)
+	for(const auto & account : activeGameRooms)
 		if(account.second.roomID == gameRoomID)
 			return account.first;

--- a/lobby/LobbyServer.h
+++ b/lobby/LobbyServer.h
@@ -9,8 +9,8 @@
 */
 #pragma once

-#include "LobbyDefines.h"
 #include "../lib/network/NetworkListener.h"
+#include "LobbyDefines.h"

 VCMI_LIB_NAMESPACE_BEGIN
 class JsonNode;