diff options
| author |  Saleem Abdulrasool <compnerd@compnerd.org>
| 2016-02-27 11:42:33 -0800 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@compnerd.org>
| 2016-02-27 11:42:33 -0800 |
| commit | 8aabff2f44ced77ac8ac318d6060513f32b05e0a (patch) | |
| tree | 385952c2068c2c5a000ec10a846998dc1a2f54a4 | |
| parent | d8c09b5bebe3873a522e5dee920fba86ed46f9b9 (diff) | |
| download | paludis-8aabff2f44ced77ac8ac318d6060513f32b05e0a.tar.gz paludis-8aabff2f44ced77ac8ac318d6060513f32b05e0a.tar.xz | |
paludis: apply missing changes to previous commit
The import renamed the methods and class to conform to paludis style. These
changes were left out of the original commit.
| -rw-r--r-- | paludis/args/args_handler.hh | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/paludis/args/args_handler.hh b/paludis/args/args_handler.hh index f1e7088..bfe3a77 100644 --- a/paludis/args/args_handler.hh +++ b/paludis/args/args_handler.hh @@ -22,6 +22,7 @@ #include <paludis/args/args_section.hh> #include <paludis/args/args_group.hh> +#include <paludis/util/iterator_range.hh> #include <paludis/util/pimp.hh> #include <paludis/util/options.hh> #include <paludis/util/sequence.hh> @@ -134,8 +135,8 @@ namespace paludis ParametersConstIterator begin_parameters() const; ParametersConstIterator end_parameters() const; - IteratorRange<ParameterConstIterator> parameters() const { - return make_iterator_range(begin_parameters(), end_parameters()); + IteratorRange<ParametersConstIterator> parameters() const { + return make_range(begin_parameters(), end_parameters()); } bool empty() const; @@ -200,7 +201,7 @@ namespace paludis UsageLineConstIterator end_usage_lines() const; IteratorRange<UsageLineConstIterator> usage_lines() const { - return make_iterator_range(begin_usage_lines(), end_usage_lines()); + return make_range(begin_usage_lines(), end_usage_lines()); } ///\} @@ -216,7 +217,7 @@ namespace paludis EnvironmentLineConstIterator end_environment_lines() const; IteratorRange<EnvironmentLineConstIterator> environment_lines() const { - return make_iterator_range(begin_environment_lines(), end_environment_lines()); + return make_range(begin_environment_lines(), end_environment_lines()); } ///\} @@ -232,7 +233,7 @@ namespace paludis ExamplesConstIterator end_examples() const; IteratorRange<ExamplesConstIterator> examples() const { - return make_iterator_range(begin_examples(), end_examples()); + return make_range(begin_examples(), end_examples()); } ///\} @@ -247,7 +248,7 @@ namespace paludis ArgsSectionsConstIterator end_args_sections() const; IteratorRange<ArgsSectionsConstIterator> args_sections() const { - return make_iterator_range(begin_args_sections(), end_args_sections()); + return make_range(begin_args_sections(), end_args_sections()); } /** @@ -269,7 +270,7 @@ namespace paludis NotesIterator end_notes() const; IteratorRange<NotesIterator> notes() const { - return make_iterator_range(begin_notes(), end_notes()); + return make_range(begin_notes(), end_notes()); } ///\} @@ -284,7 +285,7 @@ namespace paludis DescriptionLineConstIterator end_description_lines() const; IteratorRange<DescriptionLineConstIterator> description_lines() const { - return make_iterator_range(begin_description_lines(), end_description_lines()); + return make_range(begin_description_lines(), end_description_lines()); } ///\} @@ -300,7 +301,7 @@ namespace paludis SeeAlsoConstIterator end_see_alsos() const; IteratorRange<SeeAlsoConstIterator> see_alsos() const { - return make_iterator_range(begin_see_alsos(), end_see_alsos()); + return make_range(begin_see_alsos(), end_see_alsos()); } ///\} |