aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/vdb_merger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-07-29 21:47:08 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-08-03 21:20:26 +0100
commit77be16f5c2de2ebcd7ce78084755f83c522edc39 (patch)
tree7f46de7cf0f1cd9ec9cd2c4b342446cd0c4d567c /paludis/repositories/e/vdb_merger.hh
parent5c42e4800f4e6edd91dc6d8cdf54afb3d1fb34df (diff)
downloadpaludis-77be16f5c2de2ebcd7ce78084755f83c522edc39.tar.gz
paludis-77be16f5c2de2ebcd7ce78084755f83c522edc39.tar.xz
Kill kc. Breaks python.
Diffstat (limited to 'paludis/repositories/e/vdb_merger.hh')
-rw-r--r--paludis/repositories/e/vdb_merger.hh35
1 files changed, 23 insertions, 12 deletions
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index 9d27d8b97..ab694b98c 100644
--- a/paludis/repositories/e/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -23,13 +23,23 @@
#include <paludis/merger.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/kc.hh>
-#include <paludis/util/keys.hh>
namespace paludis
{
class Hook;
+ namespace n
+ {
+ struct config_protect;
+ struct config_protect_mask;
+ struct contents_file;
+ struct environment;
+ struct image;
+ struct options;
+ struct package_id;
+ struct root;
+ }
+
/**
* Parameters for a VDBMerger.
*
@@ -39,16 +49,17 @@ namespace paludis
* \nosubgrouping
* \since 0.26
*/
- typedef kc::KeyedClass<
- kc::Field<k::environment, Environment *>,
- kc::Field<k::image, FSEntry>,
- kc::Field<k::root, FSEntry>,
- kc::Field<k::contents_file, FSEntry>,
- kc::Field<k::config_protect, std::string>,
- kc::Field<k::config_protect_mask, std::string>,
- kc::Field<k::package_id, std::tr1::shared_ptr<const PackageID> >,
- kc::Field<k::options, MergerOptions>
- > VDBMergerParams;
+ struct VDBMergerParams
+ {
+ NamedValue<n::config_protect, std::string> config_protect;
+ NamedValue<n::config_protect_mask, std::string> config_protect_mask;
+ NamedValue<n::contents_file, FSEntry> contents_file;
+ NamedValue<n::environment, Environment *> environment;
+ NamedValue<n::image, FSEntry> image;
+ NamedValue<n::options, MergerOptions> options;
+ NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id;
+ NamedValue<n::root, FSEntry> root;
+ };
/**
* Merger for VDBRepository.