| -rw-r--r-- | include/opkele/types.h | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/include/opkele/types.h b/include/opkele/types.h index ffb9afb..f63bf5d 100644 --- a/include/opkele/types.h +++ b/include/opkele/types.h @@ -120,5 +120,4 @@ namespace opkele { - class basic_openid_message { + class basic_fields { public: - typedef list<string> fields_t; typedef util::forward_iterator_proxy< @@ -127,7 +126,7 @@ namespace opkele { - basic_openid_message() { } - virtual ~basic_openid_message() { } - basic_openid_message(const basic_openid_message& x); - void copy_to(basic_openid_message& x) const; - void append_to(basic_openid_message& x) const; + basic_fields() { } + virtual ~basic_fields() { } + basic_fields(const basic_fields& x); + void copy_to(basic_fields& x) const; + void append_to(basic_fields& x) const; @@ -136,5 +135,2 @@ namespace opkele { - virtual bool has_ns(const string& uri) const; - virtual string get_ns(const string& uri) const; - virtual fields_iterator fields_begin() const = 0; @@ -142,5 +138,4 @@ namespace opkele { - virtual string append_query(const string& url,const char *pfx="openid.") const; - virtual string query_string(const char *pfx="openid.") const; - + virtual string append_query(const string& url,const char *pfx=0) const; + virtual string query_string(const char *pfx=0) const; @@ -150,2 +145,18 @@ namespace opkele { + }; + + class basic_openid_message : public basic_fields { + public: + + basic_openid_message() { } + basic_openid_message(const basic_openid_message& x); + + virtual bool has_ns(const string& uri) const; + virtual string get_ns(const string& uri) const; + + virtual string append_query(const string& url,const char *pfx="openid.") const { + return basic_fields::append_query(url,pfx); } + virtual string query_string(const char *pfx="openid.") const { + return basic_fields::query_string(pfx); } + virtual void from_keyvalues(const string& kv); @@ -166,4 +177,2 @@ namespace opkele { - void copy_to(basic_openid_message& x) const; - bool has_field(const string& n) const; |