ProfileFile -> TraditionalProfileFile

7 files changed, 35 insertions, 37 deletions

diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 5b1f056e7..8f7545fb3 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -86,7 +86,6 @@ noinst_HEADERS = \
 	pbin_merger.hh \
 	pipe_command_handler.hh \
 	profile.hh \
-	profile_file.hh \
 	required_use_verifier.hh \
 	source_uri_finder.hh \
 	spec_tree_pretty_printer.hh \
@@ -94,6 +93,7 @@ noinst_HEADERS = \
 	traditional_mask_file.hh \
 	traditional_mask_store.hh \
 	traditional_profile.hh \
+	traditional_profile_file.hh \
 	use_desc.hh \
 	xml_things_handle.hh \
 	vdb_contents_tokeniser.hh \
@@ -164,7 +164,6 @@ libpaludiserepository_la_SOURCES = \
 	pbin_merger.cc \
 	pipe_command_handler.cc \
 	profile.cc \
-	profile_file.cc \
 	registration.cc \
 	required_use_verifier.cc \
 	source_uri_finder.cc \
@@ -173,6 +172,7 @@ libpaludiserepository_la_SOURCES = \
 	traditional_mask_file.cc \
 	traditional_mask_store.cc \
 	traditional_profile.cc \
+	traditional_profile_file.cc \
 	use_desc.cc \
 	xml_things_handle.cc \
 	vdb_id.cc \
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 31748aa94..1728edf46 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -22,7 +22,6 @@
 #include <paludis/repositories/e/e_key.hh>
 #include <paludis/repositories/e/e_repository.hh>
 #include <paludis/repositories/e/profile.hh>
-#include <paludis/repositories/e/profile_file.hh>
 #include <paludis/repositories/e/traditional_profile.hh>
 #include <paludis/repositories/e/e_repository_news.hh>
 #include <paludis/repositories/e/e_repository_sets.hh>
diff --git a/paludis/repositories/e/exheres_mask_store.cc b/paludis/repositories/e/exheres_mask_store.cc
index b6c6fd7ed..b3f1fbb5a 100644
--- a/paludis/repositories/e/exheres_mask_store.cc
+++ b/paludis/repositories/e/exheres_mask_store.cc
@@ -18,7 +18,6 @@
  */
 
 #include <paludis/repositories/e/exheres_mask_store.hh>
-#include <paludis/repositories/e/profile_file.hh>
 #include <paludis/repositories/e/eapi.hh>
 #include <paludis/repositories/e/dep_parser.hh>
 
diff --git a/paludis/repositories/e/traditional_mask_store.cc b/paludis/repositories/e/traditional_mask_store.cc
index 4c969ff14..4cd5dcbc1 100644
--- a/paludis/repositories/e/traditional_mask_store.cc
+++ b/paludis/repositories/e/traditional_mask_store.cc
@@ -18,7 +18,7 @@
  */
 
 #include <paludis/repositories/e/traditional_mask_store.hh>
-#include <paludis/repositories/e/profile_file.hh>
+#include <paludis/repositories/e/traditional_profile_file.hh>
 #include <paludis/repositories/e/traditional_mask_file.hh>
 #include <paludis/repositories/e/eapi.hh>
 
@@ -88,11 +88,11 @@ TraditionalMaskStore::_populate()
 
     using namespace std::placeholders;
 
-    ProfileFile<TraditionalMaskFile> repository_mask_file(_imp->eapi_for_file);
+    TraditionalProfileFile<TraditionalMaskFile> repository_mask_file(_imp->eapi_for_file);
     std::for_each(_imp->files->begin(), _imp->files->end(),
-            std::bind(&ProfileFile<TraditionalMaskFile>::add_file, std::ref(repository_mask_file), _1));
+            std::bind(&TraditionalProfileFile<TraditionalMaskFile>::add_file, std::ref(repository_mask_file), _1));
 
