diff options
Diffstat (limited to 'app/Census/CensusOfWales1841.php')
| -rw-r--r-- | app/Census/CensusOfWales1841.php | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/app/Census/CensusOfWales1841.php b/app/Census/CensusOfWales1841.php index c43da02742..8f25b5e6da 100644 --- a/app/Census/CensusOfWales1841.php +++ b/app/Census/CensusOfWales1841.php @@ -16,8 +16,6 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; -use Fisharebest\Webtrees\Individual; -use Fisharebest\Webtrees\Place; /** * Definitions for a census @@ -35,18 +33,16 @@ class CensusOfWales1841 extends CensusOfWales implements CensusInterface { /** * The columns of the census. * - * @param Individual $individual - * * @return CensusColumnInterface[] */ - public function columns(Individual $individual) { - $place = new Place($this->censusPlace(), $individual->getTree()); - $date = new Date($this->censusDate()); - + public function columns() { return array( - new CensusColumnFullName($individual, $place, $date), - new CensusColumnSexMF($individual, $place, $date), - new CensusColumnOccupation($individual, $place, $date), + new CensusColumnFullName($this), + new CensusColumnAgeMale5Years($this), + new CensusColumnAgeFemale5Years($this), + new CensusColumnOccupation($this), + new CensusColumnBornSameCounty($this), + new CensusColumnBornForeignParts($this), ); } } |