1 files changed, 9 insertions, 13 deletions

diff --git a/include/opkele/types.h b/include/opkele/types.h
index bf50e2b..f63bf5d 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -119,5 +119,5 @@ namespace opkele {
     typedef tr1mem::shared_ptr<association_t> assoc_t;
 
-    class basic_message {
+    class basic_fields {
         public:
             typedef util::forward_iterator_proxy<
@@ -125,9 +125,9 @@ namespace opkele {
                 > fields_iterator;
 
-            basic_message() { }
-            virtual ~basic_message() { }
-            basic_message(const basic_message& x);
-            void copy_to(basic_message& x) const;
-            void append_to(basic_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;
 
             virtual bool has_field(const string& n) const = 0;
@@ -146,10 +146,6 @@ namespace opkele {
     };
 
-    class basic_openid_message : public basic_message {
+    class basic_openid_message : public basic_fields {
         public:
-            typedef list<string> fields_t;
-            typedef util::forward_iterator_proxy<
-                string,const string&,const string*
-                > fields_iterator;
 
             basic_openid_message() { }
@@ -160,7 +156,7 @@ namespace opkele {
 
             virtual string append_query(const string& url,const char *pfx="openid.") const {
-                return basic_message::append_query(url,pfx); }
+                return basic_fields::append_query(url,pfx); }
             virtual string query_string(const char *pfx="openid.") const {
-                return basic_message::query_string(pfx); }
+                return basic_fields::query_string(pfx); }
 
             virtual void from_keyvalues(const string& kv);