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
@@ -31,9 +31,9 @@ $Id$
 #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")
@@ -67,10 +67,10 @@ class Address
  public:
    /**
      List of addresses.
    */
-    typedef QValueList<Address> List;
+    typedef Q3ValueList<Address> List;
-    typedef QValueList<int> TypeList;
+    typedef Q3ValueList<int> TypeList;
  
    /**
      Address types:
     
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index fe59fcb..c700897 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -36,10 +36,10 @@ $Id$
 #include <kstandarddirs.h>
 #include "errorhandler.h"
 */
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <kglobal.h>
@@ -243,9 +243,9 @@ 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") );
@@ -380,15 +380,15 @@ bool AddressBook::save( Ticket *ticket )
 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 );
+  Q3TextStream t( &outFile );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
  Iterator it;
  KABC::VCardConverter::Version version;
  version = KABC::VCardConverter::v3_0;
  for ( it = begin(); it != end(); ++it ) { 
@@ -467,12 +467,12 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
     
  }
  
  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
+      Q3TextStream t( &outFile );  // use a text stream
-      t.setEncoding( QTextStream::UnicodeUTF8 );
+      t.setEncoding( Q3TextStream::UnicodeUTF8 );
      t <<datastream;
      t <<  "\r\n\r\n";
      outFile.close();
          
@@ -489,9 +489,9 @@ int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo
    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 ) { 
@@ -633,9 +633,9 @@ 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;
@@ -1217,11 +1217,11 @@ bool AddressBook::addResource( Resource *resource )
 }
 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);
    }
@@ -1239,11 +1239,11 @@ bool AddressBook::removeResource( Resource *resource )
  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;
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index a8a9fc1..56fce4d 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -30,9 +30,9 @@ $Id$
 #include <qobject.h>
 #include <kresources/manager.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include "addressee.h"
 #include "field.h"
@@ -279,9 +279,9 @@ class AddressBook : public QObject
    /**
      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.
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index e8e440c..9994e29 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -390,9 +390,9 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
        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 ;
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 0ea1803..30dcd5d 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -32,9 +32,9 @@ $Id$
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <ksharedptr.h>
 #include <kurl.h>
@@ -83,9 +83,9 @@ 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.
     */
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 671787e..bda1b9e 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -19,13 +19,16 @@
 */
 #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>
@@ -37,10 +40,10 @@
 //#include "addresseedialog.moc"
 using namespace KABC;
-AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
+AddresseeItem::AddresseeItem( Q3ListView *parent, const Addressee &addressee ) :
-  QListViewItem( parent ),
+  Q3ListViewItem( parent ),
  mAddressee( addressee )
 {
    setText( Name,addressee.realName());
    setText( Email, addressee.preferredEmail() );
@@ -70,9 +73,9 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
  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") );
@@ -80,12 +83,12 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
  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() ) );
@@ -100,22 +103,22 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
    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 * ) ),
+    connect( mAddresseeList, SIGNAL( clicked( Q3ListViewItem * ) ),
-             SLOT( addSelected( QListViewItem * ) ) );
+             SLOT( addSelected( Q3ListViewItem * ) ) );
-    connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
+    connect( mAddresseeList, SIGNAL( returnPressed( Q3ListViewItem * ) ),
-             SLOT( selectNextItem( QListViewItem * ) ) );
+             SLOT( selectNextItem( Q3ListViewItem * ) ) );
  }
  mAddressBook = StdAddressBook::self( true );
@@ -125,9 +128,9 @@ AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
  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 );
 }
@@ -171,9 +174,9 @@ void AddresseeDialog::loadAddressBook()
          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 );
@@ -183,41 +186,41 @@ void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item
 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 );
  }
@@ -225,12 +228,12 @@ void AddresseeDialog::addSelected( QListViewItem *item )
 }
 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 );
@@ -254,9 +257,9 @@ 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();
diff --git a/kabc/addresseedialog.h b/kabc/addresseedialog.h
index 6fab62d..be7bbb4 100644
--- a/kabc/addresseedialog.h
+++ b/kabc/addresseedialog.h
@@ -20,9 +20,9 @@
 #ifndef KABC_ADDRESSEEDIALOG_H
 #define KABC_ADDRESSEEDIALOG_H
-#include <qdict.h>
+#include <q3dict.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <klistview.h>
@@ -33,9 +33,9 @@ namespace KABC {
 /**
  @short Special ListViewItem, that is used by the AddresseeDialog.
 */
-class AddresseeItem : public QListViewItem
+class AddresseeItem : public Q3ListViewItem
 {
  public:
    /**
@@ -50,9 +50,9 @@ class AddresseeItem : public QListViewItem
      @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.
    */
@@ -128,19 +128,19 @@ class AddresseeDialog : public KDialogBase
    static Addressee::List getAddressees( QWidget *parent );
  private slots:
    void selectItem( const QString & );
-    void selectNextItem( QListViewItem *item );
+    void selectNextItem( Q3ListViewItem *item );
-    void updateEdit( QListViewItem *item );
+    void updateEdit( Q3ListViewItem *item );
-    void addSelected( QListViewItem *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;
@@ -149,10 +149,10 @@ class AddresseeDialog : public KDialogBase
    KListView *mSelectedList;
    AddressBook *mAddressBook;
-    QDict<QListViewItem> mItemDict;
+    Q3Dict<Q3ListViewItem> mItemDict;
-    QDict<QListViewItem> mSelectedDict;
+    Q3Dict<Q3ListViewItem> mSelectedDict;
    class AddresseeDialogPrivate;
    AddresseeDialogPrivate *d;
 };
diff --git a/kabc/addresseelist.cpp b/kabc/addresseelist.cpp
index 097e162..e1ba1ce 100644
--- a/kabc/addresseelist.cpp
+++ b/kabc/addresseelist.cpp
@@ -27,9 +27,11 @@ $Id$
 */
 #include <kdebug.h>
 //US
-#include <qtl.h>
+#include <q3tl.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include "addresseelist.h"
 #include "field.h"
@@ -120,9 +122,9 @@ bool SortingTraits::GivenName::lt( const Addressee &a1, const Addressee &a2 )
 //
 //
 AddresseeList::AddresseeList()
-  : QValueList<Addressee>()
+  : Q3ValueList<Addressee>()
 {
  mReverseSorting = false;
  mActiveSortingCriterion = FormattedName;
  mActiveSortingField = 0;
@@ -132,16 +134,16 @@ 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 )
+AddresseeList::AddresseeList( const Q3ValueList<Addressee> &l )
-  : QValueList<Addressee>( l )
+  : Q3ValueList<Addressee>( l )
 {
  mReverseSorting = false;
 }
diff --git a/kabc/addresseelist.h b/kabc/addresseelist.h
index 2df252c..6106804 100644
--- a/kabc/addresseelist.h
+++ b/kabc/addresseelist.h
@@ -28,9 +28,9 @@ $Id$
 #ifndef KABC_ADDRESSEELIST_H
 #define KABC_ADDRESSEELIST_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include "addressee.h"
 namespace KABC {
@@ -113,15 +113,15 @@ typedef enum { Uid, Name, FormattedName, FamilyName, GivenName } SortingCriterio
 * 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.
     */
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index cde19a1..425e67c 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -26,25 +26,30 @@
 //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>
@@ -58,9 +63,9 @@
 using namespace KABC;
 bool AddresseeView::sFullDetailsMode = false;
 AddresseeView::AddresseeView( QWidget *parent, const char *name )
-  : QTextBrowser( parent, name )
+  : Q3TextBrowser( parent, name )
 {
 //US  setWrapPolicy( QTextEdit::AtWordBoundary );
@@ -81,9 +86,9 @@ void AddresseeView::printMe()
    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 ();
@@ -401,9 +406,9 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
  }
  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 ) {
@@ -417,9 +422,9 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
          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 ) {
@@ -434,43 +439,43 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
          } 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\">";
                  }
@@ -652,9 +657,9 @@ KABC::Addressee AddresseeView::addressee() const
 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)
@@ -687,26 +692,26 @@ AddresseeChooser::AddresseeChooser( KABC::Addressee loc, KABC::Addressee rem, bo
    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())); 
diff --git a/kabc/addresseeview.h b/kabc/addresseeview.h
index a4de085..f7ce2e0 100644
--- a/kabc/addresseeview.h
+++ b/kabc/addresseeview.h
@@ -25,14 +25,14 @@
 #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 );
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp
index d34ba0b..cf5afa6 100644
--- a/kabc/distributionlist.cpp
+++ b/kabc/distributionlist.cpp
@@ -22,8 +22,10 @@
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include "distributionlist.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 using namespace KABC;
 DistributionList::DistributionList( DistributionListManager *manager,
@@ -53,9 +55,9 @@ 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,
@@ -73,9 +75,9 @@ void DistributionList::insertEntry( const Addressee &a, const QString &email )
 }
 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;
diff --git a/kabc/distributionlist.h b/kabc/distributionlist.h
index c81e543..8d21a17 100644
--- a/kabc/distributionlist.h
+++ b/kabc/distributionlist.h
@@ -23,8 +23,11 @@
 //#include <kdirwatch.h>
 #include "addressbook.h"
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3PtrList>
 namespace KABC {
 class DistributionListManager;
@@ -47,9 +50,9 @@ class DistributionList
      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 ) {}
