1 files changed, 15 insertions, 28 deletions
diff --git a/src/contentDispositionField.hpp b/src/contentDispositionField.hpp
index d0cf0b88..38a7caa2 100644
--- a/src/contentDispositionField.hpp
+++ b/src/contentDispositionField.hpp
@@ -22,54 +22,41 @@
 
 
 #include "parameterizedHeaderField.hpp"
-#include "disposition.hpp"
+#include "genericField.hpp"
 
-#include "dateParameter.hpp"
-#include "textParameter.hpp"
+#include "disposition.hpp"
+#include "dateTime.hpp"
 
 
 namespace vmime
 {
 
 
-class contentDispositionField : public parameterizedHeaderField
+class contentDispositionField : public parameterizedHeaderField, public genericField <disposition>
 {
 	friend class headerFieldFactory::registerer <contentDispositionField>;
 
 protected:
 
 	contentDispositionField();
+	contentDispositionField(contentDispositionField&);
 
 public:
 
-	void copyFrom(const headerField& field);
-
-	contentDispositionField& operator=(const disposition& type);
-
-	const disposition& value() const { return (m_value); }
-	disposition& value() { return (m_value); }
-
-	const datetime& creationDate() const { return (dynamic_cast<const dateParameter&>(parameters.find("creation-date")).value()); }
-	datetime& creationDate() { return (dynamic_cast<dateParameter&>(parameters.get("creation-date")).value()); }
+	const datetime& getCreationDate() const;
+	void setCreationDate(const datetime& creationDate);
 
-	const datetime& modificationDate() const { return (dynamic_cast<const dateParameter&>(parameters.find("modification-date")).value()); }
-	datetime& modificationDate() { return (dynamic_cast<dateParameter&>(parameters.get("modification-date")).value()); }
+	const datetime& getModificationDate() const;
+	void setModificationDate(const datetime& modificationDate);
 
-	const datetime& readDate() const { return (dynamic_cast<const dateParameter&>(parameters.find("read-date")).value()); }
-	datetime& readDate() { return (dynamic_cast<dateParameter&>(parameters.get("read-date")).value()); }
-
-	const string& filename() const { return (dynamic_cast<const textParameter&>(parameters.find("filename")).value()); }
-	string& filename() { return (dynamic_cast<textParameter&>(parameters.get("filename")).value()); }
-
-	const string& size() const { return (dynamic_cast<const textParameter&>(parameters.find("size")).value()); }
-	string& size() { return (dynamic_cast<textParameter&>(parameters.get("size")).value()); }
-
-protected:
+	const datetime& getReadDate() const;
+	void setReadDate(const datetime& readDate);
 
-	disposition m_value;
+	const string getFilename() const;
+	void setFilename(const string& filename);
 
-	void parseValue(const string& buffer, const string::size_type position, const string::size_type end);
-	const string generateValue() const;
+	const string getSize() const;
+	void setSize(const string& size);
 };