diff options
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/VcpkgCmdArguments.h (renamed from toolsrc/include/vcpkg_cmd_arguments.h) | 6 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_Commands.h | 48 |
2 files changed, 27 insertions, 27 deletions
diff --git a/toolsrc/include/vcpkg_cmd_arguments.h b/toolsrc/include/VcpkgCmdArguments.h index 6f06ad98d..4a0809fff 100644 --- a/toolsrc/include/vcpkg_cmd_arguments.h +++ b/toolsrc/include/VcpkgCmdArguments.h @@ -7,10 +7,10 @@ namespace vcpkg { - struct vcpkg_cmd_arguments + struct VcpkgCmdArguments { - static vcpkg_cmd_arguments create_from_command_line(const int argc, const wchar_t* const* const argv); - static vcpkg_cmd_arguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end); + static VcpkgCmdArguments create_from_command_line(const int argc, const wchar_t* const* const argv); + static VcpkgCmdArguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end); std::unique_ptr<std::string> vcpkg_root_dir; std::unique_ptr<std::string> target_triplet; diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index 985657a94..b7e981b41 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -1,6 +1,6 @@ #pragma once -#include "vcpkg_cmd_arguments.h" +#include "VcpkgCmdArguments.h" #include "vcpkg_paths.h" #include "StatusParagraphs.h" #include <array> @@ -8,9 +8,9 @@ namespace vcpkg::Commands { - using command_type_a = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); - using command_type_b = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); - using command_type_c = void(*)(const vcpkg_cmd_arguments& args); + using command_type_a = void(*)(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + using command_type_b = void(*)(const VcpkgCmdArguments& args, const vcpkg_paths& paths); + using command_type_c = void(*)(const VcpkgCmdArguments& args); namespace Build { @@ -33,28 +33,28 @@ namespace vcpkg::Commands BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set<std::string>& options, const vcpkg_paths& paths); - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace BuildExternal { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace Install { void install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db); - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace CI { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace Remove { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace Update @@ -68,64 +68,64 @@ namespace vcpkg::Commands }; std::vector<outdated_package> find_outdated_packages(const vcpkg_paths& paths, const StatusParagraphs& status_db); - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Env { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_triplet); } namespace Create { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Edit { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Search { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace List { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Owns { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Cache { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Import { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Integrate { extern const char*const INTEGRATE_COMMAND_HELPSTRING; - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace PortsDiff { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Help { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); void help_topic_valid_triplet(const vcpkg_paths& paths); @@ -139,18 +139,18 @@ namespace vcpkg::Commands namespace Version { const std::string& version(); - void perform_and_exit(const vcpkg_cmd_arguments& args); + void perform_and_exit(const VcpkgCmdArguments& args); } namespace Contact { const std::string& email(); - void perform_and_exit(const vcpkg_cmd_arguments& args); + void perform_and_exit(const VcpkgCmdArguments& args); } namespace Hash { - void perform_and_exit(const vcpkg_cmd_arguments& args); + void perform_and_exit(const VcpkgCmdArguments& args); } template <class T> |