169 files changed, 967 insertions, 732 deletions

diff --git a/kabc/address.h b/kabc/address.h
index 38ad20b..41794fe 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -11,86 +11,86 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_ADDRESS_H
 #define KABC_ADDRESS_H
 
 #include <qmap.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 // template tags for address formatting localization
 #define KABC_FMTTAG_realname   QString("%n")
 #define KABC_FMTTAG_REALNAME   QString("%N")
 #define KABC_FMTTAG_company    QString("%cm")
 #define KABC_FMTTAG_COMPANY    QString("%CM")
 #define KABC_FMTTAG_pobox      QString("%p")
 #define KABC_FMTTAG_street     QString("%s")
 #define KABC_FMTTAG_STREET     QString("%S")
 #define KABC_FMTTAG_zipcode    QString("%z")
 #define KABC_FMTTAG_location   QString("%l")
 #define KABC_FMTTAG_LOCATION   QString("%L")
 #define KABC_FMTTAG_region     QString("%r")
 #define KABC_FMTTAG_REGION     QString("%R")
 #define KABC_FMTTAG_newline    QString("\\n")
 #define KABC_FMTTAG_condcomma  QString("%,")
 #define KABC_FMTTAG_condwhite  QString("%w")
 #define KABC_FMTTAG_purgeempty QString("%0")
 
 namespace KABC {
 
 /**
   @short Postal address information.
   
   This class represents information about a postal address.
 */
 class Address
 {
     friend QDataStream &operator<<( QDataStream &, const Address & );
     friend QDataStream &operator>>( QDataStream &, Address & );
 
   public:
     /**
       List of addresses.
     */
-    typedef QValueList<Address> List;
-    typedef QValueList<int> TypeList;
+    typedef Q3ValueList<Address> List;
+    typedef Q3ValueList<int> TypeList;
   
     /**
       Address types:
      
       @li @p Dom -    domestic
       @li @p Intl -   international
       @li @p Postal - postal
       @li @p Parcel - parcel
       @li @p Home -   home address
       @li @p Work -   address at work
       @li @p Pref -   preferred address
     */
     enum Type { Dom = 1, Intl = 2, Postal = 4, Parcel = 8, Home = 16, Work = 32,
            Pref = 64 };
 
     /**
       Constructor that creates an empty Address, which is initialized
       with a unique id (see @ref id()).
     */
     Address();
   
     /**
       This is like @ref Address() just above, with the difference
       that you can specify the type.
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index fe59fcb..c700897 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -16,50 +16,50 @@
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 /*US
 
 #include <qfile.h>
 #include <qregexp.h>
 #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 
 #include "errorhandler.h"
 */
-#include <qptrlist.h>
-#include <qtextstream.h>
+#include <q3ptrlist.h>
+#include <q3textstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <libkcal/syncdefines.h>
 #include <libkdepim/phoneaccess.h>
 #include "addressbook.h"
 #include "resource.h"
 #include "vcardconverter.h"
 #include "vcardparser/vcardtool.h"
 
 //US #include "addressbook.moc"
 
 using namespace KABC;
 
 struct AddressBook::AddressBookData
 {
   Addressee::List mAddressees;
   Addressee::List mRemovedAddressees;
   Field::List mAllFields;
   KConfig *mConfig;
@@ -223,49 +223,49 @@ bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
 
 
 AddressBook::AddressBook()
 {
   init(0, "contact");
 }
 
 AddressBook::AddressBook( const QString &config )
 {
   init(config, "contact");
 }
 
 AddressBook::AddressBook( const QString &config, const QString &family )
 {
   init(config, family);
 
 }
 
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
   blockLSEchange = false;
   d = new AddressBookData;
   QString fami = family;
-  if (config != 0) {
+  if (!config.isEmpty()) {
       if ( family == "syncContact" ) {
           qDebug("creating sync config ");
           fami = "contact";
           KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
           con->setGroup( "General" );
           con->writeEntry( "ResourceKeys", QString("sync") );
           con->writeEntry( "Standard", QString("sync") );
           con->setGroup( "Resource_sync" );
           con->writeEntry( "FileName", config );
           con->writeEntry( "FileFormat", QString("vcard") );
           con->writeEntry( "ResourceIdentifier", QString("sync") );
           con->writeEntry( "ResourceName", QString("sync_res") );
           if ( config.right(4) == ".xml" )
               con->writeEntry( "ResourceType", QString("qtopia") );
           else if (  config == "sharp"            ) {
               con->writeEntry( "ResourceType", QString("sharp") );
           } else {
               con->writeEntry( "ResourceType", QString("file") );
           }
           //con->sync();
           d->mConfig = con;
       }
       else
     d->mConfig = new KConfig( locateLocal("config", config) );
@@ -360,55 +360,55 @@ bool AddressBook::load()
         //qDebug("setId aa %s ", id.latin1());
         (*addrIt).setIDStr(id );
     }
   }
   blockLSEchange = true;
   return ok;
 }
 
 bool AddressBook::save( Ticket *ticket )
 {
   kdDebug(5700) << "AddressBook::save()"<< endl;
 
   if ( ticket->resource() ) {
     deleteRemovedAddressees();
     return ticket->resource()->save( ticket );
   }
 
   return false;
 }
 // exports all Addressees, which are syncable
 void  AddressBook::export2File( QString fileName, QString resourceName )
 {
   
   QFile outFile( fileName );
-  if ( !outFile.open( IO_WriteOnly ) ) {
+  if ( !outFile.open( QIODevice::WriteOnly ) ) {
     QString text = i18n( "<qt>Unable to open file <b>%1</b> for export.</qt>" );
     KMessageBox::error( 0, text.arg( fileName ) );
     return ;
   }
-  QTextStream t( &outFile );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( &outFile );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   Iterator it;
   KABC::VCardConverter::Version version;
   version = KABC::VCardConverter::v3_0;
   for ( it = begin(); it != end(); ++it ) { 
       if ( (*it).resource()  ) {
           bool include = (*it).resource()->includeInSync();
           if ( !resourceName.isEmpty()  )
               include = (resourceName == (*it).resource()->resourceName() );
           if ( include ) {
               //qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->resourceName() ).arg( fileName ) );
               if ( !(*it).IDStr().isEmpty() ) {
                   (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() );
               }
               KABC::VCardConverter converter;
               QString vcard; 
               //Resource *resource() const;
               converter.addresseeToVCard( *it, vcard, version );
               t << vcard << "\r\n";
           }
       }
   }
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
@@ -447,71 +447,71 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
           if ( semi < dopp && semi >= 0 )
               sep = semi ;
           else
               sep = dopp;
           vcardnew +=vcard.mid( start, next - start);
           vcardnew +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
       vcardnew += vcard.mid( start,vcard.length() );
       vcard = "";
       start = 0;
       while ( (next = vcardnew.find("ADR", start) )>= 0 ) {
           int sep = vcardnew.find(":", next);
           vcard +=vcardnew.mid( start, next - start+3);
           start = sep;
       }
       vcard += vcardnew.mid( start,vcardnew.length() );
       vcard.replace ( QRegExp(";;;") , "" );
       vcard.replace ( QRegExp(";;") , "" );
       datastream += vcard;
      
   }
   
   QFile outFile(fileName);
-  if ( outFile.open(IO_WriteOnly) ) { 
+  if ( outFile.open(QIODevice::WriteOnly) ) { 
       datastream.replace ( QRegExp("VERSION:3.0") , "VERSION:2.1" );
-      QTextStream t( &outFile );  // use a text stream
-      t.setEncoding( QTextStream::UnicodeUTF8 );
+      Q3TextStream t( &outFile );  // use a text stream
+      t.setEncoding( Q3TextStream::UnicodeUTF8 );
       t <<datastream;
       t <<  "\r\n\r\n";
       outFile.close();
           
   } else {
       qDebug("Error open temp file ");
       return false;
   }
   return true;
 
 }
 int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld, QString resource   )
 {
 
     if ( removeOld )
         setUntagged( true, resource );
     KABC::Addressee::List list;
     QFile file( fileName );
-    file.open( IO_ReadOnly );
+    file.open( QIODevice::ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
     if ( replaceLabel ) { 
         data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
         data.replace ( QRegExp("LABEL") , "ADR" );
         data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
     } else
         data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
     KABC::VCardTool tool;
     list =  tool.parseVCards( data );
     KABC::Addressee::List::Iterator it;
 
     Resource * setRes = 0;
     if ( !resource.isEmpty() ) {
         KRES::Manager<Resource>::ActiveIterator it;
         KRES::Manager<Resource> *manager = d->mManager;
         for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
             //qDebug("SaveAB::checking resource..." );
             if ( (*it)->resourceName() == resource  ) {
                 setRes = (*it);
                 qDebug("KA: AB: Inserting imported contacs to resource %s", resource.latin1());
                 break;
             }
@@ -613,49 +613,49 @@ void AddressBook::removeSyncInfo( QString syncProfile)
 }
 void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
         QString id = (*ait).IDStr();
         (*ait).setIDStr( ":");
         (*ait).setExternalUID( id );
         (*ait).setOriginalExternalUID( id ); 
         if ( isPreSync )
             (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
         else {
             (*ait).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
             (*ait).setID( currentSyncDevice,id );
             
         }
     }
 }
 void AddressBook::findNewExtIds(  QString fileName, QString currentSyncDevice  )
 {
  
     setUntagged();
     KABC::Addressee::List list;
     QFile file( fileName );
-    file.open( IO_ReadOnly );
+    file.open( QIODevice::ReadOnly );
     QByteArray rawData = file.readAll();
     file.close();
     QString data;
 
     data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
     KABC::VCardTool tool;
     list =  tool.parseVCards( data );
     KABC::Addressee::List::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         Iterator ait;
         for ( ait = begin(); ait != end(); ++ait ) {
             if ( !(*ait).tagged() ) {
                 if ( (*ait).containsAdr(*it)) {
                     (*ait).setTagged(true);
                     QString id = (*it).custom( "KADDRESSBOOK", "X-ExternalID" );
                     (*it).setIDStr( ":");
                     (*it).setID( currentSyncDevice,id );
                     (*it).setExternalUID( id );
                     (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
                     (*it).setUid( ( (*ait).uid() ));
                     break;
                 }
             }
             
@@ -1197,73 +1197,73 @@ QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab )
 QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab )
 {
   if (!ab.d) return s;
 
   s >> ab.d->mAddressees;
 
   return s;
 }
 
 bool AddressBook::addResource( Resource *resource )
 {
   if ( !resource->open() ) {
     kdDebug(5700) << "AddressBook::addResource(): can't add resource" << endl;
     return false;
   }
 
   resource->setAddressBook( this );
 
   d->mManager->add( resource );
   return true;
 }
 void AddressBook::removeResources()
 {
     //remove all possible resources. This should cleanup the configfile.
-    QPtrList<KABC::Resource> mResources = resources();
+    Q3PtrList<KABC::Resource> mResources = resources();
     
-    QPtrListIterator<KABC::Resource> it(mResources);
+    Q3PtrListIterator<KABC::Resource> it(mResources);
     for ( ; it.current(); ++it ) {
         KABC::Resource *res = it.current();
         removeResource(res);
     }
 }
 
 bool AddressBook::removeResource( Resource *resource )
 {
   resource->close();
 
   if ( resource == standardResource() )
     d->mManager->setStandardResource( 0 );
 
   resource->setAddressBook( 0 );
 
   d->mManager->remove( resource );
   return true;
 }
 
-QPtrList<Resource> AddressBook::resources()
+Q3PtrList<Resource> AddressBook::resources()
 {
-  QPtrList<Resource> list;
+  Q3PtrList<Resource> list;
 
 //  qDebug("AddressBook::resources() 1");
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     list.append( *it );
 
   return list;
 }
 
 /*US
 void AddressBook::setErrorHandler( ErrorHandler *handler )
 {
   delete d->mErrorHandler;
   d->mErrorHandler = handler;
 }
 */
 
 void AddressBook::error( const QString& msg )
 {
 /*US
   if ( !d->mErrorHandler ) // create default error handler
     d->mErrorHandler = new ConsoleErrorHandler;
 
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index a8a9fc1..56fce4d 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -10,49 +10,49 @@
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_ADDRESSBOOK_H
 #define KABC_ADDRESSBOOK_H
 
 #include <qobject.h>
 
 #include <kresources/manager.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "addressee.h"
 #include "field.h"
 
 namespace KABC {
 
 class ErrorHandler;
 class Resource;
 class Ticket;
 
 /**
   @short Address Book
 
   This class provides access to a collection of address book entries.
 */
 class AddressBook : public QObject
 {
     Q_OBJECT
 
     friend QDataStream &operator<<( QDataStream &, const AddressBook & );
     friend QDataStream &operator>>( QDataStream &, AddressBook & );
     friend class StdAddressBook;
 
   public:
@@ -259,49 +259,49 @@ class AddressBook : public QObject
       @param category Ored list of field categories.
       @param key      Identifier used as key for reading and writing the field.
       @param app      String used as application key for reading and writing
                       the field.
     */
     bool addCustomField( const QString &label, int category = Field::All,
                          const QString &key = QString::null,
                          const QString &app = QString::null );
 
 
     /**
       Add address book resource.
     */
     bool addResource( Resource * );
 
     /**
       Remove address book resource.
     */
     void removeResources();
     bool removeResource( Resource * );
 
     /**
       Return pointer list of all resources.
     */
-    QPtrList<Resource> resources();
+    Q3PtrList<Resource> resources();
 
     /**
       Set the @p ErrorHandler, that is used by @ref error() to
       provide gui-independend error messages.
     */
     void setErrorHandler( ErrorHandler * );
 
     /**
       Shows gui independend error messages.
     */
     void error( const QString& );
 
     /**
       Query all resources to clean up their lock files
      */
     void cleanUp();
 
     // sync stuff 
     //Addressee::List getExternLastSyncAddressees();
     void resetTempSyncStat(); 
     QStringList uidList(); 
     void removeSyncAddressees( bool removeDeleted = false );
     void  mergeAB( AddressBook *aBook, const QString& profile, bool isSubset );
     const Addressee findByExternUid( const QString& uid , const QString& profile  ) const;
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index e8e440c..9994e29 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -370,49 +370,49 @@ void Addressee::mergeOLContact( const Addressee& ad )
     }
   
     KABC::Address addthis = otherAddress();
     KABC::Address addother = ad.otherAddress();
     if ( !addthis.isEmpty() && !addother.isEmpty() )
         addthis.setType( addother.type() );
     //qDebug("merge contact %s ", ad.uid().latin1());
     setUid( ad.uid() );
     setRevision( ad.revision() );
 
 
 }
 
 void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
 {
     // merge all standard non-outlook fields. 
     //if isSubSet (e.g. mobile phone sync) merge all fields
 
     detach();
     if ( isSubSet ) {
         if ( mData->name.isEmpty() ) mData->name = ad.mData->name;
         if ( mData->formattedName.isEmpty() ) mData->formattedName  = ad.mData->formattedName;
         if ( mData->familyName.isEmpty()  )  mData->familyName  = ad.mData->familyName;
         if ( mData->givenName.isEmpty() ) mData->givenName   = ad.mData->givenName ;
-        if ( mData->additionalName )  mData->additionalName  = ad.mData->additionalName;
+        if ( mData->additionalName.isEmpty() )  mData->additionalName  = ad.mData->additionalName;
         if ( mData->prefix.isEmpty() )  mData->prefix  = ad.mData->prefix;
         if ( mData->suffix.isEmpty() )  mData->suffix  = ad.mData->suffix;
         if ( mData->title .isEmpty() ) mData->title = ad.mData->title  ;
         if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
         if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
         if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
         if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; 
         if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy;
         if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ;
         if ( !mData->birthday.isValid() ) 
             if ( ad.mData->birthday.isValid()) 
                 mData->birthday =  ad.mData->birthday;
 
     }
     if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer;
     if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone;
     if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo;
     if ( mData->productId.isEmpty() ) mData->productId  = ad.mData->productId; 
     if ( mData->sortString.isEmpty() )  mData->sortString  = ad.mData->sortString; 
     QStringList t;
     QStringList tAD;
     uint iii;
 
     // ********** phone numbers
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 0ea1803..30dcd5d 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -12,49 +12,49 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_ADDRESSEE_H
 #define KABC_ADDRESSEE_H
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include <ksharedptr.h>
 #include <kurl.h>
 
 #include "address.h"
 #include "agent.h"
 #include "geo.h"
 #include "key.h"
 #include "phonenumber.h"
 #include "picture.h"
 #include "secrecy.h"
 #include "sound.h"
 #include "timezone.h"
 
 namespace KABC {
 
 class Resource;
 
 /**
   @short address book entry
 
   This class represents an entry in the address book.
 
   The data of this class is implicitly shared. You can pass this class by value.
@@ -63,49 +63,49 @@ class Resource;
   the functions ending in Label(). They return a translated string which can be
   used as label for the corresponding field.
 
   About the name fields:
 
   givenName() is the first name and familyName() the last name. In some
   countries the family name comes first, that's the reason for the
   naming. formattedName() is the full name with the correct formatting.
   It is used as an override, when the correct formatting can't be generated
   from the other name fields automatically.
 
   realName() returns a fully formatted name(). It uses formattedName, if set,
   otherwise it constucts the name from the name fields. As fallback, if
   nothing else is set it uses name().
 
   name() is the NAME type of RFC2426. It can be used as internal name for the
   data enty, but shouldn't be used for displaying the data to the user.
  */
 class Addressee
 {
     friend QDataStream &operator<<( QDataStream &, const Addressee & );
     friend QDataStream &operator>>( QDataStream &, Addressee & );
 
   public:
-    typedef QValueList<Addressee> List;
+    typedef Q3ValueList<Addressee> List;
 
     /**
       Construct an empty address book entry.
      */
     Addressee();
     ~Addressee();
 
     Addressee( const Addressee & );
     Addressee &operator=( const Addressee & );
 
     bool operator==( const Addressee & ) const;
     bool operator!=( const Addressee & ) const;
     // sync stuff
     void setTempSyncStat(int id);
     int tempSyncStat() const;
     void setIDStr( const QString & );
     const QString IDStr() const;
     void setID( const QString &, const QString & );
     const QString  getID( const QString & ) const;
     void setCsum( const QString &, const QString & );
     const QString getCsum( const QString & ) const ;
     void removeID(const QString &);
     void computeCsum(const QString &dev);
     ulong getCsum4List( const QStringList &  attList);
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 671787e..bda1b9e 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -1,282 +1,285 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qapplication.h>
 #include <qregexp.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qlabel.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
 #include "stdaddressbook.h"
 
 #include "addresseedialog.h"
 #include "KDGanttMinimizeSplitter.h"
 //#include "addresseedialog.moc"
 
 using namespace KABC;
 
-AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
-  QListViewItem( parent ),
+AddresseeItem::AddresseeItem( Q3ListView *parent, const Addressee &addressee ) :
+  Q3ListViewItem( parent ),
   mAddressee( addressee )
 {
     setText( Name,addressee.realName());
     setText( Email, addressee.preferredEmail() );
     setText( Category, addressee.categories().join(";") );
 }
 
 QString AddresseeItem::key( int column, bool ) const
 {
 
   if (column == Email) {
     QString value = text(Email);
     int val = value.findRev("@");
     return value.mid( val) + value.left( val );
   }
   return text(column).lower();
 }
 
 AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
                Ok|Cancel, No, parent ), mMultiple( multiple )
 {
     qDebug("NEW AddresseeDialog ");
     
 
   KDGanttMinimizeSplitter* mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this );
   mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
   setMainWidget( mMiniSplitter );
 
   QWidget *listWidget = new QWidget( mMiniSplitter );
 
-  QVBoxLayout *listLayout = new QVBoxLayout (listWidget) ;
+  Q3VBoxLayout *listLayout = new Q3VBoxLayout (listWidget) ;
   //topLayout->addLayout( listLayout );
 
   mAddresseeList = new KListView( listWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->addColumn( i18n("Category") );
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
-  connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
+  connect( mAddresseeList, SIGNAL( doubleClicked( Q3ListViewItem * ) ),
            SLOT( slotOk() ) );
   //QHBox* searchBox = new QHBox ( listWidget );
-  QHBox * hb = new QHBox ( listWidget );
+  Q3HBox * hb = new Q3HBox ( listWidget );
   listLayout->addWidget (  hb );
   mAddresseeEdit = new QLineEdit(  hb );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
            SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
   QPushButton *searchButton = new QPushButton( i18n("Search!"),   hb ); 
   connect ( searchButton, SIGNAL( clicked() ), SLOT( loadAddressBook() ) );
    if ( mMultiple ) {
      
     mSelectedList = new KListView( mMiniSplitter );
     mSelectedList->addColumn( i18n("Selected Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
     //connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
     //       SLOT( removeSelected() ) );
-    connect( mSelectedList, SIGNAL( clicked( QListViewItem * ) ),
+    connect( mSelectedList, SIGNAL( clicked( Q3ListViewItem * ) ),
              SLOT( removeSelected() ) );
-    connect( mSelectedList, SIGNAL( returnPressed( QListViewItem *) ),
+    connect( mSelectedList, SIGNAL( returnPressed( Q3ListViewItem *) ),
              SLOT( removeSelected() ) );
 
 #if 0
     QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
     connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
 
 #endif
-    connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
-             SLOT( addSelected( QListViewItem * ) ) );
-    connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
-             SLOT( selectNextItem( QListViewItem * ) ) );
+    connect( mAddresseeList, SIGNAL( clicked( Q3ListViewItem * ) ),
+             SLOT( addSelected( Q3ListViewItem * ) ) );
+    connect( mAddresseeList, SIGNAL( returnPressed( Q3ListViewItem * ) ),
+             SLOT( selectNextItem( Q3ListViewItem * ) ) );
 
   }
 
   mAddressBook = StdAddressBook::self( true );
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
            SLOT( addressBookChanged() ) );
 #if 0
   connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
 #endif
   loadAddressBook();  
-  QValueList<int> splitterSize; 
+  Q3ValueList<int> splitterSize; 
   splitterSize.append( ( width() / 5 ) * 3 );
   splitterSize.append( ( width() / 5 ) *2 );
   mMiniSplitter->setSizes( splitterSize );
 }
 
 AddresseeDialog::~AddresseeDialog()
 {
     qDebug("DELETE AddresseeDialog ");
 }
 
 void AddresseeDialog::loadAddressBook()
 {
   mAddresseeList->clear();
   mItemDict.clear();
   if ( mAddresseeEdit->text().isEmpty() ) {
       AddressBook::Iterator it;
       for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
       if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
             continue; 
           new AddresseeItem( mAddresseeList, (*it) );
       }
       return;
   }
   //mAddresseeEdit->completionObject()->clear();
   QRegExp re;
   re.setWildcard(true); // most people understand these better.
   re.setCaseSensitive(false);
   re.setPattern( "*"+ mAddresseeEdit->text() + "*");
 
   AddressBook::Iterator it;
   for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
       if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
             continue; 
       QString name = (*it).realName();
       name += (*it).preferredEmail();
       name += (*it).categories().join(";");
 #if QT_VERSION >= 0x030000
       if (re.search(name) != -1)
 #else
       if (re.match(name) != -1)
 #endif
           AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
   }
 }
 
-void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
+void AddresseeDialog::addCompletionItem( const QString &str, Q3ListViewItem *item )
 {
   if ( str.isEmpty() ) return;
 
   mItemDict.insert( str, item );
   //mAddresseeEdit->completionObject()->addItem( str );
 }
 
 void AddresseeDialog::selectItem( const QString &str )
 {
   if ( str.isEmpty() ) return;
 
-  QListViewItem *item = mItemDict.find( str );
+  Q3ListViewItem *item = mItemDict.find( str );
   if ( item ) {
     mAddresseeList->blockSignals( true );
     mAddresseeList->setSelected( item, true );
     mAddresseeList->ensureItemVisible( item );
     mAddresseeList->blockSignals( false );
   }
 }
 
-void AddresseeDialog::updateEdit( QListViewItem *item )
+void AddresseeDialog::updateEdit( Q3ListViewItem *item )
 {
   mAddresseeEdit->setText( item->text( 0 ) );
   mAddresseeEdit->setSelection( 0, item->text( 0 ).length() );
 }
 
-void AddresseeDialog::selectNextItem( QListViewItem *item )
+void AddresseeDialog::selectNextItem( Q3ListViewItem *item )
 {
     addSelected( item );
-    QListViewItem *next = item->nextSibling();
+    Q3ListViewItem *next = item->nextSibling();
     if ( next ) {
         next->setSelected( true );
         item->setSelected( false );
         mAddresseeList->setCurrentItem( next );
     }
 }
-void AddresseeDialog::addSelected( QListViewItem *item )
+void AddresseeDialog::addSelected( Q3ListViewItem *item )
 {
     AddresseeItem *addrItem = (AddresseeItem *)( item );
   if ( !addrItem ) return;
 
   Addressee a = addrItem->addressee();
 
-  QListViewItem *selectedItem = mSelectedDict.find( a.uid() );
+  Q3ListViewItem *selectedItem = mSelectedDict.find( a.uid() );
   if ( !selectedItem ) {
     selectedItem = new AddresseeItem( mSelectedList, a );
     mSelectedDict.insert( a.uid(), selectedItem );
   }
  
 }
 
 void AddresseeDialog::removeSelected()
 {
-  QListViewItem *item = mSelectedList->selectedItem();
+  Q3ListViewItem *item = mSelectedList->selectedItem();
   AddresseeItem *addrItem = (AddresseeItem *)( item );
   if ( !addrItem ) return;
-  QListViewItem *next =  item->nextSibling();
+  Q3ListViewItem *next =  item->nextSibling();
   mSelectedDict.remove( addrItem->addressee().uid() );
   delete addrItem;
   if ( next )
       next->setSelected( true );
 }
 
 Addressee AddresseeDialog::addressee()
 {
   AddresseeItem *aItem = 0;
   
   if ( mMultiple )
       aItem = (AddresseeItem *)( mSelectedList->firstChild() );
   else
       aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
  
   if (aItem) return aItem->addressee();
   return Addressee();
 }
 
 Addressee::List AddresseeDialog::addressees()
 {
   Addressee::List al;
   AddresseeItem *aItem = 0;
 
   if ( mMultiple ) {
-    QListViewItem *item = mSelectedList->firstChild();
+    Q3ListViewItem *item = mSelectedList->firstChild();
     while( item ) {
         aItem = (AddresseeItem *)( item );
       if ( aItem ) al.append( aItem->addressee() );
       item = item->nextSibling();
     }
   }
   else
   {
       aItem = (AddresseeItem *)( mAddresseeList->selectedItem() );
     if (aItem) al.append( aItem->addressee() );
   }
 
   return al;
 }
 
 Addressee AddresseeDialog::getAddressee( QWidget *parent )
 {
     AddresseeDialog *dlg = new AddresseeDialog( parent );
     Addressee addressee;
 #ifdef DESKTOP_VERSION
     static int geoX = 0;
     static int geoY = 0;
     static int geoW = 0;
     static int geoH = 0;
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 6fab62d..be7bbb4 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -1,78 +1,78 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KABC_ADDRESSEEDIALOG_H
 #define KABC_ADDRESSEEDIALOG_H
 
-#include <qdict.h>
+#include <q3dict.h>
 
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <klistview.h>
 
 #include "addressbook.h"
 
 namespace KABC {
 
 /**
   @short Special ListViewItem, that is used by the AddresseeDialog.
 */
-class AddresseeItem : public QListViewItem
+class AddresseeItem : public Q3ListViewItem
 {
   public:
 
     /**
       Type of column
       @li @p Name -  Name in Addressee
       @li @p Email - Email in Addressee
     */
     enum columns { Name = 0, Email = 1,Category = 2 };
 
     /**
       Constructor.
 
       @param parent    The parent listview.
       @param addressee The associated addressee.
     */
-    AddresseeItem( QListView *parent, const Addressee &addressee );
+    AddresseeItem( Q3ListView *parent, const Addressee &addressee );
 
     /**
       Returns the addressee.
     */
     Addressee addressee() const { return mAddressee; }
 
     /**
       Method used by QListView to sort the items.
     */
     virtual QString key( int column, bool ascending ) const;
 
   private:
     Addressee mAddressee;
 };
 
 /**
   @short Dialog for selecting address book entries.
  
   This class provides a dialog for selecting entries from the standard KDE
   address book. Use the getAddressee() function to open a modal dialog,
   returning an address book entry.
  
   In the dialog you can select an entry from the list with the mouse or type in
   the first letters of the name or email address you are searching for. The
@@ -108,54 +108,54 @@ class AddresseeDialog : public KDialogBase
       Return the list of addresses chosen
     */
     Addressee::List addressees();
 
     /**
       Select a single address book entry.
      
       Open addressee select dialog and return the entry selected by the user.
       If the user doesn't select an entry or presses cancel, the returned
       addressee is empty.
     */
     static Addressee getAddressee( QWidget *parent );
 
     /**
       Select multiple address book entries.
       
       Open addressee select dialog and return the entries selected by the user.
       If the user doesn't select an entry or presses cancel, the returned
       addressee list is empty.
     */
     static Addressee::List getAddressees( QWidget *parent );
 
   private slots:
     void selectItem( const QString & );
-    void selectNextItem( QListViewItem *item );
-    void updateEdit( QListViewItem *item );
-    void addSelected( QListViewItem *item );
+    void selectNextItem( Q3ListViewItem *item );
+    void updateEdit( Q3ListViewItem *item );
+    void addSelected( Q3ListViewItem *item );
     void removeSelected();
     void loadAddressBook();
 
   protected slots:
     void addressBookChanged();
 
   private:
-    void addCompletionItem( const QString &str, QListViewItem *item );
+    void addCompletionItem( const QString &str, Q3ListViewItem *item );
 
     bool mMultiple;
 
     KListView *mAddresseeList;
     QLineEdit *mAddresseeEdit;
 
     KListView *mSelectedList;
 
     AddressBook *mAddressBook;
 
-    QDict<QListViewItem> mItemDict;
-    QDict<QListViewItem> mSelectedDict;
+    Q3Dict<Q3ListViewItem> mItemDict;
+    Q3Dict<Q3ListViewItem> mSelectedDict;
 
     class AddresseeDialogPrivate;
     AddresseeDialogPrivate *d;
 };
 
 }
 #endif
diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp
index 097e162..e1ba1ce 100644
--- a/kabc/addresseelist.cpp
+++ b/kabc/addresseelist.cpp
@@ -7,49 +7,51 @@
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kdebug.h>
 //US
-#include <qtl.h>
+#include <q3tl.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 
 
 #include "addresseelist.h"
 #include "field.h"
 
 using namespace KABC;
 
 //
 //
 // Traits
 //
 //
 
 bool SortingTraits::Uid::eq( const Addressee &a1, const Addressee &a2 )
 {
   // locale awareness doesn't make sense sorting ids
   return ( QString::compare( a1.uid(), a2.uid() ) == 0 );
 }
 
 bool SortingTraits::Uid::lt( const Addressee &a1, const Addressee &a2 )
 {
   // locale awareness doesn't make sense sorting ids
   return ( QString::compare( a1.uid(), a2.uid() ) < 0 );
 }
@@ -100,68 +102,68 @@ bool SortingTraits::GivenName::eq( const Addressee &a1, const Addressee &a2 )
 {
 //US QString::localeAwareCompare is not available in my distribution. Redefine it to compare
   return ( QString::compare( a1.givenName(), a2.givenName() ) == 0 
            && QString::compare( a1.familyName(), a2.familyName() ) == 0 );
 }
 
 bool SortingTraits::GivenName::lt( const Addressee &a1, const Addressee &a2 )
 {
 //US QString::localeAwareCompare is not available in my distribution. Redefine it to compare
   int given = QString::compare( a1.givenName(), a2.givenName() );
   if ( 0 == given ) {
     return ( QString::compare( a1.familyName(), a2.familyName() ) < 0 );
   } else {
     return given < 0;
   }
 }
 
 //
 //
 // AddresseeList
 //
 //
 
 AddresseeList::AddresseeList()
-  : QValueList<Addressee>()
+  : Q3ValueList<Addressee>()
 {
   mReverseSorting = false;
   mActiveSortingCriterion = FormattedName;
   mActiveSortingField = 0;
 }
 
 AddresseeList::~AddresseeList()
 {
 }
 
 AddresseeList::AddresseeList( const AddresseeList &l )
-  : QValueList<Addressee>( l )
+  : Q3ValueList<Addressee>( l )
 {
   mReverseSorting = l.reverseSorting();
   mActiveSortingCriterion = l.sortingCriterion();
 }
 
-AddresseeList::AddresseeList( const QValueList<Addressee> &l )
-  : QValueList<Addressee>( l )
+AddresseeList::AddresseeList( const Q3ValueList<Addressee> &l )
+  : Q3ValueList<Addressee>( l )
 {
   mReverseSorting = false;
 }
 
 void AddresseeList::dump() const
 {
   kdDebug(5700) << "AddresseeList {" << endl;
   kdDebug(5700) << "reverse order: " << ( mReverseSorting ? "true" : "false" ) << endl;
 
   QString crit;
   if ( Uid == mActiveSortingCriterion ) {
     crit = "Uid";
   } else if ( Name == mActiveSortingCriterion ) {
     crit = "Name";
   } else if ( FormattedName == mActiveSortingCriterion ) {
     crit = "FormattedName";
   } else if ( FamilyName == mActiveSortingCriterion ) {
     crit = "FamilyName";
   } else if ( GivenName == mActiveSortingCriterion ) {
     crit = "GivenName";
   } else {
     crit = "unknown -- update dump method";
   }
 
diff --git a/kabc/addresseelist.h b/kabc/addresseelist.h
index 2df252c..6106804 100644
--- a/kabc/addresseelist.h
+++ b/kabc/addresseelist.h
@@ -8,49 +8,49 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_ADDRESSEELIST_H
 #define KABC_ADDRESSEELIST_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "addressee.h"
 
 namespace KABC {
 
 class Field;
     
 /**
  * Each trait must implement one static function for equality, one for "less 
  * than". Class name should be the field name. A trait does not necessarily 
  * have to stick to just one field: a trait sorting by family name can e.g. 
  * sort addressees with equal family name by given name.
  *
  * If you want to implement reverse sorting, you do not have to write another
  * trait, as AddresseeList takes care of that.
  */
 namespace SortingTraits
 { 
 
 class Uid
 {
   public:
     static bool eq( const Addressee &, const Addressee & );
     static bool lt( const Addressee &, const Addressee & );
@@ -93,55 +93,55 @@ typedef enum { Uid, Name, FormattedName, FamilyName, GivenName } SortingCriterio
 
 /**
  * @short  a QValueList of Addressee, with sorting functionality
  *
  * This class extends the functionality of QValueList with
  * sorting methods specific to the Addressee class. It can be used
  * just like any other QValueList but is no template class.
  *
  * An AddresseeList does not automatically keep sorted when addressees
  * are added or removed or the sorting order is changed, as this would
  * slow down larger operations by sorting after every step. So after
  * such operations you have to call {@link #sort} or {@link #sortBy} to 
  * create a defined order again.
  *
  * Iterator usage is inherited by QValueList and extensively documented
  * there. Please remember that the state of an iterator is undefined 
  * after any sorting operation.
  *
  * For the enumeration Type SortingCriterion, which specifies the
  * field by the collection will be sorted, the following values exist:
  * Uid, Name, FormattedName, FamilyName, GivenName.
  * 
  * @author Jost Schenck jost@schenck.de 
  */
-class AddresseeList : public QValueList<Addressee>
+class AddresseeList : public Q3ValueList<Addressee>
 {
   public:
     AddresseeList();
     ~AddresseeList();
     AddresseeList( const AddresseeList & );
-    AddresseeList( const QValueList<Addressee> & );
+    AddresseeList( const Q3ValueList<Addressee> & );
 
     /**
      * Debug output.
      */
     void dump() const;
   
     /** 
      * Determines the direction of sorting. On change, the list
      * will <em>not</em> automatically be resorted.
      * @param r   <tt>true</tt> if sorting should be done reverse, <tt>false</tt> otherwise
      */
     void setReverseSorting( bool r = true ) { mReverseSorting = r; }
 
     /**
      * Returns the direction of sorting.
      * @return    <tt>true</tt> if sorting is done reverse, <tt>false</tt> otherwise
      */
     bool reverseSorting() const { return mReverseSorting; }
 
     /**
      * Sorts this list by a specific criterion.
      * @param c    the criterion by which should be sorted 
      */
     void sortBy( SortingCriterion c );
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index cde19a1..425e67c 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -6,104 +6,109 @@
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <kabc/address.h>
 #include <kabc/addressee.h>
 #include <kabc/phonenumber.h>
 #include <kglobal.h>
 //US#include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
 //US #include <kstringhandler.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
 #include <qregexp.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qlabel.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qapplication.h>
 #include <qpushbutton.h>
 #ifdef DESKTOP_VERSION 
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #include <qprinter.h>
 #include <qpainter.h>
 #endif
+#include <QDesktopWidget>
 
 
-#include <qstylesheet.h> 
+#include <q3stylesheet.h> 
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QPixmap>
+#include <Q3VBoxLayout>
 #include "externalapphandler.h"
 #include <kabc/addresseeview.h>
 
 
 //US #ifndef DESKTOP_VERSION
 //US #include <qtopia/qcopenvelope_qws.h>
 //US #include <qpe/qpeapplication.h>
 //US #endif
 
 //US static int kphoneInstalled = 0;
 
 using namespace KABC;
 bool AddresseeView::sFullDetailsMode = false;
 
 AddresseeView::AddresseeView( QWidget *parent, const char *name )
-  : QTextBrowser( parent, name )
+  : Q3TextBrowser( parent, name )
 
 
 {
 //US  setWrapPolicy( QTextEdit::AtWordBoundary );
   setLinkUnderline( false );
   // setVScrollBarMode( QScrollView::AlwaysOff );
   //setHScrollBarMode( QScrollView::AlwaysOff );
 
 //US  QStyleSheet *sheet = styleSheet();
 //US  QStyleSheetItem *link = sheet->item( "a" );
 //US  link->setColor( KGlobalSettings::linkColor() );
 
 
 }
 void AddresseeView::printMe()
 {
 #ifdef DESKTOP_VERSION 
     QPrinter printer;
     if (!printer.setup() )
         return;
     QPainter p;
     p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
     int wid = (m.width() * 9)/10;
     dx = (float) wid/(float)contentsWidth ();
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
     if ( dx < dy )
         scale = dx;
     else
         scale = dy;
     p.translate( m.width()/10,0 );
     p.scale( scale, scale );
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
 #endif  
 }
 void AddresseeView::setSource(const QString& n)
 {
     //qDebug("********AddresseeView::setSource %s", n.latin1());
 
    if ( n == "allDetails" ) {
        sFullDetailsMode = true;
        setAddressee( mCurrentContact );
    } else  if ( n == "notAllDetails" ) {
@@ -381,116 +386,116 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
   QString aOrga = "";
   if ( true /*!mAddressee.role().isEmpty()*/ ) {
       aRole = "<tr>"
           "<td align=\"left\">" + mAddressee.role() + "</td>"
           "</tr>";
   }
   if ( true /*!mAddressee.organization().isEmpty()*/ ) {
       aOrga = "<tr>"
           "<td align=\"left\">" + mAddressee.organization() + "</td>" 
           "</tr>";
   }
   mText = "";
   QString picString = "";
   KABC::Picture picture = mAddressee.photo();
   if (picture.undefined() ) picture = mAddressee.logo();
   bool picAvailintern = false;
   bool picAvailUrl = false;
   if (! picture.undefined() ) {
       picAvailintern = (picture.isIntern() && !picture.data().isNull());
       picAvailUrl = !picture.isIntern() &&  QFile::exists(picture.url() );
   }
   if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) {
       picString =  "<img src=\"myimage\" width=\"50\" height=\"70\">";
       if (  picAvailintern ) {
-          QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
+          Q3MimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
           int wid = picture.data().width();
           int hei = picture.data().height();  
           if ( wid > 128 || hei > 128 ) {
               if ( wid > hei ) {
                   hei = (hei*128)/wid;
                   wid = 128;
               } else {
                   wid = (wid*128)/hei;
                   hei = 128;
               }
           }
           picString =  QString("<img src=\"myimage\" width=\"%1\" height=\"%2\">").arg(wid).arg(hei);
       } else {
           if ( picAvailUrl ) {
               QPixmap picPix( picture.url() );
-              QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", picPix );
+              Q3MimeSourceFactory::defaultFactory()->setPixmap( "myimage", picPix );
               int wid = picPix.width();
               int hei = picPix.height();
               if ( wid > 128 || hei > 128 ) {
                   if ( wid > hei ) {
                       hei = (hei*128)/wid;
                       wid = 128;
                   } else {
                       wid = (wid*128)/hei;
                       hei = 128;
                   }
               }
               picString =  QString("<img src=\"myimage\" width=\"%1\" height=\"%2\">").arg(wid).arg(hei);
           } else {
               if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {
                   static bool setDefaultImageChildren = false;
                   if ( !setDefaultImageChildren ) {
-                      QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
+                      Q3MimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
                       setDefaultImageChildren = true;
                   }
                   picString =  "<img src=\"familyIcon\" width=\"64\" height=\"64\">";
                   
               } else  if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) {
                   static bool setDefaultImagepouses = false;
                   if ( !setDefaultImagepouses ) {
-                      QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
+                      Q3MimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
                       setDefaultImagepouses = true;
                   }
                   picString =  "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">";
               } else {
                   QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
                   if ( gen == "male" ) {
                       static bool setDefaultImageMale = false;
                       if ( !setDefaultImageMale ) {
-                          QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
+                          Q3MimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
                           setDefaultImageMale = true;
                   }
                       picString =  "<img src=\"MaleIcon\" width=\"64\" height=\"64\">";
                       
                   } else if ( gen == "female" ) {
                   static bool setDefaultImageFemale = false;
                   if ( !setDefaultImageFemale ) {
-                      QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
+                      Q3MimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
                       setDefaultImageFemale = true;
                   }
                   picString =  "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">";
 
                   } else {
                       static bool setDefaultImage = false;
                       if ( !setDefaultImage ) {
                           //qDebug("Setting default pixmap ");
-                          QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
+                          Q3MimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
                           setDefaultImage = true;
                       }
                       picString =  "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";
                   }
               }
           }
       }
     mText = QString::fromLatin1(
   "<html>"
   "<body text=\"%1\" bgcolor=\"%2\">" // text and background color
   "<table>"
   "<tr>"
   "<td rowspan=\"3\" align=\"right\" valign=\"top\">"
   "%3"
   "</td>"
   "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>"  // name
   "</tr>"
   "%5"  // role
   "%6"  // organization
   "<td colspan=\"2\">&nbsp;</td>"
   "%7"  // dynamic part
   "%8"  // notes
   "</table>"
   "</body>"
@@ -632,101 +637,101 @@ QString AddresseeView::getPhoneNumbers(  KABC::PhoneNumber::List phones_unsorted
               .arg( (*phoneIt).number() )
               .arg( sms );
 
       } else {
           dynamicPart += QString(
                                  "<tr><td align=\"right\"><b>%1</b></td>"
                                  "<td align=\"left\">%2 %3</td></tr>" )
               .arg( KABC::PhoneNumber::typeLabel( phonetype ) )
               .arg( (*phoneIt).number() )
               .arg( sms );
       }
   }
   return dynamicPart;
 }
 /*
 KABC::Addressee AddresseeView::addressee() const
 {
   return mAddressee;
 }
 */
 void AddresseeView::addTag(const QString & tag,const QString & text)
 {
     if ( text.isEmpty() )
         return;
-    int number=text.contains("\n");
+    int number=text.count("\n");
     QString str = "<" + tag + ">";
     QString tmpText=text;
     QString tmpStr=str;
     if(number !=-1)
         {
             if (number > 0) {
                 int pos=0;
                 QString tmp;
                 for(int i=0;i<=number;i++) {
                     pos=tmpText.find("\n");
                     tmp=tmpText.left(pos);
                     tmpText=tmpText.right(tmpText.length()-pos-1);
                     tmpStr+=tmp+"<br>";
                 }
             }
             else tmpStr += tmpText;
             tmpStr+="</" + tag + ">";
             mText.append(tmpStr);
         }
     else
         {
             str += text + "</" + tag + ">";
             mText.append(str);
         }
 }
 
 AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bool takeloc, QWidget *parent, const char *name ) : KDialogBase(parent,name,
                 true ,i18n("Conflict! Please choose Adressee!"),Ok|User1|Close,Close, false)
 {
     findButton( Close )->setText( i18n("Cancel Sync"));
     findButton( Ok )->setText( i18n("Remote"));
     findButton( User1 )->setText( i18n("Local"));
     QWidget* topframe = new QWidget( this );
     setMainWidget( topframe );
-    QBoxLayout* bl;
+    Q3BoxLayout* bl;
     if ( QApplication::desktop()->width() < 640 ) {
-        bl = new QVBoxLayout( topframe  );
+        bl = new Q3VBoxLayout( topframe  );
     } else {
-        bl = new QHBoxLayout( topframe  );
+        bl = new Q3HBoxLayout( topframe  );
     }
-    QVBox* subframe = new QVBox( topframe );
+    Q3VBox* subframe = new Q3VBox( topframe );
     bl->addWidget(subframe  );
     QLabel* lab = new QLabel( i18n("Local Addressee"), subframe ); 
     if ( takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     AddresseeView * av = new AddresseeView( subframe );
     av->setAddressee( loc );
-    subframe = new QVBox( topframe );
+    subframe = new Q3VBox( topframe );
     bl->addWidget(subframe  );
     lab = new QLabel( i18n("Remote Addressee"), subframe  ); 
     if ( !takeloc )
-        lab->setBackgroundColor(Qt::green.light() );
+        lab->setBackgroundColor(QColor(Qt::green).light() );
     av = new AddresseeView( subframe );
     av->setAddressee( rem );
     QObject::connect(findButton( Ok ),SIGNAL(clicked()),this, SLOT(slot_remote())); 
     QObject::connect(this,SIGNAL(user1Clicked()),this, SLOT(slot_local())); 
 #ifndef DESKTOP_VERSION
     showMaximized();
 #else
     resize ( 640, 400 );
 #endif
 }
 
 int AddresseeChooser::executeD( bool local )
 {
     mSyncResult = 3; 
     if ( local ) 
         findButton( User1 )->setFocus();
     else 
         findButton( Ok )->setFocus();
     exec();
     return mSyncResult;  
 }
 void AddresseeChooser::slot_remote()
 {
     mSyncResult = 2;
diff --git a/kabc/addresseeview.h b/kabc/addresseeview.h
index a4de085..f7ce2e0 100644
--- a/kabc/addresseeview.h
+++ b/kabc/addresseeview.h
@@ -5,54 +5,54 @@
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KPIM_ADDRESSEEVIEW_H
 #define KPIM_ADDRESSEEVIEW_H
 
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 
 //US #include <ktextbrowser.h>
-#include <qtextbrowser.h>
+#include <q3textbrowser.h>
 
 namespace KABC {
 
 //US class AddresseeView : public KTextBrowser
-class AddresseeView : public QTextBrowser
+class AddresseeView : public Q3TextBrowser
 {
 
   public:
     AddresseeView( QWidget *parent = 0, const char *name = 0 );
 
     /**
       Sets the addressee object. The addressee is displayed immediately.
 
       @param addr The addressee object.
      */
     void setAddressee( const KABC::Addressee& addr );
     void setSource(const QString& n);
     /**
       Returns the current addressee object.
      */
     //KABC::Addressee addressee() const;
     void printMe(); 
     static bool sFullDetailsMode;
   private: 
     Addressee mCurrentContact;
     //KABC::Addressee mAddressee;
     QString mText;
     QString getPhoneNumbers( KABC::PhoneNumber::List phones, bool preferred );
     void addTag(const QString & tag,const QString & text);
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index d34ba0b..cf5afa6 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -2,100 +2,102 @@
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 
 #include "distributionlist.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace KABC;
 
 DistributionList::DistributionList( DistributionListManager *manager,
                                     const QString &name ) :
   mManager( manager ), mName( name )
 {
   mManager->insert( this );
 }
 
 DistributionList::~DistributionList()
 {
   mManager->remove( this );
 }
 
 void DistributionList::setName( const QString &name )
 {
   mName = name;
 }
 
 QString DistributionList::name() const
 {
   return mName;
 }
 
 void DistributionList::insertEntry( const Addressee &a, const QString &email )
 {
     QString em = email;
     if (em.isNull() )
         em = a.preferredEmail();
     Entry e( a, em );
-  QValueList<Entry>::Iterator it;
+  Q3ValueList<Entry>::Iterator it;
   for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
     if ( (*it).addressee.uid() == a.uid() ) {
       /**
         We have to check if both email addresses contains no data,
         a simple 'email1 == email2' wont work here
        */
       if ( ( (*it).email.isNull() && em.isEmpty() ) ||
            ( (*it).email.isEmpty() && em.isNull() ) ||
            ( (*it).email == em ) ) {
           //*it = e;
         return;
       }
     }
   }
   mEntries.append( e );
 }
 
 void DistributionList::removeEntry( const Addressee &a, const QString &email )
 {
-  QValueList<Entry>::Iterator it;
+  Q3ValueList<Entry>::Iterator it;
   for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
     if ( (*it).addressee.uid() == a.uid() && (*it).email == email ) {
       mEntries.remove( it  );
       return;
     }
   }
 }
 
 QStringList DistributionList::emails() const
 {
   QStringList emails;
 
   Entry::List::ConstIterator it;
   for( it = mEntries.begin(); it != mEntries.end(); ++it ) {
     Addressee a = (*it).addressee;
     QString email = (*it).email.isEmpty() ? a.fullEmail() :
                                             a.fullEmail( (*it).email );
 
     if ( !email.isEmpty() ) {
       emails.append( email );
     }
   }
   
   return emails;
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index c81e543..8d21a17 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -3,73 +3,76 @@
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KABC_DISTRIBUTIONLIST_H
 #define KABC_DISTRIBUTIONLIST_H
 
 //#include <kdirwatch.h>
 
 #include "addressbook.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
 
 namespace KABC {
 
 class DistributionListManager;
 
 /**
   @short Distribution list of email addresses
  
   This class represents a list of email addresses. Each email address is
   associated with an address book entry. If the address book entry changes, the
   entry in the distribution list is automatically updated.
 */
 class DistributionList
 {
   public:
     /**
       @short Distribution List Entry
 
       This class represents an entry of a distribution list. It consists of an
       addressee and an email address. If the email address is null, the
       preferred email address of the addressee is used.
     */
     struct Entry
     {
-      typedef QValueList<Entry> List;
+      typedef Q3ValueList<Entry> List;
 
       Entry() {}
       Entry( const Addressee &_addressee, const QString &_email ) :
           addressee( _addressee ), email( _email ) {}
 
       Addressee addressee;
       QString email;
     };
 
     /**
        Create distribution list object.
 
       @param manager Managing object of this list.
       @param name    Name of this list.
     */
     DistributionList( DistributionListManager *manager, const QString &name );
 
     /**
       Destructor.
     */
     ~DistributionList();
 
     /**
       Set name of this list. The name is used as key by the
@@ -146,49 +149,49 @@ class DistributionListManager
     /**
       Remove distribution list. If a list with this name doesn't exist, nothing
       happens.
     */
     void remove( DistributionList * );
 
     /**
       Return names of all distribution lists managed by this manager.
     */
     QStringList listNames();
 
     /**
       Load distribution lists form disk.
     */
     bool load();
 
     /**
       Save distribution lists to disk.
     */
     bool save();
 
   private:
     AddressBook *mAddressBook;
 
-    QPtrList<DistributionList> mLists;
+    Q3PtrList<DistributionList> mLists;
 };
 
 /**
   @short Watchdog for distribution lists
  
   This class provides a @ref changed() signal that i emitted when the
   distribution lists has changed in some way.
 
   Exapmle:
   
   <pre>
   KABC::DistributionListWatcher *watchdog = KABC::DistributionListWatcher::self()
 
   connect( watchdog, SIGNAL( changed() ), SLOT( doSomething() ) );
   </pre>
 */
 
 /*
 class DistributionListWatcher : public QObject
 {
   Q_OBJECT_XX
   
   public:
    
diff --git a/kabc/distributionlistdialog.cpp b/kabc/distributionlistdialog.cpp
index d2e1144..82883e6 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/kabc/distributionlistdialog.cpp
@@ -1,208 +1,214 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 #include <klineeditdlg.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
+#include <Q3Button>
 #include <qradiobutton.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
 #include "addressbook.h"
 #include "addresseedialog.h"
 #include "distributionlist.h"
 
 #include "distributionlistdialog.h"
 
 //US #include "distributionlistdialog.moc"
 
 using namespace KABC;
 
 DistributionListDialog::DistributionListDialog( AddressBook *addressBook, QWidget *parent)
     : KDialogBase( parent, "", true, i18n("Configure Distribution Lists"), Ok, Ok, true)
 {
   mEditor = new DistributionListEditorWidget( addressBook, this );
   setMainWidget( mEditor );
 
   connect( this, SIGNAL( okClicked() ), mEditor, SLOT( save() ) );
 }
 
 DistributionListDialog::~DistributionListDialog()
 {
 }
 
 
 EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
                                       QWidget *parent ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
                parent )
 {
-  QFrame *topFrame = plainPage();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = plainPage();
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
-  mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   topLayout->addWidget( mButtonGroup );
 
   QStringList::ConstIterator it;
   for( it = emails.begin(); it != emails.end(); ++it ) {
     QRadioButton *button = new QRadioButton( *it, mButtonGroup );
     if ( (*it) == current ) {
       button->setDown( true );
     }
   }
 }
 
 QString EmailSelector::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
   if ( button ) return button->text();
   return QString::null;
 }
 
 QString EmailSelector::getEmail( const QStringList &emails, const QString &current,
                                      QWidget *parent )
 {
   EmailSelector *dlg = new EmailSelector( emails, current, parent );
   dlg->exec();
 
   QString result = dlg->selected();
 
   delete dlg;
 
   return result;
 }
 
-class EntryItem : public QListViewItem
+class EntryItem : public Q3ListViewItem
 {
   public:
-    EntryItem( QListView *parent, const Addressee &addressee,
+    EntryItem( Q3ListView *parent, const Addressee &addressee,
                const QString &email=QString::null ) :
-      QListViewItem( parent ),
+      Q3ListViewItem( parent ),
       mAddressee( addressee ),
       mEmail( email )
     {
       setText( 0, addressee.realName() );
       if( email.isEmpty() ) {
         setText( 1, addressee.preferredEmail() );
         setText( 2, i18n("Yes") );
       } else {
         setText( 1, email );
         setText( 2, i18n("No") );
       }
     }
 
     Addressee addressee() const
     {
       return mAddressee;
     }
 
     QString email() const
     {
       return mEmail;
     }
 
   private:
     Addressee mAddressee;
     QString mEmail;
 };
 
 DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *addressBook, QWidget *parent) :
   QWidget( parent ),
   mAddressBook( addressBook )
 {
   kdDebug(5700) << "DistributionListEditor()" << endl;
 
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
 
-  QBoxLayout *nameLayout = new QHBoxLayout( topLayout) ;
+  Q3BoxLayout *nameLayout = new Q3HBoxLayout( topLayout) ;
 
   mNameCombo = new QComboBox( this );
   nameLayout->addWidget( mNameCombo );
   connect( mNameCombo, SIGNAL( activated( int ) ), SLOT( updateEntryView() ) );
 
   mNewButton = new QPushButton( i18n("New List..."), this );
   nameLayout->addWidget( mNewButton );
   connect( mNewButton, SIGNAL( clicked() ), SLOT( newList() ) );
 
   mEditButton = new QPushButton( i18n("Rename List..."), this );
   nameLayout->addWidget( mEditButton );
   connect( mEditButton, SIGNAL( clicked() ), SLOT( editList() ) );
 
   mRemoveButton = new QPushButton( i18n("Remove List"), this );
   nameLayout->addWidget( mRemoveButton );
   connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeList() ) );
 
-  QGridLayout *gridLayout = new QGridLayout( topLayout, 3, 3 );
+  Q3GridLayout *gridLayout = new Q3GridLayout( topLayout, 3, 3 );
   gridLayout->setColStretch(1, 1);
 
   QLabel *listLabel = new QLabel( i18n("Available addresses:"), this );
   gridLayout->addWidget( listLabel, 0, 0 );
 
   mListLabel = new QLabel( this );
   gridLayout->addMultiCellWidget( mListLabel, 0, 0, 1, 2 );
 
-  mAddresseeView = new QListView( this );
+  mAddresseeView = new Q3ListView( this );
   mAddresseeView->addColumn( i18n("Name") );
   mAddresseeView->addColumn( i18n("Preferred Email") );
   mAddresseeView->setAllColumnsShowFocus( true );
   gridLayout->addWidget( mAddresseeView, 1, 0 );
   connect( mAddresseeView, SIGNAL( selectionChanged() ),
            SLOT( slotSelectionAddresseeViewChanged() ) );
-  connect( mAddresseeView, SIGNAL( doubleClicked( QListViewItem * ) ),
+  connect( mAddresseeView, SIGNAL( doubleClicked( Q3ListViewItem * ) ),
            SLOT( addEntry() ) );
 
   mAddEntryButton = new QPushButton( i18n("Add Entry"), this );
   mAddEntryButton->setEnabled(false);
   gridLayout->addWidget( mAddEntryButton, 2, 0 );
   connect( mAddEntryButton, SIGNAL( clicked() ), SLOT( addEntry() ) );
 
-  mEntryView = new QListView( this );
+  mEntryView = new Q3ListView( this );
   mEntryView->addColumn( i18n("Name") );
   mEntryView->addColumn( i18n("Email") );
   mEntryView->addColumn( i18n("Use Preferred") );
   mEntryView->setEnabled(false);
   mEntryView->setAllColumnsShowFocus( true );
   gridLayout->addMultiCellWidget( mEntryView, 1, 1, 1, 2 );
   connect( mEntryView, SIGNAL( selectionChanged() ),
            SLOT( slotSelectionEntryViewChanged() ) );
 
   mChangeEmailButton = new QPushButton( i18n("Change Email..."), this );
   gridLayout->addWidget( mChangeEmailButton, 2, 1 );
   connect( mChangeEmailButton, SIGNAL( clicked() ), SLOT( changeEmail() ) );
 
   mRemoveEntryButton = new QPushButton( i18n("Remove Entry"), this );
   gridLayout->addWidget( mRemoveEntryButton, 2, 2 );
   connect( mRemoveEntryButton, SIGNAL( clicked() ), SLOT( removeEntry() ) );
 
   mManager = new DistributionListManager( mAddressBook );
   mManager->load();
 
   updateAddresseeView();
   updateNameCombo();
 }
 
diff --git a/kabc/distributionlistdialog.h b/kabc/distributionlistdialog.h
index b6d3c80..3627431 100644
--- a/kabc/distributionlistdialog.h
+++ b/kabc/distributionlistdialog.h
@@ -1,55 +1,57 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KABC_DISTRIBUTIONLISTDIALOG_H
 #define KABC_DISTRIBUTIONLISTDIALOG_H
 
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QLabel>
 
 #include <kdialogbase.h>
 
-class QListView;
+class Q3ListView;
 class QLabel;
 class QComboBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 
 namespace KABC {
 
 class AddressBook;
 class DistributionListEditorWidget;
 class DistributionListManager;
 
 /**
   @short Frontend to create distribution lists
  
   Creating a new DistributionListDialog does automatically
   load all addressees and distribution lists from the config
   files. The changes will be saved when clicking the 'OK'
   button.
  
   Example:
  
   <pre>
   KABC::DistributionListDialog *dlg = new
           KABC::DistributionListDialog( KABC::StdAddressBook::self(), this );
  
   dlg->exec();
   </pre>
 */
@@ -72,69 +74,69 @@ class DistributionListDialog : public KDialogBase
     virtual ~DistributionListDialog();
 
   private:
     DistributionListEditorWidget *mEditor;
 
     struct Data;
     Data *d;
 };
 
 /**
   @short Helper class
 */
 class EmailSelector : public KDialogBase
 {
   public:
     EmailSelector( const QStringList &emails, const QString &current,
         QWidget *parent );
 
     QString selected();
 
     static QString getEmail( const QStringList &emails, const QString &current,
         QWidget *parent );
 
   private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
 
 /**
   @short Helper class
 */
 class DistributionListEditorWidget : public QWidget
 {
     Q_OBJECT
 
   public:
     DistributionListEditorWidget( AddressBook *, QWidget *parent );
     virtual ~DistributionListEditorWidget();
 
   private slots:
     void newList();
     void editList();
     void removeList();
     void addEntry();
     void removeEntry();
     void changeEmail();
     void updateEntryView();
     void updateAddresseeView();
     void updateNameCombo();
     void slotSelectionEntryViewChanged();
     void slotSelectionAddresseeViewChanged();
     void save();
 
   private:
     QComboBox *mNameCombo;  
     QLabel *mListLabel;
-    QListView *mEntryView;
-    QListView *mAddresseeView;
+    Q3ListView *mEntryView;
+    Q3ListView *mAddresseeView;
 
     AddressBook *mAddressBook;
     DistributionListManager *mManager;
     QPushButton *mNewButton, *mEditButton, *mRemoveButton;
     QPushButton *mChangeEmailButton, *mRemoveEntryButton, *mAddEntryButton;
 
     struct Data;
     Data *d;
 };
 
 }
 #endif
diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp
index 9f5840b..ca5ecb7 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/kabc/distributionlisteditor.cpp
@@ -1,189 +1,193 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #ifdef DESKTOP_VERSION
 #include <qinputdialog.h>
 #else
 #include <qtcompat/qinputdialog.h>
 #endif
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 
 #include <klocale.h>
 #include <kdebug.h>
 
 #include "addressbook.h"
 #include "addresseedialog.h"
 #include "distributionlist.h"
 
 #include "distributionlisteditor.h"
 
 //US #include "distributionlisteditor.moc"
 
 using namespace KABC;
 
 EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString &current,
                                       QWidget *parent ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
                parent )
 {
-  QFrame *topFrame = plainPage();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = plainPage();
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
-  mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   topLayout->addWidget( mButtonGroup );
 
   QStringList::ConstIterator it;
   for( it = emails.begin(); it != emails.end(); ++it ) {
     QRadioButton *button = new QRadioButton( *it, mButtonGroup );
     if ( (*it) == current ) {
       button->setDown( true );
     }
   }
 }
 
 QString EmailSelectDialog::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
   if ( button ) return button->text();
   return QString::null;
 }
 
 QString EmailSelectDialog::getEmail( const QStringList &emails, const QString &current,
                                      QWidget *parent )
 {
   
   EmailSelectDialog *dlg = new EmailSelectDialog( emails, current, parent );
   dlg->exec();
 
   QString result = dlg->selected();
 
   delete dlg;
 
   return result;
 }
 
-class EditEntryItem : public QListViewItem
+class EditEntryItem : public Q3ListViewItem
 {
   public:
-    EditEntryItem( QListView *parent, const Addressee &addressee,
+    EditEntryItem( Q3ListView *parent, const Addressee &addressee,
                const QString &email=QString::null ) :
-      QListViewItem( parent ),
+      Q3ListViewItem( parent ),
       mAddressee( addressee ),
       mEmail( email )
     {
       setText( 0, addressee.realName() );
       if( email.isEmpty() ) {
         setText( 1, addressee.preferredEmail() );
         setText( 2, i18n("Yes") );
       } else {
         setText( 1, email );
         setText( 2, i18n("No") );
       }
     }
 
     Addressee addressee() const
     {
       return mAddressee;
     }
 
     QString email() const
     {
       return mEmail;
     }
 
   private:
     Addressee mAddressee;
     QString mEmail;
 };
 
 DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidget *parent) :
   QWidget( parent ),
   mAddressBook( addressBook )
 {
   kdDebug(5700) << "DistributionListEditor()" << endl;
 
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setMargin( KDialog::marginHint() );
   topLayout->setSpacing( KDialog::spacingHint() );
 
-  QBoxLayout *nameLayout = new QHBoxLayout( topLayout) ;
+  Q3BoxLayout *nameLayout = new Q3HBoxLayout( topLayout) ;
 
   mNameCombo = new QComboBox( this );
   nameLayout->addWidget( mNameCombo );
   connect( mNameCombo, SIGNAL( activated( int ) ), SLOT( updateEntryView() ) );
 
   newButton = new QPushButton( i18n("New List"), this );
   nameLayout->addWidget( newButton );
   connect( newButton, SIGNAL( clicked() ), SLOT( newList() ) );
 
   removeButton = new QPushButton( i18n("Remove List"), this );
   nameLayout->addWidget( removeButton );
   connect( removeButton, SIGNAL( clicked() ), SLOT( removeList() ) );
 
-  mEntryView = new QListView( this );
+  mEntryView = new Q3ListView( this );
   mEntryView->addColumn( i18n("Name") );
   mEntryView->addColumn( i18n("Email") );
   mEntryView->addColumn( i18n("Use Preferred") );
   topLayout->addWidget( mEntryView );
   connect(mEntryView,SIGNAL(selectionChanged ()),this, SLOT(slotSelectionEntryViewChanged()));
 
   changeEmailButton = new QPushButton( i18n("Change Email"), this );
   topLayout->addWidget( changeEmailButton );
   connect( changeEmailButton, SIGNAL( clicked() ), SLOT( changeEmail() ) );
 
   removeEntryButton = new QPushButton( i18n("Remove Entry"), this );
   topLayout->addWidget( removeEntryButton );
   connect( removeEntryButton, SIGNAL( clicked() ), SLOT( removeEntry() ) );
 
   addEntryButton = new QPushButton( i18n("Add Entry"), this );
   topLayout->addWidget( addEntryButton );
   connect( addEntryButton, SIGNAL( clicked() ), SLOT( addEntry() ) );
 
-  mAddresseeView = new QListView( this );
+  mAddresseeView = new Q3ListView( this );
   mAddresseeView->addColumn( i18n("Name") );
   mAddresseeView->addColumn( i18n("Preferred Email") );
   topLayout->addWidget( mAddresseeView );
 
 
   connect(mAddresseeView,SIGNAL(selectionChanged ()),this, SLOT(slotSelectionAddresseeViewChanged()));
 
   mManager = new DistributionListManager( mAddressBook );
   mManager->load();
 
   updateAddresseeView();
   updateNameCombo();
   removeButton->setEnabled(!mManager->listNames().isEmpty());
 }
 
 DistributionListEditor::~DistributionListEditor()
 {
   kdDebug(5700) << "~DistributionListEditor()" << endl;
 
   mManager->save();
   delete mManager;
 }
 
 void DistributionListEditor::slotSelectionEntryViewChanged()
diff --git a/kabc/distributionlisteditor.h b/kabc/distributionlisteditor.h
index e0b4221..e672a14 100644
--- a/kabc/distributionlisteditor.h
+++ b/kabc/distributionlisteditor.h
@@ -3,84 +3,84 @@
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef KABC_DISTRIBUTIONLISTEDITOR_H
 #define KABC_DISTRIBUTIONLISTEDITOR_H
 
 #include <qwidget.h>
 
 #include <kdialogbase.h>
 
-class QListView;
+class Q3ListView;
 class QComboBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 
 namespace KABC {
 
 class AddressBook;
 class DistributionListManager;
 
 class EmailSelectDialog : public KDialogBase
 {
   public:
     EmailSelectDialog( const QStringList &emails, const QString &current,
                        QWidget *parent );
     
     QString selected();
 
     static QString getEmail( const QStringList &emails, const QString &current,
                              QWidget *parent );
 
   private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
 
 /**
   @obsolete
 */
 class DistributionListEditor : public QWidget
 {
     Q_OBJECT
   public:
     DistributionListEditor( AddressBook *, QWidget *parent );
     virtual ~DistributionListEditor();
 
   private slots:
     void newList();
     void removeList();
     void addEntry();
     void removeEntry();
     void changeEmail();
     void updateEntryView();
     void updateAddresseeView();
     void updateNameCombo();
     void slotSelectionEntryViewChanged();
     void slotSelectionAddresseeViewChanged();
 
   private:
     QComboBox *mNameCombo;  
-    QListView *mEntryView;
-    QListView *mAddresseeView;
+    Q3ListView *mEntryView;
+    Q3ListView *mAddresseeView;
 
     AddressBook *mAddressBook;
     DistributionListManager *mManager;
     QPushButton *newButton, *removeButton;
     QPushButton *changeEmailButton,*removeEntryButton,*addEntryButton;
 };
 
 }
 
 #endif
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 7c6d7a9..203f696 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -12,48 +12,50 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <klocale.h>
 #include <kconfig.h>
 #include <kconfigbase.h>
 #include <kglobal.h>
 
 #include "field.h"
 #include "resource.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 
 using namespace KABC;
 
 class Field::FieldImpl
 {
   public:
     FieldImpl( int fieldId, int category = 0,
                const QString &label = QString::null,
                const QString &key = QString::null,
                const QString &app = QString::null )
       : mFieldId( fieldId ), mCategory( category ), mLabel( label ),
         mKey( key ), mApp( app ) {}
   
     enum FieldId
     {
       CustomField,
       FormattedName,
       FamilyName,
       GivenName,
       AdditionalName,
       Prefix,
       Suffix,
       NickName,
       Birthday,
@@ -356,49 +358,49 @@ bool Field::setValue( KABC::Addressee &a, const QString &value )
     case FieldImpl::NickName:
       a.setNickName( value );
       return true;
     case FieldImpl::Mailer:
       a.setMailer( value );
       return true;
     case FieldImpl::Title:
       a.setTitle( value );
       return true;
     case FieldImpl::Role:
       a.setRole( value );
       return true;
     case FieldImpl::Organization:
       a.setOrganization( value );
       return true;
     case FieldImpl::Note:
       a.setNote( value );
       return true;
     case FieldImpl::Birthday:
 //US
 //the generated code had the following format: return a.setBirthday( QDate::fromString( value, Qt::ISODate ) );
 // But Qt::IsoDate and QDate::fromString was not specified. Do I have the wrong QT version ?
       {
       QDate dt = KGlobal::locale()->readDate( value, "%Y-%m-%d");  // = Qt::ISODate
-      a.setBirthday(dt);
+      a.setBirthday((QDateTime)dt);
       }
       return true;
     case FieldImpl::CustomField:
       a.insertCustom( mImpl->app(), mImpl->key(), value );
 //US never copy the resourcename back to the adressee. 
     case FieldImpl::Resource:
     default:
       return false;
   }
 }
 
 bool Field::isCustom()
 {
   return mImpl->fieldId() == FieldImpl::CustomField;
 }
 
 Field::List Field::allFields()
 {
   if ( mAllFields.isEmpty() ) {
     createField( FieldImpl::FormattedName, Frequent );
     createField( FieldImpl::FamilyName, Frequent );
     createField( FieldImpl::GivenName, Frequent );
     createField( FieldImpl::AdditionalName );
     createField( FieldImpl::Prefix );
@@ -472,96 +474,96 @@ void Field::deleteFields()
   mAllFields.clear();
 
   for( it = mDefaultFields.begin(); it != mDefaultFields.end(); ++it ) {
     delete (*it);
   }
   mDefaultFields.clear();
 
   for( it = mCustomFields.begin(); it != mCustomFields.end(); ++it ) {
     delete (*it);
   }
   mCustomFields.clear();
 }
 
 void Field::saveFields( const QString &identifier,
                         const Field::List &fields )
 {
   KConfig *cfg = KGlobal::config();
   KConfigGroupSaver( cfg, "KABCFields" );
   saveFields( cfg, identifier, fields );
 }
 
 void Field::saveFields( KConfig *cfg, const QString &identifier,
                         const Field::List &fields )
 {
-  QValueList<int> fieldIds;
+  Q3ValueList<int> fieldIds;
 
 //US
 //  qDebug("Field::saveFields to %s %s", cfg->getFileName().latin1(), identifier.latin1());
     
   int custom = 0;
   Field::List::ConstIterator it;
   for( it = fields.begin(); it != fields.end(); ++it ) {
 //US  
 //  qDebug("Field::saveFields field:%i", (*it)->mImpl->fieldId());
     
     fieldIds.append( (*it)->mImpl->fieldId() );
     if( (*it)->isCustom() ) {
       QStringList customEntry;
       customEntry << (*it)->mImpl->label();
       customEntry << (*it)->mImpl->key();
       customEntry << (*it)->mImpl->app();
       cfg->writeEntry( "KABC_CustomEntry_" + identifier + "_" +
                        QString::number( custom++ ), customEntry );
     }
   }
   cfg->writeEntry( identifier, fieldIds );
 }
 
 Field::List Field::restoreFields( const QString &identifier )
 {
 //US
 //  qDebug("Field::restoreFields, identifier: %s", identifier.latin1());
   
   KConfig *cfg = KGlobal::config();
   KConfigGroupSaver( cfg, "KABCFields" );
   cfg->setGroup( "KABCFields" );
   
   Field::List l = restoreFields( cfg, identifier );
 
   return l;
 }
 
 Field::List Field::restoreFields( KConfig *cfg, const QString &identifier )
 {
-  QValueList<int> fieldIds = cfg->readIntListEntry( identifier);
+  Q3ValueList<int> fieldIds = cfg->readIntListEntry( identifier);
 //US
 //  qDebug("Field::restoreFields from %s, identifier: %s", cfg->getFileName().latin1(), identifier.latin1());
   
   Field::List fields;
 
   int custom = 0;
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
   for( it = fieldIds.begin(); it != fieldIds.end(); ++it ) {
     FieldImpl *f = 0;
     if ( (*it) == FieldImpl::CustomField ) {
       QStringList customEntry = cfg->readListEntry( "KABC_CustomEntry_" +
                                                  identifier + "_" +
                                                  QString::number( custom++ ) );
       f = new FieldImpl( *it, CustomCategory, customEntry[ 0 ],
                          customEntry[ 1 ], customEntry[ 2 ] );
     } else {
       f = new FieldImpl( *it );
     }
     fields.append( new Field( f ) );
   }
   
   return fields;
 }
 
 bool Field::equals( Field *field )
 {
   bool sameId = ( mImpl->fieldId() == field->mImpl->fieldId() );
 
   if ( !sameId ) return false;
 
   if ( mImpl->fieldId() != FieldImpl::CustomField ) return true;
diff --git a/kabc/field.h b/kabc/field.h
index 9e06597..55cc705 100644
--- a/kabc/field.h
+++ b/kabc/field.h
@@ -8,63 +8,63 @@
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_FIELD_H
 #define KABC_FIELD_H
 
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "addressee.h"
 
 class KConfig;
 
 namespace KABC {
 
 class Field
 {
   class FieldImpl;
   friend class FieldImpl;
 
 public:
-  typedef QValueList<Field *> List;
+  typedef Q3ValueList<Field *> List;
 
   /**
    * @li @p All -
    * @li @p Frequent -
    * @li @p Address -
    * @li @p Email -
    * @li @p Personal -
    * @li @p Organization -
    * @li @p CustomCategory -
    */  
   enum FieldCategory
   {
     All = 0x0,
     Frequent = 0x01,
     Address = 0x02,
     Email = 0x04,
     Personal = 0x08,
     Organization = 0x10,
     CustomCategory = 0x20
   };
 
   /**
    * Returns the translated label for this field.
    */
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp
index 3ae1c27..cbb97a2 100644
--- a/kabc/formatfactory.cpp
+++ b/kabc/formatfactory.cpp
@@ -81,49 +81,49 @@ US lets enter all resources directly instead of using teh desktopfiles.
     mFormatList.insert( type, info );
   }
 #endif 
     //US we already have vcard as default format.
     info = new FormatInfo;
     info->library = i18n("microkabcformat_binary");
     info->nameLabel = i18n( "Binary" );
     info->descriptionLabel = i18n( "No description available." );
     mFormatList.insert( "binary", info );
 
 }
 
 FormatFactory::~FormatFactory()
 {
   mFormatList.clear();
 }
 
 QStringList FormatFactory::formats()
 {
   QStringList retval;
 
   // make sure 'vcard' is the first entry
   retval << "vcard";
 
-  QDictIterator<FormatInfo> it( mFormatList );
+  Q3DictIterator<FormatInfo> it( mFormatList );
   for ( ; it.current(); ++it )
     if ( it.currentKey() != "vcard" )
       retval << it.currentKey();
 
   return retval;
 }
 
 FormatInfo *FormatFactory::info( const QString &type )
 {
   if ( type.isEmpty() )
     return 0;
   else
     return mFormatList[ type ];
 }
 
 FormatPlugin *FormatFactory::format( const QString& type )
 {
   FormatPlugin *format = 0;
 
   if ( type.isEmpty() )
     return 0;
 
   if ( type == "vcard" ) {
     format = new VCardFormatPlugin;
diff --git a/kabc/formatfactory.h b/kabc/formatfactory.h
index 9612374..de15b17 100644
--- a/kabc/formatfactory.h
+++ b/kabc/formatfactory.h
@@ -1,48 +1,48 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef KABC_FORMATFACTORY_H
 #define KABC_FORMATFACTORY_H
 
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 
 #include <kconfig.h>
 #ifndef DESKTOP_VERSION
 #include <klibloader.h>
 #endif
 
 #include "formatplugin.h"
 
 namespace KABC {
 
 struct FormatInfo
 {
   QString library;
   QString nameLabel;
   QString descriptionLabel;
 };
 
 /**
  * Class for loading format plugins.
  *
  * Example:
  *
  * <pre>
@@ -76,29 +76,29 @@ class FormatFactory
      *
      * @param type   The type of the format, returned by @ref formats()
      */
     FormatPlugin *format( const QString &type );
 
     /**
      * Returns a list of all available format types.
      */
     QStringList formats();
 
     /**
      * Returns the info structure for a special type.
      */
     FormatInfo *info( const QString &type );
 
   protected:
     FormatFactory();
 
   private:
 #ifndef DESKTOP_VERSION
     KLibrary *openLibrary( const QString& libName );
 #endif
     static FormatFactory *mSelf;
 
-    QDict<FormatInfo> mFormatList;
+    Q3Dict<FormatInfo> mFormatList;
 };
 
 }
 #endif
diff --git a/kabc/formats/binary/kabcformat_binaryE.pro b/kabc/formats/binary/kabcformat_binaryE.pro
index 2d9594d..c71197e 100644
--- a/kabc/formats/binary/kabcformat_binaryE.pro
+++ b/kabc/formats/binary/kabcformat_binaryE.pro
@@ -1,21 +1,21 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabcformat_binary
 #INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 
 INTERFACES = \
 
 HEADERS = \
  binaryformat.h
  
 SOURCES = \
  binaryformat.cpp
diff --git a/kabc/formats/vcardformatplugin2.cpp b/kabc/formats/vcardformatplugin2.cpp
index 41b0c9a..fbebe92 100644
--- a/kabc/formats/vcardformatplugin2.cpp
+++ b/kabc/formats/vcardformatplugin2.cpp
@@ -1,124 +1,124 @@
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "vcardformatplugin2.h"
 
 #include "address.h"
 #include "addressee.h"
 #include "vcardparser/vcardtool.h"
 
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 
 using namespace KABC;
 
 extern "C"
 {
   FormatPlugin *format()
   {
     return new VCardFormatPlugin2();
   }
 }
 
 VCardFormatPlugin2::VCardFormatPlugin2()
 {
 }
 
 VCardFormatPlugin2::~VCardFormatPlugin2()
 {
 }
 
 bool VCardFormatPlugin2::load( Addressee &addressee, QFile *file )
 {
   qDebug("VCardFormatPlugin2::load");
   QString data;
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   data = t.read();
 
   VCardTool tool;
   
   Addressee::List l = tool.parseVCards( data );
 
   if ( ! l.first().isEmpty() ) {
     addressee = l.first();
     return true;
   }
 
   return false;
 }
 
 bool VCardFormatPlugin2::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
 {
   qDebug("VCardFormatPlugin2::loadAll");
   QString data;
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   data = t.read();
 
   VCardTool tool;
 
   Addressee::List l = tool.parseVCards( data );
 
   Addressee::List::Iterator itr;
 
   for ( itr = l.begin(); itr != l.end(); ++itr) {
     Addressee addressee = *itr;
     addressee.setResource( resource );
     addressBook->insertAddressee( addressee );
   }
 
   return true;
 }
 
 void VCardFormatPlugin2::save( const Addressee &addressee, QFile *file )
 {
   qDebug("VCardFormatPlugin2::save");
   VCardTool tool;
   Addressee::List vcardlist;
 
 
   vcardlist.append( addressee );
 
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   t << tool.createVCards( vcardlist );
 }
 
 void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *file )
 {
   qDebug("VCardFormatPlugin2::saveAll");
   VCardTool tool;
   Addressee::List vcardlist;
 
   AddressBook::Iterator it;
   for ( it = ab->begin(); it != ab->end(); ++it ) {
     if ( (*it).resource() == resource ) {
       (*it).setChanged( false );
       vcardlist.append( *it );
     }
   }
   
-  QTextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream t( file );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
   t << tool.createVCards( vcardlist );
 }
 
 bool VCardFormatPlugin2::checkFormat( QFile *file ) const
 {
   QString line;
 
-  file->readLine( line, 1024 );
+  char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp;
   line = line.stripWhiteSpace();
   if ( line == "BEGIN:VCARD" )
     return true;
   else
     return false;
 }
 
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 17ebff8..846ed8a 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -1,36 +1,36 @@
         TEMPLATE= lib
 CONFIG += qt warn_on 
 #release debug
 DESTDIR=../bin
 
-TARGET = microkabc
+TARGET = xmicrokabc
 
 include( ../variables.pri )
 
 INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kio/kfile ../microkde/kio/kio ../libkdepim ../qtcompat ../microkde/kdeui ..
 
-#LIBS += -lmicrokde -lldap
+#LIBS += -lxmicrokde -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
 unix : {
 
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 }
 INTERFACES = \
 
 
 HEADERS = \
  resource.h \
  stdaddressbook.h \
  agent.h \
  geo.h \
  key.h \
  field.h \
  plugin.h \
  address.h \
@@ -195,24 +195,28 @@ vcard/RToken.cpp \
 vcard/SourceParam.cpp \
 vcard/TelParam.cpp \
 vcard/TextParam.cpp \
 vcard/TextValue.cpp \
 vcard/TextBinParam.cpp \
 vcard/URIValue.cpp \
 vcard/VCardv.cpp \
 vcard/VCardEntity.cpp \
 vcard/Value.cpp \
 vcard/SoundValue.cpp \
 vcard/AgentValue.cpp \
 vcard/TelValue.cpp \
 vcard/TextBinValue.cpp \
 vcard/OrgValue.cpp \
 vcard/UTCValue.cpp \
 vcard/ClassValue.cpp \
 vcard/FloatValue.cpp \
 vcard/TextListValue.cpp
 
 
 # plugins/ldap/resourceldap.cpp \
 # plugins/ldap/resourceldapconfig.cpp \
 
 #formats/binary/binaryformat.cpp \
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+QT +=  
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 1d28a4d..6045b68 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,35 +1,35 @@
         TEMPLATE= lib
 CONFIG += qt warn_on 
-TARGET = microkabc
+TARGET = xmicrokabc
 
 
 INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokdepim 
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokdepim 
 #LIBS += -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 
 #enable the following line if you want to get debugoutput while loading adresses
 #DEFINES += VCARD_DEBUG 
 
 INTERFACES = \
 
 HEADERS = \
  address.h \
  addressbook.h \
  addressee.h \
  addresseedialog.h \
  addresseelist.h \
  addresseeview.h \
  agent.h \
  distributionlist.h \
  distributionlistdialog.h \
  distributionlisteditor.h \
  field.h \
  formatfactory.h \
  formatplugin.h \
  geo.h \
@@ -173,24 +173,26 @@ vcard/Param.cpp \
 vcard/PhoneNumberValue.cpp \
 vcard/RToken.cpp \
 vcard/SourceParam.cpp \
 vcard/TelParam.cpp \
 vcard/TextParam.cpp \
 vcard/TextValue.cpp \
 vcard/TextBinParam.cpp \
 vcard/URIValue.cpp \
 vcard/VCardv.cpp \
 vcard/VCardEntity.cpp \
 vcard/Value.cpp \
 vcard/SoundValue.cpp \
 vcard/AgentValue.cpp \
 vcard/TelValue.cpp \
 vcard/TextBinValue.cpp \
 vcard/OrgValue.cpp \
 vcard/UTCValue.cpp \
 vcard/ClassValue.cpp \
 vcard/FloatValue.cpp \
 vcard/TextListValue.cpp
 
 
 # plugins/ldap/resourceldap.cpp \
 # plugins/ldap/resourceldapconfig.cpp \
+#The following line was inserted by qt3to4
+QT +=  qt3support 
diff --git a/kabc/key.h b/kabc/key.h
index 6ea5b47..313eb7d 100644
--- a/kabc/key.h
+++ b/kabc/key.h
@@ -7,63 +7,63 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_KEY_H
 #define KABC_KEY_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 namespace KABC {
 
 /**
  * @short A class to store an encryption key.
  */
 class Key
 {
   friend QDataStream &operator<<( QDataStream &, const Key & );
   friend QDataStream &operator>>( QDataStream &, Key & );
 
 public:
-  typedef QValueList<Key> List;
-  typedef QValueList<int> TypeList;  
+  typedef Q3ValueList<Key> List;
+  typedef Q3ValueList<int> TypeList;  
 
   /**
    * Key types
    *
    * @li X509   - X509 key
    * @li PGP    - Pretty Good Privacy key
    * @li Custom - Custom or IANA conform key
    */
   enum Types {
     X509,
     PGP,
     Custom
   };
 
   /**
    * Constructor.
    *
    * @param text  The text data.
    * @param type  The key type, @see Types.
    */
   Key( const QString &text = QString::null, int type = PGP );
 
   /**
    * Destructor.
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index feeba6c..6bc89d3 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -7,68 +7,68 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_PHONENUMBER_H
 #define KABC_PHONENUMBER_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qstring.h>
 
 namespace KABC {
 
 /**
   @short Phonenumber information.
   
   This class provides phone number information. A phone number is classified by
   a type. The following types are available, it's possible to use multiple types
   @ref Types for a number by combining them through a logical or.
 */
 class PhoneNumber
 {
     friend QDataStream &operator<<( QDataStream &, const PhoneNumber & );
     friend QDataStream &operator>>( QDataStream &, PhoneNumber & );
 
   public:
-    typedef QValueList<PhoneNumber> List;
-    typedef QValueList<int> TypeList;
+    typedef Q3ValueList<PhoneNumber> List;
+    typedef Q3ValueList<int> TypeList;
 
     /**
       @li @p Home -  Home number
       @li @p Work -  Office number
       @li @p Msg -   Messaging
       @li @p Pref -  Preferred number
       @li @p Voice - Voice
       @li @p Fax -   Fax machine
       @li @p Cell -  Cell phone
       @li @p Video - Video phone
       @li @p Bbs -   Mailbox
       @li @p Modem - Modem
       @li @p Car -   Car phone
       @li @p Isdn -  ISDN connection
       @li @p Pcs -   Personal Communication Service
       @li @p Pager - Pager
     */
     enum Types { Home = 1, Work = 2, Msg = 4, Pref = 8, Voice = 16, Fax = 32,
            Cell = 64, Video = 128, Bbs = 256, Modem = 512, Car = 1024,
            Isdn = 2048, Pcs = 4096, Pager = 8192 };
 
     /**
       Create an empty phone number object.
     */  
diff --git a/kabc/picture.cpp b/kabc/picture.cpp
index 57aa297..0c59937 100644
--- a/kabc/picture.cpp
+++ b/kabc/picture.cpp
@@ -5,48 +5,50 @@
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "picture.h"
+//Added by qt3to4:
+#include <QPixmap>
 
 using namespace KABC;
 
 Picture::Picture()
   : mIntern( false )
 {
   mUndefined = true;
 }
 
 Picture::Picture( const QString &url )
   : mUrl( url ), mIntern( false )
 {
   mUndefined = false;
 }
 
 Picture::Picture( const QImage &data )
   : mData( data ), mIntern( true )
 {
   mUndefined = false;
 }
 
 Picture::~Picture()
 {
 }
diff --git a/kabc/picture.h b/kabc/picture.h
index 714d1e2..1b63610 100644
--- a/kabc/picture.h
+++ b/kabc/picture.h
@@ -8,48 +8,50 @@
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_PICTURE_H
 #define KABC_PICTURE_H
 
 #include <qimage.h>
+//Added by qt3to4:
+#include <QPixmap>
 
 namespace KABC {
 
 class Picture
 {
   friend QDataStream &operator<<( QDataStream &, const Picture & );
   friend QDataStream &operator>>( QDataStream &, Picture & );
 
 public:
 
   /**
    * Consturctor. Creates an empty object.
    */
   Picture();
 
   /**
    * Consturctor.
    *
    * @param url  A URL that describes the position of the picture file.
    */
   Picture( const QString &url );
 
   /**
    * Consturctor.
diff --git a/kabc/plugins/dir/dir.pro b/kabc/plugins/dir/dir.pro
index 3e18594..9b3b894 100644
--- a/kabc/plugins/dir/dir.pro
+++ b/kabc/plugins/dir/dir.pro
@@ -1,36 +1,40 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
 include( ../../../variables.pri )
 
-TARGET = microkabc_dir
+TARGET = xmicrokabc_dir
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -lxmicrokde -lxmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcedir.h \
  resourcedirconfig.h
  
 SOURCES = \
  resourcedir.cpp \
  resourcedirconfig.cpp
 
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+#The following line was inserted by qt3to4
+QT += xml  
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index cda4e2f..75332a0 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -1,21 +1,21 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
-TARGET = microkabc_dir
+TARGET = xmicrokabc_dir
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcedir.h \
  resourcedirconfig.h
  
 SOURCES = \
  resourcedir.cpp \
  resourcedirconfig.cpp
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index c61664b..cc4afee 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -149,146 +149,146 @@ Ticket *ResourceDir::requestSaveTicket()
 
   if ( !addressBook() ) return 0;
 #ifdef ALLOW_LOCKING
   if ( !lock( mPath ) ) {
     
     return 0;
   }
 #endif
   return createTicket( this );
 
 }
 
 
 bool ResourceDir::doOpen()
 {
   QDir dir( mPath );
   if ( !dir.exists() ) { // no directory available
     return dir.mkdir( dir.path() );
   } else {
     QString testName = dir.entryList( QDir::Files )[0];
     if ( testName.isNull() || testName.isEmpty() ) // no file in directory
       return true;
 
     QFile file( mPath + "/" + testName );
-    if ( file.open( IO_ReadOnly ) )
+    if ( file.open( QIODevice::ReadOnly ) )
       return true;
 
     if ( file.size() == 0 )
       return true;
 
     bool ok = mFormat->checkFormat( &file );
     file.close();
     return ok;
   }
 }
 
 void ResourceDir::doClose()
 {
 }
 
 bool ResourceDir::load()
 {
   QDir dir( mPath );
   QStringList files = dir.entryList( QDir::Files );
 
   QStringList::Iterator it;
   bool ok = true;
   for ( it = files.begin(); it != files.end(); ++it ) {
     QFile file( mPath + "/" + (*it) );
 
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
       addressBook()->error( i18n( "Unable to open file '%1' for reading" ).arg( file.name() ) );
       ok = false;
       continue;
     }
 
     if ( !mFormat->loadAll( addressBook(), this, &file ) )
       ok = false;
 
     file.close();
   }
 
   return ok;
 }
 
 bool ResourceDir::save( Ticket *ticket )
 {
   AddressBook::Iterator it;
   bool ok = true;
 #ifndef NO_DIRWATCH
   mDirWatch.stopScan();
 #endif
   for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
     if ( (*it).resource() != this || !(*it).changed() )
       continue;
 
     QFile file( mPath + "/" + (*it).uid() );
-    if ( !file.open( IO_WriteOnly ) ) {
+    if ( !file.open( QIODevice::WriteOnly ) ) {
       addressBook()->error( i18n( "Unable to open file '%1' for writing" ).arg( file.name() ) );
       continue;
     }
 
     mFormat->save( *it, &file );
 
     // mark as unchanged
     (*it).setChanged( false );
 
     file.close();
   }
 #ifndef NO_DIRWATCH
   mDirWatch.startScan();
 #endif
   delete ticket;
 #ifdef ALLOW_LOCKING
   unlock( mPath );
 #endif
   return ok;
 }
 
 bool ResourceDir::lock( const QString &path )
 {
 #ifdef ALLOW_LOCKING
   QString p = path;
 //US change the implementation how the lockfilename is getting created
 //US  p.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + p + ".lock" );
   KURL url(p);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
 
   if ( QFile::exists( lockName ) ) return false;
 
   QString lockUniqueName;
   lockUniqueName = p + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
 
   // Create unique file
   QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 #else
   return true;
 #endif
 }
 
 void ResourceDir::unlock( const QString &path )
 {
 #ifdef ALLOW_LOCKING
diff --git a/kabc/plugins/dir/resourcedirconfig.cpp b/kabc/plugins/dir/resourcedirconfig.cpp
index 98d18fe..8fa48d0 100644
--- a/kabc/plugins/dir/resourcedirconfig.cpp
+++ b/kabc/plugins/dir/resourcedirconfig.cpp
@@ -6,66 +6,68 @@
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
 //US #include "formatfactory.h"
 #include "resourcedir.h"
 #include "stdaddressbook.h"
 
 #include "resourcedirconfig.h"
 
 using namespace KABC;
 
 ResourceDirConfig::ResourceDirConfig( QWidget* parent,  const char* name )
     : KRES::ConfigWidget( parent, name )
 {
-  QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0, 
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 2, 2, 0, 
       KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18n( "Format:" ), this );
   mFormatBox = new KComboBox( this );
 
   mainLayout->addWidget( label, 0, 0 );
   mainLayout->addWidget( mFormatBox, 0, 1 );
 
   label = new QLabel( i18n( "Location:" ), this );
   mFileNameEdit = new KURLRequester( this );
 //US  mFileNameEdit->setMode( KFile::Directory );
 
   mainLayout->addWidget( label, 1, 0 );
   mainLayout->addWidget( mFileNameEdit, 1, 1 );
 
 /*US lets hardcode the formats instead of using a factory
   FormatFactory *factory = FormatFactory::self();
   QStringList formats = factory->formats();
   QStringList::Iterator it;
   for ( it = formats.begin(); it != formats.end(); ++it ) {
     FormatInfo *info = factory->info( *it );
     if ( info ) {
       mFormatTypes << (*it);
       mFormatBox->insertItem( info->nameLabel );
diff --git a/kabc/plugins/file/file.pro b/kabc/plugins/file/file.pro
index 2d17313..e4f1270 100644
--- a/kabc/plugins/file/file.pro
+++ b/kabc/plugins/file/file.pro
@@ -1,37 +1,41 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
 include( ../../../variables.pri )
 
-TARGET = microkabc_file
+TARGET = xmicrokabc_file
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde -lmicrokabc
+#LIBS += -lxmicrokde -lxmicrokabc
 #LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcefile.h \
  resourcefileconfig.h
  
 SOURCES = \
  resourcefile.cpp \
  resourcefileconfig.cpp
 
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT +=  qt3support 
+#The following line was inserted by qt3to4
+QT += xml  
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 16707e5..5044cd9 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -1,21 +1,21 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
-TARGET = microkabc_file
+TARGET = xmicrokabc_file
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcefile.h \
  resourcefileconfig.h
  
 SOURCES = \
  resourcefile.cpp \
  resourcefileconfig.cpp
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index dad4571..3ed850c 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -180,78 +180,78 @@ void ResourceFile::writeConfig( KConfig *config )
 
 Ticket *ResourceFile::requestSaveTicket()
 {
   kdDebug(5700) << "ResourceFile::requestSaveTicket()" << endl;
 
   if ( !addressBook() ) return 0;
 
 #ifdef ALLOW_LOCKING
   if ( !lock( mFileName ) ) {
       qDebug("unablt to lock file ");
     return 0;
   }
 #endif
   return createTicket( this );
 }
 
 
 bool ResourceFile::doOpen()
 {
   QFile file( fileName() );
   qDebug("ResourceFile::openfile %s ", fileName().latin1());
 
   if ( !file.exists() ) {
     // try to create the file
-    bool ok = file.open( IO_WriteOnly );
+    bool ok = file.open( QIODevice::WriteOnly );
     if ( ok )
       file.close();
 
     return ok;
   } else {
-    if ( !file.open( IO_ReadWrite ) )
+    if ( !file.open( QIODevice::ReadWrite ) )
       return false;
 
     if ( file.size() < 10 ) {
       file.close();
       return true;
     }
 
     bool ok = mFormat->checkFormat( &file );
     file.close();
 
     return ok;
   }
 }
 
 void ResourceFile::doClose()
 {
 }
 
 bool ResourceFile::load()
 {
 
   QFile file( fileName() );
-  if ( !file.open( IO_ReadOnly ) ) {
+  if ( !file.open( QIODevice::ReadOnly ) ) {
     addressBook()->error( i18n( "Unable to open file '%1'." ).arg( fileName() ) );
     return false;
   }
 
 //    qDebug("ResourceFile::load format %s, %s", mFileName.latin1(), mFormatName.latin1());
 
   return mFormat->loadAll( addressBook(), this, &file );
 }
 
 bool ResourceFile::save( Ticket *ticket )
 {
 //  qDebug("ResourceFile::save format %s, %s", mFileName.latin1(), mFormatName.latin1());
 
 
   // create backup file
   QString extension = "_" + QString::number( QDate::currentDate().dayOfWeek() );
 
 /*US we use a simpler method to create a backupfile
 
   (void) KSaveFile::backupFile( mFileName, QString::null
   ,extension );
 
   KSaveFile saveFile( mFileName );
   bool ok = false;
@@ -290,49 +290,49 @@ bool ResourceFile::save( Ticket *ticket )
                     saveDate = true;
                 } else if ( retval == 1 ){
                     qDebug("KO: Backup created.");
                     // backup ok
                     mLastBackupDate =  daysTo;
                     saveDate = true;
                 } else if ( retval == 2 ){
                     qDebug("KO: Backup globally cancelled.");
                     // backup globally cancelled
                     b_enabled = false;
                 }
                 if ( !b_enabled ) {
                     conf.writeEntry( "mBackupEnabled", false );
                 }
                 if ( saveDate ) {
                     KConfig config ( locateLocal("config","kabcrc") );
                     config.setGroup( "Resource_" + identifier() );
                     config.writeEntry( "LastBackupDate", mLastBackupDate );
                 }
           }
       }
   }
   QFile info;
   info.setName( fileName() );
-  bool ok = info.open( IO_WriteOnly );
+  bool ok = info.open( QIODevice::WriteOnly );
   if ( ok ) {
     mFormat->saveAll( addressBook(), this, &info );
 
     info.close();
     ok = true;
   }
   else {
 
   }
 
   if ( !ok )
     addressBook()->error( i18n( "Unable to save file '%1'." ).arg( fileName() ) );
 #ifndef NO_DIRWATCH
   mDirWatch.startScan();
 #endif
   delete ticket;
 #ifdef ALLOW_LOCKING
   unlock( mFileName );
 #endif
 
   return ok;
 }
 
 bool ResourceFile::lock( const QString &fileName )
@@ -342,49 +342,49 @@ bool ResourceFile::lock( const QString &fileName )
 
   QString fn = fileName;
 
 //US change the implementation how the lockfilename is getting created
 //US  fn.replace( QRegExp("/"), "_" );
 //US  QString lockName = locateLocal( "data", "kabc/lock/" + fn + ".lock" );
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
 
 
   if (QFile::exists( lockName )) return false;
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
    result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 #else
   return true;
 #endif
 }
 
 void ResourceFile::unlock( const QString &fileName )
 {
 #ifdef ALLOW_LOCKING
diff --git a/kabc/plugins/file/resourcefileconfig.cpp b/kabc/plugins/file/resourcefileconfig.cpp
index b63775d..70b0bac 100644
--- a/kabc/plugins/file/resourcefileconfig.cpp
+++ b/kabc/plugins/file/resourcefileconfig.cpp
@@ -7,71 +7,73 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 //US #include "formatfactory.h"
 #include <qfile.h>
 #include "resourcefile.h"
 #include "stdaddressbook.h"
 
 #include "resourcefileconfig.h"
 
 using namespace KABC;
 
 ResourceFileConfig::ResourceFileConfig( QWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
 {
 //qDebug("ResourceFileConfig::ResourceFileConfig");
   
-  QGridLayout *mainLayout = new QGridLayout( this, 2, 2, 0,
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 2, 2, 0,
       KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18n( "Format:" ), this );
   mFormatBox = new KComboBox( this );
 
   mainLayout->addWidget( label, 0, 0 );
   mainLayout->addWidget( mFormatBox, 0, 1 );
 
   label = new QLabel( i18n( "Location:" ), this );
   mFileNameEdit = new KURLRequester( this );
 
   connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ),
            SLOT( checkFilePermissions( const QString & ) ) );
 
   mainLayout->addWidget( label, 1, 0 );
   mainLayout->addWidget( mFileNameEdit, 1, 1 );
 
 
 /*US lets hardcode the formats instead of using a factory
   FormatFactory *factory = FormatFactory::self();
   QStringList formats = factory->formats();
   QStringList::Iterator it;
   
   for ( it = formats.begin(); it != formats.end(); ++it ) {
diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro
index 57b6f84..c56d24d 100644
--- a/kabc/plugins/ldap/ldapE.pro
+++ b/kabc/plugins/ldap/ldapE.pro
@@ -1,21 +1,21 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 #release debug
 
-TARGET = microkabc_ldap
+TARGET = xmicrokabc_ldap
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lxmicrokde -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourceldap.h \
  resourceldapconfig.h
  
 SOURCES = \
  resourceldap.cpp \
  resourceldapconfig.cpp
diff --git a/kabc/plugins/olaccess/olaccess.pro b/kabc/plugins/olaccess/olaccess.pro
index 9b95015..ad7e1ef 100644
--- a/kabc/plugins/olaccess/olaccess.pro
+++ b/kabc/plugins/olaccess/olaccess.pro
@@ -1,35 +1,35 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
-TARGET = microkabc_olaccess
+TARGET = xmicrokabc_olaccess
 
 include( ../../../variables.pri )
 
 INCLUDEPATH += ../../.. ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile  ../../../microkde/kio/kio ../../../microkde/kresources ../../../qtcompat
 
 INTERFACES = \
 
 DESTDIR = ../../../bin
 HEADERS = \
  resourceolaccess.h \
  resourceolaccessconfig.h \
  olaccessconverter.h 
  
 SOURCES = \
  resourceolaccess.cpp \
  resourceolaccessconfig.cpp \
  olaccessconverter.cpp
 
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index b7ecbc0..aa6b8ea 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -1,31 +1,31 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
 #release debug
-TARGET = microkabc_opie
+TARGET = xmicrokabc_opie
 
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include $(OPIEDIR)/include
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -L$(OPIEDIR)/lib
 LIBS += -lopie
 LIBS += -lqpe
 LIBS += -lqte
 
 INTERFACES = \
 
 HEADERS = \
  resourceopie.h \
  resourceopieconfig.h \
  opieconverter.h \
  
 SOURCES = \
  resourceopie.cpp \
  resourceopieconfig.cpp \
  opieconverter.cpp \
 
diff --git a/kabc/plugins/qtopia/qtopia.pro b/kabc/plugins/qtopia/qtopia.pro
index 64d1abc..d91a2e3 100644
--- a/kabc/plugins/qtopia/qtopia.pro
+++ b/kabc/plugins/qtopia/qtopia.pro
@@ -1,43 +1,47 @@
         TEMPLATE= lib
 CONFIG += qt warn_on release
 
 include( ../../../variables.pri )
 
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
 
 INCLUDEPATH += ../.. ../../.. ../../../kabc ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../microkde/kresources 
 
 DESTDIR = ../../../bin
-#LIBS += -lmicrokde 
-#LIBS += -lkamicrokabc
+#LIBS += -lxmicrokde 
+#LIBS += -lxkamicrokabc
 
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
 
 INTERFACES = \
 
 HEADERS = \
  resourceqtopia.h \
  resourceqtopiaconfig.h \
  qtopiaconverter.h
 
 SOURCES = \
  resourceqtopia.cpp \
  resourceqtopiaconfig.cpp \
  qtopiaconverter.cpp 
 
 
 
 unix : {
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
-LIBS += ../../../bin/microkcal.lib
-LIBS += ../../../bin/microkde.lib
+LIBS += ../../../bin/xmicrokdepim.lib
+LIBS += ../../../bin/xmicrokcal.lib
+LIBS += ../../../bin/xmicrokde.lib
 LIBS += ../../../bin/microkabc.lib
 }
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
+#The following line was inserted by qt3to4
+QT +=  
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index 700057b..4b174b2 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,26 +1,26 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
 
-TARGET = microkabc_qtopia
+TARGET = xmicrokabc_qtopia
 
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 
 INTERFACES = \
 
 HEADERS = \
  resourceqtopia.h \
  resourceqtopiaconfig.h \
  qtopiaconverter.h
 
 SOURCES = \
  resourceqtopia.cpp \
  resourceqtopiaconfig.cpp \
  qtopiaconverter.cpp 
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 9693a68..9b3903b 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -13,87 +13,89 @@
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 //US
 #include "kglobal.h"
 #include "klocale.h"
 
 
 #include "qtopiaconverter.h"
 
 #include <qfile.h>
 #include <qdir.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 //#include <.h>
 
 #include <libkdepim/ksyncprofile.h>
 
 
 using namespace KABC;
 
 QtopiaConverter::QtopiaConverter()
 {
     m_edit = 0;
 }
 
 QtopiaConverter::~QtopiaConverter()
 {
   deinit();
 }
 
 bool QtopiaConverter::init()
 {
     QString fn = QDir::homeDirPath() +"/Settings/Categories.xml";
     m_edit = new CategoryEdit( fn);
     return true;
 }
 
 void QtopiaConverter::deinit()
 {
   if (m_edit)
   {
     delete m_edit;
     m_edit = 0;
   }
 }
 QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QString &app )
 {
  startover:
     QStringList dummy;
-    QValueList<OpieCategories>::ConstIterator catIt;
-    QValueList<OpieCategories> categories = m_edit->categories();
+    Q3ValueList<OpieCategories>::ConstIterator catIt;
+    Q3ValueList<OpieCategories> categories = m_edit->categories();
     bool found = false;
     for ( QStringList::ConstIterator listIt = list.begin(); listIt != list.end(); ++listIt ) {
         /* skip empty category name */
         if ( (*listIt).isEmpty() ) continue;
 
         found  = false;
         for ( catIt = categories.begin(); catIt != categories.end(); ++catIt ) {
             /*
              * We currently do not take app into account
              * if name matches and the id isn't already in dummy we'll add it
              */
             if ( (*catIt).name() == (*listIt) && !dummy.contains(( *catIt).id() )  ) { // the same name
                 found= true;
                 dummy << (*catIt).id();
             }
         }
         /* if not found and the category is not empty
          *
          * generate a new category and start over again
          * ugly goto to reiterate
          */
 
         if ( !found && !(*listIt).isEmpty() ){
             m_edit->addCategory( app, (*listIt) );  // generate a new category
@@ -171,49 +173,49 @@ QString QtopiaConverter::dateToString( const QDate &d )
     QString year = QString::number( d.year() );
     QString month = QString::number( d.month() );
     month = month.rightJustify( 2, '0' );
     QString day = QString::number( d.day() );
     day = day.rightJustify( 2, '0' );
 
     QString str = year + month + day;
 
     return str;
 }
 
 bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
 {
    { //LR
           
             adr.setUid(  el.attribute("Uid" ) );
             adr.setFamilyName( el.attribute( "LastName" ) );
             adr.setGivenName( el.attribute( "FirstName" ) );
             adr.setAdditionalName( el.attribute( "MiddleName" )  );
             adr.setSuffix( el.attribute( "Suffix" ) );
             adr.setNickName( el.attribute( "Nickname" ) );
 
             QDate date = dateFromString( el.attribute( "Birthday" ) );
             if ( date.isValid() )
-              adr.setBirthday( date );
+              adr.setBirthday( (QDateTime)date );
 
             adr.setRole( el.attribute( "JobTitle" ) );
             if ( !el.attribute( "FileAs" ).isEmpty() )
               adr.setFormattedName( el.attribute( "FileAs" ) );
 
             adr.setOrganization( el.attribute( "Company" ) );
 
             KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ),
                                                 KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref );
             KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ),
                                               KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
             KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ),
                                               KABC::PhoneNumber::Car );
             KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ),
                                              KABC::PhoneNumber::Pager );
             if ( !businessPhoneNum.number().isEmpty() )
               adr.insertPhoneNumber( businessPhoneNum );
             if ( !businessFaxNum.number().isEmpty() )
               adr.insertPhoneNumber( businessFaxNum );
             if ( !businessMobile.number().isEmpty() )
               adr.insertPhoneNumber( businessMobile );
             if ( !businessPager.number().isEmpty() )
               adr.insertPhoneNumber( businessPager  );
 
@@ -296,49 +298,49 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
                     adr.insertCustom( "KADDRESSBOOK", "X-Gender", "female" );
             }
             QDate ann = dateFromString( el.attribute( "Anniversary" ) );
             if ( ann.isValid() ) { 
                 QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate);
               adr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt );
             }
 
             if ( !el.attribute( "Children" ).isEmpty() )
               adr.insertCustom("KADDRESSBOOK", "X-Children", el.attribute("Children") );
             if ( !el.attribute( "Office" ).isEmpty() )
               adr.insertCustom("KADDRESSBOOK", "X-Office", el.attribute("Office") );
             if ( !el.attribute( "Profession" ).isEmpty() )
               adr.insertCustom("KADDRESSBOOK", "X-Profession", el.attribute("Profession") );
             if ( !el.attribute( "Assistant" ).isEmpty() )
               adr.insertCustom("KADDRESSBOOK", "X-AssistantsName", el.attribute("Assistant") );
             if ( !el.attribute( "Manager" ).isEmpty() )
               adr.insertCustom("KADDRESSBOOK", "X-ManagersName", el.attribute("Manager") );
 
             
           }
     return true;
 }
 
-bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, QTextStream *stream )
+bool QtopiaConverter::addresseeToQtopia( const Addressee &ab, Q3TextStream *stream )
 {
             *stream << "<Contact ";
             *stream << "FirstName=\"" << escape(ab.givenName()) << "\" ";
             *stream << "MiddleName=\"" << escape(ab.additionalName()) << "\" ";
             *stream << "LastName=\"" << escape(ab.familyName()) << "\" ";
             *stream << "Suffix=\"" << escape(ab.suffix()) << "\" ";
 
             QString sortStr;
             sortStr = ab.formattedName();
             /* is formattedName is empty we use the assembled name as fallback */
             if (sortStr.isEmpty() )
                 sortStr = ab.assembledName();
             *stream << "FileAs=\"" << escape(sortStr) << "\" ";
 
             *stream << "JobTitle=\"" << escape(ab.role()) << "\" ";
             *stream << "Department=\"" << escape(ab.custom( "KADDRESSBOOK", "X-Department" )) << "\" ";
             *stream << "Company=\"" << escape(ab.organization()) << "\" ";
 
             KABC::PhoneNumber businessPhoneNum = ab.phoneNumber(KABC::PhoneNumber::Work );
             *stream << "BusinessPhone=\"" << escape( businessPhoneNum.number() ) << "\" ";
 
             KABC::PhoneNumber businessFaxNum = ab.phoneNumber(KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
             *stream << "BusinessFax=\"" << escape( businessFaxNum.number() )<< "\" ";
 
@@ -463,102 +465,102 @@ QStringList AddressBook::attributes()const {
     lst << "Children";
     lst << "Notes";
     lst << "Categories";
     lst << "Uid";
     lst << "Birthday";
 
     return lst;
 }
 
 
 
 #endif
 
 
 CategoryEdit::CategoryEdit(){
 }
 CategoryEdit::CategoryEdit(const QString &fileName){
     parse( fileName );
 }
 CategoryEdit::~CategoryEdit(){
 }
 void CategoryEdit::save(const QString& fileName)const{
     QFile file( fileName );
     QString endl = "\n";
-    if ( file.open( IO_WriteOnly ) ) {
-        QTextStream stream( &file );
-        stream.setEncoding( QTextStream::UnicodeUTF8 );
+    if ( file.open( QIODevice::WriteOnly ) ) {
+        Q3TextStream stream( &file );
+        stream.setEncoding( Q3TextStream::UnicodeUTF8 );
         stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
         stream << "<!DOCTYPE CategoryList>" << endl;
         stream << "<Categories>" << endl;
-        for ( QValueList<OpieCategories>::ConstIterator it = m_categories.begin();
+        for ( Q3ValueList<OpieCategories>::ConstIterator it = m_categories.begin();
               it != m_categories.end(); ++it )
         {
             stream << "<Category id=\""<< ( (*it).id() ) << "\" ";
 
             if ( !(*it).app().isEmpty() )
                 stream << " app=\""<< ( (*it).app() ) <<  "\" ";
 
             stream << "name=\"" << ( (*it).name() ) << "\" ";
             stream << " />" << endl;
         }
         stream << "</Categories>" << endl;
         file.close();
     }
 }
 int CategoryEdit::addCategory( const QString &name, int id ){
     return addCategory( QString::null, name, id );
 }
 int CategoryEdit::addCategory( const QString &appName,  const QString &name,  int id ){
     if ( id == 0 ) {
         // code from tt
         //generate uid
         QDateTime dt = QDateTime::currentDateTime();
         id = -1 * (int) dt.secsTo( QDateTime(QDate( 2000,1,1)) );
         while ( ids.contains( id ) ){
             id += -1;
             if ( id > 0 )
                 id = -1;
         }
     }
     ids.insert( id,  TRUE );
     OpieCategories categories(QString::number(id),  name,  appName);
     //pending FIXME LR m_categories.remove( categories);
     m_categories.append( categories);
     return id;
 }
 /*
  * we parse the simple Category File here
  * We also keep track of global Cats
  * and Of Organizer and Contact cats and then
  * we will add them to the kde side...
  */
 void CategoryEdit::parse( const QString &tempFile ){
     clear();
 
     QDomDocument doc( "mydocument" );
     QFile f( tempFile );
-    if ( !f.open( IO_ReadOnly ) )
+    if ( !f.open( QIODevice::ReadOnly ) )
         return;
 
     if ( !doc.setContent( &f ) ) {
         f.close();
         return;
     }
     f.close();
 
     QStringList global, contact, organizer;
 
     // print out the element names of all elements that are a direct child
     // of the outermost element.
     QDomElement docElem = doc.documentElement();
     QDomNode n = docElem.firstChild();
     if( docElem.nodeName() == QString::fromLatin1("Categories") ){
         while( !n.isNull() ) {
             QDomElement e = n.toElement(); // try to convert the node to an element.
             if( !e.isNull() ) { // the node was really an element.
                 QString id = e.attribute("id" );
                 QString app = e.attribute("app" );
                 QString name = e.attribute("name");
 
                 /*
                  * see where it belongs default to global
@@ -566,49 +568,49 @@ void CategoryEdit::parse( const QString &tempFile ){
                 if (app == QString::fromLatin1("Calendar") || app == QString::fromLatin1("Todo List") )
                     organizer.append( name );
                 else if ( app == QString::fromLatin1("Contacts") )
                     contact.append( name );
                 else
                     global.append( name );
 
                 OpieCategories category( id, name, app );
                 m_categories.append( category ); // cheater
             }
             n = n.nextSibling();
         }
     }
     updateKDE( "kaddressbookrc", global + contact );
     updateKDE( "korganizerrc", global + organizer );
 
 }
 void CategoryEdit::clear()
 {
     ids.clear();
     m_categories.clear();
 }
 QString CategoryEdit::categoryById( const QString &id,  const QString &app )const
 {
-    QValueList<OpieCategories>::ConstIterator it;
+    Q3ValueList<OpieCategories>::ConstIterator it;
     QString category;
     QString fallback;
     for( it = m_categories.begin(); it != m_categories.end(); ++it ){
         if( id.stripWhiteSpace() == (*it).id().stripWhiteSpace() ){
             if( app == (*it).app() ){
                 category = (*it).name();
                 break;
             }else{
                 fallback = (*it).name();
             }
         }
     }
     return category.isEmpty() ? fallback : category;
 }
 QStringList CategoryEdit::categoriesByIds( const QStringList& ids,
                                            const QString& app) {
 
     QStringList list;
     QStringList::ConstIterator it;
     QString temp;
     for ( it = ids.begin(); it != ids.end(); ++it ) {
         temp = categoryById( (*it), app );
         if (!temp.isEmpty() )
             list << temp;
diff --git a/kabc/plugins/qtopia/qtopiaconverter.h b/kabc/plugins/qtopia/qtopiaconverter.h
index 744dd41..389926c 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.h
+++ b/kabc/plugins/qtopia/qtopiaconverter.h
@@ -7,127 +7,130 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 
 #ifndef KABC_QTOPIACONVERTER_H
 #define KABC_QTOPIACONVERTER_H
 
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3TextStream>
 
 #include "addressee.h"
 #ifdef DESKTOP_VERSION
 #include <qdom.h> 
 #else
 #include <xml/qdom.h> 
 #endif
 class Categories;
 
 namespace KABC {
 
 
 
 class OpieCategories {
  public:
     //friend class KSync::OpieSocket;
     friend bool operator== ( const OpieCategories &a, const OpieCategories &b );
     OpieCategories();
     OpieCategories(const QString &id, const QString &name, const QString &app );
     OpieCategories(const OpieCategories & );
     ~OpieCategories() {};
     OpieCategories &operator=(const OpieCategories & );
     QString id()const;
     QString name()const;
     QString app()const;
 
  private:
     QString m_name;
     QString m_app;
     QString m_id;
 };
 
 
  class CategoryEdit {
     public:
         CategoryEdit();
         CategoryEdit(const QString &fileName);
         ~CategoryEdit();
 
         void save(const QString&) const;
         int addCategory( const QString &name, int id = 0 );
         int addCategory(const QString &appName,  const QString &name,  int id = 0);
         void parse( const QString &fileName );
 
         QString categoryById(const QString &id, const QString &app )const;
         QStringList categoriesByIds( const QStringList& ids,  const QString& app );
 
         void clear();
-        QValueList<OpieCategories> categories()const {  return m_categories; };
+        Q3ValueList<OpieCategories> categories()const {  return m_categories; };
     private:
         /**
          * this function will be used internally to update the kde categories...
          */
         void updateKDE( const QString& app,  const QStringList& categories );
         QMap<int, bool> ids; // from tt Qtopia::UidGen
-        QValueList<OpieCategories> m_categories;
+        Q3ValueList<OpieCategories> m_categories;
     };
 
 
 class QtopiaConverter
 {
 public:
 
   /**
    * Constructor.
    */
   QtopiaConverter();
 
   /**
    * Destructor.
    */
   virtual ~QtopiaConverter();
   
   bool init();
   void deinit();
   
   /**
    * Converts a vcard string to an addressee.
    *
    * @param contact The qtopia contact.
    * @param addr    The addressee.
    */
   bool qtopiaToAddressee( const QDomElement& el, Addressee &adr );
   /**
    * Converts an addressee to a vcard string.
    *
    * @param addr    The addressee.
    * @param contact The qtopia contact.
    */
-  bool addresseeToQtopia( const Addressee &ab, QTextStream *stream );
+  bool addresseeToQtopia( const Addressee &ab, Q3TextStream *stream );
 
   private:
   QString categoriesToNumber( const QStringList &list, const QString &app );
   QString escape( const QString& s){ return s;};
     CategoryEdit *m_edit;
     QDate fromString( const QString& );
     QDate dateFromString( const QString& );
     QString dateToString( const QDate& );
   
     
 };
 }
 #endif
diff --git a/kabc/plugins/qtopia/resourceqtopia.cpp b/kabc/plugins/qtopia/resourceqtopia.cpp
index 79ddaea..a36eb8f 100644
--- a/kabc/plugins/qtopia/resourceqtopia.cpp
+++ b/kabc/plugins/qtopia/resourceqtopia.cpp
@@ -10,49 +10,49 @@
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 //US #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 //US #include <ksavefile.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 
 
 #include "resourceqtopiaconfig.h"
 #include "stdaddressbook.h"
 
 #include "qtopiaconverter.h"
 
 #include "resourceqtopia.h"
 
 using namespace KABC;
 
 extern "C"
 #ifdef _WIN32_
@@ -135,101 +135,101 @@ bool ResourceQtopia::doOpen()
           QString msg("Unable to initialize qtopia converter. Most likely a problem with the category file");
       qDebug(msg);
       return false;
     }
   }
 
   return true;
 }
 
 void ResourceQtopia::doClose()
 {
   qDebug("ResourceQtopia::doClose: %s", fileName().latin1());
 
  
   // it seems so, that deletion of access deletes backend as well
   //delete backend;
 
   return;
 }
 
 bool ResourceQtopia::load()
 {
 
   QFile file( fileName() );
-  if ( !file.open(IO_ReadOnly ) ) {
+  if ( !file.open(QIODevice::ReadOnly ) ) {
     return false;
   }
 
   QDomDocument doc("mydocument" );
   if ( !doc.setContent( &file ) ) {
     file.close();
     return false; 
   }
   bool res;
   QDomElement docElem = doc.documentElement( );
   QDomNode n =  docElem.firstChild();
   while ( !n.isNull() ) {
     QDomElement e = n.toElement();
     if ( !e.isNull() ) {
       if ( e.tagName() == QString::fromLatin1( "Contacts" ) ) { 
         QDomNode no = e.firstChild();
         while ( !no.isNull() ) {
           QDomElement el = no.toElement();
           if ( !el.isNull() ) {
               KABC::Addressee addressee;
               res = mConverter->qtopiaToAddressee( el,  addressee ); 
               if ( !addressee.isEmpty() && res )
                   {
                       addressee.setResource( this );
                       addressBook()->insertAddressee( addressee );
                   }
           }
 
           no = no.nextSibling();
         }
       }
     }
 
     n = n.nextSibling();
   }
   return true;
 }
 
 bool ResourceQtopia::save( Ticket *ticket )
 {
 #ifdef _USE_DIRWATCH_
     mDirWatch.stopScan();
 #endif
     KABC::AddressBook::Iterator it;
     bool res;  
     QFile file( fileName() );
-    if (!file.open( IO_WriteOnly ) ) {
+    if (!file.open( QIODevice::WriteOnly ) ) {
         return false;
     }
-    QTextStream ts( &file );
-    QTextStream *stream = &ts;
-    stream->setEncoding( QTextStream::UnicodeUTF8 );
+    Q3TextStream ts( &file );
+    Q3TextStream *stream = &ts;
+    stream->setEncoding( Q3TextStream::UnicodeUTF8 );
     *stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>" << endl;
     *stream << " <Groups>" << endl;
     *stream << " </Groups>" << endl;
     *stream << " <Contacts> " << endl;
     // for all entries
     KABC::Addressee ab;
     for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) {
         KABC::Addressee addressee = (*it);
         res = mConverter->addresseeToQtopia( addressee, stream );
         if (!res == true)
             {
                 qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
             }
     }
     *stream << "</Contacts>" << endl;
     *stream << "</AddressBook>" << endl;
     file.close();
 #ifdef _USE_DIRWATCH_  
     mDirWatch.startScan();
 #endif
     delete ticket;
     unlock( fileName() );
   return true; 
 }
@@ -239,49 +239,49 @@ bool ResourceQtopia::lock( const QString &lockfileName )
     //disabled
     return true;
   qDebug("ResourceQtopia::lock: %s", fileName().latin1());
   QString fn = lockfileName;
 
   KURL url(fn);
   QString lockName = locateLocal( "data", "kabc/lock/" + url.fileName() + ".lock" );
 
   if (QFile::exists( lockName ))
   {
     qDebug("ResourceOpie::lock: lockfile %s already exists. (Delete it before continuing if nobody else is accessing the resourcefile %s)", lockName.latin1(), fileName().latin1());
     return false;
   }
 
   QString lockUniqueName;
   lockUniqueName = fn + KApplication::randomString( 8 );
 
   url = lockUniqueName;
 //US  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
   mLockUniqueName = locateLocal( "data", "kabc/lock/" + url.fileName() );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file
   QFile file( mLockUniqueName );
-  file.open( IO_WriteOnly );
+  file.open( QIODevice::WriteOnly );
   file.close();
 
   // Create lock file
   int result = 0;
 #ifndef _WIN32_
   result = ::link( QFile::encodeName( mLockUniqueName ),
                        QFile::encodeName( lockName ) );
 #endif
   if ( result == 0 ) {
     addressBook()->emitAddressBookLocked();
     return true;
   }
 
   // TODO: check stat
 
   return false;
 }
 
 void ResourceQtopia::unlock( const QString &fileName )
 {
     //disabled
     return;
   qDebug("ResourceQtopia::unlock() %s", fileName.latin1());
 
diff --git a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
index d5d6141..42fd428 100644
--- a/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
+++ b/kabc/plugins/qtopia/resourceqtopiaconfig.cpp
@@ -6,68 +6,70 @@
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 
 //#include <unistd.h>
 
 #include <qdir.h>
 #include <qfile.h>
 #include "resourceqtopia.h"
 
 #include "resourceqtopiaconfig.h"
 
 using namespace KABC;
 
 ResourceQtopiaConfig::ResourceQtopiaConfig( QWidget* parent,  const char* name )
     : ConfigWidget( parent, name )
 {
-  QGridLayout *mainLayout = new QGridLayout( this, 1, 2, 0,
+  Q3GridLayout *mainLayout = new Q3GridLayout( this, 1, 2, 0,
       KDialog::spacingHint() );
 
   QLabel *label = new QLabel( i18n( "Location:" ), this );
   mFileNameEdit = new KURLRequester( this );
 
   connect( mFileNameEdit, SIGNAL( textChanged( const QString & ) ),
            SLOT( checkFilePermissions( const QString & ) ) );
 
   mainLayout->addWidget( label, 0, 0 );
   mainLayout->addWidget( mFileNameEdit, 0, 1 );
  
 }
 
 void ResourceQtopiaConfig::loadSettings( KRES::Resource *res  )
 {
 //US  ResourceFile *resource = dynamic_cast<ResourceFile*>( res );
   ResourceQtopia *resource = (ResourceQtopia*)( res );
   
   if ( !resource ) {
     kdDebug(5700) << "ResourceQtopiaConfig::loadSettings(): cast failed" << endl;
     return;
   }
 
   mFileNameEdit->setURL( resource->fileName() );
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 23b0b76..7fc8ba8 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,35 +1,35 @@
         TEMPLATE= lib
 CONFIG += qt warn_on
-TARGET = microkabc_sharpdtm
+TARGET = xmicrokabc_sharpdtm
 
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include 
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde 
-LIBS += -lmicrokabc
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokde 
+LIBS += -lxmicrokabc
+LIBS += -lxmicrokdepim
 LIBS += -lmicroqtcompat
 LIBS += -L$(QPEDIR)/lib
 LIBS += -ljpeg
 LIBS += -lqpe
 LIBS += -lqte
 LIBS += -lzdtm
 LIBS += -lsl
 
 
 
 INTERFACES = \
 
 HEADERS = \
  resourcesharpdtm.h \
  resourcesharpdtmconfig.h \
  sharpdtmconverter.h 
  
 SOURCES = \
  resourcesharpdtm.cpp \
  resourcesharpdtmconfig.cpp \
  sharpdtmconverter.cpp
 
diff --git a/kabc/secrecy.h b/kabc/secrecy.h
index b2ff565..0fe956e 100644
--- a/kabc/secrecy.h
+++ b/kabc/secrecy.h
@@ -7,59 +7,59 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_SECRECY_H
 #define KABC_SECRECY_H
 
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 namespace KABC {
 
 class Secrecy
 {
     friend QDataStream &operator<<( QDataStream &, const Secrecy & );
     friend QDataStream &operator>>( QDataStream &, Secrecy & );
 
 public:
-  typedef QValueList<int> TypeList;  
+  typedef Q3ValueList<int> TypeList;  
 
   /**
    * Secrecy types
    *
    * @li Public       - for public access
    * @li Private      - only private access
    * @li Confidential - access for confidential persons
    */
   enum Types {
     Public,
     Private,
     Confidential,
     Invalid
   };
 
   /**
    * Constructor.
    *
    * @param type  The secrecy type, @see Types.
    */
   Secrecy( int type = Public );
 
   bool operator==( const Secrecy & ) const;
   bool operator!=( const Secrecy & ) const;
diff --git a/kabc/sound.h b/kabc/sound.h
index 0ec5ec8..9777054 100644
--- a/kabc/sound.h
+++ b/kabc/sound.h
@@ -7,49 +7,49 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_SOUND_H
 #define KABC_SOUND_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qstring.h>
 
 namespace KABC {
 
 class Sound
 {
   friend QDataStream &operator<<( QDataStream &, const Sound & );
   friend QDataStream &operator>>( QDataStream &, Sound & );
 
 public:
 
   /**
    * Consturctor. Creates an empty object.
    */
   Sound();
 
   /**
    * Consturctor.
    *
    * @param url  A URL that describes the position of the sound file.
    */
   Sound( const QString &url );
 
   /**
diff --git a/kabc/tmpaddressbook.cpp b/kabc/tmpaddressbook.cpp
index cfa57e3..5152e00 100644
--- a/kabc/tmpaddressbook.cpp
+++ b/kabc/tmpaddressbook.cpp
@@ -3,47 +3,47 @@
     Copyright (c) 2004 Ulf Schenk
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include "tmpaddressbook.h"
 
 using namespace KABC;
 
 #include "resource.h"
 
 TmpAddressBook::TmpAddressBook()
         : AddressBook(0, "tmpcontact")
 {
 }
 
 TmpAddressBook::TmpAddressBook( const QString &config )
         : AddressBook( config, "tmpcontact" )
 {
 }
 
 TmpAddressBook::~TmpAddressBook()
 {
     removeResources();
 }
 
diff --git a/kabc/vcard/AdrParam.cpp b/kabc/vcard/AdrParam.cpp
index fa46499..33d358c 100644
--- a/kabc/vcard/AdrParam.cpp
+++ b/kabc/vcard/AdrParam.cpp
@@ -3,124 +3,126 @@
 
         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 <VCardRToken.h>
 #include <VCardAdrParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 AdrParam::AdrParam()
                 :Param()
 {
 }
 
 AdrParam::AdrParam(const AdrParam & x)
                 :Param(x),
                         adrTypeList_(x.adrTypeList_)
 {
 }
 
-AdrParam::AdrParam(const QCString & s)
+AdrParam::AdrParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         AdrParam &
 AdrParam::operator = (AdrParam & x)
 {
         if (*this == x) return *this;
         
                 adrTypeList_= x.adrTypeList();
                 textParam_      = x.textParam();
 
         Param::operator = (x);
         return *this;
 }
 
         AdrParam &
-AdrParam::operator = (const QCString & s)
+AdrParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         
         adrTypeList_.clear();
         textParam_.truncate(0);
         
         return *this;
 }
 
         bool
 AdrParam::operator == (AdrParam & x)
 {
         parse();
 
         if (!x.textParam().isEmpty())
                 return (x.textParam_ == textParam_);
 
         if (x.adrTypeList().count() != adrTypeList_.count())
                 return false;
         
-        QStrListIterator it(x.adrTypeList_);
+        Q3StrListIterator it(x.adrTypeList_);
         
         for (; it.current(); ++it)
                 if (!adrTypeList_.find(it.current()))
                         return false;
         
         return true;
 }
 
 AdrParam::~AdrParam()
 {
 }
 
         void
 AdrParam::_parse()
 {
         adrTypeList_.clear();
 
         if (strRep_.left(4) != "TYPE") {
                 textParam_ = strRep_;
                 return;
         }
         
         if (!strRep_.contains('='))
                 return;
         
         RTokenise(strRep_, ",", adrTypeList_);
 }
 
         void
 AdrParam::_assemble()
 {
         if (!textParam_.isEmpty()) {
                 strRep_ = textParam_;
                 return;
         }
         
-        QStrListIterator it(adrTypeList_);
+        Q3StrListIterator it(adrTypeList_);
         
         for (; it.current(); ++it) {
                 
                 strRep_ += it.current();
                 
                 if (it.current() != adrTypeList_.last())
                         strRep_ += ',';
         }
 }
diff --git a/kabc/vcard/AdrValue.cpp b/kabc/vcard/AdrValue.cpp
index 7ecef33..51ca12a 100644
--- a/kabc/vcard/AdrValue.cpp
+++ b/kabc/vcard/AdrValue.cpp
@@ -4,129 +4,132 @@
         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 <VCardRToken.h>
 #include <VCardAdrValue.h>
 #include <VCardValue.h>
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3StrList>
+#include <Q3CString>
 
 using namespace VCARD;
 
 AdrValue::AdrValue()
                 :Value()
 {
 }
 
 AdrValue::AdrValue(const AdrValue & x)
                 :Value(x),
                         poBox_  (x.poBox_),
                         extAddress_(x.extAddress_),
                         street_         (x.street_),
                         locality_(x.locality_),
                         region_         (x.region_),
                         postCode_(x.postCode_),
                         countryName_(x.countryName_)
 {
 }
 
-AdrValue::AdrValue(const QCString & s)
+AdrValue::AdrValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         AdrValue &
 AdrValue::operator = (AdrValue & x)
 {
         if (*this == x) return *this;
 
                 poBox_  = x.poBox_;
                 extAddress_= x.extAddress_;
                 street_         = x.street_;
                 locality_= x.locality_;
                 region_         = x.region_;
                 postCode_= x.postCode_;
                 countryName_= x.countryName_;
 
         Value::operator = (x);
         return *this;
 }
 
         AdrValue &
-AdrValue::operator = (const QCString & s)
+AdrValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 AdrValue::operator == (AdrValue & x)
 {
         parse();
         x.parse();
         
         return (
                         poBox_          == x.poBox_     &&
                         extAddress_     == x.extAddress_&&
                         street_                 == x.street_    &&
                         locality_       == x.locality_  &&
                         region_                 == x.region_    &&
                         postCode_       == x.postCode_  &&
                         countryName_== x.countryName_);
 }
 
 AdrValue::~AdrValue()
 {
 }
 
         AdrValue *
 AdrValue::clone()
 {
         return new AdrValue( *this );
 }
 
         void
 AdrValue::_parse()
 {
         vDebug("AdrValue::_parse()");
 
-        QStrList l;
+        Q3StrList l;
         RTokenise(strRep_, ";", l);
         
         for (unsigned int i = 0; i < l.count(); i++) {
                 
                 switch (i) {
                         
                                 case 0: poBox_          = l.at(0);break;
                                 case 1: extAddress_     = l.at(1);break;
                                 case 2: street_                 = l.at(2);break;
                                 case 3: locality_       = l.at(3);break;
                                 case 4: region_                 = l.at(4);break;
                                 case 5: postCode_       = l.at(5);break;
                                 case 6: countryName_    = l.at(6);break;
                                 default:                                                break;
                 }
         }
 }
 
         void
 AdrValue::_assemble()
 {
         vDebug("AdrValue::_assemble");
 
                 strRep_ =       poBox_;
diff --git a/kabc/vcard/AgentParam.cpp b/kabc/vcard/AgentParam.cpp
index 5625e00..aae35ac 100644
--- a/kabc/vcard/AgentParam.cpp
+++ b/kabc/vcard/AgentParam.cpp
@@ -3,82 +3,84 @@
 
         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 <VCardAgentParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 AgentParam::AgentParam()
                 :Param()
 {
 }
 
 AgentParam::AgentParam(const AgentParam & x)
                 :Param(x),
                         refer_(x.refer_),
                         uri_(x.uri_)
 {
 }
 
-AgentParam::AgentParam(const QCString & s)
+AgentParam::AgentParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         AgentParam &
 AgentParam::operator = (AgentParam & x)
 {
         if (*this == x) return *this;
         
                 refer_= x.refer_;
                 uri_= x.uri_;
 
         Param::operator = (x);
         return *this;
 }
 
         AgentParam &
-AgentParam::operator = (const QCString & s)
+AgentParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
 AgentParam::operator == (AgentParam & x)
 {
         parse();
 
         if (refer_)
                 return (x.refer() && uri_ == x.uri_);
         
         return !x.refer();
 }
 
 AgentParam::~AgentParam()
 {
 }
 
         void
 AgentParam::_parse()
 {
         if (strRep_.isEmpty()) {
diff --git a/kabc/vcard/AgentValue.cpp b/kabc/vcard/AgentValue.cpp
index bccde80..14e73b1 100644
--- a/kabc/vcard/AgentValue.cpp
+++ b/kabc/vcard/AgentValue.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardAgentValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 AgentValue::AgentValue()
                 :Value()
 {
 }
 
 AgentValue::AgentValue(const AgentValue & x)
                 :Value(x)
 {
 }
 
-AgentValue::AgentValue(const QCString & s)
+AgentValue::AgentValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         AgentValue &
 AgentValue::operator = (AgentValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         AgentValue &
-AgentValue::operator = (const QCString & s)
+AgentValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 AgentValue::operator == (AgentValue & x)
 {
         x.parse();
         return false;
 }
 
 AgentValue::~AgentValue()
 {
 }
 
         void
 AgentValue::_parse()
 {
 }
 
         void
 AgentValue::_assemble()
 {
diff --git a/kabc/vcard/ClassValue.cpp b/kabc/vcard/ClassValue.cpp
index f01e5a6..c088d7c 100644
--- a/kabc/vcard/ClassValue.cpp
+++ b/kabc/vcard/ClassValue.cpp
@@ -5,81 +5,83 @@
         
   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 <VCardClassValue.h>
 
 #include <VCardValue.h>
 
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 ClassValue::ClassValue()
                 :Value()
 {
 }
 
 ClassValue::ClassValue(const ClassValue & x)
                 :Value(x),
                 classType_(x.classType_)
 {
 }
 
-ClassValue::ClassValue(const QCString & s)
+ClassValue::ClassValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         ClassValue &
 ClassValue::operator = (ClassValue & x)
 {
         if (*this == x) return *this;
         x.parse();
         
         classType_ = x.classType_;
 
         Value::operator = (x);
         return *this;
 }
 
         ClassValue &
-ClassValue::operator = (const QCString & s)
+ClassValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 ClassValue::operator == (ClassValue & x)
 {
         x.parse();
         return ( classType_ == x.classType_ );
 }
 
 ClassValue::~ClassValue()
 {
 }
 
   ClassValue *
 ClassValue::clone()
 {
   return new ClassValue( *this );
 }
 
         void
 ClassValue::_parse()
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp
index 0a2f97d..1d4886c 100644
--- a/kabc/vcard/ContentLine.cpp
+++ b/kabc/vcard/ContentLine.cpp
@@ -1,49 +1,49 @@
 /*
         libvcard - vCard parsing library for vCard version 3.0
 
         Copyright (C) 1999 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 <q3cstring.h>
+#include <q3strlist.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>
@@ -77,183 +77,183 @@ ContentLine::ContentLine()
 ContentLine::ContentLine(const ContentLine & x)
                 :Entity(x),
                 group_ (x.group_),
                 name_ (x.name_),
         /*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)
+ContentLine::ContentLine(const Q3CString & s)
                 :Entity(s),
                 value_(0),
                 paramType_( ParamUnknown ),
                 valueType_( ValueUnknown ),
                 entityType_( EntityUnknown )
 {
   paramList_.setAutoDelete( TRUE );
 }
 
         ContentLine &
 ContentLine::operator = (ContentLine & x)
 {
         if (*this == x) return *this;
 
     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)
+ContentLine::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         delete value_;
         value_ = 0;
         return *this;
 }
 
         bool
 ContentLine::operator == (ContentLine & x)
 {
         x.parse();
 
-        QPtrListIterator<Param> it(x.paramList());
+        Q3PtrListIterator<Param> it(x.paramList());
 
         if (!paramList_.find(it.current()))
                 return false;
 
         return true;
 }
 
 ContentLine::~ContentLine()
 {
         delete value_;
         value_ = 0;
 }
 
         void
 ContentLine::_parse()
 {
         vDebug("parse");
 
     // Unfold folded lines
     // NLR
-    strRep_ = strRep_.replace( QRegExp( "\\r" ), "" );
+    strRep_ = strRep_.replace( "\\r" , "" );
                 // Unqote newlines
-        strRep_ = strRep_.replace( QRegExp( "\\\\n" ), "\n" );
+        strRep_ = strRep_.replace( "\\\\n", "\n" );
     //NLR
-        strRep_ = strRep_.replace( QRegExp( "\\\\r" ), "\r" );
+        strRep_ = strRep_.replace( "\\\\r" , "\r" );
 
         int split = strRep_.find(':');
 
         if (split == -1) { // invalid content line
                 vDebug("No ':'");
                 return;
         }
 
-        QCString firstPart(strRep_.left(split));
-        QCString valuePart(strRep_.mid(split + 1));
+        Q3CString firstPart(strRep_.left(split));
+        Q3CString valuePart(strRep_.mid(split + 1));
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.mid(split + 1);
         }
 
         vDebug("Group == " + group_);
         vDebug("firstPart == " + firstPart);
         vDebug("valuePart == " + valuePart);
 
         // Now we have the group, the name and param list together and the value.
 
-        QStrList l;
+        Q3StrList l;
 
         RTokenise(firstPart, ";", l);
 
         if (l.count() == 0) {// invalid - no name !
                 vDebug("No name for this content line !");
                 return;
         }
 
         name_ = l.at(0);
 
         // Now we have the name, so the rest of 'l' is the params.
         // Remove the name part.
         l.remove(0u);
 
                 entityType_= EntityNameToEntityType(name_);
                 paramType_= EntityTypeToParamType(entityType_);
 
         unsigned int i = 0;
 
         // For each parameter, create a new parameter of the correct type.
 
-        QStrListIterator it(l);
+        Q3StrListIterator it(l);
 
         for (; it.current(); ++it, i++) {
 
-                QCString str = *it;
+                Q3CString str = *it;
 
                 split = str.find("=");
                 if (split < 0 ) {
                         vDebug("No '=' in paramter.");
                         continue;
                 }
 
-                QCString paraName = str.left(split);
-                QCString paraValue = str.mid(split + 1);
+                Q3CString paraName = str.left(split);
+                Q3CString paraValue = str.mid(split + 1);
 
-                QStrList paraValues;
+                Q3StrList paraValues;
                 RTokenise(paraValue, ",", paraValues);
 
-                QStrListIterator it2( paraValues );
+                Q3StrListIterator it2( paraValues );
 
                 for(; it2.current(); ++it2) {
 
                         Param *p = new Param;
                         p->setName( paraName );
                         p->setValue( *it2 );
 
                         paramList_.append(p);
                 }
         }
 
         // Create a new value of the correct type.
 
         valueType_ = EntityTypeToValueType(entityType_);
 
         //kdDebug(5710) << "valueType: " << valueType_ << endl;
 
         switch (valueType_) {
 
                         case ValueSound:        value_ = new SoundValue;break;
                         case ValueAgent:        value_ = new AgentValue;break;
                         case ValueAddress:      value_ = new AdrValue;  break;
                         case ValueTel:          value_ = new TelValue;  break;
                         case ValueTextBin:      value_ = new TextBinValue;break;
@@ -288,49 +288,49 @@ ContentLine::_assemble()
                 line += ";" + it.current()->asString();
 
         if (value_ != 0)
                 line += ":" + value_->asString();
 
         line = line.replace( QRegExp( "\r" ), "\\r" );
         line = line.replace( QRegExp( "\n" ), "\\n" );
 
         // Fold lines longer than 72 chars
         const int maxLen = 72;
         uint cursor = 0;
     QString cut;
         while( line.length() > ( cursor + 1 ) * maxLen ) {
                 cut += line.mid( cursor * maxLen, maxLen );
                 cut += "\r\n ";
                 ++cursor;
         }
         cut += line.mid( cursor * maxLen );
     strRep_ = cut.latin1();
     //qDebug("ContentLine::_assemble()\n%s*****", strRep_.data());
 #if 0
         vDebug("Assemble (argl) - my name is \"" + name_ + "\"");
         strRep_.truncate(0);
 
-        QCString line;
+        Q3CString line;
 
         if (!group_.isEmpty())
                 line += group_ + '.';
 
         line += name_;
 
         vDebug("Adding parameters");
         ParamListIterator it(paramList_);
 
         for (; it.current(); ++it)
                 line += ";" + it.current()->asString();
 
         vDebug("Adding value");
         if (value_ != 0)
                 line += ":" + value_->asString();
         else
                 vDebug("No value");
 
         // Quote newlines
         line = line.replace( QRegExp( "\n" ), "\\n" );
 
         // Fold lines longer than 72 chars
         const int maxLen = 72;
         uint cursor = 0;
diff --git a/kabc/vcard/DateParam.cpp b/kabc/vcard/DateParam.cpp
index 52af089..52fb828 100644
--- a/kabc/vcard/DateParam.cpp
+++ b/kabc/vcard/DateParam.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardDateParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 DateParam::DateParam()
                 :Param()
 {
 }
 
 DateParam::DateParam(const DateParam & x)
                 :Param(x)
 {
 }
 
-DateParam::DateParam(const QCString & s)
+DateParam::DateParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         DateParam &
 DateParam::operator = (DateParam & x)
 {
         if (*this == x) return *this;
 
         Param::operator = (x);
         return *this;
 }
 
         DateParam &
-DateParam::operator = (const QCString & s)
+DateParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
 DateParam::operator == (DateParam & x)
 {
         x.parse();
         
         return false;
 }
 
 DateParam::~DateParam()
 {
 }
 
         void
 DateParam::_parse()
 {
 }
 
         void
 DateParam::_assemble()
diff --git a/kabc/vcard/DateValue.cpp b/kabc/vcard/DateValue.cpp
index c5c5c85..87c7007 100644
--- a/kabc/vcard/DateValue.cpp
+++ b/kabc/vcard/DateValue.cpp
@@ -1,48 +1,50 @@
 /*
         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>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <kdebug.h>
 
 #include <VCardDefines.h>
 #include <VCardDateValue.h>
 #include <VCardValue.h>
 
 using namespace VCARD;
 
 DateValue::DateValue()
                 :Value()
 {
         vDebug("DateValue::DateValue()");
 }
 
 DateValue::DateValue(
                         unsigned intyear,
                         unsigned intmonth,
                         unsigned intday,
                         unsigned inthour,
                         unsigned intminute,
                         unsigned intsecond,
                         double  secFrac,
                         bool    zonePositive,
@@ -84,189 +86,189 @@ DateValue::DateValue(const QDateTime & d)
                         hour_   (d.time().hour()),
                         minute_         (d.time().minute()),
                         second_         (d.time().second()),
                 hasTime_(true)
 {
         parsed_ = true;
         assembled_ = false;
 }
 
 DateValue::DateValue(const DateValue & x)
                 :Value(x)
 {
         year_ = x.year_;
         month_ = x.month_;
         day_ = x.day_;
         hour_ = x.hour_;
         minute_ = x.minute_;
         second_ = x.second_;
         zoneHour_ = x.zoneHour_;
         zoneMinute_ = x.zoneMinute_;
         secFrac_ = x.secFrac_;
         hasTime_ = x.hasTime_;
 }
 
-DateValue::DateValue(const QCString & s)
+DateValue::DateValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         DateValue &
 DateValue::operator = (DateValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         DateValue &
-DateValue::operator = (const QCString & s)
+DateValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 DateValue::operator == (DateValue & x)
 {
         x.parse();
         return false;
 }
 
 DateValue::~DateValue()
 {
 }
 
         DateValue *
 DateValue::clone()
 {
         return new DateValue( *this );
 }
 
         void
 DateValue::_parse()
 {
         vDebug("DateValue::_parse()");
 
         // date = date-full-year ["-"] date-month ["-"] date-mday
         // time = time-hour [":"] time-minute [":"] time-second [":"]
         // [time-secfrac] [time-zone]
         
         int timeSep = strRep_.find('T');
         
-        QCString dateStr;
-        QCString timeStr;
+        Q3CString dateStr;
+        Q3CString timeStr;
         
         if (timeSep == -1) {
                 
                 dateStr = strRep_;
                 vDebug("Has date string \"" + dateStr + "\"");
                 
         } else {
                 
                 dateStr = strRep_.left(timeSep);
                 vDebug("Has date string \"" + dateStr + "\"");
                 
                 timeStr = strRep_.mid(timeSep + 1);
                 vDebug("Has time string \"" + timeStr + "\"");
         }
         
         /////////////////////////////////////////////////////////////// DATE
         
-        dateStr.replace(QRegExp("-"), "");
+        dateStr.replace("-", "");
 
         kdDebug(5710) << "dateStr: " << dateStr << endl;
 
                 year_= dateStr.left(4).toInt();
                 month_= dateStr.mid(4, 2).toInt();
                 day_= dateStr.right(2).toInt();
         
         if (timeSep == -1) {
                 hasTime_ = false;
                 return; // No time, done.
         }
         else
                 hasTime_ = true;
         
         /////////////////////////////////////////////////////////////// TIME
 
         /////////////////////////////////////////////////////////////// ZONE
         
         int zoneSep = timeStr.find('Z');
         
         if (zoneSep != -1 && timeStr.length() - zoneSep > 3) {
                 
-                QCString zoneStr(timeStr.mid(zoneSep + 1));
+                Q3CString zoneStr(timeStr.mid(zoneSep + 1));
                 vDebug("zoneStr == " + zoneStr);
 
                         zonePositive_= (zoneStr[0] == '+');
                         zoneHour_       = zoneStr.mid(1, 2).toInt();
                         zoneMinute_     = zoneStr.right(2).toInt();
                 
                 timeStr.remove(zoneSep, timeStr.length() - zoneSep);
         }
 
         //////////////////////////////////////////////////// SECOND FRACTION
         
         int secFracSep = timeStr.findRev(',');
         
         if (secFracSep != -1 && zoneSep != -1) { // zoneSep checked to avoid errors.
-                QCString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
+                Q3CString quirkafleeg = "0." + timeStr.mid(secFracSep + 1, zoneSep);
                 secFrac_ = quirkafleeg.toDouble();
         }
         
         /////////////////////////////////////////////////////////////// HMS
 
-        timeStr.replace(QRegExp(":"), "");
+        timeStr.replace(":", "");
         
                 hour_= timeStr.left(2).toInt();
                 minute_= timeStr.mid(2, 2).toInt();
                 second_= timeStr.mid(4, 2).toInt();
 }
 
         void
 DateValue::_assemble()
 {
         vDebug("DateValue::_assemble");
 
-        QCString year;
-        QCString month;
-        QCString day;
+        Q3CString year;
+        Q3CString month;
+        Q3CString day;
         
         year.setNum( year_ );
         month.setNum( month_ );
         day.setNum( day_ );
 
         if ( month.length() < 2 ) month.prepend( "0" );
         if ( day.length() < 2 ) day.prepend( "0" );
 
         strRep_ = year + '-' + month + '-' + day;
 
         if ( hasTime_ ) {
-            QCString hour;
-            QCString minute;
-            QCString second;
+            Q3CString hour;
+            Q3CString minute;
+            Q3CString second;
 
             hour.setNum( hour_ );
             minute.setNum( minute_ );
             second.setNum( second_ );
 
             if ( hour.length() < 2 ) hour.prepend( "0" );
             if ( minute.length() < 2 ) minute.prepend( "0" );
             if ( second.length() < 2 ) second.prepend( "0" );
 
             strRep_ += 'T' + hour + ':' + minute + ':' + second + 'Z';
         }
 }
 
         unsigned int
 DateValue::year()
 {
         parse();
         return year_;
 }
 
         unsigned int
 DateValue::month()
 {
         parse();
diff --git a/kabc/vcard/EmailParam.cpp b/kabc/vcard/EmailParam.cpp
index 8c87477..877af60 100644
--- a/kabc/vcard/EmailParam.cpp
+++ b/kabc/vcard/EmailParam.cpp
@@ -3,83 +3,85 @@
 
         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 <VCardEmailParam.h>
 #include <VCardParam.h>
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 EmailParam::EmailParam()
                 :Param()
 {
         vDebug("ctor");
 }
 
 EmailParam::EmailParam(const EmailParam & x)
                 :Param(x),
                         emailType_(x.emailType_),
                         pref_   (x.pref_)
 {
 }
 
-EmailParam::EmailParam(const QCString & s)
+EmailParam::EmailParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         EmailParam &
 EmailParam::operator = (EmailParam & x)
 {
         if (*this == x) return *this;
         
                 emailType_= x.emailType();
                 pref_   = x.pref_;
 
         Param::operator = (x);
         return *this;
 }
 
         EmailParam &
-EmailParam::operator = (const QCString & s)
+EmailParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
 EmailParam::operator == (EmailParam & x)
 {
         parse();
 
         if (pref_)
                 return (x.pref_ && x.emailType() == emailType_);
 
         return !x.pref();
 }
 
 EmailParam::~EmailParam()
 {
 }
 
         void
 EmailParam::_parse()
 {
 #if 0
diff --git a/kabc/vcard/Entity.cpp b/kabc/vcard/Entity.cpp
index b7d09e0..e38fa11 100644
--- a/kabc/vcard/Entity.cpp
+++ b/kabc/vcard/Entity.cpp
@@ -1,126 +1,128 @@
 /*
         libvcard - vCard parsing library for vCard version 3.0
         
         Copyright (C) 1999 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 <VCardEntity.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 Entity::Entity()
                 :       parsed_         (false),
                         assembled_(true)
 {
         // empty
 }
                 
 Entity::Entity(const Entity & e)
                 :       strRep_         (e.strRep_),
                         parsed_         (e.parsed_),
                         assembled_(e.assembled_)
 {
         // empty
 }
                 
-Entity::Entity(const QCString & s)
+Entity::Entity(const Q3CString & s)
                 :       strRep_         (s),
                         parsed_         (false),
                         assembled_(true)
 {
         // empty
 }
                 
         Entity &
 Entity::operator = (const Entity & e)
 {
         if (this == &e) return *this;
         
                 strRep_         = e.strRep_;
                 parsed_         = e.parsed_;
                 assembled_= e.assembled_;
 
         return *this;
 }
                 
         Entity &
-Entity::operator = (const QCString & s)
+Entity::operator = (const Q3CString & s)
 {
                 strRep_         = s;
                 parsed_         = false;
                 assembled_= true;
         
         return *this;
 }
                 
         bool
 Entity::operator == (Entity & e)
 {
         return asString() == e.asString();
 }
                 
         bool
 Entity::operator != (Entity & e)
 {
         return !(*this == e);
 }
                 
         bool
-Entity::operator == (const QCString & s)
+Entity::operator == (const Q3CString & s)
 {
         return asString() == s;
 }
                 
         bool
-Entity::operator != (const QCString & s)
+Entity::operator != (const Q3CString & s)
 {
         return !(*this == s);
 }
                 
 Entity::~Entity()
 {
         // empty
 }
                 
-        QCString
+        Q3CString
 Entity::asString()
 {
         //vDebug("Entity::asString()");
         assemble();
 
         return strRep_;
 }
                 
         void
 Entity::parse()
 {
         //vDebug( "Entity::parse()" );
 
         if (!parsed_) _parse();
         
                 parsed_         = true;
                 assembled_= false;
 }
                 
         void
 Entity::assemble()
 {
         //vDebug( "Entity::assemble()" );
 
diff --git a/kabc/vcard/Enum.cpp b/kabc/vcard/Enum.cpp
index cc48b5a..036324c 100644
--- a/kabc/vcard/Enum.cpp
+++ b/kabc/vcard/Enum.cpp
@@ -1,56 +1,56 @@
 /*
         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 <q3cstring.h>
 #include <ctype.h>
 
 #include <VCardEnum.h>
 
 using namespace VCARD;
 
 // There are 31 possible types, not including extensions.
-        const QCString
+        const Q3CString
 VCARD::paramNames [] =
 {
         "NAME",
         "PROFILE",
         "SOURCE",
         "FN",
         "N",
         "NICKNAME",
         "PHOTO",
         "BDAY",
         "ADR",
         "LABEL",
         "TEL",
         "EMAIL",
         "MAILER",
         "TZ",
         "GEO",
         "TITLE",
         "ROLE",
         "LOGO",
         "AGENT",
         "ORG",
         "CATEGORIES",
         "NOTE",
@@ -201,57 +201,57 @@ VCARD::EntityTypeToValueType(EntityType e)
                         case EntityNickname:            t = ValueTextList;break;
                 //---------------------------------------------------------------//
                 case EntityLabel:
                 case EntityExtension:
                 case EntityEmail:
                 case EntityTitle:
                 case EntityRole:
                 case EntityFullName:
                 case EntityMailer:
                 case EntityProductID:
                 case EntityName:
                 case EntitySortString:
                 case EntityVersion:
                 case EntityProfile:
                 case EntityUID:
                 case EntityNote:
                         default:                        t = ValueText;  break;
                 //---------------------------------------------------------------//
 
         }
         
         return t;
 }
 
-        QCString
+        Q3CString
 VCARD::EntityTypeToParamName(EntityType e)
 {
         if ( e > EntityUnknown ) e = EntityUnknown;
         return paramNames[ int( e ) ];
 }
 
         EntityType
-VCARD::EntityNameToEntityType(const QCString & s)
+VCARD::EntityNameToEntityType(const Q3CString & s)
 {
         if (s.isEmpty()) return EntityUnknown;
         
         EntityType t(EntityUnknown);
         
         switch (s[0]) {
 
                 case 'A':
                         if (s == "ADR")
                                 t = EntityAddress;
                         else if (s == "AGENT")
                                 t = EntityAgent;
                         break;
 
                 case 'B':
                         if (s == "BDAY")
                                 t = EntityBirthday;
                         break;
 
                 case 'C':
                         if (s == "CATEGORIES")
                                 t = EntityCategories;
                         else if (s == "CLASS")
                                 t = EntityClass;
diff --git a/kabc/vcard/FloatValue.cpp b/kabc/vcard/FloatValue.cpp
index 15bb664..7065081 100644
--- a/kabc/vcard/FloatValue.cpp
+++ b/kabc/vcard/FloatValue.cpp
@@ -3,118 +3,120 @@
 
         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 <VCardFloatValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 FloatValue::FloatValue()
                 :Value()
 {
 }
 
 FloatValue::FloatValue(float f)
                 :       Value(),
                         value_(f)
 {
         parsed_ = true;
 }
 
 FloatValue::FloatValue(const FloatValue & x)
                 :Value(x)
 {
         value_ = x.value_;
 }
 
-FloatValue::FloatValue(const QCString & s)
+FloatValue::FloatValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         FloatValue &
 FloatValue::operator = (FloatValue & x)
 {
         if (*this == x) return *this;
         
         x.parse();
         value_ = x.value_;
 
         Value::operator = (x);
         return *this;
 }
 
         FloatValue &
-FloatValue::operator = (const QCString & s)
+FloatValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 FloatValue::operator == (FloatValue & x)
 {
         x.parse();
         return (value_ == x.value_);
 }
 
 FloatValue::~FloatValue()
 {
 }
 
         void
 FloatValue::_parse()
 {
         bool negative(false);
         
         if (strRep_[0] == '-' || strRep_[1] == '+') {
                 
                 if (strRep_[0] == '-')
                         negative = true;
                 
                 strRep_.remove(0, 1);
         }
         
         value_ = strRep_.toFloat();
         if (negative)
                 value_ = -value_;
 }
 
         void
 FloatValue::_assemble()
 {
-        strRep_ = QCString().setNum(value_);
+        strRep_ = Q3CString().setNum(value_);
 }
 
         float
 FloatValue::value()
 {
         parse();
         return value_;
 }
 
         void
 FloatValue::setValue(float f)
 {
         parsed_ = true;
         value_ = f;
 }
 
diff --git a/kabc/vcard/GeoValue.cpp b/kabc/vcard/GeoValue.cpp
index e02b402..ba57a6b 100644
--- a/kabc/vcard/GeoValue.cpp
+++ b/kabc/vcard/GeoValue.cpp
@@ -2,80 +2,82 @@
     This file is part of libvcard.
     Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <VCardGeoValue.h>
 
 #include <VCardValue.h>
 
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 GeoValue::GeoValue()
                 :Value()
 {
 }
 
 GeoValue::GeoValue(const GeoValue & x)
                 :Value(x), latitude_(x.latitude_), longitude_(x.longitude_)
 {
 }
 
-GeoValue::GeoValue(const QCString & s)
+GeoValue::GeoValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         GeoValue &
 GeoValue::operator = (GeoValue & x)
 {
         if (*this == x) return *this;
 
   latitude_ = x.latitude_;
   longitude_ = x.longitude_;
 
         Value::operator = (x);
         return *this;
 }
 
         GeoValue &
-GeoValue::operator = (const QCString & s)
+GeoValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 GeoValue::operator == (GeoValue & x)
 {
         x.parse();
 
   if ( latitude_ != x.latitude_ ) return false;
   if ( longitude_ != x.longitude_ ) return false;
 
         return true;
 }
 
 GeoValue::~GeoValue()
 {
 }
 
         GeoValue *
 GeoValue::clone()
 {
         return new GeoValue( *this );
diff --git a/kabc/vcard/ImageParam.cpp b/kabc/vcard/ImageParam.cpp
index c9cf6fd..6da317d 100644
--- a/kabc/vcard/ImageParam.cpp
+++ b/kabc/vcard/ImageParam.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardImageParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 ImageParam::ImageParam()
                 :Param()
 {
 }
 
 ImageParam::ImageParam(const ImageParam & x)
                 :Param(x)
 {
 }
 
-ImageParam::ImageParam(const QCString & s)
+ImageParam::ImageParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         ImageParam &
 ImageParam::operator = (ImageParam & x)
 {
         if (*this == x) return *this;
 
         Param::operator = (x);
         return *this;
 }
 
         ImageParam &
-ImageParam::operator = (const QCString & s)
+ImageParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
 ImageParam::operator == (ImageParam & x)
 {
         x.parse();
         return false;
 }
 
 ImageParam::~ImageParam()
 {
 }
 
         void
 ImageParam::_parse()
 {
 }
 
         void
 ImageParam::_assemble()
 {
diff --git a/kabc/vcard/ImageValue.cpp b/kabc/vcard/ImageValue.cpp
index 4630fac..678a81c 100644
--- a/kabc/vcard/ImageValue.cpp
+++ b/kabc/vcard/ImageValue.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardImageValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 ImageValue::ImageValue()
                 :Value()
 {
 }
 
 ImageValue::ImageValue(const ImageValue & x)
                 :Value(x)
 {
 }
 
-ImageValue::ImageValue(const QCString & s)
+ImageValue::ImageValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         ImageValue &
 ImageValue::operator = (ImageValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         ImageValue &
-ImageValue::operator = (const QCString & s)
+ImageValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 ImageValue::operator == (ImageValue & x)
 {
         x.parse();
         return false;
 }
 
 ImageValue::~ImageValue()
 {
 }
 
         void
 ImageValue::_parse()
 {
 }
 
         void
 ImageValue::_assemble()
 {
diff --git a/kabc/vcard/ImgValue.cpp b/kabc/vcard/ImgValue.cpp
index 7b961f8..1b289df 100644
--- a/kabc/vcard/ImgValue.cpp
+++ b/kabc/vcard/ImgValue.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardImgValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 ImgValue::ImgValue()
                 :Value()
 {
 }
 
 ImgValue::ImgValue(const ImgValue & x)
                 :Value(x)
 {
 }
 
-ImgValue::ImgValue(const QCString & s)
+ImgValue::ImgValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         ImgValue &
 ImgValue::operator = (ImgValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         ImgValue &
-ImgValue::operator = (const QCString & s)
+ImgValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 ImgValue::operator == (ImgValue & x)
 {
         x.parse();
         return false;
 }
 
 ImgValue::~ImgValue()
 {
 }
 
         void
 ImgValue::_parse()
 {
 }
 
         void
 ImgValue::_assemble()
 {
diff --git a/kabc/vcard/LangValue.cpp b/kabc/vcard/LangValue.cpp
index edf1804..52a0204 100644
--- a/kabc/vcard/LangValue.cpp
+++ b/kabc/vcard/LangValue.cpp
@@ -5,123 +5,127 @@
         
   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 <VCardRToken.h>
 
 #include <VCardLangValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3StrList>
 
 using namespace VCARD;
 
 LangValue::LangValue()
                 :Value()
 {
 }
 
 LangValue::LangValue(const LangValue & x)
                 :Value(x)
 {
 }
 
-LangValue::LangValue(const QCString & s)
+LangValue::LangValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         LangValue &
 LangValue::operator = (LangValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         LangValue &
-LangValue::operator = (const QCString & s)
+LangValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 LangValue::operator == (LangValue & x)
 {
         x.parse();
         return false;
 }
 
 LangValue::~LangValue()
 {
 }
 
         void
 LangValue::_parse()
 {
-        QStrList l;
+        Q3StrList l;
         RTokenise(strRep_, "-", l);
         
         if (l.count() == 0) return;
         
         primary_ = l.at(0);
         
         l.remove(0u);
         
         subtags_ = l;
 }
 
         void
 LangValue::_assemble()
 {
         strRep_ = primary_;
         
-        QStrListIterator it(subtags_);
+        Q3StrListIterator it(subtags_);
         
-        for (; it.current(); ++it)
-                strRep_ += QCString('-') + it.current();
+        for (; it.current(); ++it) {
+                strRep_ += Q3CString('-'); strRep_ += it.current();
+        }
 }
 
-        QCString
+        Q3CString
 LangValue::primary()
 {
         parse();
         return primary_;
 }
         
-        QStrList
+        Q3StrList
 LangValue::subtags()
 {
         parse();
         return subtags_;
 }
         
         void
-LangValue::setPrimary(const QCString & s)
+LangValue::setPrimary(const Q3CString & s)
 {
         parse();
         primary_ = s;
 }
 
         void
-LangValue::setSubTags(const QStrList & l)
+LangValue::setSubTags(const Q3StrList & l)
 {
         parse();
         subtags_ = l;
 }
 
diff --git a/kabc/vcard/NValue.cpp b/kabc/vcard/NValue.cpp
index cdec621..6c0f365 100644
--- a/kabc/vcard/NValue.cpp
+++ b/kabc/vcard/NValue.cpp
@@ -1,127 +1,129 @@
 /*
         libvcard - vCard parsing library for vCard version 3.0
 
         Copyright (C) 1999 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 <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <VCardRToken.h>
 #include <VCardNValue.h>
 #include <VCardValue.h>
 #include <VCardDefines.h>
 
 using namespace VCARD;
 
 NValue::NValue()
                 :Value()
 {
         vDebug("ctor");
 }
 
 NValue::NValue(const NValue & x)
                 :Value(x),
                         family_(x.family_),
                         given_(x.given_),
                         middle_(x.middle_),
                         prefix_(x.prefix_),
                         suffix_(x.suffix_)
 {
 }
 
-NValue::NValue(const QCString & s)
+NValue::NValue(const Q3CString & s)
                 :Value(s)
 {
         vDebug("ctor");
 }
 
         NValue &
 NValue::operator = (NValue & x)
 {
         if (*this == x) return *this;
         
                 family_= x.family_;
                 given_= x.given_;
                 middle_= x.middle_;
                 prefix_= x.prefix_;
                 suffix_= x.suffix_;
 
         Value::operator = (x);
         return *this;
 }
 
         NValue &
-NValue::operator = (const QCString & s)
+NValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 NValue::operator == (NValue & x)
 {
         x.parse();
 
         return (
                         family_         == x.family_&&
                         given_  == x.given_&&
                         middle_         == x.middle_&&
                         prefix_         == x.prefix_&&
                 suffix_ == x.suffix_);
 }
 
 NValue::~NValue()
 {
 }
 
         NValue *
 NValue::clone()
 {
         return new NValue( *this );
 }
 
         void
 NValue::_parse()
 {
-        QStrList l;
+        Q3StrList l;
         RTokenise(strRep_, ";", l);
         
         for (unsigned int i = 0; i < l.count(); i++) {
 
                 switch (i) {
                                 case 0: family_         = l.at(0);break;
                                 case 1: given_  = l.at(1);break;
                                 case 2: middle_         = l.at(2);break;
                                 case 3: prefix_         = l.at(3);break;
                                 case 4: suffix_         = l.at(4);break;
                                 default:                break;
                 }
         }
 }
 
         void
 NValue::_assemble()
 {
                 strRep_ =       family_;
                 strRep_ += ";" +given_;
                 strRep_ += ";" +middle_;
                 strRep_ += ";" +prefix_;
                 strRep_ += ";" +suffix_;
 }
diff --git a/kabc/vcard/OrgValue.cpp b/kabc/vcard/OrgValue.cpp
index c3134c8..a6a32dd 100644
--- a/kabc/vcard/OrgValue.cpp
+++ b/kabc/vcard/OrgValue.cpp
@@ -5,103 +5,105 @@
         
   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 <VCardRToken.h>
 
 #include <VCardOrgValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 OrgValue::OrgValue()
                 :Value()
 {
 }
 
 OrgValue::OrgValue(const OrgValue & x)
                 :Value(x)
 {
 }
 
-OrgValue::OrgValue(const QCString & s)
+OrgValue::OrgValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         OrgValue &
 OrgValue::operator = (OrgValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         OrgValue &
-OrgValue::operator = (const QCString & s)
+OrgValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 OrgValue::operator == (OrgValue & x)
 {
         x.parse();
         return false;
 }
 
 OrgValue::~OrgValue()
 {
 }
 
         void
 OrgValue::_parse()
 {
         RTokenise(strRep_, ";", valueList_);
 }
 
         void
 OrgValue::_assemble()
 {
         bool first(true);
         
-        QStrListIterator it(valueList_);
+        Q3StrListIterator it(valueList_);
         
         for (; it.current(); ++it) {
                 if (!first) strRep_ += ';';
                 strRep_ += it.current();
                 first = false;
         }
 }
 
         unsigned int
 OrgValue::numValues()
 {
         parse();
         return valueList_.count();
 }
 
-        QCString
+        Q3CString
 OrgValue::value(unsigned int i)
 {
         parse();
         return valueList_.at(i);
 }
 
diff --git a/kabc/vcard/Param.cpp b/kabc/vcard/Param.cpp
index c513613..bd6b299 100644
--- a/kabc/vcard/Param.cpp
+++ b/kabc/vcard/Param.cpp
@@ -5,125 +5,127 @@
         
   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 <VCardParam.h>
 
 #include <VCardEntity.h>
 
 #include <VCardRToken.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 Param::Param()
                 :Entity(),
                 name_(""),
                 value_("")
 {
 }
 
 Param::Param(const Param & x)
                 :Entity(x),
                 name_(x.name_),
                 value_(x.value_)
 {
 }
 
-Param::Param(const QCString & s)
+Param::Param(const Q3CString & s)
                 :Entity(s),
                 name_(""),
                 value_("")
 {
 }
 
         Param &
 Param::operator = (Param & x)
 {
         if (*this == x) return *this;
 
         Entity::operator = (x);
         name_ = x.name_;
         value_ = x.value_;
         
         return *this;
 }
 
         Param &
-Param::operator = (const QCString & s)
+Param::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
 Param::operator == (Param & x)
 {
         x.parse();
         return false;
 }
 
 Param::~Param()
 {
 }
 
         void
 Param::_parse()
 {
 }
 
         void
 Param::_assemble()
 {
         strRep_ = name_ + "=" + value_;
 }
 
-Param::Param(const QCString &name, const QCString &value)
+Param::Param(const Q3CString &name, const Q3CString &value)
                 :Entity(),
                 name_(name),
                 value_(value)
 {
         parsed_ = true;
         assembled_ = false;
 }
 
         void
-Param::setName(const QCString & name)
+Param::setName(const Q3CString & name)
 {
         name_ = name;
         
         assembled_ = false;
 }
 
         void
-Param::setValue(const QCString & value)
+Param::setValue(const Q3CString & value)
 {
         value_ = value;
         
         assembled_ = false;
 }
 
-        QCString
+        Q3CString
 Param::name()
 {
         return name_;
 }
 
-        QCString
+        Q3CString
 Param::value()
 {
         return value_;
 }
diff --git a/kabc/vcard/PhoneNumberValue.cpp b/kabc/vcard/PhoneNumberValue.cpp
index 17b1400..57aa336 100644
--- a/kabc/vcard/PhoneNumberValue.cpp
+++ b/kabc/vcard/PhoneNumberValue.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardPhoneNumberValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 PhoneNumberValue::PhoneNumberValue()
                 :Value()
 {
 }
 
 PhoneNumberValue::PhoneNumberValue(const PhoneNumberValue & x)
                 :Value(x)
 {
 }
 
-PhoneNumberValue::PhoneNumberValue(const QCString & s)
+PhoneNumberValue::PhoneNumberValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         PhoneNumberValue &
 PhoneNumberValue::operator = (PhoneNumberValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         PhoneNumberValue &
-PhoneNumberValue::operator = (const QCString & s)
+PhoneNumberValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 PhoneNumberValue::operator == (PhoneNumberValue & x)
 {
         x.parse();
         return false;
 }
 
 PhoneNumberValue::~PhoneNumberValue()
 {
 }
 
         void
 PhoneNumberValue::_parse()
 {
 }
 
         void
 PhoneNumberValue::_assemble()
 {
diff --git a/kabc/vcard/RToken.cpp b/kabc/vcard/RToken.cpp
index 2a85820..8fc0558 100644
--- a/kabc/vcard/RToken.cpp
+++ b/kabc/vcard/RToken.cpp
@@ -3,56 +3,56 @@
         libvcard - vCard parsing library for vCard version 3.0
 
         Copyright (C) 1999 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 <string.h>
 #include <stddef.h>
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 namespace VCARD
 {
 
         Q_UINT32
-RTokenise(const char * str, const char * delim, QStrList & l)
+RTokenise(const char * str, const char * delim, Q3StrList & l)
 {
         // FIXME no stderr !
         l.clear();
         
         if (!delim || !str || strlen(delim) == 0 || strlen(str) == 0) return 0;
         
                 char * len = (char *)(str + strlen(str));// End of string.
         
         register char * rstart = new char[strlen(str) + 1];
         register char * r = rstart;
         
         
                 register const char * i = str;// Cursor.
         
         while (i <= len) {
 
                 if (*i == '\\') { // Escaped chars go straight through.
                         *r++ = *i++;
                         if (i <= len)
                                 *r++ = *i++;
                         continue;
                 }
                 
                 if (strchr(delim, *i) != 0) {
diff --git a/kabc/vcard/SoundValue.cpp b/kabc/vcard/SoundValue.cpp
index 81040d1..4d098d2 100644
--- a/kabc/vcard/SoundValue.cpp
+++ b/kabc/vcard/SoundValue.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardSoundValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 SoundValue::SoundValue()
                 :Value()
 {
 }
 
 SoundValue::SoundValue(const SoundValue & x)
                 :Value(x)
 {
 }
 
-SoundValue::SoundValue(const QCString & s)
+SoundValue::SoundValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         SoundValue &
 SoundValue::operator = (SoundValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         SoundValue &
-SoundValue::operator = (const QCString & s)
+SoundValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 SoundValue::operator == (SoundValue & x)
 {
         x.parse();
         return false;
 }
 
 SoundValue::~SoundValue()
 {
 }
 
         void
 SoundValue::_parse()
 {
 }
 
         void
 SoundValue::_assemble()
 {
diff --git a/kabc/vcard/SourceParam.cpp b/kabc/vcard/SourceParam.cpp
index cd51cbd..8f02113 100644
--- a/kabc/vcard/SourceParam.cpp
+++ b/kabc/vcard/SourceParam.cpp
@@ -3,85 +3,87 @@
 
         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 <VCardSourceParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 SourceParam::SourceParam()
                 :Param(),
                 type_(SourceParam::TypeUnknown)
 {
 }
 
 SourceParam::SourceParam(const SourceParam & x)
                 :Param(x),
                         type_(x.type_),
                         par_(x.par_),
                         val_(x.val_)
 {
 }
 
-SourceParam::SourceParam(const QCString & s)
+SourceParam::SourceParam(const Q3CString & s)
                 :Param(s),
                 type_(SourceParam::TypeUnknown)
 {
 }
 
         SourceParam &
 SourceParam::operator = (SourceParam & x)
 {
         if (*this == x) return *this;
                 type_= x.type();
                 par_= x.par();
                 val_= x.val();
 
         Param::operator = (x);
         return *this;
 }
 
         SourceParam &
-SourceParam::operator = (const QCString & s)
+SourceParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
 SourceParam::operator == (SourceParam & x)
 {
         x.parse();
         return false;
 }
 
 SourceParam::~SourceParam()
 {
 }
 
         void
 SourceParam::_parse()
 {
         int i = strRep_.find('=');
         if (i == -1) // Invalid
                 return;
         
         par_ = strRep_.left(i);
diff --git a/kabc/vcard/TelParam.cpp b/kabc/vcard/TelParam.cpp
index 9d9fe4d..4bc8b6a 100644
--- a/kabc/vcard/TelParam.cpp
+++ b/kabc/vcard/TelParam.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardTelParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TelParam::TelParam()
                 :Param()
 {
 }
 
 TelParam::TelParam(const TelParam & x)
                 :Param(x)
 {
 }
 
-TelParam::TelParam(const QCString & s)
+TelParam::TelParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         TelParam &
 TelParam::operator = (TelParam & x)
 {
         if (*this == x) return *this;
 
         Param::operator = (x);
         return *this;
 }
 
         TelParam &
-TelParam::operator = (const QCString & s)
+TelParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
 TelParam::operator == (TelParam & x)
 {
         x.parse();
         return false;
 }
 
 TelParam::~TelParam()
 {
 }
 
         void
 TelParam::_parse()
 {
 }
 
         void
 TelParam::_assemble()
 {
diff --git a/kabc/vcard/TelValue.cpp b/kabc/vcard/TelValue.cpp
index 349f99a..d9cbf3e 100644
--- a/kabc/vcard/TelValue.cpp
+++ b/kabc/vcard/TelValue.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardTelValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TelValue::TelValue()
                 :Value()
 {
 }
 
 TelValue::TelValue(const TelValue & x)
                 :Value(x)
 {
 }
 
-TelValue::TelValue(const QCString & s)
+TelValue::TelValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         TelValue &
 TelValue::operator = (TelValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         TelValue &
-TelValue::operator = (const QCString & s)
+TelValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 TelValue::operator == (TelValue & x)
 {
         x.parse();
         return false;
 }
 
 TelValue::~TelValue()
 {
 }
 
         void
 TelValue::_parse()
 {
 }
 
         void
 TelValue::_assemble()
 {
diff --git a/kabc/vcard/TextBinParam.cpp b/kabc/vcard/TextBinParam.cpp
index 66f2946..2866c12 100644
--- a/kabc/vcard/TextBinParam.cpp
+++ b/kabc/vcard/TextBinParam.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardTextBinParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextBinParam::TextBinParam()
                 :Param()
 {
 }
 
 TextBinParam::TextBinParam(const TextBinParam & x)
                 :Param(x)
 {
 }
 
-TextBinParam::TextBinParam(const QCString & s)
+TextBinParam::TextBinParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         TextBinParam &
 TextBinParam::operator = (TextBinParam & x)
 {
         if (*this == x) return *this;
 
         Param::operator = (x);
         return *this;
 }
 
         TextBinParam &
-TextBinParam::operator = (const QCString & s)
+TextBinParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
 TextBinParam::operator == (TextBinParam & x)
 {
         x.parse();
         return false;
 }
 
 TextBinParam::~TextBinParam()
 {
 }
 
         void
 TextBinParam::_parse()
 {
 }
 
         void
 TextBinParam::_assemble()
 {
diff --git a/kabc/vcard/TextBinValue.cpp b/kabc/vcard/TextBinValue.cpp
index c584009..a3a96ae 100644
--- a/kabc/vcard/TextBinValue.cpp
+++ b/kabc/vcard/TextBinValue.cpp
@@ -4,84 +4,86 @@
         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 <kmdcodec.h>
 
 #include <VCardTextBinValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextBinValue::TextBinValue()
                 :Value()
 {
 }
 
 TextBinValue::TextBinValue(const TextBinValue & x)
                 :Value(x)
 {
   mIsBinary_ = x.mIsBinary_;
   mData_ = x.mData_;
   mUrl_ = x.mUrl_;
 }
 
-TextBinValue::TextBinValue(const QCString & s)
+TextBinValue::TextBinValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         TextBinValue &
 TextBinValue::operator = (TextBinValue & x)
 {
         if (*this == x) return *this;
 
   mIsBinary_ = x.mIsBinary_;
   mData_ = x.mData_;
   mUrl_ = x.mUrl_;
 
         Value::operator = (x);
         return *this;
 }
 
         TextBinValue &
-TextBinValue::operator = (const QCString & s)
+TextBinValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 TextBinValue::operator == (TextBinValue & x)
 {
         x.parse();
 
   if ( mIsBinary_ != x.mIsBinary_ ) return false;
   if ( mData_ != x.mData_ ) return false;
   if ( mUrl_ != x.mUrl_ ) return false;
 
         return true;
 }
 
 TextBinValue::~TextBinValue()
 {
 }
 
   TextBinValue *
 TextBinValue::clone()
 {
diff --git a/kabc/vcard/TextListValue.cpp b/kabc/vcard/TextListValue.cpp
index c4ac1e3..919f4f7 100644
--- a/kabc/vcard/TextListValue.cpp
+++ b/kabc/vcard/TextListValue.cpp
@@ -5,103 +5,105 @@
         
   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 <VCardRToken.h>
 
 #include <VCardTextListValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextListValue::TextListValue()
                 :Value()
 {
 }
 
 TextListValue::TextListValue(const TextListValue & x)
                 :Value(x)
 {
 }
 
-TextListValue::TextListValue(const QCString & s)
+TextListValue::TextListValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         TextListValue &
 TextListValue::operator = (TextListValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         TextListValue &
-TextListValue::operator = (const QCString & s)
+TextListValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 TextListValue::operator == (TextListValue & x)
 {
         x.parse();
         return false;
 }
 
 TextListValue::~TextListValue()
 {
 }
 
         void
 TextListValue::_parse()
 {
         RTokenise(strRep_, ";", valueList_);
 }
 
         void
 TextListValue::_assemble()
 {
         bool first(true);
         
-        QStrListIterator it(valueList_);
+        Q3StrListIterator it(valueList_);
         
         for (; it.current(); ++it) {
                 if (!first) strRep_ += ';';
                 strRep_ += it.current();
                 first = false;
         }
 }
 
         unsigned int
 TextListValue::numValues()
 {
         parse();
         return valueList_.count();
 }
 
-        QCString
+        Q3CString
 TextListValue::value(unsigned int i)
 {
         parse();
         return valueList_.at(i);
 }
 
diff --git a/kabc/vcard/TextParam.cpp b/kabc/vcard/TextParam.cpp
index 7c68700..ce6661f 100644
--- a/kabc/vcard/TextParam.cpp
+++ b/kabc/vcard/TextParam.cpp
@@ -3,77 +3,79 @@
 
         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 <VCardTextParam.h>
 
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextParam::TextParam()
                 :Param()
 {
 }
 
 TextParam::TextParam(const TextParam & x)
                 :Param(x)
 {
 }
 
-TextParam::TextParam(const QCString & s)
+TextParam::TextParam(const Q3CString & s)
                 :Param(s)
 {
 }
 
         TextParam &
 TextParam::operator = (TextParam & x)
 {
         if (*this == x) return *this;
 
         Param::operator = (x);
         return *this;
 }
 
         TextParam &
-TextParam::operator = (const QCString & s)
+TextParam::operator = (const Q3CString & s)
 {
         Param::operator = (s);
         return *this;
 }
 
         bool
 TextParam::operator == (TextParam & x)
 {
         x.parse();
         
         return false;
 }
 
 TextParam::~TextParam()
 {
 }
 
         void
 TextParam::_parse()
 {
 }
 
         void
 TextParam::_assemble()
diff --git a/kabc/vcard/TextValue.cpp b/kabc/vcard/TextValue.cpp
index 09934fa..d0d2996 100644
--- a/kabc/vcard/TextValue.cpp
+++ b/kabc/vcard/TextValue.cpp
@@ -3,84 +3,86 @@
 
         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 <VCardTextValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 TextValue::TextValue()
                 :Value()
 {
 }
 
 TextValue::TextValue(const TextValue & x)
                 :Value(x)
 {
 }
 
-TextValue::TextValue(const QCString & s)
+TextValue::TextValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         TextValue &
 TextValue::operator = (TextValue & x)
 {
         if (*this == x) return *this;
 
         Value::operator = (x);
         return *this;
 }
 
         TextValue &
-TextValue::operator = (const QCString & s)
+TextValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 TextValue::operator == (TextValue & x)
 {
-        return strRep_ = x.strRep_;
+        return strRep_ == x.strRep_;
 }
 
 TextValue::~TextValue()
 {
 }
 
   TextValue *
 TextValue::clone()
 {
   return new TextValue( *this );
 }
 
         void
 TextValue::_parse()
 {
 }
 
         void
 TextValue::_assemble()
 {
 }
 
diff --git a/kabc/vcard/URIValue.cpp b/kabc/vcard/URIValue.cpp
index c1d1022..26da7f4 100644
--- a/kabc/vcard/URIValue.cpp
+++ b/kabc/vcard/URIValue.cpp
@@ -3,131 +3,133 @@
 
         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 <VCardURIValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 URIValue::URIValue()
                 :Value()
 {
 }
 
-URIValue::URIValue(const QCString & scheme, const QCString & schemeSpecificPart)
+URIValue::URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart)
                 :Value(),
                         scheme_                         (scheme),
                         schemeSpecificPart_(schemeSpecificPart)
 {
         parsed_ = true;
 }
 
 URIValue::URIValue(const URIValue & x)
                 :       Value                   (x),
                         scheme_                         (x.scheme_),
                         schemeSpecificPart_(x.schemeSpecificPart_)
 {
 }
 
-URIValue::URIValue(const QCString & s)
+URIValue::URIValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         URIValue &
 URIValue::operator = (URIValue & x)
 {
         if (*this == x) return *this;
         
                 scheme_                         = x.scheme_;
                 schemeSpecificPart_= x.schemeSpecificPart_;
 
         Value::operator = (x);
         return *this;
 }
 
         URIValue &
-URIValue::operator = (const QCString & s)
+URIValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 URIValue::operator == (URIValue & x)
 {
         x.parse();
         return (
                         (scheme_                        == x.scheme_) &&
                         (schemeSpecificPart_== x.schemeSpecificPart_));
 
         return false;
 }
 
 URIValue::~URIValue()
 {
 }
 
         void
 URIValue::_parse()
 {
         int split = strRep_.find(':');
         if (split == -1)
                 return;
         
         scheme_ = strRep_.left(split);
         schemeSpecificPart_ = strRep_.mid(split + 1);
 }
 
         void
 URIValue::_assemble()
 {
         strRep_ = scheme_ + ':' + schemeSpecificPart_;
 }
 
-        QCString
+        Q3CString
 URIValue::scheme()
 {
         parse();
         return scheme_;
 }
 
-        QCString
+        Q3CString
 URIValue::schemeSpecificPart()
 {
         parse();
         return schemeSpecificPart_;
 }
 
         void
-URIValue::setScheme(const QCString & s)
+URIValue::setScheme(const Q3CString & s)
 {
         parse();
         scheme_ = s;
 }
 
         void
-URIValue::setSchemeSpecificPart(const QCString & s)
+URIValue::setSchemeSpecificPart(const Q3CString & s)
 {
         parse();
         schemeSpecificPart_ = s;
 }
 
diff --git a/kabc/vcard/UTCValue.cpp b/kabc/vcard/UTCValue.cpp
index 374306c..f35d986 100644
--- a/kabc/vcard/UTCValue.cpp
+++ b/kabc/vcard/UTCValue.cpp
@@ -3,82 +3,84 @@
 
         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 <VCardUTCValue.h>
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 UTCValue::UTCValue()
                 :Value()
 {
 }
 
 UTCValue::UTCValue(const UTCValue & x)
                 :       Value(x),positive_(x.positive_), hour_(x.hour_), minute_(x.minute_)
 
 {
 }
 
-UTCValue::UTCValue(const QCString & s)
+UTCValue::UTCValue(const Q3CString & s)
                 :Value(s)
 {
 }
 
         UTCValue &
 UTCValue::operator = (UTCValue & x)
 {
         if (*this == x) return *this;
 
   positive_ = x.positive_;
   hour_ = x.hour_;
   minute_ = x.minute_;
 
         Value::operator = (x);
         return *this;
 }
 
         UTCValue &
-UTCValue::operator = (const QCString & s)
+UTCValue::operator = (const Q3CString & s)
 {
         Value::operator = (s);
         return *this;
 }
 
         bool
 UTCValue::operator == (UTCValue & x)
 {
         x.parse();
 
   if (positive_ != x.positive_) return false;
   if (hour_ != x.hour_) return false;
   if (minute_ != x.minute_) return false;
 
         return true;
 }
 
 UTCValue::~UTCValue()
 {
 }
 
   UTCValue *
 UTCValue::clone()
 {
diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index a2ff327..bae5385 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -2,158 +2,160 @@
         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 <qdatetime.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #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)
+VCardEntity::VCardEntity(const Q3CString & 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)
+VCardEntity::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
 VCardEntity::operator == (VCardEntity & x)
 {
         x.parse();
         return false;
 }
 
 VCardEntity::~VCardEntity()
 {
 }
 
         void
 VCardEntity::_parse()
 {
 #if 0
     QTime tim;
     tim.start();
     int num  = 0;
     // old code 
         vDebug("parse");
-        QCString s(strRep_);
+        Q3CString 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));
+                Q3CString cardStr(s.left(i));
 
                 VCard * v = new VCard(cardStr);
 
                 cardList_.append(v);
 
                 v->parse();
 
                 s.remove(0, i);
         }
 
 #else
     // this code is up to 17 (!)  times faster
     int start = 0;
     QTime tim;
     tim.start();
     int i = 11;
     int len = strRep_.length();
     int num  = 0;
         while (i < len ) {
         while( i < len ) {
             int add = 1;
             if ( strRep_.at(i) == 'B' ) {
                 if ( i+add < len && strRep_.at(i+add++) == 'E')
                 if ( i+add < len && strRep_.at(i+add++) == 'G')
                 if ( i+add < len && strRep_.at(i+add++) == 'I')
                 if ( i+add < len && strRep_.at(i+add++) == 'N')
                 if ( i+add < len && strRep_.at(i+add++) == ':')
                 if ( i+add < len && strRep_.at(i+add++) == 'V')
                 if ( i+add < len && strRep_.at(i+add++) == 'C')
                 if ( i+add < len && strRep_.at(i+add++) == 'A')
                 if ( i+add < len && strRep_.at(i+add++) == 'R')
                 if ( i+add < len && strRep_.at(i+add++) == 'D')
                     if ( i+add < len && (strRep_.at(i+add) == '\r' || strRep_.at(i+add) == '\n' ))
                     break;
             }
             ++i;
         }
         if ( i <= len ) {
             ++num;
             char* dat = strRep_.data()+start;
-            VCard * v = new VCard( QCString (  dat,i-start ) );
+            VCard * v = new VCard( Q3CString (  dat,i-start ) );
             start = i;
             cardList_.append(v);
             v->parse();
         }
         i+= 11;
         }
 #endif
     //qDebug("***time %d found %d", tim.elapsed(), num);
 }
 
         void
 VCardEntity::_assemble()
 {
         VCardListIterator it(cardList_);
 
         for (; it.current(); ++it)
                 strRep_ += it.current()->asString() + "\r\n"; // One CRLF for luck.
 }
 
         VCardList &
 VCardEntity::cardList()
 {
         parse();
         return cardList_;
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
@@ -1,136 +1,137 @@
 /*
         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 <q3cstring.h>
+#include <q3strlist.h>
 #include <qstringlist.h>
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.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_.setAutoDelete( TRUE );
 
-  QPtrListIterator<ContentLine> it(x.contentLineList_);
+  Q3PtrListIterator<ContentLine> it(x.contentLineList_);
   for (; it.current(); ++it) {
     ContentLine * c = new ContentLine(*it.current());
     contentLineList_.append(c);
   }
 
 }
 
-VCard::VCard(const QCString & s)
+VCard::VCard(const Q3CString & s)
                 :Entity(s)
 {
   contentLineList_.setAutoDelete( TRUE );
 }
 
         VCard &
 VCard::operator = (VCard & x)
 {
         if (*this == x) return *this;
 
                 group_                  = x.group();
-    QPtrListIterator<ContentLine> it(x.contentLineList_);
+    Q3PtrListIterator<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)
+VCard::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
 VCard::operator == (VCard & x)
 {
         x.parse();
         return false;
 }
 
 VCard::~VCard()
 {
 }
 
         void
 VCard::_parse()
 {
         
         QStringList l;
-        QStrList sl;
+        Q3StrList sl;
 
         RTokenise(strRep_, "\r\n", sl);
 
         if (sl.count() < 3) { // Invalid VCARD !
         //qDebug("invalid vcard ");
                 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();
 
         // Remove extra blank lines
         while (l.last().isEmpty())
                 l.remove(l.last());
 
         // Now we know this is the last line
         QString endLine = l.last();
 
         // Trash the first and last lines as we have seen them.
         l.remove(l.begin());
         l.remove(l.last());
 
         ///////////////////////////////////////////////////////////////
         // FIRST LINE
 
         int split = beginLine.find(':');
 
         if (split == -1) { // invalid, no BEGIN
                 vDebug("No split");
                 return;
         }
 
@@ -159,136 +160,136 @@ VCard::_parse()
         //
         vDebug("Content lines");
 
         // Handle folded lines.
 
         QStringList refolded;
 
 
     QStringList::Iterator it =  l.begin(); 
 
         QString cur;
 
         for (; it != l.end(); ++it) {
                 cur = (*it);
                 ++it;
                         while ( it!= l.end() && (*it).at(0) == ' '&& (*it).length()!= 1) {
                         cur += (*it).mid(1) ;
                         ++it;
                 }
                 --it;
                 refolded.append(cur);
         }
     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)
                 {
                     qDebug("Content line could not be parsed. Discarded: %s", (*it2).latin1());
                     delete cl;
                 }
                 else
                   contentLineList_.append(cl);
         }
 
         ///////////////////////////////////////////////////////////////
         // LAST LINE
 
 
         // LR: sorry, but the remaining code in this method makes no sense
 
 #if 0
         split = endLine.find(':');
 
         if (split == -1) // invalid, no END
                 return;
 
         firstPart = endLine.left(split);
         valuePart = endLine.right(firstPart.length() - split - 1);
 
         split = firstPart.find('.');
 
         if (split != -1) {
                         group_  = firstPart.left(split);
                         firstPart= firstPart.right(firstPart.length() - split - 1);
         }
 
         if (qstricmp(firstPart, "END") != 0) // No END !
                 return;
 
         if (qstricmp(valuePart, "VCARD") != 0) // Not a vcard !
                 return;
 #endif
 }
 
         void
 VCard::_assemble()
 {
         vDebug("Assembling vcard");
         strRep_ = "BEGIN:VCARD\r\n";
         strRep_ += "VERSION:3.0\r\n";
 
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 strRep_ += it.current()->asString() + "\r\n";
 
         strRep_ += "END:VCARD\r\n";
 }
 
         bool
 VCard::has(EntityType t)
 {
         parse();
         return contentLine(t) == 0 ? false : true;
 }
 
         bool
-VCard::has(const QCString & s)
+VCard::has(const Q3CString & s)
 {
         parse();
         return contentLine(s) == 0 ? false : true;
 }
 
         void
 VCard::add(const ContentLine & cl)
 {
         parse();
         ContentLine * c = new ContentLine(cl);
         contentLineList_.append(c);
 }
 
         void
-VCard::add(const QCString & s)
+VCard::add(const Q3CString & s)
 {
         parse();
         ContentLine * c = new ContentLine(s);
         contentLineList_.append(c);
 }
 
         ContentLine *
 VCard::contentLine(EntityType t)
 {
         parse();
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 if (it.current()->entityType() == t)
                         return it.current();
 
         return 0;
 }
 
         ContentLine *
-VCard::contentLine(const QCString & s)
+VCard::contentLine(const Q3CString & s)
 {
         parse();
-        QPtrListIterator<ContentLine> it(contentLineList_);
+        Q3PtrListIterator<ContentLine> it(contentLineList_);
 
         for (; it.current(); ++it)
                 if (it.current()->entityType() == EntityNameToEntityType(s))
                         return it.current();
 
         return 0;
 }
 
diff --git a/kabc/vcard/Value.cpp b/kabc/vcard/Value.cpp
index 1978af2..3a4d406 100644
--- a/kabc/vcard/Value.cpp
+++ b/kabc/vcard/Value.cpp
@@ -2,77 +2,79 @@
         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 <VCardEntity.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace VCARD;
 
 Value::Value()
                 :Entity()
 {
 }
 
 Value::Value(const Value & x)
                 :Entity(x)
 {
 }
 
-Value::Value(const QCString & s)
+Value::Value(const Q3CString & s)
                 :Entity(s)
 {
 }
 
         Value &
 Value::operator = (Value & x)
 {
         if (*this == x) return *this;
 
         Entity::operator = (x);
         return *this;
 }
 
         Value &
-Value::operator = (const QCString & s)
+Value::operator = (const Q3CString & s)
 {
         Entity::operator = (s);
         return *this;
 }
 
         bool
 Value::operator == (Value & x)
 {
         x.parse();
         return false;
 }
 
 Value::~Value()
 {
 }
 
         void
 Value::_parse()
 {
 }
 
         void
 Value::_assemble()
 {
diff --git a/kabc/vcard/include/VCardAdrParam.h b/kabc/vcard/include/VCardAdrParam.h
index 89dcb64..6456624 100644
--- a/kabc/vcard/include/VCardAdrParam.h
+++ b/kabc/vcard/include/VCardAdrParam.h
@@ -3,62 +3,62 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  ADRPARAM_H
 #define  ADRPARAM_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
         
 class AdrParam : public Param
 {
 
 #include "AdrParam-generated.h"
         
-        QStrList adrTypeList()
+        Q3StrList adrTypeList()
         { parse(); return adrTypeList_; }
         
-        QCString textParam()
+        Q3CString textParam()
         { parse(); return textParam_; }
         
-        void setAdrTypeList(const QStrList & l)
+        void setAdrTypeList(const Q3StrList & l)
         { adrTypeList_ = l; assembled_ = false; }
         
-        void setTextParam(const QCString & s)
+        void setTextParam(const Q3CString & s)
         { textParam_ = s; assembled_ = false; }
         
         enum AdrType {
                 AdrDom, AdrIntl, AdrPostal, AdrParcel, AdrHome, AdrWork, AdrPref,
                 AdrIANA, AdrX
         };
         
         private:
                 
-                        QStrListadrTypeList_;
-                        QCStringtextParam_;
+                        Q3StrListadrTypeList_;
+                        Q3CStringtextParam_;
 };
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardAdrValue.h b/kabc/vcard/include/VCardAdrValue.h
index 0731924..14ddb02 100644
--- a/kabc/vcard/include/VCardAdrValue.h
+++ b/kabc/vcard/include/VCardAdrValue.h
@@ -3,81 +3,83 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  ADRVALUE_H
 #define  ADRVALUE_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class AdrValue : public Value
 {
         
 #include "AdrValue-generated.h"
         
         AdrValue *clone();
         
-        void setPOBox(const QCString & s)
+        void setPOBox(const Q3CString & s)
         { poBox_ = s; assembled_ = false; }
         
-        void setExtAddress(const QCString & s)
+        void setExtAddress(const Q3CString & s)
         { extAddress_ = s; assembled_ = false; }
 
-        void setStreet(const QCString & s)
+        void setStreet(const Q3CString & s)
         { street_ = s; assembled_ = false; }
 
-        void setLocality(const QCString & s)
+        void setLocality(const Q3CString & s)
         { locality_ = s; assembled_ = false; }
 
-        void setRegion(const QCString & s)
+        void setRegion(const Q3CString & s)
         { region_ = s; assembled_ = false; }
 
-        void setPostCode(const QCString & s)
+        void setPostCode(const Q3CString & s)
         { postCode_ = s; assembled_ = false; }
         
-        void setCountryName(const QCString & s)
+        void setCountryName(const Q3CString & s)
         { countryName_ = s; assembled_ = false; }
         
-                QCString poBox()        { parse(); return poBox_;}
-                QCString extAddress()   { parse(); return extAddress_;}
-                QCString street()       { parse(); return street_;}
-                QCString locality()     { parse(); return locality_;}
-                QCString region()       { parse(); return region_;}
-                QCString postCode()     { parse(); return postCode_;}
-                QCString countryName()  { parse(); return countryName_;}
+                Q3CString poBox()       { parse(); return poBox_;}
+                Q3CString extAddress()  { parse(); return extAddress_;}
+                Q3CString street()      { parse(); return street_;}
+                Q3CString locality()    { parse(); return locality_;}
+                Q3CString region()      { parse(); return region_;}
+                Q3CString postCode()    { parse(); return postCode_;}
+                Q3CString countryName()         { parse(); return countryName_;}
         
         private:
                 
-                QCString poBox_;
-                QCString extAddress_;
-                QCString street_;
-                QCString locality_;
-                QCString region_;
-                QCString postCode_;
-                QCString countryName_;
+                Q3CString poBox_;
+                Q3CString extAddress_;
+                Q3CString street_;
+                Q3CString locality_;
+                Q3CString region_;
+                Q3CString postCode_;
+                Q3CString countryName_;
 };
 
 }
 
 #endif
 
diff --git a/kabc/vcard/include/VCardAgentParam.h b/kabc/vcard/include/VCardAgentParam.h
index 72a05db..5733540 100644
--- a/kabc/vcard/include/VCardAgentParam.h
+++ b/kabc/vcard/include/VCardAgentParam.h
@@ -3,58 +3,58 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  AGENTPARAM_H
 #define  AGENTPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 #include <VCardURIValue.h>
 
 namespace VCARD
 {
 
 class AgentParam : public Param
 {
         
 #include "AgentParam-generated.h"
         
         bool refer()
         { parse(); return refer_; }
         
         URIValue uri()
         { parse(); return uri_; }
         
         void setRefer(bool b)
         { refer_ = b; assembled_ = false; }
 
-        void setURI(const QCString & s)
+        void setURI(const Q3CString & s)
         { uri_ = s; assembled_ = false; }
         
         private:
                 
                         bool    refer_;
                         URIValueuri_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardAgentValue.h b/kabc/vcard/include/VCardAgentValue.h
index f655836..b0d883b 100644
--- a/kabc/vcard/include/VCardAgentValue.h
+++ b/kabc/vcard/include/VCardAgentValue.h
@@ -3,42 +3,42 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  AGENTVALUE_H
 #define  AGENTVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class AgentValue : public Value
 {
         
 #include "AgentValue-generated.h"
         
         private:
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardClassValue.h b/kabc/vcard/include/VCardClassValue.h
index ff133c2..c450169 100644
--- a/kabc/vcard/include/VCardClassValue.h
+++ b/kabc/vcard/include/VCardClassValue.h
@@ -3,49 +3,49 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  CLASSVALUE_H
 #define  CLASSVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 #include <kdebug.h>
 
 namespace VCARD
 {
 
 class ClassValue : public Value
 {
 
 #include "ClassValue-generated.h"
 
           enum ClassType {
                   Public, Private, Confidential, Other
           };
 
             ClassValue *clone();
 
     void setType( int type ) { classType_ = type; assembled_ = false; parsed_ = true; }
     int type() { parse(); return classType_; }
         
         private:
                 int classType_;
diff --git a/kabc/vcard/include/VCardContentLine.h b/kabc/vcard/include/VCardContentLine.h
index 1c5f5be..c3c5253 100644
--- a/kabc/vcard/include/VCardContentLine.h
+++ b/kabc/vcard/include/VCardContentLine.h
@@ -3,75 +3,77 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  CONTENTLINE_H
 #define  CONTENTLINE_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include "VCardEnum.h"
 #include "VCardEntity.h"
 #include "VCardParam.h"
 #include "VCardValue.h"
 
 namespace VCARD
 {
 
 class ContentLine : public Entity
 {
 
 #include "ContentLine-generated.h"
         
-                QCString        group()                 { parse(); return group_;}
-                QCString        name()          { parse(); return name_;}
+                Q3CString       group()                 { parse(); return group_;}
+                Q3CString       name()          { parse(); return name_;}
                 Value   *       value()                 { parse(); return value_;}
                 ParamList       paramList()     { parse(); return paramList_;}
                 ParamType       paramType()     { parse(); return paramType_;}
                 ValueType       valueType()     { parse(); return valueType_;}
                 EntityType      entityType()    { parse(); return entityType_;}
         
-                void setGroup   (const QCString & s)
+                void setGroup   (const Q3CString & s)
         { group_ = s; assembled_ = false; }
         
-                void setName    (const QCString & s)
+                void setName    (const Q3CString & s)
         { name_ = s; assembled_ = false; }
         
                 void setValue   (Value *s)
         { value_ = s; assembled_ = false; }
         
                 void setParamList(const ParamList & l)
         { paramList_ = l; assembled_ = false; }
 
                 void clear      ();
         
         private:
                 
-                        QCString        group_;
-                        QCString        name_;
-                        QPtrList<Param>         paramList_;
+                        Q3CString       group_;
+                        Q3CString       name_;
+                        Q3PtrList<Param>        paramList_;
                         Value           * value_;
                 
                         ParamType       paramType_;
                         ValueType       valueType_;
                         EntityType      entityType_;
 };
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardDateParam.h b/kabc/vcard/include/VCardDateParam.h
index 21ac1f1..959b75b 100644
--- a/kabc/vcard/include/VCardDateParam.h
+++ b/kabc/vcard/include/VCardDateParam.h
@@ -3,42 +3,42 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  DATEPARAM_H
 #define  DATEPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
 class DateParam : public Param
 {
         
 #include "DateParam-generated.h"
         
         private:
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardDateValue.h b/kabc/vcard/include/VCardDateValue.h
index c248966..fc216c0 100644
--- a/kabc/vcard/include/VCardDateValue.h
+++ b/kabc/vcard/include/VCardDateValue.h
@@ -3,49 +3,49 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  DATEVALUE_H
 #define  DATEVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdatetime.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class DateValue : public Value
 {
 #include "DateValue-generated.h"
         
         DateValue(
                         unsigned intyear,
                         unsigned intmonth,
                         unsigned intday,
                         unsigned inthour = 0,
                         unsigned intminute = 0,
                         unsigned intsecond = 0,
                         double          secFrac = 0,
                         bool            zonePositive = true,
                         unsigned intzoneHour = 0,
                         unsigned intzoneMinute = 0);
 
         DateValue(const QDate &);
diff --git a/kabc/vcard/include/VCardDefines.h b/kabc/vcard/include/VCardDefines.h
index 557410f..5d4f2f4 100644
--- a/kabc/vcard/include/VCardDefines.h
+++ b/kabc/vcard/include/VCardDefines.h
@@ -14,40 +14,40 @@
   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.
 */
 
 #ifndef VCARD_DEFINES_H
 #define VCARD_DEFINES_H
 
 #include <kdebug.h>
 
 #ifdef VCARD_DEBUG
 //US #define vDebug(a) kdDebug(5710) << a << endl;
 #define vDebug(a) qDebug(a);
 #else
 #define vDebug(a)
 #endif
 
 #if 0
 #ifndef NDEBUG
-        #include <qcstring.h>
+        #include <q3cstring.h>
         #include <iostream>
         #ifdef __GNUG__
         #       define vDebug(a) cerr << className() << ":" << __FUNCTION__ << " (" \
-                                                << __LINE__ << "): " << QCString((a)).data() << endl;
+                                                << __LINE__ << "): " << Q3CString((a)).data() << endl;
         #else
         #       define vDebug(a) cerr << className() << ": " \
-                                                << QCString((a)).data() << endl;
+                                                << Q3CString((a)).data() << endl;
         #endif
 #else
         #define vDebug(a)
 #endif
 #endif
 
 #endif // Included this file
                                                 
diff --git a/kabc/vcard/include/VCardEmailParam.h b/kabc/vcard/include/VCardEmailParam.h
index 98d1b30..ff07324 100644
--- a/kabc/vcard/include/VCardEmailParam.h
+++ b/kabc/vcard/include/VCardEmailParam.h
@@ -3,54 +3,54 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  EMAILPARAM_H
 #define  EMAILPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
 class EmailParam : public Param
 {
         
 #include "EmailParam-generated.h"
         
-                QCString        emailType() { parse(); return emailType_;}
+                Q3CString       emailType() { parse(); return emailType_;}
                 bool            pref()          { parse(); return pref_;        }
         
-        void setEmailType(const QCString & s)
+        void setEmailType(const Q3CString & s)
         { emailType_ = s; assembled_ = false; }
         
         void setPref(bool b)
         { pref_ = b; assembled_ = false; }
         
         private:
         
-                        QCStringemailType_;
+                        Q3CStringemailType_;
                         bool    pref_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardEntity.h b/kabc/vcard/include/VCardEntity.h
index 3c945b5..1a3d20f 100644
--- a/kabc/vcard/include/VCardEntity.h
+++ b/kabc/vcard/include/VCardEntity.h
@@ -3,65 +3,65 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  ENTITY_H
 #define  ENTITY_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 namespace VCARD
 {
 
 class Entity
 {
         public:
                 
                 Entity();
                 Entity(const Entity & e);
-                Entity(const QCString & s);
+                Entity(const Q3CString & s);
                 
                 virtual Entity & operator = (const Entity & e);
-                virtual Entity & operator = (const QCString & s);
+                virtual Entity & operator = (const Q3CString & s);
                 
                 virtual bool operator == (Entity & e);
                 virtual bool operator != (Entity & e);
-                virtual bool operator == (const QCString & s);
-                virtual bool operator != (const QCString & s);
+                virtual bool operator == (const Q3CString & s);
+                virtual bool operator != (const Q3CString & s);
                 
                 virtual ~Entity();
                 
-                QCString asString();
+                Q3CString asString();
                 
                 virtual void parse();
                 virtual void assemble();
                 
                 virtual void _parse() = 0;
                 virtual void _assemble() = 0;
         
         protected:
                 
-                QCString strRep_;
+                Q3CString strRep_;
                 bool parsed_;
                 bool assembled_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardEnum.h b/kabc/vcard/include/VCardEnum.h
index b4e4094..0c35e5e 100644
--- a/kabc/vcard/include/VCardEnum.h
+++ b/kabc/vcard/include/VCardEnum.h
@@ -3,54 +3,54 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  ENUM_H
 #define  ENUM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 namespace VCARD
 {
 
-extern const QCString paramNames [];
+extern const Q3CString paramNames [];
 
 enum EntityType {
         EntityName,
         EntityProfile,
         EntitySource,
         EntityFullName,
         EntityN,
         EntityNickname,
         EntityPhoto,
         EntityBirthday,
         EntityAddress,
         EntityLabel,
         EntityTelephone,
         EntityEmail,
         EntityMailer,
         EntityTimeZone,
         EntityGeo,
         EntityTitle,
         EntityRole,
         EntityLogo,
         EntityAgent,
         EntityOrganisation,
         EntityCategories,
         EntityNote,
@@ -87,34 +87,34 @@ enum ValueType {
         ValueUnknown
 };
 
 enum ParamType {
         ParamUnknown,
         ParamNone,
         ParamSource,
         ParamText,
         ParamImage,
         ParamDate,
         ParamAddrText,
         ParamTel,
         ParamEmail,
         ParamMailer,
         ParamAgent,
         ParamTextBin,
         ParamTextNS,
         ParamSound
 };
 
 extern const ParamType paramTypesTable[];
 
 ParamType EntityTypeToParamType(EntityType);
 ValueType EntityTypeToValueType(EntityType);
-QCString EntityTypeToParamName(EntityType);
-EntityType EntityNameToEntityType(const QCString &);
+Q3CString EntityTypeToParamName(EntityType);
+EntityType EntityNameToEntityType(const Q3CString &);
 
 char * encodeBase64(const char *, unsigned long, unsigned long &);
 char * decodeBase64(const char *, unsigned long, unsigned long &);
 
 }
 
 #endif
 
diff --git a/kabc/vcard/include/VCardFloatValue.h b/kabc/vcard/include/VCardFloatValue.h
index 69fdc22..cac7a91 100644
--- a/kabc/vcard/include/VCardFloatValue.h
+++ b/kabc/vcard/include/VCardFloatValue.h
@@ -3,49 +3,49 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  FLOATVALUE_H
 #define  FLOATVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class FloatValue : public Value
 {
         
 #include "FloatValue-generated.h"
         
         FloatValue(float);
         
         float value();
         void setValue(float);
         
         private:
                 
                 float value_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardImageParam.h b/kabc/vcard/include/VCardImageParam.h
index ce99ccc..2785331 100644
--- a/kabc/vcard/include/VCardImageParam.h
+++ b/kabc/vcard/include/VCardImageParam.h
@@ -3,42 +3,42 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  IMGPARAM_H
 #define  IMGPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
 class ImageParam : public Param
 {
         
 #include "ImageParam-generated.h"
         
         private:
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardImageValue.h b/kabc/vcard/include/VCardImageValue.h
index 6ce0371..3b64731 100644
--- a/kabc/vcard/include/VCardImageValue.h
+++ b/kabc/vcard/include/VCardImageValue.h
@@ -3,42 +3,42 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  IMAGEVALUE_H
 #define  IMAGEVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class ImageValue : public Value
 {
         
 #include "ImageValue-generated.h"
         
         private:
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardLangValue.h b/kabc/vcard/include/VCardLangValue.h
index 991ceed..319de76 100644
--- a/kabc/vcard/include/VCardLangValue.h
+++ b/kabc/vcard/include/VCardLangValue.h
@@ -3,49 +3,49 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  LANGVALUE_H
 #define  LANGVALUE_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class LangValue : public Value
 {
 #include "LangValue-generated.h"
         
-        QCString primary();
-        QStrList subtags();
+        Q3CString primary();
+        Q3StrList subtags();
         
-                void setPrimary(const QCString &);
-        void setSubTags(const QStrList &);
+                void setPrimary(const Q3CString &);
+        void setSubTags(const Q3StrList &);
         
-        QCString primary_;
-        QStrList subtags_;
+        Q3CString primary_;
+        Q3StrList subtags_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardNValue.h b/kabc/vcard/include/VCardNValue.h
index 306821b..ffc5355 100644
--- a/kabc/vcard/include/VCardNValue.h
+++ b/kabc/vcard/include/VCardNValue.h
@@ -4,53 +4,55 @@
         Copyright (C) 1999 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.
 */
 
 #ifndef  NVALUE_H
 #define  NVALUE_H
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace VCARD
 {
 
 class NValue : public Value
 {
 #include "NValue-generated.h"
         NValue *clone();
 
-                QCString family()       { parse(); return family_;}
-                QCString given()        { parse(); return given_;}
-                QCString middle()       { parse(); return middle_;}
-                QCString prefix()       { parse(); return prefix_;}
-                QCString suffix()       { parse(); return suffix_;}
-
-                void setFamily  (const QCString & s) { family_= s; assembled_ = false; }
-                void setGiven   (const QCString & s) { given_= s; assembled_ = false; }
-                void setMiddle  (const QCString & s) { middle_= s; assembled_ = false; }
-                void setPrefix  (const QCString & s) { prefix_= s; assembled_ = false; }
-                void setSuffix  (const QCString & s) { suffix_= s; assembled_ = false; }
+                Q3CString family()      { parse(); return family_;}
+                Q3CString given()       { parse(); return given_;}
+                Q3CString middle()      { parse(); return middle_;}
+                Q3CString prefix()      { parse(); return prefix_;}
+                Q3CString suffix()      { parse(); return suffix_;}
+
+                void setFamily  (const Q3CString & s) { family_= s; assembled_ = false; }
+                void setGiven   (const Q3CString & s) { given_= s; assembled_ = false; }
+                void setMiddle  (const Q3CString & s) { middle_= s; assembled_ = false; }
+                void setPrefix  (const Q3CString & s) { prefix_= s; assembled_ = false; }
+                void setSuffix  (const Q3CString & s) { suffix_= s; assembled_ = false; }
         
         private:
         
-        QCString family_, given_, middle_, prefix_, suffix_;
+        Q3CString family_, given_, middle_, prefix_, suffix_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardOrgValue.h b/kabc/vcard/include/VCardOrgValue.h
index c4f3f25..2e5d32f 100644
--- a/kabc/vcard/include/VCardOrgValue.h
+++ b/kabc/vcard/include/VCardOrgValue.h
@@ -3,48 +3,48 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  ORGVALUE_H
 #define  ORGVALUE_H
 
-#include <qcstring.h>
-#include <qstrlist.h>
+#include <q3cstring.h>
+#include <q3strlist.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class OrgValue : public Value
 {
         
 #include "OrgValue-generated.h"
         
         unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
         
         private:
                 
-                QStrList valueList_;
+                Q3StrList valueList_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardParam.h b/kabc/vcard/include/VCardParam.h
index b61ce5c..b83fde1 100644
--- a/kabc/vcard/include/VCardParam.h
+++ b/kabc/vcard/include/VCardParam.h
@@ -3,57 +3,57 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  PARAM_H
 #define  PARAM_H
 
-#include <qcstring.h>
-#include <qptrlist.h>
+#include <q3cstring.h>
+#include <q3ptrlist.h>
 
 #include <VCardEntity.h>
 
 namespace VCARD
 {
 
 class Param : public Entity
 {
 
 #include "Param-generated.h"
 
-        Param(const QCString &name, const QCString &value);
+        Param(const Q3CString &name, const Q3CString &value);
 
-        void setName(const QCString &);
-        void setValue(const QCString &);
+        void setName(const Q3CString &);
+        void setValue(const Q3CString &);
                 
-        QCString name();
-        QCString value();
+        Q3CString name();
+        Q3CString value();
         
         private:
                 
-                QCString name_;
-                QCString value_;
+                Q3CString name_;
+                Q3CString value_;
 };
 
-typedef QPtrList<Param> ParamList;
-typedef QPtrListIterator<Param> ParamListIterator;
+typedef Q3PtrList<Param> ParamList;
+typedef Q3PtrListIterator<Param> ParamListIterator;
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardRToken.h b/kabc/vcard/include/VCardRToken.h
index 2f95f1b..4a5adb2 100644
--- a/kabc/vcard/include/VCardRToken.h
+++ b/kabc/vcard/include/VCardRToken.h
@@ -4,35 +4,35 @@
 
         Copyright (C) 1999 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.
 */
 
 #ifndef RTOKEN_H
 #define RTOKEN_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
 
 namespace VCARD
 {
 
-Q_UINT32 RTokenise(const char * str, const char * delim, QStrList & l);
+Q_UINT32 RTokenise(const char * str, const char * delim, Q3StrList & l);
 
 }
 
 #endif
 
diff --git a/kabc/vcard/include/VCardSoundValue.h b/kabc/vcard/include/VCardSoundValue.h
index 994f55e..26f750b 100644
--- a/kabc/vcard/include/VCardSoundValue.h
+++ b/kabc/vcard/include/VCardSoundValue.h
@@ -3,42 +3,42 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  SOUNDVALUE_H
 #define  SOUNDVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class SoundValue : public Value
 {
         
 #include "SoundValue-generated.h"
         
         private:
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardSourceParam.h b/kabc/vcard/include/VCardSourceParam.h
index 887ea20..5218864 100644
--- a/kabc/vcard/include/VCardSourceParam.h
+++ b/kabc/vcard/include/VCardSourceParam.h
@@ -3,56 +3,56 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  SOURCEPARAM_H
 #define  SOURCEPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
 class SourceParam : public Param
 {
 
 #include "SourceParam-generated.h"
         
         enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
         
                         SourceParamType type(){ parse(); return type_;}
-                        QCString par()          { parse(); return par_; }
-                        QCString val()          { parse(); return val_; }
+                        Q3CString par()                 { parse(); return par_; }
+                        Q3CString val()                 { parse(); return val_; }
                 
                         void setType(SourceParamType t) { type_= t; assembled_ = false; }
-                        void setPar(const QCString & s) { par_= s; assembled_ = false; }
-                        void setVal(const QCString & s) { val_= s; assembled_ = false; }
+                        void setPar(const Q3CString & s) { par_= s; assembled_ = false; }
+                        void setVal(const Q3CString & s) { val_= s; assembled_ = false; }
         
         private:
                 
                 SourceParamType type_;
                 // May be "VALUE = uri" or "CONTEXT = word" or "x-name = *SAFE-CHAR"
-                QCString par_, val_; // Sub-parameter, value
+                Q3CString par_, val_; // Sub-parameter, value
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardTelParam.h b/kabc/vcard/include/VCardTelParam.h
index 27d7dcc..0c45a3a 100644
--- a/kabc/vcard/include/VCardTelParam.h
+++ b/kabc/vcard/include/VCardTelParam.h
@@ -3,49 +3,51 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  TELPARAM_H
 #define  TELPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
 class TelParam : public Param
 {
 #include "TelParam-generated.h"
         
         enum TelType {
                 TelHome, TelWork, TelPref, TelVoice, TelFex, TelMsg, TelCell,
                 TelPager, TelBBS, TelModem, TelCar, TelISDN, TelVideo, TelPCS,
                 TelIANA, TelX
         };
         
         private:
                 
-                QPtrList<TelType> types_;
+                Q3PtrList<TelType> types_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardTelValue.h b/kabc/vcard/include/VCardTelValue.h
index 9cf5a98..a119e4a 100644
--- a/kabc/vcard/include/VCardTelValue.h
+++ b/kabc/vcard/include/VCardTelValue.h
@@ -3,42 +3,42 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  TELVALUE_H
 #define  TELVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class TelValue : public Value
 {
         
 #include "TelValue-generated.h"
         
         private:
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardTextBinParam.h b/kabc/vcard/include/VCardTextBinParam.h
index 31dec86..d186995 100644
--- a/kabc/vcard/include/VCardTextBinParam.h
+++ b/kabc/vcard/include/VCardTextBinParam.h
@@ -3,42 +3,42 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  TEXTBINPARAM_H
 #define  TEXTBINPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
 class TextBinParam : public Param
 {
         
 #include "TextBinParam-generated.h"
         
         private:
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardTextBinValue.h b/kabc/vcard/include/VCardTextBinValue.h
index 8d44fdf..3924f2a 100644
--- a/kabc/vcard/include/VCardTextBinValue.h
+++ b/kabc/vcard/include/VCardTextBinValue.h
@@ -3,49 +3,49 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  TEXTBINVALUE_H
 #define  TEXTBINVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class TextBinValue : public Value
 {
         
 #include "TextBinValue-generated.h"
 
   TextBinValue *clone();
 
   bool isBinary() { parse(); return mIsBinary_; }
   QByteArray data() { parse(); return mData_; }
   QString url() { parse(); return mUrl_; }
 
   void setData( const QByteArray &data )
   {
     mData_ = data;
     mIsBinary_ = true;
     assembled_ = false;
   }
 
diff --git a/kabc/vcard/include/VCardTextListValue.h b/kabc/vcard/include/VCardTextListValue.h
index 8e47af5..ac42a29 100644
--- a/kabc/vcard/include/VCardTextListValue.h
+++ b/kabc/vcard/include/VCardTextListValue.h
@@ -3,49 +3,49 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  TEXTLISTVALUE_H
 #define  TEXTLISTVALUE_H
 
-#include <qstrlist.h>
+#include <q3strlist.h>
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class TextListValue : public Value
 {
         
 #include "TextListValue-generated.h"
         
         unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
         
         private:
                 
-                QStrList valueList_;
+                Q3StrList valueList_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardTextParam.h b/kabc/vcard/include/VCardTextParam.h
index 08b5f57..2503337 100644
--- a/kabc/vcard/include/VCardTextParam.h
+++ b/kabc/vcard/include/VCardTextParam.h
@@ -3,42 +3,42 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  TEXTPARAM_H
 #define  TEXTPARAM_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardParam.h>
 
 namespace VCARD
 {
 
 class TextParam : public Param
 {
         
 #include "TextParam-generated.h"
         
         private:
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardURIValue.h b/kabc/vcard/include/VCardURIValue.h
index 5fd7184..116e4c8 100644
--- a/kabc/vcard/include/VCardURIValue.h
+++ b/kabc/vcard/include/VCardURIValue.h
@@ -4,49 +4,51 @@
         Copyright (C) 1999 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.
 */
 
 #ifndef  URIVALUE_H
 #define  URIVALUE_H
 
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 namespace VCARD
 {
 
 class URIValue : public Value
 {
 #include "URIValue-generated.h"
 
-        URIValue(const QCString & scheme, const QCString & schemeSpecificPart);
+        URIValue(const Q3CString & scheme, const Q3CString & schemeSpecificPart);
         
-        QCString scheme();
-        QCString schemeSpecificPart();
+        Q3CString scheme();
+        Q3CString schemeSpecificPart();
         
-                void setScheme                  (const QCString &);
-                void setSchemeSpecificPart(const QCString &);
+                void setScheme                  (const Q3CString &);
+                void setSchemeSpecificPart(const Q3CString &);
         
         private:
         
-                QCString scheme_;
-                QCString schemeSpecificPart_;
+                Q3CString scheme_;
+                Q3CString schemeSpecificPart_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardUTCValue.h b/kabc/vcard/include/VCardUTCValue.h
index ff695e0..eb69829 100644
--- a/kabc/vcard/include/VCardUTCValue.h
+++ b/kabc/vcard/include/VCardUTCValue.h
@@ -3,49 +3,49 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  UTCVALUE_H
 #define  UTCVALUE_H
 
-#include <qcstring.h>
+#include <q3cstring.h>
 
 #include <VCardValue.h>
 
 namespace VCARD
 {
 
 class UTCValue : public Value
 {
         
 #include "UTCValue-generated.h"
 
   UTCValue *clone();
         
   void setPositive( int p ) { positive_ = p; assembled_ = false; }
   void setHour( int h ) { hour_ = h; assembled_ = false; }
   void setMinute( int m ) { minute_ = m; assembled_ = false; }
 
         bool positive() { parse(); return positive_; }
         unsigned int hour() { parse(); return hour_; }
         unsigned int minute() { parse(); return minute_; }
         
         private:
                 
                 bool positive_;
diff --git a/kabc/vcard/include/VCardVCard.h b/kabc/vcard/include/VCardVCard.h
index 5dec166..5b66074 100644
--- a/kabc/vcard/include/VCardVCard.h
+++ b/kabc/vcard/include/VCardVCard.h
@@ -4,60 +4,62 @@
         Copyright (C) 1999 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.
 */
 
 #ifndef  VCARD_VCARD_H
 #define  VCARD_VCARD_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <VCardEnum.h>
 #include <VCardEntity.h>
 #include <VCardContentLine.h>
 
 namespace VCARD
 {
 
 class VCard : public Entity
 {
 
 #include "VCard-generated.h"
         
         bool has(EntityType);
-        bool has(const QCString &);
+        bool has(const Q3CString &);
         
         void add(const ContentLine &);
-        void add(const QCString &);
+        void add(const Q3CString &);
         
         ContentLine * contentLine(EntityType);
-        ContentLine * contentLine(const QCString &);
+        ContentLine * contentLine(const Q3CString &);
         
-        QCString group() { parse(); return group_; }
+        Q3CString group() { parse(); return group_; }
         
-                QPtrList<ContentLine>contentLineList() { parse(); return contentLineList_; }
+                Q3PtrList<ContentLine>contentLineList() { parse(); return contentLineList_; }
         
         private:
 
-                QCString        group_;
-                QPtrList<ContentLine>contentLineList_;
+                Q3CString       group_;
+                Q3PtrList<ContentLine>contentLineList_;
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardVCardEntity.h b/kabc/vcard/include/VCardVCardEntity.h
index 47ba370..8c824e7 100644
--- a/kabc/vcard/include/VCardVCardEntity.h
+++ b/kabc/vcard/include/VCardVCardEntity.h
@@ -4,53 +4,53 @@
         Copyright (C) 1999 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.
 */
 
 #ifndef  VCARD_ENTITY_H
 #define  VCARD_ENTITY_H
 
 #include <qstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <VCardEnum.h>
 #include <VCardVCard.h>
 #include <VCardEntity.h>
 
 namespace VCARD
 {
   
-typedef QPtrList<VCard> VCardList;
-typedef QPtrListIterator<VCard> VCardListIterator;
+typedef Q3PtrList<VCard> VCardList;
+typedef Q3PtrListIterator<VCard> VCardListIterator;
 
 class VCardEntity : public Entity
 {
 
 #include "VCardEntity-generated.h"
         
         void setCardList(const VCardList & l);
         VCardList & cardList();
         
         private:
   
   VCardList cardList_;
 
 };
 
 }
 
 #endif
diff --git a/kabc/vcard/include/VCardValue.h b/kabc/vcard/include/VCardValue.h
index 7cfe4a0..024397c 100644
--- a/kabc/vcard/include/VCardValue.h
+++ b/kabc/vcard/include/VCardValue.h
@@ -3,44 +3,44 @@
         
         Copyright (C) 1999 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.
 */
 
 #ifndef  VALUE_H
 #define  VALUE_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 
 #include <VCardEntity.h>
 
 namespace VCARD
 {
 
 class Value : public Entity
 {
 #include "Value-generated.h"
 
         virtual Value *clone() { return new Value( *this ); }
 };
 
-typedef QPtrList<Value> ValueList;
-typedef QPtrListIterator<Value> ValueListIterator;
+typedef Q3PtrList<Value> ValueList;
+typedef Q3PtrListIterator<Value> ValueListIterator;
 
 }
 
 #endif
diff --git a/kabc/vcard/include/generated/AdrParam-generated.h b/kabc/vcard/include/generated/AdrParam-generated.h
index 3e265d8..a11d142 100644
--- a/kabc/vcard/include/generated/AdrParam-generated.h
+++ b/kabc/vcard/include/generated/AdrParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 AdrParam();
 AdrParam(const AdrParam&);
-AdrParam(const QCString&);
+AdrParam(const Q3CString&);
 AdrParam & operator = (AdrParam&);
-AdrParam & operator = (const QCString&);
+AdrParam & operator = (const Q3CString&);
 bool operator ==(AdrParam&);
 bool operator !=(AdrParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AdrParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AdrParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~AdrParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "AdrParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/AdrValue-generated.h b/kabc/vcard/include/generated/AdrValue-generated.h
index e1d93e4..c0a33a3 100644
--- a/kabc/vcard/include/generated/AdrValue-generated.h
+++ b/kabc/vcard/include/generated/AdrValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 AdrValue();
 AdrValue(const AdrValue&);
-AdrValue(const QCString&);
+AdrValue(const Q3CString&);
 AdrValue & operator = (AdrValue&);
-AdrValue & operator = (const QCString&);
+AdrValue & operator = (const Q3CString&);
 bool operator ==(AdrValue&);
 bool operator !=(AdrValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AdrValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AdrValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~AdrValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "AdrValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/AgentParam-generated.h b/kabc/vcard/include/generated/AgentParam-generated.h
index 6423867..d5ed988 100644
--- a/kabc/vcard/include/generated/AgentParam-generated.h
+++ b/kabc/vcard/include/generated/AgentParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 AgentParam();
 AgentParam(const AgentParam&);
-AgentParam(const QCString&);
+AgentParam(const Q3CString&);
 AgentParam & operator = (AgentParam&);
-AgentParam & operator = (const QCString&);
+AgentParam & operator = (const Q3CString&);
 bool operator ==(AgentParam&);
 bool operator !=(AgentParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AgentParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AgentParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~AgentParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "AgentParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/AgentValue-generated.h b/kabc/vcard/include/generated/AgentValue-generated.h
index 76bb81c..eef5277 100644
--- a/kabc/vcard/include/generated/AgentValue-generated.h
+++ b/kabc/vcard/include/generated/AgentValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 AgentValue();
 AgentValue(const AgentValue&);
-AgentValue(const QCString&);
+AgentValue(const Q3CString&);
 AgentValue & operator = (AgentValue&);
-AgentValue & operator = (const QCString&);
+AgentValue & operator = (const Q3CString&);
 bool operator ==(AgentValue&);
 bool operator !=(AgentValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {AgentValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {AgentValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~AgentValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "AgentValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/ClassValue-generated.h b/kabc/vcard/include/generated/ClassValue-generated.h
index df4ed5f..b84c98f 100644
--- a/kabc/vcard/include/generated/ClassValue-generated.h
+++ b/kabc/vcard/include/generated/ClassValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ClassValue();
 ClassValue(const ClassValue&);
-ClassValue(const QCString&);
+ClassValue(const Q3CString&);
 ClassValue & operator = (ClassValue&);
-ClassValue & operator = (const QCString&);
+ClassValue & operator = (const Q3CString&);
 bool operator ==(ClassValue&);
 bool operator !=(ClassValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ClassValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ClassValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ClassValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "ClassValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/ContentLine-generated.h b/kabc/vcard/include/generated/ContentLine-generated.h
index 9efe273..84d0822 100644
--- a/kabc/vcard/include/generated/ContentLine-generated.h
+++ b/kabc/vcard/include/generated/ContentLine-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ContentLine();
 ContentLine(const ContentLine&);
-ContentLine(const QCString&);
+ContentLine(const Q3CString&);
 ContentLine & operator = (ContentLine&);
-ContentLine & operator = (const QCString&);
+ContentLine & operator = (const Q3CString&);
 bool operator ==(ContentLine&);
 bool operator !=(ContentLine& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ContentLine a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ContentLine a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ContentLine();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "ContentLine"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/DateParam-generated.h b/kabc/vcard/include/generated/DateParam-generated.h
index ff1da58..029c1da 100644
--- a/kabc/vcard/include/generated/DateParam-generated.h
+++ b/kabc/vcard/include/generated/DateParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 DateParam();
 DateParam(const DateParam&);
-DateParam(const QCString&);
+DateParam(const Q3CString&);
 DateParam & operator = (DateParam&);
-DateParam & operator = (const QCString&);
+DateParam & operator = (const Q3CString&);
 bool operator ==(DateParam&);
 bool operator !=(DateParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {DateParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {DateParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~DateParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "DateParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/DateValue-generated.h b/kabc/vcard/include/generated/DateValue-generated.h
index a382823..70eecce 100644
--- a/kabc/vcard/include/generated/DateValue-generated.h
+++ b/kabc/vcard/include/generated/DateValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 DateValue();
 DateValue(const DateValue&);
-DateValue(const QCString&);
+DateValue(const Q3CString&);
 DateValue & operator = (DateValue&);
-DateValue & operator = (const QCString&);
+DateValue & operator = (const Q3CString&);
 bool operator ==(DateValue&);
 bool operator !=(DateValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {DateValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {DateValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~DateValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "DateValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/EmailParam-generated.h b/kabc/vcard/include/generated/EmailParam-generated.h
index 428a6fc..f498931 100644
--- a/kabc/vcard/include/generated/EmailParam-generated.h
+++ b/kabc/vcard/include/generated/EmailParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 EmailParam();
 EmailParam(const EmailParam&);
-EmailParam(const QCString&);
+EmailParam(const Q3CString&);
 EmailParam & operator = (EmailParam&);
-EmailParam & operator = (const QCString&);
+EmailParam & operator = (const Q3CString&);
 bool operator ==(EmailParam&);
 bool operator !=(EmailParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {EmailParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {EmailParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~EmailParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "EmailParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/FloatValue-generated.h b/kabc/vcard/include/generated/FloatValue-generated.h
index cac55cf..c04b85f 100644
--- a/kabc/vcard/include/generated/FloatValue-generated.h
+++ b/kabc/vcard/include/generated/FloatValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 FloatValue();
 FloatValue(const FloatValue&);
-FloatValue(const QCString&);
+FloatValue(const Q3CString&);
 FloatValue & operator = (FloatValue&);
-FloatValue & operator = (const QCString&);
+FloatValue & operator = (const Q3CString&);
 bool operator ==(FloatValue&);
 bool operator !=(FloatValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {FloatValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {FloatValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~FloatValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "FloatValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/GeoValue-generated.h b/kabc/vcard/include/generated/GeoValue-generated.h
index 594f3ad..ab659bf 100644
--- a/kabc/vcard/include/generated/GeoValue-generated.h
+++ b/kabc/vcard/include/generated/GeoValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 GeoValue();
 GeoValue(const GeoValue&);
-GeoValue(const QCString&);
+GeoValue(const Q3CString&);
 GeoValue & operator = (GeoValue&);
-GeoValue & operator = (const QCString&);
+GeoValue & operator = (const Q3CString&);
 bool operator ==(GeoValue&);
 bool operator !=(GeoValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {GeoValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {GeoValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~GeoValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "GeoValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/Group-generated.h b/kabc/vcard/include/generated/Group-generated.h
index f39302d..ae16e3d 100644
--- a/kabc/vcard/include/generated/Group-generated.h
+++ b/kabc/vcard/include/generated/Group-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 Group();
 Group(const Group&);
-Group(const QCString&);
+Group(const Q3CString&);
 Group & operator = (Group&);
-Group & operator = (const QCString&);
+Group & operator = (const Q3CString&);
 bool operator ==(Group&);
 bool operator !=(Group& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Group a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Group a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~Group();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "Group"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/ImageParam-generated.h b/kabc/vcard/include/generated/ImageParam-generated.h
index 81edfd2..91b09a4 100644
--- a/kabc/vcard/include/generated/ImageParam-generated.h
+++ b/kabc/vcard/include/generated/ImageParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ImageParam();
 ImageParam(const ImageParam&);
-ImageParam(const QCString&);
+ImageParam(const Q3CString&);
 ImageParam & operator = (ImageParam&);
-ImageParam & operator = (const QCString&);
+ImageParam & operator = (const Q3CString&);
 bool operator ==(ImageParam&);
 bool operator !=(ImageParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImageParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImageParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ImageParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "ImageParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/ImageValue-generated.h b/kabc/vcard/include/generated/ImageValue-generated.h
index 5a2c493..d71282e 100644
--- a/kabc/vcard/include/generated/ImageValue-generated.h
+++ b/kabc/vcard/include/generated/ImageValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ImageValue();
 ImageValue(const ImageValue&);
-ImageValue(const QCString&);
+ImageValue(const Q3CString&);
 ImageValue & operator = (ImageValue&);
-ImageValue & operator = (const QCString&);
+ImageValue & operator = (const Q3CString&);
 bool operator ==(ImageValue&);
 bool operator !=(ImageValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImageValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImageValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ImageValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "ImageValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/ImgParam-generated.h b/kabc/vcard/include/generated/ImgParam-generated.h
index 46a6ca0..461ca6d 100644
--- a/kabc/vcard/include/generated/ImgParam-generated.h
+++ b/kabc/vcard/include/generated/ImgParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ImgParam();
 ImgParam(const ImgParam&);
-ImgParam(const QCString&);
+ImgParam(const Q3CString&);
 ImgParam & operator = (ImgParam&);
-ImgParam & operator = (const QCString&);
+ImgParam & operator = (const Q3CString&);
 bool operator ==(ImgParam&);
 bool operator !=(ImgParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImgParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImgParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ImgParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 virtual const char * className() const { return "ImgParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/ImgValue-generated.h b/kabc/vcard/include/generated/ImgValue-generated.h
index d75d545..80ee646 100644
--- a/kabc/vcard/include/generated/ImgValue-generated.h
+++ b/kabc/vcard/include/generated/ImgValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 ImgValue();
 ImgValue(const ImgValue&);
-ImgValue(const QCString&);
+ImgValue(const Q3CString&);
 ImgValue & operator = (ImgValue&);
-ImgValue & operator = (const QCString&);
+ImgValue & operator = (const Q3CString&);
 bool operator ==(ImgValue&);
 bool operator !=(ImgValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {ImgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {ImgValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~ImgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 virtual const char * className() const { return "ImgValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/LangValue-generated.h b/kabc/vcard/include/generated/LangValue-generated.h
index 23e138b..434f762 100644
--- a/kabc/vcard/include/generated/LangValue-generated.h
+++ b/kabc/vcard/include/generated/LangValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 LangValue();
 LangValue(const LangValue&);
-LangValue(const QCString&);
+LangValue(const Q3CString&);
 LangValue & operator = (LangValue&);
-LangValue & operator = (const QCString&);
+LangValue & operator = (const Q3CString&);
 bool operator ==(LangValue&);
 bool operator !=(LangValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {LangValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {LangValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~LangValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "LangValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/NValue-generated.h b/kabc/vcard/include/generated/NValue-generated.h
index 082c253..086810f 100644
--- a/kabc/vcard/include/generated/NValue-generated.h
+++ b/kabc/vcard/include/generated/NValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 NValue();
 NValue(const NValue&);
-NValue(const QCString&);
+NValue(const Q3CString&);
 NValue & operator = (NValue&);
-NValue & operator = (const QCString&);
+NValue & operator = (const Q3CString&);
 bool operator ==(NValue&);
 bool operator !=(NValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {NValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {NValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~NValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "NValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/Name-generated.h b/kabc/vcard/include/generated/Name-generated.h
index 0e69abd..a3bcb25 100644
--- a/kabc/vcard/include/generated/Name-generated.h
+++ b/kabc/vcard/include/generated/Name-generated.h
@@ -1,22 +1,24 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 V_Name();
 V_Name(const V_Name&);
-V_Name(const QCString&);
+V_Name(const Q3CString&);
 V_Name & operator = (V_Name&);
-V_Name & operator = (const QCString&);
+V_Name & operator = (const Q3CString&);
 bool operator ==(V_Name&);
 bool operator !=(V_Name& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_Name a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_Name a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~V_Name();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/OrgValue-generated.h b/kabc/vcard/include/generated/OrgValue-generated.h
index 51eb1b7..275f56f 100644
--- a/kabc/vcard/include/generated/OrgValue-generated.h
+++ b/kabc/vcard/include/generated/OrgValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 OrgValue();
 OrgValue(const OrgValue&);
-OrgValue(const QCString&);
+OrgValue(const Q3CString&);
 OrgValue & operator = (OrgValue&);
-OrgValue & operator = (const QCString&);
+OrgValue & operator = (const Q3CString&);
 bool operator ==(OrgValue&);
 bool operator !=(OrgValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {OrgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {OrgValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~OrgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "OrgValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/Param-generated.h b/kabc/vcard/include/generated/Param-generated.h
index cf4666a..1a35166 100644
--- a/kabc/vcard/include/generated/Param-generated.h
+++ b/kabc/vcard/include/generated/Param-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 Param();
 Param(const Param&);
-Param(const QCString&);
+Param(const Q3CString&);
 Param & operator = (Param&);
-Param & operator = (const QCString&);
+Param & operator = (const Q3CString&);
 bool operator ==(Param&);
 bool operator !=(Param& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Param a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Param a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~Param();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "Param"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/ParamName-generated.h b/kabc/vcard/include/generated/ParamName-generated.h
index ef673c3..b45022e 100644
--- a/kabc/vcard/include/generated/ParamName-generated.h
+++ b/kabc/vcard/include/generated/ParamName-generated.h
@@ -1,22 +1,24 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 V_ParamName();
 V_ParamName(const V_ParamName&);
-V_ParamName(const QCString&);
+V_ParamName(const Q3CString&);
 V_ParamName & operator = (V_ParamName&);
-V_ParamName & operator = (const QCString&);
+V_ParamName & operator = (const Q3CString&);
 bool operator ==(V_ParamName&);
 bool operator !=(V_ParamName& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_ParamName a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_ParamName a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~V_ParamName();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/ParamValue-generated.h b/kabc/vcard/include/generated/ParamValue-generated.h
index e73500f..956c8da 100644
--- a/kabc/vcard/include/generated/ParamValue-generated.h
+++ b/kabc/vcard/include/generated/ParamValue-generated.h
@@ -1,22 +1,24 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 V_ParamValue();
 V_ParamValue(const V_ParamValue&);
-V_ParamValue(const QCString&);
+V_ParamValue(const Q3CString&);
 V_ParamValue & operator = (V_ParamValue&);
-V_ParamValue & operator = (const QCString&);
+V_ParamValue & operator = (const Q3CString&);
 bool operator ==(V_ParamValue&);
 bool operator !=(V_ParamValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {V_ParamValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {V_ParamValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~V_ParamValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/PhoneNumberValue-generated.h b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
index 1320f18..0d206f4 100644
--- a/kabc/vcard/include/generated/PhoneNumberValue-generated.h
+++ b/kabc/vcard/include/generated/PhoneNumberValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 PhoneNumberValue();
 PhoneNumberValue(const PhoneNumberValue&);
-PhoneNumberValue(const QCString&);
+PhoneNumberValue(const Q3CString&);
 PhoneNumberValue & operator = (PhoneNumberValue&);
-PhoneNumberValue & operator = (const QCString&);
+PhoneNumberValue & operator = (const Q3CString&);
 bool operator ==(PhoneNumberValue&);
 bool operator !=(PhoneNumberValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {PhoneNumberValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {PhoneNumberValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~PhoneNumberValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "PhoneNumberValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/SoundValue-generated.h b/kabc/vcard/include/generated/SoundValue-generated.h
index a9ab2e8..2cc9c0d 100644
--- a/kabc/vcard/include/generated/SoundValue-generated.h
+++ b/kabc/vcard/include/generated/SoundValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 SoundValue();
 SoundValue(const SoundValue&);
-SoundValue(const QCString&);
+SoundValue(const Q3CString&);
 SoundValue & operator = (SoundValue&);
-SoundValue & operator = (const QCString&);
+SoundValue & operator = (const Q3CString&);
 bool operator ==(SoundValue&);
 bool operator !=(SoundValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {SoundValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {SoundValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~SoundValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "SoundValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/SourceParam-generated.h b/kabc/vcard/include/generated/SourceParam-generated.h
index 75fefb8..537e093 100644
--- a/kabc/vcard/include/generated/SourceParam-generated.h
+++ b/kabc/vcard/include/generated/SourceParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 SourceParam();
 SourceParam(const SourceParam&);
-SourceParam(const QCString&);
+SourceParam(const Q3CString&);
 SourceParam & operator = (SourceParam&);
-SourceParam & operator = (const QCString&);
+SourceParam & operator = (const Q3CString&);
 bool operator ==(SourceParam&);
 bool operator !=(SourceParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {SourceParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {SourceParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~SourceParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "SourceParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/TelParam-generated.h b/kabc/vcard/include/generated/TelParam-generated.h
index 3ee77cc..8d9ba0f 100644
--- a/kabc/vcard/include/generated/TelParam-generated.h
+++ b/kabc/vcard/include/generated/TelParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TelParam();
 TelParam(const TelParam&);
-TelParam(const QCString&);
+TelParam(const Q3CString&);
 TelParam & operator = (TelParam&);
-TelParam & operator = (const QCString&);
+TelParam & operator = (const Q3CString&);
 bool operator ==(TelParam&);
 bool operator !=(TelParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TelParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TelParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TelParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "TelParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/TelValue-generated.h b/kabc/vcard/include/generated/TelValue-generated.h
index 3213e1c..b72fa7d 100644
--- a/kabc/vcard/include/generated/TelValue-generated.h
+++ b/kabc/vcard/include/generated/TelValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TelValue();
 TelValue(const TelValue&);
-TelValue(const QCString&);
+TelValue(const Q3CString&);
 TelValue & operator = (TelValue&);
-TelValue & operator = (const QCString&);
+TelValue & operator = (const Q3CString&);
 bool operator ==(TelValue&);
 bool operator !=(TelValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TelValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TelValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TelValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "TelValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/TextBinParam-generated.h b/kabc/vcard/include/generated/TextBinParam-generated.h
index d075c10..2e433b0 100644
--- a/kabc/vcard/include/generated/TextBinParam-generated.h
+++ b/kabc/vcard/include/generated/TextBinParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextBinParam();
 TextBinParam(const TextBinParam&);
-TextBinParam(const QCString&);
+TextBinParam(const Q3CString&);
 TextBinParam & operator = (TextBinParam&);
-TextBinParam & operator = (const QCString&);
+TextBinParam & operator = (const Q3CString&);
 bool operator ==(TextBinParam&);
 bool operator !=(TextBinParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextBinParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextBinParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextBinParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "TextBinParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/TextBinValue-generated.h b/kabc/vcard/include/generated/TextBinValue-generated.h
index e9553ac..bc3ad61 100644
--- a/kabc/vcard/include/generated/TextBinValue-generated.h
+++ b/kabc/vcard/include/generated/TextBinValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextBinValue();
 TextBinValue(const TextBinValue&);
-TextBinValue(const QCString&);
+TextBinValue(const Q3CString&);
 TextBinValue & operator = (TextBinValue&);
-TextBinValue & operator = (const QCString&);
+TextBinValue & operator = (const Q3CString&);
 bool operator ==(TextBinValue&);
 bool operator !=(TextBinValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextBinValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextBinValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextBinValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "TextBinValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/TextListValue-generated.h b/kabc/vcard/include/generated/TextListValue-generated.h
index 9f46124..9df8a46 100644
--- a/kabc/vcard/include/generated/TextListValue-generated.h
+++ b/kabc/vcard/include/generated/TextListValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextListValue();
 TextListValue(const TextListValue&);
-TextListValue(const QCString&);
+TextListValue(const Q3CString&);
 TextListValue & operator = (TextListValue&);
-TextListValue & operator = (const QCString&);
+TextListValue & operator = (const Q3CString&);
 bool operator ==(TextListValue&);
 bool operator !=(TextListValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextListValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextListValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextListValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "TextListValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/TextNSParam-generated.h b/kabc/vcard/include/generated/TextNSParam-generated.h
index d7f58ca..8842bd6 100644
--- a/kabc/vcard/include/generated/TextNSParam-generated.h
+++ b/kabc/vcard/include/generated/TextNSParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextNSParam();
 TextNSParam(const TextNSParam&);
-TextNSParam(const QCString&);
+TextNSParam(const Q3CString&);
 TextNSParam & operator = (TextNSParam&);
-TextNSParam & operator = (const QCString&);
+TextNSParam & operator = (const Q3CString&);
 bool operator ==(TextNSParam&);
 bool operator !=(TextNSParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextNSParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextNSParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextNSParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "TextNSParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/TextParam-generated.h b/kabc/vcard/include/generated/TextParam-generated.h
index 154e1bf..e56a8a5 100644
--- a/kabc/vcard/include/generated/TextParam-generated.h
+++ b/kabc/vcard/include/generated/TextParam-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextParam();
 TextParam(const TextParam&);
-TextParam(const QCString&);
+TextParam(const Q3CString&);
 TextParam & operator = (TextParam&);
-TextParam & operator = (const QCString&);
+TextParam & operator = (const Q3CString&);
 bool operator ==(TextParam&);
 bool operator !=(TextParam& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextParam a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "TextParam"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/TextValue-generated.h b/kabc/vcard/include/generated/TextValue-generated.h
index e1c4dcc..3f205e0 100644
--- a/kabc/vcard/include/generated/TextValue-generated.h
+++ b/kabc/vcard/include/generated/TextValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 TextValue();
 TextValue(const TextValue&);
-TextValue(const QCString&);
+TextValue(const Q3CString&);
 TextValue & operator = (TextValue&);
-TextValue & operator = (const QCString&);
+TextValue & operator = (const Q3CString&);
 bool operator ==(TextValue&);
 bool operator !=(TextValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {TextValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {TextValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~TextValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "TextValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/URIValue-generated.h b/kabc/vcard/include/generated/URIValue-generated.h
index dbcb5c1..464178f 100644
--- a/kabc/vcard/include/generated/URIValue-generated.h
+++ b/kabc/vcard/include/generated/URIValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 URIValue();
 URIValue(const URIValue&);
-URIValue(const QCString&);
+URIValue(const Q3CString&);
 URIValue & operator = (URIValue&);
-URIValue & operator = (const QCString&);
+URIValue & operator = (const Q3CString&);
 bool operator ==(URIValue&);
 bool operator !=(URIValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {URIValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {URIValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~URIValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "URIValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/UTCValue-generated.h b/kabc/vcard/include/generated/UTCValue-generated.h
index 46e447b..1a34b5c 100644
--- a/kabc/vcard/include/generated/UTCValue-generated.h
+++ b/kabc/vcard/include/generated/UTCValue-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 UTCValue();
 UTCValue(const UTCValue&);
-UTCValue(const QCString&);
+UTCValue(const Q3CString&);
 UTCValue & operator = (UTCValue&);
-UTCValue & operator = (const QCString&);
+UTCValue & operator = (const Q3CString&);
 bool operator ==(UTCValue&);
 bool operator !=(UTCValue& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {UTCValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {UTCValue a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~UTCValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "UTCValue"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/VCard-generated.h b/kabc/vcard/include/generated/VCard-generated.h
index 4d7d96d..d09c789 100644
--- a/kabc/vcard/include/generated/VCard-generated.h
+++ b/kabc/vcard/include/generated/VCard-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 VCard();
 VCard(const VCard&);
-VCard(const QCString&);
+VCard(const Q3CString&);
 VCard & operator = (VCard&);
-VCard & operator = (const QCString&);
+VCard & operator = (const Q3CString&);
 bool operator ==(VCard&);
 bool operator !=(VCard& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {VCard a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {VCard a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~VCard();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "VCard"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/VCardEntity-generated.h b/kabc/vcard/include/generated/VCardEntity-generated.h
index 9f2dfbc..cbbe8e1 100644
--- a/kabc/vcard/include/generated/VCardEntity-generated.h
+++ b/kabc/vcard/include/generated/VCardEntity-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 VCardEntity();
 VCardEntity(const VCardEntity&);
-VCardEntity(const QCString&);
+VCardEntity(const Q3CString&);
 VCardEntity & operator = (VCardEntity&);
-VCardEntity & operator = (const QCString&);
+VCardEntity & operator = (const Q3CString&);
 bool operator ==(VCardEntity&);
 bool operator !=(VCardEntity& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {VCardEntity a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {VCardEntity a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~VCardEntity();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "VCardEntity"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/include/generated/Value-generated.h b/kabc/vcard/include/generated/Value-generated.h
index 7afac34..142e720 100644
--- a/kabc/vcard/include/generated/Value-generated.h
+++ b/kabc/vcard/include/generated/Value-generated.h
@@ -1,23 +1,25 @@
+//Added by qt3to4:
+#include <Q3CString>
 // XXX Automatically generated. DO NOT EDIT! XXX //
 
 public:
 Value();
 Value(const Value&);
-Value(const QCString&);
+Value(const Q3CString&);
 Value & operator = (Value&);
-Value & operator = (const QCString&);
+Value & operator = (const Q3CString&);
 bool operator ==(Value&);
 bool operator !=(Value& x) {return !(*this==x);}
-bool operator ==(const QCString& s) {Value a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator ==(const Q3CString& s) {Value a(s);return(*this==a);} 
+bool operator != (const Q3CString& s) {return !(*this == s);}
 
 virtual ~Value();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
 void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
 void _parse();
 void _assemble();
 const char * className() const { return "Value"; }
 
 // End of automatically generated code           //
diff --git a/kabc/vcard/testread.cpp b/kabc/vcard/testread.cpp
index 919c661..4d66aaf 100644
--- a/kabc/vcard/testread.cpp
+++ b/kabc/vcard/testread.cpp
@@ -1,79 +1,81 @@
 #include <iostream>
 #include <stdlib.h>
 #include <assert.h>
 
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 #include <VCard.h>
 
 using namespace std;
 
 int main(int argc, char * argv[])
 {
         if (argc != 2) {
                 cerr << "Usage: " << argv[0] << " <filename>" << endl;
                 exit(1);
         }
         
         QFile f(argv[1]);
         
-        QCString str;
+        Q3CString str;
         
-        if (!f.open(IO_ReadOnly)) {
+        if (!f.open(QIODevice::ReadOnly)) {
                 cerr << "Couldn't open file \"" << argv[1] << endl;
                 exit(1);
         }
         
-        QTextStream t(&f);
+        Q3TextStream t(&f);
         
         while (!t.eof())
                 str += t.readLine().utf8() + '\n';
         
         using namespace VCARD; 
 
         // Iterate through all vCards in the file.
 
         cout << "--------- begin ----------" << endl;
         cout << str.data();
         cout << "---------  end  ----------" << endl;
 
         VCardEntity e(str);
         
         VCardListIterator it(e.cardList());
         
         for (; it.current(); ++it) {
                 
                 cerr << "****************** VCARD ********************" << endl;
                 
                 // Create a vcard using the string representation.
                 VCard & v (*it.current());
 
                 if (v.has(EntityEmail)) {
                         cerr << "Email parameter found" << endl;
                         
-                        QCString s = v.contentLine(EntityEmail)->value()->asString();
+                        Q3CString s = v.contentLine(EntityEmail)->value()->asString();
                         
                         cerr << "Email value == " << s << endl;
                 }
                 
                 if (v.has(EntityNickname)) {
                         cerr << "Nickname parameter found" << endl;
                         
                         cerr << "Nickname value == " <<
                                 v.contentLine(EntityNickname)->value()->asString() <<
                                 endl;
                 }
                 
                 if (v.has(EntityRevision)) {
                         
                         cerr << "Revision parameter found" << endl;
                         
                         DateValue * d =
                                 (DateValue *)
                                 v.contentLine(EntityRevision)->value();
                         
                         assert(d != 0);
                         
                         cerr << "Revision date: " << endl;
                                 cerr << "Day   : " << d->day()  << endl;
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index e4bbe7b..846e51a 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -1,41 +1,43 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
 
 #include <VCard.h>
+//Added by qt3to4:
+#include <Q3CString>
 
 int main(int argc,char **argv)
 {
   KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
   KCmdLineArgs::init(argc,argv,&aboutData);
 
   KApplication app;
   
   kdDebug() << "Test Write VCard" << endl;
 
   using namespace VCARD;
   
   VCard v;
 
   ContentLine cl1;
   cl1.setName(EntityTypeToParamName(EntityName));
   cl1.setValue(new TextValue("Hans Wurst"));
   v.add(cl1);
 
   ContentLine cl2;
   cl2.setName(EntityTypeToParamName(EntityTelephone));
   cl2.setValue(new TelValue("12345"));
   ParamList p;
   p.append( new TelParam("home") );
   p.append( new TelParam("fax") );
   cl2.setParamList( p );
   v.add(cl2);
 
-  QCString str = v.asString();
+  Q3CString str = v.asString();
 
   kdDebug() << "--- VCard begin ---" << endl
             << str
             << "--- VCard  end  ---" << endl;
 }
diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index 60d02b8..e24a9dc 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -6,67 +6,69 @@
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qmap.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kmdcodec.h>
 
 #include "vcard21parser.h"
 #include "vcardconverter.h"
 
 using namespace KABC;
 
 bool VCardLineX::isValid() const
 {
   // Invalid: if it is "begin:vcard" or "end:vcard"
   if ( name == VCARD_BEGIN_N || name == VCARD_END_N )
     return false;
 
   if ( name[0] == 'x' && name[1] == '-' ) // A custom x- line
     return true;
 
   // 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)    ||
                     qualifiers.contains(VCARD_ADR_INTL)   ||
                     qualifiers.contains(VCARD_ADR_POSTAL) ||
                     qualifiers.contains(VCARD_ADR_HOME)   ||
                     qualifiers.contains(VCARD_ADR_WORK)   ||
                     qualifiers.contains(VCARD_ADR_PREF)
          ) )
         return true;
 
       if ( name == VCARD_AGENT )
         return true;
       break;
 
     case 'b':
       if ( name == VCARD_BDAY )
         return true;
       break;
 
     case 'c':
       if ( name == VCARD_CATEGORIES )
         return true;
       if ( name == VCARD_CLASS && qualified &&
@@ -248,107 +250,110 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
   //set the addressee's organisation
   tmpStr = mVCard->getValue(VCARD_ORG);
   addressee.setOrganization(tmpStr);
   //set the addressee's title
   tmpStr = mVCard->getValue(VCARD_TITLE);
   addressee.setTitle(tmpStr);
   //set the addressee's email - we can only deal with two.  The preferenced one and one other.
   tmpStr = mVCard->getValue(VCARD_EMAIL, VCARD_EMAIL_INTERNET);
   addressee.insertEmail(tmpStr, false);
   tmpStr = mVCard->getValue(VCARD_EMAIL,VCARD_EMAIL_PREF);
   addressee.insertEmail(tmpStr, true);
   //set the addressee's url
   tmpStr = mVCard->getValue(VCARD_URL);
   if (tmpStr.isEmpty()) tmpStr = mVCard->getValue(VCARD_URL, VCARD_ADR_WORK);
   if (tmpStr.isEmpty()) tmpStr = mVCard->getValue(VCARD_URL, VCARD_ADR_HOME);
   if (!tmpStr.isEmpty()) {
     addressee.setUrl(KURL(tmpStr));
   }
 
   //set the addressee's birthday
   tmpStr = mVCard->getValue(VCARD_BDAY);
   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 ) {
         if ( (*i).qualifiers.contains( VCARD_TEL_HOME ) )
           type |= PhoneNumber::Home;
         if ( (*i).qualifiers.contains( VCARD_TEL_WORK ) )
           type |= PhoneNumber::Work;
         if ( (*i).qualifiers.contains( VCARD_TEL_PREF ) )
             type |= PhoneNumber::Pref;
         if ( (*i).qualifiers.contains( VCARD_TEL_VOICE ) )
             type |= PhoneNumber::Voice;
         if ( (*i).qualifiers.contains( VCARD_TEL_FAX ) )
           type |= PhoneNumber::Fax;
         if ( (*i).qualifiers.contains( VCARD_TEL_MSG ) )
           type |= PhoneNumber::Msg;
         if ( (*i).qualifiers.contains( VCARD_TEL_CELL ) )
           type |= PhoneNumber::Cell;
         if ( (*i).qualifiers.contains( VCARD_TEL_PAGER ) )
           type |= PhoneNumber::Pager;
         if ( (*i).qualifiers.contains( VCARD_TEL_BBS ) )
           type |= PhoneNumber::Bbs;
         if ( (*i).qualifiers.contains( VCARD_TEL_MODEM ) )
           type |= PhoneNumber::Modem;
         if ( (*i).qualifiers.contains( VCARD_TEL_CAR ) )
           type |= PhoneNumber::Car;
         if ( (*i).qualifiers.contains( VCARD_TEL_ISDN ) )
           type |= PhoneNumber::Isdn;
         if ( (*i).qualifiers.contains( VCARD_TEL_VIDEO ) )
           type |= PhoneNumber::Video;
         if ( (*i).qualifiers.contains( VCARD_TEL_PCS ) )
           type |= PhoneNumber::Pcs;
        
       }
       addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) );
     }
   }
   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 ) {
         if ( (*i).qualifiers.contains( VCARD_ADR_DOM ) )
           type |= Address::Dom;
         if ( (*i).qualifiers.contains( VCARD_ADR_INTL ) )
           type |= Address::Intl;
         if ( (*i).qualifiers.contains( VCARD_ADR_POSTAL ) )
           type |= Address::Postal;
         if ( (*i).qualifiers.contains( VCARD_ADR_PARCEL ) )
           type |= Address::Parcel;
         if ( (*i).qualifiers.contains( VCARD_ADR_HOME ) )
           type |= Address::Home;
         if ( (*i).qualifiers.contains( VCARD_ADR_WORK ) )
           type |= Address::Work;
         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 ) );
     }
   }
 
   //set the addressee's delivery label
   tmpStr = mVCard->getValue(VCARD_LABEL);
   if (!tmpStr.isEmpty()) {
 qDebug("VCard21Parser::readFromString please verify if replace is correct");
 //US    tmpStr.replace("\r\n","\n");
     tmpStr.replace( QRegExp("\r\n"), "\n" );   
     Address tmpAddress;
     tmpAddress.setLabel(tmpStr);
     addressee.insertAddress(tmpAddress);
   }
 
   //set the addressee's notes
   tmpStr = mVCard->getValue(VCARD_NOTE);
 qDebug("VCard21Parser::readFromString please verify if correct");
 //US    tmpStr.replace("\r\n","\n");
   tmpStr.replace( QRegExp("\r\n"), "\n" );   
   addressee.setNote(tmpStr);
 
   //set the addressee's timezone
   tmpStr = mVCard->getValue(VCARD_TZ);
   TimeZone tmpZone(tmpStr.toInt());
@@ -387,52 +392,52 @@ KABC::Address VCard21Parser::readAddressFromQStringList ( const QStringList &dat
   if ( data.count() > 0 )
     mAddress.setPostOfficeBox( data[0] );
   if ( data.count() > 1 )
     mAddress.setExtended( data[1] );
   if ( data.count() > 2 )
     mAddress.setStreet( data[2] );
   if ( data.count() > 3 )
     mAddress.setLocality( data[3] );
   if ( data.count() > 4 )
     mAddress.setRegion( data[4] );
   if ( data.count() > 5 )
     mAddress.setPostalCode( data[5] );
   if ( data.count() > 6 )
     mAddress.setCountry( data[6] );
 
   return mAddress;
 }
 
 
 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 );
 
   // for each line in the vCard
   for ( QStringList::Iterator j = lines.begin(); j != lines.end(); ++j ) {
     VCardLineX _vcl;
 
     // take spaces off the end - ugly but necessary hack
     for ( int g = (*j).length()-1; g > 0 && (*j)[g].isSpace(); --g )
       (*j)[g] = 0;
 
     // first token:
     //   verify state, update if necessary
     if ( _state & VC_STATE_BEGIN) {
       if ( !qstricmp( (*j).latin1(), VCARD_BEGIN ) ) {
         _state = VC_STATE_BODY;
         continue;
       } else {
         _err = VC_ERR_NO_BEGIN;
         break;
       }
     } else if ( _state & VC_STATE_BODY ) {
       if ( !qstricmp( (*j).latin1(), VCARD_END ) ) {
         _state |= VC_STATE_END;
@@ -480,128 +485,129 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
 
       if ( _vcl.name == VCARD_VERSION )
         _state |= VC_STATE_HAVE_VERSION;
 
       if ( _vcl.name == VCARD_N || _vcl.name == VCARD_FN )
         _state |= VC_STATE_HAVE_N;
 
       // second token:
       //    split into tokens by ;
       //    add to parameters vector
       if ( b64 ) {
         if ( value.at( value.length() - 1 ) != '=' )
           do {
             value += *( ++j );
           } while ( (*j).at( (*j).length() - 1 ) != '=' );
       } else {
         if ( qp ) { // join any split lines
           while ( value.at( value.length() - 1 ) == '=' ) {
             value.remove( value.length() - 1, 1 );
             value.append(*( ++j ));
           }
         }
         _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 {
       _err = VC_ERR_INTERNAL;
       break;
     }
 
     // validate VCardLineX
     if ( !_vcl.isValid() ) {
       _err = VC_ERR_INVALID_LINE;
       break;
     }
 
     // add to vector
     _vcdata->append( _vcl );
   }
 
   // errors to check at the last minute (exit state related)
   if ( _err == 0 ) {
     if ( !( _state & VC_STATE_END ) ) // we have to have an end!!
       _err = VC_ERR_NO_END;
 
     if ( !( _state & VC_STATE_HAVE_N ) || // we have to have the mandatories!
          !( _state & VC_STATE_HAVE_VERSION ) )
       _err = VC_ERR_MISSING_MANDATORY;
   }
 
   // set the error message if we can, and only return an object
   // if the vCard was valid.
   if ( err )
     *err = _err;
 
   if ( _err != 0 ) {
     delete _vcdata;
     return 0;
   }
 
   return new VCard21ParserImpl( _vcdata );
 }
 
-VCard21ParserImpl::VCard21ParserImpl(QValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
+VCard21ParserImpl::VCard21ParserImpl(Q3ValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
 {
 }
 
 
 QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifier)
 {
   QString failed;
   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];
     else return failed;
     }
   }
   return failed;
 }
 
 
 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];
       else return failed;
     }
    }
   return failed;
 }
 
 
 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();
 }
 
 QStringList VCard21ParserImpl::getValues(const QString& name, const QString& qualifier)
 {
   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();
 }
 
 
diff --git a/kabc/vcard21parser.h b/kabc/vcard21parser.h
index 77e69b6..80ba6ef 100644
--- a/kabc/vcard21parser.h
+++ b/kabc/vcard21parser.h
@@ -13,49 +13,49 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_VCARD21FORMAT_H
 #define KABC_VCARD21FORMAT_H
 
 #include <qdatetime.h>
 #include <kdebug.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <kurl.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 #include "addressee.h"
 #include "addressbook.h"
 #include "phonenumber.h"
 
 
 #define VCARD_BEGIN          "begin:vcard"
 #define VCARD_END            "end:vcard"
 #define VCARD_BEGIN_N        "begin"
 #define VCARD_END_N          "end"
 #define VCARD_VERSION        "version"
 
 #define VCARD_FN             "fn"
 #define VCARD_N              "n"
 
 // optional
 #define VCARD_NAME           "name"
 #define VCARD_NICKNAME       "nickname"
 #define VCARD_PHOTO          "photo"
 #define VCARD_BDAY           "bday"
 #define VCARD_ADR            "adr"
 
 // types
 #define VCARD_ADR_DOM      "dom"
@@ -175,52 +175,52 @@ public:
   /**
    * Parses a string in vcard2.1 format and returns the inherent addressee.
    */
   KABC::Addressee readFromString( const QString &data);
 
   /**
    * Helper method to store a address.
    *
    * @param data  A string list, that is filled with 'street', 'house number' ...
    * @param type  The type of the returned address.
    */
   static KABC::Address readAddressFromQStringList (const QStringList &data, const int type);
 };
 
 }
 
 /**
  * @short Helper class
  */
 class VCardLineX
 {
 public:
   QString name;
   bool qualified;
-  QValueList<QString> qualifiers;
-  QValueList<QString> parameters;
+  Q3ValueList<QString> qualifiers;
+  Q3ValueList<QString> parameters;
   bool isValid() const;
 };
 
 /**
  * @short Helper class
  */
 class VCard21ParserImpl
 {
   friend class VCardLineX;
 
 public:
   VCard21ParserImpl() {  };
   virtual ~VCard21ParserImpl() {  };
   static VCard21ParserImpl *parseVCard(const QString& vc, int *err = NULL);
   QString getValue(const QString& name, const QString& qualifier);
   QString getValue(const QString& name);
   QStringList getValues(const QString& name, const QString& qualifier);
   QStringList getValues(const QString& name);
 
-  QValueList<VCardLineX> *_vcdata;
+  Q3ValueList<VCardLineX> *_vcdata;
 
 private:
-  VCard21ParserImpl (QValueList<VCardLineX> *_vcd);
+  VCard21ParserImpl (Q3ValueList<VCardLineX> *_vcd);
 };
 
 #endif
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index 580c28b..2417874 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -7,154 +7,157 @@
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 #include <qregexp.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3PtrList>
 
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 
 #include <VCard.h>
 
 #include "addressbook.h"
 #include "vcardformatimpl.h"
 
 using namespace KABC;
 using namespace VCARD;
 
 int VCardFormatImpl::debug = -1;
 
 VCardFormatImpl::VCardFormatImpl()
 {
   debug = (getenv("KABC_DEBUG") != 0);
 }
 
 bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
 {
   kdDebug(5700) << "VCardFormat::load()" << endl;
 
   QByteArray fdata = file->readAll();
-  QCString data(fdata.data(), fdata.size()+1);
+  Q3CString data(fdata.data(), fdata.size()+1);
 
   VCardEntity e( data );
 
   VCardListIterator it( e.cardList() );
 
   if ( it.current() ) {
 //US    VCard v(*it.current());
 //US    loadAddressee( addressee, v );
     loadAddressee( addressee, it.current() );
     return true;
   }
 
   return false;
 }
 
 
 #include <kmessagebox.h>
 bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
 {
   
-    QCString data(file->readAll().data(), file->size()+1); 
+    Q3CString data(file->readAll().data(), file->size()+1); 
   VCardEntity e( data );
 
   VCardListIterator it( e.cardList() );
 
   for (; it.current(); ++it) {
 //US    VCard v(*it.current());
     Addressee addressee;
 //US    loadAddressee( addressee, v );
     loadAddressee( addressee, it.current() );
     addressee.setResource( resource );
     addressBook->insertAddressee( addressee );
     if (debug == true)
       {
         printf("address %s loaded successfully\n", addressee.formattedName().latin1());
       } 
   }
   return true;
 }
 
 void VCardFormatImpl::save( const Addressee &addressee, QFile *file )
 {
   VCardEntity vcards;
   VCardList vcardlist;
   vcardlist.setAutoDelete( true );
 
   VCard *v = new VCard;
 
   saveAddressee( addressee, v, false );
 
   vcardlist.append( v );
   vcards.setCardList( vcardlist );
 
-  QCString vcardData = vcards.asString();
+  Q3CString vcardData = vcards.asString();
   file->writeBlock( (const char*)vcardData, vcardData.length() );
 }
 
 void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file )
 {
 
  AddressBook::Iterator it;
   for ( it = ab->begin(); it != ab->end(); ++it ) {
     if ( (*it).resource() == resource ) {
         save((*it),file);
         qApp->processEvents();
       (*it).setChanged( false );
     }
   }
   // for memory usage status test only
   // KMessageBox::information ( 0, "Stoppppp", QString("Stop ") );
 }
 
 bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
 {
-  QPtrList<ContentLine> contentLines = v->contentLineList();
+  Q3PtrList<ContentLine> contentLines = v->contentLineList();
   ContentLine *cl;
 
   for( cl = contentLines.first(); cl; cl = contentLines.next() ) {
-    QCString n = cl->name();
+    Q3CString n = cl->name();
     if ( n.left( 2 ) == "X-" ) {
       n = n.mid( 2 );
       int posDash = n.find( "-" );
       addressee.insertCustom( QString::fromUtf8( n.left( posDash ) ),
                         QString::fromUtf8( n.mid( posDash + 1 ) ),
                         QString::fromUtf8( cl->value()->asString() ) );
         continue;
     }
 
     EntityType type = cl->entityType();
     switch( type ) {
 
       case EntityUID:
         addressee.setUid( readTextValue( cl ) );
         break;
 
       case EntityEmail:
         addressee.insertEmail( readTextValue( cl ) );
         break;
 
       case EntityName:
         addressee.setName( readTextValue( cl ) );
         break;
 
@@ -198,49 +201,49 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
         addressee.setProductId( readTextValue( cl ) );
         break;
 
       case EntitySortString:
         addressee.setSortString( readTextValue( cl ) );
         break;
 
       case EntityN:
         readNValue( cl, addressee );
         break;
 
       case EntityAddress:
         addressee.insertAddress( readAddressValue( cl ) );
         break;
 
       case EntityTelephone:
         addressee.insertPhoneNumber( readTelephoneValue( cl ) );
         break;
 
       case EntityCategories:
         addressee.setCategories( QStringList::split( ",", readTextValue( cl ) ) );
         break;
 
       case EntityBirthday:
-        addressee.setBirthday( readDateValue( cl ) );
+        addressee.setBirthday( (QDateTime) readDateValue( cl ) );
         break;
 
       case EntityRevision:
         addressee.setRevision( readDateTimeValue( cl ) );
         break;
 
       case EntityGeo:
         addressee.setGeo( readGeoValue( cl ) );
         break;
 
       case EntityTimeZone:
         addressee.setTimeZone( readUTCValue( cl ) );
         break;
 
       case EntityVersion:
         break;
 
       case EntityClass:
         addressee.setSecrecy( readClassValue( cl ) );
         break;
 
       case EntityKey:
         addressee.insertKey( readKeyValue( cl ) );
         break;
@@ -509,49 +512,49 @@ void VCardFormatImpl::addClassValue( VCard *vcard, const Secrecy &secrecy )
 
 
 Address VCardFormatImpl::readAddressValue( ContentLine *cl )
 {
   Address a;
   AdrValue *v = (AdrValue *)cl->value();
   a.setPostOfficeBox( QString::fromUtf8( v->poBox() ) );
   a.setExtended( QString::fromUtf8( v->extAddress() ) );
   a.setStreet( QString::fromUtf8( v->street() ) );
   a.setLocality( QString::fromUtf8( v->locality() ) );
   a.setRegion( QString::fromUtf8( v->region() ) );
   a.setPostalCode( QString::fromUtf8( v->postCode() ) );
   a.setCountry( QString::fromUtf8( v->countryName() ) );
 
   a.setType( readAddressParam( cl ) );
 
   return a;
 }
 
 int VCardFormatImpl::readAddressParam( ContentLine *cl )
 {
   int type = 0;
   ParamList params = cl->paramList();
   ParamListIterator it( params );
-  QCString tmpStr;
+  Q3CString tmpStr;
   for( ; it.current(); ++it ) {
     if ( (*it)->name().upper() == "TYPE" ) {
       tmpStr = (*it)->value().lower();
       if ( tmpStr == "dom" ) type |= Address::Dom;
       else if ( tmpStr == "intl" ) type |= Address::Intl;
       else if ( tmpStr == "parcel" ) type |= Address::Parcel;
       else if ( tmpStr == "postal" ) type |= Address::Postal;
       else if ( tmpStr == "work" ) type |= Address::Work;
       else if ( tmpStr == "home" ) type |= Address::Home;
       else if ( tmpStr == "pref" ) type |= Address::Pref;
     }
   }
   return type;
 }
 
 void VCardFormatImpl::addNValue( VCard *vcard, const Addressee &a )
 {
   ContentLine cl;
   cl.setName(EntityTypeToParamName( EntityN ) );
   NValue *v = new NValue;
   v->setFamily( a.familyName().utf8() );
   v->setGiven( a.givenName().utf8() );
   v->setMiddle( a.additionalName().utf8() );
   v->setPrefix( a.prefix().utf8() );
@@ -588,49 +591,49 @@ void VCardFormatImpl::addTelephoneValue( VCard *v, const PhoneNumber &p )
   if( p.type() & PhoneNumber::Voice ) params.append( new Param( "TYPE", "voice" ) );
   if( p.type() & PhoneNumber::Fax ) params.append( new Param( "TYPE", "fax" ) );
   if( p.type() & PhoneNumber::Cell ) params.append( new Param( "TYPE", "cell" ) );
   if( p.type() & PhoneNumber::Video ) params.append( new Param( "TYPE", "video" ) );
   if( p.type() & PhoneNumber::Bbs ) params.append( new Param( "TYPE", "bbs" ) );
   if( p.type() & PhoneNumber::Modem ) params.append( new Param( "TYPE", "modem" ) );
   if( p.type() & PhoneNumber::Car ) params.append( new Param( "TYPE", "car" ) );
   if( p.type() & PhoneNumber::Isdn ) params.append( new Param( "TYPE", "isdn" ) );
   if( p.type() & PhoneNumber::Pcs ) params.append( new Param( "TYPE", "pcs" ) );
   if( p.type() & PhoneNumber::Pager ) params.append( new Param( "TYPE", "pager" ) );
   cl.setParamList( params );
 
   v->add(cl);
 }
 
 PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
 {
   PhoneNumber p;
   TelValue *value = (TelValue *)cl->value();
   p.setNumber( QString::fromUtf8( value->asString() ) );
 
   int type = 0;
   ParamList params = cl->paramList();
   ParamListIterator it( params );
-  QCString tmpStr;
+  Q3CString tmpStr;
   for( ; it.current(); ++it ) {
     if ( (*it)->name() == "TYPE" ) {
       tmpStr = (*it)->value().lower();
       if ( tmpStr == "home" ) type |= PhoneNumber::Home;
       else if ( tmpStr == "work" ) type |= PhoneNumber::Work;
       else if ( tmpStr == "msg" ) type |= PhoneNumber::Msg;
       else if ( tmpStr == "pref" ) type |= PhoneNumber::Pref;
       else if ( tmpStr == "voice" ) type |= PhoneNumber::Voice;
       else if ( tmpStr == "fax" ) type |= PhoneNumber::Fax;
       else if ( tmpStr == "cell" ) type |= PhoneNumber::Cell;
       else if ( tmpStr == "video" ) type |= PhoneNumber::Video;
       else if ( tmpStr == "bbs" ) type |= PhoneNumber::Bbs;
       else if ( tmpStr == "modem" ) type |= PhoneNumber::Modem;
       else if ( tmpStr == "car" ) type |= PhoneNumber::Car;
       else if ( tmpStr == "isdn" ) type |= PhoneNumber::Isdn;
       else if ( tmpStr == "pcs" ) type |= PhoneNumber::Pcs;
       else if ( tmpStr == "pager" ) type |= PhoneNumber::Pager;
     }
   }
   p.setType( type );
 
   return p;
 }
 
@@ -849,49 +852,49 @@ Agent VCardFormatImpl::readAgentValue( VCARD::ContentLine *cl )
   } else {
     agent.setUrl( QString::fromUtf8( v->asString() ) );
   }
 
   return agent;
 }
 
 #include <qstringlist.h>
 void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType type, const Picture &pic, const Addressee &addr, bool intern )
 {
   ContentLine cl;
   cl.setName( EntityTypeToParamName( type ) );
   // qDebug( "IIIMMMMM %s",QImage::outputFormatList ().join("-").latin1() );
   if ( pic.isIntern() && pic.data().isNull() )
     return;
 
   if ( !pic.isIntern() && pic.url().isEmpty() )
     return;
 
   ParamList params;
   if ( pic.isIntern() ) {
     QImage img = pic.data();
     if ( intern ) { // only for vCard export we really write the data inline
       QByteArray data;
-      QDataStream s( data, IO_WriteOnly );
+      QDataStream s( &data, QIODevice::WriteOnly );
       s.setVersion( 4 ); // to produce valid png files
       s << img;
       cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
       params.append( new Param( "ENCODING", "b" ) );
       if ( !pic.type().isEmpty() )
           params.append( new Param( "TYPE", pic.type().utf8() ) );
     } else { // save picture in cache
       QString dir;
       if ( type == EntityPhoto )
         dir = "photos";
       if ( type == EntityLogo )
         dir = "logos";
       QString imUrl = locateLocal( "data", "kabc/" + dir + "/" + addr.uid() );
       KABC::Picture* ppic =(KABC::Picture*) &pic;
       ppic->setUrl( imUrl );
       img.save(imUrl, "PNG" );
       cl.setValue( new TextValue( pic.url().utf8() ) );
       params.append( new Param( "VALUE", "uri" ) );
     }
     
   } else {
 
     cl.setValue( new TextValue( pic.url().utf8() ) );
     params.append( new Param( "VALUE", "uri" ) );
@@ -938,81 +941,81 @@ Picture VCardFormatImpl::readPictureValue( VCARD::ContentLine *cl, VCARD::Entity
     pic.setUrl( QString::fromUtf8( v->asString() ) );
   }
 
   return pic;
 }
 
 void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, const Addressee &addr, bool intern )
 {
   ContentLine cl;
   cl.setName( EntityTypeToParamName( EntitySound ) );
 
   if ( sound.isIntern() && sound.data().isNull() )
     return;
 
   if ( !sound.isIntern() && sound.url().isEmpty() )
     return;
 
   ParamList params;
   if ( sound.isIntern() ) {
     QByteArray data = sound.data();
     if ( intern ) { // only for vCard export we really write the data inline
         cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
     } else { // save sound in cache
       QFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
-      if ( file.open( IO_WriteOnly ) ) {
+      if ( file.open( QIODevice::WriteOnly ) ) {
         file.writeBlock( data );
       }
       cl.setValue( new TextValue( "<dummy>" ) );
     }
     params.append( new Param( "ENCODING", "b" ) );
   } else {
     cl.setValue( new TextValue( sound.url().utf8() ) );
     params.append( new Param( "VALUE", "uri" ) );
   }
 
   cl.setParamList( params );
   vcard->add( cl );
 }
 
 Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &addr )
 {
   Sound sound;
   bool isInline = false;
   TextValue *v = (TextValue *)cl->value();
 
   ParamList params = cl->paramList();
   ParamListIterator it( params );
   for( ; it.current(); ++it ) {
     if ( (*it)->name() == "ENCODING" && (*it)->value() == "b" )
       isInline = true;
   }
 
   if ( isInline ) {
     QByteArray data;
     if ( v->asString() == "<dummy>" ) { // no sound inline stored => sound is in cache
       QFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
-      if ( file.open( IO_ReadOnly ) ) {
+      if ( file.open( QIODevice::ReadOnly ) ) {
         data = file.readAll();
         file.close();
       }
     } else {
       KCodecs::base64Decode( v->asString(), data );
     }
     sound.setData( data );
   } else {
     sound.setUrl( QString::fromUtf8( v->asString() ) );
   }
 
   return sound;
 }
 
 bool VCardFormatImpl::readFromString( const QString &vcard, Addressee &addressee )
 {
   VCardEntity e( vcard.utf8() );
   VCardListIterator it( e.cardList() );
 
   if ( it.current() ) {
 //US    VCard v(*it.current());
 //US    loadAddressee( addressee, v );
     loadAddressee( addressee, it.current() );
     return true;
diff --git a/kabc/vcardformatplugin.cpp b/kabc/vcardformatplugin.cpp
index 8db8c11..0b97a08 100644
--- a/kabc/vcardformatplugin.cpp
+++ b/kabc/vcardformatplugin.cpp
@@ -40,31 +40,31 @@ bool VCardFormatPlugin::load( Addressee &addressee, QFile *file )
 }
 
 bool VCardFormatPlugin::loadAll( AddressBook *addressBook, Resource *resource, QFile *file )
 {
     // qDebug("VCardFormatPlugin::loadAll");
   return mImpl->loadAll( addressBook, resource, file );
 }
 
 void VCardFormatPlugin::save( const Addressee &addressee, QFile *file )
 {
   qDebug("VCardFormatPlugin::save");
   mImpl->save( addressee, file );
 }
 
 void VCardFormatPlugin::saveAll( AddressBook *addressBook, Resource *resource, QFile *file )
 {
   qDebug("VCardFormatPlugin::saveAll");
   mImpl->saveAll( addressBook, resource, file );
 }
 
 bool VCardFormatPlugin::checkFormat( QFile *file ) const
 {
   QString line;
 
-  file->readLine( line, 1024 );
+  char tmp[1024]; file->readLine( tmp, 1024 ); line = tmp;
   line = line.stripWhiteSpace();
   if ( line == "BEGIN:VCARD" )
     return true;
   else
     return false;
 }
diff --git a/kabc/vcardparser/vcard.h b/kabc/vcardparser/vcard.h
index 0bee441..85b50e4 100644
--- a/kabc/vcardparser/vcard.h
+++ b/kabc/vcardparser/vcard.h
@@ -3,56 +3,56 @@
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef VCARDPARSER_VCARD_H
 #define VCARDPARSER_VCARD_H
 
 #include "vcardline.h"
 #include <qmap.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 
 namespace KABC {
 
 class VCard
 {
   public:
-    typedef QValueList<VCard> List;
+    typedef Q3ValueList<VCard> List;
     typedef QMap< QString, VCardLine::List > LineMap;
 
     enum Version { v2_1, v3_0 };
 
     VCard();
     VCard( const VCard& );
 
     ~VCard();
 
     VCard& operator=( const VCard& );
 
     /**
      * Removes all lines from the vCard.
      */
     void clear();
 
     /**
      * Returns a list of all identifiers that exists in the
      * vCard.
      */
     QStringList identifiers() const;
 
     /**
      * Adds a VCardLine to the VCard
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index 8df2d32..c7254a0 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -1,113 +1,115 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include "vcardline.h"
+//Added by qt3to4:
+#include <Q3CString>
 
 using namespace KABC;
 
 class VCardLine::VCardLinePrivate
 {
   public:
     QString mGroup;
 };
 
 VCardLine::VCardLine()
   : d( 0 )
 {
 }
 
 VCardLine::VCardLine( const QString &identifier )
   : d( 0 )
 {
   mIdentifier = identifier;
 }
 
 VCardLine::VCardLine( const QString &identifier, const QString &value )
   : d( 0 )
 {
   mIdentifier = identifier;
-  mValue.assign( value.data(), value.length() );
+  mValue = value;
 }
 
 VCardLine::VCardLine( const VCardLine& line )
   : d( 0 )
 {
   mParamMap = line.mParamMap;
   mValue = line.mValue;
   mIdentifier = line.mIdentifier;
 }
 
 VCardLine::~VCardLine()
 {
   delete d;
   d = 0;
 }
 
 VCardLine& VCardLine::operator=( const VCardLine& line )
 {
   if ( &line == this )
     return *this;
 
   mParamMap = line.mParamMap;
   mValue = line.mValue;
   mIdentifier = line.mIdentifier;
 
   return *this;
 }
 
 void VCardLine::setIdentifier( const QString& identifier )
 {
   mIdentifier = identifier;
 }
 
 QString VCardLine::identifier() const
 {
   return mIdentifier;
 }
 
 void VCardLine::setValueString( const QString& value )
 {
     setValueCString( value.utf8() );
 }
-void VCardLine::setValueCString( const QCString& value )
+void VCardLine::setValueCString( const Q3CString& value )
 {
     mValue.duplicate(  value.data(), value.length() );
 }
 
 void VCardLine::setValueBytes( const QByteArray& value )
 {
   mValue = value;
 }
 
 QString VCardLine::valueString() const
 {
   return QString::fromUtf8( mValue.data(), mValue.size() );
 }
 
 QByteArray VCardLine::valueBytes() const
 {
   return mValue;
 }
 
 void VCardLine::setGroup( const QString& group )
 {
   if ( !d )
     d = new VCardLinePrivate();
 
diff --git a/kabc/vcardparser/vcardline.h b/kabc/vcardparser/vcardline.h
index 8dc9322..dc4bdec 100644
--- a/kabc/vcardparser/vcardline.h
+++ b/kabc/vcardparser/vcardline.h
@@ -1,86 +1,86 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #ifndef VCARDLINE_H
 #define VCARDLINE_H
 
 #include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qcstring.h>
+#include <q3valuelist.h>
+#include <q3cstring.h>
 #include <qvariant.h>
 #include <qmap.h>
 #include <qstring.h>
 
 namespace KABC {
 
 class VCardLine
 {
   public:
-    typedef QValueList<VCardLine> List;
+    typedef Q3ValueList<VCardLine> List;
     typedef QMap<QString, QStringList> ParamMap;
 
     VCardLine();
     VCardLine( const QString &identifier );
     VCardLine( const QString &identifier, const QString &value );
     VCardLine( const VCardLine& );
 
     ~VCardLine();
 
     VCardLine& operator=( const VCardLine& );
 
     /**
      * Sets the identifier of this line e.g. UID, FN, CLASS
      */
     void setIdentifier( const QString& identifier );
 
     /**
      * Returns the identifier of this line.
      */
     QString identifier() const;
 
     /**
      * Sets the value of of this line.
      */
     void setValueString( const QString& value );
-    void setValueCString( const QCString& value );
+    void setValueCString( const Q3CString& value );
     void setValueBytes( const QByteArray& value );
 
     /**
      * Returns the value of this line.
      */
     QString valueString() const;
     QByteArray valueBytes() const;
 
     /**
      * Sets the group the line belongs to.
      */
     void setGroup( const QString& group );
 
     /**
      * Returns the group the line belongs to.
      */
     QString group() const;
 
     /**
      * Returns whether the line belongs to a group.
      */
     bool hasGroup() const;
 
     /**
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 11622a0..a319531 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -197,44 +197,44 @@ QString VCardParser::createVCards( const VCard::List& list )
           params = (*lineIt).parameterList();
           hasEncoding = false;
           if ( params.count() > 0 ) { // we have parameters
             for ( paramIt = params.begin(); paramIt != params.end(); ++paramIt ) {
               if ( (*paramIt) == "encoding" ) {
                 hasEncoding = true;
                 encodingType = (*lineIt).parameter( "encoding" ).lower();
               }
 
               values = (*lineIt).parameters( *paramIt );
               for ( valueIt = values.begin(); valueIt != values.end(); ++valueIt ) {
                 textLine.append( ";" + (*paramIt).upper() );
                 if ( !(*valueIt).isEmpty() )
                   textLine.append( "=" + (*valueIt) );
               }
             }
           }
 
           if ( hasEncoding ) { // have to encode the data
             QByteArray input, output;
             input = (*lineIt).valueBytes();
             if ( encodingType == "b" )
               KCodecs::base64Encode( input, output );
             else if ( encodingType == "quoted-printable" )
-              KCodecs::quotedPrintableEncode( input, output );
+              KCodecs::quotedPrintableEncode( input, output, true );
             textLine.append( ":" + QString( output ) );
           } else
             textLine.append( ":" + (*lineIt).valueString().replace( QRegExp("\n"), "\\n" ) );
 
           if ( textLine.length() > FOLD_WIDTH ) { // we have to fold the line
             for ( uint i = 0; i <= ( textLine.length() / FOLD_WIDTH ); ++i )
               text.append( ( i == 0 ? "" : " " ) + textLine.mid( i * FOLD_WIDTH, FOLD_WIDTH ) + "\r\n" );
           } else
             text.append( textLine + "\r\n" );
         }
       }
     }
 
     text.append( "END:VCARD\r\n" );
     text.append( "\r\n" );
   }
 
   return text;
 }
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp
index 204326e..435c3b0 100644
--- a/kabc/vcardparser/vcardtool.cpp
+++ b/kabc/vcardparser/vcardtool.cpp
@@ -631,49 +631,49 @@ Picture VCardTool::parsePicture( const VCardLine &line )
 
   const QStringList params = line.parameterList();
   if ( params.findIndex( "encoding" ) != -1 ) {
     QImage img;
     img.loadFromData( line.valueBytes() );
     pic.setData( img );
   } else if ( params.findIndex( "value" ) != -1 ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       pic.setUrl( line.valueString() );
   }
 
   if ( params.findIndex( "type" ) != -1 )
     pic.setType( line.parameter( "type" ) );
 
   return pic;
 }
 
 VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pic )
 {
   VCardLine line( identifier );
 
   if ( pic.isIntern() ) {
     if ( !pic.data().isNull() ) {
       QByteArray input;
-      QDataStream s( input, IO_WriteOnly );
+      QDataStream s( &input, QIODevice::WriteOnly );
       s.setVersion( 4 );
       s << pic.data();
       line.setValueBytes( input );
       line.addParameter( "encoding", "b" );
       line.addParameter( "type", "image/png" );
     }
   } else if ( !pic.url().isEmpty() ) {
     QByteArray ba;
     line.setValueString( pic.url() );
     line.addParameter( "value", "URI" );
   }
 
   return line;
 }
 
 Sound VCardTool::parseSound( const VCardLine &line )
 {
   Sound snd;
 
   const QStringList params = line.parameterList();
   if ( params.findIndex( "encoding" ) != -1 )
     snd.setData( line.valueBytes() );
   else if ( params.findIndex( "value" ) != -1 ) {
     if ( line.parameter( "value" ).lower() == "uri" )