optional<T> -> Optional<T>

5 files changed, 14 insertions, 14 deletions

diff --git a/toolsrc/src/commands_edit.cpp b/toolsrc/src/commands_edit.cpp
index 361e69941..e118f41b6 100644
--- a/toolsrc/src/commands_edit.cpp
+++ b/toolsrc/src/commands_edit.cpp
@@ -20,7 +20,7 @@ namespace vcpkg::Commands::Edit
 
         if (env_EDITOR.empty())
         {
-            const optional<std::wstring> env_EDITOR_optional = System::get_environmental_variable(L"EDITOR");
+            const Optional<std::wstring> env_EDITOR_optional = System::get_environmental_variable(L"EDITOR");
             if (auto e = env_EDITOR_optional.get())
             {
                 env_EDITOR = *e;
@@ -46,7 +46,7 @@ namespace vcpkg::Commands::Edit
             };
             for (auto&& keypath : regkeys)
             {
-                const optional<std::wstring> code_installpath = System::get_registry_string(HKEY_LOCAL_MACHINE, keypath, L"InstallLocation");
+                const Optional<std::wstring> code_installpath = System::get_registry_string(HKEY_LOCAL_MACHINE, keypath, L"InstallLocation");
                 if (auto c = code_installpath.get())
                 {
                     auto p = fs::path(*c) / "Code.exe";
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index bfbc79a83..522d78af2 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -45,7 +45,7 @@ static void inner(const VcpkgCmdArguments& args)
     }
     else
     {
-        const optional<std::wstring> vcpkg_root_dir_env = System::get_environmental_variable(L"VCPKG_ROOT");
+        const Optional<std::wstring> vcpkg_root_dir_env = System::get_environmental_variable(L"VCPKG_ROOT");
         if (auto v = vcpkg_root_dir_env.get())
         {
             vcpkg_root_dir = fs::absolute(*v);
@@ -76,7 +76,7 @@ static void inner(const VcpkgCmdArguments& args)
     }
     else
     {
-        const optional<std::wstring> vcpkg_default_triplet_env = System::get_environmental_variable(L"VCPKG_DEFAULT_TRIPLET");
+        const Optional<std::wstring> vcpkg_default_triplet_env = System::get_environmental_variable(L"VCPKG_DEFAULT_TRIPLET");
         if (auto v = vcpkg_default_triplet_env.get())
         {
             default_target_triplet = Triplet::from_canonical_name(Strings::utf16_to_utf8(*v));
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp
index bb0f78428..52c55b6a8 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg_Dependencies.cpp
@@ -13,7 +13,7 @@ namespace vcpkg::Dependencies
     {
     }
 
-    InstallPlanAction::InstallPlanAction(const InstallPlanType& plan_type, optional<BinaryParagraph> binary_pgh, optional<SourceParagraph> source_pgh)
+    InstallPlanAction::InstallPlanAction(const InstallPlanType& plan_type, Optional<BinaryParagraph> binary_pgh, Optional<SourceParagraph> source_pgh)
         : plan_type(std::move(plan_type)), binary_pgh(std::move(binary_pgh)), source_pgh(std::move(source_pgh))
     {
     }
diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg_System.cpp
index bf0ae9ebd..b4cf0b40d 100644
--- a/toolsrc/src/vcpkg_System.cpp
+++ b/toolsrc/src/vcpkg_System.cpp
@@ -69,7 +69,7 @@ namespace vcpkg::System
 
         for (auto&& env_wstring : env_wstrings)
         {
-            const optional<std::wstring> value = System::get_environmental_variable(env_wstring);
+            const Optional<std::wstring> value = System::get_environmental_variable(env_wstring);
             auto v = value.get();
             if (!v || v->empty())
                 continue;
@@ -161,7 +161,7 @@ namespace vcpkg::System
         putchar('\n');
     }
 
-    optional<std::wstring> get_environmental_variable(const CWStringView 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 CWStringView subKey, const CWStringView 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/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp
index f20d4cba5..16ab44fd8 100644
--- a/toolsrc/src/vcpkg_paths.cpp
+++ b/toolsrc/src/vcpkg_paths.cpp
@@ -38,7 +38,7 @@ namespace vcpkg
         return false;
     }
 
-    static optional<fs::path> find_if_has_equal_or_greater_version(const std::vector<fs::path>& candidate_paths, const std::wstring& version_check_arguments, const std::array<int, 3>& expected_version)
+    static Optional<fs::path> find_if_has_equal_or_greater_version(const std::vector<fs::path>& candidate_paths, const std::wstring& version_check_arguments, const std::array<int, 3>& expected_version)
     {
         auto it = std::find_if(candidate_paths.cbegin(), candidate_paths.cend(), [&](const fs::path& p)
                                {
@@ -99,7 +99,7 @@ namespace vcpkg
         candidate_paths.push_back(System::get_ProgramFiles_platform_bitness() / "CMake" / "bin" / "cmake.exe");
         candidate_paths.push_back(System::get_ProgramFiles_32_bit() / "CMake" / "bin");
 
-        const optional<fs::path> path = find_if_has_equal_or_greater_version(candidate_paths, version_check_arguments, expected_version);
+        const Optional<fs::path> path = find_if_has_equal_or_greater_version(candidate_paths, version_check_arguments, expected_version);
         if (auto p = path.get())
         {
             return *p;
@@ -143,7 +143,7 @@ namespace vcpkg
         candidate_paths.push_back(System::get_ProgramFiles_platform_bitness() / "git" / "cmd" / "git.exe");
         candidate_paths.push_back(System::get_ProgramFiles_32_bit() / "git" / "cmd" / "git.exe");
 
-        const optional<fs::path> path = find_if_has_equal_or_greater_version(candidate_paths, version_check_arguments, expected_version);
+        const Optional<fs::path> path = find_if_has_equal_or_greater_version(candidate_paths, version_check_arguments, expected_version);
         if (auto p = path.get())
         {
             return *p;
@@ -250,9 +250,9 @@ namespace vcpkg
         return Strings::split(ec_data.output, "\n");
     }
 
-    static optional<fs::path> get_VS2015_installation_instance()
+    static Optional<fs::path> get_VS2015_installation_instance()
     {
-        const optional<std::wstring> vs2015_cmntools_optional = System::get_environmental_variable(L"VS140COMNTOOLS");
+        const Optional<std::wstring> vs2015_cmntools_optional = System::get_environmental_variable(L"VS140COMNTOOLS");
         if (auto v = vs2015_cmntools_optional.get())
         {
             const fs::path vs2015_cmntools = fs::path(*v).parent_path(); // The call to parent_path() is needed because the env variable has a trailing backslash
@@ -305,7 +305,7 @@ namespace vcpkg
         }
 
         // VS2015
-        const optional<fs::path> vs_2015_installation_instance = get_VS2015_installation_instance();
+        const Optional<fs::path> vs_2015_installation_instance = get_VS2015_installation_instance();
         if (auto v = vs_2015_installation_instance.get())
         {
             const fs::path vs2015_vcvarsall_bat = *v / "VC" / "vcvarsall.bat";