aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 21:46:00 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 21:46:00 +0100
commit4209b95ecc83365718b3dd5556a6866a662e95c5 (patch)
tree2adf8c110af7f7979685fa1a3743230f8c370c83 /paludis/environments
parent99ca317486703808bec65846a6266afdace5d0f7 (diff)
downloadpaludis-4209b95ecc83365718b3dd5556a6866a662e95c5.tar.gz
paludis-4209b95ecc83365718b3dd5556a6866a662e95c5.tar.xz
Less verbose PrivateImplementationPattern
Diffstat (limited to 'paludis/environments')
-rw-r--r--paludis/environments/no_config/no_config_environment.cc3
-rw-r--r--paludis/environments/paludis/keywords_conf.cc2
-rw-r--r--paludis/environments/paludis/licenses_conf.cc2
-rw-r--r--paludis/environments/paludis/mirrors_conf.cc4
-rw-r--r--paludis/environments/paludis/output_conf.cc2
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc2
-rw-r--r--paludis/environments/paludis/paludis_config.cc2
-rw-r--r--paludis/environments/paludis/paludis_environment.cc3
-rw-r--r--paludis/environments/paludis/use_conf.cc2
-rw-r--r--paludis/environments/paludis/world.cc2
-rw-r--r--paludis/environments/portage/portage_environment.cc2
-rw-r--r--paludis/environments/test/test_environment.cc4
12 files changed, 14 insertions, 16 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 1b0141b1c..bece5fa38 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -349,8 +349,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
}
NoConfigEnvironment::NoConfigEnvironment(const no_config_environment::Params & params) :
- PrivateImplementationPattern<NoConfigEnvironment>(
- new Implementation<NoConfigEnvironment>(this, params)),
+ PrivateImplementationPattern<NoConfigEnvironment>(this, params),
_imp(PrivateImplementationPattern<NoConfigEnvironment>::_imp)
{
_imp->initialise(this);
diff --git a/paludis/environments/paludis/keywords_conf.cc b/paludis/environments/paludis/keywords_conf.cc
index e67d27e23..935322e97 100644
--- a/paludis/environments/paludis/keywords_conf.cc
+++ b/paludis/environments/paludis/keywords_conf.cc
@@ -74,7 +74,7 @@ namespace paludis
}
KeywordsConf::KeywordsConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<KeywordsConf>(new Implementation<KeywordsConf>(e))
+ PrivateImplementationPattern<KeywordsConf>(e)
{
}
diff --git a/paludis/environments/paludis/licenses_conf.cc b/paludis/environments/paludis/licenses_conf.cc
index c2cc0d9b2..2c4fa4ad1 100644
--- a/paludis/environments/paludis/licenses_conf.cc
+++ b/paludis/environments/paludis/licenses_conf.cc
@@ -73,7 +73,7 @@ namespace paludis
}
LicensesConf::LicensesConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<LicensesConf>(new Implementation<LicensesConf>(e))
+ PrivateImplementationPattern<LicensesConf>(e)
{
}
diff --git a/paludis/environments/paludis/mirrors_conf.cc b/paludis/environments/paludis/mirrors_conf.cc
index f3d0820fc..32f29852a 100644
--- a/paludis/environments/paludis/mirrors_conf.cc
+++ b/paludis/environments/paludis/mirrors_conf.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -56,7 +56,7 @@ namespace paludis
}
MirrorsConf::MirrorsConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<MirrorsConf>(new Implementation<MirrorsConf>(e))
+ PrivateImplementationPattern<MirrorsConf>(e)
{
}
diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc
index 11807fe60..22ece8808 100644
--- a/paludis/environments/paludis/output_conf.cc
+++ b/paludis/environments/paludis/output_conf.cc
@@ -112,7 +112,7 @@ namespace paludis
}
OutputConf::OutputConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<OutputConf>(new Implementation<OutputConf>(e))
+ PrivateImplementationPattern<OutputConf>(e)
{
}
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index 93af22644..39a20f713 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -64,7 +64,7 @@ namespace paludis
}
PackageMaskConf::PackageMaskConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<PackageMaskConf>(new Implementation<PackageMaskConf>(e))
+ PrivateImplementationPattern<PackageMaskConf>(e)
{
}
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index fdd96465e..9a3f60f65 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -383,7 +383,7 @@ PaludisConfigNoDirectoryError::PaludisConfigNoDirectoryError(const std::string &
}
PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & suffix) :
- PrivateImplementationPattern<PaludisConfig>(new Implementation<PaludisConfig>(e))
+ PrivateImplementationPattern<PaludisConfig>(e)
{
using namespace std::placeholders;
diff --git a/paludis/environments/paludis/paludis_environment.cc b/paludis/environments/paludis/paludis_environment.cc
index 4a0ca1bb0..2895303d6 100644
--- a/paludis/environments/paludis/paludis_environment.cc
+++ b/paludis/environments/paludis/paludis_environment.cc
@@ -141,8 +141,7 @@ namespace paludis
}
PaludisEnvironment::PaludisEnvironment(const std::string & s) :
- PrivateImplementationPattern<PaludisEnvironment>(new Implementation<PaludisEnvironment>(
- this, std::shared_ptr<PaludisConfig>(new PaludisConfig(this, s)))),
+ PrivateImplementationPattern<PaludisEnvironment>(this, std::shared_ptr<PaludisConfig>(new PaludisConfig(this, s))),
_imp(PrivateImplementationPattern<PaludisEnvironment>::_imp)
{
Context context("When loading paludis environment:");
diff --git a/paludis/environments/paludis/use_conf.cc b/paludis/environments/paludis/use_conf.cc
index c5373472b..10fe3fceb 100644
--- a/paludis/environments/paludis/use_conf.cc
+++ b/paludis/environments/paludis/use_conf.cc
@@ -51,7 +51,7 @@ namespace paludis
}
UseConf::UseConf(const PaludisEnvironment * const e) :
- PrivateImplementationPattern<UseConf>(new Implementation<UseConf>(e))
+ PrivateImplementationPattern<UseConf>(e)
{
}
diff --git a/paludis/environments/paludis/world.cc b/paludis/environments/paludis/world.cc
index 19f9ce435..06ed296d8 100644
--- a/paludis/environments/paludis/world.cc
+++ b/paludis/environments/paludis/world.cc
@@ -51,7 +51,7 @@ namespace paludis
}
World::World(const Environment * const e, const std::shared_ptr<const FSEntry> & f) :
- PrivateImplementationPattern<World>(new Implementation<World>(e, f))
+ PrivateImplementationPattern<World>(e, f)
{
}
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 11ff499ae..92c81c2a5 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -222,7 +222,7 @@ namespace
}
PortageEnvironment::PortageEnvironment(const std::string & s) :
- PrivateImplementationPattern<PortageEnvironment>(new Implementation<PortageEnvironment>(this, s)),
+ PrivateImplementationPattern<PortageEnvironment>(this, s),
_imp(PrivateImplementationPattern<PortageEnvironment>::_imp)
{
using namespace std::placeholders;
diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index 647a626d9..f62fc4e05 100644
--- a/paludis/environments/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -64,13 +64,13 @@ namespace paludis
}
TestEnvironment::TestEnvironment() :
- PrivateImplementationPattern<TestEnvironment>(new Implementation<TestEnvironment>(this, FSEntry("/"))),
+ PrivateImplementationPattern<TestEnvironment>(this, FSEntry("/")),
_imp(PrivateImplementationPattern<TestEnvironment>::_imp)
{
}
TestEnvironment::TestEnvironment(const FSEntry & r) :
- PrivateImplementationPattern<TestEnvironment>(new Implementation<TestEnvironment>(this, r)),
+ PrivateImplementationPattern<TestEnvironment>(this, r),
_imp(PrivateImplementationPattern<TestEnvironment>::_imp)
{
}