Introduce Command namespace. Refactoring

1 files changed, 16 insertions, 16 deletions

diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index 213d31ada..6b4941cc1 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -3,21 +3,17 @@
 #include "vcpkg_cmd_arguments.h"
 #include "vcpkg_paths.h"
 
-namespace vcpkg
+namespace vcpkg::Commands
 {
-    //
-    namespace Commands::details
-    {
-        void build_internal(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir);
-    }
-
     extern const char*const INTEGRATE_COMMAND_HELPSTRING;
 
-    void print_usage();
-    void print_example(const std::string& command_and_arguments);
-    std::string create_example_string(const std::string& command_and_arguments);
+    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);
+
     void update_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
 
+    void build_internal(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir);
     void build_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
     void build_external_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
     void install_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet);
@@ -30,7 +26,6 @@ namespace vcpkg
     void list_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
     void import_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
     void owns_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
-    void internal_test_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
 
     void cache_command(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths);
 
@@ -45,10 +40,6 @@ namespace vcpkg
     void contact_command(const vcpkg_cmd_arguments& args);
     void hash_command(const vcpkg_cmd_arguments& args);
 
-    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);
-
     template <class T>
     struct package_name_and_function
     {
@@ -61,7 +52,7 @@ namespace vcpkg
     const std::vector<package_name_and_function<command_type_c>>& get_available_commands_type_c();
 
     template <typename T>
-    T find_command(const std::string& command_name, const std::vector<package_name_and_function<T>> available_commands)
+    T find(const std::string& command_name, const std::vector<package_name_and_function<T>> available_commands)
     {
         for (const package_name_and_function<T>& cmd : available_commands)
         {
@@ -75,3 +66,12 @@ namespace vcpkg
         return nullptr;
     }
 }
+
+namespace vcpkg::Commands::Helpers
+{
+    void print_usage();
+
+    void print_example(const std::string& command_and_arguments);
+
+    std::string create_example_string(const std::string& command_and_arguments);
+}