3 files changed, 51 insertions, 6 deletions

diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 6fa1a8f..0fb5b5d 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -23,119 +23,144 @@
 
 #include <qcstring.h>
 #include <qstrlist.h>
 #include <qregexp.h>
 
 #include <kdebug.h>
 
 #include <VCardAdrParam.h>
 #include <VCardAgentParam.h>
 #include <VCardDateParam.h>
 #include <VCardEmailParam.h>
 #include <VCardImageParam.h>
 #include <VCardSourceParam.h>
 #include <VCardTelParam.h>
 #include <VCardTextBinParam.h>
 #include <VCardTextParam.h>
 
 #include <VCardAdrValue.h>
 #include <VCardAgentValue.h>
 #include <VCardDateValue.h>
 #include <VCardImageValue.h>
 #include <VCardTextValue.h>
 #include <VCardTextBinValue.h>
 #include <VCardLangValue.h>
 #include <VCardNValue.h>
 #include <VCardURIValue.h>
 #include <VCardSoundValue.h>
 #include <VCardClassValue.h>
 #include <VCardFloatValue.h>
 #include <VCardOrgValue.h>
 #include <VCardTelValue.h>
 #include <VCardTextListValue.h>
 #include <VCardUTCValue.h>
 #include <VCardGeoValue.h>
 
 #include <VCardRToken.h>
 #include <VCardContentLine.h>
 
 #include <VCardEntity.h>
 #include <VCardEnum.h>
 #include <VCardDefines.h>
 
 using namespace VCARD;
 
 ContentLine::ContentLine()
 	:	Entity(),
 		value_(0)
 {
+  paramList_.setAutoDelete( TRUE );
 }
 
 ContentLine::ContentLine(const ContentLine & x)
 	:	Entity(x),
                 group_ (x.group_),
                 name_ (x.name_),
