Reference counting and smart pointers.

1 files changed, 25 insertions, 25 deletions

diff --git a/tests/parser/headerTest.cpp b/tests/parser/headerTest.cpp
index 4ee5b443..83f0409e 100644
--- a/tests/parser/headerTest.cpp
+++ b/tests/parser/headerTest.cpp
@@ -68,10 +68,10 @@ namespace
 			vmime::header hdr;
 			hdr.parse("");
 
-			vmime::headerField* hf = vmime::headerFieldFactory::getInstance()->create("A", "a");
+			vmime::ref <vmime::headerField> hf = vmime::headerFieldFactory::getInstance()->create("A", "a");
 			hdr.appendField(hf);
 
-			std::vector <vmime::headerField*> res = hdr.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(1), res.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res[0]));
@@ -82,10 +82,10 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a\r\n");
 
-			vmime::headerField* hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
+			vmime::ref <vmime::headerField> hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
 			hdr.appendField(hf);
 
-			std::vector <vmime::headerField*> res = hdr.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(2), res.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res[0]));
@@ -98,10 +98,10 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a\r\nC: c\r\n");
 
-			vmime::headerField* hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
+			vmime::ref <vmime::headerField> hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
 			hdr.insertFieldBefore(hdr.getField("C"), hf);
 
-			std::vector <vmime::headerField*> res = hdr.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(3), res.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res[0]));
@@ -114,10 +114,10 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a\r\nC: c\r\n");
 
-			vmime::headerField* hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
+			vmime::ref <vmime::headerField> hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
 			hdr.insertFieldBefore(1, hf);
 
-			std::vector <vmime::headerField*> res = hdr.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(3), res.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res[0]));
@@ -131,10 +131,10 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a\r\nC: c\r\n");
 
-			vmime::headerField* hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
+			vmime::ref <vmime::headerField> hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
 			hdr.insertFieldAfter(hdr.getField("A"), hf);
 
-			std::vector <vmime::headerField*> res = hdr.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(3), res.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res[0]));
@@ -147,10 +147,10 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a\r\nC: c\r\n");
 
-			vmime::headerField* hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
+			vmime::ref <vmime::headerField> hf = vmime::headerFieldFactory::getInstance()->create("B", "b");
 			hdr.insertFieldAfter(0, hf);
 
-			std::vector <vmime::headerField*> res = hdr.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(3), res.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res[0]));
@@ -168,13 +168,13 @@ namespace
 			hdr1.removeField(hdr1.getField("B"));
 			hdr2.removeField(1);
 
-			std::vector <vmime::headerField*> res1 = hdr1.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res1 = hdr1.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(2), res1.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res1[0]));
 			assert_eq("Second value", "C: c", headerTest::getFieldValue(*res1[1]));
 
-			std::vector <vmime::headerField*> res2 = hdr2.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res2 = hdr2.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(2), res2.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res2[0]));
@@ -190,10 +190,10 @@ namespace
 			hdr1.removeField(hdr1.getField("A"));
 			hdr2.removeField(0);
 
-			std::vector <vmime::headerField*> res1 = hdr1.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res1 = hdr1.getFieldList();
 			assert_eq("Count", static_cast <unsigned int>(0), res1.size());
 
-			std::vector <vmime::headerField*> res2 = hdr2.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res2 = hdr2.getFieldList();
 			assert_eq("Count", static_cast <unsigned int>(0), res2.size());
 		}
 
@@ -207,10 +207,10 @@ namespace
 			hdr1.removeAllFields();
 			hdr2.removeAllFields();
 
-			std::vector <vmime::headerField*> res1 = hdr1.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res1 = hdr1.getFieldList();
 			assert_eq("Count", static_cast <unsigned int>(0), res1.size());
 
-			std::vector <vmime::headerField*> res2 = hdr2.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res2 = hdr2.getFieldList();
 			assert_eq("Count", static_cast <unsigned int>(0), res2.size());
 		}
 
@@ -246,7 +246,7 @@ namespace
 			vmime::header hdr;
 			hdr.parse("B: b\r\nA: a\r\nC: c\r\n");
 
-			vmime::headerField* res = hdr.getFieldAt(2);
+			vmime::ref <vmime::headerField> res = hdr.getFieldAt(2);
 
 			assert_eq("Value", "C: c", getFieldValue(*res));
 		}
@@ -257,7 +257,7 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a\r\nB: b1\r\nC: c\r\nB: b2\r\n");
 
-			std::vector <vmime::headerField*> res = hdr.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(4), res.size());
 			assert_eq("First value", "A: a", headerTest::getFieldValue(*res[0]));
@@ -271,7 +271,7 @@ namespace
 			vmime::header hdr;
 			hdr.parse("\r\n");
 
-			std::vector <vmime::headerField*> res = hdr.getFieldList();
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.getFieldList();
 
 			assert_eq("Count", static_cast <unsigned int>(0), res.size());
 		}
@@ -282,7 +282,7 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a\r\nB: b\r\nC: c\r\nB: d\r\n");
 
-			vmime::headerField* res = hdr.findField("B");
+			vmime::ref <vmime::headerField> res = hdr.findField("B");
 
 			assert_eq("Value", "B: b", getFieldValue(*res));
 		}
@@ -293,7 +293,7 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a1\nC: c1\n");
 
-			std::vector <vmime::headerField*> res = hdr.findAllFields("B");
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.findAllFields("B");
 
 			assert_eq("Count", static_cast <unsigned int>(0), res.size());
 		}
@@ -303,7 +303,7 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a1\nB: b1\nB: b2\nC: c1\n");
 
-			std::vector <vmime::headerField*> res = hdr.findAllFields("B");
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.findAllFields("B");
 
 			assert_eq("Count", static_cast <unsigned int>(2), res.size());
 			assert_eq("First value", "B: b1", headerTest::getFieldValue(*res[0]));
@@ -315,7 +315,7 @@ namespace
 			vmime::header hdr;
 			hdr.parse("A: a1\nB: b1\nB: b2\nC: c1\nC: c3\nC: c2\n");
 
-			std::vector <vmime::headerField*> res = hdr.findAllFields("C");
+			std::vector <vmime::ref <vmime::headerField> > res = hdr.findAllFields("C");
 
 			assert_eq("Count", static_cast <unsigned int>(3), res.size());
 			assert_eq("First value", "C: c1", headerTest::getFieldValue(*res[0]));