@@ -166,9 +169,9 @@ class DistributionListManager
  private:
    AddressBook *mAddressBook;
-    QPtrList<DistributionList> mLists;
+    Q3PtrList<DistributionList> mLists;
 };
 /**
  @short Watchdog for distribution lists
diff --git a/kabc/distributionlistdialog.cpp b/kabc/distributionlistdialog.cpp
index d2e1144..82883e6 100644
--- a/kabc/distributionlistdialog.cpp
+++ b/kabc/distributionlistdialog.cpp
@@ -17,15 +17,21 @@
    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>
@@ -59,12 +65,12 @@ EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
                                      QWidget *parent ) :
  KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
               parent )
 {
-  QFrame *topFrame = plainPage();
+  Q3Frame *topFrame = plainPage();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  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;
@@ -77,9 +83,9 @@ EmailSelector::EmailSelector( const QStringList &emails, const QString &current,
 }
 QString EmailSelector::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
  if ( button ) return button->text();
  return QString::null;
 }
@@ -95,14 +101,14 @@ QString EmailSelector::getEmail( const QStringList &emails, const QString &curre
  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() );
@@ -135,12 +141,12 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
  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() ) );
@@ -156,33 +162,33 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
  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);
diff --git a/kabc/distributionlistdialog.h b/kabc/distributionlistdialog.h
index b6d3c80..3627431 100644
--- a/kabc/distributionlistdialog.h
+++ b/kabc/distributionlistdialog.h
@@ -21,15 +21,17 @@
 #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;
@@ -92,9 +94,9 @@ class EmailSelector : public KDialogBase
    static QString getEmail( const QStringList &emails, const QString &current,
        QWidget *parent );
  private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
 /**
  @short Helper class
@@ -123,10 +125,10 @@ class DistributionListEditorWidget : public QWidget
  private:
    QComboBox *mNameCombo;  
    QLabel *mListLabel;
-    QListView *mEntryView;
+    Q3ListView *mEntryView;
-    QListView *mAddresseeView;
+    Q3ListView *mAddresseeView;
    AddressBook *mAddressBook;
    DistributionListManager *mManager;
    QPushButton *mNewButton, *mEditButton, *mRemoveButton;
diff --git a/kabc/distributionlisteditor.cpp b/kabc/distributionlisteditor.cpp
index 9f5840b..ca5ecb7 100644
--- a/kabc/distributionlisteditor.cpp
+++ b/kabc/distributionlisteditor.cpp
@@ -17,19 +17,23 @@
    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>
@@ -47,12 +51,12 @@ EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString &
                                      QWidget *parent ) :
  KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok, Ok,
               parent )
 {
-  QFrame *topFrame = plainPage();
+  Q3Frame *topFrame = plainPage();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  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;
@@ -65,9 +69,9 @@ EmailSelectDialog::EmailSelectDialog( const QStringList &emails, const QString &
 }
 QString EmailSelectDialog::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
  if ( button ) return button->text();
  return QString::null;
 }
@@ -84,14 +88,14 @@ QString EmailSelectDialog::getEmail( const QStringList &emails, const QString &c
  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() );
@@ -124,13 +128,13 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidge
  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() ) );
@@ -142,9 +146,9 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidge
  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 );
@@ -161,9 +165,9 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, QWidge
  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 );
diff --git a/kabc/distributionlisteditor.h b/kabc/distributionlisteditor.h
index e0b4221..e672a14 100644
--- a/kabc/distributionlisteditor.h
+++ b/kabc/distributionlisteditor.h
@@ -23,11 +23,11 @@
 #include <qwidget.h>
 #include <kdialogbase.h>
-class QListView;
+class Q3ListView;
 class QComboBox;
-class QButtonGroup;
+class Q3ButtonGroup;
 namespace KABC {
 class AddressBook;
@@ -44,9 +44,9 @@ class EmailSelectDialog : public KDialogBase
    static QString getEmail( const QStringList &emails, const QString &current,
                             QWidget *parent );
  private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
 /**
  @obsolete
@@ -71,10 +71,10 @@ class DistributionListEditor : public QWidget
    void slotSelectionAddresseeViewChanged();
  private:
    QComboBox *mNameCombo;  
-    QListView *mEntryView;
+    Q3ListView *mEntryView;
-    QListView *mAddresseeView;
+    Q3ListView *mAddresseeView;
    AddressBook *mAddressBook;
    DistributionListManager *mManager;
    QPushButton *newButton, *removeButton;
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 7c6d7a9..203f696 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -32,8 +32,10 @@ $Id$
 #include <kglobal.h>
 #include "field.h"
 #include "resource.h"
+//Added by qt3to4:
+#include <Q3ValueList>
 using namespace KABC;
 class Field::FieldImpl
@@ -376,9 +378,9 @@ bool Field::setValue( KABC::Addressee &a, const QString &value )
 //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 );
@@ -492,9 +494,9 @@ void Field::saveFields( const QString &identifier,
 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());
    
@@ -532,16 +534,16 @@ Field::List Field::restoreFields( const QString &identifier )
 }
 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_" +
diff --git a/kabc/field.h b/kabc/field.h
index 9e06597..55cc705 100644
--- a/kabc/field.h
+++ b/kabc/field.h
@@ -28,9 +28,9 @@ $Id$
 #ifndef KABC_FIELD_H
 #define KABC_FIELD_H
 #include <qstring.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include "addressee.h"
 class KConfig;
@@ -42,9 +42,9 @@ class Field
  class FieldImpl;
  friend class FieldImpl;
 public:
-  typedef QValueList<Field *> List;
+  typedef Q3ValueList<Field *> List;
  /**
   * @li @p All -
   * @li @p Frequent -
diff --git a/kabc/formatfactory.cpp b/kabc/formatfactory.cpp
index 3ae1c27..cbb97a2 100644
--- a/kabc/formatfactory.cpp
+++ b/kabc/formatfactory.cpp
@@ -101,9 +101,9 @@ QStringList FormatFactory::formats()
  // 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();
diff --git a/kabc/formatfactory.h b/kabc/formatfactory.h
index 9612374..de15b17 100644
--- a/kabc/formatfactory.h
+++ b/kabc/formatfactory.h
@@ -20,9 +20,9 @@
 #ifndef KABC_FORMATFACTORY_H
 #define KABC_FORMATFACTORY_H
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 #include <kconfig.h>
 #ifndef DESKTOP_VERSION
@@ -96,9 +96,9 @@ class FormatFactory
    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
@@ -7,9 +7,9 @@ TARGET = microkabcformat_binary
 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 = \
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
@@ -10,9 +10,9 @@ $Id$
 #include "address.h"
 #include "addressee.h"
 #include "vcardparser/vcardtool.h"
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 using namespace KABC;
@@ -36,10 +36,10 @@ bool VCardFormatPlugin2::load( Addressee &addressee, QFile *file )
 {
  qDebug("VCardFormatPlugin2::load");
  QString data;
-  QTextStream t( file );
+  Q3TextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
  data = t.read();
  VCardTool tool;
  
@@ -57,10 +57,10 @@ bool VCardFormatPlugin2::loadAll( AddressBook *addressBook, Resource *resource,
 {
  qDebug("VCardFormatPlugin2::loadAll");
  QString data;
-  QTextStream t( file );
+  Q3TextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
  data = t.read();
  VCardTool tool;
@@ -85,10 +85,10 @@ void VCardFormatPlugin2::save( const Addressee &addressee, QFile *file )
  vcardlist.append( addressee );
-  QTextStream t( file );
+  Q3TextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  t.setEncoding( Q3TextStream::UnicodeUTF8 );
  t << tool.createVCards( vcardlist );
 }
 void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *file )
@@ -104,18 +104,18 @@ void VCardFormatPlugin2::saveAll( AddressBook *ab, Resource *resource, QFile *fi
      vcardlist.append( *it );
    }
  }
  
-  QTextStream t( file );
+  Q3TextStream t( file );
-  t.setEncoding( QTextStream::UnicodeUTF8 );
+  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
diff --git a/kabc/kabc.pro b/kabc/kabc.pro
index 17ebff8..846ed8a 100644
--- a/kabc/kabc.pro
+++ b/kabc/kabc.pro
@@ -2,15 +2,15 @@ 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 : {
@@ -215,4 +215,8 @@ 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,15 +1,15 @@
        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 += -lxmicrokde 
-LIBS += -lmicrokdepim 
+LIBS += -lxmicrokdepim 
 #LIBS += -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
@@ -193,4 +193,6 @@ 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
@@ -27,9 +27,9 @@ $Id$
 #ifndef KABC_KEY_H
 #define KABC_KEY_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 namespace KABC {
 /**
@@ -40,10 +40,10 @@ class Key
  friend QDataStream &operator<<( QDataStream &, const Key & );
  friend QDataStream &operator>>( QDataStream &, Key & );
 public:
-  typedef QValueList<Key> List;
+  typedef Q3ValueList<Key> List;
-  typedef QValueList<int> TypeList;  
+  typedef Q3ValueList<int> TypeList;  
  /**
   * Key types
   *
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index feeba6c..6bc89d3 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -27,9 +27,9 @@ $Id$
 #ifndef KABC_PHONENUMBER_H
 #define KABC_PHONENUMBER_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <qstring.h>
 namespace KABC {
@@ -45,10 +45,10 @@ class PhoneNumber
    friend QDataStream &operator<<( QDataStream &, const PhoneNumber & );
    friend QDataStream &operator>>( QDataStream &, PhoneNumber & );
  public:
-    typedef QValueList<PhoneNumber> List;
+    typedef Q3ValueList<PhoneNumber> List;
-    typedef QValueList<int> TypeList;
+    typedef Q3ValueList<int> TypeList;
    /**
      @li @p Home -  Home number
      @li @p Work -  Office number
diff --git a/kabc/picture.cpp b/kabc/picture.cpp
index 57aa297..0c59937 100644
--- a/kabc/picture.cpp
+++ b/kabc/picture.cpp
@@ -25,8 +25,10 @@ Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include "picture.h"
+//Added by qt3to4:
+#include <QPixmap>
 using namespace KABC;
 Picture::Picture()
diff --git a/kabc/picture.h b/kabc/picture.h
index 714d1e2..1b63610 100644
--- a/kabc/picture.h
+++ b/kabc/picture.h
@@ -28,8 +28,10 @@ $Id$
 #ifndef KABC_PICTURE_H
 #define KABC_PICTURE_H
 #include <qimage.h>
+//Added by qt3to4:
+#include <QPixmap>
 namespace KABC {
 class Picture
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
@@ -3,12 +3,12 @@ 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 = \
@@ -28,9 +28,13 @@ win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/xmicrokdepim.lib
-LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/xmicrokcal.lib
-LIBS += ../../../bin/microkde.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,14 +1,14 @@
        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 = \
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
@@ -169,9 +169,9 @@ bool ResourceDir::doOpen()
    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;
@@ -195,9 +195,9 @@ bool ResourceDir::load()
  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;
    }
@@ -222,9 +222,9 @@ bool ResourceDir::save( Ticket *ticket )
    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;
    }
@@ -266,9 +266,9 @@ bool ResourceDir::lock( const QString &path )
  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;
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
@@ -26,8 +26,10 @@ $Id$
 */
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -43,9 +45,9 @@ 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 );
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
@@ -3,13 +3,13 @@ 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 = \
@@ -29,9 +29,13 @@ win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/xmicrokdepim.lib
-LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/xmicrokcal.lib
-LIBS += ../../../bin/microkde.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,14 +1,14 @@
        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 = \
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
@@ -200,15 +200,15 @@ bool ResourceFile::doOpen()
  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();