-    for (ProfileFile<TraditionalMaskFile>::ConstIterator
+    for (TraditionalProfileFile<TraditionalMaskFile>::ConstIterator
             line(repository_mask_file.begin()), line_end(repository_mask_file.end()) ;
             line != line_end ; ++line)
     {
diff --git a/paludis/repositories/e/traditional_profile.cc b/paludis/repositories/e/traditional_profile.cc
index ef501e033..5f02e315f 100644
--- a/paludis/repositories/e/traditional_profile.cc
+++ b/paludis/repositories/e/traditional_profile.cc
@@ -18,7 +18,7 @@
  */
 
 #include <paludis/repositories/e/traditional_profile.hh>
-#include <paludis/repositories/e/profile_file.hh>
+#include <paludis/repositories/e/traditional_profile_file.hh>
 #include <paludis/repositories/e/traditional_mask_file.hh>
 #include <paludis/repositories/e/e_repository_exceptions.hh>
 #include <paludis/repositories/e/e_repository.hh>
@@ -107,9 +107,9 @@ namespace paludis
         const IsArchFlagFunction is_arch_flag;
         const bool has_master_repositories;
 
-        ProfileFile<LineConfigFile> packages_file;
-        ProfileFile<LineConfigFile> virtuals_file;
-        ProfileFile<TraditionalMaskFile> package_mask_file;
+        TraditionalProfileFile<LineConfigFile> packages_file;
+        TraditionalProfileFile<LineConfigFile> virtuals_file;
+        TraditionalProfileFile<TraditionalMaskFile> package_mask_file;
 
         std::shared_ptr<FSPathSequence> profiles_with_parents;
 
@@ -294,7 +294,7 @@ namespace
         try
         {
             if (! _imp->has_master_repositories)
-                for (ProfileFile<LineConfigFile>::ConstIterator i(_imp->packages_file.begin()),
+                for (TraditionalProfileFile<LineConfigFile>::ConstIterator i(_imp->packages_file.begin()),
                         i_end(_imp->packages_file.end()) ; i != i_end ; ++i)
                 {
                     if (0 != i->second.compare(0, 1, "*", 0, 1))
@@ -323,7 +323,7 @@ namespace
                     _imp->env->distribution())).support_old_style_virtuals())
             try
             {
-                for (ProfileFile<LineConfigFile>::ConstIterator line(_imp->virtuals_file.begin()), line_end(_imp->virtuals_file.end()) ;
+                for (TraditionalProfileFile<LineConfigFile>::ConstIterator line(_imp->virtuals_file.begin()), line_end(_imp->virtuals_file.end()) ;
                         line != line_end ; ++line)
                 {
                     std::vector<std::string> tokens;
@@ -348,7 +348,7 @@ namespace
                     << "Loading virtuals failed due to exception: " << e.message() << " (" << e.what() << ")";
             }
 
-        for (ProfileFile<TraditionalMaskFile>::ConstIterator line(_imp->package_mask_file.begin()), line_end(_imp->package_mask_file.end()) ;
+        for (TraditionalProfileFile<TraditionalMaskFile>::ConstIterator line(_imp->package_mask_file.begin()), line_end(_imp->package_mask_file.end()) ;
                 line != line_end ; ++line)
         {
             if (line->second.first.empty())
diff --git a/paludis/repositories/e/profile_file.cc b/paludis/repositories/e/traditional_profile_file.cc
index e2764581c..a0b9ada83 100644
--- a/paludis/repositories/e/profile_file.cc
+++ b/paludis/repositories/e/traditional_profile_file.cc
@@ -17,7 +17,7 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <paludis/repositories/e/profile_file.hh>
+#include <paludis/repositories/e/traditional_profile_file.hh>
 #include <paludis/repositories/e/e_repository_exceptions.hh>
 #include <paludis/repositories/e/eapi.hh>
 #include <paludis/repositories/e/e_repository.hh>
@@ -82,7 +82,7 @@ namespace
 namespace paludis
 {
     template <typename F_>
-    struct Imp<ProfileFile<F_> >
+    struct Imp<TraditionalProfileFile<F_> >
     {
         const EAPIForFileFunction eapi_for_file;
 
@@ -99,14 +99,14 @@ namespace paludis
     };
 
     template <>
-    struct WrappedForwardIteratorTraits<ProfileFile<LineConfigFile>::ConstIteratorTag>
+    struct WrappedForwardIteratorTraits<TraditionalProfileFile<LineConfigFile>::ConstIteratorTag>
     {
         typedef std::list<std::pair<std::shared_ptr<const EAPI>,
                 const std::remove_reference<LineConfigFile::ConstIterator::value_type>::type> >::const_iterator UnderlyingIterator;
     };
 
     template <>
-    struct WrappedForwardIteratorTraits<ProfileFile<TraditionalMaskFile>::ConstIteratorTag>
+    struct WrappedForwardIteratorTraits<TraditionalProfileFile<TraditionalMaskFile>::ConstIteratorTag>
     {
         typedef std::list<std::pair<std::shared_ptr<const EAPI>,
                 const std::remove_reference<TraditionalMaskFile::ConstIterator::value_type>::type> >::const_iterator UnderlyingIterator;
@@ -133,7 +133,7 @@ namespace paludis
 
 template <typename F_>
 void
-ProfileFile<F_>::add_file(const FSPath & f)
+TraditionalProfileFile<F_>::add_file(const FSPath & f)
 {
     Context context("When adding profile configuration file '" + stringify(f) + "':");
 
@@ -151,7 +151,7 @@ ProfileFile<F_>::add_file(const FSPath & f)
         const std::string key(FileEntryTraits<const typename std::remove_reference<typename F_::ConstIterator::value_type>::type>::extract_key(*line));
         if (0 == key.compare(0, 1, "-", 0, 1))
         {
-            typename Imp<ProfileFile>::Lines::iterator i(
+            typename Imp<TraditionalProfileFile>::Lines::iterator i(
                 std::find_if(this->_imp->lines.begin(), this->_imp->lines.end(),
                              MatchesKey<std::string>(key.substr(1))));
             if (this->_imp->lines.end() == i)
@@ -181,37 +181,37 @@ ProfileFile<F_>::add_file(const FSPath & f)
 }
 
 template <typename F_>
-ProfileFile<F_>::ProfileFile(const EAPIForFileFunction & f) :
+TraditionalProfileFile<F_>::TraditionalProfileFile(const EAPIForFileFunction & f) :
     _imp(f)
 {
 }
 
 template <typename F_>
-ProfileFile<F_>::~ProfileFile()
+TraditionalProfileFile<F_>::~TraditionalProfileFile()
 {
 }
 
 template <typename F_>
-typename ProfileFile<F_>::ConstIterator
-ProfileFile<F_>::begin() const
+typename TraditionalProfileFile<F_>::ConstIterator
+TraditionalProfileFile<F_>::begin() const
 {
     return ConstIterator(this->_imp->lines.begin());
 }
 
 template <typename F_>
-typename ProfileFile<F_>::ConstIterator
-ProfileFile<F_>::end() const
+typename TraditionalProfileFile<F_>::ConstIterator
+TraditionalProfileFile<F_>::end() const
 {
     return ConstIterator(this->_imp->lines.end());
 }
 
-template class ProfileFile<LineConfigFile>;
-template class WrappedForwardIterator<ProfileFile<LineConfigFile>::ConstIteratorTag, const std::pair<
+template class TraditionalProfileFile<LineConfigFile>;
+template class WrappedForwardIterator<TraditionalProfileFile<LineConfigFile>::ConstIteratorTag, const std::pair<
     std::shared_ptr<const EAPI>,
     const std::remove_reference<LineConfigFile::ConstIterator::value_type>::type> >;
 
-template class ProfileFile<TraditionalMaskFile>;
-template class WrappedForwardIterator<ProfileFile<TraditionalMaskFile>::ConstIteratorTag, const std::pair<
+template class TraditionalProfileFile<TraditionalMaskFile>;
+template class WrappedForwardIterator<TraditionalProfileFile<TraditionalMaskFile>::ConstIteratorTag, const std::pair<
     std::shared_ptr<const EAPI>,
     const std::remove_reference<TraditionalMaskFile::ConstIterator::value_type>::type> >;
 
diff --git a/paludis/repositories/e/profile_file.hh b/paludis/repositories/e/traditional_profile_file.hh
index fdbec98c2..810bd04e0 100644
--- a/paludis/repositories/e/profile_file.hh
+++ b/paludis/repositories/e/traditional_profile_file.hh
@@ -17,8 +17,8 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_PROFILE_FILE_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_PROFILE_FILE_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_TRADITIONAL_PROFILE_FILE_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_TRADITIONAL_PROFILE_FILE_HH 1
 
 #include <paludis/repositories/e/eapi-fwd.hh>
 #include <paludis/util/pimp.hh>
@@ -36,18 +36,18 @@ namespace paludis
     namespace erepository
     {
         template <typename F_>
-        class PALUDIS_VISIBLE ProfileFile
+        class PALUDIS_VISIBLE TraditionalProfileFile
         {
             private:
-                Pimp<ProfileFile<F_> > _imp;
+                Pimp<TraditionalProfileFile<F_> > _imp;
 
             public:
                 ///\name Basic operations
                 ///\{
 
-                explicit ProfileFile(const EAPIForFileFunction &);
+                explicit TraditionalProfileFile(const EAPIForFileFunction &);
 
-                ~ProfileFile();
+                ~TraditionalProfileFile();
 
                 ///\}