aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Richard <[email protected]>2014-06-06 17:26:01 +0000
committerVincent Richard <[email protected]>2014-06-06 17:26:01 +0000
commit4aefcca37493a337522a7fdd120b4aa2189372ef (patch)
treeb8808c9215a207e6309e196f1acd5fc8f5bec191
parentFixed parsing of empty lines in header field value. (diff)
downloadvmime-4aefcca37493a337522a7fdd120b4aa2189372ef.tar.gz
vmime-4aefcca37493a337522a7fdd120b4aa2189372ef.zip
Removed useless 'virtual' inheritance (fixed issue #84).
-rw-r--r--src/vmime/contentDispositionField.cpp2
-rw-r--r--src/vmime/contentTypeField.cpp2
-rw-r--r--src/vmime/parameterizedHeaderField.hpp2
-rw-r--r--tests/parser/parameterTest.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/vmime/contentDispositionField.cpp b/src/vmime/contentDispositionField.cpp
index 2331b606..efa99b4e 100644
--- a/src/vmime/contentDispositionField.cpp
+++ b/src/vmime/contentDispositionField.cpp
@@ -35,7 +35,7 @@ contentDispositionField::contentDispositionField()
contentDispositionField::contentDispositionField(contentDispositionField&)
- : headerField(), parameterizedHeaderField()
+ : parameterizedHeaderField()
{
}
diff --git a/src/vmime/contentTypeField.cpp b/src/vmime/contentTypeField.cpp
index e15608cc..9e9ed4c2 100644
--- a/src/vmime/contentTypeField.cpp
+++ b/src/vmime/contentTypeField.cpp
@@ -35,7 +35,7 @@ contentTypeField::contentTypeField()
contentTypeField::contentTypeField(contentTypeField&)
- : headerField(), parameterizedHeaderField()
+ : parameterizedHeaderField()
{
}
diff --git a/src/vmime/parameterizedHeaderField.hpp b/src/vmime/parameterizedHeaderField.hpp
index 509506a9..526e8bcb 100644
--- a/src/vmime/parameterizedHeaderField.hpp
+++ b/src/vmime/parameterizedHeaderField.hpp
@@ -39,7 +39,7 @@ namespace vmime
* Parameters can be created using vmime::parameterFactory.
*/
-class VMIME_EXPORT parameterizedHeaderField : virtual public headerField
+class VMIME_EXPORT parameterizedHeaderField : public headerField
{
friend class headerFieldFactory;
diff --git a/tests/parser/parameterTest.cpp b/tests/parser/parameterTest.cpp
index 4f6f8677..2edfabbe 100644
--- a/tests/parser/parameterTest.cpp
+++ b/tests/parser/parameterTest.cpp
@@ -48,8 +48,8 @@ VMIME_TEST_SUITE_BEGIN(parameterTest)
public:
parameterizedHeaderField()
- : headerField("F")
{
+ setName("F");
setValue(vmime::headerFieldFactory::getInstance()->createValue(getName()));
setValue(vmime::word("X"));
}