-		paramList_(x.paramList_),
-		value_(x.value_->clone())
+/*US		paramList_(x.paramList_),*/
+		value_(x.value_->clone()),
+		paramType_(x.paramType_),
+		valueType_(x.valueType_),
+		entityType_(x.entityType_)
 {
+  paramList_.setAutoDelete( TRUE );
+
+
+  ParamListIterator it(x.paramList_);
+  for (; it.current(); ++it)
+  {
+    Param *p = new Param;
+	p->setName( it.current()->name() );
+	p->setValue( it.current()->value() );
+    paramList_.append(p);
+  }
+
 }
 
 ContentLine::ContentLine(const QCString & s)
 	:	Entity(s),
 		value_(0)
 {
+  paramList_.setAutoDelete( TRUE );
 }
 
 	ContentLine &
 ContentLine::operator = (ContentLine & x)
 {
 	if (*this == x) return *this;
 	
-	paramList_ = x.paramList();
+    ParamListIterator it(x.paramList_);
+    for (; it.current(); ++it)
+    {
+      Param *p = new Param;
+      p->setName( it.current()->name() );
+      p->setValue( it.current()->value() );
+      paramList_.append(p);
+    }
+
 	value_ = x.value_->clone();
 
 	Entity::operator = (x);
 	return *this;
 }
 
 	ContentLine &
 ContentLine::operator = (const QCString & s)
 {
 	Entity::operator = (s);
 	delete value_;
 	value_ = 0;
 	return *this;
 }
 
 	bool
 ContentLine::operator == (ContentLine & x)
 {
 	x.parse();
 	
 	QPtrListIterator<Param> it(x.paramList());
 	
 	if (!paramList_.find(it.current()))
 		return false;
 
 	return true;
 }
 
 ContentLine::~ContentLine()
 {
 	delete value_;
 	value_ = 0;
 }
 
 	void
 ContentLine::_parse()
 {
 	vDebug("parse");
 	
 	// Unqote newlines
 	strRep_ = strRep_.replace( QRegExp( "\\\\n" ), "\n" );
 	
 	int split = strRep_.find(':');
 	
 	if (split == -1) { // invalid content line
 		vDebug("No ':'");
 		return;
 	}
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index 0c21e2f..0cd2086 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -1,91 +1,94 @@
 /*
 	libvcard - vCard parsing library for vCard version 3.0
 
 	Copyright (C) 1998 Rik Hemsley rik@kde.org
 	
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to
   deal in the Software without restriction, including without limitation the
   rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   sell copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <qregexp.h>
 
 #include <VCardDefines.h>
 #include <VCardVCardEntity.h>
 
 using namespace VCARD;
 
 VCardEntity::VCardEntity()
 	:	Entity()
 {
+  cardList_.setAutoDelete( TRUE );
 }
 
 VCardEntity::VCardEntity(const VCardEntity & x)
 	:	Entity(x)
 {
+  cardList_.setAutoDelete( TRUE );
 }
 
 VCardEntity::VCardEntity(const QCString & s)
 	:	Entity(s)
 {
+  cardList_.setAutoDelete( TRUE );
 }
 
 	VCardEntity &
 VCardEntity::operator = (VCardEntity & x)
 {
 	if (*this == x) return *this;
 
 	Entity::operator = (x);
 	return *this;
 }
 
 	VCardEntity &
 VCardEntity::operator = (const QCString & s)
 {
 	Entity::operator = (s);
 	return *this;
 }
 
 	bool
 VCardEntity::operator == (VCardEntity & x)
 {
 	x.parse();
 	return false;
 }
 
 VCardEntity::~VCardEntity()
 {
 }
 
 	void
 VCardEntity::_parse()
 {
 	vDebug("parse");
 	QCString s(strRep_);
 	
 	int i = s.find(QRegExp("BEGIN:VCARD", false));
 	
 	while (i != -1) {
 		
 		i = s.find(QRegExp("BEGIN:VCARD", false), 11);
 		
 		QCString cardStr(s.left(i));
 		
 		VCard * v = new VCard(cardStr);
 		
 		cardList_.append(v);
 		
 		v->parse();
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp
index 8d271f4..3f0a5e5 100644
--- a/kabc/vcard/VCardv.cpp
+++ b/kabc/vcard/VCardv.cpp
@@ -1,107 +1,124 @@
 /*
 	libvcard - vCard parsing library for vCard version 3.0
 
 	Copyright (C) 1998 Rik Hemsley rik@kde.org
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to
   deal in the Software without restriction, including without limitation the
   rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
   sell copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
 
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
   AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
   ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
   WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <qcstring.h>
 #include <qstrlist.h>
 
 #include <VCardEntity.h>
 #include <VCardVCard.h>
 #include <VCardContentLine.h>
 #include <VCardRToken.h>
 
 #include <VCardDefines.h>
 
 using namespace VCARD;
 
 VCard::VCard()
 	:	Entity()
 {
+  contentLineList_.setAutoDelete( TRUE );
 }
 
 VCard::VCard(const VCard & x)
 	:	Entity(x),
-		group_(x.group_),
-		contentLineList_(x.contentLineList_)
+		group_(x.group_)
 {
+  contentLineList_.setAutoDelete( TRUE );
+  //US
+	qDebug("VCard::VCard");
+
+  QPtrListIterator<ContentLine> it(x.contentLineList_);
+  for (; it.current(); ++it) {
+    ContentLine * c = new ContentLine(*it.current());
+    contentLineList_.append(c);
+  }
+
 }
 
 VCard::VCard(const QCString & s)
 	:	Entity(s)
 {
+  contentLineList_.setAutoDelete( TRUE );
 }
 
 	VCard &
 VCard::operator = (VCard & x)
 {
+  //US
+	qDebug("VCard::operator =");
 	if (*this == x) return *this;
 
 	group_				= x.group();
-	contentLineList_	= x.contentLineList_;
+    QPtrListIterator<ContentLine> it(x.contentLineList_);
+    for (; it.current(); ++it) {
+      ContentLine * c = new ContentLine(*it.current());
+      contentLineList_.append(c);
+    }
 
 	Entity::operator = (x);
 	return *this;
 }
 
 	VCard &
 VCard::operator = (const QCString & s)
 {
 	Entity::operator = (s);
 	return *this;
 }
 
 	bool
 VCard::operator == (VCard & x)
 {
 	x.parse();
 	return false;
 }
 
 VCard::~VCard()
 {
 }
 
 	void
 VCard::_parse()
 {
 	vDebug("parse() called");
 	QStrList l;
 
 	RTokenise(strRep_, "\r\n", l);
 
 	if (l.count() < 3) { // Invalid VCARD !
 		vDebug("Invalid vcard");
 		return;
 	}
 
 	// Get the first line
 	QCString beginLine = QCString(l.at(0)).stripWhiteSpace();
 
 	vDebug("Begin line == \"" + beginLine + "\"");
 
 	// Remove extra blank lines
 	while (QCString(l.last()).isEmpty())
 		l.remove(l.last());
 
 	// Now we know this is the last line
 	QCString endLine = l.last();