@@ -229,9 +229,9 @@ 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;
  }
@@ -310,9 +310,9 @@ bool ResourceFile::save( Ticket *ticket )
      }
  }
  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();
@@ -362,9 +362,9 @@ bool ResourceFile::lock( const QString &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;
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
@@ -27,8 +27,10 @@ $Id$
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -49,9 +51,9 @@ 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 );
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,14 +1,14 @@
        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 = \
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,7 +1,7 @@
        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
@@ -27,9 +27,9 @@ win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/xmicrokdepim.lib
-LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/xmicrokcal.lib
-LIBS += ../../../bin/microkde.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,17 +1,17 @@
        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 += -lxmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -L$(OPIEDIR)/lib
 LIBS += -lopie
 LIBS += -lqpe
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
@@ -2,15 +2,15 @@ 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 += -lxmicrokde 
-#LIBS += -lkamicrokabc
+#LIBS += -lxkamicrokabc
 DEFINES += KAB_EMBEDDED  DESKTOP_VERSION
 INTERFACES = \
@@ -35,9 +35,13 @@ win32: {
 CONFIG += dll
 DEFINES += _WIN32_
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
-LIBS += ../../../bin/microkdepim.lib
+LIBS += ../../../bin/xmicrokdepim.lib
-LIBS += ../../../bin/microkcal.lib
+LIBS += ../../../bin/xmicrokcal.lib
-LIBS += ../../../bin/microkde.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,16 +1,16 @@
        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 += -lxmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 INTERFACES = \
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
@@ -33,9 +33,11 @@ $Id$
 #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>
@@ -70,10 +72,10 @@ void QtopiaConverter::deinit()
 QString QtopiaConverter::categoriesToNumber( const QStringList &list, const QString &app )
 {
 startover:
    QStringList dummy;
-    QValueList<OpieCategories>::ConstIterator catIt;
+    Q3ValueList<OpieCategories>::ConstIterator catIt;
-    QValueList<OpieCategories> categories = m_edit->categories();
+    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;
@@ -191,9 +193,9 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
            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" ) );
@@ -316,9 +318,9 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
          }
    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()) << "\" ";
