Revert "Revert "Run clang-format""

This reverts commit 6f09a0a.

Author: patrikjuvonen

Client/cefweb/CWebCore.cpp

@@ -254,7 +254,8 @@ eURLState CWebCore::GetDomainState(const SString& strURL, bool bOutputDebug)
     std::lock_guard<std::recursive_mutex> lock(m_FilterMutex);
 
     // Initialize wildcard whitelist (be careful with modifying) | Todo: Think about the following
-    static SString wildcardWhitelist[] = {"*.googlevideo.com", "*.google.com", "*.youtube.com", "*.ytimg.com", "*.vimeocdn.com", "*.gstatic.com", "*.googleapis.com", "*.ggpht.com"};
+    static SString wildcardWhitelist[] = {"*.googlevideo.com", "*.google.com",  "*.youtube.com",    "*.ytimg.com",
+                                          "*.vimeocdn.com",    "*.gstatic.com", "*.googleapis.com", "*.ggpht.com"};
 
     for (int i = 0; i < sizeof(wildcardWhitelist) / sizeof(SString); ++i)
     {
@@ -329,9 +330,9 @@ void CWebCore::InitialiseWhiteAndBlacklist(bool bAddHardcoded, bool bAddDynamic)
     if (bAddDynamic)
     {
         // Hardcoded whitelist
-        static SString whitelist[] = {
-            "google.com",         "youtube.com", "www.youtube-nocookie.com", "vimeo.com",           "player.vimeo.com", "code.jquery.com", "mtasa.com",
-            "multitheftauto.com", "mtavc.com",   "www.googleapis.com",       "ajax.googleapis.com"};
+        static SString whitelist[] = {"google.com",         "youtube.com", "www.youtube-nocookie.com", "vimeo.com", "player.vimeo.com",
+                                      "code.jquery.com",    "mtasa.com",   "multitheftauto.com",       "mtavc.com", "www.googleapis.com",
+                                      "ajax.googleapis.com"};
 
         // Hardcoded blacklist
         static SString blacklist[] = {"nobrain.dk"};
@@ -499,7 +500,7 @@ void CWebCore::ProcessInputMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
     // Alt-Gr check
     if ((keyEvent.type == KEYEVENT_CHAR) && isKeyDown(VK_RMENU))
     {
-        HKL current_layout = ::GetKeyboardLayout(0);
+        HKL   current_layout = ::GetKeyboardLayout(0);
         SHORT scan_res = ::VkKeyScanExW(wParam, current_layout);
         if ((HIBYTE(scan_res) & (2 | 4)) == (2 | 4))
         {

Client/cefweb/CWebCore.h

@@ -39,10 +39,7 @@ class CWebCore : public CWebCoreInterface
 
         EventEntry(const std::function<void()>& callback_, CWebView* pWebView_) : callback(callback_), pWebView(pWebView_) {}
 #ifdef MTA_DEBUG
-        EventEntry(const std::function<void()>& callback_, CWebView* pWebView_, const SString& name_)
-            : callback(callback_), pWebView(pWebView_), name(name_)
-        {
-        }
+        EventEntry(const std::function<void()>& callback_, CWebView* pWebView_, const SString& name_) : callback(callback_), pWebView(pWebView_), name(name_) {}
 #endif
     };
 

Client/cefweb/CWebView.cpp

@@ -458,7 +458,8 @@ bool CWebView::GetFullPathFromLocal(SString& strPath)
                 return;
 
             result = m_pEventsInterface->Events_OnResourcePathCheck(strPath);
-    }, this);
+        },
+        this);
 
     return result;
 }
@@ -504,7 +505,8 @@ bool CWebView::VerifyFile(const SString& strPath, CBuffer& outFileData)
                 return;
 
             result = m_pEventsInterface->Events_OnResourceFileCheck(strPath, outFileData);
-    }, this);
+        },
+        this);
 
     return result;
 }
@@ -824,7 +826,7 @@ bool CWebView::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame>
 //                                                                //
 ////////////////////////////////////////////////////////////////////
 CefResourceRequestHandler::ReturnValue CWebView::OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
