summaryrefslogtreecommitdiff
path: root/project2/cgi
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2012-03-28 00:45:18 +0000
committerrandomdan <randomdan@localhost>2012-03-28 00:45:18 +0000
commit45f9da26f630df987c59c8b04ce1339874efc081 (patch)
treefab37e5dbbfcf23c69b85b4b4151d14e1b87447e /project2/cgi
parentA generic variadic template loader (diff)
downloadproject2-45f9da26f630df987c59c8b04ce1339874efc081.tar.bz2
project2-45f9da26f630df987c59c8b04ce1339874efc081.tar.xz
project2-45f9da26f630df987c59c8b04ce1339874efc081.zip
Remove lots of specific implementations and replace them with our new generic loader
Diffstat (limited to 'project2/cgi')
-rw-r--r--project2/cgi/cgiAppEngine.cpp2
-rw-r--r--project2/cgi/cgiOutputOptions.cpp2
-rw-r--r--project2/cgi/cgiOutputOptions.h2
-rw-r--r--project2/cgi/cgiStagePresent.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index a503f3d..c7ee3e6 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -18,7 +18,7 @@ SimpleMessageException(UnknownDomain);
CgiApplicationEngine::CgiApplicationEngine(const CgiEnvironment * e, std::ostream & io) :
_env(e),
- sessionsContainer(LoaderBase::getLoader<SessionContainerLoader, NotSupported>(e->sessionModule)->open()),
+ sessionsContainer(SessionContainerLoader::getFor(e->sessionModule)->create()),
IO(io),
outputCachingActive(false)
{
diff --git a/project2/cgi/cgiOutputOptions.cpp b/project2/cgi/cgiOutputOptions.cpp
index e18a0b8..ba4d621 100644
--- a/project2/cgi/cgiOutputOptions.cpp
+++ b/project2/cgi/cgiOutputOptions.cpp
@@ -32,7 +32,7 @@ OutputOptionsLoader::OutputOptionsLoader() :
}
OutputOptionsPtr
-OutputOptionsLoader::createFrom(ScriptNodePtr e) const {
+OutputOptionsLoader::create(ScriptNodePtr e) const {
return new OutputOptions(e);
}
diff --git a/project2/cgi/cgiOutputOptions.h b/project2/cgi/cgiOutputOptions.h
index 4a4f1c8..faace67 100644
--- a/project2/cgi/cgiOutputOptions.h
+++ b/project2/cgi/cgiOutputOptions.h
@@ -31,7 +31,7 @@ typedef boost::intrusive_ptr<OutputOptions> OutputOptionsPtr;
class OutputOptionsLoader : public ComponentLoader {
public:
OutputOptionsLoader();
- OutputOptionsPtr createFrom(ScriptNodePtr e) const;
+ OutputOptionsPtr create(ScriptNodePtr e) const;
const Options * options() const;
private:
diff --git a/project2/cgi/cgiStagePresent.cpp b/project2/cgi/cgiStagePresent.cpp
index 9c7ab7f..98031e4 100644
--- a/project2/cgi/cgiStagePresent.cpp
+++ b/project2/cgi/cgiStagePresent.cpp
@@ -52,7 +52,7 @@ MultiRowSetPresenterPtr
CgiApplicationEngine::PresentStage::getPresenter() const
{
if (!presenter) {
- presenter = LoaderBase::getLoader<PresenterLoader, NotSupported>(env()->defaultPresenter)->createFrom(root);
+ presenter = PresenterLoader::getFor(env()->defaultPresenter)->create(root);
}
return presenter;
}