@@ -483,15 +485,15 @@ CategoryEdit::~CategoryEdit(){
 }
 void CategoryEdit::save(const QString& fileName)const{
    QFile file( fileName );
    QString endl = "\n";
-    if ( file.open( IO_WriteOnly ) ) {
+    if ( file.open( QIODevice::WriteOnly ) ) {
-        QTextStream stream( &file );
+        Q3TextStream stream( &file );
-        stream.setEncoding( QTextStream::UnicodeUTF8 );
+        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() ) << "\" ";
@@ -536,9 +538,9 @@ 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();
@@ -586,9 +588,9 @@ void CategoryEdit::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() ){
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
@@ -27,8 +27,11 @@ $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> 
@@ -75,16 +78,16 @@ class OpieCategories {
        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
@@ -116,9 +119,9 @@ public:
   *
   * @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;};
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
@@ -30,9 +30,9 @@ $Id$
 #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>
@@ -155,9 +155,9 @@ void ResourceQtopia::doClose()
 bool ResourceQtopia::load()
 {
  QFile file( fileName() );
-  if ( !file.open(IO_ReadOnly ) ) {
+  if ( !file.open(QIODevice::ReadOnly ) ) {
    return false;
  }
  QDomDocument doc("mydocument" );
@@ -202,14 +202,14 @@ bool ResourceQtopia::save( Ticket *ticket )
 #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 );
+    Q3TextStream ts( &file );
-    QTextStream *stream = &ts;
+    Q3TextStream *stream = &ts;
-    stream->setEncoding( QTextStream::UnicodeUTF8 );
+    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;
@@ -259,9 +259,9 @@ bool ResourceQtopia::lock( const QString &lockfileName )
  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;
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
@@ -26,8 +26,10 @@ $Id$
 */
 #include <qlabel.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
@@ -45,9 +47,9 @@ 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 );
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,17 +1,17 @@
        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 += -lxmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lxmicrokabc
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokdepim
 LIBS += -lmicroqtcompat
 LIBS += -L$(QPEDIR)/lib
 LIBS += -ljpeg
 LIBS += -lqpe
diff --git a/kabc/secrecy.h b/kabc/secrecy.h
index b2ff565..0fe956e 100644
--- a/kabc/secrecy.h
+++ b/kabc/secrecy.h
@@ -27,9 +27,9 @@ $Id$
 #ifndef KABC_SECRECY_H
 #define KABC_SECRECY_H
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 namespace KABC {
 class Secrecy
@@ -37,9 +37,9 @@ class Secrecy
    friend QDataStream &operator<<( QDataStream &, const Secrecy & );
    friend QDataStream &operator>>( QDataStream &, Secrecy & );
 public:
-  typedef QValueList<int> TypeList;  
+  typedef Q3ValueList<int> TypeList;  
  /**
   * Secrecy types
   *
diff --git a/kabc/sound.h b/kabc/sound.h
index 0ec5ec8..9777054 100644
--- a/kabc/sound.h
+++ b/kabc/sound.h
@@ -27,9 +27,9 @@ $Id$
 #ifndef KABC_SOUND_H
 #define KABC_SOUND_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qstring.h>
 namespace KABC {
diff --git a/kabc/tmpaddressbook.cpp b/kabc/tmpaddressbook.cpp
index cfa57e3..5152e00 100644
--- a/kabc/tmpaddressbook.cpp
+++ b/kabc/tmpaddressbook.cpp
@@ -23,9 +23,9 @@ 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;
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
@@ -23,8 +23,10 @@
 #include <VCardRToken.h>
 #include <VCardAdrParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 AdrParam::AdrParam()
@@ -37,9 +39,9 @@ AdrParam::AdrParam(const AdrParam & x)
                        adrTypeList_(x.adrTypeList_)
 {
 }
-AdrParam::AdrParam(const QCString & s)
+AdrParam::AdrParam(const Q3CString & s)
                :Param(s)
 {
 }
@@ -55,9 +57,9 @@ AdrParam::operator = (AdrParam & x)
        return *this;
 }
        AdrParam &
-AdrParam::operator = (const QCString & s)
+AdrParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        
        adrTypeList_.clear();
@@ -76,9 +78,9 @@ AdrParam::operator == (AdrParam & x)
        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;
@@ -113,9 +115,9 @@ AdrParam::_assemble()
                strRep_ = textParam_;
                return;
        }
        
-        QStrListIterator it(adrTypeList_);
+        Q3StrListIterator it(adrTypeList_);
        
        for (; it.current(); ++it) {
                
                strRep_ += it.current();
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
@@ -24,8 +24,11 @@
 #include <VCardRToken.h>
 #include <VCardAdrValue.h>
 #include <VCardValue.h>
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3StrList>
+#include <Q3CString>
 using namespace VCARD;
 AdrValue::AdrValue()
@@ -44,9 +47,9 @@ AdrValue::AdrValue(const AdrValue & x)
                        countryName_(x.countryName_)
 {
 }
-AdrValue::AdrValue(const QCString & s)
+AdrValue::AdrValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -67,9 +70,9 @@ AdrValue::operator = (AdrValue & x)
        return *this;
 }
        AdrValue &
-AdrValue::operator = (const QCString & s)
+AdrValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
@@ -104,9 +107,9 @@ AdrValue::clone()
 AdrValue::_parse()
 {
        vDebug("AdrValue::_parse()");
-        QStrList l;
+        Q3StrList l;
        RTokenise(strRep_, ";", l);
        
        for (unsigned int i = 0; i < l.count(); i++) {
                
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
@@ -23,8 +23,10 @@
 #include <VCardAgentParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 AgentParam::AgentParam()
@@ -38,9 +40,9 @@ AgentParam::AgentParam(const AgentParam & x)
                        uri_(x.uri_)
 {
 }
-AgentParam::AgentParam(const QCString & s)
+AgentParam::AgentParam(const Q3CString & s)
                :Param(s)
 {
 }
@@ -56,9 +58,9 @@ AgentParam::operator = (AgentParam & x)
        return *this;
 }
        AgentParam &
-AgentParam::operator = (const QCString & s)
+AgentParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
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
@@ -23,8 +23,10 @@
 #include <VCardAgentValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 AgentValue::AgentValue()
@@ -36,9 +38,9 @@ AgentValue::AgentValue(const AgentValue & x)
                :Value(x)
 {
 }
-AgentValue::AgentValue(const QCString & s)
+AgentValue::AgentValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -51,9 +53,9 @@ AgentValue::operator = (AgentValue & x)
        return *this;
 }
        AgentValue &
-AgentValue::operator = (const QCString & s)
+AgentValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -25,8 +25,10 @@
 #include <VCardValue.h>
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 ClassValue::ClassValue()
@@ -39,9 +41,9 @@ ClassValue::ClassValue(const ClassValue & x)
                classType_(x.classType_)
 {
 }
-ClassValue::ClassValue(const QCString & s)
+ClassValue::ClassValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -57,9 +59,9 @@ ClassValue::operator = (ClassValue & x)
        return *this;
 }
        ClassValue &
-ClassValue::operator = (const QCString & s)
+ClassValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -20,10 +20,10 @@
  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 <qstrlist.h>
+#include <q3strlist.h>
 #include <qregexp.h>
 #include <kdebug.h>
@@ -97,9 +97,9 @@ ContentLine::ContentLine(const ContentLine & x)
  }
 }
-ContentLine::ContentLine(const QCString & s)
+ContentLine::ContentLine(const Q3CString & s)
                :Entity(s),
                value_(0),
                paramType_( ParamUnknown ),
                valueType_( ValueUnknown ),
@@ -128,9 +128,9 @@ ContentLine::operator = (ContentLine & x)
        return *this;
 }
        ContentLine &
-ContentLine::operator = (const QCString & s)
+ContentLine::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        delete value_;
        value_ = 0;
@@ -141,9 +141,9 @@ ContentLine::operator = (const QCString & s)
 ContentLine::operator == (ContentLine & x)
 {
        x.parse();
-        QPtrListIterator<Param> it(x.paramList());
+        Q3PtrListIterator<Param> it(x.paramList());
        if (!paramList_.find(it.current()))
                return false;
@@ -162,23 +162,23 @@ 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));
+        Q3CString firstPart(strRep_.left(split));
-        QCString valuePart(strRep_.mid(split + 1));
+        Q3CString valuePart(strRep_.mid(split + 1));
        split = firstPart.find('.');
        if (split != -1) {
@@ -191,9 +191,9 @@ ContentLine::_parse()
        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 !
@@ -213,27 +213,27 @@ ContentLine::_parse()
        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);
+                Q3CString paraName = str.left(split);
-                QCString paraValue = str.mid(split + 1);
+                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;
@@ -308,9 +308,9 @@ ContentLine::_assemble()
 #if 0
        vDebug("Assemble (argl) - my name is \"" + name_ + "\"");
        strRep_.truncate(0);
-        QCString line;
+        Q3CString line;
        if (!group_.isEmpty())
                line += group_ + '.';
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
@@ -23,8 +23,10 @@
 #include <VCardDateParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 DateParam::DateParam()
@@ -36,9 +38,9 @@ DateParam::DateParam(const DateParam & x)
                :Param(x)
 {
 }
-DateParam::DateParam(const QCString & s)
+DateParam::DateParam(const Q3CString & s)
                :Param(s)
 {
 }
@@ -51,9 +53,9 @@ DateParam::operator = (DateParam & x)
        return *this;
 }
        DateParam &
-DateParam::operator = (const QCString & s)
+DateParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
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
@@ -21,8 +21,10 @@
  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>
@@ -104,9 +106,9 @@ DateValue::DateValue(const DateValue & x)
        secFrac_ = x.secFrac_;
        hasTime_ = x.hasTime_;
 }
-DateValue::DateValue(const QCString & s)
+DateValue::DateValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -119,9 +121,9 @@ DateValue::operator = (DateValue & x)
        return *this;
 }
        DateValue &
-DateValue::operator = (const QCString & s)
+DateValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
@@ -153,10 +155,10 @@ DateValue::_parse()
        // [time-secfrac] [time-zone]
        
        int timeSep = strRep_.find('T');
        
-        QCString dateStr;
+        Q3CString dateStr;
-        QCString timeStr;
+        Q3CString timeStr;
        
        if (timeSep == -1) {
                
                dateStr = strRep_;
@@ -172,9 +174,9 @@ DateValue::_parse()
        }
        
        /////////////////////////////////////////////////////////////// DATE
        
-        dateStr.replace(QRegExp("-"), "");
+        dateStr.replace("-", "");
        kdDebug(5710) << "dateStr: " << dateStr << endl;
                year_= dateStr.left(4).toInt();
@@ -195,9 +197,9 @@ DateValue::_parse()
        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();
@@ -210,15 +212,15 @@ DateValue::_parse()
        
        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();
@@ -228,11 +230,11 @@ DateValue::_parse()
 DateValue::_assemble()
 {
        vDebug("DateValue::_assemble");
-        QCString year;
+        Q3CString year;
-        QCString month;
+        Q3CString month;
-        QCString day;
+        Q3CString day;
        
        year.setNum( year_ );
        month.setNum( month_ );
        day.setNum( day_ );
@@ -242,11 +244,11 @@ DateValue::_assemble()
        strRep_ = year + '-' + month + '-' + day;
        if ( hasTime_ ) {
-            QCString hour;
+            Q3CString hour;
-            QCString minute;
+            Q3CString minute;
-            QCString second;
+            Q3CString second;
            hour.setNum( hour_ );
            minute.setNum( minute_ );
            second.setNum( second_ );
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
@@ -23,8 +23,10 @@
 #include <VCardEmailParam.h>
 #include <VCardParam.h>
 #include <VCardDefines.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 EmailParam::EmailParam()
@@ -39,9 +41,9 @@ EmailParam::EmailParam(const EmailParam & x)
                        pref_   (x.pref_)
 {
 }
-EmailParam::EmailParam(const QCString & s)
+EmailParam::EmailParam(const Q3CString & s)
                :Param(s)
 {
 }
@@ -57,9 +59,9 @@ EmailParam::operator = (EmailParam & x)
        return *this;
 }
        EmailParam &
-EmailParam::operator = (const QCString & s)
+EmailParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
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
@@ -21,8 +21,10 @@
  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()
@@ -39,9 +41,9 @@ Entity::Entity(const Entity & e)
 {
        // empty
 }
                
-Entity::Entity(const QCString & s)
+Entity::Entity(const Q3CString & s)
                :       strRep_         (s),
                        parsed_         (false),
                        assembled_(true)
 {
@@ -60,9 +62,9 @@ Entity::operator = (const Entity & e)
        return *this;
 }
                
        Entity &
-Entity::operator = (const QCString & s)
+Entity::operator = (const Q3CString & s)
 {
                strRep_         = s;
                parsed_         = false;
                assembled_= true;
@@ -82,15 +84,15 @@ 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);
 }
                
@@ -98,9 +100,9 @@ Entity::~Entity()
 {
        // empty
 }
                
-        QCString
+        Q3CString
 Entity::asString()
 {
        //vDebug("Entity::asString()");
        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
@@ -20,17 +20,17 @@
  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",
@@ -221,17 +221,17 @@ VCARD::EntityTypeToValueType(EntityType e)
        
        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);
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
@@ -23,8 +23,10 @@
 #include <VCardFloatValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 FloatValue::FloatValue()
@@ -44,9 +46,9 @@ FloatValue::FloatValue(const FloatValue & x)
 {
        value_ = x.value_;
 }
-FloatValue::FloatValue(const QCString & s)
+FloatValue::FloatValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -62,9 +64,9 @@ FloatValue::operator = (FloatValue & x)
        return *this;
 }
        FloatValue &
-FloatValue::operator = (const QCString & s)
+FloatValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
@@ -100,9 +102,9 @@ FloatValue::_parse()
        void
 FloatValue::_assemble()
 {
-        strRep_ = QCString().setNum(value_);
+        strRep_ = Q3CString().setNum(value_);
 }
        float
 FloatValue::value()
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
@@ -22,8 +22,10 @@
 #include <VCardValue.h>
 #include <kdebug.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 GeoValue::GeoValue()
@@ -35,9 +37,9 @@ 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)
 {
 }
@@ -53,9 +55,9 @@ GeoValue::operator = (GeoValue & x)
        return *this;
 }
        GeoValue &
-GeoValue::operator = (const QCString & s)
+GeoValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *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
@@ -23,8 +23,10 @@
 #include <VCardImageParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 ImageParam::ImageParam()
@@ -36,9 +38,9 @@ ImageParam::ImageParam(const ImageParam & x)
                :Param(x)
 {
 }
-ImageParam::ImageParam(const QCString & s)
+ImageParam::ImageParam(const Q3CString & s)
                :Param(s)
 {
 }
@@ -51,9 +53,9 @@ ImageParam::operator = (ImageParam & x)
        return *this;
 }
        ImageParam &
-ImageParam::operator = (const QCString & s)
+ImageParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
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
@@ -23,8 +23,10 @@
 #include <VCardImageValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 ImageValue::ImageValue()
@@ -36,9 +38,9 @@ ImageValue::ImageValue(const ImageValue & x)
                :Value(x)
 {
 }
-ImageValue::ImageValue(const QCString & s)
+ImageValue::ImageValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -51,9 +53,9 @@ ImageValue::operator = (ImageValue & x)
        return *this;
 }
        ImageValue &
-ImageValue::operator = (const QCString & s)
+ImageValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -23,8 +23,10 @@
 #include <VCardImgValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 ImgValue::ImgValue()
@@ -36,9 +38,9 @@ ImgValue::ImgValue(const ImgValue & x)
                :Value(x)
 {
 }
-ImgValue::ImgValue(const QCString & s)
+ImgValue::ImgValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -51,9 +53,9 @@ ImgValue::operator = (ImgValue & x)
        return *this;
 }
        ImgValue &
-ImgValue::operator = (const QCString & s)
+ImgValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -25,8 +25,11 @@
 #include <VCardLangValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <Q3StrList>
 using namespace VCARD;
 LangValue::LangValue()
@@ -38,9 +41,9 @@ LangValue::LangValue(const LangValue & x)
                :Value(x)
 {
 }
-LangValue::LangValue(const QCString & s)
+LangValue::LangValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -53,9 +56,9 @@ LangValue::operator = (LangValue & x)
        return *this;
 }
        LangValue &
-LangValue::operator = (const QCString & s)
+LangValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
@@ -73,9 +76,9 @@ LangValue::~LangValue()
        void
 LangValue::_parse()
 {
-        QStrList l;
+        Q3StrList l;
        RTokenise(strRep_, "-", l);
        
        if (l.count() == 0) return;
        
@@ -90,37 +93,38 @@ LangValue::_parse()
 LangValue::_assemble()
 {
        strRep_ = primary_;
        
-        QStrListIterator it(subtags_);
+        Q3StrListIterator it(subtags_);
        
-        for (; it.current(); ++it)
+        for (; it.current(); ++it) {
-                strRep_ += QCString('-') + it.current();
+                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
@@ -20,9 +20,11 @@
  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>
@@ -45,9 +47,9 @@ NValue::NValue(const NValue & x)
                        suffix_(x.suffix_)
 {
 }
-NValue::NValue(const QCString & s)
+NValue::NValue(const Q3CString & s)
                :Value(s)
 {
        vDebug("ctor");
 }
@@ -67,9 +69,9 @@ NValue::operator = (NValue & x)
        return *this;
 }
        NValue &
-NValue::operator = (const QCString & s)
+NValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
@@ -99,9 +101,9 @@ NValue::clone()
        void
 NValue::_parse()
 {
-        QStrList l;
+        Q3StrList l;
        RTokenise(strRep_, ";", l);
        
        for (unsigned int i = 0; i < l.count(); i++) {
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
@@ -25,8 +25,10 @@
 #include <VCardOrgValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 OrgValue::OrgValue()
@@ -38,9 +40,9 @@ OrgValue::OrgValue(const OrgValue & x)
                :Value(x)
 {
 }
-OrgValue::OrgValue(const QCString & s)
+OrgValue::OrgValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -53,9 +55,9 @@ OrgValue::operator = (OrgValue & x)
        return *this;
 }
        OrgValue &
-OrgValue::operator = (const QCString & s)
+OrgValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
@@ -81,9 +83,9 @@ OrgValue::_parse()
 OrgValue::_assemble()
 {
        bool first(true);
        
-        QStrListIterator it(valueList_);
+        Q3StrListIterator it(valueList_);
        
        for (; it.current(); ++it) {
                if (!first) strRep_ += ';';
                strRep_ += it.current();
@@ -97,9 +99,9 @@ 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
@@ -25,8 +25,10 @@
 #include <VCardEntity.h>
 #include <VCardRToken.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 Param::Param()
@@ -42,9 +44,9 @@ Param::Param(const Param & x)
                value_(x.value_)
 {
 }
-Param::Param(const QCString & s)
+Param::Param(const Q3CString & s)
                :Entity(s),
                name_(""),
                value_("")
 {
@@ -62,9 +64,9 @@ Param::operator = (Param & x)
        return *this;
 }
        Param &
-Param::operator = (const QCString & s)
+Param::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        return *this;
 }
@@ -90,9 +92,9 @@ 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)
 {
@@ -100,30 +102,30 @@ Param::Param(const QCString &name, const QCString &value)
        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
@@ -23,8 +23,10 @@
 #include <VCardPhoneNumberValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 PhoneNumberValue::PhoneNumberValue()
@@ -36,9 +38,9 @@ PhoneNumberValue::PhoneNumberValue(const PhoneNumberValue & x)
                :Value(x)
 {
 }
-PhoneNumberValue::PhoneNumberValue(const QCString & s)
+PhoneNumberValue::PhoneNumberValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -51,9 +53,9 @@ PhoneNumberValue::operator = (PhoneNumberValue & x)
        return *this;
 }
        PhoneNumberValue &
-PhoneNumberValue::operator = (const QCString & s)
+PhoneNumberValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -23,16 +23,16 @@
 */
 #include <string.h>
 #include <stddef.h>
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.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();
        
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
@@ -23,8 +23,10 @@
 #include <VCardSoundValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 SoundValue::SoundValue()
@@ -36,9 +38,9 @@ SoundValue::SoundValue(const SoundValue & x)
                :Value(x)
 {
 }
-SoundValue::SoundValue(const QCString & s)
+SoundValue::SoundValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -51,9 +53,9 @@ SoundValue::operator = (SoundValue & x)
        return *this;
 }
        SoundValue &
-SoundValue::operator = (const QCString & s)
+SoundValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -23,8 +23,10 @@
 #include <VCardSourceParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 SourceParam::SourceParam()
@@ -40,9 +42,9 @@ SourceParam::SourceParam(const SourceParam & x)
                        val_(x.val_)
 {
 }
-SourceParam::SourceParam(const QCString & s)
+SourceParam::SourceParam(const Q3CString & s)
                :Param(s),
                type_(SourceParam::TypeUnknown)
 {
 }
@@ -59,9 +61,9 @@ SourceParam::operator = (SourceParam & x)
        return *this;
 }
        SourceParam &
-SourceParam::operator = (const QCString & s)
+SourceParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
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
@@ -23,8 +23,10 @@
 #include <VCardTelParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TelParam::TelParam()
@@ -36,9 +38,9 @@ TelParam::TelParam(const TelParam & x)
                :Param(x)
 {
 }
-TelParam::TelParam(const QCString & s)
+TelParam::TelParam(const Q3CString & s)
                :Param(s)
 {
 }
@@ -51,9 +53,9 @@ TelParam::operator = (TelParam & x)
        return *this;
 }
        TelParam &
-TelParam::operator = (const QCString & s)
+TelParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
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
@@ -23,8 +23,10 @@
 #include <VCardTelValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TelValue::TelValue()
@@ -36,9 +38,9 @@ TelValue::TelValue(const TelValue & x)
                :Value(x)
 {
 }
-TelValue::TelValue(const QCString & s)
+TelValue::TelValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -51,9 +53,9 @@ TelValue::operator = (TelValue & x)
        return *this;
 }
        TelValue &