-                                                              CefRefPtr<CefRequestCallback> callback)
+                                                                      CefRefPtr<CefRequestCallback> callback)
 {
     // Mostly the same as CWebView::OnBeforeBrowse
     CefURLParts urlParts;

Client/cefweb/CWebView.h

@@ -131,7 +131,8 @@ class CWebView : public CWebViewInterface,
                              const CefString& failedURL) override;
 
     // CefRequestHandler methods
-    virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool userGesture, bool isRedirect) override;
+    virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool userGesture,
+                                bool isRedirect) override;
     virtual CefRefPtr<CefResourceRequestHandler> GetResourceRequestHandler(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
                                                                            CefRefPtr<CefRequest> request, bool is_navigation, bool is_download,
                                                                            const CefString& request_initiator, bool& disable_default_handling) override
@@ -141,7 +142,7 @@ class CWebView : public CWebViewInterface,
 
     // CefResourceRequestHandler
     virtual CefResourceRequestHandler::ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
-                                                                CefRefPtr<CefRequestCallback> callback) override;
+                                                                        CefRefPtr<CefRequestCallback> callback) override;
 
     // CefLifeSpawnHandler methods
     virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) override;

Client/cefweb/CefWeb.cpp

@@ -11,7 +11,7 @@
 #include "StdInc.h"
 #include "SharedUtil.hpp"
 
-CCoreInterface* g_pCore = NULL;
+CCoreInterface*         g_pCore = NULL;
 CLocalizationInterface* g_pLocalization = nullptr;
 
 extern "C" _declspec(dllexport) CWebCoreInterface* InitWebCoreInterface(CCoreInterface* pCore)

Client/cefweb/StdInc.h

@@ -21,5 +21,5 @@
 #include "CWebCore.h"
 #include "CWebView.h"
 
-extern CCoreInterface* g_pCore;
+extern CCoreInterface*         g_pCore;
 extern CLocalizationInterface* g_pLocalization;

Client/core/CAdditionalVertexStreamManager.cpp

@@ -328,7 +328,7 @@ bool CAdditionalVertexStreamManager::UpdateAdditionalStreamContent(SCurrentState
         for (uint i = 0; i < NumVerts; i++)
         {
             // Validate
-            CVector& Normal = NormalList[i];
+            CVector&               Normal = NormalList[i];
             static constexpr float FLOAT_EPSILON = 0.0001f;
             if (Normal.Normalize() < FLOAT_EPSILON)
                 Normal = CVector(0, 0, 1);

Client/core/CClientVariables.cpp

@@ -351,8 +351,8 @@ void CClientVariables::LoadDefaults()
     DEFAULT("browser_remote_javascript", true);                                       // Execute javascript on remote websites?
     DEFAULT("filter_duplicate_log_lines", true);                                      // Filter duplicate log lines for debug view and clientscript.log
     DEFAULT("discord_rich_presence", true);                                           // Enable Discord Game SDK
-    DEFAULT("always_show_transferbox", false);                                        // Should the transfer box always be visible for downloads? (and ignore scripted control)
-    DEFAULT("_beta_qc_rightclick_command", _S("reconnect"));                          // Command to run when right clicking quick connect (beta - can be removed at any time)
+    DEFAULT("always_show_transferbox", false);            // Should the transfer box always be visible for downloads? (and ignore scripted control)
+    DEFAULT("_beta_qc_rightclick_command", _S("reconnect"));            // Command to run when right clicking quick connect (beta - can be removed at any time)
 
     if (!Exists("locale"))
     {

Client/core/CConnectManager.cpp

@@ -46,7 +46,8 @@ CConnectManager::~CConnectManager()
     g_pConnectManager = NULL;
 }
 
-bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser, const char* szSecret)
+bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser,
+                              const char* szSecret)
 {
     assert(szHost);
     assert(szNick);

Client/core/CConnectManager.h

@@ -21,7 +21,8 @@ class CConnectManager
     CConnectManager();
     ~CConnectManager();
 
-    bool Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser = false, const char* szSecret = nullptr);
+    bool Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser = false,
+                 const char* szSecret = nullptr);
     bool Reconnect(const char* szHost, unsigned short usPort, const char* szPassword, bool bSave = true);
 
     bool Abort();