CLOUD: JANITORIAL: Fix code formatting

6 files changed, 104 insertions, 46 deletions

diff --git a/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp b/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp
index b16827dc58..474ac7465e 100644
--- a/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp
+++ b/backends/networking/sdl_net/handlers/createdirectoryhandler.cpp
@@ -61,7 +61,8 @@ void CreateDirectoryHandler::handle(Client &client) {
 	}
 
 	// check that <directory_name> doesn't exist or is directory
-	if (path.lastChar() != '/' && path.lastChar() != '\\') path += '/';
+	if (path.lastChar() != '/' && path.lastChar() != '\\')
+		path += '/';
 	node = g_system->getFilesystemFactory()->makeFileNodePath(path + name);
 	if (node->exists()) {
 		if (!node->isDirectory()) {
@@ -97,8 +98,10 @@ void CreateDirectoryHandler::handle(Client &client) {
 }
 
 void CreateDirectoryHandler::handleError(Client &client, Common::String message) const {
-	if (client.queryParameter("answer_json") == "true") setJsonResponseHandler(client, "error", message);
-	else HandlerUtils::setFilesManagerErrorMessageHandler(client, message);
+	if (client.queryParameter("answer_json") == "true")
+		setJsonResponseHandler(client, "error", message);
+	else
+		HandlerUtils::setFilesManagerErrorMessageHandler(client, message);
 }
 
 void CreateDirectoryHandler::setJsonResponseHandler(Client &client, Common::String type, Common::String message) const {
diff --git a/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp b/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp
index 6cf18aeb79..e0ecae9632 100644
--- a/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp
+++ b/backends/networking/sdl_net/handlers/filesajaxpagehandler.cpp
@@ -42,7 +42,9 @@ Common::String encodeDoubleQuotesAndSlashes(Common::String s) {
 			result += "\\\"";
 		} else if (s[i] == '\\') {
 			result += "\\\\";
-		} else result += s[i];
+		} else {
+			result += s[i];
+		}
 	return result;
 }
 
diff --git a/backends/networking/sdl_net/handlers/filesbasehandler.cpp b/backends/networking/sdl_net/handlers/filesbasehandler.cpp
index 9546c5c845..68d7919d4a 100644
--- a/backends/networking/sdl_net/handlers/filesbasehandler.cpp
+++ b/backends/networking/sdl_net/handlers/filesbasehandler.cpp
@@ -40,20 +40,24 @@ Common::String FilesBaseHandler::parentPath(Common::String path) {
 				break;
 			}
 	}
-	if (path.size() && path.lastChar() != '/' && path.lastChar() != '\\') path += '/';
+	if (path.size() && path.lastChar() != '/' && path.lastChar() != '\\')
+		path += '/';
 	return path;
 }
 
 bool FilesBaseHandler::transformPath(Common::String &path, Common::String &prefixToRemove, Common::String &prefixToAdd, bool isDirectory) {
 	// <path> is not empty, but could lack the trailing slash
-	if (isDirectory && path.lastChar() != '/' && path.lastChar() != '\\') path += '/';
+	if (isDirectory && path.lastChar() != '/' && path.lastChar() != '\\')
+		path += '/';
 
 	if (path.hasPrefix("/root")) {
 		prefixToAdd = "/root/";
 		prefixToRemove = "";
 		path.erase(0, 5);
-		if (path == "") path = "/"; // absolute root is '/'
-		if (path != "/") path.deleteChar(0); // if that was "/root/ab/c", it becomes "/ab/c", but we need "ab/c"
+		if (path == "")
+			path = "/"; // absolute root is '/'
+		if (path != "/")
+			path.deleteChar(0); // if that was "/root/ab/c", it becomes "/ab/c", but we need "ab/c"
 		return true;
 	}
 
diff --git a/backends/networking/sdl_net/handlers/filespagehandler.cpp b/backends/networking/sdl_net/handlers/filespagehandler.cpp
index d3fa459aeb..abe6f42d8f 100644
--- a/backends/networking/sdl_net/handlers/filespagehandler.cpp
+++ b/backends/networking/sdl_net/handlers/filespagehandler.cpp
@@ -40,17 +40,23 @@ Common::String encodeDoubleQuotes(Common::String s) {
 	for (uint32 i = 0; i < s.size(); ++i)
 		if (s[i] == '"') {
 			result += "\\\"";
-		} else result += s[i];
+		} else {
+			result += s[i];
+		}
 	return result;
 }
 
 Common::String encodeHtmlEntities(Common::String s) {
 	Common::String result = "";
 	for (uint32 i = 0; i < s.size(); ++i)
-		if (s[i] == '<') result += "&lt;";
-		else if (s[i] == '>') result += "&gt;";
-		else if (s[i] == '&') result += "&amp;";
-		else if (s[i] > 0x7F) result += Common::String::format("&#%d;", (int)s[i]);
+		if (s[i] == '<')
+			result += "&lt;";
+		else if (s[i] == '>')
+			result += "&gt;";
+		else if (s[i] == '&')
+			result += "&amp;";
+		else if (s[i] > 0x7F)
+			result += Common::String::format("&#%d;", (int)s[i]);
 		else result += s[i];
 	return result;
 }