-TelValue::operator = (const QCString & s)
+TelValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -23,8 +23,10 @@
 #include <VCardTextBinParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextBinParam::TextBinParam()
@@ -36,9 +38,9 @@ TextBinParam::TextBinParam(const TextBinParam & x)
                :Param(x)
 {
 }
-TextBinParam::TextBinParam(const QCString & s)
+TextBinParam::TextBinParam(const Q3CString & s)
                :Param(s)
 {
 }
@@ -51,9 +53,9 @@ TextBinParam::operator = (TextBinParam & x)
        return *this;
 }
        TextBinParam &
-TextBinParam::operator = (const QCString & s)
+TextBinParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
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
@@ -24,8 +24,10 @@
 #include <kmdcodec.h>
 #include <VCardTextBinValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextBinValue::TextBinValue()
@@ -40,9 +42,9 @@ TextBinValue::TextBinValue(const TextBinValue & x)
  mData_ = x.mData_;
  mUrl_ = x.mUrl_;
 }
-TextBinValue::TextBinValue(const QCString & s)
+TextBinValue::TextBinValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -59,9 +61,9 @@ TextBinValue::operator = (TextBinValue & x)
        return *this;
 }
        TextBinValue &
-TextBinValue::operator = (const QCString & s)
+TextBinValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -25,8 +25,10 @@
 #include <VCardTextListValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextListValue::TextListValue()
