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
@@ -27,6 +27,8 @@ $Id$
 
 #include <qmap.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kmdcodec.h>
 
 #include "vcard21parser.h"
@@ -45,7 +47,7 @@ bool VCardLineX::isValid() const
 
   // This is long but it makes it a bit faster (and saves me from using
   // a tree which is probably the ideal situation, but a bit memory heavy)
-  switch( name[0] ) {
+  switch( name[0].unicode() ) {
     case 'a':
       if ( name == VCARD_ADR && qualified &&
                    (qualifiers.contains(VCARD_ADR_DOM)    ||
@@ -269,7 +271,7 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
   addressee.setBirthday(VCardStringToDate(tmpStr));
 
   //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 ) {
       int type = 0;
       if ( (*i).qualified ) {
@@ -308,7 +310,7 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
   }
   addressee.makePhoneNumbersOLcompatible();
   //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 ) {
       int type = 0;
       if ( (*i).qualified ) {
@@ -327,7 +329,10 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
         if ( (*i).qualifiers.contains( VCARD_ADR_PREF ) )
           type |= Address::Pref;
       }
-      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 ) );
     }
   }
 
@@ -408,10 +413,10 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
   int _err = 0;
   int _state = VC_STATE_BEGIN;
 
-  QValueList<VCardLineX> *_vcdata;
-  QValueList<QString> lines;
+  Q3ValueList<VCardLineX> *_vcdata;
+  QStringList lines;
 
-  _vcdata = new QValueList<VCardLineX>;
+  _vcdata = new Q3ValueList<VCardLineX>;
 
   lines = QStringList::split( QRegExp( "[\x0d\x0a]" ), vc );
 
@@ -501,8 +506,8 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
         }
         _vcl.parameters = QStringList::split( ';', value, true );
         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() );
         }
       }
     } else {
@@ -543,7 +548,7 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
   return new VCard21ParserImpl( _vcdata );
 }
 
-VCard21ParserImpl::VCard21ParserImpl(QValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
+VCard21ParserImpl::VCard21ParserImpl(Q3ValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
 {
 }
 
@@ -554,7 +559,7 @@ QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifie
   const QString lowname = name.lower();
   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)) {
     if ((*i).parameters.count() > 0)
      return (*i).parameters[0];
@@ -570,7 +575,7 @@ QString VCard21ParserImpl::getValue(const QString& name)
   QString failed;
   const QString lowname = name.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) {
       if ((*i).parameters.count() > 0)
         return (*i).parameters[0];
@@ -584,9 +589,10 @@ QString VCard21ParserImpl::getValue(const QString& name)
 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 );
+    }
   }
   // failed.
   return QStringList();
@@ -596,9 +602,9 @@ QStringList VCard21ParserImpl::getValues(const QString& name, const QString& qua
 {
   const QString lowname = name.lower();
   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 );
   }
   // failed.
   return QStringList();