Skip to content

Commit 6f09a0a

Browse files
patrikjuvonenpatrikjuvonen
committed
Revert "Run clang-format"
Test fix. This reverts commit ec1b27a. This reverts commit 94a735b. This reverts commit 8e3e3b8. This reverts commit d5b9a56. This reverts commit 25d9ba3.
1 parent d10c7d0 commit 6f09a0a

File tree

314 files changed

+2360
-2110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

314 files changed

+2360
-2110
lines changed

‎Client/cefweb/CWebCore.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ eURLState CWebCore::GetDomainState(const SString& strURL, bool bOutputDebug)
254254
std::lock_guard<std::recursive_mutex> lock(m_FilterMutex);
255255

256256
// Initialize wildcard whitelist (be careful with modifying) | Todo: Think about the following
257-
static SString wildcardWhitelist[] = {"*.googlevideo.com", "*.google.com", "*.youtube.com", "*.ytimg.com",
258-
"*.vimeocdn.com", "*.gstatic.com", "*.googleapis.com", "*.ggpht.com"};
257+
static SString wildcardWhitelist[] = {"*.googlevideo.com", "*.google.com", "*.youtube.com", "*.ytimg.com", "*.vimeocdn.com", "*.gstatic.com", "*.googleapis.com", "*.ggpht.com"};
259258

260259
for (int i = 0; i < sizeof(wildcardWhitelist) / sizeof(SString); ++i)
261260
{
@@ -330,9 +329,9 @@ void CWebCore::InitialiseWhiteAndBlacklist(bool bAddHardcoded, bool bAddDynamic)
330329
if (bAddDynamic)
331330
{
332331
// Hardcoded whitelist
333-
static SString whitelist[] = {"google.com", "youtube.com", "www.youtube-nocookie.com", "vimeo.com", "player.vimeo.com",
334-
"code.jquery.com", "mtasa.com", "multitheftauto.com", "mtavc.com", "www.googleapis.com",
335-
"ajax.googleapis.com"};
332+
static SString whitelist[] = {
333+
"google.com", "youtube.com", "www.youtube-nocookie.com", "vimeo.com", "player.vimeo.com", "code.jquery.com", "mtasa.com",
334+
"multitheftauto.com", "mtavc.com", "www.googleapis.com", "ajax.googleapis.com"};
336335

337336
// Hardcoded blacklist
338337
static SString blacklist[] = {"nobrain.dk"};
@@ -500,7 +499,7 @@ void CWebCore::ProcessInputMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
500499
// Alt-Gr check
501500
if ((keyEvent.type == KEYEVENT_CHAR) && isKeyDown(VK_RMENU))
502501
{
503-
HKL current_layout = ::GetKeyboardLayout(0);
502+
HKL current_layout = ::GetKeyboardLayout(0);
504503
SHORT scan_res = ::VkKeyScanExW(wParam, current_layout);
505504
if ((HIBYTE(scan_res) & (2 | 4)) == (2 | 4))
506505
{

‎Client/cefweb/CWebCore.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ class CWebCore : public CWebCoreInterface
3939

4040
EventEntry(const std::function<void()>& callback_, CWebView* pWebView_) : callback(callback_), pWebView(pWebView_) {}
4141
#ifdef MTA_DEBUG
42-
EventEntry(const std::function<void()>& callback_, CWebView* pWebView_, const SString& name_) : callback(callback_), pWebView(pWebView_), name(name_) {}
42+
EventEntry(const std::function<void()>& callback_, CWebView* pWebView_, const SString& name_)
43+
: callback(callback_), pWebView(pWebView_), name(name_)
44+
{
45+
}
4346
#endif
4447
};
4548

‎Client/cefweb/CWebView.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,7 @@ bool CWebView::GetFullPathFromLocal(SString& strPath)
458458
return;
459459

460460
result = m_pEventsInterface->Events_OnResourcePathCheck(strPath);
461-
},
462-
this);
461+
}, this);
463462

464463
return result;
465464
}
@@ -505,8 +504,7 @@ bool CWebView::VerifyFile(const SString& strPath, CBuffer& outFileData)
505504
return;
506505

507506
result = m_pEventsInterface->Events_OnResourceFileCheck(strPath, outFileData);
508-
},
509-
this);
507+
}, this);
510508