@@ -38,9 +40,9 @@ TextListValue::TextListValue(const TextListValue & x)
                :Value(x)
 {
 }
-TextListValue::TextListValue(const QCString & s)
+TextListValue::TextListValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -53,9 +55,9 @@ TextListValue::operator = (TextListValue & x)
        return *this;
 }
        TextListValue &
-TextListValue::operator = (const QCString & s)
+TextListValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
@@ -81,9 +83,9 @@ TextListValue::_parse()
 TextListValue::_assemble()
 {
        bool first(true);
        
-        QStrListIterator it(valueList_);
+        Q3StrListIterator it(valueList_);
        
        for (; it.current(); ++it) {
                if (!first) strRep_ += ';';
                strRep_ += it.current();
@@ -97,9 +99,9 @@ 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
@@ -23,8 +23,10 @@
 #include <VCardTextParam.h>
 #include <VCardParam.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextParam::TextParam()
@@ -36,9 +38,9 @@ TextParam::TextParam(const TextParam & x)
                :Param(x)
 {
 }
-TextParam::TextParam(const QCString & s)
+TextParam::TextParam(const Q3CString & s)
                :Param(s)
 {
 }
@@ -51,9 +53,9 @@ TextParam::operator = (TextParam & x)
        return *this;
 }
        TextParam &
-TextParam::operator = (const QCString & s)
+TextParam::operator = (const Q3CString & s)
 {
        Param::operator = (s);
        return *this;
 }
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
@@ -23,8 +23,10 @@
 #include <VCardTextValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 TextValue::TextValue()
@@ -36,9 +38,9 @@ TextValue::TextValue(const TextValue & x)
                :Value(x)
 {
 }
-TextValue::TextValue(const QCString & s)
+TextValue::TextValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -51,18 +53,18 @@ TextValue::operator = (TextValue & 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()
 {
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
@@ -23,17 +23,19 @@
 #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)
 {
@@ -46,9 +48,9 @@ URIValue::URIValue(const URIValue & x)
                        schemeSpecificPart_(x.schemeSpecificPart_)
 {
 }
-URIValue::URIValue(const QCString & s)
+URIValue::URIValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -64,9 +66,9 @@ URIValue::operator = (URIValue & x)
        return *this;
 }
        URIValue &
-URIValue::operator = (const QCString & s)
+URIValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
@@ -102,31 +104,31 @@ 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
@@ -23,8 +23,10 @@
 #include <VCardUTCValue.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 UTCValue::UTCValue()
@@ -37,9 +39,9 @@ UTCValue::UTCValue(const UTCValue & x)
 {
 }
-UTCValue::UTCValue(const QCString & s)
+UTCValue::UTCValue(const Q3CString & s)
                :Value(s)
 {
 }
@@ -56,9 +58,9 @@ UTCValue::operator = (UTCValue & x)
        return *this;
 }
        UTCValue &
-UTCValue::operator = (const QCString & s)
+UTCValue::operator = (const Q3CString & s)
 {
        Value::operator = (s);
        return *this;
 }
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
@@ -22,8 +22,10 @@
 */
 #include <qregexp.h>
 #include <qdatetime.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardDefines.h>
 #include <VCardVCardEntity.h>
@@ -40,9 +42,9 @@ VCardEntity::VCardEntity(const VCardEntity & x)
 {
  cardList_.setAutoDelete( TRUE );
 }
-VCardEntity::VCardEntity(const QCString & s)
+VCardEntity::VCardEntity(const Q3CString & s)
                :Entity(s)
 {
  cardList_.setAutoDelete( TRUE );
 }
@@ -56,9 +58,9 @@ VCardEntity::operator = (VCardEntity & x)
        return *this;
 }
        VCardEntity &
-VCardEntity::operator = (const QCString & s)
+VCardEntity::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        return *this;
 }
@@ -82,17 +84,17 @@ VCardEntity::_parse()
    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);
@@ -131,9 +133,9 @@ VCardEntity::_parse()
        }
        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();
        }
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
@@ -20,13 +20,13 @@
  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 <qstrlist.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>
@@ -47,17 +47,17 @@ VCard::VCard(const VCard & 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 );
 }
@@ -67,9 +67,9 @@ 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);
    }
@@ -78,9 +78,9 @@ VCard::operator = (VCard & x)
        return *this;
 }
        VCard &
-VCard::operator = (const QCString & s)
+VCard::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        return *this;
 }
@@ -100,17 +100,18 @@ VCard::~VCard()
 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
@@ -179,9 +180,9 @@ VCard::_parse()
                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());
@@ -227,9 +228,9 @@ 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";
@@ -243,9 +244,9 @@ VCard::has(EntityType t)
        return contentLine(t) == 0 ? false : true;
 }
        bool
-VCard::has(const QCString & s)
+VCard::has(const Q3CString & s)
 {
        parse();
        return contentLine(s) == 0 ? false : true;
 }
@@ -258,9 +259,9 @@ VCard::add(const 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);
@@ -269,9 +270,9 @@ VCard::add(const QCString & s)
        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();
@@ -279,12 +280,12 @@ VCard::contentLine(EntityType t)
        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();
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
@@ -22,8 +22,10 @@
 */
 #include <VCardEntity.h>
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 using namespace VCARD;
 Value::Value()
@@ -35,9 +37,9 @@ Value::Value(const Value & x)
                :Entity(x)
 {
 }
-Value::Value(const QCString & s)
+Value::Value(const Q3CString & s)
                :Entity(s)
 {
 }
@@ -50,9 +52,9 @@ Value::operator = (Value & x)
        return *this;
 }
        Value &
-Value::operator = (const QCString & s)
+Value::operator = (const Q3CString & s)
 {
        Entity::operator = (s);
        return *this;
 }
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
@@ -23,10 +23,10 @@
 #ifndef  ADRPARAM_H
 #define  ADRPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <VCardParam.h>
 namespace VCARD
@@ -36,18 +36,18 @@ 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,
@@ -55,10 +55,10 @@ class AdrParam : public Param
        };
        
        private:
                
-                        QStrListadrTypeList_;
+                        Q3StrListadrTypeList_;
-                        QCStringtextParam_;
+                        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
@@ -23,9 +23,11 @@
 #ifndef  ADRVALUE_H
 #define  ADRVALUE_H
-#include <qstrlist.h>
+#include <q3strlist.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <VCardValue.h>
 namespace VCARD
 {
@@ -36,46 +38,46 @@ 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_;}
+                Q3CString poBox()       { parse(); return poBox_;}
-                QCString extAddress()   { parse(); return extAddress_;}
+                Q3CString extAddress()  { parse(); return extAddress_;}
-                QCString street()       { parse(); return street_;}
+                Q3CString street()      { parse(); return street_;}
-                QCString locality()     { parse(); return locality_;}
+                Q3CString locality()    { parse(); return locality_;}
-                QCString region()       { parse(); return region_;}
+                Q3CString region()      { parse(); return region_;}
-                QCString postCode()     { parse(); return postCode_;}
+                Q3CString postCode()    { parse(); return postCode_;}
-                QCString countryName()  { parse(); return countryName_;}
+                Q3CString countryName()         { parse(); return countryName_;}
        
        private:
                
-                QCString poBox_;
+                Q3CString poBox_;
-                QCString extAddress_;
+                Q3CString extAddress_;
-                QCString street_;
+                Q3CString street_;
-                QCString locality_;
+                Q3CString locality_;
-                QCString region_;
+                Q3CString region_;
-                QCString postCode_;
+                Q3CString postCode_;
-                QCString countryName_;
+                Q3CString countryName_;
 };
 }
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
@@ -23,9 +23,9 @@
 #ifndef  AGENTPARAM_H
 #define  AGENTPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 #include <VCardURIValue.h>
@@ -45,9 +45,9 @@ class AgentParam : public Param
        
        void setRefer(bool b)
        { refer_ = b; assembled_ = false; }
-        void setURI(const QCString & s)
+        void setURI(const Q3CString & s)
        { uri_ = s; assembled_ = false; }
        
        private:
                
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
@@ -23,9 +23,9 @@
 #ifndef  AGENTVALUE_H
 #define  AGENTVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
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
@@ -23,9 +23,9 @@
 #ifndef  CLASSVALUE_H
 #define  CLASSVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 #include <kdebug.h>
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
@@ -23,9 +23,11 @@
 #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"
@@ -38,20 +40,20 @@ class ContentLine : public Entity
 {
 #include "ContentLine-generated.h"
        
-                QCString        group()                 { parse(); return group_;}
+                Q3CString       group()                 { parse(); return group_;}
-                QCString        name()          { parse(); return name_;}
+                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; }
@@ -62,11 +64,11 @@ class ContentLine : public Entity
                void clear      ();
        
        private:
                
