aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_unmerger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-17 18:25:28 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-17 18:25:28 +0000
commit549705408bc3cf99b8c4f210a07e3862e7dccbfb (patch)
tree94b693c6779108e41c60ec79fd45e036fea57ad8 /paludis/ndbam_unmerger.hh
parentc3af10b1593a472aacd141cb3aa6143c79d92da2 (diff)
downloadpaludis-549705408bc3cf99b8c4f210a07e3862e7dccbfb.tar.gz
paludis-549705408bc3cf99b8c4f210a07e3862e7dccbfb.tar.xz
More sr -> kc
Diffstat (limited to 'paludis/ndbam_unmerger.hh')
-rw-r--r--paludis/ndbam_unmerger.hh13
1 files changed, 11 insertions, 2 deletions
diff --git a/paludis/ndbam_unmerger.hh b/paludis/ndbam_unmerger.hh
index 1fb3f3014..486e89110 100644
--- a/paludis/ndbam_unmerger.hh
+++ b/paludis/ndbam_unmerger.hh
@@ -22,8 +22,9 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_UNPACKAGED_NDBAM_UNMERGER_HH 1
#include <paludis/util/private_implementation_pattern.hh>
-#include <paludis/util/sr.hh>
#include <paludis/util/fs_entry.hh>
+#include <paludis/util/kc-fwd.hh>
+#include <paludis/util/keys.hh>
#include <paludis/unmerger.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/package_id-fwd.hh>
@@ -32,7 +33,15 @@ namespace paludis
{
class NDBAM;
-#include <paludis/ndbam_unmerger-sr.hh>
+ typedef kc::KeyedClass<
+ kc::Field<k::environment, const Environment *>,
+ 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, tr1::shared_ptr<const PackageID> >,
+ kc::Field<k::ndbam, const NDBAM *>
+ > NDBAMUnmergerOptions;
class PALUDIS_VISIBLE NDBAMUnmergerError :
public UnmergerError