1 files changed, 23 insertions, 17 deletions

diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index 60d02b8..e24a9dc 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -29,2 +29,4 @@ $Id$
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kmdcodec.h>
@@ -47,3 +49,3 @@ bool VCardLineX::isValid() const
   // a tree which is probably the ideal situation, but a bit memory heavy)
-  switch( name[0] ) {
+  switch( name[0].unicode() ) {
     case 'a':
@@ -271,3 +273,3 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
   //set the addressee's phone numbers
-  for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
+  for ( Q3ValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
     if ( (*i).name == VCARD_TEL ) {
@@ -310,3 +312,3 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
   //set the addressee's addresses
-  for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
+  for ( Q3ValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
     if ( (*i).name == VCARD_ADR ) {
@@ -329,3 +331,6 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
       }
-      addressee.insertAddress( readAddressFromQStringList( (*i).parameters, type ) );
+      QStringList tmp;
+      for(Q3ValueList<QString>::const_iterator ii=(*i).parameters.begin();ii!=(*i).parameters.end();++ii)
+          tmp.push_back(*ii);
+      addressee.insertAddress( readAddressFromQStringList( tmp, type ) );
     }
@@ -410,6 +415,6 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
 
-  QValueList<VCardLineX> *_vcdata;
-  QValueList<QString> lines;
+  Q3ValueList<VCardLineX> *_vcdata;
+  QStringList lines;
 
-  _vcdata = new QValueList<VCardLineX>;
+  _vcdata = new Q3ValueList<VCardLineX>;
 
@@ -503,4 +508,4 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
         if ( qp ) { // decode the quoted printable
-          for ( QStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
-            *z = KCodecs::quotedPrintableDecode( (*z).latin1() );
+          for ( QLinkedList<QString>::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
+            *z = KCodecs::quotedPrintableDecode( (Q3CString)(*z).latin1() );
         }
@@ -545,3 +550,3 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
 
-VCard21ParserImpl::VCard21ParserImpl(QValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
+VCard21ParserImpl::VCard21ParserImpl(Q3ValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
 {
@@ -556,3 +561,3 @@ QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifie
 
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
    if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier)) {
@@ -572,3 +577,3 @@ QString VCard21ParserImpl::getValue(const QString& name)
 
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
     if ((*i).name == lowname && !(*i).qualified) {
@@ -586,5 +591,6 @@ QStringList VCard21ParserImpl::getValues(const QString& name)
   const QString lowname = name.lower();
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
-    if ((*i).name == lowname && !(*i).qualified)
-      return (*i).parameters;
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+    if ((*i).name == lowname && !(*i).qualified) {
+      return QStringList( (*i).parameters );
+    }
   }
@@ -598,5 +604,5 @@ QStringList VCard21ParserImpl::getValues(const QString& name, const QString& qua
   const QString lowqualifier = qualifier.lower();
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
     if ((*i).name == lowname && (*i).qualified && (*i).qualifiers.contains(lowqualifier))
-       return (*i).parameters;
+       return QStringList( (*i).parameters );
   }