diff options
author | 2013-05-23 11:48:54 +0100 | |
---|---|---|
committer | 2013-05-23 20:57:29 +0100 | |
commit | 3479c45da84cc79f0a69463c0b0470dd76e41053 (patch) | |
tree | ae427122b8711fd16034e3fea5e4c6a7cbd38202 | |
parent | 0174215ed434594d9288e38575a3aa41e2b10842 (diff) | |
download | paludis-3479c45da84cc79f0a69463c0b0470dd76e41053.tar.gz paludis-3479c45da84cc79f0a69463c0b0470dd76e41053.tar.xz |
Move code around
63 files changed, 87 insertions, 176 deletions
diff --git a/paludis/args/args_handler.cc b/paludis/args/args_handler.cc index 3c13602d7..89195eb4f 100644 --- a/paludis/args/args_handler.cc +++ b/paludis/args/args_handler.cc @@ -23,7 +23,6 @@ #include <paludis/args/bad_argument.hh> #include <paludis/util/system.hh> #include <paludis/util/join.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/iterator_funcs.hh> #include <paludis/util/pimp-impl.hh> diff --git a/paludis/comma_separated_dep_pretty_printer.cc b/paludis/comma_separated_dep_pretty_printer.cc index 6a2f9228f..5d7784458 100644 --- a/paludis/comma_separated_dep_pretty_printer.cc +++ b/paludis/comma_separated_dep_pretty_printer.cc @@ -21,7 +21,6 @@ #include <paludis/util/pimp-impl.hh> #include <paludis/util/options.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/metadata_key.hh> #include <paludis/pretty_printer.hh> #include <algorithm> diff --git a/paludis/dep_spec_flattener.cc b/paludis/dep_spec_flattener.cc index 46c7d518a..8dbe282e7 100644 --- a/paludis/dep_spec_flattener.cc +++ b/paludis/dep_spec_flattener.cc @@ -25,7 +25,6 @@ #include <paludis/util/stringify.hh> #include <paludis/util/wrapped_forward_iterator-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/repository.hh> #include <list> #include <algorithm> diff --git a/paludis/repositories/e/a_finder.cc b/paludis/repositories/e/a_finder.cc index b4c9a552a..24611f960 100644 --- a/paludis/repositories/e/a_finder.cc +++ b/paludis/repositories/e/a_finder.cc @@ -19,7 +19,6 @@ #include <paludis/repositories/e/a_finder.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <algorithm> using namespace paludis; diff --git a/paludis/repositories/e/aa_visitor.cc b/paludis/repositories/e/aa_visitor.cc index 5b58057f6..ba99fa9e4 100644 --- a/paludis/repositories/e/aa_visitor.cc +++ b/paludis/repositories/e/aa_visitor.cc @@ -22,7 +22,6 @@ #include <paludis/util/pimp-impl.hh> #include <paludis/util/wrapped_forward_iterator-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <list> #include <algorithm> diff --git a/paludis/repositories/e/can_skip_phase.cc b/paludis/repositories/e/can_skip_phase.cc index 7ce33054b..e5e6828be 100644 --- a/paludis/repositories/e/can_skip_phase.cc +++ b/paludis/repositories/e/can_skip_phase.cc @@ -22,7 +22,6 @@ #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/tokeniser.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/metadata_key.hh> #include <paludis/dep_spec.hh> #include <paludis/spec_tree.hh> diff --git a/paludis/repositories/e/check_fetched_files_visitor.cc b/paludis/repositories/e/check_fetched_files_visitor.cc index 7c91b13c2..bdf48e229 100644 --- a/paludis/repositories/e/check_fetched_files_visitor.cc +++ b/paludis/repositories/e/check_fetched_files_visitor.cc @@ -42,7 +42,6 @@ #include <paludis/util/map.hh> #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/safe_ifstream.hh> #include <paludis/output_manager.hh> #include <algorithm> diff --git a/paludis/repositories/e/do_install_action.cc b/paludis/repositories/e/do_install_action.cc index 7dfe759dc..62f414ffc 100644 --- a/paludis/repositories/e/do_install_action.cc +++ b/paludis/repositories/e/do_install_action.cc @@ -32,7 +32,6 @@ #include <paludis/repositories/e/permitted_directories.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/strip.hh> #include <paludis/util/fs_stat.hh> #include <paludis/util/make_named_values.hh> diff --git a/paludis/repositories/e/e_choices_key.cc b/paludis/repositories/e/e_choices_key.cc index 09df36b38..6e07762d9 100644 --- a/paludis/repositories/e/e_choices_key.cc +++ b/paludis/repositories/e/e_choices_key.cc @@ -37,7 +37,6 @@ #include <paludis/util/set-impl.hh> #include <paludis/util/make_named_values.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/upper_lower.hh> #include <paludis/util/destringify.hh> diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc index 63a914169..6de2a9e4f 100644 --- a/paludis/repositories/e/e_repository.cc +++ b/paludis/repositories/e/e_repository.cc @@ -61,7 +61,6 @@ #include <paludis/repository_name_cache.hh> #include <paludis/syncer.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/active_object_ptr.hh> #include <paludis/util/cookie.hh> #include <paludis/util/config_file.hh> diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc index ffb59a345..d1e1fb430 100644 --- a/paludis/repositories/e/ebuild_id.cc +++ b/paludis/repositories/e/ebuild_id.cc @@ -64,7 +64,6 @@ #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/destringify.hh> #include <paludis/util/singleton-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/fs_stat.hh> #include <paludis/util/join.hh> #include <paludis/util/upper_lower.hh> diff --git a/paludis/repositories/e/fetch_visitor.cc b/paludis/repositories/e/fetch_visitor.cc index 333fd1fa9..b3d3d2b3d 100644 --- a/paludis/repositories/e/fetch_visitor.cc +++ b/paludis/repositories/e/fetch_visitor.cc @@ -38,7 +38,6 @@ #include <paludis/util/join.hh> #include <paludis/util/stringify.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/fs_path.hh> #include <paludis/util/fs_stat.hh> #include <paludis/util/env_var_names.hh> diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc index 84156d6d2..ff688cdbf 100644 --- a/paludis/repositories/e/fix_locked_dependencies.cc +++ b/paludis/repositories/e/fix_locked_dependencies.cc @@ -24,7 +24,6 @@ #include <paludis/util/stringify.hh> #include <paludis/util/options.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/dep_spec.hh> #include <paludis/environment.hh> #include <paludis/package_id.hh> diff --git a/paludis/repositories/e/myoptions_requirements_verifier.cc b/paludis/repositories/e/myoptions_requirements_verifier.cc index 6b8eae682..a47d35783 100644 --- a/paludis/repositories/e/myoptions_requirements_verifier.cc +++ b/paludis/repositories/e/myoptions_requirements_verifier.cc @@ -28,7 +28,6 @@ #include <paludis/util/log.hh> #include <paludis/util/set.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/choice.hh> #include <paludis/metadata_key.hh> #include <paludis/dep_spec_annotations.hh> diff --git a/paludis/repositories/e/pipe_command_handler.cc b/paludis/repositories/e/pipe_command_handler.cc index d76afca15..2476af925 100644 --- a/paludis/repositories/e/pipe_command_handler.cc +++ b/paludis/repositories/e/pipe_command_handler.cc @@ -38,7 +38,6 @@ #include <paludis/util/visitor_cast.hh> #include <paludis/util/set.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/save.hh> #include <paludis/output_manager.hh> diff --git a/paludis/repositories/e/pretend_fetch_visitor.cc b/paludis/repositories/e/pretend_fetch_visitor.cc index a07effa6c..b556733f7 100644 --- a/paludis/repositories/e/pretend_fetch_visitor.cc +++ b/paludis/repositories/e/pretend_fetch_visitor.cc @@ -31,7 +31,6 @@ #include <paludis/util/log.hh> #include <paludis/util/stringify.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/fs_stat.hh> #include <algorithm> diff --git a/paludis/repositories/e/required_use_verifier.cc b/paludis/repositories/e/required_use_verifier.cc index 6c55c742d..651150e9f 100644 --- a/paludis/repositories/e/required_use_verifier.cc +++ b/paludis/repositories/e/required_use_verifier.cc @@ -20,7 +20,6 @@ #include <paludis/repositories/e/required_use_verifier.hh> #include <paludis/util/pimp-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/save.hh> #include <paludis/util/log.hh> #include <paludis/action.hh> diff --git a/paludis/repositories/e/spec_tree_pretty_printer.cc b/paludis/repositories/e/spec_tree_pretty_printer.cc index d0437c270..f7dbd4330 100644 --- a/paludis/repositories/e/spec_tree_pretty_printer.cc +++ b/paludis/repositories/e/spec_tree_pretty_printer.cc @@ -20,7 +20,6 @@ #include <paludis/repositories/e/spec_tree_pretty_printer.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/save.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/pimp-impl.hh> #include <paludis/util/stringify.hh> #include <paludis/pretty_printer.hh> diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc index b7fd7b5a0..e41512d84 100644 --- a/paludis/repositories/e/vdb_repository.cc +++ b/paludis/repositories/e/vdb_repository.cc @@ -56,7 +56,6 @@ #include <paludis/unformatted_pretty_printer.hh> #include <paludis/slot.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/is_file_with_extension.hh> #include <paludis/util/log.hh> #include <paludis/util/set.hh> diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc index 1f22fc428..2d3640e8d 100644 --- a/paludis/repositories/e/vdb_repository_TEST.cc +++ b/paludis/repositories/e/vdb_repository_TEST.cc @@ -26,7 +26,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/options.hh> #include <paludis/util/make_named_values.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/safe_ifstream.hh> #include <paludis/util/fs_iterator.hh> #include <paludis/util/fs_stat.hh> diff --git a/paludis/repositories/e/vdb_repository_TEST_cache.cc b/paludis/repositories/e/vdb_repository_TEST_cache.cc index 7863128e4..804f83f5b 100644 --- a/paludis/repositories/e/vdb_repository_TEST_cache.cc +++ b/paludis/repositories/e/vdb_repository_TEST_cache.cc @@ -26,7 +26,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/options.hh> #include <paludis/util/make_named_values.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/safe_ifstream.hh> #include <paludis/util/fs_iterator.hh> #include <paludis/util/fs_stat.hh> diff --git a/paludis/repositories/e/vdb_repository_TEST_eapis.cc b/paludis/repositories/e/vdb_repository_TEST_eapis.cc index ce7c15217..66cc1adf1 100644 --- a/paludis/repositories/e/vdb_repository_TEST_eapis.cc +++ b/paludis/repositories/e/vdb_repository_TEST_eapis.cc @@ -26,7 +26,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/options.hh> #include <paludis/util/make_named_values.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/safe_ifstream.hh> #include <paludis/util/fs_iterator.hh> #include <paludis/util/fs_stat.hh> diff --git a/paludis/repositories/fake/dep_parser_TEST.cc b/paludis/repositories/fake/dep_parser_TEST.cc index 08b34163e..d5eb8540c 100644 --- a/paludis/repositories/fake/dep_parser_TEST.cc +++ b/paludis/repositories/fake/dep_parser_TEST.cc @@ -22,7 +22,6 @@ #include <paludis/environments/test/test_environment.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/stringify.hh> #include <sstream> diff --git a/paludis/repositories/fake/fake_package_id.cc b/paludis/repositories/fake/fake_package_id.cc index 5858a101e..e2c05b7b4 100644 --- a/paludis/repositories/fake/fake_package_id.cc +++ b/paludis/repositories/fake/fake_package_id.cc @@ -46,7 +46,6 @@ #include <paludis/util/make_named_values.hh> #include <paludis/util/return_literal_function.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/singleton-impl.hh> #include <paludis/util/join.hh> diff --git a/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc b/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc index 42e75feea..aaf7478fe 100644 --- a/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc +++ b/paludis/repositories/gemcutter/gemcutter_dependencies_key.cc @@ -18,7 +18,6 @@ */ #include <paludis/repositories/gemcutter/gemcutter_dependencies_key.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/pimp-impl.hh> #include <paludis/util/singleton-impl.hh> diff --git a/paludis/repositories/gemcutter/gemcutter_uri_key.cc b/paludis/repositories/gemcutter/gemcutter_uri_key.cc index f5ea29a3f..acb7f6553 100644 --- a/paludis/repositories/gemcutter/gemcutter_uri_key.cc +++ b/paludis/repositories/gemcutter/gemcutter_uri_key.cc @@ -18,7 +18,6 @@ */ #include <paludis/repositories/gemcutter/gemcutter_uri_key.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/pimp-impl.hh> #include <paludis/spec_tree.hh> diff --git a/paludis/repositories/unpackaged/installed_repository_TEST.cc b/paludis/repositories/unpackaged/installed_repository_TEST.cc index 1fbbaca3f..0e8bb869e 100644 --- a/paludis/repositories/unpackaged/installed_repository_TEST.cc +++ b/paludis/repositories/unpackaged/installed_repository_TEST.cc @@ -38,7 +38,6 @@ #include <paludis/util/join.hh> #include <paludis/util/options.hh> #include <paludis/util/make_named_values.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/fs_stat.hh> diff --git a/paludis/repositories/unwritten/unwritten_repository_file.cc b/paludis/repositories/unwritten/unwritten_repository_file.cc index 4cc435ba0..285249e4a 100644 --- a/paludis/repositories/unwritten/unwritten_repository_file.cc +++ b/paludis/repositories/unwritten/unwritten_repository_file.cc @@ -27,7 +27,6 @@ #include <paludis/util/join.hh> #include <paludis/util/safe_ifstream.hh> #include <paludis/util/wrapped_forward_iterator.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/name.hh> #include <paludis/version_spec.hh> #include <paludis/literal_metadata_key.hh> diff --git a/paludis/resolver/collect_depped_upon.cc b/paludis/resolver/collect_depped_upon.cc index 8ad2391c5..ef88ea79c 100644 --- a/paludis/resolver/collect_depped_upon.cc +++ b/paludis/resolver/collect_depped_upon.cc @@ -22,7 +22,6 @@ #include <paludis/util/visitor_cast.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_named_values.hh> #include <paludis/util/sequence-impl.hh> #include <paludis/util/set-impl.hh> diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index 7b026ecad..e5cf0a13a 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -52,7 +52,6 @@ #include <paludis/util/tribool.hh> #include <paludis/util/log.hh> #include <paludis/util/visitor_cast.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/environment.hh> #include <paludis/notifier_callback.hh> #include <paludis/repository.hh> diff --git a/paludis/resolver/labels_classifier.cc b/paludis/resolver/labels_classifier.cc index 5497b8bd9..af1e69d93 100644 --- a/paludis/resolver/labels_classifier.cc +++ b/paludis/resolver/labels_classifier.cc @@ -20,7 +20,6 @@ #include <paludis/resolver/labels_classifier.hh> #include <paludis/resolver/sanitised_dependencies.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/stringify.hh> #include <paludis/util/pimp-impl.hh> #include <paludis/util/pool-impl.hh> diff --git a/paludis/resolver/resolver.cc b/paludis/resolver/resolver.cc index 8bf9f15a2..542b25482 100644 --- a/paludis/resolver/resolver.cc +++ b/paludis/resolver/resolver.cc @@ -35,7 +35,6 @@ #include <paludis/util/make_shared_copy.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/pimp-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/environment.hh> #include <paludis/notifier_callback.hh> #include <paludis/spec_tree.hh> diff --git a/paludis/resolver/resolver_TEST_any.cc b/paludis/resolver/resolver_TEST_any.cc index 2f276de3e..7c1755c6f 100644 --- a/paludis/resolver/resolver_TEST_any.cc +++ b/paludis/resolver/resolver_TEST_any.cc @@ -34,7 +34,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/tribool.hh> #include <paludis/util/make_shared_copy.hh> diff --git a/paludis/resolver/resolver_TEST_binaries.cc b/paludis/resolver/resolver_TEST_binaries.cc index e0cb541a7..babb22ea9 100644 --- a/paludis/resolver/resolver_TEST_binaries.cc +++ b/paludis/resolver/resolver_TEST_binaries.cc @@ -33,7 +33,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/util/stringify.hh> diff --git a/paludis/resolver/resolver_TEST_blockers.cc b/paludis/resolver/resolver_TEST_blockers.cc index 4518bbd90..c93f626a5 100644 --- a/paludis/resolver/resolver_TEST_blockers.cc +++ b/paludis/resolver/resolver_TEST_blockers.cc @@ -34,7 +34,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/util/stringify.hh> diff --git a/paludis/resolver/resolver_TEST_continue_on_failure.cc b/paludis/resolver/resolver_TEST_continue_on_failure.cc index 2771a395f..6ea7de2c0 100644 --- a/paludis/resolver/resolver_TEST_continue_on_failure.cc +++ b/paludis/resolver/resolver_TEST_continue_on_failure.cc @@ -38,7 +38,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/tribool.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/util/visitor_cast.hh> diff --git a/paludis/resolver/resolver_TEST_cycles.cc b/paludis/resolver/resolver_TEST_cycles.cc index d0339e045..0923958a0 100644 --- a/paludis/resolver/resolver_TEST_cycles.cc +++ b/paludis/resolver/resolver_TEST_cycles.cc @@ -33,7 +33,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/util/stringify.hh> diff --git a/paludis/resolver/resolver_TEST_errors.cc b/paludis/resolver/resolver_TEST_errors.cc index f39c8bced..fe7faf5ff 100644 --- a/paludis/resolver/resolver_TEST_errors.cc +++ b/paludis/resolver/resolver_TEST_errors.cc @@ -33,7 +33,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/user_dep_spec.hh> diff --git a/paludis/resolver/resolver_TEST_fetches.cc b/paludis/resolver/resolver_TEST_fetches.cc index 7f51f8e27..4ecd4fc9b 100644 --- a/paludis/resolver/resolver_TEST_fetches.cc +++ b/paludis/resolver/resolver_TEST_fetches.cc @@ -37,7 +37,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/tribool.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/util/visitor_cast.hh> diff --git a/paludis/resolver/resolver_TEST_purges.cc b/paludis/resolver/resolver_TEST_purges.cc index 3a0d14b9d..ddb9d7db6 100644 --- a/paludis/resolver/resolver_TEST_purges.cc +++ b/paludis/resolver/resolver_TEST_purges.cc @@ -33,7 +33,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/util/return_literal_function.hh> diff --git a/paludis/resolver/resolver_TEST_serialisation.cc b/paludis/resolver/resolver_TEST_serialisation.cc index 0a9e5f933..65a14afbc 100644 --- a/paludis/resolver/resolver_TEST_serialisation.cc +++ b/paludis/resolver/resolver_TEST_serialisation.cc @@ -34,7 +34,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/string_list_stream.hh> #include <paludis/user_dep_spec.hh> diff --git a/paludis/resolver/resolver_TEST_simple.cc b/paludis/resolver/resolver_TEST_simple.cc index fa8b4076e..abdd052f6 100644 --- a/paludis/resolver/resolver_TEST_simple.cc +++ b/paludis/resolver/resolver_TEST_simple.cc @@ -33,7 +33,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/user_dep_spec.hh> diff --git a/paludis/resolver/resolver_TEST_suggestions.cc b/paludis/resolver/resolver_TEST_suggestions.cc index 15acc486d..96faa5df1 100644 --- a/paludis/resolver/resolver_TEST_suggestions.cc +++ b/paludis/resolver/resolver_TEST_suggestions.cc @@ -33,7 +33,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/user_dep_spec.hh> diff --git a/paludis/resolver/resolver_TEST_uninstalls.cc b/paludis/resolver/resolver_TEST_uninstalls.cc index 377795c3a..f65f5d130 100644 --- a/paludis/resolver/resolver_TEST_uninstalls.cc +++ b/paludis/resolver/resolver_TEST_uninstalls.cc @@ -35,7 +35,6 @@ #include <paludis/util/sequence.hh> #include <paludis/util/map.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/util/visitor_cast.hh> #include <paludis/util/return_literal_function.hh> diff --git a/paludis/resolver/resolver_test.cc b/paludis/resolver/resolver_test.cc index 11cdc467d..7616fb8db 100644 --- a/paludis/resolver/resolver_test.cc +++ b/paludis/resolver/resolver_test.cc @@ -33,7 +33,6 @@ #include <paludis/util/map.hh> #include <paludis/util/sequence.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_named_values.hh> #include <paludis/util/make_shared_copy.hh> #include <paludis/util/set-impl.hh> diff --git a/paludis/resolver/sanitised_dependencies.cc b/paludis/resolver/sanitised_dependencies.cc index 794c206a6..1954c0ad5 100644 --- a/paludis/resolver/sanitised_dependencies.cc +++ b/paludis/resolver/sanitised_dependencies.cc @@ -33,7 +33,6 @@ #include <paludis/util/sequence-impl.hh> #include <paludis/util/log.hh> #include <paludis/util/map.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/spec_tree.hh> #include <paludis/slot_requirement.hh> #include <paludis/metadata_key.hh> diff --git a/paludis/set_file_TEST.cc b/paludis/set_file_TEST.cc index 0b016f3b6..a42c05d44 100644 --- a/paludis/set_file_TEST.cc +++ b/paludis/set_file_TEST.cc @@ -26,7 +26,6 @@ #include <paludis/util/make_named_values.hh> #include <paludis/util/safe_ifstream.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/stringify.hh> #include <algorithm> diff --git a/paludis/spec_tree.cc b/paludis/spec_tree.cc index 0adb27f8d..e6c68934c 100644 --- a/paludis/spec_tree.cc +++ b/paludis/spec_tree.cc @@ -21,7 +21,6 @@ #include <paludis/util/sequence-impl.hh> #include <paludis/util/wrapped_forward_iterator-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <algorithm> using namespace paludis; diff --git a/paludis/user_dep_spec.cc b/paludis/user_dep_spec.cc index 8b71528cf..e75d19e24 100644 --- a/paludis/user_dep_spec.cc +++ b/paludis/user_dep_spec.cc @@ -43,7 +43,6 @@ #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/timestamp.hh> #include <paludis/util/destringify.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/tribool.hh> #include <paludis/util/join.hh> diff --git a/paludis/util/accept_visitor.hh b/paludis/util/accept_visitor.hh deleted file mode 100644 index d68ead189..000000000 --- a/paludis/util/accept_visitor.hh +++ /dev/null @@ -1,114 +0,0 @@ -/* vim: set sw=4 sts=4 et foldmethod=syntax : */ - -/* - * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh - * - * This file is part of the Paludis package manager. Paludis is free software; - * you can redistribute it and/or modify it under the terms of the GNU General - * Public License version 2, as published by the Free Software Foundation. - * - * Paludis is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef PALUDIS_GUARD_PALUDIS_UTIL_ACCEPT_VISITOR_HH -#define PALUDIS_GUARD_PALUDIS_UTIL_ACCEPT_VISITOR_HH 1 - -#include <paludis/util/attributes.hh> - -namespace paludis -{ - /** - * Used by accept_visitor. - * - * \nosubgrouping - * \ingroup g_visitors - */ - template <typename Visitor_> - class PALUDIS_VISIBLE AcceptVisitor - { - private: - Visitor_ & _v; - - public: - typedef void result_type; - - ///\name Visitor operations - ///\{ - - AcceptVisitor(Visitor_ & v) : - _v(v) - { - } - - template <typename T_> - void operator() (T_ & t) const - { - t.accept(_v); - } - - ///\} - }; - - /** - * Used by accept_visitor. - * - * \nosubgrouping - * \ingroup g_visitors - */ - template <typename Visitor_, typename Returning_> - class PALUDIS_VISIBLE AcceptVisitorReturning - { - private: - Visitor_ & _v; - - public: - typedef Returning_ result_type; - - ///\name Visitor operations - ///\{ - - AcceptVisitorReturning(Visitor_ & v) : - _v(v) - { - } - - template <typename T_> - Returning_ operator() (T_ & t) const - { - return t.template accept_returning<Returning_>(_v); - } - - ///\} - }; - - /** - * Convenience function for using a visitor with a standard algorithm. - * - * \ingroup g_visitors - */ - template <typename Visitor_> - AcceptVisitor<Visitor_> PALUDIS_VISIBLE accept_visitor(Visitor_ & v) - { - return AcceptVisitor<Visitor_>(v); - } - - /** - * Convenience function for using a visitor with a standard algorithm. - * - * \ingroup g_visitors - */ - template <typename Returning_, typename Visitor_> - AcceptVisitorReturning<Visitor_, Returning_> PALUDIS_VISIBLE accept_visitor_returning(Visitor_ & v) - { - return AcceptVisitorReturning<Visitor_, Returning_>(v); - } -} - -#endif diff --git a/paludis/util/files.m4 b/paludis/util/files.m4 index 93fc959e0..e2f304c52 100644 --- a/paludis/util/files.m4 +++ b/paludis/util/files.m4 @@ -8,7 +8,6 @@ dnl the base filename with no extension; later parameters can be `hh', `cc', dnl `gtest', `impl', `testscript'. Note that there isn't much error checking done dnl on this file at present... -add(`accept_visitor', `hh') add(`active_object_ptr', `hh', `cc', `fwd', `gtest') add(`attributes', `hh') add(`buffer_output_stream', `hh', `cc', `fwd', `gtest') diff --git a/paludis/util/visitor.hh b/paludis/util/visitor.hh index ba97373db..547e27231 100644 --- a/paludis/util/visitor.hh +++ b/paludis/util/visitor.hh @@ -1,7 +1,7 @@ /* vim: set sw=4 sts=4 et foldmethod=syntax : */ /* - * Copyright (c) 2008, 2009, 2010, 2011 Ciaran McCreesh + * Copyright (c) 2008, 2009, 2010, 2011, 2013 Ciaran McCreesh * * This file is part of the Paludis package manager. Paludis is free software; * you can redistribute it and/or modify it under the terms of the GNU General @@ -26,6 +26,92 @@ namespace paludis { + /** + * Used by accept_visitor. + * + * \nosubgrouping + * \ingroup g_visitors + */ + template <typename Visitor_> + class PALUDIS_VISIBLE AcceptVisitor + { + private: + Visitor_ & _v; + + public: + typedef void result_type; + + ///\name Visitor operations + ///\{ + + AcceptVisitor(Visitor_ & v) : + _v(v) + { + } + + template <typename T_> + void operator() (T_ & t) const + { + t.accept(_v); + } + + ///\} + }; + + /** + * Used by accept_visitor. + * + * \nosubgrouping + * \ingroup g_visitors + */ + template <typename Visitor_, typename Returning_> + class PALUDIS_VISIBLE AcceptVisitorReturning + { + private: + Visitor_ & _v; + + public: + typedef Returning_ result_type; + + ///\name Visitor operations + ///\{ + + AcceptVisitorReturning(Visitor_ & v) : + _v(v) + { + } + + template <typename T_> + Returning_ operator() (T_ & t) const + { + return t.template accept_returning<Returning_>(_v); + } + + ///\} + }; + + /** + * Convenience function for using a visitor with a standard algorithm. + * + * \ingroup g_visitors + */ + template <typename Visitor_> + AcceptVisitor<Visitor_> PALUDIS_VISIBLE accept_visitor(Visitor_ & v) + { + return AcceptVisitor<Visitor_>(v); + } + + /** + * Convenience function for using a visitor with a standard algorithm. + * + * \ingroup g_visitors + */ + template <typename Returning_, typename Visitor_> + AcceptVisitorReturning<Visitor_, Returning_> PALUDIS_VISIBLE accept_visitor_returning(Visitor_ & v) + { + return AcceptVisitorReturning<Visitor_, Returning_>(v); + } + template <> class DeclareAbstractVisitMethods<TypeListTail> { diff --git a/python/dep_spec.cc b/python/dep_spec.cc index 7e109162b..20b59bb81 100644 --- a/python/dep_spec.cc +++ b/python/dep_spec.cc @@ -38,7 +38,6 @@ #include <paludis/util/wrapped_output_iterator-impl.hh> #include <paludis/util/sequence-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <type_traits> #include <list> diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc index 8631f84db..46211d5ba 100644 --- a/ruby/dep_spec.cc +++ b/ruby/dep_spec.cc @@ -29,7 +29,6 @@ #include <paludis/util/save.hh> #include <paludis/util/member_iterator-impl.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <algorithm> #include <list> #include <ruby.h> diff --git a/src/clients/cave/cmd_generate_metadata.cc b/src/clients/cave/cmd_generate_metadata.cc index e2b9e630c..b33813a4d 100644 --- a/src/clients/cave/cmd_generate_metadata.cc +++ b/src/clients/cave/cmd_generate_metadata.cc @@ -28,7 +28,6 @@ #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/visitor_cast.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/thread_pool.hh> #include <paludis/util/stringify.hh> #include <paludis/generator.hh> diff --git a/src/clients/cave/cmd_manage_search_index.cc b/src/clients/cave/cmd_manage_search_index.cc index bc61138b4..58337dec8 100644 --- a/src/clients/cave/cmd_manage_search_index.cc +++ b/src/clients/cave/cmd_manage_search_index.cc @@ -46,7 +46,6 @@ #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/visitor_cast.hh> #include <paludis/util/iterator_funcs.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/stringify.hh> #include <cstdlib> diff --git a/src/clients/cave/cmd_match.cc b/src/clients/cave/cmd_match.cc index f20a4f04c..7c13290a0 100644 --- a/src/clients/cave/cmd_match.cc +++ b/src/clients/cave/cmd_match.cc @@ -31,7 +31,6 @@ #include <paludis/util/visitor_cast.hh> #include <paludis/util/iterator_funcs.hh> #include <paludis/util/singleton-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/log.hh> #include <paludis/generator.hh> #include <paludis/filtered_generator.hh> diff --git a/src/clients/cave/cmd_print_set.cc b/src/clients/cave/cmd_print_set.cc index 1d383c5b5..7d74578ab 100644 --- a/src/clients/cave/cmd_print_set.cc +++ b/src/clients/cave/cmd_print_set.cc @@ -31,7 +31,6 @@ #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/visitor_cast.hh> #include <paludis/util/map.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/stringify.hh> #include <cstdlib> #include <iostream> diff --git a/src/clients/cave/cmd_print_unused_distfiles.cc b/src/clients/cave/cmd_print_unused_distfiles.cc index 02c1cab4f..c459938a9 100644 --- a/src/clients/cave/cmd_print_unused_distfiles.cc +++ b/src/clients/cave/cmd_print_unused_distfiles.cc @@ -35,7 +35,6 @@ #include <paludis/repository.hh> #include <paludis/selection.hh> #include <paludis/user_dep_spec.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/fs_iterator.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/map.hh> diff --git a/src/clients/cave/cmd_report.cc b/src/clients/cave/cmd_report.cc index 11340fbe4..526f63009 100644 --- a/src/clients/cave/cmd_report.cc +++ b/src/clients/cave/cmd_report.cc @@ -46,7 +46,6 @@ #include <paludis/util/wrapped_output_iterator.hh> #include <paludis/util/visitor_cast.hh> #include <paludis/util/indirect_iterator-impl.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/make_named_values.hh> #include <paludis/util/stringify.hh> #include <paludis/util/join.hh> diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc index 398f97339..052c449f5 100644 --- a/src/clients/cave/cmd_show.cc +++ b/src/clients/cave/cmd_show.cc @@ -43,7 +43,6 @@ #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/pretty_print.hh> #include <paludis/util/timestamp.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/stringify.hh> #include <paludis/util/join.hh> #include <paludis/action.hh> diff --git a/src/clients/cave/cmd_verify.cc b/src/clients/cave/cmd_verify.cc index 9f2218b00..de42e0fc5 100644 --- a/src/clients/cave/cmd_verify.cc +++ b/src/clients/cave/cmd_verify.cc @@ -27,7 +27,6 @@ #include <paludis/args/do_help.hh> #include <paludis/util/wrapped_forward_iterator.hh> #include <paludis/util/make_named_values.hh> -#include <paludis/util/accept_visitor.hh> #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/safe_ifstream.hh> #include <paludis/util/visitor_cast.hh> diff --git a/src/clients/cave/executables_common.cc b/src/clients/cave/executables_common.cc index 6c3582d7a..47891c16c 100644 --- a/src/clients/cave/executables_common.cc +++ b/src/clients/cave/executables_common.cc @@ -36,7 +36,6 @@ #include <paludis/util/indirect_iterator-impl.hh> #include <paludis/util/system.hh> #include <paludis/util/tokeniser.hh> -#include <paludis/util/accept_visitor.hh> #include <algorithm> #include <set> |