| -rw-r--r-- | kabc/vcard/VCardv.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp index bad2ef1..5dd675d 100644 --- a/kabc/vcard/VCardv.cpp +++ b/kabc/vcard/VCardv.cpp @@ -22,9 +22,9 @@ */ -#include <qcstring.h> -#include <qstrlist.h> +#include <q3cstring.h> +#include <q3strlist.h> #include <qstringlist.h> #include <qstring.h> -#include <qvaluelist.h> +#include <q3valuelist.h> #include <VCardEntity.h> @@ -49,5 +49,5 @@ VCard::VCard(const VCard & x) contentLineList_.setAutoDelete( TRUE ); - QPtrListIterator<ContentLine> it(x.contentLineList_); + Q3PtrListIterator<ContentLine> it(x.contentLineList_); for (; it.current(); ++it) { ContentLine * c = new ContentLine(*it.current()); @@ -57,5 +57,5 @@ VCard::VCard(const VCard & x) } -VCard::VCard(const QCString & s) +VCard::VCard(const Q3CString & s) : Entity(s) { @@ -69,5 +69,5 @@ VCard::operator = (VCard & x) group_ = x.group(); - QPtrListIterator<ContentLine> it(x.contentLineList_); + Q3PtrListIterator<ContentLine> it(x.contentLineList_); for (; it.current(); ++it) { ContentLine * c = new ContentLine(*it.current()); @@ -80,5 +80,5 @@ VCard::operator = (VCard & x) VCard & -VCard::operator = (const QCString & s) +VCard::operator = (const Q3CString & s) { Entity::operator = (s); @@ -102,5 +102,5 @@ VCard::_parse() QStringList l; - QStrList sl; + Q3StrList sl; RTokenise(strRep_, "\r\n", sl); @@ -110,5 +110,6 @@ VCard::_parse() return; } - l = QStringList::fromStrList( sl ); + for(Q3StrList::iterator i=sl.begin();i!=sl.end();++i) + l.push_back(*i); // Get the first line QString beginLine = l[0].stripWhiteSpace(); @@ -181,5 +182,5 @@ VCard::_parse() QStringList::Iterator it2 = refolded.begin(); for (; it2 != refolded.end(); ++it2) { - ContentLine * cl = new ContentLine(QCString((*it2).latin1())); + ContentLine * cl = new ContentLine(Q3CString((*it2).latin1())); cl->parse(); if (cl->value() == 0) @@ -229,5 +230,5 @@ VCard::_assemble() strRep_ += "VERSION:3.0\r\n"; - QPtrListIterator<ContentLine> it(contentLineList_); + Q3PtrListIterator<ContentLine> it(contentLineList_); for (; it.current(); ++it) @@ -245,5 +246,5 @@ VCard::has(EntityType t) bool -VCard::has(const QCString & s) +VCard::has(const Q3CString & s) { parse(); @@ -260,5 +261,5 @@ VCard::add(const ContentLine & cl) void -VCard::add(const QCString & s) +VCard::add(const Q3CString & s) { parse(); @@ -271,5 +272,5 @@ VCard::contentLine(EntityType t) { parse(); - QPtrListIterator<ContentLine> it(contentLineList_); + Q3PtrListIterator<ContentLine> it(contentLineList_); for (; it.current(); ++it) @@ -281,8 +282,8 @@ VCard::contentLine(EntityType t) ContentLine * -VCard::contentLine(const QCString & s) +VCard::contentLine(const Q3CString & s) { parse(); - QPtrListIterator<ContentLine> it(contentLineList_); + Q3PtrListIterator<ContentLine> it(contentLineList_); for (; it.current(); ++it) |