diff options
| author | randomdan <randomdan@localhost> | 2011-12-20 16:43:00 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2011-12-20 16:43:00 +0000 |
| commit | 2840c5f9dfb72a1756581f238d3476a0f96067f6 (patch) | |
| tree | db2f90928a07d789ae7686ca53bcb906819aacc5 | |
| parent | Pluggable file system row filters (diff) | |
| download | project2-2840c5f9dfb72a1756581f238d3476a0f96067f6.tar.bz2 project2-2840c5f9dfb72a1756581f238d3476a0f96067f6.tar.xz project2-2840c5f9dfb72a1756581f238d3476a0f96067f6.zip | |
Store options set name
Fix error in default CGI output options settings
| -rw-r--r-- | project2/cgi/cgiOutputOptions.cpp | 10 | ||||
| -rw-r--r-- | project2/common/options.cpp | 3 | ||||
| -rw-r--r-- | project2/common/options.h | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/project2/cgi/cgiOutputOptions.cpp b/project2/cgi/cgiOutputOptions.cpp index f9a6d86..e18a0b8 100644 --- a/project2/cgi/cgiOutputOptions.cpp +++ b/project2/cgi/cgiOutputOptions.cpp @@ -23,11 +23,11 @@ OutputOptionsLoader::OutputOptionsLoader() : { opts ("cgi.output.core", Options::value(&OutputOptions::core, true), "Core messages") - ("cgi.output.session", Options::value(&OutputOptions::core, true), "Session values") - ("cgi.output.timing", Options::value(&OutputOptions::core, true), "Timing") - ("cgi.output.environment", Options::value(&OutputOptions::core, true), "Environment") - ("cgi.output.url", Options::value(&OutputOptions::core, true), "URL breakdown") - ("cgi.output.parameters", Options::value(&OutputOptions::core, true), "Parameters") + ("cgi.output.session", Options::value(&OutputOptions::session, true), "Session values") + ("cgi.output.timing", Options::value(&OutputOptions::timing, true), "Timing") + ("cgi.output.environment", Options::value(&OutputOptions::environment, true), "Environment") + ("cgi.output.url", Options::value(&OutputOptions::url, true), "URL breakdown") + ("cgi.output.parameters", Options::value(&OutputOptions::parameters, true), "Parameters") ; } diff --git a/project2/common/options.cpp b/project2/common/options.cpp index 8ff7f55..767fb3b 100644 --- a/project2/common/options.cpp +++ b/project2/common/options.cpp @@ -68,7 +68,8 @@ class OptionAlias : public Options::Option { const NamedOption * target; }; -Options::Options(Glib::ustring const&) +Options::Options(Glib::ustring const & n) : + name(n) { } diff --git a/project2/common/options.h b/project2/common/options.h index 207848a..b4cbaf8 100644 --- a/project2/common/options.h +++ b/project2/common/options.h @@ -110,6 +110,9 @@ class Options { void reset() const; void consume(const Glib::ustring & name, const Glib::ustring & platform, const Glib::ustring & value) const; const Option * find(const Glib::ustring & name) const; + + const Glib::ustring name; + private: typedef std::list<OptionPtr> OptionList; OptionList options; |