cstring_view -> CStringView

5 files changed, 19 insertions, 19 deletions

diff --git a/toolsrc/src/vcpkg_Checks.cpp b/toolsrc/src/vcpkg_Checks.cpp
index acc15df99..18154ccf3 100644
--- a/toolsrc/src/vcpkg_Checks.cpp
+++ b/toolsrc/src/vcpkg_Checks.cpp
@@ -29,7 +29,7 @@ namespace vcpkg::Checks
     }
 
     [[noreturn]]
-    void exit_with_message(const LineInfo& line_info, const cstring_view errorMessage)
+    void exit_with_message(const LineInfo& line_info, const CStringView errorMessage)
     {
         System::println(System::color::error, errorMessage);
         exit_fail(line_info);
@@ -43,7 +43,7 @@ namespace vcpkg::Checks
         }
     }
 
-    void check_exit(const LineInfo& line_info, bool expression, const cstring_view errorMessage)
+    void check_exit(const LineInfo& line_info, bool expression, const CStringView errorMessage)
     {
         if (!expression)
         {
diff --git a/toolsrc/src/vcpkg_Input.cpp b/toolsrc/src/vcpkg_Input.cpp
index 82dcca8a8..552ddc3da 100644
--- a/toolsrc/src/vcpkg_Input.cpp
+++ b/toolsrc/src/vcpkg_Input.cpp
@@ -6,7 +6,7 @@
 
 namespace vcpkg::Input
 {
-    package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, cstring_view example_text)
+    package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, CStringView example_text)
     {
         const std::string as_lowercase = Strings::ascii_to_lowercase(package_spec_as_string);
         expected<package_spec> expected_spec = package_spec::from_string(as_lowercase, default_target_triplet);
diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg_Strings.cpp
index 4878a02f4..26dc6388b 100644
--- a/toolsrc/src/vcpkg_Strings.cpp
+++ b/toolsrc/src/vcpkg_Strings.cpp
@@ -50,13 +50,13 @@ namespace vcpkg::Strings::details
 
 namespace vcpkg::Strings
 {
-    std::wstring utf8_to_utf16(const cstring_view s)
+    std::wstring utf8_to_utf16(const CStringView s)
     {
         std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> conversion;
         return conversion.from_bytes(s);
     }
 
-    std::string utf16_to_utf8(const cwstring_view w)
+    std::string utf16_to_utf8(const CWStringView w)
     {
         std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> conversion;
         return conversion.to_bytes(w);
diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg_System.cpp
index 688773aea..bf0ae9ebd 100644
--- a/toolsrc/src/vcpkg_System.cpp
+++ b/toolsrc/src/vcpkg_System.cpp
@@ -13,7 +13,7 @@ namespace vcpkg::System
         return fs::path(buf, buf + bytes);
     }
 
-    int cmd_execute_clean(const cwstring_view cmd_line)
+    int cmd_execute_clean(const CWStringView cmd_line)
     {
         static const std::wstring system_root = get_environmental_variable(L"SystemRoot").value_or_exit(VCPKG_LINE_INFO);
         static const std::wstring system_32 = system_root + LR"(\system32)";
@@ -88,7 +88,7 @@ namespace vcpkg::System
         return static_cast<int>(exit_code);
     }
 
-    int cmd_execute(const cwstring_view cmd_line)
+    int cmd_execute(const CWStringView cmd_line)
     {
         // Flush stdout before launching external process
         _flushall();
@@ -99,7 +99,7 @@ namespace vcpkg::System
         return exit_code;
     }
 
-    exit_code_and_output cmd_execute_and_capture_output(const cwstring_view cmd_line)
+    exit_code_and_output cmd_execute_and_capture_output(const CWStringView cmd_line)
     {
         // Flush stdout before launching external process
         fflush(stdout);
@@ -125,24 +125,24 @@ namespace vcpkg::System
         return { ec, output };
     }
 
-    std::wstring create_powershell_script_cmd(const fs::path& script_path, const cwstring_view args)
+    std::wstring create_powershell_script_cmd(const fs::path& script_path, const CWStringView args)
     {
         // TODO: switch out ExecutionPolicy Bypass with "Remove Mark Of The Web" code and restore RemoteSigned
         return Strings::wformat(LR"(powershell -NoProfile -ExecutionPolicy Bypass -Command "& {& '%s' %s}")", script_path.native(), args);
     }
 
-    void print(const cstring_view message)
+    void print(const CStringView message)
     {
         fputs(message, stdout);
     }
 
-    void println(const cstring_view message)
+    void println(const CStringView message)
     {
         print(message);
         putchar('\n');
     }
 
-    void print(const color c, const cstring_view message)
+    void print(const color c, const CStringView message)
     {
         HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
 
@@ -155,13 +155,13 @@ namespace vcpkg::System
         SetConsoleTextAttribute(hConsole, original_color);
     }
 
-    void println(const color c, const cstring_view message)
+    void println(const color c, const CStringView message)
     {
         print(c, message);
         putchar('\n');
     }
 
-    optional<std::wstring> get_environmental_variable(const cwstring_view varname) noexcept
+    optional<std::wstring> get_environmental_variable(const CWStringView varname) noexcept
     {
         auto sz = GetEnvironmentVariableW(varname, nullptr, 0);
         if (sz == 0)
@@ -181,7 +181,7 @@ namespace vcpkg::System
         return hkey_type == REG_SZ || hkey_type == REG_MULTI_SZ || hkey_type == REG_EXPAND_SZ;
     }
 
-    optional<std::wstring> get_registry_string(HKEY base, const cwstring_view subKey, const cwstring_view valuename)
+    optional<std::wstring> get_registry_string(HKEY base, const CWStringView subKey, const CWStringView valuename)
     {
         HKEY k = nullptr;
         LSTATUS ec = RegOpenKeyExW(base, subKey, NULL, KEY_READ, &k);
diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp
index 152b9ac2b..8dff013bd 100644
--- a/toolsrc/src/vcpkglib.cpp
+++ b/toolsrc/src/vcpkglib.cpp
@@ -215,10 +215,10 @@ namespace vcpkg
         return installed_files;
     }
 
-    CMakeVariable::CMakeVariable(const cwstring_view varname, const wchar_t* varvalue) : s(Strings::wformat(LR"("-D%s=%s")", varname, varvalue)) { }
-    CMakeVariable::CMakeVariable(const cwstring_view varname, const std::string& varvalue) : CMakeVariable(varname, Strings::utf8_to_utf16(varvalue).c_str()) { }
-    CMakeVariable::CMakeVariable(const cwstring_view varname, const std::wstring& varvalue) : CMakeVariable(varname, varvalue.c_str()) {}
-    CMakeVariable::CMakeVariable(const cwstring_view varname, const fs::path& path) : CMakeVariable(varname, path.generic_wstring()) {}
+    CMakeVariable::CMakeVariable(const CWStringView varname, const wchar_t* varvalue) : s(Strings::wformat(LR"("-D%s=%s")", varname, varvalue)) { }
+    CMakeVariable::CMakeVariable(const CWStringView varname, const std::string& varvalue) : CMakeVariable(varname, Strings::utf8_to_utf16(varvalue).c_str()) { }
+    CMakeVariable::CMakeVariable(const CWStringView varname, const std::wstring& varvalue) : CMakeVariable(varname, varvalue.c_str()) {}
+    CMakeVariable::CMakeVariable(const CWStringView varname, const fs::path& path) : CMakeVariable(varname, path.generic_wstring()) {}
 
     std::wstring make_cmake_cmd(const fs::path& cmake_exe, const fs::path& cmake_script, const std::vector<CMakeVariable>& pass_variables)
     {