aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-29 18:45:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-29 18:45:20 +0000
commit9a9bc0aaf28d2c8aa3f1453f645f5382506b4cca (patch)
tree8d22683863a885d1ceae8f64a0fdb86f454a7217
parent77579dd5d6ed01fe5587457ad10296c7ec50b08a (diff)
downloadpaludis-9a9bc0aaf28d2c8aa3f1453f645f5382506b4cca.tar.gz
paludis-9a9bc0aaf28d2c8aa3f1453f645f5382506b4cca.tar.xz
Rename PortageRepository*Metadata to PortageRepository*Entries
-rw-r--r--paludis/repositories/portage/Makefile.am8
-rw-r--r--paludis/repositories/portage/portage_repository.cc14
-rw-r--r--paludis/repositories/portage/portage_repository_ebuild_entries.cc (renamed from paludis/repositories/portage/portage_repository_ebuild_metadata.cc)18
-rw-r--r--paludis/repositories/portage/portage_repository_ebuild_entries.hh (renamed from paludis/repositories/portage/portage_repository_ebuild_metadata.hh)14
-rw-r--r--paludis/repositories/portage/portage_repository_entries.cc (renamed from paludis/repositories/portage/portage_repository_metadata.cc)6
-rw-r--r--paludis/repositories/portage/portage_repository_entries.hh (renamed from paludis/repositories/portage/portage_repository_metadata.hh)10
6 files changed, 35 insertions, 35 deletions
diff --git a/paludis/repositories/portage/Makefile.am b/paludis/repositories/portage/Makefile.am
index 51f4273..20aa63c 100644
--- a/paludis/repositories/portage/Makefile.am
+++ b/paludis/repositories/portage/Makefile.am
@@ -20,8 +20,8 @@ paludis_repositories_portage_include_HEADERS = \
portage_repository_news.hh \
portage_repository_params.hh \
portage_repository_sets.hh \
- portage_repository_metadata.hh \
- portage_repository_ebuild_metadata.hh
+ portage_repository_entries.hh \
+ portage_repository_ebuild_entries.hh
libpaludisportagerepository_la_SOURCES = \
portage_repository.cc \
@@ -29,8 +29,8 @@ libpaludisportagerepository_la_SOURCES = \
portage_repository_exceptions.cc \
portage_repository_news.cc \
portage_repository_sets.cc \
- portage_repository_metadata.cc \
- portage_repository_ebuild_metadata.cc \
+ portage_repository_entries.cc \
+ portage_repository_ebuild_entries.cc \
$(paludis_repositories_portage_include_HEADERS)
TESTS = portage_repository_TEST
diff --git a/paludis/repositories/portage/portage_repository.cc b/paludis/repositories/portage/portage_repository.cc
index e720e3a..399aa66 100644
--- a/paludis/repositories/portage/portage_repository.cc
+++ b/paludis/repositories/portage/portage_repository.cc
@@ -25,7 +25,7 @@
#include <paludis/repositories/portage/portage_repository_news.hh>
#include <paludis/repositories/portage/portage_repository_sets.hh>
#include <paludis/repositories/portage/portage_repository_exceptions.hh>
-#include <paludis/repositories/portage/portage_repository_ebuild_metadata.hh>
+#include <paludis/repositories/portage/portage_repository_ebuild_entries.hh>
#include <paludis/config_file.hh>
#include <paludis/dep_atom.hh>
@@ -171,7 +171,7 @@ namespace paludis
mutable PortageRepositorySets::Pointer sets_ptr;
/// Our metadata handler.
- mutable PortageRepositoryMetadata::Pointer metadata_ptr;
+ mutable PortageRepositoryEntries::Pointer entries_ptr;
/// Our virtuals
mutable VirtualsMap our_virtuals;
@@ -191,7 +191,7 @@ namespace paludis
profile_ptr(0),
news_ptr(new PortageRepositoryNews(params.get<prpk_environment>(), repo, p)),
sets_ptr(new PortageRepositorySets(params.get<prpk_environment>(), repo, p)),
- metadata_ptr(new PortageRepositoryEbuildMetadata(params.get<prpk_environment>(), repo, p)),
+ entries_ptr(new PortageRepositoryEbuildEntries(params.get<prpk_environment>(), repo, p)),
has_our_virtuals(false)
{
}
@@ -383,7 +383,7 @@ PortageRepository::do_package_names(const CategoryNamePart & c) const
if (! d->is_directory())
continue;
if (DirIterator() == std::find_if(DirIterator(*d), DirIterator(),
- IsFileWithExtension(_imp->metadata_ptr->file_extension())))
+ IsFileWithExtension(_imp->entries_ptr->file_extension())))
continue;
try
@@ -495,13 +495,13 @@ PortageRepository::need_version_names(const QualifiedPackageName & n) const
for (DirIterator e(path), e_end ; e != e_end ; ++e)
{
if (! IsFileWithExtension(stringify(n.get<qpn_package>()) + "-",
- _imp->metadata_ptr->file_extension())(*e))
+ _imp->entries_ptr->file_extension())(*e))
continue;
try
{
v->insert(strip_leading_string(
- strip_trailing_string(e->basename(), _imp->metadata_ptr->file_extension()),
+ strip_trailing_string(e->basename(), _imp->entries_ptr->file_extension()),
stringify(n.get<qpn_package>()) + "-"));
}
catch (const NameError &)
@@ -569,7 +569,7 @@ PortageRepository::do_version_metadata(
PortageDepParser::parse_depend));
}
- VersionMetadata::Pointer result(_imp->metadata_ptr->generate_version_metadata(q, v));
+ VersionMetadata::Pointer result(_imp->entries_ptr->generate_version_metadata(q, v));
_imp->metadata.insert(std::make_pair(std::make_pair(q, v), result));
return result;
}
diff --git a/paludis/repositories/portage/portage_repository_ebuild_metadata.cc b/paludis/repositories/portage/portage_repository_ebuild_entries.cc
index c40e419..6436ef8 100644
--- a/paludis/repositories/portage/portage_repository_ebuild_metadata.cc
+++ b/paludis/repositories/portage/portage_repository_ebuild_entries.cc
@@ -17,7 +17,7 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <paludis/repositories/portage/portage_repository_ebuild_metadata.hh>
+#include <paludis/repositories/portage/portage_repository_ebuild_entries.hh>
#include <paludis/repositories/portage/portage_repository.hh>
#include <paludis/ebuild.hh>
@@ -35,8 +35,8 @@ using namespace paludis;
namespace paludis
{
template<>
- struct Implementation<PortageRepositoryEbuildMetadata> :
- InternalCounted<Implementation<PortageRepositoryEbuildMetadata> >
+ struct Implementation<PortageRepositoryEbuildEntries> :
+ InternalCounted<Implementation<PortageRepositoryEbuildEntries> >
{
const Environment * const environment;
PortageRepository * const portage_repository;
@@ -52,20 +52,20 @@ namespace paludis
};
}
-PortageRepositoryEbuildMetadata::PortageRepositoryEbuildMetadata(
+PortageRepositoryEbuildEntries::PortageRepositoryEbuildEntries(
const Environment * const e, PortageRepository * const p, const PortageRepositoryParams & k) :
- PortageRepositoryMetadata(".ebuild"),
- PrivateImplementationPattern<PortageRepositoryEbuildMetadata>(new
- Implementation<PortageRepositoryEbuildMetadata>(e, p, k))
+ PortageRepositoryEntries(".ebuild"),
+ PrivateImplementationPattern<PortageRepositoryEbuildEntries>(new
+ Implementation<PortageRepositoryEbuildEntries>(e, p, k))
{
}
-PortageRepositoryEbuildMetadata::~PortageRepositoryEbuildMetadata()
+PortageRepositoryEbuildEntries::~PortageRepositoryEbuildEntries()
{
}
VersionMetadata::Pointer
-PortageRepositoryEbuildMetadata::generate_version_metadata(const QualifiedPackageName & q,
+PortageRepositoryEbuildEntries::generate_version_metadata(const QualifiedPackageName & q,
const VersionSpec & v) const
{
VersionMetadata::Pointer result(new VersionMetadata::Ebuild(PortageDepParser::parse_depend));
diff --git a/paludis/repositories/portage/portage_repository_ebuild_metadata.hh b/paludis/repositories/portage/portage_repository_ebuild_entries.hh
index 9d59959..03af54e 100644
--- a/paludis/repositories/portage/portage_repository_ebuild_metadata.hh
+++ b/paludis/repositories/portage/portage_repository_ebuild_entries.hh
@@ -20,12 +20,12 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EBUILD_METADATA_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_PORTAGE_PORTAGE_REPOSITORY_EBUILD_METADATA_HH 1
-#include <paludis/repositories/portage/portage_repository_metadata.hh>
+#include <paludis/repositories/portage/portage_repository_entries.hh>
#include <paludis/repositories/portage/portage_repository_params.hh>
#include <paludis/util/private_implementation_pattern.hh>
/** \file
- * Declaration for the PortageRepositoryEbuildMetadata class.
+ * Declaration for the PortageRepositoryEbuildEntries class.
*
* \ingroup grpportagerepository
*/
@@ -35,16 +35,16 @@ namespace paludis
class FSEntry;
class PortageRepository;
- class PortageRepositoryEbuildMetadata :
- public PortageRepositoryMetadata,
- private PrivateImplementationPattern<PortageRepositoryEbuildMetadata>
+ class PortageRepositoryEbuildEntries :
+ public PortageRepositoryEntries,
+ private PrivateImplementationPattern<PortageRepositoryEbuildEntries>
{
public:
- PortageRepositoryEbuildMetadata(const Environment * const,
+ PortageRepositoryEbuildEntries(const Environment * const,
PortageRepository * const portage_repository,
const PortageRepositoryParams &);
- virtual ~PortageRepositoryEbuildMetadata();
+ virtual ~PortageRepositoryEbuildEntries();
virtual VersionMetadata::Pointer generate_version_metadata(const QualifiedPackageName &,
const VersionSpec &) const;
diff --git a/paludis/repositories/portage/portage_repository_metadata.cc b/paludis/repositories/portage/portage_repository_entries.cc
index 3b7e81d..3abbbbb 100644
--- a/paludis/repositories/portage/portage_repository_metadata.cc
+++ b/paludis/repositories/portage/portage_repository_entries.cc
@@ -17,16 +17,16 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "portage_repository_metadata.hh"
+#include "portage_repository_entries.hh"
using namespace paludis;
-PortageRepositoryMetadata::PortageRepositoryMetadata(const std::string & ext) :
+PortageRepositoryEntries::PortageRepositoryEntries(const std::string & ext) :
_ext(ext)
{
}
-PortageRepositoryMetadata::~PortageRepositoryMetadata()
+PortageRepositoryEntries::~PortageRepositoryEntries()
{
}
diff --git a/paludis/repositories/portage/portage_repository_metadata.hh b/paludis/repositories/portage/portage_repository_entries.hh
index a7ee10d..3f67898 100644
--- a/paludis/repositories/portage/portage_repository_metadata.hh
+++ b/paludis/repositories/portage/portage_repository_entries.hh
@@ -28,24 +28,24 @@
#include <string>
/** \file
- * Declaration for the PortageRepositoryMetadata class.
+ * Declaration for the PortageRepositoryEntries class.
*
* \ingroup grpportagerepository
*/
namespace paludis
{
- class PortageRepositoryMetadata :
- public InternalCounted<PortageRepositoryMetadata>
+ class PortageRepositoryEntries :
+ public InternalCounted<PortageRepositoryEntries>
{
private:
const std::string _ext;
protected:
- PortageRepositoryMetadata(const std::string & ext);
+ PortageRepositoryEntries(const std::string & ext);
public:
- virtual ~PortageRepositoryMetadata();
+ virtual ~PortageRepositoryEntries();
std::string file_extension() const
{