-                        QCString        group_;
+                        Q3CString       group_;
-                        QCString        name_;
+                        Q3CString       name_;
-                        QPtrList<Param>         paramList_;
+                        Q3PtrList<Param>        paramList_;
                        Value           * value_;
                
                        ParamType       paramType_;
                        ValueType       valueType_;
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
@@ -23,9 +23,9 @@
 #ifndef  DATEPARAM_H
 #define  DATEPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
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
@@ -23,9 +23,9 @@
 #ifndef  DATEVALUE_H
 #define  DATEVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qdatetime.h>
 #include <VCardValue.h>
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
@@ -34,16 +34,16 @@
 #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
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
@@ -23,9 +23,9 @@
 #ifndef  EMAILPARAM_H
 #define  EMAILPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
@@ -35,20 +35,20 @@ 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_;
 };
 }
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
@@ -23,9 +23,9 @@
 #ifndef  ENTITY_H
 #define  ENTITY_H
-#include <qcstring.h>
+#include <q3cstring.h>
 namespace VCARD
 {
@@ -34,21 +34,21 @@ 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 Q3CString & s);
-                virtual bool operator != (const QCString & s);
+                virtual bool operator != (const Q3CString & s);
                
                virtual ~Entity();
                
-                QCString asString();
+                Q3CString asString();
                
                virtual void parse();
                virtual void assemble();
                
@@ -56,9 +56,9 @@ class Entity
                virtual void _assemble() = 0;
        
        protected:
                
-                QCString strRep_;
+                Q3CString strRep_;
                bool parsed_;
                bool assembled_;
 };
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
@@ -23,14 +23,14 @@
 #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,
@@ -107,10 +107,10 @@ enum ParamType {
 extern const ParamType paramTypesTable[];
 ParamType EntityTypeToParamType(EntityType);
 ValueType EntityTypeToValueType(EntityType);
-QCString EntityTypeToParamName(EntityType);
+Q3CString EntityTypeToParamName(EntityType);
-EntityType EntityNameToEntityType(const QCString &);
+EntityType EntityNameToEntityType(const Q3CString &);
 char * encodeBase64(const char *, unsigned long, unsigned long &);
 char * decodeBase64(const char *, unsigned long, unsigned long &);
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
@@ -23,9 +23,9 @@
 #ifndef  FLOATVALUE_H
 #define  FLOATVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
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
@@ -23,9 +23,9 @@
 #ifndef  IMGPARAM_H
 #define  IMGPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
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
@@ -23,9 +23,9 @@
 #ifndef  IMAGEVALUE_H
 #define  IMAGEVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
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
@@ -23,10 +23,10 @@
 #ifndef  LANGVALUE_H
 #define  LANGVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <VCardValue.h>
 namespace VCARD
@@ -35,16 +35,16 @@ namespace VCARD
 class LangValue : public Value
 {
 #include "LangValue-generated.h"
        
-        QCString primary();
+        Q3CString primary();
-        QStrList subtags();
+        Q3StrList subtags();
        
-                void setPrimary(const QCString &);
+                void setPrimary(const Q3CString &);
-        void setSubTags(const QStrList &);
+        void setSubTags(const Q3StrList &);
        
-        QCString primary_;
+        Q3CString primary_;
-        QStrList subtags_;
+        Q3StrList subtags_;
 };
 }
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
@@ -24,8 +24,10 @@
 #ifndef  NVALUE_H
 #define  NVALUE_H
 #include <VCardValue.h>
+//Added by qt3to4:
+#include <Q3CString>
 namespace VCARD
 {
@@ -33,23 +35,23 @@ class NValue : public Value
 {
 #include "NValue-generated.h"
        NValue *clone();
-                QCString family()       { parse(); return family_;}
+                Q3CString family()      { parse(); return family_;}
-                QCString given()        { parse(); return given_;}
+                Q3CString given()       { parse(); return given_;}
-                QCString middle()       { parse(); return middle_;}
+                Q3CString middle()      { parse(); return middle_;}
-                QCString prefix()       { parse(); return prefix_;}
+                Q3CString prefix()      { parse(); return prefix_;}
-                QCString suffix()       { parse(); return suffix_;}
+                Q3CString suffix()      { parse(); return suffix_;}
-                void setFamily  (const QCString & s) { family_= s; assembled_ = false; }
+                void setFamily  (const Q3CString & s) { family_= s; assembled_ = false; }
-                void setGiven   (const QCString & s) { given_= s; assembled_ = false; }
+                void setGiven   (const Q3CString & s) { given_= s; assembled_ = false; }
-                void setMiddle  (const QCString & s) { middle_= s; assembled_ = false; }
+                void setMiddle  (const Q3CString & s) { middle_= s; assembled_ = false; }
-                void setPrefix  (const QCString & s) { prefix_= s; assembled_ = false; }
+                void setPrefix  (const Q3CString & s) { prefix_= s; assembled_ = false; }
-                void setSuffix  (const QCString & s) { suffix_= 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_;
 };
 }
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
@@ -23,10 +23,10 @@
 #ifndef  ORGVALUE_H
 #define  ORGVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qstrlist.h>
+#include <q3strlist.h>
 #include <VCardValue.h>
 namespace VCARD
@@ -37,13 +37,13 @@ class OrgValue : public Value
        
 #include "OrgValue-generated.h"
        
        unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
        
        private:
                
-                QStrList valueList_;
+                Q3StrList valueList_;
 };
 }
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
@@ -23,10 +23,10 @@
 #ifndef  PARAM_H
 #define  PARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <VCardEntity.h>
 namespace VCARD
@@ -36,24 +36,24 @@ 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 setName(const Q3CString &);
-        void setValue(const QCString &);
+        void setValue(const Q3CString &);
                
-        QCString name();
+        Q3CString name();
-        QCString value();
+        Q3CString value();
        
        private:
                
-                QCString name_;
+                Q3CString name_;
-                QCString value_;
+                Q3CString value_;
 };
-typedef QPtrList<Param> ParamList;
+typedef Q3PtrList<Param> ParamList;
-typedef QPtrListIterator<Param> ParamListIterator;
+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
@@ -24,14 +24,14 @@
 #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
@@ -23,9 +23,9 @@
 #ifndef  SOUNDVALUE_H
 #define  SOUNDVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
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
@@ -23,9 +23,9 @@
 #ifndef  SOURCEPARAM_H
 #define  SOURCEPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
@@ -38,20 +38,20 @@ class SourceParam : public Param
        
        enum SourceParamType { TypeUnknown, TypeValue, TypeContext, TypeX };
        
                        SourceParamType type(){ parse(); return type_;}
-                        QCString par()          { parse(); return par_; }
+                        Q3CString par()                 { parse(); return par_; }
-                        QCString val()          { parse(); return val_; }
+                        Q3CString val()                 { parse(); return val_; }
                
                        void setType(SourceParamType t) { type_= t; assembled_ = false; }
-                        void setPar(const QCString & s) { par_= s; assembled_ = false; }
+                        void setPar(const Q3CString & s) { par_= s; assembled_ = false; }
-                        void setVal(const QCString & s) { val_= 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
 };
 }
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
@@ -23,9 +23,11 @@
 #ifndef  TELPARAM_H
 #define  TELPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
+//Added by qt3to4:
+#include <Q3PtrList>
 #include <VCardParam.h>
 namespace VCARD
@@ -42,9 +44,9 @@ class TelParam : public Param
        };
        
        private:
                
-                QPtrList<TelType> types_;
+                Q3PtrList<TelType> types_;
 };
 }
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
@@ -23,9 +23,9 @@
 #ifndef  TELVALUE_H
 #define  TELVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
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
@@ -23,9 +23,9 @@
 #ifndef  TEXTBINPARAM_H
 #define  TEXTBINPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
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
@@ -23,9 +23,9 @@
 #ifndef  TEXTBINVALUE_H
 #define  TEXTBINVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
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
@@ -23,11 +23,11 @@
 #ifndef  TEXTLISTVALUE_H
 #define  TEXTLISTVALUE_H
-#include <qstrlist.h>
+#include <q3strlist.h>
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
@@ -38,13 +38,13 @@ class TextListValue : public Value
        
 #include "TextListValue-generated.h"
        
        unsigned int numValues();
-        QCString value(unsigned int);
+        Q3CString value(unsigned int);
        
        private:
                
-                QStrList valueList_;
+                Q3StrList valueList_;
 };
 }
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
@@ -23,9 +23,9 @@
 #ifndef  TEXTPARAM_H
 #define  TEXTPARAM_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardParam.h>
 namespace VCARD
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
@@ -24,28 +24,30 @@
 #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();
+        Q3CString scheme();
-        QCString schemeSpecificPart();
+        Q3CString schemeSpecificPart();
        
-                void setScheme                  (const QCString &);
+                void setScheme                  (const Q3CString &);
-                void setSchemeSpecificPart(const QCString &);
+                void setSchemeSpecificPart(const Q3CString &);
        
        private:
        