511509
return result;
512510
}
@@ -826,7 +824,7 @@ bool CWebView::OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame>
826824
// //
827825
////////////////////////////////////////////////////////////////////
828826
CefResourceRequestHandler::ReturnValue CWebView::OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
829-
CefRefPtr<CefRequestCallback> callback)
827+
CefRefPtr<CefRequestCallback> callback)
830828
{
831829
// Mostly the same as CWebView::OnBeforeBrowse
832830
CefURLParts urlParts;

‎Client/cefweb/CWebView.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ class CWebView : public CWebViewInterface,
131131
const CefString& failedURL) override;
132132

133133
// CefRequestHandler methods
134-
virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool userGesture,
135-
bool isRedirect) override;
134+
virtual bool OnBeforeBrowse(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request, bool userGesture, bool isRedirect) override;
136135
virtual CefRefPtr<CefResourceRequestHandler> GetResourceRequestHandler(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
137136
CefRefPtr<CefRequest> request, bool is_navigation, bool is_download,
138137
const CefString& request_initiator, bool& disable_default_handling) override
@@ -142,7 +141,7 @@ class CWebView : public CWebViewInterface,
142141

143142
// CefResourceRequestHandler
144143
virtual CefResourceRequestHandler::ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame, CefRefPtr<CefRequest> request,
145-
CefRefPtr<CefRequestCallback> callback) override;
144+
CefRefPtr<CefRequestCallback> callback) override;
146145

147146
// CefLifeSpawnHandler methods
148147
virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) override;

‎Client/cefweb/CefWeb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "StdInc.h"
1212
#include "SharedUtil.hpp"
1313

14-
CCoreInterface* g_pCore = NULL;
14+
CCoreInterface* g_pCore = NULL;
1515
CLocalizationInterface* g_pLocalization = nullptr;
1616

1717
extern "C" _declspec(dllexport) CWebCoreInterface* InitWebCoreInterface(CCoreInterface* pCore)

‎Client/cefweb/StdInc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
#include "CWebCore.h"
2222
#include "CWebView.h"
2323

24-
extern CCoreInterface* g_pCore;
24+
extern CCoreInterface* g_pCore;
2525
extern CLocalizationInterface* g_pLocalization;

‎Client/core/CAdditionalVertexStreamManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ bool CAdditionalVertexStreamManager::UpdateAdditionalStreamContent(SCurrentState
328328
for (uint i = 0; i < NumVerts; i++)
329329
{
330330
// Validate
331-
CVector& Normal = NormalList[i];
331+
CVector& Normal = NormalList[i];
332332
static constexpr float FLOAT_EPSILON = 0.0001f;
333333
if (Normal.Normalize() < FLOAT_EPSILON)
334334
Normal = CVector(0, 0, 1);

‎Client/core/CClientVariables.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,8 @@ void CClientVariables::LoadDefaults()
351351
DEFAULT("browser_remote_javascript", true); // Execute javascript on remote websites?
352352
DEFAULT("filter_duplicate_log_lines", true); // Filter duplicate log lines for debug view and clientscript.log
353353
DEFAULT("discord_rich_presence", true); // Enable Discord Game SDK
354-
DEFAULT("always_show_transferbox", false); // Should the transfer box always be visible for downloads? (and ignore scripted control)
355-
DEFAULT("_beta_qc_rightclick_command", _S("reconnect")); // Command to run when right clicking quick connect (beta - can be removed at any time)
354+
DEFAULT("always_show_transferbox", false); // Should the transfer box always be visible for downloads? (and ignore scripted control)
355+
DEFAULT("_beta_qc_rightclick_command", _S("reconnect")); // Command to run when right clicking quick connect (beta - can be removed at any time)
356356

357357
if (!Exists("locale"))
358358
{

‎Client/core/CConnectManager.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ CConnectManager::~CConnectManager()
4646
g_pConnectManager = NULL;
4747
}
4848

49-
bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser,
50-
const char* szSecret)
49+
bool CConnectManager::Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser, const char* szSecret)
5150
{
5251
assert(szHost);
5352
assert(szNick);

‎Client/core/CConnectManager.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ class CConnectManager
2121
CConnectManager();
2222
~CConnectManager();
2323

24-
bool Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser = false,
25-
const char* szSecret = nullptr);
24+
bool Connect(const char* szHost, unsigned short usPort, const char* szNick, const char* szPassword, bool bNotifyServerBrowser = false, const char* szSecret = nullptr);
2625
bool Reconnect(const char* szHost, unsigned short usPort, const char* szPassword, bool bSave = true);
2726

2827
bool Abort();

0 commit comments

Comments
 (0)