From cd0799e816573f062aeac23a8cfed5b83fc6cb41 Mon Sep 17 00:00:00 2001 From: Aleksey Komarov Date: Sat, 29 Sep 2018 23:17:29 +0300 Subject: [PATCH] Rename getStatus to GetStatus --- src/Layers/xrRender/xrRender_console.cpp | 14 +++++++------- src/xrEngine/XR_IOConsole.cpp | 2 +- src/xrEngine/XR_IOConsole_get.cpp | 2 +- src/xrEngine/xrSASH.cpp | 2 +- src/xrEngine/xr_ioc_cmd.cpp | 4 ++-- src/xrEngine/xr_ioc_cmd.h | 18 +++++++++--------- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Layers/xrRender/xrRender_console.cpp b/src/Layers/xrRender/xrRender_console.cpp index d672a030055..00c67f510ec 100644 --- a/src/Layers/xrRender/xrRender_console.cpp +++ b/src/Layers/xrRender/xrRender_console.cpp @@ -252,9 +252,9 @@ class CCC_detail_radius : public CCC_Integer apply(); } - void getStatus(TStatus& S) override + void GetStatus(TStatus& S) override { - CCC_Integer::getStatus(S); + CCC_Integer::GetStatus(S); } }; @@ -285,9 +285,9 @@ class CCC_tf_Aniso : public CCC_Integer CCC_Integer::Execute(args); apply(); } - virtual void getStatus(TStatus& S) + virtual void GetStatus(TStatus& S) { - CCC_Integer::getStatus(S); + CCC_Integer::GetStatus(S); apply(); } }; @@ -315,9 +315,9 @@ class CCC_tf_MipBias : public CCC_Float CCC_Float::Execute(args); apply(); } - virtual void getStatus(TStatus& S) + virtual void GetStatus(TStatus& S) { - CCC_Float::getStatus(S); + CCC_Float::GetStatus(S); apply(); } }; @@ -639,7 +639,7 @@ class CCC_Dof : public CCC_Vector3 g_pGamePersistent->SetBaseDof(ps_r2_dof); } } - virtual void getStatus(TStatus& S) { xr_sprintf(S, "%f,%f,%f", value->x, value->y, value->z); } + virtual void GetStatus(TStatus& S) { xr_sprintf(S, "%f,%f,%f", value->x, value->y, value->z); } virtual void Info(TInfo& I) { xr_sprintf(I, "vector3 in range [%f,%f,%f]-[%f,%f,%f]", min.x, min.y, min.z, max.x, max.y, max.z); diff --git a/src/xrEngine/XR_IOConsole.cpp b/src/xrEngine/XR_IOConsole.cpp index 0771de3dfcf..558d7e4ee59 100644 --- a/src/xrEngine/XR_IOConsole.cpp +++ b/src/xrEngine/XR_IOConsole.cpp @@ -564,7 +564,7 @@ void CConsole::ExecuteCommand(LPCSTR cmd_str, bool record_cmd) else { IConsole_Command::TStatus stat; - cc->getStatus(stat); + cc->GetStatus(stat); Msg("- %s %s", cc->Name(), stat); } } diff --git a/src/xrEngine/XR_IOConsole_get.cpp b/src/xrEngine/XR_IOConsole_get.cpp index cdb47edabe2..490c9be1f74 100644 --- a/src/xrEngine/XR_IOConsole_get.cpp +++ b/src/xrEngine/XR_IOConsole_get.cpp @@ -78,7 +78,7 @@ LPCSTR CConsole::GetString(LPCSTR cmd) const return NULL; static IConsole_Command::TStatus stat; - cc->getStatus(stat); + cc->GetStatus(stat); return stat; } diff --git a/src/xrEngine/xrSASH.cpp b/src/xrEngine/xrSASH.cpp index 8f836115524..c84eb069195 100644 --- a/src/xrEngine/xrSASH.cpp +++ b/src/xrEngine/xrSASH.cpp @@ -644,7 +644,7 @@ void xrSASH::GetOption(pcstr pszOptionName) else if (pToken) { IConsole_Command::TStatus stat; - pToken->getStatus(stat); + pToken->GetStatus(stat); Val.Enum = stat; oaAddOptionValue(pszOptionName, OA_TYPE_ENUM, &Val); } diff --git a/src/xrEngine/xr_ioc_cmd.cpp b/src/xrEngine/xr_ioc_cmd.cpp index bc9754ad43d..a446005eb1f 100644 --- a/src/xrEngine/xr_ioc_cmd.cpp +++ b/src/xrEngine/xr_ioc_cmd.cpp @@ -156,7 +156,7 @@ class CCC_Help : public IConsole_Command { IConsole_Command& C = *(it->second); TStatus _S; - C.getStatus(_S); + C.GetStatus(_S); TInfo _I; C.Info(_I); @@ -601,7 +601,7 @@ class CCC_soundDevice : public CCC_Token GetToken(); if (!tokens) return; - inherited::getStatus(S); + inherited::GetStatus(S); } const xr_token* GetToken() noexcept override diff --git a/src/xrEngine/xr_ioc_cmd.h b/src/xrEngine/xr_ioc_cmd.h index feac554bf0c..1dfc7dbec44 100644 --- a/src/xrEngine/xr_ioc_cmd.h +++ b/src/xrEngine/xr_ioc_cmd.h @@ -69,12 +69,12 @@ class ENGINE_API IConsole_Command LPCSTR Name() { return cName; } void InvalidSyntax(); virtual void Execute(LPCSTR args) = 0; - virtual void getStatus(TStatus& S) { S[0] = 0; } + virtual void GetStatus(TStatus& S) { S[0] = 0; } virtual void Info(TInfo& I) { xr_strcpy(I, "(no arguments)"); } virtual void Save(IWriter* F) { TStatus S; - getStatus(S); + GetStatus(S); if (S[0]) F->w_printf("%s %s\r\n", cName, S); } @@ -110,7 +110,7 @@ class ENGINE_API CCC_Mask : public IConsole_Command else InvalidSyntax(); } - virtual void getStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); } + virtual void GetStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); } virtual void Info(TInfo& I) { xr_strcpy(I, "'on/off' or '1/0'"); } virtual void fill_tips(vecTips& tips, u32 /*mode*/) { @@ -136,7 +136,7 @@ class ENGINE_API CCC_ToggleMask : public IConsole_Command strconcat(sizeof(S), S, cName, " is ", value->test(mask) ? "on" : "off"); Log(S); } - virtual void getStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); } + virtual void GetStatus(TStatus& S) { xr_strcpy(S, value->test(mask) ? "on" : "off"); } virtual void Info(TInfo& I) { xr_strcpy(I, "'on/off' or '1/0'"); } virtual void fill_tips(vecTips& tips, u32 /*mode*/) { @@ -175,7 +175,7 @@ class ENGINE_API CCC_Token : public IConsole_Command if (!tok->name) InvalidSyntax(); } - virtual void getStatus(TStatus& S) + virtual void GetStatus(TStatus& S) { const xr_token* tok = GetToken(); while (tok->name) @@ -255,7 +255,7 @@ class ENGINE_API CCC_Float : public IConsole_Command else *value = v; } - virtual void getStatus(TStatus& S) + virtual void GetStatus(TStatus& S) { xr_sprintf(S, sizeof(S), "%3.5f", *value); while (xr_strlen(S) && ('0' == S[xr_strlen(S) - 1])) @@ -305,7 +305,7 @@ class ENGINE_API CCC_Vector3 : public IConsole_Command } value->set(v); } - virtual void getStatus(TStatus& S) { xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z); } + virtual void GetStatus(TStatus& S) { xr_sprintf(S, sizeof(S), "(%f, %f, %f)", value->x, value->y, value->z); } virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "vector3 in range [%e,%e,%e]-[%e,%e,%e]", min.x, min.y, min.z, max.x, max.y, max.z); @@ -344,7 +344,7 @@ class ENGINE_API CCC_Integer : public IConsole_Command else *value = v; } - virtual void getStatus(TStatus& S) { xr_itoa(*value, S, 10); } + virtual void GetStatus(TStatus& S) { xr_itoa(*value, S, 10); } virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "integer value in range [%d,%d]", min, max); } virtual void fill_tips(vecTips& tips, u32 mode) { @@ -370,7 +370,7 @@ class ENGINE_API CCC_String : public IConsole_Command }; virtual void Execute(LPCSTR args) { strncpy_s(value, size, args, size - 1); } - virtual void getStatus(TStatus& S) { xr_strcpy(S, value); } + virtual void GetStatus(TStatus& S) { xr_strcpy(S, value); } virtual void Info(TInfo& I) { xr_sprintf(I, sizeof(I), "string with up to %d characters", size); } virtual void fill_tips(vecTips& tips, u32 mode) {