-                QCString scheme_;
+                Q3CString scheme_;
-                QCString schemeSpecificPart_;
+                Q3CString schemeSpecificPart_;
 };
 }
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
@@ -23,9 +23,9 @@
 #ifndef  UTCVALUE_H
 #define  UTCVALUE_H
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <VCardValue.h>
 namespace VCARD
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
@@ -24,9 +24,11 @@
 #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>
@@ -39,24 +41,24 @@ 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_;
+                Q3CString       group_;
-                QPtrList<ContentLine>contentLineList_;
+                Q3PtrList<ContentLine>contentLineList_;
 };
 }
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
@@ -24,19 +24,19 @@
 #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 Q3PtrList<VCard> VCardList;
-typedef QPtrListIterator<VCard> VCardListIterator;
+typedef Q3PtrListIterator<VCard> VCardListIterator;
 class VCardEntity : public Entity
 {
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
@@ -23,9 +23,9 @@
 #ifndef  VALUE_H
 #define  VALUE_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <VCardEntity.h>
 namespace VCARD
@@ -37,10 +37,10 @@ class Value : public Entity
        virtual Value *clone() { return new Value( *this ); }
 };
-typedef QPtrList<Value> ValueList;
+typedef Q3PtrList<Value> ValueList;
-typedef QPtrListIterator<Value> ValueListIterator;
+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,16 +1,18 @@
+//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 Q3CString& s) {AdrParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~AdrParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {AdrValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~AdrValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {AgentParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~AgentParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {AgentValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~AgentValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {ClassValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ClassValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {ContentLine a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ContentLine();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {DateParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~DateParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {DateValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~DateValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {EmailParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~EmailParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {FloatValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~FloatValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {GeoValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~GeoValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {Group a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~Group();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {ImageParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ImageParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {ImageValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ImageValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {ImgParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ImgParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {ImgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~ImgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {LangValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~LangValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {NValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~NValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {V_Name a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~V_Name();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {OrgValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~OrgValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {Param a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~Param();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {V_ParamName a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~V_ParamName();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {V_ParamValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~V_ParamValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {PhoneNumberValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~PhoneNumberValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {SoundValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~SoundValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {SourceParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~SourceParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {TelParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TelParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {TelValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TelValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {TextBinParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextBinParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {TextBinValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextBinValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {TextListValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextListValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {TextNSParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextNSParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {TextParam a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextParam();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {TextValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~TextValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {URIValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~URIValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {UTCValue a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~UTCValue();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {VCard a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~VCard();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {VCardEntity a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~VCardEntity();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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,16 +1,18 @@
+//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 Q3CString& s) {Value a(s);return(*this==a);} 
-bool operator != (const QCString& s) {return !(*this == s);}
+bool operator != (const Q3CString& s) {return !(*this == s);}
 virtual ~Value();
 void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
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
@@ -2,9 +2,11 @@
 #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;
@@ -17,16 +19,16 @@ int main(int argc, char * argv[])
        }
        
        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';
        
@@ -51,9 +53,9 @@ int main(int argc, char * argv[])
                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;
                }
                
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
@@ -4,8 +4,10 @@
 #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");
@@ -32,9 +34,9 @@ int main(int argc,char **argv)
  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
@@ -26,8 +26,10 @@ $Id$
 */
 #include <qmap.h>
 #include <qregexp.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <kmdcodec.h>
 #include "vcard21parser.h"
 #include "vcardconverter.h"
@@ -44,9 +46,9 @@ bool VCardLineX::isValid() const
    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)   ||
@@ -268,9 +270,9 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
  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 ) )
@@ -307,9 +309,9 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
    }
  }
  addressee.makePhoneNumbersOLcompatible();
  //set the addressee's addresses
-  for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
+  for ( Q3ValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
    if ( (*i).name == VCARD_ADR ) {
      int type = 0;
      if ( (*i).qualified ) {
        if ( (*i).qualifiers.contains( VCARD_ADR_DOM ) )
@@ -326,9 +328,12 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
          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
@@ -407,12 +412,12 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
 {
  int _err = 0;
  int _state = VC_STATE_BEGIN;
-  QValueList<VCardLineX> *_vcdata;
+  Q3ValueList<VCardLineX> *_vcdata;
-  QValueList<QString> lines;
+  QStringList lines;
-  _vcdata = new QValueList<VCardLineX>;
+  _vcdata = new Q3ValueList<VCardLineX>;
  lines = QStringList::split( QRegExp( "[\x0d\x0a]" ), vc );
  // for each line in the vCard
@@ -500,10 +505,10 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
          }
        }
        _vcl.parameters = QStringList::split( ';', value, true );
        if ( qp ) { // decode the quoted printable
-          for ( QStringList::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
+          for ( QLinkedList<QString>::Iterator z = _vcl.parameters.begin(); z != _vcl.parameters.end(); ++z )
-            *z = KCodecs::quotedPrintableDecode( (*z).latin1() );
+            *z = KCodecs::quotedPrintableDecode( (Q3CString)(*z).latin1() );
        }
      }
    } else {
      _err = VC_ERR_INTERNAL;
@@ -542,9 +547,9 @@ VCard21ParserImpl *VCard21ParserImpl::parseVCard( const QString& vc, int *err )
  return new VCard21ParserImpl( _vcdata );
 }
-VCard21ParserImpl::VCard21ParserImpl(QValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
+VCard21ParserImpl::VCard21ParserImpl(Q3ValueList<VCardLineX> *_vcd) : _vcdata(_vcd)
 {
 }
@@ -553,9 +558,9 @@ QString VCard21ParserImpl::getValue(const QString& name, const QString& qualifie
  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;
@@ -569,9 +574,9 @@ 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;
@@ -583,11 +588,12 @@ QString VCard21ParserImpl::getValue(const QString& name)
 QStringList VCard21ParserImpl::getValues(const QString& name)
 {
  const QString lowname = name.lower();
-  for (QValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
+  for (Q3ValueListIterator<VCardLineX> i = _vcdata->begin();i != _vcdata->end();++i) {
-    if ((*i).name == lowname && !(*i).qualified)
+    if ((*i).name == lowname && !(*i).qualified) {
-      return (*i).parameters;
+      return QStringList( (*i).parameters );
+    }
  }
  // failed.
  return QStringList();
 }
@@ -595,11 +601,11 @@ QStringList VCard21ParserImpl::getValues(const QString& name)
 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
@@ -33,9 +33,9 @@ $Id$
 #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"
@@ -195,10 +195,10 @@ class VCardLineX
 {
 public:
  QString name;
  bool qualified;
-  QValueList<QString> qualifiers;
+  Q3ValueList<QString> qualifiers;
-  QValueList<QString> parameters;
+  Q3ValueList<QString> parameters;
  bool isValid() const;
 };
 /**
@@ -216,11 +216,11 @@ public:
  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
@@ -27,8 +27,11 @@ $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>
@@ -53,9 +56,9 @@ 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() );
@@ -74,9 +77,9 @@ bool VCardFormatImpl::load( Addressee &addressee, QFile *file )
 #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() );
@@ -107,9 +110,9 @@ void VCardFormatImpl::save( const Addressee &addressee, QFile *file )
  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 )
@@ -128,13 +131,13 @@ void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file
 }
 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 ) ),
@@ -218,9 +221,9 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
        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 ) );
@@ -529,9 +532,9 @@ 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;
@@ -608,9 +611,9 @@ PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
  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;
@@ -869,9 +872,9 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty
  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" ) );
@@ -958,9 +961,9 @@ void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, co
    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>" ) );
    }
@@ -990,9 +993,9 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
  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 {
diff --git a/kabc/vcardformatplugin.cpp b/kabc/vcardformatplugin.cpp
index 8db8c11..0b97a08 100644
--- a/kabc/vcardformatplugin.cpp
+++ b/kabc/vcardformatplugin.cpp
@@ -60,9 +60,9 @@ void VCardFormatPlugin::saveAll( AddressBook *addressBook, Resource *resource, Q
 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
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
@@ -23,16 +23,16 @@
 #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 };
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
@@ -18,8 +18,10 @@
    Boston, MA 02111-1307, USA.
 */
 #include "vcardline.h"
+//Added by qt3to4:
+#include <Q3CString>
 using namespace KABC;
 class VCardLine::VCardLinePrivate
@@ -42,9 +44,9 @@ VCardLine::VCardLine( const QString &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 )
@@ -85,9 +87,9 @@ QString VCardLine::identifier() const
 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() );
 }
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
@@ -21,10 +21,10 @@
 #ifndef VCARDLINE_H
 #define VCARDLINE_H
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
-#include <qcstring.h>
+#include <q3cstring.h>
 #include <qvariant.h>
 #include <qmap.h>
 #include <qstring.h>
@@ -32,9 +32,9 @@ namespace KABC {
 class VCardLine
 {
  public:
-    typedef QValueList<VCardLine> List;
+    typedef Q3ValueList<VCardLine> List;
    typedef QMap<QString, QStringList> ParamMap;
    VCardLine();
    VCardLine( const QString &identifier );
@@ -58,9 +58,9 @@ class VCardLine
    /**
     * 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.
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
@@ -217,9 +217,9 @@ QString VCardParser::createVCards( const VCard::List& list )
            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" ) );
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
@@ -651,9 +651,9 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi
  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" );