aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-02 08:39:19 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-02 08:39:19 +0000
commitea7d4ab21e1fcad22161a1443869b6c74a0dae65 (patch)
tree0127b71bdf46fa33edbb5a5e5e95958bf1a68a7a /src
parente07358f56f589f148d4d9505526b37f5a647ce49 (diff)
downloadpaludis-ea7d4ab21e1fcad22161a1443869b6c74a0dae65.tar.gz
paludis-ea7d4ab21e1fcad22161a1443869b6c74a0dae65.tar.xz
Fix
Diffstat (limited to 'src')
-rw-r--r--src/clients/contrarius/contrarius.cc3
-rw-r--r--src/clients/contrarius/stage_builder.cc2
-rw-r--r--src/clients/contrarius/target_config.cc2
-rw-r--r--src/clients/contrarius/target_config.hh3
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc6
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/gui_sync_task.cc2
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc9
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc1
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc5
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc1
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc5
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc5
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc6
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc3
-rw-r--r--src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc4
-rw-r--r--src/clients/importare/importare.cc3
-rw-r--r--src/clients/importare/install.cc3
-rw-r--r--src/clients/inquisitio/do_search.cc2
-rw-r--r--src/clients/inquisitio/key_extractor.cc1
-rw-r--r--src/clients/qualudis/qualudis.cc3
20 files changed, 25 insertions, 44 deletions
diff --git a/src/clients/contrarius/contrarius.cc b/src/clients/contrarius/contrarius.cc
index e6497ef..6f3cb9d 100644
--- a/src/clients/contrarius/contrarius.cc
+++ b/src/clients/contrarius/contrarius.cc
@@ -27,9 +27,6 @@
#include <iostream>
#include <algorithm>
-#include <libebt/libebt.hh>
-#include <libwrapiter/libwrapiter.hh>
-
#include "target_config.hh"
#include "command_line.hh"
#include "stage.hh"
diff --git a/src/clients/contrarius/stage_builder.cc b/src/clients/contrarius/stage_builder.cc
index a336d8e..eba92ae 100644
--- a/src/clients/contrarius/stage_builder.cc
+++ b/src/clients/contrarius/stage_builder.cc
@@ -22,7 +22,7 @@
#include <src/clients/contrarius/stage.hh>
#include <src/clients/contrarius/stage_builder.hh>
#include <src/output/colour.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
#include <iostream>
#include <list>
diff --git a/src/clients/contrarius/target_config.cc b/src/clients/contrarius/target_config.cc
index 6384e45..910fbe5 100644
--- a/src/clients/contrarius/target_config.cc
+++ b/src/clients/contrarius/target_config.cc
@@ -23,6 +23,7 @@
#include <paludis/util/instantiation_policy-impl.hh>
#include <paludis/util/options.hh>
#include <paludis/util/config_file.hh>
+#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <list>
#include <string>
#include <vector>
@@ -33,6 +34,7 @@
using namespace paludis;
template class InstantiationPolicy<TargetConfig, instantiation_method::SingletonTag>;
+template class WrappedForwardIterator<TargetConfig::ConstIteratorTag, const std::string>;
void
TargetConfig::_parse_defaults()
diff --git a/src/clients/contrarius/target_config.hh b/src/clients/contrarius/target_config.hh
index feffd76..535490e 100644
--- a/src/clients/contrarius/target_config.hh
+++ b/src/clients/contrarius/target_config.hh
@@ -22,6 +22,7 @@
#include <paludis/util/exception.hh>
#include <paludis/util/instantiation_policy.hh>
+#include <paludis/util/wrapped_forward_iterator-fwd.hh>
#include <paludis/host_tuple_name.hh>
#include <list>
#include <utility>
@@ -46,7 +47,7 @@ class TargetConfig :
private:
typedef std::list<std::pair<std::string, std::string> > SpecEntryList;
- typedef libwrapiter::ForwardIterator<TargetConfig, const std::string> ConstIterator;
+ typedef WrappedForwardIterator<enum ConstIteratorTag { }, const std::string> ConstIterator;
SpecEntryList _binutils_list;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc
index 796bf91..17b5cbf 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/categories_list_model.cc
@@ -3,14 +3,14 @@
#include "categories_list_model.hh"
#include "main_window.hh"
#include "packages_page.hh"
-#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
+#include <paludis/util/wrapped_output_iterator.hh>
+#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
using namespace paludis;
using namespace gtkpaludis;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/gui_sync_task.cc b/src/clients/gtkpaludis/libgtkpaludis/gui_sync_task.cc
index 3888ee3..f09e091 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/gui_sync_task.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/gui_sync_task.cc
@@ -6,7 +6,7 @@
#include "task_window.hh"
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/stringify.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
using namespace gtkpaludis;
using namespace paludis;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc
index 05392f8..7364185 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_list_model.cc
@@ -9,13 +9,12 @@
#include <paludis/package_database.hh>
#include <paludis/metadata_key.hh>
#include <paludis/package_id.hh>
-#include <paludis/util/iterator.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/tr1_functional.hh>
#include <paludis/util/visitor-impl.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/iterator_funcs.hh>
+#include <paludis/util/wrapped_forward_iterator-impl.hh>
#include <list>
#include <algorithm>
#include <set>
@@ -79,10 +78,10 @@ namespace gtkpaludis
};
struct PackagesListModel::PopulateDataIterator :
- libwrapiter::ForwardIterator<PackagesListModel::PopulateDataIterator, const PopulateItem>
+ WrappedForwardIterator<PackagesListModel::PopulateDataIterator, const PopulateItem>
{
PopulateDataIterator(const std::list<PopulateItem>::const_iterator & i) :
- libwrapiter::ForwardIterator<PackagesListModel::PopulateDataIterator, const PopulateItem>(i)
+ WrappedForwardIterator<PackagesListModel::PopulateDataIterator, const PopulateItem>(i)
{
}
};
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc b/src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc
index 3c53357..47ff193 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_package_filter_model.cc
@@ -2,7 +2,6 @@
#include "packages_package_filter_model.hh"
#include "main_window.hh"
-#include <paludis/util/iterator.hh>
#include <paludis/environment.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/package_database.hh>
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc b/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc
index c677397..432ed53 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_repository_filter_model.cc
@@ -3,13 +3,12 @@
#include "packages_repository_filter_model.hh"
#include "main_window.hh"
#include <paludis/util/private_implementation_pattern-impl.hh>
-#include <paludis/util/iterator.hh>
#include <paludis/util/sequence.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/query.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
+#include <paludis/util/indirect_iterator-impl.hh>
using namespace paludis;
using namespace gtkpaludis;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc b/src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc
index c9292cd..eb80c67 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/packages_text_filter_source_model.cc
@@ -2,7 +2,6 @@
#include "packages_text_filter_source_model.hh"
#include "main_window.hh"
-#include <paludis/util/iterator.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
diff --git a/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc
index 107c161..4033fbb 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/repositories_list_model.cc
@@ -2,13 +2,12 @@
#include "repositories_list_model.hh"
#include "main_window.hh"
-#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/sequence.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
+#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
using namespace paludis;
using namespace gtkpaludis;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc b/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc
index 7282458..727a890 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/repository_info_model.cc
@@ -6,10 +6,9 @@
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/repository_info.hh>
-#include <paludis/util/iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/indirect_iterator-impl.hh>
using namespace gtkpaludis;
using namespace paludis;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
index 283039d..eed33df 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/sets_list_model.cc
@@ -3,14 +3,14 @@
#include "sets_list_model.hh"
#include "main_window.hh"
#include "packages_page.hh"
-#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
+#include <paludis/util/wrapped_output_iterator.hh>
+#include <paludis/util/indirect_iterator-impl.hh>
using namespace paludis;
using namespace gtkpaludis;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
index 397ee2d..200f4cd 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/version_info_model.cc
@@ -5,7 +5,6 @@
#include "versions_page.hh"
#include "markup.hh"
#include "markup_formatter.hh"
-#include <paludis/util/iterator.hh>
#include <paludis/util/visitor-impl.hh>
#include <paludis/util/set.hh>
#include <paludis/util/strip.hh>
@@ -16,8 +15,6 @@
#include <paludis/query.hh>
#include <paludis/mask.hh>
#include <paludis/metadata_key.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
#include <list>
using namespace paludis;
diff --git a/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc b/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc
index 98a307c..8a3add1 100644
--- a/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc
+++ b/src/clients/gtkpaludis/libgtkpaludis/versions_list_model.cc
@@ -4,17 +4,15 @@
#include "query_window.hh"
#include "versions_page.hh"
#include "markup.hh"
-#include <paludis/util/iterator.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/tr1_functional.hh>
#include <paludis/util/sequence.hh>
+#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/environment.hh>
#include <paludis/package_database.hh>
#include <paludis/query.hh>
#include <paludis/package_id.hh>
#include <paludis/mask.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
#include <list>
using namespace paludis;
diff --git a/src/clients/importare/importare.cc b/src/clients/importare/importare.cc
index 91ade5b..add6127 100644
--- a/src/clients/importare/importare.cc
+++ b/src/clients/importare/importare.cc
@@ -27,12 +27,11 @@
#include <paludis/util/log.hh>
#include <paludis/util/map.hh>
#include <paludis/util/sequence.hh>
+#include <paludis/util/indirect_iterator-impl.hh>
#include <paludis/about.hh>
#include <paludis/repository_maker.hh>
#include <paludis/fuzzy_finder.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-
#include <algorithm>
#include <iterator>
#include <iostream>
diff --git a/src/clients/importare/install.cc b/src/clients/importare/install.cc
index 8d0142a..fad687b 100644
--- a/src/clients/importare/install.cc
+++ b/src/clients/importare/install.cc
@@ -41,9 +41,6 @@
#include <paludis/mask.hh>
#include <paludis/action.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
-#include <libwrapiter/libwrapiter_output_iterator.hh>
-
using namespace paludis;
using std::cerr;
diff --git a/src/clients/inquisitio/do_search.cc b/src/clients/inquisitio/do_search.cc
index 183bbe3..1c961ff 100644
--- a/src/clients/inquisitio/do_search.cc
+++ b/src/clients/inquisitio/do_search.cc
@@ -30,12 +30,12 @@
#include <paludis/package_database.hh>
#include <paludis/action.hh>
#include <paludis/package_id.hh>
-#include <paludis/util/iterator.hh>
#include <paludis/util/set.hh>
#include <paludis/util/sequence.hh>
#include <paludis/util/make_shared_ptr.hh>
#include <paludis/util/tr1_functional.hh>
#include <paludis/util/parallel_for_each.hh>
+#include <paludis/util/create_iterator-impl.hh>
#include <list>
#include <set>
#include <map>
diff --git a/src/clients/inquisitio/key_extractor.cc b/src/clients/inquisitio/key_extractor.cc
index 3081dac..436501b 100644
--- a/src/clients/inquisitio/key_extractor.cc
+++ b/src/clients/inquisitio/key_extractor.cc
@@ -32,7 +32,6 @@
#include <paludis/stringify_formatter.hh>
#include <paludis/dep_spec.hh>
#include <paludis/environment.hh>
-#include <libwrapiter/libwrapiter_forward_iterator.hh>
#include <algorithm>
using namespace paludis;
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index e960056..77ff5f2 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -36,9 +36,6 @@
#include <algorithm>
#include <set>
-#include <libebt/libebt.hh>
-#include <libwrapiter/libwrapiter.hh>
-
#include "qualudis_command_line.hh"
#include <src/output/colour.hh>
#include <paludis/args/do_help.hh>