aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-19 14:41:28 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-19 14:46:26 +0000
commit6b299efea62a714bd6bf58756654fa72a208e3a7 (patch)
tree60f83bef385407cc931b91176f0d94974a6cdfc9
parentf2121cec89e5bcce11b10fe664d996b19c3ff86e (diff)
downloadpaludis-6b299efea62a714bd6bf58756654fa72a208e3a7.tar.gz
paludis-6b299efea62a714bd6bf58756654fa72a208e3a7.tar.xz
Rename RepositoryMaskStore to TraditionalMaskStore
-rw-r--r--paludis/repositories/e/Makefile.am4
-rw-r--r--paludis/repositories/e/exheres_layout.cc10
-rw-r--r--paludis/repositories/e/traditional_layout.cc10
-rw-r--r--paludis/repositories/e/traditional_mask_store.cc (renamed from paludis/repositories/e/repository_mask_store.cc)12
-rw-r--r--paludis/repositories/e/traditional_mask_store.hh (renamed from paludis/repositories/e/repository_mask_store.hh)12
5 files changed, 24 insertions, 24 deletions
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 0997465..9b0423b 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -87,11 +87,11 @@ noinst_HEADERS = \
pipe_command_handler.hh \
profile.hh \
profile_file.hh \
- repository_mask_store.hh \
required_use_verifier.hh \
source_uri_finder.hh \
spec_tree_pretty_printer.hh \
traditional_layout.hh \
+ traditional_mask_store.hh \
traditional_profile.hh \
use_desc.hh \
xml_things_handle.hh \
@@ -165,11 +165,11 @@ libpaludiserepository_la_SOURCES = \
profile.cc \
profile_file.cc \
registration.cc \
- repository_mask_store.cc \
required_use_verifier.cc \
source_uri_finder.cc \
spec_tree_pretty_printer.cc \
traditional_layout.cc \
+ traditional_mask_store.cc \
traditional_profile.cc \
use_desc.cc \
xml_things_handle.cc \
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 17f51ed..84e75af 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/e/e_repository_exceptions.hh>
#include <paludis/repositories/e/e_repository.hh>
#include <paludis/repositories/e/file_suffixes.hh>
-#include <paludis/repositories/e/repository_mask_store.hh>
+#include <paludis/repositories/e/traditional_mask_store.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/active_object_ptr.hh>
@@ -62,13 +62,13 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace
{
- std::shared_ptr<RepositoryMaskStore> make_mask_store(
+ std::shared_ptr<TraditionalMaskStore> make_mask_store(
const Environment * const env,
const RepositoryName & repo_name,
const std::shared_ptr<const FSPathSequence> & f,
const EAPIForFileFunction & e)
{
- return std::make_shared<RepositoryMaskStore>(env, repo_name, f, e);
+ return std::make_shared<TraditionalMaskStore>(env, repo_name, f, e);
}
}
@@ -97,7 +97,7 @@ namespace paludis
std::shared_ptr<FSPathSequence> info_packages_files;
std::shared_ptr<UseDescFileInfoSequence> use_desc_files;
- ActiveObjectPtr<DeferredConstructionPtr<std::shared_ptr<RepositoryMaskStore> > > repository_mask_store;
+ ActiveObjectPtr<DeferredConstructionPtr<std::shared_ptr<TraditionalMaskStore> > > repository_mask_store;
Imp(const Environment * const env, const ERepository * const n, const FSPath & t) :
repository(n),
@@ -110,7 +110,7 @@ namespace paludis
info_variables_files(std::make_shared<FSPathSequence>()),
info_packages_files(std::make_shared<FSPathSequence>()),
use_desc_files(std::make_shared<UseDescFileInfoSequence>()),
- repository_mask_store(DeferredConstructionPtr<std::shared_ptr<RepositoryMaskStore> > (
+ repository_mask_store(DeferredConstructionPtr<std::shared_ptr<TraditionalMaskStore> > (
std::bind(&make_mask_store, env, n->name(),
repository_mask_files, EAPIForFileFunction(std::bind(std::mem_fn(&ERepository::eapi_for_file), n, std::placeholders::_1)))))
{
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index a0f717d..95f90f9 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -21,7 +21,7 @@
#include <paludis/repositories/e/traditional_layout.hh>
#include <paludis/repositories/e/e_repository.hh>
#include <paludis/repositories/e/file_suffixes.hh>
-#include <paludis/repositories/e/repository_mask_store.hh>
+#include <paludis/repositories/e/traditional_mask_store.hh>
#include <paludis/util/config_file.hh>
#include <paludis/util/pimp-impl.hh>
@@ -62,13 +62,13 @@ typedef std::unordered_map<QualifiedPackageName, std::shared_ptr<PackageIDSequen
namespace
{
- std::shared_ptr<RepositoryMaskStore> make_mask_store(
+ std::shared_ptr<TraditionalMaskStore> make_mask_store(
const Environment * const env,
const RepositoryName & repo_name,
const std::shared_ptr<const FSPathSequence> & f,
const EAPIForFileFunction & e)
{
- return std::make_shared<RepositoryMaskStore>(env, repo_name, f, e);
+ return std::make_shared<TraditionalMaskStore>(env, repo_name, f, e);
}
}
@@ -97,7 +97,7 @@ namespace paludis
std::shared_ptr<FSPathSequence> info_variables_files;
std::shared_ptr<UseDescFileInfoSequence> use_desc_files;
- ActiveObjectPtr<DeferredConstructionPtr<std::shared_ptr<RepositoryMaskStore> > > repository_mask_store;
+ ActiveObjectPtr<DeferredConstructionPtr<std::shared_ptr<TraditionalMaskStore> > > repository_mask_store;
Imp(
const Environment * const env,
@@ -113,7 +113,7 @@ namespace paludis
info_packages_files(std::make_shared<FSPathSequence>()),
info_variables_files(std::make_shared<FSPathSequence>()),
use_desc_files(std::make_shared<UseDescFileInfoSequence>()),
- repository_mask_store(DeferredConstructionPtr<std::shared_ptr<RepositoryMaskStore> > (
+ repository_mask_store(DeferredConstructionPtr<std::shared_ptr<TraditionalMaskStore> > (
std::bind(&make_mask_store, env, r->name(),
repository_mask_files, EAPIForFileFunction(std::bind(std::mem_fn(&ERepository::eapi_for_file), r, std::placeholders::_1)))))
{
diff --git a/paludis/repositories/e/repository_mask_store.cc b/paludis/repositories/e/traditional_mask_store.cc
index 8b3a683..801891c 100644
--- a/paludis/repositories/e/repository_mask_store.cc
+++ b/paludis/repositories/e/traditional_mask_store.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/e/repository_mask_store.hh>
+#include <paludis/repositories/e/traditional_mask_store.hh>
#include <paludis/repositories/e/profile_file.hh>
#include <paludis/repositories/e/e_repository_mask_file.hh>
#include <paludis/repositories/e/eapi.hh>
@@ -45,7 +45,7 @@ typedef std::unordered_map<QualifiedPackageName,
namespace paludis
{
template <>
- struct Imp<RepositoryMaskStore>
+ struct Imp<TraditionalMaskStore>
{
const Environment * const env;
RepositoryName repo_name;
@@ -64,7 +64,7 @@ namespace paludis
};
}
-RepositoryMaskStore::RepositoryMaskStore(
+TraditionalMaskStore::TraditionalMaskStore(
const Environment * const e,
const RepositoryName & r,
const std::shared_ptr<const FSPathSequence> & f,
@@ -74,12 +74,12 @@ RepositoryMaskStore::RepositoryMaskStore(
_populate();
}
-RepositoryMaskStore::~RepositoryMaskStore()
+TraditionalMaskStore::~TraditionalMaskStore()
{
}
void
-RepositoryMaskStore::_populate()
+TraditionalMaskStore::_populate()
{
Context context("When loading repository masks for '" + stringify(_imp->repo_name) + "':");
@@ -119,7 +119,7 @@ RepositoryMaskStore::_populate()
}
const std::shared_ptr<const MasksInfo>
-RepositoryMaskStore::query(const std::shared_ptr<const PackageID> & id) const
+TraditionalMaskStore::query(const std::shared_ptr<const PackageID> & id) const
{
auto result(std::make_shared<MasksInfo>());
auto r(_imp->repo_mask.find(id->name()));
diff --git a/paludis/repositories/e/repository_mask_store.hh b/paludis/repositories/e/traditional_mask_store.hh
index d792242..1396091 100644
--- a/paludis/repositories/e/repository_mask_store.hh
+++ b/paludis/repositories/e/traditional_mask_store.hh
@@ -17,8 +17,8 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_REPOSITORY_MASK_STORE_HH
-#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_REPOSITORY_MASK_STORE_HH 1
+#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_TRADITIONAL_MASK_STORE_HH
+#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_E_TRADITIONAL_MASK_STORE_HH 1
#include <paludis/repositories/e/mask_info.hh>
#include <paludis/repositories/e/eapi-fwd.hh>
@@ -38,21 +38,21 @@ namespace paludis
{
namespace erepository
{
- class PALUDIS_VISIBLE RepositoryMaskStore
+ class PALUDIS_VISIBLE TraditionalMaskStore
{
private:
- Pimp<RepositoryMaskStore> _imp;
+ Pimp<TraditionalMaskStore> _imp;
void _populate();
public:
- RepositoryMaskStore(
+ TraditionalMaskStore(
const Environment * const,
const RepositoryName &,
const std::shared_ptr<const FSPathSequence> &,
const EAPIForFileFunction &);
- ~RepositoryMaskStore();
+ ~TraditionalMaskStore();
const std::shared_ptr<const MasksInfo> query(const std::shared_ptr<const PackageID> & id) const;
};