aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/vdb_merger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-26 15:38:13 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-28 10:11:25 +0100
commitd03893141379f242baf6ccbe0e934ebabd1ce626 (patch)
tree62d41a98a0a3bc5aa77d5cc63e15c1102c4fbdee /paludis/repositories/e/vdb_merger.hh
parent164f1c1f44aedebad33225803bfd56701d1eb82f (diff)
downloadpaludis-d03893141379f242baf6ccbe0e934ebabd1ce626.tar.gz
paludis-d03893141379f242baf6ccbe0e934ebabd1ce626.tar.xz
Merger -> FSMerger
Diffstat (limited to 'paludis/repositories/e/vdb_merger.hh')
-rw-r--r--paludis/repositories/e/vdb_merger.hh16
1 files changed, 8 insertions, 8 deletions
diff --git a/paludis/repositories/e/vdb_merger.hh b/paludis/repositories/e/vdb_merger.hh
index 214141af6..208a2e815 100644
--- a/paludis/repositories/e/vdb_merger.hh
+++ b/paludis/repositories/e/vdb_merger.hh
@@ -20,7 +20,7 @@
#ifndef PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_VDB_MERGER_HH
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_GENTOO_VDB_MERGER_HH 1
-#include <paludis/merger.hh>
+#include <paludis/fs_merger.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/util/pimp.hh>
#include <paludis/output_manager-fwd.hh>
@@ -61,7 +61,7 @@ namespace paludis
NamedValue<n::fix_mtimes_before, Timestamp> fix_mtimes_before;
NamedValue<n::image, FSEntry> image;
NamedValue<n::merged_entries, std::shared_ptr<FSEntrySet> > merged_entries;
- NamedValue<n::options, MergerOptions> options;
+ NamedValue<n::options, FSMergerOptions> options;
NamedValue<n::output_manager, std::shared_ptr<OutputManager> > output_manager;
NamedValue<n::package_id, std::shared_ptr<const PackageID> > package_id;
NamedValue<n::root, FSEntry> root;
@@ -74,12 +74,12 @@ namespace paludis
* \nosubgrouping
*/
class PALUDIS_VISIBLE VDBMerger :
- public Merger,
+ public FSMerger,
private Pimp<VDBMerger>
{
private:
void display_override(const std::string &) const;
- std::string make_arrows(const MergeStatusFlags &) const;
+ std::string make_arrows(const FSMergerStatusFlags &) const;
Pimp<VDBMerger>::ImpPtr & _imp;
@@ -94,10 +94,10 @@ namespace paludis
virtual Hook extend_hook(const Hook &);
- virtual void record_install_file(const FSEntry &, const FSEntry &, const std::string &, const MergeStatusFlags &);
- virtual void record_install_dir(const FSEntry &, const FSEntry &, const MergeStatusFlags &);
- virtual void record_install_under_dir(const FSEntry &, const MergeStatusFlags &);
- virtual void record_install_sym(const FSEntry &, const FSEntry &, const MergeStatusFlags &);
+ virtual void record_install_file(const FSEntry &, const FSEntry &, const std::string &, const FSMergerStatusFlags &);
+ virtual void record_install_dir(const FSEntry &, const FSEntry &, const FSMergerStatusFlags &);
+ virtual void record_install_under_dir(const FSEntry &, const FSMergerStatusFlags &);
+ virtual void record_install_sym(const FSEntry &, const FSEntry &, const FSMergerStatusFlags &);
virtual void on_error(bool is_check, const std::string &);
virtual void on_warn(bool is_check, const std::string &);