StatusParagraph_and_associated_files -> StatusParagraphAndAssociatedFiles
MODIFY
include/vcpkglib.h
include/vcpkglib.h
@@ -12,14 +12,14 @@ namespace vcpkg
void write_update(const VcpkgPaths& paths, const StatusParagraph& p);
- struct StatusParagraph_and_associated_files
+ struct StatusParagraphAndAssociatedFiles
{
StatusParagraph pgh;
SortedVector<std::string> files;
};
std::vector<StatusParagraph*> get_installed_ports(const StatusParagraphs& status_db);
- std::vector<StatusParagraph_and_associated_files> get_installed_files(const VcpkgPaths& paths, const StatusParagraphs& status_db);
+ std::vector<StatusParagraphAndAssociatedFiles> get_installed_files(const VcpkgPaths& paths, const StatusParagraphs& status_db);
struct CMakeVariable

MODIFY
src/commands_install.cpp
src/commands_install.cpp
@@ -96,10 +96,10 @@ namespace vcpkg::Commands::Install
}
};
- static std::vector<std::string> extract_files_in_triplet(const std::vector<StatusParagraph_and_associated_files>& pgh_and_files, const Triplet& triplet)
+ static std::vector<std::string> extract_files_in_triplet(const std::vector<StatusParagraphAndAssociatedFiles>& pgh_and_files, const Triplet& triplet)
{
std::vector<std::string> output;
- for (const StatusParagraph_and_associated_files& t : pgh_and_files)
+ for (const StatusParagraphAndAssociatedFiles& t : pgh_and_files)
{
if (t.pgh.package.spec.target_triplet() != triplet)
{
@@ -127,7 +127,7 @@ namespace vcpkg::Commands::Install
return SortedVector<std::string>(std::move(package_files));
}
- static SortedVector<std::string> build_list_of_installed_files(const std::vector<StatusParagraph_and_associated_files>& pgh_and_files, const Triplet& triplet)
+ static SortedVector<std::string> build_list_of_installed_files(const std::vector<StatusParagraphAndAssociatedFiles>& pgh_and_files, const Triplet& triplet)
{
std::vector<std::string> installed_files = extract_files_in_triplet(pgh_and_files, triplet);
const size_t installed_remove_char_count = triplet.canonical_name().size() + 1; // +1 for the slash
@@ -140,7 +140,7 @@ namespace vcpkg::Commands::Install
{
const fs::path package_dir = paths.package_dir(binary_paragraph.spec);
const Triplet& triplet = binary_paragraph.spec.target_triplet();
- const std::vector<StatusParagraph_and_associated_files> pgh_and_files = get_installed_files(paths, *status_db);
+ const std::vector<StatusParagraphAndAssociatedFiles> pgh_and_files = get_installed_files(paths, *status_db);
const SortedVector<std::string> package_files = build_list_of_package_files(package_dir);
const SortedVector<std::string> installed_files = build_list_of_installed_files(pgh_and_files, triplet);

MODIFY
src/commands_owns.cpp
src/commands_owns.cpp
@@ -7,8 +7,8 @@ namespace vcpkg::Commands::Owns
{
static void search_file(const VcpkgPaths& paths, const std::string& file_substr, const StatusParagraphs& status_db)
{
- const std::vector<StatusParagraph_and_associated_files> installed_files = get_installed_files(paths, status_db);
- for (const StatusParagraph_and_associated_files& pgh_and_file : installed_files)
+ const std::vector<StatusParagraphAndAssociatedFiles> installed_files = get_installed_files(paths, status_db);
+ for (const StatusParagraphAndAssociatedFiles& pgh_and_file : installed_files)
{
const StatusParagraph& pgh = pgh_and_file.pgh;

MODIFY
src/vcpkglib.cpp
src/vcpkglib.cpp
@@ -184,9 +184,9 @@ namespace vcpkg
return installed_packages;
}
- std::vector<StatusParagraph_and_associated_files> get_installed_files(const VcpkgPaths& paths, const StatusParagraphs& status_db)
+ std::vector<StatusParagraphAndAssociatedFiles> get_installed_files(const VcpkgPaths& paths, const StatusParagraphs& status_db)
{
- std::vector<StatusParagraph_and_associated_files> installed_files;
+ std::vector<StatusParagraphAndAssociatedFiles> installed_files;
for (const std::unique_ptr<StatusParagraph>& pgh : status_db)
{
@@ -208,7 +208,7 @@ namespace vcpkg
}
), installed_files_of_current_pgh.end());
- StatusParagraph_and_associated_files pgh_and_files = { *pgh, SortedVector<std::string>(std::move(installed_files_of_current_pgh)) };
+ StatusParagraphAndAssociatedFiles pgh_and_files = { *pgh, SortedVector<std::string>(std::move(installed_files_of_current_pgh)) };
installed_files.push_back(std::move(pgh_and_files));
}

StatusParagraph_and_associated_files -> StatusParagraphAndAssociatedFiles