@@ -58,9 +64,12 @@ Common::String encodeHtmlEntities(Common::String s) {
 Common::String getDisplayPath(Common::String s) {
 	Common::String result = "";
 	for (uint32 i = 0; i < s.size(); ++i)
-		if (s[i] == '\\') result += '/';
-		else result += s[i];
-	if (result == "") return "/";
+		if (s[i] == '\\')
+			result += '/';
+		else
+			result += s[i];
+	if (result == "")
+		return "/";
 	return result;
 }
 }
@@ -93,7 +102,8 @@ void FilesPageHandler::handle(Client &client) {
 
 	// load stylish response page from the archive
 	Common::SeekableReadStream *const stream = HandlerUtils::getArchiveFile(FILES_PAGE_NAME);
-	if (stream) response = HandlerUtils::readEverythingFromStream(stream);
+	if (stream)
+		response = HandlerUtils::readEverythingFromStream(stream);
 
 	Common::String path = client.queryParameter("path");
 	Common::String content = "";
@@ -127,11 +137,14 @@ bool FilesPageHandler::listDirectory(Common::String path, Common::String &conten
 	}
 
 	Common::String prefixToRemove = "", prefixToAdd = "";
-	if (!transformPath(path, prefixToRemove, prefixToAdd)) return false;
+	if (!transformPath(path, prefixToRemove, prefixToAdd))
+		return false;
 
 	Common::FSNode node = Common::FSNode(path);
-	if (path == "/") node = node.getParent(); // absolute root
-	if (!node.isDirectory()) return false;
+	if (path == "/")
+		node = node.getParent(); // absolute root
+	if (!node.isDirectory())
+		return false;
 
 	// list directory
 	Common::FSList _nodeContent;
@@ -155,7 +168,8 @@ bool FilesPageHandler::listDirectory(Common::String path, Common::String &conten
 	// fill the content
 	for (Common::FSList::iterator i = _nodeContent.begin(); i != _nodeContent.end(); ++i) {
 		Common::String name = i->getDisplayName();
-		if (i->isDirectory()) name += "/";
+		if (i->isDirectory())
+			name += "/";
 
 		Common::String filePath = i->getPath();
 		if (filePath.hasPrefix(prefixToRemove))
@@ -169,10 +183,14 @@ bool FilesPageHandler::listDirectory(Common::String path, Common::String &conten
 }
 
 FilesPageHandler::ItemType FilesPageHandler::detectType(bool isDirectory, const Common::String &name) {
-	if (isDirectory) return IT_DIRECTORY;
-	if (name.hasSuffix(".txt")) return IT_TXT;
-	if (name.hasSuffix(".zip")) return IT_ZIP;
-	if (name.hasSuffix(".7z")) return IT_7Z;
+	if (isDirectory)
+		return IT_DIRECTORY;
+	if (name.hasSuffix(".txt"))
+		return IT_TXT;
+	if (name.hasSuffix(".zip"))
+		return IT_ZIP;
+	if (name.hasSuffix(".7z"))
+		return IT_7Z;
 	return IT_UNKNOWN;
 }
 
@@ -180,12 +198,23 @@ void FilesPageHandler::addItem(Common::String &content, const Common::String &it
 	Common::String item = itemTemplate, icon;
 	bool isDirectory = (itemType == IT_DIRECTORY || itemType == IT_PARENT_DIRECTORY);
 	switch (itemType) {
-	case IT_DIRECTORY: icon = "dir.png"; break;
-	case IT_PARENT_DIRECTORY: icon = "up.png"; break;
-	case IT_TXT: icon = "txt.png"; break;
-	case IT_ZIP: icon = "zip.png"; break;
-	case IT_7Z: icon = "7z.png"; break;
-	default: icon = "unk.png";
+	case IT_DIRECTORY:
+		icon = "dir.png";
+		break;
+	case IT_PARENT_DIRECTORY:
+		icon = "up.png";
+		break;
+	case IT_TXT:
+		icon = "txt.png";
+		break;
+	case IT_ZIP:
+		icon = "zip.png";
+		break;
+	case IT_7Z:
+		icon = "7z.png";
+		break;
+	default:
+		icon = "unk.png";
 	}
 	replace(item, "{icon}", icon);
 	replace(item, "{link}", (isDirectory ? "files?path=" : "download?path=") + LocalWebserver::urlEncodeQueryParameterValue(path));
diff --git a/backends/networking/sdl_net/handlers/listajaxhandler.cpp b/backends/networking/sdl_net/handlers/listajaxhandler.cpp
index 2e2e138fd6..de349bd6ef 100644
--- a/backends/networking/sdl_net/handlers/listajaxhandler.cpp
+++ b/backends/networking/sdl_net/handlers/listajaxhandler.cpp
@@ -54,11 +54,14 @@ Common::JSONObject ListAjaxHandler::listDirectory(Common::String path) {
 	}
 
 	Common::String prefixToRemove = "", prefixToAdd = "";
-	if (!transformPath(path, prefixToRemove, prefixToAdd)) return errorResult;
+	if (!transformPath(path, prefixToRemove, prefixToAdd))
+		return errorResult;
 
 	Common::FSNode node = Common::FSNode(path);
-	if (path == "/") node = node.getParent(); // absolute root
-	if (!node.isDirectory()) return errorResult;
+	if (path == "/")
+		node = node.getParent(); // absolute root
+	if (!node.isDirectory())
+		return errorResult;
 
 	// list directory
 	Common::FSList _nodeContent;
@@ -97,10 +100,14 @@ Common::JSONObject ListAjaxHandler::listDirectory(Common::String path) {
 }
 
 ListAjaxHandler::ItemType ListAjaxHandler::detectType(bool isDirectory, const Common::String &name) {
-	if (isDirectory) return IT_DIRECTORY;
-	if (name.hasSuffix(".txt")) return IT_TXT;
-	if (name.hasSuffix(".zip")) return IT_ZIP;
-	if (name.hasSuffix(".7z")) return IT_7Z;
+	if (isDirectory)
+		return IT_DIRECTORY;
+	if (name.hasSuffix(".txt"))
+		return IT_TXT;
+	if (name.hasSuffix(".zip"))
+		return IT_ZIP;
+	if (name.hasSuffix(".7z"))
+		return IT_7Z;
 	return IT_UNKNOWN;
 }
 
@@ -108,12 +115,23 @@ void ListAjaxHandler::addItem(Common::JSONArray &responseItemsList, ItemType ite
 	Common::String icon;
 	bool isDirectory = (itemType == IT_DIRECTORY || itemType == IT_PARENT_DIRECTORY);
 	switch (itemType) {
-	case IT_DIRECTORY: icon = "dir.png"; break;
-	case IT_PARENT_DIRECTORY: icon = "up.png"; break;
-	case IT_TXT: icon = "txt.png"; break;
-	case IT_ZIP: icon = "zip.png"; break;
-	case IT_7Z: icon = "7z.png"; break;
-	default: icon = "unk.png";
+	case IT_DIRECTORY:
+		icon = "dir.png";
+		break;
+	case IT_PARENT_DIRECTORY:
+		icon = "up.png";
+		break;
+	case IT_TXT:
+		icon = "txt.png";
+		break;
+	case IT_ZIP:
+		icon = "zip.png";
+		break;
+	case IT_7Z:
+		icon = "7z.png";
+		break;
+	default:
+		icon = "unk.png";
 	}
 
 	Common::JSONObject item;
diff --git a/backends/networking/sdl_net/handlers/resourcehandler.cpp b/backends/networking/sdl_net/handlers/resourcehandler.cpp
index 1205c4aa7d..d6c419dd51 100644
--- a/backends/networking/sdl_net/handlers/resourcehandler.cpp
+++ b/backends/networking/sdl_net/handlers/resourcehandler.cpp
@@ -35,11 +35,13 @@ void ResourceHandler::handle(Client &client) {
 	filename.deleteChar(0);
 
 	// if archive hidden file is requested, ignore
-	if (filename.size() && filename[0] == '.') return;
+	if (filename.size() && filename[0] == '.')
+		return;
 
 	// if file not found, don't set handler either
 	Common::SeekableReadStream *file = HandlerUtils::getArchiveFile(filename);
-	if (file == nullptr) return;
+	if (file == nullptr)
+		return;
 
 	LocalWebserver::setClientGetHandler(client, file, 200, LocalWebserver::determineMimeType(filename));
 }