aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-14 21:40:20 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-14 21:40:20 +0100
commite3cce2ea1add93fd66450100c7e413abc6f0b70c (patch)
tree27e991a332003622aaaaf02a2e626df04d7cc32c
parent6945cb45acb4f215f347cc0bbc7a55d10ea054b1 (diff)
downloadpaludis-e3cce2ea1add93fd66450100c7e413abc6f0b70c.tar.gz
paludis-e3cce2ea1add93fd66450100c7e413abc6f0b70c.tar.xz
Make some hook performs non-const
-rw-r--r--paludis/install_task.cc2
-rw-r--r--paludis/install_task.hh2
-rw-r--r--paludis/repositories/accounts/accounts_repository.cc2
-rw-r--r--paludis/repositories/accounts/accounts_repository.hh2
-rw-r--r--paludis/repositories/cran/cran_installed_repository.cc2
-rw-r--r--paludis/repositories/cran/cran_installed_repository.hh2
-rw-r--r--paludis/repositories/cran/cran_repository.cc2
-rw-r--r--paludis/repositories/cran/cran_repository.hh2
-rw-r--r--paludis/repositories/e/e_installed_repository.cc2
-rw-r--r--paludis/repositories/e/e_installed_repository.hh2
-rw-r--r--paludis/repositories/e/e_repository.cc2
-rw-r--r--paludis/repositories/e/e_repository.hh2
-rw-r--r--paludis/repositories/fake/fake_repository_base.cc2
-rw-r--r--paludis/repositories/fake/fake_repository_base.hh2
-rw-r--r--paludis/repositories/gems/gems_repository.cc2
-rw-r--r--paludis/repositories/gems/gems_repository.hh2
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc2
-rw-r--r--paludis/repositories/gems/installed_gems_repository.hh2
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.cc2
-rw-r--r--paludis/repositories/unavailable/unavailable_repository.hh2
-rw-r--r--paludis/repositories/unpackaged/installed_repository.cc2
-rw-r--r--paludis/repositories/unpackaged/installed_repository.hh2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.cc2
-rw-r--r--paludis/repositories/unpackaged/unpackaged_repository.hh2
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.cc2
-rw-r--r--paludis/repositories/unwritten/unwritten_repository.hh2
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.cc2
-rw-r--r--paludis/repositories/virtuals/installed_virtuals_repository.hh2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.cc2
-rw-r--r--paludis/repositories/virtuals/virtuals_repository.hh2
-rw-r--r--paludis/repository.hh2
-rw-r--r--src/output/console_install_task.cc2
-rw-r--r--src/output/console_install_task.hh2
33 files changed, 33 insertions, 33 deletions
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 52f7e06de..5d372ff36 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -1356,7 +1356,7 @@ InstallTask::set_safe_resume(const bool value)
}
HookResult
-InstallTask::perform_hook(const Hook & hook) const
+InstallTask::perform_hook(const Hook & hook)
{
return _imp->env->perform_hook(hook);
}
diff --git a/paludis/install_task.hh b/paludis/install_task.hh
index 37debab4c..088aeebfe 100644
--- a/paludis/install_task.hh
+++ b/paludis/install_task.hh
@@ -255,7 +255,7 @@ namespace paludis
/**
* Perform a hook. By default, delegates to environment.
*/
- virtual HookResult perform_hook(const Hook &) const
+ virtual HookResult perform_hook(const Hook &)
PALUDIS_ATTRIBUTE((warn_unused_result));
/**
diff --git a/paludis/repositories/accounts/accounts_repository.cc b/paludis/repositories/accounts/accounts_repository.cc
index d8d866296..26f5b8fff 100644
--- a/paludis/repositories/accounts/accounts_repository.cc
+++ b/paludis/repositories/accounts/accounts_repository.cc
@@ -460,7 +460,7 @@ AccountsRepository::populate_sets() const
}
HookResult
-AccountsRepository::perform_hook(const Hook &) const
+AccountsRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/accounts/accounts_repository.hh b/paludis/repositories/accounts/accounts_repository.hh
index e3c80675d..c19fa5f1b 100644
--- a/paludis/repositories/accounts/accounts_repository.hh
+++ b/paludis/repositories/accounts/accounts_repository.hh
@@ -138,7 +138,7 @@ namespace paludis
virtual void invalidate_masks();
virtual void regenerate_cache() const;
- virtual HookResult perform_hook(const Hook & hook) const;
+ virtual HookResult perform_hook(const Hook & hook);
///\}
diff --git a/paludis/repositories/cran/cran_installed_repository.cc b/paludis/repositories/cran/cran_installed_repository.cc
index 5f94c03e5..66a1ccc01 100644
--- a/paludis/repositories/cran/cran_installed_repository.cc
+++ b/paludis/repositories/cran/cran_installed_repository.cc
@@ -598,7 +598,7 @@ CRANInstalledRepository::populate_sets() const
}
HookResult
-CRANInstalledRepository::perform_hook(const Hook &) const
+CRANInstalledRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/cran/cran_installed_repository.hh b/paludis/repositories/cran/cran_installed_repository.hh
index 79c6492ea..5b1a1e2a4 100644
--- a/paludis/repositories/cran/cran_installed_repository.hh
+++ b/paludis/repositories/cran/cran_installed_repository.hh
@@ -106,7 +106,7 @@ namespace paludis
virtual void invalidate();
virtual void invalidate_masks();
- virtual HookResult perform_hook(const Hook & hook) const;
+ virtual HookResult perform_hook(const Hook & hook);
/* RepositoryDestinationInterface */
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 762b649dc..bba60bf7f 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -546,7 +546,7 @@ CRANRepository::populate_sets() const
}
HookResult
-CRANRepository::perform_hook(const Hook &) const
+CRANRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/cran/cran_repository.hh b/paludis/repositories/cran/cran_repository.hh
index a836690fe..33b4084e9 100644
--- a/paludis/repositories/cran/cran_repository.hh
+++ b/paludis/repositories/cran/cran_repository.hh
@@ -163,7 +163,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const;
+ virtual HookResult perform_hook(const Hook & hook);
};
/**
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index 7d0227cf4..685d5c1a6 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -149,7 +149,7 @@ EInstalledRepository::want_pre_post_phases() const
}
HookResult
-EInstalledRepository::perform_hook(const Hook & hook) const
+EInstalledRepository::perform_hook(const Hook & hook)
{
Context context("When performing hook '" + stringify(hook.name()) + "' for repository '"
+ stringify(name()) + "':");
diff --git a/paludis/repositories/e/e_installed_repository.hh b/paludis/repositories/e/e_installed_repository.hh
index 76427b09d..de411df96 100644
--- a/paludis/repositories/e/e_installed_repository.hh
+++ b/paludis/repositories/e/e_installed_repository.hh
@@ -79,7 +79,7 @@ namespace paludis
virtual bool some_ids_might_support_action(const SupportsActionTestBase &) const;
- virtual HookResult perform_hook(const Hook & hook) const
+ HookResult perform_hook(const Hook & hook)
PALUDIS_ATTRIBUTE((warn_unused_result));
///\name For use by EInstalledRepositoryID
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 146a562b4..1efae14d1 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -1067,7 +1067,7 @@ ERepository::merge(const MergeParams & p)
}
HookResult
-ERepository::perform_hook(const Hook & hook) const
+ERepository::perform_hook(const Hook & hook)
{
Context context("When performing hook '" + stringify(hook.name()) + "' for repository '"
+ stringify(name()) + "':");
diff --git a/paludis/repositories/e/e_repository.hh b/paludis/repositories/e/e_repository.hh
index 39951f42e..7f5aeb359 100644
--- a/paludis/repositories/e/e_repository.hh
+++ b/paludis/repositories/e/e_repository.hh
@@ -184,7 +184,7 @@ namespace paludis
///\}
- HookResult perform_hook(const Hook &) const
+ HookResult perform_hook(const Hook &)
PALUDIS_ATTRIBUTE((warn_unused_result));
virtual std::tr1::shared_ptr<const CategoryNamePartSet> unimportant_category_names() const;
diff --git a/paludis/repositories/fake/fake_repository_base.cc b/paludis/repositories/fake/fake_repository_base.cc
index 365bd8dc2..57140c731 100644
--- a/paludis/repositories/fake/fake_repository_base.cc
+++ b/paludis/repositories/fake/fake_repository_base.cc
@@ -182,7 +182,7 @@ FakeRepositoryBase::populate_sets() const
}
HookResult
-FakeRepositoryBase::perform_hook(const Hook &) const
+FakeRepositoryBase::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/fake/fake_repository_base.hh b/paludis/repositories/fake/fake_repository_base.hh
index 6613358b3..7ae08c019 100644
--- a/paludis/repositories/fake/fake_repository_base.hh
+++ b/paludis/repositories/fake/fake_repository_base.hh
@@ -124,7 +124,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const;
+ virtual HookResult perform_hook(const Hook & hook);
};
}
diff --git a/paludis/repositories/gems/gems_repository.cc b/paludis/repositories/gems/gems_repository.cc
index 6de2ede09..6113f4351 100644
--- a/paludis/repositories/gems/gems_repository.cc
+++ b/paludis/repositories/gems/gems_repository.cc
@@ -406,7 +406,7 @@ GemsRepository::populate_sets() const
}
HookResult
-GemsRepository::perform_hook(const Hook &) const
+GemsRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/gems/gems_repository.hh b/paludis/repositories/gems/gems_repository.hh
index 79fe71c20..bf267fe7e 100644
--- a/paludis/repositories/gems/gems_repository.hh
+++ b/paludis/repositories/gems/gems_repository.hh
@@ -114,7 +114,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const;
+ virtual HookResult perform_hook(const Hook & hook);
};
}
diff --git a/paludis/repositories/gems/installed_gems_repository.cc b/paludis/repositories/gems/installed_gems_repository.cc
index 9461342bd..f86afb0ba 100644
--- a/paludis/repositories/gems/installed_gems_repository.cc
+++ b/paludis/repositories/gems/installed_gems_repository.cc
@@ -450,7 +450,7 @@ InstalledGemsRepository::populate_sets() const
}
HookResult
-InstalledGemsRepository::perform_hook(const Hook &) const
+InstalledGemsRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/gems/installed_gems_repository.hh b/paludis/repositories/gems/installed_gems_repository.hh
index 49d671d1e..d336303e2 100644
--- a/paludis/repositories/gems/installed_gems_repository.hh
+++ b/paludis/repositories/gems/installed_gems_repository.hh
@@ -129,7 +129,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const
+ virtual HookResult perform_hook(const Hook & hook)
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/repositories/unavailable/unavailable_repository.cc b/paludis/repositories/unavailable/unavailable_repository.cc
index 28cf947c3..2a0a3e797 100644
--- a/paludis/repositories/unavailable/unavailable_repository.cc
+++ b/paludis/repositories/unavailable/unavailable_repository.cc
@@ -345,7 +345,7 @@ UnavailableRepository::populate_sets() const
}
HookResult
-UnavailableRepository::perform_hook(const Hook &) const
+UnavailableRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/unavailable/unavailable_repository.hh b/paludis/repositories/unavailable/unavailable_repository.hh
index 338a595ef..7dc22225f 100644
--- a/paludis/repositories/unavailable/unavailable_repository.hh
+++ b/paludis/repositories/unavailable/unavailable_repository.hh
@@ -118,7 +118,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const;
+ virtual HookResult perform_hook(const Hook & hook);
};
}
diff --git a/paludis/repositories/unpackaged/installed_repository.cc b/paludis/repositories/unpackaged/installed_repository.cc
index a8718c99c..8b8f3c0bf 100644
--- a/paludis/repositories/unpackaged/installed_repository.cc
+++ b/paludis/repositories/unpackaged/installed_repository.cc
@@ -512,7 +512,7 @@ InstalledUnpackagedRepository::populate_sets() const
}
HookResult
-InstalledUnpackagedRepository::perform_hook(const Hook &) const
+InstalledUnpackagedRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/unpackaged/installed_repository.hh b/paludis/repositories/unpackaged/installed_repository.hh
index febe346da..c05e4d6c7 100644
--- a/paludis/repositories/unpackaged/installed_repository.hh
+++ b/paludis/repositories/unpackaged/installed_repository.hh
@@ -132,7 +132,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const
+ virtual HookResult perform_hook(const Hook & hook)
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.cc b/paludis/repositories/unpackaged/unpackaged_repository.cc
index a0970a9ae..6557dd70f 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.cc
+++ b/paludis/repositories/unpackaged/unpackaged_repository.cc
@@ -283,7 +283,7 @@ UnpackagedRepository::populate_sets() const
}
HookResult
-UnpackagedRepository::perform_hook(const Hook &) const
+UnpackagedRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/unpackaged/unpackaged_repository.hh b/paludis/repositories/unpackaged/unpackaged_repository.hh
index 9f886f723..fe13511dc 100644
--- a/paludis/repositories/unpackaged/unpackaged_repository.hh
+++ b/paludis/repositories/unpackaged/unpackaged_repository.hh
@@ -131,7 +131,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const
+ virtual HookResult perform_hook(const Hook & hook)
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/repositories/unwritten/unwritten_repository.cc b/paludis/repositories/unwritten/unwritten_repository.cc
index 7856e3b7a..3deba9700 100644
--- a/paludis/repositories/unwritten/unwritten_repository.cc
+++ b/paludis/repositories/unwritten/unwritten_repository.cc
@@ -345,7 +345,7 @@ UnwrittenRepository::populate_sets() const
}
HookResult
-UnwrittenRepository::perform_hook(const Hook &) const
+UnwrittenRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/unwritten/unwritten_repository.hh b/paludis/repositories/unwritten/unwritten_repository.hh
index d6efad9c1..55faace19 100644
--- a/paludis/repositories/unwritten/unwritten_repository.hh
+++ b/paludis/repositories/unwritten/unwritten_repository.hh
@@ -117,7 +117,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const;
+ virtual HookResult perform_hook(const Hook & hook);
};
}
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.cc b/paludis/repositories/virtuals/installed_virtuals_repository.cc
index dd7b30d6d..f676e6dfc 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.cc
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.cc
@@ -236,7 +236,7 @@ InstalledVirtualsRepository::invalidate_masks()
}
HookResult
-InstalledVirtualsRepository::perform_hook(const Hook & hook) const
+InstalledVirtualsRepository::perform_hook(const Hook & hook)
{
Context context("When performing hook '" + stringify(hook.name()) + "' for repository '"
+ stringify(name()) + "':");
diff --git a/paludis/repositories/virtuals/installed_virtuals_repository.hh b/paludis/repositories/virtuals/installed_virtuals_repository.hh
index 5cfeaf795..d99bfc2b0 100644
--- a/paludis/repositories/virtuals/installed_virtuals_repository.hh
+++ b/paludis/repositories/virtuals/installed_virtuals_repository.hh
@@ -82,7 +82,7 @@ namespace paludis
virtual bool can_be_favourite_repository() const;
- HookResult perform_hook(const Hook &) const
+ HookResult perform_hook(const Hook &)
PALUDIS_ATTRIBUTE((warn_unused_result));
/* Repository */
diff --git a/paludis/repositories/virtuals/virtuals_repository.cc b/paludis/repositories/virtuals/virtuals_repository.cc
index ced232da4..d4dacd9f9 100644
--- a/paludis/repositories/virtuals/virtuals_repository.cc
+++ b/paludis/repositories/virtuals/virtuals_repository.cc
@@ -459,7 +459,7 @@ VirtualsRepository::populate_sets() const
}
HookResult
-VirtualsRepository::perform_hook(const Hook &) const
+VirtualsRepository::perform_hook(const Hook &)
{
return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
}
diff --git a/paludis/repositories/virtuals/virtuals_repository.hh b/paludis/repositories/virtuals/virtuals_repository.hh
index 175e3ea76..a96ec4845 100644
--- a/paludis/repositories/virtuals/virtuals_repository.hh
+++ b/paludis/repositories/virtuals/virtuals_repository.hh
@@ -122,7 +122,7 @@ namespace paludis
///\}
- virtual HookResult perform_hook(const Hook & hook) const
+ virtual HookResult perform_hook(const Hook & hook)
PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/repository.hh b/paludis/repository.hh
index e5ed76d9d..9e8f6b2b8 100644
--- a/paludis/repository.hh
+++ b/paludis/repository.hh
@@ -397,7 +397,7 @@ namespace paludis
*
* \since 0.40 (previously in an interface)
*/
- virtual HookResult perform_hook(const Hook & hook) const
+ virtual HookResult perform_hook(const Hook & hook)
PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index aac492b7e..e741c6a88 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -1958,7 +1958,7 @@ ConsoleInstallTask::on_installed_paludis()
}
HookResult
-ConsoleInstallTask::perform_hook(const Hook & hook) const
+ConsoleInstallTask::perform_hook(const Hook & hook)
{
std::string resume_command(make_resume_command(true));
if (resume_command.empty())
diff --git a/src/output/console_install_task.hh b/src/output/console_install_task.hh
index f36d9333e..beadfdc9a 100644
--- a/src/output/console_install_task.hh
+++ b/src/output/console_install_task.hh
@@ -248,7 +248,7 @@ namespace paludis
void show_resume_command(const std::string &) const;
virtual std::string make_resume_command(const bool undo_failures) const = 0;
virtual void on_installed_paludis();
- virtual HookResult perform_hook(const Hook &) const;
+ virtual HookResult perform_hook(const Hook &);
///\}