Refactoring (see ChangeLog).

1 files changed, 37 insertions, 10 deletions

diff --git a/src/disposition.cpp b/src/disposition.cpp
index 7f8962f0..dd4a59b8 100644
--- a/src/disposition.cpp
+++ b/src/disposition.cpp
@@ -18,6 +18,7 @@
 //
 
 #include "disposition.hpp"
+#include "utility/stringUtils.hpp"
 
 
 namespace vmime
@@ -31,7 +32,7 @@ disposition::disposition()
 
 
 disposition::disposition(const string& name)
-	: m_name(toLower(name))
+	: m_name(stringUtils::toLower(name))
 {
 }
 
@@ -45,7 +46,7 @@ disposition::disposition(const disposition& type)
 void disposition::parse(const string& buffer, const string::size_type position,
 	const string::size_type end, string::size_type* newPosition)
 {
-	m_name = toLower(string(buffer.begin() + position, buffer.begin() + end));
+	m_name = stringUtils::toLower(string(buffer.begin() + position, buffer.begin() + end));
 
 	if (newPosition)
 		*newPosition = end;
@@ -62,29 +63,55 @@ void disposition::generate(utility::outputStream& os, const string::size_type /*
 }
 
 
-disposition& disposition::operator=(const disposition& source)
+disposition& disposition::operator=(const string& name)
 {
-	m_name = source.m_name;
+	m_name = stringUtils::toLower(name);
 	return (*this);
 }
 
 
-disposition& disposition::operator=(const string& name)
+const bool disposition::operator==(const disposition& value) const
+{
+	return (stringUtils::toLower(m_name) == value.m_name);
+}
+
+
+const bool disposition::operator!=(const disposition& value) const
+{
+	return !(*this == value);
+}
+
+
+disposition* disposition::clone() const
 {
-	m_name = toLower(name);
+	return new disposition(*this);
+}
+
+
+void disposition::copyFrom(const component& other)
+{
+	const disposition& d = dynamic_cast <const disposition&>(other);
+
+	m_name = d.m_name;
+}
+
+
+disposition& disposition::operator=(const disposition& other)
+{
+	copyFrom(other);
 	return (*this);
 }
 
 
-const bool disposition::operator==(const disposition& value) const
+const string& disposition::getName() const
 {
-	return (toLower(m_name) == value.m_name);
+	return (m_name);
 }
 
 
-const bool disposition::operator!=(const disposition& value) const
+void disposition::setName(const string& name)
 {
-	return !(*this == value);
+	m_name = name;
 }