98 files changed, 1095 insertions, 882 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp
index 3dcd592..83908d0 100644
--- a/kaddressbook/addresseditwidget.cpp
+++ b/kaddressbook/addresseditwidget.cpp
@@ -1,216 +1,223 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
                  2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcheckbox.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
-#include <qsignal.h>
+#include <q3signal.h>
 #include <qstring.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+#include <Q3VBoxLayout>
+#include <Q3GridLayout>
 #ifndef KAB_EMBEDDED    
-#include <qtextedit.h>
+#include <q3textedit.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3VBoxLayout>
 #include <kaccelmanager.h>
 #include <kbuttonbox.h>
 #else //KAB_EMBEDDED    
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif //KAB_EMBEDDED    
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
 #include "addresseditwidget.h"
 AddressEditWidget::AddressEditWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
    mConfig = AddresseeConfig::instance();
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
  layout->setSpacing( KDialog::spacingHintSmall() );
-  QHBox *b1 = new QHBox( this);
+  Q3HBox *b1 = new Q3HBox( this);
  //QLabel * label = new QLabel( b1 );
  //label->setPixmap( KGlobal::iconLoader()->loadIcon( "gohome", KIcon::Desktop, 0 ) );
  
 
  //label->setAlignment( AlignCenter);
  layout->addWidget( b1 ); 
  mTypeCombo = new AddressTypeCombo( mAddressList, b1 );
 QPushButton *editButton = new QPushButton( i18n( "&Edit Addresses..." ),
                                             b1 );
  connect( mTypeCombo, SIGNAL( activated( int ) ),
           SLOT( updateAddressEdit() ) );
  // layout->addWidget( mTypeCombo );
 #ifndef KAB_EMBEDDED    
-  mAddressTextEdit = new QTextEdit( this );
+  mAddressTextEdit = new Q3TextEdit( this );
  mAddressTextEdit->setReadOnly( true );
  mAddressTextEdit->setMinimumHeight( 20 );
 #else //KAB_EMBEDDED    
-  mAddressTextEdit = new QMultiLineEdit( this );
+  mAddressTextEdit = new Q3MultiLineEdit( this );
  mAddressTextEdit->setReadOnly( true );
  mAddressTextEdit->setMinimumHeight( 20 );
 #endif //KAB_EMBEDDED    
  
  layout->addWidget( mAddressTextEdit );
  
  connect( editButton, SIGNAL( clicked() ), SLOT( edit() ) );
 }
 AddressEditWidget::~AddressEditWidget()
 { 
   
 }
 KABC::Address::List AddressEditWidget::addresses()
 {
  KABC::Address::List retList;
  KABC::Address::List::Iterator it;
  for ( it = mAddressList.begin(); it != mAddressList.end(); ++it )
    if ( !(*it).isEmpty() )
      retList.append( *it );
  return retList;
 }
 void AddressEditWidget::setAddresses( const KABC::Addressee &addr,
                                      const KABC::Address::List &list )
 {
  mAddressee = addr;
  mAddressList.clear();
  // Insert types for existing numbers.
  mTypeCombo->insertTypeList( list );
-  QValueList<int> defaultTypes;
+  Q3ValueList<int> defaultTypes;
  defaultTypes << KABC::Address::Home;
  defaultTypes << KABC::Address::Work;
  mConfig->setUid( mAddressee.uid() );
-  QValueList<int> configList = mConfig->noDefaultAddrTypes();
+  Q3ValueList<int> configList = mConfig->noDefaultAddrTypes();
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
  for ( it = configList.begin(); it != configList.end(); ++it )
    defaultTypes.remove( *it );
  // Insert default types.
  // Doing this for mPrefCombo is enough because the list is shared by all
  // combos.
  for( it = defaultTypes.begin(); it != defaultTypes.end(); ++it ) {
    if ( !mTypeCombo->hasType( *it ) )
      mTypeCombo->insertType( list, *it, Address( *it ) );
  }
  mTypeCombo->updateTypes();
  // find preferred address which will be shown
  int preferred = KABC::Address::Home;  // default if no preferred address set
  uint i;
  for (i = 0; i < list.count(); i++)
    if ( list[i].type() & KABC::Address::Pref ) {
      preferred = list[i].type();
      break;
    }
  mTypeCombo->selectType( preferred );
  updateAddressEdit();
 }
 void AddressEditWidget::edit()
 {
  AddressEditDialog dialog( mAddressList, mTypeCombo->currentItem(), this );
  if ( dialog.exec() ) {
    if ( dialog.changed() ) {
      mAddressList = dialog.addresses();
      bool hasHome = false, hasWork = false;
      KABC::Address::List::Iterator it;
      for ( it = mAddressList.begin(); it != mAddressList.end(); ++it ) {
        if ( (*it).type() == KABC::Address::Home ) {
          if ( !(*it).isEmpty() )
            hasHome = true;
        }
        if ( (*it).type() == KABC::Address::Work ) {
          if ( !(*it).isEmpty() )
            hasWork = true;
        }
      }
      mConfig->setUid( mAddressee.uid() );
-      QValueList<int> configList;
+      Q3ValueList<int> configList;
      if ( !hasHome ) {
        configList << KABC::Address::Home;
      }
      if ( !hasWork ) {
        configList << KABC::Address::Work;
      }
      mConfig->setNoDefaultAddrTypes( configList );
      mTypeCombo->updateTypes();
      updateAddressEdit();
      emit modified();
    }
  }
 }
 void AddressEditWidget::updateAddressEdit()
 {
  KABC::Address::List::Iterator it = mTypeCombo->selectedElement();
  bool block = signalsBlocked();
  blockSignals( true );
  mAddressTextEdit->setText( "" );
  if ( it != mAddressList.end() ) {
    KABC::Address a = *it;
    if ( !a.isEmpty() ) {
 #if  KDE_VERSION >= 319
      if ( a.type() & KABC::Address::Work ) {
        mAddressTextEdit->setText( a.formattedAddress( mAddressee.realName(),
                                   mAddressee.organization() ) );
      } else {
@@ -226,128 +233,128 @@ void AddressEditWidget::updateAddressEdit()
      text += a.locality() + QString(" ") + a.region();
      if ( !a.postalCode().isEmpty() )
        text += QString(", ") + a.postalCode();
      text += "\n";
      if ( !a.country().isEmpty() )
        text += a.country() + "\n";
      text += a.extended();
      mAddressTextEdit->setText( text );      
 #endif
    }
  }
  blockSignals( block );
 }
 AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
                                      int selected, QWidget *parent,
                                      const char *name )
  : KDialogBase( Plain, i18n( "Edit Address" ), Ok | Cancel, Ok,
                 parent, name, true, true ),
    mPreviousAddress( 0 )
 {
  mAddressList = list;
  QWidget *page = plainPage();
-  QGridLayout *topLayout = new QGridLayout( page, 8, 2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 8, 2 );
  topLayout->setSpacing( spacingHintSmall() );
  mTypeCombo = new AddressTypeCombo( mAddressList, page );
  topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 );
  QLabel *label = new QLabel( i18n( "Street:" ), page );
  label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
  topLayout->addWidget( label, 1, 0 );
  
 #ifndef KAB_EMBEDDED    
-  mStreetTextEdit = new QTextEdit( page );
+  mStreetTextEdit = new Q3TextEdit( page );
 #else //KAB_EMBEDDED    
-  mStreetTextEdit = new QMultiLineEdit( page );
+  mStreetTextEdit = new Q3MultiLineEdit( page );
 //US qDebug("AddressEditDialog::AddressEditDialog has to be changed");
 #endif //KAB_EMBEDDED    
  
  label->setBuddy( mStreetTextEdit );
  topLayout->addWidget( mStreetTextEdit, 1, 1 );
  label = new QLabel( i18n( "Post office box:" ), page );
  topLayout->addWidget( label, 2 , 0 );
  mPOBoxEdit = new KLineEdit( page );
  label->setBuddy( mPOBoxEdit );
  topLayout->addWidget( mPOBoxEdit, 2, 1 );
  int maxwid = QApplication::desktop()->width();
  maxwid -= (spacingHintSmall()+label->sizeHint().width() );
  label = new QLabel( i18n( "Locality:" ), page );
  topLayout->addWidget( label, 3, 0 );
  mLocalityEdit = new KLineEdit( page );
  label->setBuddy( mLocalityEdit );
  topLayout->addWidget( mLocalityEdit, 3, 1 );
  label = new QLabel( i18n( "Region:" ), page );
  topLayout->addWidget( label, 4, 0 );
  mRegionEdit = new KLineEdit( page );
  label->setBuddy( mRegionEdit );
  topLayout->addWidget( mRegionEdit, 4, 1 );
  label = new QLabel( i18n( "Postal code:" ), page );
  topLayout->addWidget( label, 5, 0 );
  mPostalCodeEdit = new KLineEdit( page );
  label->setBuddy( mPostalCodeEdit );
  topLayout->addWidget( mPostalCodeEdit, 5, 1 );
  label = new QLabel( i18n( "Country:" ), page );
  topLayout->addWidget( label, 6, 0 );
  mCountryCombo = new KComboBox( page );
 
  mCountryCombo->setMaximumWidth( maxwid -10 );
  mCountryCombo->setEditable( true );
  mCountryCombo->setDuplicatesEnabled( false );
  mCountryCombo->setAutoCompletion( true );
  fillCountryCombo();
  label->setBuddy( mCountryCombo );
  topLayout->addWidget( mCountryCombo, 6, 1 );
-  mCountryCombo->setSizeLimit( 8);
+  mCountryCombo->setMaxVisibleItems( 8);
  mPreferredCheckBox = new QCheckBox( i18n( "This is the preferred address" ), page );
  topLayout->addMultiCellWidget( mPreferredCheckBox, 7, 7, 0, 1 );
  /*
  KSeparator *sep = new KSeparator( KSeparator::HLine, page );
  topLayout->addMultiCellWidget( sep, 8, 8, 0, 1 );
  */
-  QHBox *buttonBox = new QHBox( page );
+  Q3HBox *buttonBox = new Q3HBox( page );
  buttonBox->setSpacing( spacingHint() );
  topLayout->addMultiCellWidget( buttonBox, 9, 9, 0, 1 );
  QPushButton *addButton = new QPushButton( i18n( "New..." ), buttonBox );
  connect( addButton, SIGNAL( clicked() ), SLOT( addAddress() ) );
  mRemoveButton = new QPushButton( i18n( "Remove" ), buttonBox );
  connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeAddress() ) );
  mChangeTypeButton = new QPushButton( i18n( "Change Type" ), buttonBox );
  connect( mChangeTypeButton, SIGNAL( clicked() ), SLOT( changeType() ) );
  mTypeCombo->updateTypes();
  mTypeCombo->setCurrentItem( selected );
  updateAddressEdits();
  connect( mTypeCombo, SIGNAL( activated( int ) ),
           SLOT( updateAddressEdits() ) );
  connect( mStreetTextEdit, SIGNAL( textChanged() ), SLOT( modified() ) );
  connect( mPOBoxEdit, SIGNAL( textChanged( const QString& ) ), SLOT( modified() ) );
  connect( mLocalityEdit, SIGNAL( textChanged( const QString& ) ), SLOT( modified() ) );
  connect( mRegionEdit, SIGNAL( textChanged( const QString& ) ), SLOT( modified() ) );
  connect( mPostalCodeEdit, SIGNAL( textChanged( const QString& ) ), SLOT( modified() ) );
  connect( mCountryCombo, SIGNAL( textChanged( const QString& ) ), SLOT( modified() ) );
  connect( mPreferredCheckBox, SIGNAL( toggled( bool ) ), SLOT( modified() ) );
 #ifndef KAB_EMBEDDED    
  KAcceleratorManager::manage( this );
 #else //KAB_EMBEDDED    
 //US qDebug("AddressEditDialog::AddressEditDialog has to be changed 2");
 #endif //KAB_EMBEDDED    
@@ -554,69 +561,69 @@ void AddressEditDialog::fillCountryCombo()
    i18n( "Sri Lanka" ), i18n( "St. Kitts and Nevis" ), i18n( "Sudan" ),
    i18n( "Suriname" ), i18n( "Swaziland" ), i18n( "Sweden" ),
    i18n( "Switzerland" ), i18n( "Syria" ), i18n( "Taiwan" ),
    i18n( "Tajikistan" ), i18n( "Tanzania" ), i18n( "Thailand" ),
    i18n( "Tibet" ), i18n( "Togo" ), i18n( "Tonga" ),
    i18n( "Trinidad and Tobago" ), i18n( "Tunisia" ), i18n( "Turkey" ),
    i18n( "Turkmenistan" ), i18n( "Turks and Caicos Islands" ),
    i18n( "Tuvalu" ), i18n( "Uganda " ), i18n( "Ukraine" ),
    i18n( "United Arab Emirates" ), i18n( "United Kingdom" ),
    i18n( "United States" ), i18n( "Uruguay" ), i18n( "Uzbekistan" ),
    i18n( "Vanuatu" ), i18n( "Vatican City" ), i18n( "Venezuela" ),
    i18n( "Vietnam" ), i18n( "Western Samoa" ), i18n( "Yemen" ),
    i18n( "Yugoslavia" ), i18n( "Zaire" ), i18n( "Zambia" ),
    i18n( "Zimbabwe" ),
    ""
  };
  QStringList countries;
  for ( int i = 0; !country[ i ].isEmpty(); ++i )
    countries.append( country[ i ] );
  countries.sort();
  mCountryCombo->insertStringList( countries );
 }
 AddressTypeDialog::AddressTypeDialog( int type, QWidget *parent )
  : KDialogBase( Plain, i18n( "Edit Address Type" ), Ok | Cancel, Ok,
                 parent, "AddressTypeDialog" )
 {
  QWidget *page = plainPage();
-  QVBoxLayout *layout = new QVBoxLayout( page );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( page );
-  mGroup = new QButtonGroup( 2, Horizontal, i18n( "Address Types" ), page );
+  mGroup = new Q3ButtonGroup( 2, Qt::Horizontal, i18n( "Address Types" ), page );
  layout->addWidget( mGroup );
  mTypeList = KABC::Address::typeList();
  mTypeList.remove( KABC::Address::Pref );
  KABC::Address::TypeList::Iterator it;
  for ( it = mTypeList.begin(); it != mTypeList.end(); ++it )
    new QCheckBox( KABC::Address::typeLabel( *it ), mGroup );
  for ( int i = 0; i < mGroup->count(); ++i ) {
    QCheckBox *box = (QCheckBox*)mGroup->find( i );
    box->setChecked( type & mTypeList[ i ] );
  }
 }
 AddressTypeDialog::~AddressTypeDialog()
 {
 }
 int AddressTypeDialog::type() const
 {
  int type = 0;
  for ( int i = 0; i < mGroup->count(); ++i ) {
    QCheckBox *box = (QCheckBox*)mGroup->find( i );
    if ( box->isChecked() )
      type += mTypeList[ i ];
  }
  return type;
 }
-#ifndef KAB_EMBEDDED    
+#ifndef KAB_EMBEDDED_
-#include "addresseditwidget.moc"
+#include "moc_addresseditwidget.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h
index bc96d74..1d4e138 100644
--- a/kaddressbook/addresseditwidget.h
+++ b/kaddressbook/addresseditwidget.h
@@ -4,156 +4,156 @@
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef ADDRESSEDITWIDGET_H
 #define ADDRESSEDITWIDGET_H
 #include <qwidget.h>
 #include <kdialogbase.h>
 #include <kabc/address.h>
 #include <kabc/addressee.h>
 #include "addresseeconfig.h"
 #include "typecombo.h"
-class QButtonGroup;
+class Q3ButtonGroup;
 class QCheckBox;
-class QListView;
+class Q3ListView;
 #ifndef KAB_EMBEDDED    
-class QTextEdit;
+class Q3TextEdit;
 #else //KAB_EMBEDDED    
-class QMultiLineEdit;
+class Q3MultiLineEdit;
 #endif //KAB_EMBEDDED    
 class QToolButton;
 class KComboBox;
 class KLineEdit;
 class KListView;
 typedef TypeCombo<KABC::Address> AddressTypeCombo;
 /**
  Editor widget for addresses.
 */
 class AddressEditWidget : public QWidget
 {
  Q_OBJECT
  public:
    AddressEditWidget( QWidget *parent, const char *name = 0 );
    ~AddressEditWidget();
    KABC::Address::List addresses();
    void setAddresses( const KABC::Addressee &addr,
                       const KABC::Address::List &list );
    void updateTypeCombo( const KABC::Address::List&, KComboBox* );
    KABC::Address currentAddress( KComboBox*, int );
  signals:
    void modified();
  protected slots:
    void updateAddressEdit();
    void edit();
  private:
    AddresseeConfig * mConfig;
    AddressTypeCombo *mTypeCombo;
    QPushButton *mEditButton;
 #ifndef KAB_EMBEDDED    
-    QTextEdit *mAddressTextEdit;
+    Q3TextEdit *mAddressTextEdit;
 #else //KAB_EMBEDDED    
-    QMultiLineEdit *mAddressTextEdit;
+    Q3MultiLineEdit *mAddressTextEdit;
 #endif //KAB_EMBEDDED    
    KABC::Address::List mAddressList;
    KABC::Addressee mAddressee;
    int mIndex;
 };
 /**
  Dialog for editing address details.
 */
 class AddressEditDialog : public KDialogBase
 {
  Q_OBJECT
  public:
    AddressEditDialog( const KABC::Address::List &list, int selected,
                       QWidget *parent, const char *name = 0 );
    ~AddressEditDialog();
    KABC::Address::List addresses();
    bool changed() const;
  protected slots:
    void addAddress();
    void removeAddress();
    void changeType();
    void updateAddressEdits();
    void modified();
  private:
    void saveAddress( KABC::Address &addr );
    void fillCountryCombo();
    AddressTypeCombo *mTypeCombo;
 #ifndef KAB_EMBEDDED    
-    QTextEdit *mStreetTextEdit;
+    Q3TextEdit *mStreetTextEdit;
 #else //KAB_EMBEDDED    
-    QMultiLineEdit *mStreetTextEdit;
+    Q3MultiLineEdit *mStreetTextEdit;
 #endif //KAB_EMBEDDED    
    KComboBox *mCountryCombo;
    KLineEdit *mRegionEdit;
    KLineEdit *mLocalityEdit;
    KLineEdit *mPostalCodeEdit;
    KLineEdit *mPOBoxEdit;
    QCheckBox *mPreferredCheckBox;
    QPushButton *mRemoveButton;
    QPushButton *mChangeTypeButton;
    KABC::Address::List mAddressList;
    KABC::Address *mPreviousAddress;
    bool mChanged;
 };
 /**
  Dialog for selecting an address type.
 */
 class AddressTypeDialog : public KDialogBase
 {
  public:
    AddressTypeDialog( int type, QWidget *parent );
    ~AddressTypeDialog();
    int type() const;
  private:
-    QButtonGroup *mGroup;
+    Q3ButtonGroup *mGroup;
    KABC::Address::TypeList mTypeList;
 };
 #endif
diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp
index ea0436f..81b1bf4 100644
--- a/kaddressbook/addresseeconfig.cpp
+++ b/kaddressbook/addresseeconfig.cpp
@@ -1,94 +1,96 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include "addresseeconfig.h"
 #include "kabprefs.h"
 //US
 #include <kstandarddirs.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 using namespace KABC;
 static AddresseeConfig* extern_AddresseeConfig = 0; 
 static  KConfig *  extern_Config = 0; 
 AddresseeConfig::AddresseeConfig()
 {
  
 }
 AddresseeConfig::~AddresseeConfig()
 {
    delete AddresseeConfig::config();
 }
 AddresseeConfig* AddresseeConfig::instance()
 {
    if ( ! extern_AddresseeConfig )
        extern_AddresseeConfig = new AddresseeConfig();
    return extern_AddresseeConfig;
 }
 KConfig* AddresseeConfig::config()
 {
    if ( ! extern_Config ) {
        QString conf = locateLocal("config", "kaddressrc");
        extern_Config= new KConfig( conf );
    }
    return extern_Config;
 }
  
 void AddresseeConfig::setUid( const QString & uid )
 {
    AddresseeConfig::config()->setGroup( uid );
    mUid = uid;
 }
 void AddresseeConfig::setAutomaticNameParsing( bool value )
 {
    AddresseeConfig::config()->writeEntry( "AutomaticNameParsing", value );
 }
 bool AddresseeConfig::automaticNameParsing()
 {
    return AddresseeConfig::config()->readBoolEntry( "AutomaticNameParsing",
                               KABPrefs::instance()->mAutomaticNameParsing );
 }
-void AddresseeConfig::setNoDefaultAddrTypes( const QValueList<int> &types )
+void AddresseeConfig::setNoDefaultAddrTypes( const Q3ValueList<int> &types )
 {
    AddresseeConfig::config()->writeEntry( "NoDefaultAddrTypes", types );
    AddresseeConfig::config()->sync();
 }
- QValueList<int> AddresseeConfig::noDefaultAddrTypes() const
+ Q3ValueList<int> AddresseeConfig::noDefaultAddrTypes() const
 {
    return AddresseeConfig::config()->readIntListEntry( "NoDefaultAddrTypes" );
 }
 void AddresseeConfig::remove( const QString & uid )
 {
    AddresseeConfig::config()->deleteGroup( uid );
 }
diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h
index 47fbdd6..f6bb3e9 100644
--- a/kaddressbook/addresseeconfig.h
+++ b/kaddressbook/addresseeconfig.h
@@ -1,55 +1,57 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef ADDRESSEECONFIG_H
 #define ADDRESSEECONFIG_H
 #include <kabc/addressee.h>
 #include <kconfig.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 using namespace KABC;
 class AddresseeConfig
 {
  public:
    AddresseeConfig();
    ~AddresseeConfig();
    static AddresseeConfig* instance();
    static KConfig* config();
    Addressee addressee();
    void setUid( const QString & uid );
    void setAutomaticNameParsing( bool value );
    bool automaticNameParsing();
-    void setNoDefaultAddrTypes( const QValueList<int> &types );
+    void setNoDefaultAddrTypes( const Q3ValueList<int> &types );
-    QValueList<int> noDefaultAddrTypes() const;
+    Q3ValueList<int> noDefaultAddrTypes() const;
    void remove( const QString & uid);
  private:
    QString mUid;
 };
 #endif
diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index b5a60f2..b925a07 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -1,78 +1,81 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qlayout.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include "addresseeeditorwidget.h"
 #include "kabcore.h"
 #include "addresseeeditordialog.h"
 AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
                                              const char *name )
  : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), 
                 KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
                 KDialogBase::Ok, parent, name, true )
 {
  QWidget *page = plainPage();
  
-  QVBoxLayout *layout = new QVBoxLayout( page );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( page );
  mEditorWidget = new AddresseeEditorWidget( core, false, page );
  connect( mEditorWidget, SIGNAL( modified( const KABC::Addressee::List& ) ),
           SLOT( widgetModified() ) );
  layout->addWidget( mEditorWidget );
  
  enableButton( KDialogBase::Apply, false );
  if ( QApplication::desktop()->width()  < 480 ) {
      hideButtons();
  }
 }
 AddresseeEditorDialog::~AddresseeEditorDialog()
 {
    //emit editorDestroyed( mEditorWidget->addressee().uid() );
 }
 void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr )
 {
  enableButton( KDialogBase::Apply, false );
  
  mEditorWidget->setAddressee( addr );
  this->setCaption(i18n ("Edit ") + addr.formattedName());
 }
 KABC::Addressee AddresseeEditorDialog::addressee()
 {
  return mEditorWidget->addressee();
 }
 bool AddresseeEditorDialog::dirty()
@@ -89,35 +92,35 @@ void AddresseeEditorDialog::slotApply()
  enableButton( KDialogBase::Apply, false );
  
  KDialogBase::slotApply();
 }
 void AddresseeEditorDialog:: accept () 
 {
    slotOk();
 }
 void AddresseeEditorDialog::slotOk()
 {
  slotApply();
  
  //KDialogBase::slotOk();
  emit okClicked();
  QDialog::accept();
 }
 void AddresseeEditorDialog::widgetModified()
 {
  enableButton( KDialogBase::Apply, true );
 }
  
 void AddresseeEditorDialog::slotCancel()
 {
  KDialogBase::slotCancel();
  
 
 }
-#ifndef KAB_EMBEDDED    
+#ifndef KAB_EMBEDDED_
-#include "addresseeeditordialog.moc"
+#include "moc_addresseeeditordialog.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 4313998..a95db03 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -1,73 +1,77 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qcheckbox.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
 #ifndef KAB_EMBEDDED    
-#include <qtextedit.h>
+#include <q3textedit.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 #include <kaccelmanager.h>
 #include "keywidget.h"
 #include "soundwidget.h"
 #else //KAB_EMBEDDED    
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif //KAB_EMBEDDED    
 #include "keywidget.h"
 #include "geowidget.h"
 #include "imagewidget.h"
 #include "nameeditdialog.h"
 #include "phoneeditwidget.h"
 #include "secrecywidget.h"
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
 #include <ksqueezedtextlabel.h>
 #include <libkdepim/categoryeditdialog.h>
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kdateedit.h>
@@ -101,95 +105,95 @@ AddresseeEditorWidget::AddresseeEditorWidget( KABCore *core, bool isExtension,
 AddresseeEditorWidget::~AddresseeEditorWidget()
 {
  kdDebug(5720) << "~AddresseeEditorWidget()" << endl;
 }  
  
 void AddresseeEditorWidget::contactsSelectionChanged()
 {
  KABC::Addressee::List list = selectedContacts();
  mAddressee = list[ 0 ];
  load();
 }
 void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr )
 {
  mAddressee = addr;
  load();
 }
 const KABC::Addressee &AddresseeEditorWidget::addressee()
 {
  return mAddressee;
 }
 void AddresseeEditorWidget::textChanged( const QString& )
 {
  emitModified();
 }
  
 void AddresseeEditorWidget::initGUI()
 {
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
  mTabWidget = new QTabWidget( this );
  layout->addWidget( mTabWidget );
  setupTab1();
  setupTab1_1();
  setupTab2();
  setupTab2_1();
  setupTab3();
  setupTab3_1();
  mNameEdit->setFocus();
  
  connect( mTabWidget, SIGNAL( currentChanged(QWidget*) ),
           SLOT( pageChanged(QWidget*) ) );
 }
 void AddresseeEditorWidget::setupTab1()
 {
  // This is the General tab
  QWidget *tab1 = new QWidget( mTabWidget );
 //US  QGridLayout *layout = new QGridLayout( tab1, 11, 7 );
  bool horLayout = false;
  int maxCol = 1;
  if ( QApplication::desktop()->width() == 640 || QApplication::desktop()->width() == 320 ) {
      horLayout = true;
      maxCol = 3;
  }
-  QGridLayout *layout = new QGridLayout( tab1, 7-maxCol, maxCol );
+  Q3GridLayout *layout = new Q3GridLayout( tab1, 7-maxCol, maxCol );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
  
  QLabel *label;
  KSeparator* bar;
  QPushButton *button;
  
  //////////////////////////////////
  // Upper left group (person info)
  
  // Person icon
  /* LR
  label = new QLabel( tab1 );
 //US ambiguous call. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  */
  // First name
  button = new QPushButton( i18n( "Name..." ), tab1 );
 //US  QToolTip::add( button, i18n( "Edit the contact's name" ) );
  mNameEdit = new KLineEdit( tab1, "mNameEdit" );
  connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( nameTextChanged( const QString& ) ) );
  connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) );
  
  mNameLabel = new KSqueezedTextLabel( tab1 );
  mNameLabel->hide();
  
  layout->addWidget( button, 0, 0 );
  layout->addWidget( mNameEdit, 0, 1 );
@@ -298,75 +302,75 @@ void AddresseeEditorWidget::setupTab1()
  // add the separator
  bar = new KSeparator( KSeparator::HLine, tab1 );
  layout->addMultiCellWidget( bar, 7, 7, 3, 6 );
  label = new QLabel( tab1 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, 0) );
  layout->addMultiCellWidget( label, 8, 9, 3, 3 );
  label = new QLabel( i18n( "URL:" ), tab1 );
  mURLEdit = new KLineEdit( tab1 );
  connect( mURLEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mURLEdit );
  layout->addWidget( label, 8, 4 );
  layout->addMultiCellWidget( mURLEdit, 8, 8, 5, 6 );
  label = new QLabel( i18n( "&IM address:" ), tab1 );
  mIMAddressEdit = new KLineEdit( tab1 );
  connect( mIMAddressEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mIMAddressEdit );
  layout->addWidget( label, 9, 4 );
  layout->addMultiCellWidget( mIMAddressEdit, 9, 9, 5, 6 );
  
  layout->addColSpacing( 6, 50 );
  
  bar = new KSeparator( KSeparator::HLine, tab1 );
  layout->addMultiCellWidget( bar, 10, 10, 0, 6 );
 */  
  ///////////////////////////////////////
-      QHBox *categoryBox = new QHBox( tab1 ,"cato");
+      Q3HBox *categoryBox = new Q3HBox( tab1 ,"cato");
  categoryBox->setSpacing( KDialogBase::spacingHint() );
  categoryBox->setMargin( KDialogBase::marginHintSmall() );
  
  // Categories
  button = new QPushButton( i18n( "Categories" )+":", categoryBox );
  connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) );
  mCategoryEdit = new QPushButton ( categoryBox ); 
  mCategoryEdit->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Fixed  ,FALSE) );
-  mCatPopup = new QPopupMenu ( categoryBox );
+  mCatPopup = new Q3PopupMenu ( categoryBox );
  mCategoryEdit->setPopup( mCatPopup );
  connect(mCatPopup,SIGNAL(aboutToShow ()  ), this ,SLOT(showCatPopup()));
  connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT(selectedCatPopup( int )));
  //connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), 
  //       SLOT( textChanged( const QString& ) ) );
  mSecrecyWidget = new SecrecyWidget( categoryBox );
  connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 //US  layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 );
  layout->addMultiCellWidget( categoryBox, iii, iii, 0, maxCol );
  
  // Build the layout and add to the tab widget
  layout->activate(); // required
  mTabWidget->addTab( tab1, i18n( "&General" ) );
 }
 void AddresseeEditorWidget::showCatPopup()
 {
    mCatPopup->clear(); 
    QStringList checkedCategories = QStringList::split (",", mCategoryEdit->text());
    int index = 0;
    for (QStringList::Iterator it = KABPrefs::instance()->mCustomCategories.begin ();
         it != KABPrefs::instance()->mCustomCategories.end ();
         ++it) {
        mCatPopup->insertItem (*it, index );
        //mCategory[index] = *it;
        if (checkedCategories.find (*it) != checkedCategories.end ()) mCatPopup->setItemChecked (index, true);
        ++index;
    }
 }
@@ -382,65 +386,65 @@ void AddresseeEditorWidget::selectedCatPopup( int index )
    if ( !colcat.isEmpty() ) {
        if ( categories.find ( colcat ) != categories.end () ) {
            categories.remove( colcat );
            categories.prepend( colcat );
        }
    }
    mCategoryEdit->setText( categories.join(",") );
    emitModified();
 }
 void AddresseeEditorWidget::setRole2FN()
 {
    if ( mRoleEdit->text().isEmpty() ) return;
    mFormattedNameType = NameEditDialog::CustomName;
    mAddressee.setFormattedName( mRoleEdit->text() ); 
    mFormattedNameLabel->setText( mRoleEdit->text() );
    emitModified();
 }
 void AddresseeEditorWidget::setCompany2FN()
 {
    if (  mOrgEdit->text().isEmpty() ) return;
    mFormattedNameType = NameEditDialog::CustomName;
    mAddressee.setFormattedName( mOrgEdit->text() );
    mFormattedNameLabel->setText( mOrgEdit->text() );
    emitModified();
 }
 void AddresseeEditorWidget::setupTab1_1()
 {
  // This is the Address tab
  QWidget *tab1_1 = new QWidget( mTabWidget );
 //US  QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 );
-  QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( tab1_1, 7, 2 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
  
  QLabel *label;
  KSeparator* bar;
  QPushButton *button;
 /*US    
  //////////////////////////////////
  // Upper left group (person info)
  
  // Person icon
  label = new QLabel( tab1 );
 //US ambiguous call. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  
  // First name
  button = new QPushButton( i18n( "Name..." ), tab1 );
  QToolTip::add( button, i18n( "Edit the contact's name" ) );
  mNameEdit = new KLineEdit( tab1, "mNameEdit" );
  connect( mNameEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( nameTextChanged( const QString& ) ) );
  connect( button, SIGNAL( clicked() ), SLOT( nameButtonClicked() ) );
  
 #ifndef KAB_EMBEDDED    
  mNameLabel = new KSqueezedTextLabel( tab1 );
  mNameLabel->hide();
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 #endif //KAB_EMBEDDED    
@@ -583,65 +587,65 @@ qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 /*US  
  ///////////////////////////////////////
  QHBox *categoryBox = new QHBox( tab1 );
  categoryBox->setSpacing( KDialogBase::spacingHintSmall() );
  
  // Categories
  button = new QPushButton( i18n( "Categories" ), categoryBox );
  connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) );
  mCategoryEdit = new KLineEdit( categoryBox );
  mCategoryEdit->setReadOnly( true );
  connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), 
           SLOT( textChanged( const QString& ) ) );
  mSecrecyWidget = new SecrecyWidget( categoryBox );
  connect( mSecrecyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addMultiCellWidget( categoryBox, 11, 11, 0, 6 );
 */  
  // Build the layout and add to the tab widget
  layout->activate(); // required
  mTabWidget->addTab( tab1_1, i18n( "&Address" ) );
 }
 void AddresseeEditorWidget::setupTab2()
 {
  // This is the Details tab
  QWidget *tab2 = new QWidget( mTabWidget );
-  QGridLayout *layout = new QGridLayout( tab2, 8, 3 );
+  Q3GridLayout *layout = new Q3GridLayout( tab2, 8, 3 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
  
  QLabel *label;
  KSeparator* bar;
  
  ///////////////////////
  // Office info
  
  // Department
  label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  
  label = new QLabel( i18n( "Department:" ), tab2 );
  layout->addWidget( label, 0, 1 );
  mDepartmentEdit = new KLineEdit( tab2 );
  connect( mDepartmentEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mDepartmentEdit );
  layout->addWidget( mDepartmentEdit, 0, 2 );
  
  label = new QLabel( i18n( "Office:" ), tab2 );
  layout->addWidget( label, 1, 1 );
  mOfficeEdit = new KLineEdit( tab2 );
  connect( mOfficeEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mOfficeEdit );
  layout->addWidget( mOfficeEdit, 1, 2 );
  
@@ -662,109 +666,109 @@ void AddresseeEditorWidget::setupTab2()
  label->setBuddy( mManagerEdit );
 //US  layout->addMultiCellWidget( mManagerEdit, 0, 0, 4, 5 );
  layout->addWidget( mManagerEdit, 3, 2 );
  
  label = new QLabel( i18n( "Assistant's name:" ), tab2 );
 //US  layout->addWidget( label, 1, 3 );
  layout->addWidget( label, 4, 1 );
  mAssistantEdit = new KLineEdit( tab2 );
  connect( mAssistantEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mAssistantEdit );
 //US  layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 );
  layout->addWidget( mAssistantEdit, 4, 2 );
  
  bar = new KSeparator( KSeparator::HLine, tab2 );
 //US  layout->addMultiCellWidget( bar, 3, 3, 0, 5 );
  layout->addMultiCellWidget( bar, 5, 5, 0, 2 );
  
  /////////////////////////////////////////////////
  // Personal info
  
  //label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) );
      //label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, 0 ) );
 //US  layout->addMultiCellWidget( label, 4, 5, 0, 0 );
      //layout->addMultiCellWidget( label, 6, 7, 0, 0 );
      int iii = 6;
      if ( QApplication::desktop()->width() == 640 ) {
-          QHBox * nbox = new QHBox ( tab2 );
+          Q3HBox * nbox = new Q3HBox ( tab2 );
          label = new QLabel( i18n( "Nick name:" )+" ", nbox );
          mNicknameEdit = new KLineEdit(  nbox );
          connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
                   SLOT( textChanged( const QString& ) ) );
          label->setBuddy( mNicknameEdit );
          label = new QLabel( " "+i18n( "Spouse's name:" )+" ",  nbox );
          mSpouseEdit = new KLineEdit(  nbox );
          connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
                   SLOT( textChanged( const QString& ) ) );
          label->setBuddy( mSpouseEdit );
          layout->addMultiCellWidget( nbox, iii, iii, 1, 2 );
          ++iii;
      } else {
          label = new QLabel( i18n( "Nick name:" ), tab2 );
          layout->addWidget( label, iii, 1 );
          mNicknameEdit = new KLineEdit( tab2 );
          connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
                   SLOT( textChanged( const QString& ) ) );
          label->setBuddy( mNicknameEdit );
          layout->addWidget( mNicknameEdit, iii, 2 );
          ++iii;
          label = new QLabel( i18n( "Spouse's name:" ), tab2 );
          layout->addWidget( label, iii, 1 );
          mSpouseEdit = new KLineEdit( tab2 );
          connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
                   SLOT( textChanged( const QString& ) ) );
          label->setBuddy( mSpouseEdit );
          layout->addWidget( mSpouseEdit, iii, 2 );
          ++iii;
      }
      label = new QLabel( i18n( "Children's names:" ), tab2 );
      layout->addWidget( label, iii, 1 );
      mChildEdit = new KLineEdit( tab2 );
      connect( mChildEdit, SIGNAL( textChanged( const QString& ) ),
               SLOT( textChanged( const QString& ) ) );
      label->setBuddy( mChildEdit );
      layout->addWidget( mChildEdit, iii, 2 );
      ++iii;
      if ( QApplication::desktop()->width() == 640 ) {
-          QHBox * nbox = new QHBox ( tab2 );
+          Q3HBox * nbox = new Q3HBox ( tab2 );
          label = new QLabel( i18n( "Birthday:" )+" ", nbox );
          mBirthdayPicker = new KDateEdit(  nbox  );
          //mBirthdayPicker->toggleDateFormat();
          mBirthdayPicker->setHandleInvalid( true );
          connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                   SLOT( dateChanged( QDate ) ) );
           
          label->setBuddy( mBirthdayPicker );
  
          label = new QLabel(  " "+i18n( "Anniversary:" )+" ",  nbox  );
          mAnniversaryPicker = new KDateEdit(  nbox  );
          mAnniversaryPicker->setHandleInvalid( true );
          connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
                   SLOT( dateChanged( QDate ) ) );
           
          label->setBuddy( mAnniversaryPicker );
          layout->addMultiCellWidget( nbox, iii, iii, 1, 2 );
          ++iii;
      } else {
          label = new QLabel( i18n( "Birthday:" ), tab2 );
          layout->addWidget( label, iii, 1 );
          mBirthdayPicker = new KDateEdit( tab2 );
          //mBirthdayPicker->toggleDateFormat();
          mBirthdayPicker->setHandleInvalid( true );
          connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                   SLOT( dateChanged( QDate ) ) );
           
          label->setBuddy( mBirthdayPicker );
          layout->addWidget( mBirthdayPicker, iii, 2 );
          ++iii;
@@ -775,65 +779,65 @@ void AddresseeEditorWidget::setupTab2()
          mAnniversaryPicker->setHandleInvalid( true );
          connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
                   SLOT( dateChanged( QDate ) ) );
           
          label->setBuddy( mAnniversaryPicker );
          layout->addWidget( mAnniversaryPicker, iii, 2 );
          ++iii;
      }
      label = new QLabel( i18n( "Gender:" ), tab2 );
      layout->addWidget( label, iii, 1 );
      mGenderBox = new QComboBox ( tab2 );
      mGenderBox->insertItem ( i18n( "ALIEN (undefined)" ));
      mGenderBox->insertItem ( i18n( "female" ));
      mGenderBox->insertItem ( i18n( "male" ));
      connect( mGenderBox, SIGNAL(  activated ( const QString & )  ),
                   SLOT( textChanged( const QString& ) ) );
      label->setBuddy( mGenderBox );
      layout->addWidget( mGenderBox, iii, 2 );
      ++iii;
   // Build the layout and add to the tab widget
  layout->activate(); // required
  mTabWidget->addTab( tab2, i18n( "&Details" ) );
 }
 void AddresseeEditorWidget::setupTab2_1()
 {
  // This is the Details tab
  QWidget *tab2_2 = new QWidget( mTabWidget );
-  QGridLayout *layout = new QGridLayout( tab2_2, 1, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( tab2_2, 1, 2 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
  
  QLabel *label;
  KSeparator* bar;
  
 /*US  
  ///////////////////////
  // Office info
  
  // Department
  label = new QLabel( tab2 );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, 0 ) );
  layout->addMultiCellWidget( label, 0, 1, 0, 0 );
  
  label = new QLabel( i18n( "Department:" ), tab2 );
  layout->addWidget( label, 0, 1 );
  mDepartmentEdit = new KLineEdit( tab2 );
  connect( mDepartmentEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mDepartmentEdit );
  layout->addWidget( mDepartmentEdit, 0, 2 );
  
  label = new QLabel( i18n( "Office:" ), tab2 );
  layout->addWidget( label, 1, 1 );
  mOfficeEdit = new KLineEdit( tab2 );
  connect( mOfficeEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  label->setBuddy( mOfficeEdit );
  layout->addWidget( mOfficeEdit, 1, 2 );
@@ -897,144 +901,144 @@ void AddresseeEditorWidget::setupTab2_1()
  connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
           SLOT( dateChanged( QDate ) ) );
  connect( mBirthdayPicker, SIGNAL( invalidDateEntered() ),
           SLOT( invalidDate() ) );
  connect( mBirthdayPicker, SIGNAL( textChanged( const QString& ) ),
           SLOT( emitModified() ) );
  label->setBuddy( mBirthdayPicker );
  layout->addWidget( mBirthdayPicker, 4, 4 );
  
  label = new QLabel( i18n( "Anniversary:" ), tab2 );
  layout->addWidget( label, 5, 3 );
  mAnniversaryPicker = new KDateEdit( tab2 );
  mAnniversaryPicker->setHandleInvalid( true );
  connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),
           SLOT( dateChanged( QDate ) ) );
  connect( mAnniversaryPicker, SIGNAL( invalidDateEntered() ),
           SLOT( invalidDate() ) );
  connect( mAnniversaryPicker, SIGNAL( textChanged( const QString& ) ),
           SLOT( emitModified() ) );
  label->setBuddy( mAnniversaryPicker );
  layout->addWidget( mAnniversaryPicker, 5, 4 );
  
  bar = new KSeparator( KSeparator::HLine, tab2 );
  layout->addMultiCellWidget( bar, 6, 6, 0, 5 );
 */  
   //////////////////////////////////////
  // Notes
  label = new QLabel( i18n( "Note:" ), tab2_2 );
  label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
 //US  layout->addWidget( label, 7, 0 );
  layout->addWidget( label, 0, 0 );
 #ifndef KAB_EMBEDDED    
-  mNoteEdit = new QTextEdit( tab2_2 );
+  mNoteEdit = new Q3TextEdit( tab2_2 );
-  mNoteEdit->setWordWrap( QTextEdit::WidgetWidth );
+  mNoteEdit->setWordWrap( Q3TextEdit::WidgetWidth );
  mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #else //KAB_EMBEDDED    
-  mNoteEdit = new QMultiLineEdit( tab2_2 );
+  mNoteEdit = new Q3MultiLineEdit( tab2_2 );
-  mNoteEdit->setWordWrap( QMultiLineEdit::WidgetWidth );
+  mNoteEdit->setWordWrap( Q3MultiLineEdit::WidgetWidth );
  mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #endif //KAB_EMBEDDED    
  
  connect( mNoteEdit, SIGNAL( textChanged() ), SLOT( emitModified() ) );
  label->setBuddy( mNoteEdit );
 //US  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
  layout->addWidget( mNoteEdit, 1, 0);
   // Build the layout and add to the tab widget
  layout->activate(); // required
  mTabWidget->addTab( tab2_2, i18n( "&Notes" ) );
 }
 void AddresseeEditorWidget::setupTab3()
 {
  // This is the Misc tab
  QWidget *tab3 = new QWidget( mTabWidget );
-  QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( tab3, 1, 1 );
  layout->setMargin( KDialogBase::marginHintSmall() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
 //US  layout->setColStretch( 2, 1 );
  
  //////////////////////////////////////
  // Geo
  mGeoWidget = new GeoWidget( tab3 );
  // mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
  connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mGeoWidget, 0, 0 );
 /*US
  //////////////////////////////////////
  // Sound
 #ifndef KAB_EMBEDDED    
  mSoundWidget = new SoundWidget( tab3 );
  mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
  connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
  //////////////////////////////////////
  // Images
  mImageWidget = new ImageWidget( tab3 );
  mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
  connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mImageWidget, 1, 0, Qt::AlignTop );
 */
 //US  
 /*
  KSeparator* bar = new KSeparator( KSeparator::HLine, tab3 );
  layout->addMultiCellWidget( bar, 1, 1, 0, 0 );
 */ 
  //////////////////////////////////////
  // Keys
  mKeyWidget = new KeyWidget( tab3 );
  //mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
  connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 //US  layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
  layout->addWidget( mKeyWidget, 1, 0 );
  mTabWidget->addTab( tab3, i18n( "&Misc" ) );
 }
 void AddresseeEditorWidget::setupTab3_1()
 {
  // This is the Misc tab
  QWidget *tab3 = new QWidget( mTabWidget );
 //US  QGridLayout *layout = new QGridLayout( tab3, 2, 3 );
-  QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( tab3, 1, 1 );
  layout->setMargin( KDialogBase::marginHint() );
  layout->setSpacing( KDialogBase::spacingHint() );
 //US  layout->setColStretch( 2, 1 );
 /*US  
  //////////////////////////////////////
  // Geo
  mGeoWidget = new GeoWidget( tab3 );
  mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
  connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mGeoWidget, 0, 0, Qt::AlignTop );
 */
  //////////////////////////////////////
  // Sound
 #ifndef KAB_EMBEDDED    
  mSoundWidget = new SoundWidget( tab3 );
  mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
  connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
  //////////////////////////////////////
  // Images
  mImageWidget = new ImageWidget( tab3 );
  mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
  connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
  layout->addWidget( mImageWidget, 0, 0, Qt::AlignTop );
 /*US
  //////////////////////////////////////
  // Keys
@@ -1401,35 +1405,35 @@ void AddresseeEditorWidget::dateChanged( QDate )
 {
  emitModified();
 }
 //US invalid dates are handdled by the KDateEdit widget itself
 void AddresseeEditorWidget::invalidDate()
 {
  KMessageBox::sorry( this, i18n( "You must specify a valid date" ) );
 }
 void AddresseeEditorWidget::pageChanged( QWidget *wdg )
 {
 #ifndef KAB_EMBEDDED    
  if ( wdg )
    KAcceleratorManager::manage( wdg );
 #else //KAB_EMBEDDED    
 //US 
 #endif //KAB_EMBEDDED    
    
 }
 QString AddresseeEditorWidget::title() const
 {
  return i18n( "Contact Editor" );
 }
 QString AddresseeEditorWidget::identifier() const
 {
  return i18n( "contact_editor" );
 }
-#ifndef KAB_EMBEDDED    
+#ifndef KAB_EMBEDDED_
-#include "addresseeeditorwidget.moc"
+#include "moc_addresseeeditorwidget.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h
index 816bbb5..aa1207e 100644
--- a/kaddressbook/addresseeeditorwidget.h
+++ b/kaddressbook/addresseeeditorwidget.h
@@ -1,77 +1,77 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef ADDRESSEEEDITORWIDGET_H
 #define ADDRESSEEEDITORWIDGET_H
 #include <qdatetime.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qcombobox.h>
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 #include <kjanuswidget.h>
 #include "extensionwidget.h"
 class AddresseeConfig;
 class QCheckBox;
 class QSpinBox;
 class QTabWidget;
 #ifndef KAB_EMBEDDED    
-class QTextEdit;
+class Q3TextEdit;
 #else //KAB_EMBEDDED    
-class QMultiLineEdit;
+class Q3MultiLineEdit;
 #endif //KAB_EMBEDDED    
 class KComboBox;
 class KDateEdit;
 class KLineEdit;
 class KSqueezedTextLabel;
 class AddressEditWidget;
 class EmailEditWidget;
 class GeoWidget;
 class ImageWidget;
 class KABCore;
 class KeyWidget;
 class PhoneEditWidget;
 class SecrecyWidget;
 class SoundWidget;
 namespace KPIM
 {
  class CategorySelectDialog;
  class CategoryEditDialog;
 }
 namespace KABC { class AddressBook; }
 class AddresseeEditorWidget : public ExtensionWidget
 {
  Q_OBJECT
  
  public:
    AddresseeEditorWidget( KABCore *core, bool isExtension,
                           QWidget *parent, const char *name = 0 );
@@ -126,68 +126,68 @@ class AddresseeEditorWidget : public ExtensionWidget
    AddresseeConfig * mAConfig;
    void initGUI();
    void setupTab1();
    void setupTab1_1();
    void setupTab2();
    void setupTab2_1();
    void setupTab3();
    void setupTab3_1();
    KABC::Addressee mAddressee;
    int mFormattedNameType;
    bool mDirty;
    bool mIsExtension;
    bool mBlockSignals;
    // GUI
    KPIM::CategorySelectDialog *mCategoryDialog;
    KPIM::CategoryEditDialog *mCategoryEditDialog;
    QTabWidget *mTabWidget;
    // Tab1 and Tab1_1
    KLineEdit *mNameEdit;
    KLineEdit *mRoleEdit;
    KLineEdit *mOrgEdit;
    
    KSqueezedTextLabel *mFormattedNameLabel;
    AddressEditWidget *mAddressEditWidget;
    EmailEditWidget *mEmailWidget;
    PhoneEditWidget *mPhoneEditWidget;
    KLineEdit *mURLEdit;
    KLineEdit *mIMAddressEdit;
    QPushButton *mCategoryEdit;
-    QPopupMenu *mCatPopup;
+    Q3PopupMenu *mCatPopup;
    SecrecyWidget *mSecrecyWidget;
    KSqueezedTextLabel *mNameLabel;
    // Tab2 and Tab2_2
    KLineEdit *mDepartmentEdit;
    KLineEdit *mOfficeEdit;
    KLineEdit *mProfessionEdit;
    KLineEdit *mManagerEdit;
    KLineEdit *mAssistantEdit;
    KLineEdit *mNicknameEdit;
    KLineEdit *mSpouseEdit;
    KLineEdit *mChildEdit;
    QComboBox *mGenderBox;
    KDateEdit *mBirthdayPicker;
    KDateEdit *mAnniversaryPicker;
 #ifndef KAB_EMBEDDED    
-    QTextEdit *mNoteEdit;
+    Q3TextEdit *mNoteEdit;
 #else //KAB_EMBEDDED    
-    QMultiLineEdit *mNoteEdit;
+    Q3MultiLineEdit *mNoteEdit;
 #endif //KAB_EMBEDDED    
    
    QSpinBox *mTimeZoneSpin;
    QSpinBox *mGeoLat;
    QSpinBox *mGeoLon;
    // Tab3
    GeoWidget *mGeoWidget;
    ImageWidget *mImageWidget;
 #ifndef KAB_EMBEDDED    
    SoundWidget *mSoundWidget;
 #endif //KAB_EMBEDDED    
    KeyWidget *mKeyWidget;
 };
 #endif
diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp
index 366384a..a860f6d 100644
--- a/kaddressbook/addresseeutil.cpp
+++ b/kaddressbook/addresseeutil.cpp
@@ -17,50 +17,50 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <kabc/stdaddressbook.h>
 #include <kabc/vcardconverter.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include "addresseeutil.h"
 QString AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list )
 {
  KABC::VCardConverter converter;
  QString vcard;
  KABC::Addressee::List::ConstIterator it;
  for ( it = list.begin(); it != list.end(); ++it ) {
    QString tmp;
    if ( converter.addresseeToVCard( *it, tmp ) )
      vcard += tmp + "\r\n";
  }
  return vcard;
 }
 KABC::Addressee::List AddresseeUtil::clipboardToAddressees( const QString &data )
 {
-  uint numVCards = data.contains( "BEGIN:VCARD", false );
+  uint numVCards = data.count( "BEGIN:VCARD", Qt::CaseInsensitive );
  QStringList dataList = QStringList::split( "\r\n\r\n", data );
  KABC::Addressee::List addrList;
  for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
    KABC::VCardConverter converter;
    KABC::Addressee addr;
    if ( !converter.vCardToAddressee( dataList[ i ].stripWhiteSpace(), addr ) ) {
      KMessageBox::error( 0, i18n( "Invalid vCard format in clipboard" ) );
      continue;
    }
    addrList.append( addr );
  }
  return addrList;
 }
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 6def26b..b52a83c 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -1,118 +1,120 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <klocale.h>
 #include <kglobal.h>
 #include "kaddressbookview.h"
 #include "addviewdialog.h"
-AddViewDialog::AddViewDialog( QDict<ViewFactory> *viewFactoryDict,
+AddViewDialog::AddViewDialog( Q3Dict<ViewFactory> *viewFactoryDict,
                              QWidget *parent, const char *name )
  : KDialogBase( KDialogBase::Plain, i18n( "Add View" ),
                 KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                 parent, name ),
   mViewFactoryDict( viewFactoryDict )
 {
 //US  setMinimumSize( KMIN(KGlobal::getDesktopWidth(), 300), KMIN(KGlobal::getDesktopHeight(), 300));
  
  mTypeId = 0;
  QWidget *page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 2, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 2, 2 );
  layout->setSpacing( spacingHint() );
  layout->setRowStretch( 1, 1 );
  layout->setColStretch( 1, 1 );
  QLabel *label = new QLabel( i18n( "View name:" ), page );
  layout->addWidget( label, 0, 0 );
  mViewNameEdit = new QLineEdit( page );
  connect( mViewNameEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  layout->addWidget( mViewNameEdit, 0, 1 );
-  mTypeGroup = new QButtonGroup( 2, Qt::Horizontal, i18n( "View Type" ), page );
+  mTypeGroup = new Q3ButtonGroup( 2, Qt::Horizontal, i18n( "View Type" ), page );
  connect( mTypeGroup, SIGNAL( clicked( int ) ), this, SLOT( clicked( int ) ) );
  layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 );
  // Now create the radio buttons. This needs some layout work.
-  QDictIterator<ViewFactory> iter( *mViewFactoryDict );
+  Q3DictIterator<ViewFactory> iter( *mViewFactoryDict );
  for ( iter.toFirst(); iter.current(); ++iter ) {
 //US i am not quit sure, why I can nopt use (*iter)-> here 
 //US    new QRadioButton( (*iter)->type(), mTypeGroup );
 //US    label = new QLabel( (*iter)->description(), mTypeGroup );
 #ifdef DESKTOP_VERSION
    new QRadioButton( (*iter)->type(), mTypeGroup );
    label = new QLabel( (*iter)->description(), mTypeGroup );
 #else
    new QRadioButton( (*iter).type(), mTypeGroup );
    label = new QLabel( (*iter).description(), mTypeGroup );
 #endif
    label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
  }
  mTypeGroup->setButton( 0 );
  mViewNameEdit->setFocus();
  enableButton( KDialogBase::Ok, false );
 
  
 }
 AddViewDialog::~AddViewDialog()
 {
 }
 QString AddViewDialog::viewName()const
 {
  return mViewNameEdit->text();
 }
 QString AddViewDialog::viewType()const
 {
  return mTypeGroup->find( mTypeId )->text();
 }
 void AddViewDialog::clicked( int id )
 {
  mTypeId = id;
 }
 void AddViewDialog::textChanged( const QString &text )
 {
  enableButton( KDialogBase::Ok, !text.isEmpty() );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "addviewdialog.moc"
+#include "moc_addviewdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h
index 8cc12f5..c3e8efd 100644
--- a/kaddressbook/addviewdialog.h
+++ b/kaddressbook/addviewdialog.h
@@ -1,73 +1,73 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef ADDVIEWDIALOG_H
 #define ADDVIEWDIALOG_H
 #include <kdialogbase.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include <qstring.h>
 class ViewFactory;
-class QButtonGroup;
+class Q3ButtonGroup;
 class QLineEdit;
 /**
  Modal dialog used for adding a new view. The dialog asks for the name of
  the view as well as the type. Someday it would be nice for this to be a
  wizard.
 */
 class AddViewDialog : public KDialogBase
 {
  Q_OBJECT
  public:
-    AddViewDialog( QDict<ViewFactory> *viewFactoryDict, QWidget *parent,
+    AddViewDialog( Q3Dict<ViewFactory> *viewFactoryDict, QWidget *parent,
                   const char *name = 0 );
    ~AddViewDialog();
    QString viewName()const;
    QString viewType()const ;
  protected slots:
    /**
      Called when the user selects a type radio button.
     */
    void clicked( int id );
    /**
      Called when the user changes the text in the name of the view.
     */
    void textChanged( const QString &text );
  private:
-    QDict<ViewFactory> *mViewFactoryDict;
+    Q3Dict<ViewFactory> *mViewFactoryDict;
    QLineEdit *mViewNameEdit;
-    QButtonGroup *mTypeGroup;
+    Q3ButtonGroup *mTypeGroup;
    int mTypeId;
 };
 #endif
diff --git a/kaddressbook/details/detailsviewcontainer.cpp b/kaddressbook/details/detailsviewcontainer.cpp
index cee5886..4a86aca 100644
--- a/kaddressbook/details/detailsviewcontainer.cpp
+++ b/kaddressbook/details/detailsviewcontainer.cpp
@@ -1,99 +1,102 @@
 /*                                                                      
    This file is part of KAddressBook.
    Copyright (c) 1996-2002 Mirko Boehm <mirko@kde.org>
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qcombobox.h>
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qwidgetstack.h>
+#include <q3widgetstack.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include "look_basic.h"
 //#include "look_details.h"
 #include "look_html.h"
 #ifdef KAB_EMBEDDED
 #include "kabprefs.h"
 #endif //KAB_EMBEDDED
 #include "detailsviewcontainer.h"
 ViewContainer::ViewContainer( QWidget *parent, const char* name )
  : QWidget( parent, name ), mCurrentLook( 0 )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
  //topLayout->setMargin( KDialog::marginHint() );
  //topLayout->setSpacing( KDialog::spacingHint() );
  topLayout->setMargin( 0 );
  topLayout->setSpacing( 0 );
-  QBoxLayout *styleLayout = new QHBoxLayout( topLayout );    
+  Q3BoxLayout *styleLayout = new Q3HBoxLayout( topLayout );    
  QLabel *label = new QLabel( i18n("Style:"), this );
  styleLayout->addWidget( label );
  mStyleCombo = new QComboBox( this );
  styleLayout->addWidget( mStyleCombo );
-  QFrame *frameRuler = new QFrame( this );
+  Q3Frame *frameRuler = new Q3Frame( this );
 //US  frameRuler->setFrameShape( QFrame::HLine );
 //US  frameRuler->setFrameShadow( QFrame::Sunken );
 //US  topLayout->addWidget( frameRuler );
-  mDetailsStack = new QWidgetStack( this );
+  mDetailsStack = new Q3WidgetStack( this );
  topLayout->addWidget( mDetailsStack, 1 );
  registerLooks();
 #if 1
    // Hide detailed view selection combo box, because we currently have
    // only one. Reenable it when there are more detailed views.
    label->hide();
    mStyleCombo->hide();
    frameRuler->hide();
 #endif
 }
 void ViewContainer::printView()
 {
    mCurrentLook->printView();
 }
 KABBasicLook *ViewContainer::currentLook()
 {
  return mCurrentLook;
 }
 void ViewContainer::registerLooks()
 {
  mLookFactories.append( new KABHtmlViewFactory( mDetailsStack ) );
 //  mLookFactories.append( new KABDetailedViewFactory( mDetailsStack ) );
  mStyleCombo->clear();
  for ( uint i = 0; i < mLookFactories.count(); ++i )
    mStyleCombo->insertItem( mLookFactories.at( i )->description() );
  if ( !mLookFactories.isEmpty() )
@@ -130,35 +133,35 @@ void ViewContainer::slotStyleSelected( int index )
             SIGNAL( browse( const QString& ) ) );
  }
  mCurrentLook->restoreSettings( config );
  mCurrentLook->setAddressee( addr );
 }
 void ViewContainer::setAddressee( const KABC::Addressee& addressee )
 {
  if ( mCurrentLook != 0 ) {
      mCurrentAddressee = addressee;
      mCurrentLook->setAddressee( mCurrentAddressee );
    
  }
 }
 KABC::Addressee ViewContainer::addressee()
 {
  static KABC::Addressee empty; // do not use!
  if ( !mCurrentLook )
    return empty;
  else
    return mCurrentLook->addressee();
 }
 void ViewContainer::setReadOnly( bool state )
 {
  if ( mCurrentLook )
    mCurrentLook->setReadOnly( state );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "detailsviewcontainer.moc"
+#include "moc_detailsviewcontainer.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/detailsviewcontainer.h b/kaddressbook/details/detailsviewcontainer.h
index 9684736..f310a30 100644
--- a/kaddressbook/details/detailsviewcontainer.h
+++ b/kaddressbook/details/detailsviewcontainer.h
@@ -1,103 +1,103 @@
 /*                                                                      
    This file is part of KAddressBook.
    Copyright (c) 1996-2002 Mirko Boehm <mirko@kde.org>
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef DETAILSVIEWCONTAINER_H
 #define DETAILSVIEWCONTAINER_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include "look_basic.h"
 class QComboBox;
-class QWidgetStack;
+class Q3WidgetStack;
 class ViewContainer : public QWidget
 {
  Q_OBJECT
  public:
    ViewContainer( QWidget *parent = 0, const char* name = 0 );
    /**
      Return the look currently selected. If there is none, it
      returns zero. Do not use this pointer to store a reference
      to a look, the user might select another one (e.g., create
      a new object) at any time.
     */
    KABBasicLook *currentLook();
    /**
      Return the contact currently displayed.
     */
    KABC::Addressee addressee();
  public slots:
    void printView();
    /**
      Set the contact currently displayed.
     */
    void setAddressee( const KABC::Addressee& addressee );
    /**
      Set read-write state.
     */
    void setReadOnly( bool state );
  signals:
    /**
      The contact has been changed.
     */
    void addresseeChanged();
    /**
      The user acticated the email address displayed. This may happen
      by, for example, clicking on the displayed mailto-URL.
     */
    void sendEmail( const QString& );
    /**
      The user activated one of the displayed HTTP URLs. For example
      by clicking on the displayed homepage address.
     */
    void browse( const QString& );
  protected:
    /**
      A style has been selected. Overloaded from base class.
     */
    void slotStyleSelected( int );
    /**
      Register the available looks.
     */
    void registerLooks();
  private:
    KABC::Addressee mCurrentAddressee;
    KABBasicLook *mCurrentLook;
-    QPtrList<KABLookFactory> mLookFactories;
+    Q3PtrList<KABLookFactory> mLookFactories;
    QComboBox *mStyleCombo;
-    QWidgetStack *mDetailsStack;
+    Q3WidgetStack *mDetailsStack;
 };
 #endif
diff --git a/kaddressbook/details/look_basic.cpp b/kaddressbook/details/look_basic.cpp
index 0245686..48cc42a 100644
--- a/kaddressbook/details/look_basic.cpp
+++ b/kaddressbook/details/look_basic.cpp
@@ -1,75 +1,75 @@
 /*                                                                      
    This file is part of KAddressBook.
    Copyright (c) 1996-2002 Mirko Boehm <mirko@kde.org>
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <kdebug.h>
 #include "look_basic.h"
 KABBasicLook::KABBasicLook( QWidget *parent, const char *name )
-  : QVBox( parent, name ), mReadOnly( false )
+  : Q3VBox( parent, name ), mReadOnly( false )
 {
 }
 void KABBasicLook::setReadOnly( bool state )
 {
  mReadOnly = state;
 }
 bool KABBasicLook::isReadOnly() const
 {
  return mReadOnly;
 }
 void KABBasicLook::setAddressee( const KABC::Addressee &addr )
 {
  if ( mAddressee == addr )
    return;
  mAddressee = addr;
  repaint( false );
 }
 KABC::Addressee KABBasicLook::addressee()
 {
  return mAddressee;
 }
 void KABBasicLook::restoreSettings( KConfig* )
 {
 }
 void KABBasicLook::saveSettings( KConfig* )
 {
 }
 KABLookFactory::KABLookFactory( QWidget *parent, const char *name )
  : mParent( parent ), mName( name )
 {
 }
 KABLookFactory::~KABLookFactory()
 {
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "look_basic.moc"
+#include "moc_look_basic.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/look_basic.h b/kaddressbook/details/look_basic.h
index a65c99c..a70e7f7 100644
--- a/kaddressbook/details/look_basic.h
+++ b/kaddressbook/details/look_basic.h
@@ -1,76 +1,76 @@
 /*                                                                      
    This file is part of KAddressBook.
    Copyright (c) 1996-2002 Mirko Boehm <mirko@kde.org>
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef LOOK_KABBASIC_H
 #define LOOK_KABBASIC_H
 #include <kabc/addressbook.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 class KConfig;
 /**
  This is a pure virtual base class that defines the
  interface for how to display and change entries of
  the KDE addressbook.
  This basic widget does not show anything in its client space.
  Derive it and implement its look and how the user may edit the
  entry.
  The paintEvent() has to paint the whole widget, since repaint()
  calls will not delete the widgets background.
 */
-class KABBasicLook : public QVBox
+class KABBasicLook : public Q3VBox
 {
  Q_OBJECT
  public:
    /**
      The constructor.
     */
    KABBasicLook( QWidget *parent = 0, const char *name = 0 );
    /**
      Set the entry. It will be displayed automatically.
     */
    virtual void setAddressee( const KABC::Addressee& addressee );
    /**
      Get the current entry.
     */
    virtual KABC::Addressee addressee();
    /**
      Configure the view from the configuration file.
     */
    virtual void restoreSettings( KConfig* );
    /**
      Save the view settings to the configuration file.
     */
    virtual void saveSettings( KConfig* );
    /**
      Retrieve read-write state.
     */
diff --git a/kaddressbook/details/look_details.cpp b/kaddressbook/details/look_details.cpp
index 11d06e9..2c3a79d 100644
--- a/kaddressbook/details/look_details.cpp
+++ b/kaddressbook/details/look_details.cpp
@@ -160,68 +160,68 @@ void KABDetailedView::paintEvent( QPaintEvent* )
  mPainter->setShowURLs( mActionShowURLs->isChecked() );
  mPainter->printAddressee( addressee(), QRect( 0, 0, entryArea.width(),
                            entryArea.height() ), &p );
  p.end();
  bitBlt( this, 0, 0, &pm );
 }
 void KABDetailedView::mouseMoveEvent( QMouseEvent *e )
 {
  QPoint bias( mGrid, mGrid );
  int rc;
  bool hit = false;
  if ( ( rc = mPainter->hitsEmail( e->pos() - bias ) ) != -1 )
    hit = true;
  else if ( ( rc = mPainter->hitsURL( e->pos() - bias ) ) != -1 )
    hit = true;
  else if ( ( rc = mPainter->hitsPhone( e->pos() - bias ) ) != -1 )
    hit = true;
  else if ( ( rc = mPainter->hitsTalk( e->pos() - bias ) ) != -1 )
    hit = true;
  if ( hit ) {
    if ( cursor().shape() != PointingHandCursor )
      setCursor( PointingHandCursor );
    else if( cursor().shape() != ArrowCursor )
      setCursor(ArrowCursor);
  }
 }
 void KABDetailedView::mousePressEvent( QMouseEvent *e )
 {
-  QPopupMenu menu( this );
+  Q3PopupMenu menu( this );
-  QPopupMenu *menuBG = new QPopupMenu( &menu );
+  Q3PopupMenu *menuBG = new Q3PopupMenu( &menu );
-  mMenuBorderedBG = new QPopupMenu( &menu );
+  mMenuBorderedBG = new Q3PopupMenu( &menu );
-  mMenuTiledBG = new QPopupMenu( &menu );
+  mMenuTiledBG = new Q3PopupMenu( &menu );
  menu.insertItem( i18n( "Select Background" ), menuBG );
  menuBG->insertItem( i18n( "Bordered Backgrounds" ), mMenuBorderedBG );
  menuBG->insertItem( i18n( "Tiled Backgrounds" ), mMenuTiledBG );
  menu.insertSeparator();
  QPoint point = e->pos() - QPoint( mGrid, mGrid );
  int rc;
  QStringList dirsBorderedBG, dirsTiledBG;
  QDir dir;
  switch( e->button() ) {
    case QMouseEvent::RightButton:
      if ( isReadOnly() )
        menu.setItemEnabled( menu.idAt( 0 ), false );
      else {
        // TODO: settings need to be saved in view options
        dirsBorderedBG = KGlobal::instance()->dirs()->findDirs( "data", mBorderedBGDir );
        if ( dirsBorderedBG.count() > 0 ) {
          dir.setPath( dirsBorderedBG[ 0 ] );
          mBorders = dir.entryList( QDir::Files );
          for ( uint count = 0; count < mBorders.count(); ++count )
            mMenuBorderedBG->insertItem( mBorders[ count ], count );
          connect( mMenuBorderedBG, SIGNAL( activated( int ) ),
                   SLOT( slotBorderedBGSelected( int ) ) );
        } else
          menuBG->setItemEnabled( menuBG->idAt( 0 ), false );
        dirsTiledBG = KGlobal::instance()->dirs()->findDirs( "data", mTiledBGDir );
        if ( dirsTiledBG.count() > 0 ) {
          dir.setPath( dirsTiledBG[ 0 ] );
@@ -385,35 +385,35 @@ void KABDetailedView::restoreSettings( KConfig *config )
      }
    }
    if ( count == dirs.count() ) {
      mUseDefaultBGImage = getBackground( bgImage, mDefaultBGImage );
      if ( !mUseDefaultBGImage )
        kdDebug(5720) << "KABDetailedView::configure: "
                      << "default BG image selected, but could not be loaded."
                      << endl;
    }
  }
  mDefaultBGColor = config->readColorEntry( ConfigView_DefaultBackgroundColor, &white );
  mHeadLineBGColor = config->readColorEntry( ConfigView_HeadlineBGColor, &darkBlue );
  mHeadLineTextColor = config->readColorEntry( ConfigView_HeadlineTextColor, &yellow );
  mUseHeadLineBGColor = config->readBoolEntry( ConfigView_UseHeadlineBGColor, true );
  if ( !mPainter )
    mPainter = new KABEntryPainter;
  mPainter->setForegroundColor( black );
  mPainter->setHeaderColor( mHeadLineTextColor );
  mPainter->setUseHeaderColor( mUseHeadLineBGColor );
  mPainter->setBackgroundColor( mHeadLineBGColor );
  mPainter->setHeaderFont( QFont( gfont, gpointsize + 4, QFont::Bold, true ) );
  mPainter->setHeadLineFont( QFont( gfont, gpointsize + 2, QFont::Bold, true ) );
  mPainter->setBodyFont( QFont( gfont, gpointsize, QFont::Normal, false ) );
  mPainter->setFixedFont( QFont( ffont, fpointsize, QFont::Normal, false ) );
  mPainter->setCommentFont( QFont( gfont, gpointsize, QFont::Normal, false ) );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "look_details.moc"
+#include "moc_look_details.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/details/look_details.h b/kaddressbook/details/look_details.h
index e8d50a9..b59d3a7 100644
--- a/kaddressbook/details/look_details.h
+++ b/kaddressbook/details/look_details.h
@@ -101,57 +101,57 @@ class KABDetailedView : public KABBasicLook
    */
    bool getBackground( QString path, QPixmap& image );
  private:
    QPtrList<QRect> mURLRects;
    QPtrList<QRect> mEmailRects;
    QPtrList<QRect> mPhoneRects;
    KABEntryPainter *mPainter;
    QMap<QString, QPixmap> mBackgroundMap;
    QPixmap mCurrentBackground;
    BackgroundStyle mBackgroundStyle;
    bool mUseDefaultBGImage;
    bool mUseHeadLineBGColor;
    QColor mDefaultBGColor;
    QColor mHeadLineBGColor;
    QColor mHeadLineTextColor;
    QPixmap mDefaultBGImage;
    KToggleAction *mActionShowAddresses;
    KToggleAction *mActionShowEmails;
    KToggleAction *mActionShowPhones;
    KToggleAction *mActionShowURLs;
    const int mGrid;
    QStringList mBorders;
    QStringList mTiles;
-    QPopupMenu *mMenuBorderedBG;
+    Q3PopupMenu *mMenuBorderedBG;
-    QPopupMenu *mMenuTiledBG;
+    Q3PopupMenu *mMenuTiledBG;
    static const QString mBorderedBGDir;
    static const QString mTiledBGDir;
 };
 class KABDetailedViewFactory : public KABLookFactory
 {
  public:
    KABDetailedViewFactory( QWidget *parent = 0, const char *name = 0 )
      : KABLookFactory( parent, name ) {}
    KABBasicLook *create()
    {
      return new KABDetailedView( mParent, mName );
    }
    QString description()
    {
      return i18n( "Detailed Style: Display all details, no modifications." );
    }
 };
 #endif
diff --git a/kaddressbook/details/look_html.cpp b/kaddressbook/details/look_html.cpp
index bb30650..4ec1c7d 100644
--- a/kaddressbook/details/look_html.cpp
+++ b/kaddressbook/details/look_html.cpp
@@ -1,56 +1,56 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <addresseeview.h>
 #include "look_html.h"
-#include <qscrollview.h> 
+#include <q3scrollview.h> 
 #include "kabprefs.h"
 #include <kabc/addresseeview.h>
 KABHtmlView::KABHtmlView( QWidget *parent, const char *name )
  : KABBasicLook( parent, name )
 {
    mView = new KABC::AddresseeView( this ); 
    mView->setFont( KABPrefs::instance()->mDetailsFont );
    connect(this, SIGNAL(printMyView()),
          this , SLOT(printMe()));
 }
 KABHtmlView::~KABHtmlView()
 {
 }
 void KABHtmlView::printMe()
 {
    mView->printMe();
 }
 void KABHtmlView::setAddressee( const KABC::Addressee &addr )
 {
  mView->setFont( KABPrefs::instance()->mDetailsFont );
  mView->setAddressee( addr );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "look_html.moc"
+#include "moc_look_html.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index e72face..09df47f 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -1,90 +1,92 @@
 /*
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qstring.h>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #endif //KAB_EMBEDDED
 #include <kconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include "emaileditwidget.h"
 EmailEditWidget::EmailEditWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2, 2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2, 2 );
  topLayout->setSpacing( KDialog::spacingHint() );
  QLabel* label = new QLabel( this );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "mail_send", KIcon::Desktop, 0) );
  topLayout->addWidget( label, 0, 0 );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
  QPushButton *editButton = new QPushButton( i18n( "Edit Email Addresses..." ), this);
  topLayout->addWidget( editButton,  0, 1 );
  label = new QLabel( i18n( "Email:" ), this );
  topLayout->addWidget( label, 1, 0 );
  mEmailEdit = new KLineEdit( this );
  connect( mEmailEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( textChanged( const QString& ) ) );
  connect( mEmailEdit, SIGNAL( textChanged( const QString& ) ),
           SIGNAL( modified() ) );
  label->setBuddy( mEmailEdit );
  topLayout->addWidget( mEmailEdit, 1, 1 );
 
  connect( editButton, SIGNAL( clicked() ), SLOT( edit() ) );
  topLayout->activate();
 }
 EmailEditWidget::~EmailEditWidget()
 {
 }
 void EmailEditWidget::setEmails( const QStringList &list )
 {
  mEmailList = list;
  bool blocked = mEmailEdit->signalsBlocked();
  mEmailEdit->blockSignals( true );
  if ( list.count() > 0 )
    mEmailEdit->setText( list[ 0 ] );
  else
@@ -108,82 +110,82 @@ QStringList EmailEditWidget::emails()
 }
 void EmailEditWidget::edit()
 {
  EmailEditDialog dlg( mEmailList, this );
  if ( dlg.exec() ) {
    if ( dlg.changed() ) {
      mEmailList = dlg.emails();
      mEmailEdit->setText( mEmailList[ 0 ] );
      emit modified();
    }
  }
 }
 void EmailEditWidget::textChanged( const QString &text )
 {
  if ( mEmailList.count() > 0 )
    mEmailList.remove( mEmailList.begin() );
  mEmailList.prepend( text );
 }
 EmailEditDialog::EmailEditDialog( const QStringList &list, QWidget *parent,
                                  const char *name )
  : KDialogBase( KDialogBase::Plain, i18n( "Edit Email Addresses" ),
                 KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                 parent, name, true )
 {
  QWidget *page = plainPage();
-  QGridLayout *topLayout = new QGridLayout( page, 4, 3 );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 4, 3 );
  QLabel *label = new QLabel( i18n( "Email address:" ), page );
  topLayout->addWidget( label, 0, 0 );
  mEmailEdit = new KLineEdit( page );
  label->setBuddy( mEmailEdit );
  topLayout->addWidget( mEmailEdit, 0, 1 );
  connect( mEmailEdit, SIGNAL( returnPressed() ), SLOT( add() ) );
  connect( mEmailEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( emailChanged() ) );
  mAddButton = new QPushButton( i18n( "Add" ), page );
  mAddButton->setEnabled( false );
  connect( mAddButton, SIGNAL( clicked() ), SLOT( add() ) );
  topLayout->addWidget( mAddButton, 0, 2 );
-  mEmailListBox = new QListBox( page );
+  mEmailListBox = new Q3ListBox( page );
  // Make sure there is room for the scrollbar
  mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 );
  connect( mEmailListBox, SIGNAL( highlighted( int ) ),
           SLOT( selectionChanged( int ) ) );
  topLayout->addMultiCellWidget( mEmailListBox, 1, 3, 0, 1 );
  mEditButton = new QPushButton( i18n( "Change" ), page );
  connect( mEditButton, SIGNAL( clicked() ), SLOT( edit() ) );
  topLayout->addWidget( mEditButton, 1, 2 );
  mRemoveButton = new QPushButton( i18n( "Remove" ), page );
  connect( mRemoveButton, SIGNAL( clicked() ), SLOT( remove() ) );
  topLayout->addWidget( mRemoveButton, 2, 2 );
  mStandardButton = new QPushButton( i18n( "Set Standard" ), page );
  connect( mStandardButton, SIGNAL( clicked() ), SLOT( standard() ) );
  topLayout->addWidget( mStandardButton, 3, 2 );
  topLayout->activate();
  QStringList items = list;
 qDebug("EmailEditDialog::EmailEditDialog has to be changed (lowPrio)");
 //US must be fixed !!!
 /*    
  if ( items.remove( "" ) > 0 )
    mChanged = true;
  else
    mChanged = false;
 */
    
  mEmailListBox->insertStringList( items );
@@ -243,35 +245,35 @@ void EmailEditDialog::remove()
  }
 }
 bool EmailEditDialog::changed() const
 {
  return mChanged;
 }
 void EmailEditDialog::standard()
 {
  QString text = mEmailListBox->currentText();
  mEmailListBox->removeItem( mEmailListBox->currentItem() );
  mEmailListBox->insertItem( text, 0 );
  mEmailListBox->setSelected( 0, true );
  mChanged = true;
 }
 void EmailEditDialog::selectionChanged( int index )
 {
  bool value = ( index >= 0 ); // An item is selected
  mRemoveButton->setEnabled( value );
  mEditButton->setEnabled( value );
  mStandardButton->setEnabled( value );
 }
 void EmailEditDialog::emailChanged()
 {
  mAddButton->setEnabled( !mEmailEdit->text().isEmpty() );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "emaileditwidget.moc"
+#include "moc_emaileditwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h
index acdecaf..618acee 100644
--- a/kaddressbook/emaileditwidget.h
+++ b/kaddressbook/emaileditwidget.h
@@ -1,101 +1,101 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef EMAILEDITWIDGET_H
 #define EMAILEDITWIDGET_H
 #include <kabc/addressee.h>
 #include <kdialogbase.h>
 #include "addresseeconfig.h"
-class QButtonGroup;
+class Q3ButtonGroup;
 class QCheckBox;
-class QListView;
+class Q3ListView;
-class QListBox;
+class Q3ListBox;
-class QTextEdit;
+class Q3TextEdit;
 class QToolButton;
 class KComboBox;
 class KLineEdit;
 class KListView;
 /**
  This widget displays a list box of the email addresses as well as buttons
  to manipulate them (up, down, add, remove).
 */
 class EmailEditWidget : public QWidget
 {
  Q_OBJECT
  public:
    EmailEditWidget( QWidget *parent, const char *name = 0 );
    ~EmailEditWidget();
    void setEmails( const QStringList &list );
    QStringList emails();
  signals:
    void modified();
    
  private slots:
    void edit();
    void textChanged( const QString& );
  private:
    KLineEdit *mEmailEdit;
    QStringList mEmailList;
 };
 class EmailEditDialog : public KDialogBase
 {
  Q_OBJECT
  
  public:
    EmailEditDialog( const QStringList &list, QWidget *parent,
                     const char *name = 0 );
    ~EmailEditDialog();
    QStringList emails() const;
    bool changed() const;
  protected slots:
    void add();
    void remove();
    void edit();
    void standard();
    void selectionChanged( int );
    void emailChanged();
  private:
    KLineEdit *mEmailEdit;
-    QListBox *mEmailListBox;
+    Q3ListBox *mEmailListBox;
    QPushButton *mAddButton;
    QPushButton *mRemoveButton;
    QPushButton *mEditButton;
    QPushButton *mStandardButton;
    bool mChanged;
 };
 #endif
diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp
index 46defa1..5356224 100644
--- a/kaddressbook/extensionmanager.cpp
+++ b/kaddressbook/extensionmanager.cpp
@@ -1,93 +1,95 @@
 /*
    This file is part of KAddressbook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qlayout.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
 #include <kactionclasses.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else //KAB_EMBEDDED
 #include <features/mergewidget.h>
 #include <features/distributionlistwidget.h>
 #endif //KAB_EMBEDDED
 #include "addresseeeditorwidget.h"
 #include "kabcore.h"
 #include "kabprefs.h"
 #include "extensionmanager.h"
 ExtensionManager::ExtensionManager( KABCore *core, QWidget *parent,
                                    const char *name )
-  : QScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 )
+  : Q3ScrollView( parent, name ), mCore( core ), mCurrentExtensionWidget( 0 )
 {
 #ifdef KAB_EMBEDDED
 //US  QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu();
  QWidget *settingsmenu = (QWidget*)mCore->getViewMenu();
 #endif //KAB_EMBEDDED
  mActionExtensions = new KSelectAction( i18n( "Show Extension Bar" ), 0,
                                         mCore->actionCollection(),
                                         "options_show_extensions" );
  mActionExtensions->plug( settingsmenu ,0);
  connect( mActionExtensions, SIGNAL( activated( int ) ),
           SLOT( setActiveExtension( int ) ) );
  mWidgetBox = new QWidget( viewport() );
-  new QHBoxLayout (mWidgetBox  );
+  new Q3HBoxLayout (mWidgetBox  );
  addChild( mWidgetBox );
  setResizePolicy(AutoOneFit);
  createExtensionWidgets();
  hide();
 }
 ExtensionManager::~ExtensionManager()
 {
 }
 void ExtensionManager::restoreSettings()
 {
  mActionExtensions->setCurrentItem( KABPrefs::instance()->mCurrentExtension );
  int i = 1;
  mCurrentExtensionWidget = mExtensionWidgetList.at( i-1 );
  while ( mCurrentExtensionWidget ) {
      if( i != KABPrefs::instance()->mCurrentExtension )
          mCurrentExtensionWidget->hide();
      mCurrentExtensionWidget  = mExtensionWidgetList.at( ++i-1 );
  }
  setActiveExtension( mActionExtensions->currentItem() );
 }
 void ExtensionManager::saveSettings()
 {
  KABPrefs::instance()->mCurrentExtension = mActionExtensions->currentItem();
 }
 void ExtensionManager::reconfigure()
 {
  saveSettings();
@@ -119,76 +121,76 @@ void ExtensionManager::setActiveExtension( int id )
 #endif //KAB_EMBEDDED
  } else if ( id > 0 ) {
    if ( mCurrentExtensionWidget )
      mCurrentExtensionWidget->hide();
    mCurrentExtensionWidget = mExtensionWidgetList.at( id - 1 );
    if ( mCurrentExtensionWidget ) {
 #ifndef DESKTOP_VERSION
 //US  our screen is so small, that we better hide the detailscreen, just in case.
 //US      mCore->setDetailsVisible( false );
 #endif //KAB_EMBEDDED
      show();
      mWidgetBox->show();
      mCurrentExtensionWidget->show();
    } else {
      hide();
      mCurrentExtensionWidget = 0;
 #ifndef DESKTOP_VERSION
 //US  our screen is so small, that we better hide the detailscreen, just in case.
 //US    mCore->setDetailsToState( );
 #endif //KAB_EMBEDDED
    }
  }
  emit changedActiveExtension( id );
 }
 void ExtensionManager::createExtensionWidgets()
 {
  // clear extension widget list
  mExtensionWidgetList.setAutoDelete( true );
-  QPtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList );
+  Q3PtrListIterator<ExtensionWidget> wdgIt( mExtensionWidgetList );
  ExtensionWidget *wdg = 0;
  while ( ( wdg = wdgIt.current() ) != 0 )
    mExtensionWidgetList.remove( wdg );
  mExtensionWidgetList.setAutoDelete( false );
  QStringList extensionNames( i18n( "None" ) );
  // add addressee editor as default
-  QHBoxLayout *hbl = (QHBoxLayout *) mWidgetBox->layout();;
+  Q3HBoxLayout *hbl = (Q3HBoxLayout *) mWidgetBox->layout();;
  wdg = new AddresseeEditorWidget( mCore, true, mWidgetBox );
  hbl->addWidget( wdg );
  //wdg->hide();
  connect( wdg, SIGNAL( modified( const KABC::Addressee::List& ) ),
           SIGNAL( modified( const KABC::Addressee::List& ) ) );
  mExtensionWidgetList.append( wdg );
  extensionNames.append( wdg->title() );
  // load the other extensions
  QStringList activeExtensions = KABPrefs::instance()->mActiveExtensions;
 #ifndef KAB_EMBEDDED
  KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/Extension" );
  KTrader::OfferList::ConstIterator it;
  for ( it = plugins.begin(); it != plugins.end(); ++it ) {
    if ( !(*it)->hasServiceType( "KAddressBook/Extension" ) )
      continue;
    KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
    if ( !factory ) {
        //kdDebug(5720) << "ExtensionManager::loadExtensions(): Factory creation failed" << endl;
      continue;
    }
    ExtensionFactory *extensionFactory = static_cast<ExtensionFactory*>( factory );
    if ( !extensionFactory ) {
        //kdDebug(5720) << "ExtensionManager::loadExtensions(): Cast failed" << endl;
      continue;
    }
@@ -215,35 +217,35 @@ void ExtensionManager::createExtensionWidgets()
          //wdg->hide();
        connect( wdg, SIGNAL( modified( const KABC::Addressee::List& ) ),
                 SIGNAL( modified( const KABC::Addressee::List& ) ) );
        mExtensionWidgetList.append( wdg );
        extensionNames.append( wdg->title() );
      }
    }
    //load DistributionListfactory/extension
    extensionFactory = new DistributionListFactory();
    if (activeExtensions.contains( extensionFactory->identifier() ) )
    {
      wdg = extensionFactory->extension( mCore, mWidgetBox );
      if ( wdg ) {
          hbl->addWidget( wdg );
          //wdg->hide();
        connect( wdg, SIGNAL( modified( const KABC::Addressee::List& ) ),
                 SIGNAL( modified( const KABC::Addressee::List& ) ) );
        mExtensionWidgetList.append( wdg );
        extensionNames.append( wdg->title() );
      }
    }
    hbl->addStretch();
 #endif //KAB_EMBEDDED
  mActionExtensions->setItems( extensionNames );
  mCurrentExtensionWidget = 0;
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "extensionmanager.moc"
+#include "moc_extensionmanager.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h
index 611a037..84c948b 100644
--- a/kaddressbook/extensionmanager.h
+++ b/kaddressbook/extensionmanager.h
@@ -1,89 +1,89 @@
 /*
    This file is part of KAddressbook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef EXTENSIONMANAGER_H
 #define EXTENSIONMANAGER_H
-#include <qhbox.h>
+#include <q3hbox.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <extensionwidget.h>
 class KABCore;
 class KSelectAction;
-class ExtensionManager : public QScrollView
+class ExtensionManager : public Q3ScrollView
 {
  Q_OBJECT
  public:
    ExtensionManager( KABCore *core, QWidget *parent, const char *name = 0 );
    ~ExtensionManager();
    /**
      Restores the extension manager specific settings.
     */
    void restoreSettings();
    /**
      Saves the extension manager specific settings.
     */
    void saveSettings();
    /**
      Rereads the extension manager specific settings with some
      additional initialization stuff.
     */
    void reconfigure();
    /**
      Returns whether the quickedit extension is currently visible.
     */
    bool isQuickEditVisible() const;
  public slots:
    void setSelectionChanged();
  signals:
    void modified( const KABC::Addressee::List& );
    void changedActiveExtension( int id );
  private slots:
    void setActiveExtension( int id );
  private:
    void createExtensionWidgets();
    KABCore *mCore;
    QWidget *mWidgetBox;
    ExtensionWidget *mCurrentExtensionWidget;
-    QPtrList<ExtensionWidget> mExtensionWidgetList;
+    Q3PtrList<ExtensionWidget> mExtensionWidgetList;
    KSelectAction *mActionExtensions;
 };
 #endif
diff --git a/kaddressbook/extensionwidget.cpp b/kaddressbook/extensionwidget.cpp
index 69f4aa8..7c3b415 100644
--- a/kaddressbook/extensionwidget.cpp
+++ b/kaddressbook/extensionwidget.cpp
@@ -49,36 +49,35 @@ bool ExtensionWidget::contactsSelected() const
 KABC::Addressee::List ExtensionWidget::selectedContacts()
 {
  KABC::Addressee::List list;
  QStringList uids = mCore->selectedUIDs();
  QStringList::Iterator it;
  for ( it = uids.begin(); it != uids.end(); ++it )
    list.append( mCore->addressBook()->findByUid( *it ) );
  return list;
 }
 void ExtensionWidget::contactsSelectionChanged()
 {
  // do nothing
 }
 QString ExtensionWidget::title() const
 {
  return "<bug!!!>";
 }
 QString ExtensionWidget::identifier() const
 {
  return "<bug!!!>";
 }
 ConfigureWidget *ExtensionFactory::configureWidget( QWidget*, const char* )
 {
  return 0;
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "extensionwidget.moc"
+#include "moc_extensionwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/extensionwidget.h b/kaddressbook/extensionwidget.h
index fc91f21..9fcfba9 100644
--- a/kaddressbook/extensionwidget.h
+++ b/kaddressbook/extensionwidget.h
@@ -57,63 +57,63 @@ class ExtensionWidget : public QWidget
      Use @ref addresseesSelected() to test if there exists selected
      contacts.
     */
    KABC::Addressee::List selectedContacts();
    /**
      This method is called whenever the selection in the view changed.
     */
    virtual void contactsSelectionChanged();
    /**
      This method should be reimplemented and return the i18ned title of this
      widget.
     */
    virtual QString title() const;
    /**
      This method should be reimplemented and return a unique identifier.
     */
    virtual QString identifier() const;
  signals:
    void modified( const KABC::Addressee::List &list );
  private:
    KABCore *mCore;
    class ExtensionWidgetPrivate;
    ExtensionWidgetPrivate *d;
 };
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class ExtensionFactory : public KLibFactory
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
 class ExtensionFactory
 #endif //KAB_EMBEDDED
 {
  public:
    virtual ExtensionWidget *extension( KABCore *core, QWidget *parent,
                                        const char *name = 0 ) = 0;
    virtual ConfigureWidget *configureWidget( QWidget *parent,
                                              const char *name = 0 );
    virtual bool configureWidgetAvailable() { return false; }
    /**
      This method should return the same identifier like the config
      widget.
     */
    virtual QString identifier() const = 0;
  protected:
    virtual QObject* createObject( QObject*, const char*, const char*,
                                   const QStringList & )
    {
      return 0;
    }
 };
 #endif
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index bfcb121..996177b 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -1,202 +1,209 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
+#include <QDragEnterEvent>
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 #include <klineeditdlg.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kabc/addressbook.h>
 #include <kabc/addresseedialog.h>
 #include <kabc/distributionlist.h>
 #include <kabc/vcardconverter.h>
 #ifndef KAB_EMBEDDED
 #include <libkdepim/kvcarddrag.h>
 #endif //KAB_EMBEDDED
 #include "kabcore.h"
 #include "distributionlistwidget.h"
 #ifndef KAB_EMBEDDED
 class DistributionListFactory : public ExtensionFactory
 {
  public:
    ExtensionWidget *extension( KABCore *core, QWidget *parent, const char *name )
    {
      return new DistributionListWidget( core, parent, name );
    }
    QString identifier() const
    {
      return "distribution_list_editor";
    }
 };
 extern "C" {
  void *init_libkaddrbk_distributionlist()
  {
    return ( new DistributionListFactory );
  }
 }
 #endif //KAB_EMBEDDED
-class ContactItem : public QListViewItem
+class ContactItem : public Q3ListViewItem
 {
  public:
    ContactItem( DistributionListView *parent, const KABC::Addressee &addressee,
               const QString &email = QString::null ) :
-      QListViewItem( parent ),
+      Q3ListViewItem( parent ),
      mAddressee( addressee ),
      mEmail( email )
    {
      setText( 0, addressee.realName() );
      if( email.isEmpty() ) {
        setText( 1, addressee.preferredEmail() );
        setText( 2, i18n( "Yes" ) );
      } else {
        setText( 1, email );
        setText( 2, i18n( "No" ) );
      }
    }
    KABC::Addressee addressee() const
    {
      return mAddressee;
    }
    QString email() const
    {
      return mEmail;
    }
  protected:
    bool acceptDrop( const QMimeSource* )
    {
      return true;
    }
  private:
    KABC::Addressee mAddressee;
    QString mEmail;
 };
 DistributionListWidget::DistributionListWidget( KABCore *core, QWidget *parent,
                                                const char *name )
  : ExtensionWidget( core, parent, name ), mManager( 0 )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 3, 4, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 3, 4, KDialog::marginHint(),
                                            KDialog::spacingHint() );
  if (KGlobal::getOrientation() == KGlobal::Portrait)
  {
    mCreateListButton = new QPushButton( i18n( "New List" ), this );
    mEditListButton = new QPushButton( i18n( "Ren List" ), this );
    mRemoveListButton = new QPushButton( i18n( "Del List" ), this );
    mAddContactButton = new QPushButton( i18n( "Add Cont." ), this );
    mChangeEmailButton = new QPushButton( i18n( "Chge Email" ), this );
    mRemoveContactButton = new QPushButton( i18n( "Del Cont." ), this );
  }
  else
  {
    mCreateListButton = new QPushButton( i18n( "New List..." ), this );
    mEditListButton = new QPushButton( i18n( "Rename List..." ), this );
    mRemoveListButton = new QPushButton( i18n( "Remove List" ), this );
    mAddContactButton = new QPushButton( i18n( "Add Contact" ), this );
    mChangeEmailButton = new QPushButton( i18n( "Change Email..." ), this );
    mRemoveContactButton = new QPushButton( i18n( "Remove Contact" ), this );
  }                                        
  mNameCombo = new QComboBox( this );
  topLayout->addWidget( mNameCombo, 0, 0 );
  connect( mNameCombo, SIGNAL( activated( int ) ), SLOT( updateContactView() ) );
  topLayout->addWidget( mCreateListButton, 0, 1 );
  connect( mCreateListButton, SIGNAL( clicked() ), SLOT( createList() ) );
  topLayout->addWidget( mEditListButton, 0, 2 );
  connect( mEditListButton, SIGNAL( clicked() ), SLOT( editList() ) );
  topLayout->addWidget( mRemoveListButton, 0, 3 );
  connect( mRemoveListButton, SIGNAL( clicked() ), SLOT( removeList() ) );
  mContactView = new DistributionListView( this );
  mContactView->addColumn( i18n( "Name" ) );
  mContactView->addColumn( i18n( "Email" ) );
  mContactView->addColumn( i18n( "Use Preferred" ) );
  mContactView->setEnabled( false );
  mContactView->setAllColumnsShowFocus( true );
  mContactView->setMinimumHeight( 30 );
  
  topLayout->addMultiCellWidget( mContactView, 1, 1, 0, 3 );
  connect( mContactView, SIGNAL( selectionChanged() ),
           SLOT( selectionContactViewChanged() ) );
-  connect( mContactView, SIGNAL( dropped( QDropEvent*, QListViewItem* ) ),
+  connect( mContactView, SIGNAL( dropped( QDropEvent*, Q3ListViewItem* ) ),
-           SLOT( dropped( QDropEvent*, QListViewItem* ) ) );
+           SLOT( dropped( QDropEvent*, Q3ListViewItem* ) ) );
  mAddContactButton->setEnabled( false );
  topLayout->addWidget( mAddContactButton, 2, 0 );
  connect( mAddContactButton, SIGNAL( clicked() ), SLOT( addContact() ) );
  topLayout->addWidget( mChangeEmailButton, 2, 2 );
  connect( mChangeEmailButton, SIGNAL( clicked() ), SLOT( changeEmail() ) );
  topLayout->addWidget( mRemoveContactButton, 2, 3 );
  connect( mRemoveContactButton, SIGNAL( clicked() ), SLOT( removeContact() ) );
  mManager = new KABC::DistributionListManager( core->addressBook() );
  mManager->load();
  updateNameCombo();
 #ifdef KAB_EMBEDDED
 //  if (KGlobal::getOrientation() == KGlobal::Portrait)
 //    parent->setMaximumSize( KGlobal::getDesktopWidth() , 150);
 #endif //KAB_EMBEDDED
  
 #ifndef KAB_EMBEDDED
  KAcceleratorManager::manage( this );
 #endif //KAB_EMBEDDED
 }
 DistributionListWidget::~DistributionListWidget()
 {
  delete mManager;
 }
 void DistributionListWidget::save()
@@ -381,121 +388,121 @@ void DistributionListWidget::dropEvent( QDropEvent *e )
 #endif //KAB_EMBEDDED
    QStringList list = QStringList::split( "\r\n\r\n", vcards );
    QStringList::Iterator it;
    KABC::VCardConverter converter;
    for ( it = list.begin(); it != list.end(); ++it ) {
      KABC::Addressee addr;
      if ( converter.vCardToAddressee( (*it).stripWhiteSpace(), addr ) )
        distributionList->insertEntry( addr );
    }
    changed();
    updateContactView();
 #ifndef KAB_EMBEDDED
  }
 #endif //KAB_EMBEDDED
 }
 void DistributionListWidget::contactsSelectionChanged()
 {
  mAddContactButton->setEnabled( contactsSelected() && mNameCombo->count() > 0 );
 }
 QString DistributionListWidget::title() const
 {
  return i18n( "Distribution List Editor" );
 }
 QString DistributionListWidget::identifier() const
 {
  return "distribution_list_editor";
 }
-void DistributionListWidget::dropped( QDropEvent *e, QListViewItem* )
+void DistributionListWidget::dropped( QDropEvent *e, Q3ListViewItem* )
 {
  dropEvent( e );
 }
 void DistributionListWidget::changed()
 {
  save();
 }
 DistributionListView::DistributionListView( QWidget *parent, const char* name )
  : KListView( parent, name )
 {
  setDragEnabled( true );
  setAcceptDrops( true );
  setAllColumnsShowFocus( true );
 }
 void DistributionListView::dragEnterEvent( QDragEnterEvent* e )
 {
 #ifndef KAB_EMBEDDED
-  bool canDecode = QTextDrag::canDecode( e );
+  bool canDecode = Q3TextDrag::canDecode( e );
  e->accept( canDecode );
 #endif //KAB_EMBEDDED
 }
 void DistributionListView::viewportDragMoveEvent( QDragMoveEvent *e )
 {
 #ifndef KAB_EMBEDDED
-  bool canDecode = QTextDrag::canDecode( e );
+  bool canDecode = Q3TextDrag::canDecode( e );
  e->accept( canDecode );
 #endif //KAB_EMBEDDED
 }
 void DistributionListView::viewportDropEvent( QDropEvent *e )
 {
  emit dropped( e, 0 );
 }
 void DistributionListView::dropEvent( QDropEvent *e )
 {
  emit dropped( e, 0 );
 }
 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;
  for( it = emails.begin(); it != emails.end(); ++it ) {
    QRadioButton *button = new QRadioButton( *it, mButtonGroup );
    if ( (*it) == current ) {
      button->setDown( true );
    }
  }
 }
 QString EmailSelector::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
  if ( button )
    return button->text();
  return QString::null;
 }
 QString EmailSelector::getEmail( const QStringList &emails,
                                 const QString &current, QWidget *parent )
 {
  EmailSelector dlg( emails, current, parent );
  dlg.exec();
  return dlg.selected();
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "distributionlistwidget.moc"
+#include "moc_distributionlistwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 82bac3d..f619389 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -1,143 +1,148 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef DISTRIBUTIONLISTWIDGET_H
 #define DISTRIBUTIONLISTWIDGET_H
 #include <kdialogbase.h>
 #include <klistview.h>
 #include "extensionwidget.h"
+//Added by qt3to4:
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QLabel>
+#include <QDragMoveEvent>
-class QButtonGroup;
+class Q3ButtonGroup;
 class QComboBox;
 class QLabel;
-class QListView;
+class Q3ListView;
 class DistributionListView;
 class KABCore;
 namespace KABC {
 class AddressBook;
 class DistributionListManager;
 }
 class DistributionListWidget : public ExtensionWidget
 {
    Q_OBJECT
  public:
    DistributionListWidget( KABCore*, QWidget *parent, const char *name = 0 );
    virtual ~DistributionListWidget();
    void contactsSelectionChanged();
    QString title() const;
    QString identifier() const;
  public slots:
    void save();
-    void dropped( QDropEvent*, QListViewItem* );
+    void dropped( QDropEvent*, Q3ListViewItem* );
  private slots:
    void createList();
    void editList();
    void removeList();
    void addContact();
    void removeContact();
    void changeEmail();
    void updateNameCombo();
    void updateContactView();
    void selectionContactViewChanged();
    void changed();
  protected:
    void dropEvent( QDropEvent* );
  private:
    QComboBox *mNameCombo;  
    QLabel *mListLabel;
    DistributionListView *mContactView;
    KABC::DistributionListManager *mManager;
    QPushButton *mCreateListButton;
    QPushButton *mEditListButton;
    QPushButton *mRemoveListButton;
    QPushButton *mChangeEmailButton;
    QPushButton *mAddContactButton;
    QPushButton *mRemoveContactButton;
 };
 /**
  @short Helper class
 */
 class DistributionListView : public KListView
 {
  Q_OBJECT
  public:
    DistributionListView( QWidget *parent, const char* name = 0 );
  protected:
    void dragEnterEvent( QDragEnterEvent *e );
    void dropEvent( QDropEvent *e );
    void viewportDragMoveEvent( QDragMoveEvent *e );
    void viewportDropEvent( QDropEvent *e );
 };
 /**
  @short Helper class
 */
 class EmailSelector : public KDialogBase
 {
  public:
    EmailSelector( const QStringList &emails, const QString &current,
        QWidget *parent );
    QString selected();
    static QString getEmail( const QStringList &emails, const QString &current,
        QWidget *parent );
  private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
 #ifdef KAB_EMBEDDED
 class DistributionListFactory : public ExtensionFactory
 {
  public:
    ExtensionWidget *extension( KABCore *core, QWidget *parent, const char *name )
    {
      return new DistributionListWidget( core, parent, name );
    }
    QString identifier() const
    {
      return "distribution_list_editor";
    }
 };
 #endif //KAB_EMBEDDED
 #endif
diff --git a/kaddressbook/features/mergewidget.cpp b/kaddressbook/features/mergewidget.cpp
index 2476e42..1becc2f 100644
--- a/kaddressbook/features/mergewidget.cpp
+++ b/kaddressbook/features/mergewidget.cpp
@@ -1,129 +1,131 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qlayout.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kabc/addressbook.h>
 #include "kabcore.h"
 #include "mergewidget.h"
 #ifndef KAB_EMBEDDED
 class MergeFactory : public ExtensionFactory
 {
  public:
    ExtensionWidget *extension( KABCore *core, QWidget *parent, const char *name )
    {
      return new MergeWidget( core, parent, name );
    }
    QString identifier() const
    {
      return "merge";
    }
 };
 extern "C" {
  void *init_libkaddrbk_merge()
  {
    return ( new MergeFactory );
  }
 }
 #endif //KAB_EMBEDDED
-class ContactItem : public QListViewItem
+class ContactItem : public Q3ListViewItem
 {
  public:
    ContactItem( KListView *parent, const KABC::Addressee &addressee )
-      : QListViewItem( parent ), mAddressee( addressee )
+      : Q3ListViewItem( parent ), mAddressee( addressee )
    {
      KABC::Field::List fieldList = KABC::Field::defaultFields();
      KABC::Field::List::ConstIterator it;
      int i = 0;
      for ( it = fieldList.begin(); it != fieldList.end(); ++it )
        setText( i++, (*it)->value( mAddressee ) );
    }
    KABC::Addressee addressee() const
    {
      return mAddressee;
    }
  private:
    KABC::Addressee mAddressee;
 };
 MergeWidget::MergeWidget( KABCore *core, QWidget *parent, const char *name )
  : ExtensionWidget( core, parent, name ), mBlockUpdate( false )
 {
 #ifdef KAB_EMBEDDED
  if (KGlobal::getOrientation() == KGlobal::Portrait)
    parent->setMaximumSize( KGlobal::getDesktopWidth() , 180);
 #endif //KAB_EMBEDDED
  
-  QGridLayout *topLayout = new QGridLayout( this, 3, 2, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 3, 2, KDialog::marginHint(),
                                            KDialog::spacingHint() );
  mContactView = new KListView( this );
  KABC::Field::List fieldList = KABC::Field::defaultFields();
  KABC::Field::List::ConstIterator it;
  for ( it = fieldList.begin(); it != fieldList.end(); ++it )
    mContactView->addColumn( (*it)->label() );
  mContactView->setEnabled( false );
  mContactView->setAllColumnsShowFocus( true );
  topLayout->addMultiCellWidget( mContactView, 0, 2, 0, 0 );
  connect( mContactView, SIGNAL( selectionChanged() ),
           SLOT( selectionContactViewChanged() ) );
  mMergeAndRemoveButton = new QPushButton( i18n( "Merge and Remove" ), this );
  mMergeAndRemoveButton->setEnabled( false );
  topLayout->addWidget( mMergeAndRemoveButton, 0, 1 );
  connect( mMergeAndRemoveButton, SIGNAL( clicked() ), SLOT( mergeAndRemove() ) );
  mMergeButton = new QPushButton( i18n( "Merge" ), this );
  mMergeButton->setEnabled( false );
  topLayout->addWidget( mMergeButton, 1, 1 );
  connect( mMergeButton, SIGNAL( clicked() ), SLOT( merge() ) );
 #ifndef KAB_EMBEDDED
  KAcceleratorManager::manage( this );
 #endif //KAB_EMBEDDED
 }
 MergeWidget::~MergeWidget()
@@ -185,65 +187,65 @@ void MergeWidget::updateView()
      new ContactItem( mContactView, *it );
 }
 QString MergeWidget::title() const
 {
  return i18n( "Merge Contacts Editor" );
 }
 QString MergeWidget::identifier() const
 {
  return "merge";
 }
 void MergeWidget::mergeAndRemove()
 {
 #ifndef KAB_EMBEDDED
  ContactItem *item = dynamic_cast<ContactItem*>( mContactView->currentItem() );
 #else //KAB_EMBEDDED
  ContactItem *item = (ContactItem*)( mContactView->currentItem() );
 #endif //KAB_EMBEDDED
  if ( !item )
    return;
  QString oldUID = item->addressee().uid();
  doMerge( item->addressee() );
  KABC::Addressee::List retval;
  retval << mMasterAddressee;
  emit modified( retval );
  mBlockUpdate = true;
-  core()->deleteContacts( oldUID );
+  core()->deleteContacts( QStringList(oldUID) );
  core()->setContactSelected( mMasterAddressee.uid() );
  mBlockUpdate = false;
  updateView();
 }
 void MergeWidget::merge()
 {
 #ifndef KAB_EMBEDDED
  ContactItem *item = dynamic_cast<ContactItem*>( mContactView->currentItem() );
 #else //KAB_EMBEDDED
  ContactItem *item = (ContactItem*)( mContactView->currentItem() );
 #endif //KAB_EMBEDDED
  if ( !item )
    return;
  doMerge( item->addressee() );
  KABC::Addressee::List retval;
  retval << mMasterAddressee;
  emit modified( retval );
  mBlockUpdate = true;
  core()->setContactSelected( mMasterAddressee.uid() );
  mBlockUpdate = false;
  updateView();
 }
 void MergeWidget::doMerge( const KABC::Addressee &addr )
 {
  // ADR + LABEL
@@ -340,35 +342,35 @@ void MergeWidget::doMerge( const KABC::Addressee &addr )
  // TEL
  KABC::PhoneNumber::List phones = addr.phoneNumbers();
  KABC::PhoneNumber::List masterPhones = mMasterAddressee.phoneNumbers();
  KABC::PhoneNumber::List::ConstIterator phoneIt;
  for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt )
    if ( !masterPhones.contains( *it ) )
      mMasterAddressee.insertPhoneNumber( *it );
  // TITLE
  if ( mMasterAddressee.title().isEmpty() && !addr.title().isEmpty() )
    mMasterAddressee.setTitle( addr.title() );
  // TZ
  if ( !mMasterAddressee.timeZone().isValid() && addr.timeZone().isValid() )
    mMasterAddressee.setTimeZone( addr.timeZone() );
  // UID // ignore UID
  // URL
  if ( mMasterAddressee.url().isEmpty() && !addr.url().isEmpty() )
    mMasterAddressee.setUrl( addr.url() );
  // X-
  QStringList customs = addr.customs();
  QStringList masterCustoms = mMasterAddressee.customs();
  QStringList newCustoms( masterCustoms );
  for ( it = customs.begin(); it != customs.end(); ++it )
    if ( !masterCustoms.contains( *it ) )
      newCustoms.append( *it );
  mMasterAddressee.setCustoms( newCustoms );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "mergewidget.moc"
+#include "moc_mergewidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/features/mergewidget.h b/kaddressbook/features/mergewidget.h
index 1063c80..bb16282 100644
--- a/kaddressbook/features/mergewidget.h
+++ b/kaddressbook/features/mergewidget.h
@@ -1,64 +1,64 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef MERGEWIDGET_H
 #define MERGEWIDGET_H
 #include <kdialogbase.h>
 #include <klistview.h>
 #include "extensionwidget.h"
-class QListView;
+class Q3ListView;
 class KABCore;
 namespace KABC {
 class AddressBook;
 }
 class MergeWidget : public ExtensionWidget
 {
    Q_OBJECT
  public:
    MergeWidget( KABCore*, QWidget *parent, const char *name = 0 );
    virtual ~MergeWidget();
    void contactsSelectionChanged();
    QString title() const;
    QString identifier() const;
  private slots:
    void mergeAndRemove();
    void merge();
    void selectionContactViewChanged();
  private:
    void updateView();
    void doMerge( const KABC::Addressee &addr );
    KListView *mContactView;
    QPushButton *mMergeAndRemoveButton;
diff --git a/kaddressbook/filter.cpp b/kaddressbook/filter.cpp
index 12ab1e3..6462310 100644
--- a/kaddressbook/filter.cpp
+++ b/kaddressbook/filter.cpp
@@ -189,50 +189,50 @@ void Filter::save( KConfig *config, QString baseGroup, Filter::List &list )
  config->writeEntry( "Count", index );
 }
                     
 Filter::List Filter::restore( KConfig *config, QString baseGroup )
 {
  Filter::List list;
  int count = 0;
  Filter f;
  
  {
    KConfigGroupSaver s( config, baseGroup );
    count = config->readNumEntry( "Count", 0 );
  }
  
  for ( int i = 0; i < count; i++ ) {
    {
      KConfigGroupSaver s( config, QString( "%1_%2" ).arg( baseGroup ).arg( i ) );
      f.restore( config );
    }
    list.append( f );
  }
  if ( list.isEmpty()) {
      QStringList cats = KABPrefs::instance()->mCustomCategories;
      for ( QStringList::Iterator it = cats.begin(); it != cats.end(); ++it ) {
          Filter filter; 
          filter.noName = false;
          filter.mName = *it;
          filter.mEnabled = true;
-          filter.mCategoryList = *it;
+          filter.mCategoryList = QStringList(*it);
          filter.mMatchRule = Matching;
          filter.mInternal = true;
          list.append( filter );
      }
  }
  return list;
 }
 void Filter::setMatchRule( MatchRule rule )
 {
  mMatchRule = rule;
 }
    
 Filter::MatchRule Filter::matchRule() const
 {
  return mMatchRule;
 }
diff --git a/kaddressbook/filter.h b/kaddressbook/filter.h
index f4ae123..508436d 100644
--- a/kaddressbook/filter.h
+++ b/kaddressbook/filter.h
@@ -1,77 +1,77 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef FILTER_H
 #define FILTER_H
 #include <qstring.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include <kabc/addressee.h>
 #include <kconfig.h>
 /**
  Filter for AddressBook related objects (Addressees)
  @todo This class should be switched to use shared data.
 */
 class Filter
 {
  public: 
    enum { ShowPublic = 1, ShowPrivate = 2, ShowConfidential = 4 };
     void setCriteria(int c) { mCriteria = c ;}
    int criteria() const { return mCriteria;}
-    typedef QValueList<Filter> List;
+    typedef Q3ValueList<Filter> List;
    
    enum MatchRule { Matching = 0, NotMatching = 1 };
    Filter();
    Filter( const QString& name );
    ~Filter();
    /**
      Set the name of the filter.
     */
    void setName( const QString &name );
    /**
      @return The name of the filter.
     */
    const QString &name() const;
    /**
      @return Whether the filter is an internal one.
     */
    bool isInternal() const;
    
    /**
      Apply the filter to the addressee list. All addressees not passing
      the filter criterias will be removed from the list.
    
      If the MatchRule is NotMatch, then all the addressees matching the
      filter will be removed from the list.
     */
    void apply( KABC::Addressee::List &addresseeList );
    
    /**
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index ef9b979..40698a7 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -1,199 +1,201 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klistbox.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include "kabprefs.h"
 #include "filtereditdialog.h"
 FilterEditDialog::FilterEditDialog( QWidget *parent, const char *name )
  : KDialogBase( Plain, i18n( "Edit Address Book Filter" ),
                 Help | Ok | Cancel, Ok, parent, name, /*US false*/ true, true )
 {
  initGUI();
  QStringList cats = KABPrefs::instance()->mCustomCategories;
  QStringList::Iterator iter;
  for ( iter = cats.begin(); iter != cats.end(); ++iter )
-    mCategoriesView->insertItem( new QCheckListItem( mCategoriesView, (*iter), QCheckListItem::CheckBox ) );
+    mCategoriesView->insertItem( new Q3CheckListItem( mCategoriesView, (*iter), Q3CheckListItem::CheckBox ) );
  filterNameTextChanged( mNameEdit->text() );
 }
 FilterEditDialog::~FilterEditDialog()
 {
 }
 void FilterEditDialog::setFilter( const Filter &filter )
 {
  mNameEdit->setText( filter.name() );
  QStringList categories = filter.categories();
-  QListViewItem *item = mCategoriesView->firstChild();
+  Q3ListViewItem *item = mCategoriesView->firstChild();
  while ( item != 0 ) {
    if ( categories.contains( item->text( 0 ) ) ) {
-      QCheckListItem *checkItem = static_cast<QCheckListItem*>( item );
+      Q3CheckListItem *checkItem = static_cast<Q3CheckListItem*>( item );
      checkItem->setOn( true );
    }
    item = item->nextSibling();
  }
  if ( filter.matchRule() == Filter::Matching )
    mMatchRuleGroup->setButton( 0 );
  else
    mMatchRuleGroup->setButton( 1 );
  int c = filter.criteria() ;
  mPublic->setChecked(c &Filter::ShowPublic);
  mPrivate->setChecked(c & Filter::ShowPrivate);
  mConfidential->setChecked(c & Filter::ShowConfidential);
 }
 Filter FilterEditDialog::filter()
 {
  Filter filter;
  filter.setName( mNameEdit->text() );
  QStringList categories;
-  QListViewItem *item = mCategoriesView->firstChild();
+  Q3ListViewItem *item = mCategoriesView->firstChild();
  while ( item != 0 ) {
-    QCheckListItem *checkItem = static_cast<QCheckListItem*>( item );
+    Q3CheckListItem *checkItem = static_cast<Q3CheckListItem*>( item );
    if ( checkItem->isOn() )
      categories.append( item->text( 0 ) );
    item = item->nextSibling();
  }
  filter.setCategories( categories );
  if ( mMatchRuleGroup->find( 0 )->isOn() )
    filter.setMatchRule( Filter::Matching );
  else
    filter.setMatchRule( Filter::NotMatching );
  int c = 0;
  if (mPublic->isChecked()) c |= Filter::ShowPublic;
  if (mPrivate->isChecked()) c |= Filter::ShowPrivate;
  if (mConfidential->isChecked()) c |= Filter::ShowConfidential;
  filter.setCriteria( c ) ;
  return filter;
 }
 void FilterEditDialog::initGUI()
 {
 #ifndef KAB_EMBEDDED  
  resize( 490, 300 );
 #else //KAB_EMBEDDED  
  resize( KMIN(KGlobal::getDesktopWidth()-10, 490), KMIN(KGlobal::getDesktopHeight()-50, 300));
 #endif //KAB_EMBEDDED  
  
  QWidget *page = plainPage();
  QLabel *label;
-  QGridLayout *topLayout = new QGridLayout( page, 3, 2, 0, spacingHint() );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 3, 2, 0, spacingHint() );
  label = new QLabel( i18n( "Name" ), page );
  mNameEdit = new KLineEdit( page );
  mNameEdit->setFocus();
  topLayout->addWidget( label, 0, 0 );
  topLayout->addWidget( mNameEdit, 0, 1 );
  connect( mNameEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( filterNameTextChanged( const QString&) ) );
  mCategoriesView = new KListView( page );
  mCategoriesView->addColumn( i18n( "Categories" ) );
  topLayout->addMultiCellWidget( mCategoriesView, 1, 1, 0, 1 );
-  mMatchRuleGroup = new QHButtonGroup( i18n( "Category rule" ), page );
+  mMatchRuleGroup = new Q3HButtonGroup( i18n( "Category rule" ), page );
  mMatchRuleGroup->setExclusive( true );
  QRadioButton *radio = new QRadioButton( i18n( "Include categories" ), mMatchRuleGroup );
  //mMatchRuleGroup->insert( radio );
  radio = new QRadioButton( i18n( "Exclude categories" ), mMatchRuleGroup );
  radio->setChecked( true );
  //mMatchRuleGroup->insert( radio );
  topLayout->addMultiCellWidget( mMatchRuleGroup, 2, 2, 0, 1 );
-  QHButtonGroup * mMatchPPCGroup = new QHButtonGroup(i18n( "Include contacts, that are:" ), page );
+  Q3HButtonGroup * mMatchPPCGroup = new Q3HButtonGroup(i18n( "Include contacts, that are:" ), page );
  mPublic = new QCheckBox( i18n( "public" ), mMatchPPCGroup );
  mPrivate = new QCheckBox( i18n( "private" ), mMatchPPCGroup );
  mConfidential = new QCheckBox( i18n( "confidential" ), mMatchPPCGroup );
  mPublic->setChecked( true );
  mPrivate->setChecked( true );
  mConfidential->setChecked( true );
  topLayout->addMultiCellWidget( mMatchPPCGroup, 3, 3, 0, 1 );
 }
 void FilterEditDialog::filterNameTextChanged( const QString &text )
 {
  enableButtonOK( !text.isEmpty() );
 }
 void FilterEditDialog::slotHelp()
 {
 #ifndef KAB_EMBEDDED
  kapp->invokeHelp( "using-filters" );
 #endif //KAB_EMBEDDED
 }
 FilterDialog::FilterDialog( QWidget *parent, const char *name )
  : KDialogBase( Plain, i18n( "Edit Address Book Filters" ),
                 Ok | Cancel, Ok, parent, name, /*US false*/true, true )
 {
  initGUI();
 }
 FilterDialog::~FilterDialog()
 {
 }
@@ -243,73 +245,73 @@ void FilterDialog::edit()
  uint pos = mFilterListBox->currentItem();
  dlg.setFilter( mFilterList[ pos ] );
  if ( dlg.exec() ) {
    mFilterList.remove( mFilterList.at( pos ) );
    mFilterList.insert( mFilterList.at( pos ), dlg.filter() );
  }
  refresh();
  mFilterListBox->setCurrentItem( pos );
 }
 void FilterDialog::remove()
 {
  mFilterList.remove( mFilterList.at( mFilterListBox->currentItem() ) );
  selectionChanged( 0 );
  refresh();
 }
 void FilterDialog::refresh()
 {
  mFilterListBox->clear();
  Filter::List::Iterator iter;
  for ( iter = mFilterList.begin(); iter != mFilterList.end(); ++iter )
    mFilterListBox->insertItem( (*iter).name() );
 }
-void FilterDialog::selectionChanged( QListBoxItem *item )
+void FilterDialog::selectionChanged( Q3ListBoxItem *item )
 {
  bool state = ( item != 0 );
  mEditButton->setEnabled( state );
  mRemoveButton->setEnabled( state );
 }
 void FilterDialog::initGUI()
 {
 #ifndef KAB_EMBEDDED  
  resize( 330, 200 );
 #else //KAB_EMBEDDED  
  resize( KMIN(KGlobal::getDesktopWidth()-10, 330), KMIN(KGlobal::getDesktopHeight()-50, 200));
 #endif //KAB_EMBEDDED  
  QWidget *page = plainPage();
-  QGridLayout *topLayout = new QGridLayout( page, 1, 2, 0, spacingHint() );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 1, 2, 0, spacingHint() );
  mFilterListBox = new KListBox( page );
  topLayout->addWidget( mFilterListBox, 0, 0 );
-  connect( mFilterListBox, SIGNAL( selectionChanged( QListBoxItem * ) ),
+  connect( mFilterListBox, SIGNAL( selectionChanged( Q3ListBoxItem * ) ),
-           SLOT( selectionChanged( QListBoxItem * ) ) );
+           SLOT( selectionChanged( Q3ListBoxItem * ) ) );
-  connect( mFilterListBox, SIGNAL( doubleClicked ( QListBoxItem * ) ),
+  connect( mFilterListBox, SIGNAL( doubleClicked ( Q3ListBoxItem * ) ),
           SLOT( edit() ) );
-  KButtonBox *buttonBox = new KButtonBox( page, Vertical );
+  KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
  buttonBox->addButton( i18n( "&Add..." ), this, SLOT( add() ) );
  mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, SLOT( edit() ) );
  mEditButton->setEnabled( false );
  mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, SLOT( remove() ) );
  mRemoveButton->setEnabled( false );
  buttonBox->layout();
  topLayout->addWidget( buttonBox, 0, 1 );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "filtereditdialog.moc"
+#include "moc_filtereditdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h
index 5a8bad1..64d2976 100644
--- a/kaddressbook/filtereditdialog.h
+++ b/kaddressbook/filtereditdialog.h
@@ -2,108 +2,107 @@
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef FILTEREDITDIALOG_H
 #define FILTEREDITDIALOG_H
-class QButtonGroup;
+#include <Q3HButtonGroup>
 class QString;
 class QToolButton;
 class QWidget;
-class QListBoxItem;
+class Q3ListBoxItem;
 class QCheckBox;
 class KLineEdit;
 class KListBox;
 class KListView;
 #include <kdialogbase.h>
-#include <qhbuttongroup.h>
 #include "filter.h"
 class FilterDialog : public KDialogBase
 {
  Q_OBJECT
  public:
    FilterDialog( QWidget *parent, const char *name = 0 );
    ~FilterDialog();
    void setFilters( const Filter::List &list );
    Filter::List filters() const;
  protected slots:
    void add();
    void edit();
    void remove();
-    void selectionChanged( QListBoxItem* );
+    void selectionChanged( Q3ListBoxItem* );
  private:
    void initGUI();
    void refresh();
    Filter::List mFilterList;
    Filter::List mInternalFilterList;
    KListBox *mFilterListBox;
    QPushButton *mAddButton;
    QPushButton *mEditButton;
    QPushButton *mRemoveButton;
 };
 class FilterEditDialog : public KDialogBase
 {
    Q_OBJECT
  public:
    FilterEditDialog( QWidget *parent, const char *name = 0 );
    ~FilterEditDialog();
    void setFilter( const Filter &filter );
    Filter filter();
  protected slots:
    void filterNameTextChanged( const QString& );
    void slotHelp();
  private:
    void initGUI();
    Filter mFilter;
    KLineEdit *mNameEdit;
    KListView *mCategoriesView;
-    QHButtonGroup *mMatchRuleGroup;
+    Q3HButtonGroup *mMatchRuleGroup;
    QCheckBox *mPrivate;
    QCheckBox *mPublic;
    QCheckBox *mConfidential;
    QPushButton *mEditButton;
    QPushButton *mRemoveButton;
 };
 #endif
diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp
index 13cd084..caff3b2 100644
--- a/kaddressbook/geowidget.cpp
+++ b/kaddressbook/geowidget.cpp
@@ -1,104 +1,111 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <kabc/geo.h>
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #else //KAB_EMBEDDED
-#include <qtextstream.h>
+#include <q3textstream.h>
+//Added by qt3to4:
+#include <QPaintEvent>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <QMouseEvent>
 #include <kglobal.h>
 #endif //KAB_EMBEDDED
+#include <QDesktopWidget>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <qcheckbox.h>
 #include <qfile.h>
 #include <qapplication.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <stdlib.h>
 #include "geowidget.h"
 GeoWidget::GeoWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
  QLabel *label = 0;
-  QGridLayout *topLayout = new QGridLayout( this, 4, 3 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 4, 3 );
  topLayout->setMargin( KDialog::marginHint() );
  topLayout->setSpacing( KDialog::spacingHint() );
  label = new QLabel( this );
 //US ambiguous call to loadIcon. Add an additional parameter  
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, 0 ) );
  label->setAlignment( Qt::AlignTop );
  topLayout->addMultiCellWidget( label, 0, 3, 0, 0 );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
  mGeoIsValid = new QCheckBox( i18n( "Use geo data" ), this );
  topLayout->addMultiCellWidget( mGeoIsValid, 0, 0, 1, 2 );
  label = new QLabel( i18n( "Latitude:" ), this );
  topLayout->addWidget( label, 1, 1 );
  mLatitudeBox = new KDoubleSpinBox( -90, 90, 1, 0, 6, this );
  mLatitudeBox->setEnabled( false );
  mLatitudeBox->setSuffix( "" );
  topLayout->addWidget( mLatitudeBox, 1, 2 );
  label->setBuddy( mLatitudeBox );
  label = new QLabel( i18n( "Longitude:" ), this );
  topLayout->addWidget( label, 2, 1 );
  mLongitudeBox = new KDoubleSpinBox( -180, 180, 1, 0, 6, this );
  mLongitudeBox->setEnabled( false );
  mLongitudeBox->setSuffix( "" );
  topLayout->addWidget( mLongitudeBox, 2, 2 );
  label->setBuddy( mLongitudeBox );
  mExtendedButton = new QPushButton( i18n( "Edit Geo Data..." ), this );
  mExtendedButton->setEnabled( false );
  topLayout->addMultiCellWidget( mExtendedButton, 3, 3, 1, 2 );
  connect( mLatitudeBox, SIGNAL( valueChanged( double ) ),
           SIGNAL( changed() ) );
  connect( mLongitudeBox, SIGNAL( valueChanged( double ) ),
           SIGNAL( changed() ) );
  connect( mExtendedButton, SIGNAL( clicked() ),
           SLOT( editGeoData() ) );
@@ -138,74 +145,74 @@ KABC::Geo GeoWidget::geo() const
    geo.setLatitude( mLatitudeBox->value() );
    geo.setLongitude( mLongitudeBox->value() );
  } else {
    geo.setLatitude( 91 );
    geo.setLongitude( 181 );
  }
  return geo;
 }
 void GeoWidget::editGeoData()
 {
  GeoDialog dlg( this );
  dlg.setLatitude( mLatitudeBox->value() );
  dlg.setLongitude( mLongitudeBox->value() );
  if ( dlg.exec() ) {
    mLatitudeBox->setValue( dlg.latitude() );
    mLongitudeBox->setValue( dlg.longitude() );
    emit changed();
  }
 }
 GeoDialog::GeoDialog( QWidget *parent, const char *name )
  : KDialogBase( Plain, i18n( "Geo Data Input" ), Ok | Cancel, Ok,
                 parent, name, true, true ),
    mUpdateSexagesimalInput( true )
 {
-  QFrame *page = plainPage();
+  Q3Frame *page = plainPage();
-  QGridLayout *topLayout = new QGridLayout( page, 1, 1, marginHintSmall(),
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 1, 1, marginHintSmall(),
                                            spacingHint() );
  //topLayout->setRowStretch( 1, 1 );
  mMapWidget = new GeoMapWidget( page );
  mCityCombo = new KComboBox( page );
-  QGroupBox *sexagesimalGroup = new QGroupBox( 0, Vertical, i18n( "Sexagesimal" ), page );
+  Q3GroupBox *sexagesimalGroup = new Q3GroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
-  QGridLayout *sexagesimalLayout = new QGridLayout( sexagesimalGroup->layout(),
+  Q3GridLayout *sexagesimalLayout = new Q3GridLayout( sexagesimalGroup->layout(),
                                                    2, 5, spacingHint() );
  QLabel *label;
  if ( QApplication::desktop()->width() < 320 ) {
      label = new QLabel( i18n( "La." ), sexagesimalGroup );
      sexagesimalLayout->setSpacing ( spacingHintSmall() );
      sexagesimalLayout->setMargin ( marginHintSmall() );
      topLayout->setMargin ( 0 );
      mCityCombo->setMaximumWidth( 220 );
      sexagesimalGroup->setMaximumWidth( 220 );
  }
  else
      label = new QLabel( i18n( "Latitude:" ), sexagesimalGroup );
  sexagesimalLayout->addWidget( label, 0, 0 );
  int maxWid = 60;
  if ( QApplication::desktop()->width() < 320 )
      maxWid = 40;
  mLatDegrees = new QSpinBox( 0, 90, 1, sexagesimalGroup );
  mLatDegrees->setSuffix( "" );
  mLatDegrees->setWrapping( false );
  sexagesimalLayout->addWidget( mLatDegrees, 0, 1 );
  mLatDegrees->setMaximumWidth( maxWid );
  mLatMinutes = new QSpinBox( 0, 59, 1, sexagesimalGroup );
  mLatMinutes->setSuffix( "'" );
  sexagesimalLayout->addWidget( mLatMinutes, 0, 2 );
  mLatMinutes->setMaximumWidth( maxWid  );
  mLatSeconds = new QSpinBox( 0, 59, 1, sexagesimalGroup );
  mLatSeconds->setSuffix( "\"" );
  sexagesimalLayout->addWidget( mLatSeconds, 0, 3 );
  mLatSeconds->setMaximumWidth( maxWid  );
@@ -400,66 +407,66 @@ void GeoDialog::updateInputs()
    mCityCombo->setCurrentItem( 0 );
  mCityCombo->blockSignals( false );
  mLatDegrees->blockSignals( false );
  mLatMinutes->blockSignals( false );
  mLatSeconds->blockSignals( false );
  mLatDirection->blockSignals( false );
  mLongDegrees->blockSignals( false );
  mLongMinutes->blockSignals( false );
  mLongSeconds->blockSignals( false );
  mLongDirection->blockSignals( false );
 }
 void GeoDialog::loadCityList()
 {
  mCityCombo->clear();
  mGeoDataMap.clear();
  QString fileName ;
 #ifdef DESKTOP_VERSION
 #ifndef _WIN32_
    fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/zone.tab";
 #else
    fileName   = qApp->applicationDirPath () + "\\kdepim\\kaddressbook\\zone.tab";
 #endif
 #else
    fileName = getenv("QPEDIR");
    fileName += "/pics/kdepim/kaddressbook/zone.tab";
 #endif
    QFile file( fileName);
    
-  if ( file.open( IO_ReadOnly ) ) {
+  if ( file.open( QIODevice::ReadOnly ) ) {
-    QTextStream s( &file );
+    Q3TextStream s( &file );
    QString line, country;
    QRegExp coord( "[+-]\\d+[+-]\\d+" );
    QRegExp name( "[^\\s]+/[^\\s]+" );
    int posc, posn, pos;
   while ( !s.eof() ) {
      line = s.readLine().stripWhiteSpace();
      if ( line.isEmpty() || line[ 0 ] == '#' )
        continue;
      country = line.left( 2 );
      QString c, n;
 #ifdef DESKTOP_VERSION
      posc = coord.search( line, 0 );
 #else
      posc = coord.find( line, 0 );
 #endif
      // if ( pos >= 0 )
      //c = line.mid( pos, coord.matchedLength() );
 #ifdef DESKTOP_VERSION
      posn = name.search(line, posc);
 #else
      posn = name.find(line, posc);
 #endif
      if ( posn > 0 ) {
          c = line.mid( posc, posn-posc ).stripWhiteSpace();
          //qDebug("*%s* ", c.latin1());
          int nend = line.find(" ", posn );
          if ( nend < 0 )
              nend = line.length();
@@ -523,65 +530,65 @@ double GeoDialog::calculateCoordinate( const QString &coordinate )
      d = str.left( 3 ).toInt();
      m = str.mid( 3, 2 ).toInt();
      s = str.right( 2 ).toInt();
      break;
    default:
      break;
  }
  if ( neg )
    return - ( d + m / 60.0 + s / 3600.0 );
  else
    return d + m / 60.0 + s / 3600.0;
 }
 int GeoDialog::nearestCity( double x, double y )
 {
  QMap<QString, GeoData>::Iterator it;
  int pos = 0;
  for ( it = mGeoDataMap.begin(); it != mGeoDataMap.end(); ++it, pos++ ) {
    double dist = ( (*it).longitude - x ) * ( (*it).longitude - x ) +
                  ( (*it).latitude - y ) * ( (*it).latitude - y );
    if ( dist < 1.5 )
      return pos;
  }
  return -1;
 }
 GeoMapWidget::GeoMapWidget( QWidget *parent, const char *name )
  : QWidget( parent, name ), mLatitude( 0 ), mLongitude( 0 )
 {
-  setBackgroundMode( NoBackground );
+  setBackgroundMode( Qt::NoBackground );
  setFixedSize( 240, 120 );
  update();
 }
 GeoMapWidget::~GeoMapWidget()
 {
 }
 void GeoMapWidget::setLatitude( double latitude )
 {
  mLatitude = latitude;
 }
 double GeoMapWidget::latitude()const
 {
  return mLatitude;
 }
 void GeoMapWidget::setLongitude( double longitude )
 {
  mLongitude = longitude;
 }
 double GeoMapWidget::longitude()const
 {
  return mLongitude;
 }
 void GeoMapWidget::mousePressEvent( QMouseEvent *event )
 {
@@ -595,35 +602,35 @@ void GeoMapWidget::mousePressEvent( QMouseEvent *event )
  mLongitude = ( longOffset * 180 ) / longMid;
  emit changed();
 }
 void GeoMapWidget::paintEvent( QPaintEvent* )
 {
  uint w = width();
  uint h = height();
  QPixmap world = KGlobal::iconLoader()->loadIcon( "world", KIcon::Desktop, 0 );
  QPainter p;
  p.begin( &world, this );
  p.setPen( QColor( 255, 0, 0 ) );
  p.setBrush( QColor( 255, 0, 0 ) );
  double latMid = h / 2;
  double longMid = w / 2;
  double latOffset = ( mLatitude * latMid ) / 90;
  double longOffset = ( mLongitude * longMid ) / 180;
  int x = (int)(longMid + longOffset);
  int y = (int)(latMid - latOffset);
  p.drawEllipse( x, y, 4, 4 );
  p.end();
  bitBlt( this, 0, 0, &world );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "geowidget.moc"
+#include "moc_geowidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h
index 3d39691..5b64370 100644
--- a/kaddressbook/geowidget.h
+++ b/kaddressbook/geowidget.h
@@ -1,61 +1,65 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef GEOWIDGET_H
 #define GEOWIDGET_H
 #include <qmap.h>
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPaintEvent>
 #include <kdialogbase.h>
 namespace KABC {
 class Geo;
 }
 class GeoMapWidget;
 class KComboBox;
 class KDoubleSpinBox;
 class QCheckBox;
 class QLabel;
 class QSpinBox;
 class QPushButton;
 typedef struct {
  double latitude;
  double longitude;
  QString country;
 } GeoData;
 class GeoWidget : public QWidget
 {
  Q_OBJECT
  public:
    GeoWidget( QWidget *parent, const char *name = 0 );
    ~GeoWidget();
    /**
      Sets the geo object.
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index eec5e08..6ecf66d 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -8,132 +8,136 @@
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <kabc/picture.h>
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #include <kio/netaccess.h>
 #include <kimageio.h>
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <kurl.h>
 #include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 #include "imagewidget.h"
 ImageWidget::ImageWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2, 1, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2, 1, KDialog::marginHint(),
                                            KDialog::spacingHint() );
-  QGroupBox *photoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
+  Q3GroupBox *photoBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
-  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 3, 2,
+  Q3GridLayout *boxLayout = new Q3GridLayout( photoBox->layout(), 3, 2,
                                            KDialog::spacingHint() );
  boxLayout->setRowStretch( 2, 1 );
  mPhotoLabel = new QLabel( photoBox );
  int fac = 9;
  if ( QApplication::desktop()->width() > 320 )
      fac = 6;
  mPhotoLabel->setFixedSize( 50*9/fac, 70*9/fac );
  mPhotoLabel->setScaledContents( true );
-  mPhotoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+  mPhotoLabel->setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken );
  boxLayout->addMultiCellWidget( mPhotoLabel, 0, 3, 0, 0 );
  mPhotoUrl = new KURLRequester( photoBox );
 #ifndef KAB_EMBEDDED  
  mPhotoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined. Does this harm ???");
 #endif //KAB_EMBEDDED  
  
  
  boxLayout->addWidget( mPhotoUrl, 0, 1 );
-  QHBox *hb1 = new QHBox ( photoBox );
+  Q3HBox *hb1 = new Q3HBox ( photoBox );
  mUsePhotoUrl = new QCheckBox( i18n( "Store as URL" ), hb1 );
  mUsePhotoUrl->setEnabled( false );
  boxLayout->addWidget( hb1, 1, 1 );
  QPushButton * pb = new QPushButton( i18n( "Remove" ), hb1 );
  connect( pb, SIGNAL( clicked() ),this, SLOT( removePhoto() ) );
  boxLayout->addWidget( new QLabel(  photoBox ), 2, 1 );
  topLayout->addWidget( photoBox, 0, 0 );
-  QGroupBox *logoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
+  Q3GroupBox *logoBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
-  boxLayout = new QGridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
+  boxLayout = new Q3GridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
  boxLayout->setRowStretch( 2, 1 );
  mLogoLabel = new QLabel( logoBox );
  mLogoLabel->setFixedSize( 50*9/fac, 70*9/fac );
  mLogoLabel->setScaledContents( true );
-  mLogoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+  mLogoLabel->setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken );
  boxLayout->addMultiCellWidget( mLogoLabel, 0, 3, 0, 0 );
  mLogoUrl = new KURLRequester( logoBox );
 #ifndef KAB_EMBEDDED  
  mLogoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined 2");
 #endif //KAB_EMBEDDED  
  boxLayout->addWidget( mLogoUrl, 0, 1 );
  
-  QHBox *hb2 = new QHBox ( logoBox );
+  Q3HBox *hb2 = new Q3HBox ( logoBox );
  mUseLogoUrl = new QCheckBox( i18n( "Store as URL" ), hb2 );
  mUseLogoUrl->setEnabled( false );
  boxLayout->addWidget( hb2, 1, 1 );
   pb = new QPushButton( i18n( "Remove" ), hb2 );
  connect( pb, SIGNAL( clicked() ),this, SLOT( removeLogo() ) );
  boxLayout->addWidget( new QLabel(  logoBox ), 2, 1 );
  topLayout->addWidget( logoBox, 1, 0 );
  connect( mPhotoUrl, SIGNAL( textChanged( const QString& ) ),
           SIGNAL( changed() ) );
  connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
           SLOT( loadPhoto() ) );
  connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
           SIGNAL( changed() ) );
  connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
           SLOT( updateGUI() ) );
  connect( mUsePhotoUrl, SIGNAL( toggled( bool ) ),
           SIGNAL( changed() ) );
  connect( mLogoUrl, SIGNAL( textChanged( const QString& ) ),
           SIGNAL( changed() ) );
  connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
           SLOT( loadLogo() ) );
  connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
           SIGNAL( changed() ) );
  connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
           SLOT( updateGUI() ) );
  connect( mUseLogoUrl, SIGNAL( toggled( bool ) ),
           SIGNAL( changed() ) );
 #ifndef KAB_EMBEDDED  
@@ -151,147 +155,147 @@ void ImageWidget::setPhoto( const KABC::Picture &photo )
  bool blocked = signalsBlocked();
  blockSignals( true );
  if ( photo.isIntern() ) {
 //US   
 //US    mPhotoLabel->setPixmap( photo.data() );
    if (photo.data().isNull() != true)
    {
      QPixmap pm;
      pm.convertFromImage(photo.data()); 
      mPhotoLabel->setPixmap( pm );
    }
    
    mUsePhotoUrl->setChecked( false );
  } else {
    mPhotoUrl->setURL( photo.url() );
    if ( !photo.url().isEmpty() )
      mUsePhotoUrl->setChecked( true );
    loadPhoto();
  }
  
  blockSignals( blocked );
 }
 KABC::Picture ImageWidget::photo() const
 {
  KABC::Picture photo;
  if ( mUsePhotoUrl->isChecked() )
    photo.setUrl( mPhotoUrl->url() );
  else {
-    QPixmap *px = mPhotoLabel->pixmap();
+    const QPixmap *px = mPhotoLabel->pixmap();
    if ( px ) {
 #ifndef KAB_EMBEDDED  
      if ( px->height() > px->width() )
        photo.setData( px->convertToImage().scaleHeight( 140 ) );
      else
        photo.setData( px->convertToImage().scaleWidth( 100 ) );
 #else //KAB_EMBEDDED  
 //US add teh nullcheck      
      if (px->isNull() != true )
        photo.setData( px->convertToImage() );
 #endif //KAB_EMBEDDED  
      photo.setType( "PNG" );
    }
  }
  return photo;
 }
 void ImageWidget::setLogo( const KABC::Picture &logo )
 {
  bool blocked = signalsBlocked();
  blockSignals( true );
  if ( logo.isIntern() ) {
 //US
 //US    mLogoLabel->setPixmap( logo.data() );
    if (logo.data().isNull() != true)
    {
      QPixmap pm;
      pm.convertFromImage(logo.data()); 
      mLogoLabel->setPixmap( pm );
    }
    mUseLogoUrl->setChecked( false );
  } else {
    mLogoUrl->setURL( logo.url() );
    if ( !logo.url().isEmpty() )
      mUseLogoUrl->setChecked( true );
    loadLogo();
  }
  blockSignals( blocked );
 }
 KABC::Picture ImageWidget::logo() const
 {
  KABC::Picture logo;
  if ( mUseLogoUrl->isChecked() )
    logo.setUrl( mLogoUrl->url() );
  else {
-    QPixmap *px = mLogoLabel->pixmap();
+    const QPixmap *px = mLogoLabel->pixmap();
    if ( px ) {
 #ifndef KAB_EMBEDDED  
      if ( px->height() > px->width() )
        logo.setData( px->convertToImage().scaleHeight( 140 ) );
      else
        logo.setData( px->convertToImage().scaleWidth( 100 ) );
 #else //KAB_EMBEDDED     
      if (px->isNull() != true ) 
          logo.setData( px->convertToImage() );
 #endif //KAB_EMBEDDED  
      logo.setType( "PNG" );
      
    }
  }
  return logo;
 }
 void ImageWidget::removePhoto()
 {
    setPhoto(KABC::Picture() );
 }
 void ImageWidget::removeLogo()
 {
    setLogo(KABC::Picture() );
 }
 void ImageWidget::loadPhoto()
 {
  mPhotoLabel->setPixmap( loadPixmap( mPhotoUrl->url() ) );
 }
 void ImageWidget::loadLogo()
 {
  mLogoLabel->setPixmap( loadPixmap( mLogoUrl->url() ) );
 }
 void ImageWidget::updateGUI()
 {
  KURLRequester *ptr = (KURLRequester*)sender();
  if ( ptr == mPhotoUrl )
    mUsePhotoUrl->setEnabled( true );
  else if ( ptr == mLogoUrl )
    mUseLogoUrl->setEnabled( true );
 }
 QPixmap ImageWidget::loadPixmap( const QString &url )
 {
  QPixmap pixmap;
  if ( url.isEmpty() )
    return pixmap;
  pixmap.load( url );
  return pixmap;
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "imagewidget.moc"
+#include "moc_imagewidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index bbfba58..9320a6b 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -1,59 +1,62 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef IMAGEWIDGET_H
 #define IMAGEWIDGET_H
 #include <qwidget.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QLabel>
 #include <kabc/picture.h>
 #include <kdialogbase.h>
 class KURL;
 class KURLRequester;
 class QCheckBox;
 class QLabel;
 class ImageWidget : public QWidget
 {
  Q_OBJECT
  public:
    ImageWidget( QWidget *parent, const char *name = 0 );
    ~ImageWidget();
    /**
      Sets the photo object.
     */
    void setPhoto( const KABC::Picture &photo );
    /**
      Returns a photo object.
     */
    KABC::Picture photo() const;
    /**
      Sets the logo object.
     */
    void setLogo( const KABC::Picture &photo );
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 5f8b83d..a54d1cd 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -1,82 +1,86 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qcombobox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
 #include <kdialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kglobal.h>
 #include "kabprefs.h"
 #include "incsearchwidget.h"
 IncSearchWidget::IncSearchWidget( QWidget *parent, const char *name )
-    : QWidget( parent, name )
 {
+    setObjectName(name);
+    setParent(parent);
 #ifndef KAB_EMBEDDED
 //US  setCaption( i18n( "Incremental Search" ) );
 #endif //KAB_EMBEDDED
-  QHBoxLayout *layout = new QHBoxLayout( this, 2, KDialog::spacingHint() );
+  Q3HBoxLayout *layout = new Q3HBoxLayout( this, 2, KDialog::spacingHint() );
 #ifdef DESKTOP_VERSION
  QLabel *label = new QLabel( i18n( "Search:" ), this );
-  label->setAlignment( QLabel::AlignVCenter | QLabel::AlignRight );
+  label->setAlignment( Qt::AlignVCenter | Qt::AlignRight );
  layout->addWidget( label );
 #endif //KAB_EMBEDDED
  mSearchText = new KLineEdit( this );
  layout->addWidget( mSearchText );
 // #ifdef KAB_EMBEDDED
 //   if (KGlobal::getOrientation() == KGlobal::Portrait)
 //     mSearchText->setMaximumWidth(30);
 // #endif //KAB_EMBEDDED
  //mSearchText->setMaximumWidth(60);
  
  mFieldCombo = new QComboBox( false, this );
  layout->addWidget( mFieldCombo );
  mFieldCombo->setMaximumHeight( 34 );
  QToolTip::add( mFieldCombo, i18n( "Select Incremental Search Field" ) );
 // #ifndef KAB_EMBEDDED
 //   resize( QSize(420, 50).expandedTo( sizeHint() ) );
 // #else //KAB_EMBEDDED
 //   resize( QSize(30, 10).expandedTo( sizeHint() ) );
 // #endif //KAB_EMBEDDED
  // for performance reasons, we do a search on the pda only after return is pressed
  connect( mSearchText, SIGNAL( textChanged( const QString& ) ),
           SLOT( announceDoSearch2() ) );
  connect( mFieldCombo, SIGNAL( activated( const QString& ) ),
           SLOT( announceDoSearch2() ) );
  connect( mSearchText, SIGNAL( returnPressed() ),
           SLOT( announceDoSearch() ) );
@@ -147,35 +151,35 @@ void IncSearchWidget::setFields( const KABC::Field::List &list )
  mFieldList = list;
  announceDoSearch();
  announceFieldChanged();
  setSize();
 }
 KABC::Field::List IncSearchWidget::fields() const
 {
  return mFieldList;
 }
 KABC::Field *IncSearchWidget::currentField()const
 {
  if ( mFieldCombo->currentItem() == -1 || mFieldCombo->currentItem() == 0 )
    return 0;  // for error or 'use all fields'
  else
    return mFieldList[ mFieldCombo->currentItem() - 1 ];
 }
 void IncSearchWidget::setCurrentItem( int pos )
 {
  mFieldCombo->setCurrentItem( pos );
  announceFieldChanged();
 }
 int IncSearchWidget::currentItem() const
 {
  
  return mFieldCombo->currentItem();
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "incsearchwidget.moc"
+#include "moc_incsearchwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index aebf8a6..740b7db 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -1,110 +1,113 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qevent.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qstring.h>
-#include <qtl.h>
+#include <q3tl.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #include <kabc/addressbook.h>
 #include <kabc/field.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include "kabcore.h"
 #include "jumpbuttonbar.h"
 class JumpButton : public QPushButton
 {
  public:
    JumpButton( const QString &text, QWidget *parent,
                const QString &character );
    void setCharacter( const QString &character );
    QString character() const;
  private:
    QString mCharacter;
 };
 JumpButton::JumpButton( const QString &text, QWidget *parent,
                        const QString &character )
  : QPushButton( text, parent )
 {
  mCharacter = character;
 }
 void JumpButton::setCharacter( const QString &character )
 {
  mCharacter = character;
  setText(mCharacter.upper() );
 }
 QString JumpButton::character() const
 {
  return mCharacter;
 }
 JumpButtonBar::JumpButtonBar( KABCore *core, QWidget *parent, const char *name )
  : QWidget( parent, name ), mCore( core )
 {
    if ( QApplication::desktop()->width() < 480 )
        
-        mButtonLayout = new QGridLayout( this,  1, 18 );
+        mButtonLayout = new Q3GridLayout( this,  1, 18 );
    else
-        mButtonLayout = new QGridLayout( this,  1, 20 );
+        mButtonLayout = new Q3GridLayout( this,  1, 20 );
  mButtonLayout->setAlignment( Qt::AlignTop );
  recreateButtons();
 }
 JumpButtonBar::~JumpButtonBar()
 {
 }
 QSizePolicy JumpButtonBar::sizePolicy() const
 {
 #ifndef KAB_EMBEDDED  
  return QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum,
                      QSizePolicy::Vertically );
 #else //KAB_EMBEDDED  
  return QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Minimum);
 #endif //KAB_EMBEDDED  
 }
  
 void JumpButtonBar::letterClicked()
 {
  JumpButton *button = (JumpButton*)sender();
  QString character = button->character();
  if ( character.length() == 2 )
      character = character.left(1) +"-"+character.right(1);
  if ( !character.isNull() )
      emit jumpToLetter( character );
  //qDebug("emit *%s* ",character.latin1());
 }
 void JumpButtonBar::recreateButtons()
 {
@@ -223,35 +226,35 @@ void JumpButtonBar::recreateButtons()
 }
 void JumpButtonBar::sortListLocaleAware( QStringList &list )
 {
  QStringList::Iterator beginIt = list.begin();
  QStringList::Iterator endIt = list.end();
  --endIt;
  if ( beginIt == endIt ) // don't need sorting
    return;
  QStringList::Iterator walkBackIt = endIt;
  while ( beginIt != endIt ) {
    QStringList::Iterator j1 = list.begin();
    QStringList::Iterator j2 = j1;
    ++j2;
    while ( j1 != walkBackIt ) {
 #ifndef KAB_EMBEDDED      
      if ( QString::localeAwareCompare( *j2, *j1 ) < 0 )
 #else //KAB_EMBEDDED      
      if ( QString::compare( *j2, *j1 ) < 0 )
 #endif //KAB_EMBEDDED      
        qSwap( *j1, *j2 );
      ++j1;
      ++j2;
    }
    ++beginIt;
    --walkBackIt;
  }
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "jumpbuttonbar.moc"
+#include "moc_jumpbuttonbar.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h
index d534f2b..0589812 100644
--- a/kaddressbook/jumpbuttonbar.h
+++ b/kaddressbook/jumpbuttonbar.h
@@ -1,84 +1,87 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef JUMPBUTTONBAR_H
 #define JUMPBUTTONBAR_H
 #include <qsizepolicy.h>
 #include <qwidget.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <Q3GridLayout>
 class QChar;
-class QGridLayout;
+class Q3GridLayout;
 class QResizeEvent;
 class QPushButton;
 class JumpButton;
 namespace KABC {
 class Field;
 }
 class KABCore;
 /**
  Used to draw the jump button bar on the right of the view.
 */
 class JumpButtonBar : public QWidget
 {
  Q_OBJECT
  
  public:
    JumpButtonBar( KABCore *core, QWidget *parent, const char *name = 0 );
    ~JumpButtonBar();
    
    QSizePolicy sizePolicy() const;    
    
  public slots:
    /**
      This method removes all buttons from the GUI and recreates them
      according to the current global search field and the content of
      the address book.
     */
    void recreateButtons();
    
  signals:
    /**
      Emitted whenever a letter is selected by the user.
     */
    void jumpToLetter( const QString &character );
  protected slots:
    void letterClicked();
  private:
    void sortListLocaleAware( QStringList &list );
    KABCore *mCore;
-    QGridLayout *mButtonLayout;
+    Q3GridLayout *mButtonLayout;
    QStringList mCharacters;
-    QPtrList<JumpButton> mButtons;
+    Q3PtrList<JumpButton> mButtons;
 };
 #endif
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index ab2824c..03b44d1 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -10,293 +10,303 @@
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    Async a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*s
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include "kabcore.h"
 #include <stdaddressbook.h>
 #include <klocale.h>
 #include <kfiledialog.h>
 #include <qtimer.h>
 #include <qlabel.h>
 #include <qregexp.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qpushbutton.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <QResizeEvent>
+#include <QPixmap>
+#include <Q3ValueList>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <Q3CString>
+#include <Q3PopupMenu>
+#include <Q3PtrList>
 #include <libkdepim/phoneaccess.h>
 #ifndef KAB_EMBEDDED
 #include <qclipboard.h>
 #include <qdir.h> 
 #include <qfile.h>
 #include <qapplicaton.h>
-#include <qprogressbar.h>
+#include <q3progressbar.h>
 #include <qlayout.h>
 #include <qregexp.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <kabc/addresseelist.h>
 #include <kabc/errorhandler.h>
 #include <kabc/resource.h>
 #include <kabc/vcardconverter.h>
 #include <kapplication.h>
 #include <kactionclasses.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <kdeversion.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kprotocolinfo.h>
 #include <kresources/selectdialog.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <kxmlguiclient.h>
 #include <kaboutdata.h>
 #include <libkdepim/categoryselectdialog.h>
 #include "addresseeutil.h"
 #include "addresseeeditordialog.h"
 #include "extensionmanager.h"
 #include "kstdaction.h"
 #include "kaddressbookservice.h"
 #include "ldapsearchdialog.h"
 #include "printing/printingwizard.h"
 #else // KAB_EMBEDDED
 #include <kapplication.h>
 #include "KDGanttMinimizeSplitter.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #include "addresseedialog.h"
 //US
 #include <addresseeview.h>
-#include <qapp.h>
+#include <qapplication.h>
 #include <qmenubar.h>
 //#include <qtoolbar.h>
 #include <qmessagebox.h>
 #include <kdebug.h>
 #include <kiconloader.h> // needed for SmallIcon
 #include <kresources/kcmkresources.h>
 #include <ktoolbar.h>
 #include <kprefsdialog.h>
 //#include <qlabel.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/ir.h>
 #include <qpe/qpemenubar.h>
 #include <qtopia/qcopenvelope_qws.h>
 #else
 #include <qmenubar.h>
 #endif
 #endif // KAB_EMBEDDED
 #include "kcmconfigs/kcmkabconfig.h"
 #include "kcmconfigs/kcmkdepimconfig.h"
 #include "kpimglobalprefs.h"
 #include "externalapphandler.h"
 #include "xxportselectdialog.h"
 #include <kresources/selectdialog.h>
 #include <kmessagebox.h>
 #include <picture.h>
 #include <resource.h>
 //US#include <qsplitter.h>
 #include <qmap.h>
 #include <qdir.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qlayout.h>
 #include <qclipboard.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qradiobutton.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/categoryeditdialog.h>
 #include <kabc/vcardconverter.h>
 #include "addresseeutil.h"
 #include "undocmds.h"
 #include "addresseeeditordialog.h"
 #include "viewmanager.h"
 #include "details/detailsviewcontainer.h"
 #include "kabprefs.h"
 #include "xxportmanager.h"
 #include "incsearchwidget.h"
 #include "jumpbuttonbar.h"
 #include "extensionmanager.h"
 #include "addresseeconfig.h"
 #include "nameeditdialog.h"
 #include <kcmultidialog.h>
 #ifdef _WIN32_
 #ifdef  _OL_IMPORT_
 #include "kaimportoldialog.h"
 #include <libkdepim/ol_access.h>
 #endif
 #else
 #include <unistd.h>
 #endif
 // sync includes
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/ksyncprefsdialog.h>
 class KABCatPrefs : public QDialog
 {
  public:
    KABCatPrefs( QWidget *parent=0, const char *name=0 ) :
      QDialog( parent, name, true ) 
    {
        setCaption( i18n("Manage new Categories") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel * lab = new QLabel( i18n("After importing/loading/syncing\nthere may be new categories in\naddressees\nwhich are not in the category list.\nPlease choose what to do:\n "), this );
        lay->addWidget( lab ); 
-        QButtonGroup* format = new  QButtonGroup( 1, Horizontal, i18n("New categories not in list:"), this );
+        Q3ButtonGroup* format = new  Q3ButtonGroup( 1, Qt::Horizontal, i18n("New categories not in list:"), this );
        lay->addWidget( format ); 
        format->setExclusive ( true ) ;
        addCatBut = new QRadioButton(i18n("Add to category list"), format );
        new QRadioButton(i18n("Remove from addressees"), format );
        addCatBut->setChecked( true );
        QPushButton * ok = new QPushButton( i18n("OK"), this );
        lay->addWidget( ok );
        QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
        lay->addWidget( cancel );
        connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
        connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
        resize( 200, 200 );
    }
      
    bool addCat() { return addCatBut->isChecked(); }
 private:
    QRadioButton* addCatBut;
 };
 class KABFormatPrefs : public QDialog
 {
  public:
    KABFormatPrefs( QWidget *parent=0, const char *name=0 ) :
      QDialog( parent, name, true ) 
    {
        setCaption( i18n("Set formatted name") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel * lab = new QLabel( i18n("You can set the formatted name\nfor a list of contacts in one go."), this );
        lay->addWidget( lab ); 
-        QButtonGroup* format = new QButtonGroup( 1, Horizontal, i18n("Set formatted name to:"), this );
+        Q3ButtonGroup* format = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Set formatted name to:"), this );
        lay->addWidget( format ); 
        format->setExclusive ( true ) ;
        simple = new QRadioButton(i18n("Simple: James Bond"), format );
        full = new QRadioButton(i18n("Full: Mr. James 007 Bond I"), format );
        reverse = new QRadioButton(i18n("Reverse: Bond, James"), format );
        company = new QRadioButton(i18n("Organization: MI6"), format );
        simple->setChecked( true );
        setCompany = new QCheckBox(i18n("Set formatted name to\norganization, if name empty"), this);
        lay->addWidget( setCompany );
        QPushButton * ok = new QPushButton( i18n("Select contact list"), this );
        lay->addWidget( ok );
        QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
        lay->addWidget( cancel );
        connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
        connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
        //resize( 200, 200 );
       
    }
 public:
    QRadioButton* simple, *full, *reverse, *company;
    QCheckBox* setCompany;
 };
 class KAex2phonePrefs : public QDialog
 {
  public:
    KAex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
      QDialog( parent, name, true ) 
    {
        setCaption( i18n("Export to phone options") );
-        QVBoxLayout* lay = new QVBoxLayout( this );
+        Q3VBoxLayout* lay = new Q3VBoxLayout( this );
        lay->setSpacing( 3 );
        lay->setMargin( 3 );
        QLabel *lab;
        lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
-        lab->setAlignment (AlignHCenter  ); 
+        lab->setAlignment (Qt::AlignHCenter  ); 
-        QHBox* temphb;
+        Q3HBox* temphb;
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
        new QLabel( i18n("I/O device: "), temphb ); 
        mPhoneDevice = new QLineEdit( temphb);
        lay->addWidget( temphb );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
        new QLabel( i18n("Connection: "), temphb ); 
        mPhoneConnection = new QLineEdit( temphb);
        lay->addWidget( temphb );
-        temphb = new QHBox( this );
+        temphb = new Q3HBox( this );
        new QLabel( i18n("Model(opt.): "), temphb ); 
        mPhoneModel = new QLineEdit( temphb);
        lay->addWidget( temphb );
        // mWriteToSim = new QCheckBox( i18n("Write Contacts to SIM card\n(if not, write to phone memory)"), this );
        // lay->addWidget( mWriteToSim );
        lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ncontact data on phone!"), this ) );  
-        lab->setAlignment (AlignHCenter); 
+        lab->setAlignment (Qt::AlignHCenter); 
        QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
        lay->addWidget( ok );
        QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
        lay->addWidget( cancel );
        connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
        connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
        resize( 220, 240 );
        
    }
   
 public:
    QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
    QCheckBox* mWriteToSim;
 };
 bool pasteWithNewUid = true;
 #ifdef KAB_EMBEDDED
 KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name )
  : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
    mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US  mLdapSearchDialog( 0 ),*/
    mReadWrite( readWrite ), mModified( false ), mMainWindow(client)
 #else //KAB_EMBEDDED
 KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name )
  : QWidget( parent, name ), KSyncInterface(), mGUIClient( client ), mViewManager( 0 ),
    mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
    mReadWrite( readWrite ), mModified( false )
 #endif //KAB_EMBEDDED
 {
  //  syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
  //  syncManager->setBlockSave(false);
@@ -378,138 +388,138 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
  connect( ExternalAppHandler::instance(), SIGNAL (nextView()),this, SLOT(setDetailsToggle()));
  connect( ExternalAppHandler::instance(), SIGNAL (doRingSync()),this, SLOT( doRingSync()));
  connect( ExternalAppHandler::instance(), SIGNAL (callContactdialog()),this, SLOT(callContactdialog()));
 #ifndef KAB_EMBEDDED
  connect( mViewManager, SIGNAL( urlDropped( const KURL& ) ),
           mXXPortManager, SLOT( importVCard( const KURL& ) ) );
  connect( mDetails, SIGNAL( browse( const QString& ) ),
           SLOT( browse( const QString& ) ) );
  mAddressBookService = new KAddressBookService( this );
 #endif //KAB_EMBEDDED
  mMessageTimer = new QTimer( this ); 
  connect( mMessageTimer, SIGNAL( timeout() ), this, SLOT( setCaptionBack() ) );
  mEditorDialog = 0;
  createAddresseeEditorDialog( this );
  setModified( false );  
  mBRdisabled = false;
 #ifndef DESKTOP_VERSION
  infrared  = 0;
 #endif
  //toggleBeamReceive( );
  mMainWindow->toolBar()->show();
  // we have a toolbar repainting error on the Zaurus when starting KA/Pi
  //QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
    QTimer::singleShot( 100, this, SLOT ( loadDataAfterStart() ));
 }
-void KABCore::receiveStart( const QCString& cmsg, const QByteArray& data )
+void KABCore::receiveStart( const Q3CString& cmsg, const QByteArray& data )
 {
    //qDebug("KO: QCOP start message received: %s ", cmsg.data()  );
    mCStringMess = cmsg;
    mByteData = data;
 }
 void  KABCore::loadDataAfterStart()
 {
    //qDebug("KABCore::loadDataAfterStart() ");
    ((StdAddressBook*)mAddressBook)->init( true );
        mViewManager->refreshView();
 #ifndef DESKTOP_VERSION  
-        disconnect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), this, SLOT (receiveStart ( const QCString &, const QByteArray & )));
+        disconnect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), this, SLOT (receiveStart ( const Q3CString &, const QByteArray & )));
        
-      QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
+      QObject::connect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const Q3CString &, const QByteArray & )));
      if ( !mCStringMess.isEmpty() ) 
          ExternalAppHandler::instance()->appMessage( mCStringMess, mByteData );
 #endif
      // QTimer::singleShot( 10, this , SLOT ( updateToolBar())); 
    setCaptionBack();
 }
 void KABCore::updateToolBar()
 {
    static int iii = 0;
    ++iii;
    mMainWindow->toolBar()->repaintMe();
    if ( iii < 4 )
        QTimer::singleShot( 100*iii, this , SLOT ( updateToolBar())); 
 }
 KABCore::~KABCore()
 {
    //  save();
    //saveSettings();
    //KABPrefs::instance()->writeConfig();
    delete AddresseeConfig::instance();
    mAddressBook = 0;
    KABC::StdAddressBook::close();
    
    delete syncManager;
 #ifndef DESKTOP_VERSION
    if ( infrared )
        delete infrared;
 #endif
 }
-void KABCore::receive( const QCString& cmsg, const QByteArray& data )
+void KABCore::receive( const Q3CString& cmsg, const QByteArray& data )
 {
    //qDebug("KA: QCOP message received: %s ", cmsg.data()  );
    if ( cmsg == "setDocument(QString)" ) {
-        QDataStream stream( data, IO_ReadOnly );
+        QDataStream stream( const_cast<QByteArray*>(&data), QIODevice::ReadOnly );
        QString fileName;
        stream >> fileName;
        recieve( fileName );
        return;
    }
 }
 void KABCore::toggleBeamReceive( )
 {
    if ( mBRdisabled  )
        return;
 #ifndef DESKTOP_VERSION
    if ( infrared ) {
        qDebug("KA: AB disable BeamReceive ");
        delete infrared;
        infrared = 0;
        mActionBR->setChecked(false);
        return;
    } 
    qDebug("KA: AB enable BeamReceive ");
    mActionBR->setChecked(true);
    infrared = new QCopChannel("QPE/Application/addressbook",this, "channelAB" ) ;   
-    QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(receive(  const QCString&, const QByteArray& )));
+    QObject::connect( infrared, SIGNAL (received ( const Q3CString &, const QByteArray & )),this, SLOT(receive(  const Q3CString&, const QByteArray& )));
 #endif
 }
 void KABCore::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
    if ( b ) {
        if ( infrared ) {
            toggleBeamReceive( );
        }
        mBRdisabled = true;
    } else {
        if ( mBRdisabled ) {
            mBRdisabled = false;
            //toggleBeamReceive( );
        }
    }
 #endif
 }
 void KABCore::recieve( QString fn  )
 {
    //qDebug("KABCore::recieve ");
    int count = mAddressBook->importFromFile( fn, true );
    if ( count )
        setModified( true );
    mViewManager->refreshView();
    message(i18n("%1 contact(s) received!").arg( count ));
    topLevelWidget()->showMaximized();
    topLevelWidget()->raise();
 }
@@ -531,65 +541,65 @@ void KABCore::restoreSettings()
  mActionJumpBar->setChecked( state );
  setJumpButtonBarVisible( state );
 /*US
 QValueList<int> splitterSize = KABPrefs::instance()->mDetailsSplitter;
  if ( splitterSize.count() == 0 ) {
    splitterSize.append( width() / 2 );
    splitterSize.append( width() / 2 );
  }
  mMiniSplitter->setSizes( splitterSize );
  if (  mExtensionBarSplitter ) {
  splitterSize = KABPrefs::instance()->mExtensionsSplitter;
  if ( splitterSize.count() == 0 ) {
    splitterSize.append( width() / 2 );
    splitterSize.append( width() / 2 );
  }
  mExtensionBarSplitter->setSizes( splitterSize );
  }
 */
  mViewManager->restoreSettings();
  mIncSearchWidget->setCurrentItem( KABPrefs::instance()->mCurrentIncSearchField );
  mExtensionManager->restoreSettings();
 #ifdef DESKTOP_VERSION
  int wid = width();
  if ( wid < 10 )
      wid = 400;
 #else
  int wid = QApplication::desktop()->width();
  if ( wid < 640 )
      wid = QApplication::desktop()->height();
 #endif
-  QValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
+  Q3ValueList<int> splitterSize;// = KABPrefs::instance()->mDetailsSplitter;
  if ( true /*splitterSize.count() == 0*/ ) {
      splitterSize.append( wid / 2 );
      splitterSize.append( wid / 2 );
  }
  mMiniSplitter->setSizes( splitterSize );
  if (  mExtensionBarSplitter ) {
      //splitterSize = KABPrefs::instance()->mExtensionsSplitter;
      if ( true /*splitterSize.count() == 0*/ ) {
          splitterSize.append( wid / 2 );
          splitterSize.append( wid / 2 );
      }
      mExtensionBarSplitter->setSizes( splitterSize );
  }
 #ifdef DESKTOP_VERSION
  KConfig *config = KABPrefs::instance()->getConfig();
  config->setGroup("WidgetLayout");
  QStringList list;
  list = config->readListEntry("MainLayout");
  int x,y,w,h;
  if ( ! list.isEmpty() ) {
      x = list[0].toInt();
      y = list[1].toInt();
      w = list[2].toInt();
      h = list[3].toInt(); 
      KApplication::testCoords( &x,&y,&w,&h );
      topLevelWidget()->setGeometry(x,y,w,h);
      
  } else {
      topLevelWidget()->setGeometry( 40 ,40 , 640, 440);
  }
 #endif
@@ -621,68 +631,68 @@ KABC::AddressBook *KABCore::addressBook() const
  return mAddressBook;
 }
 KConfig *KABCore::config()
 {
 #ifndef KAB_EMBEDDED
  return KABPrefs::instance()->config();
 #else //KAB_EMBEDDED
  return KABPrefs::instance()->getConfig();
 #endif //KAB_EMBEDDED
 }
 KActionCollection *KABCore::actionCollection() const
 {
  return mGUIClient->actionCollection();
 }
 KABC::Field *KABCore::currentSearchField() const
 {
   if (mIncSearchWidget)
    return mIncSearchWidget->currentField();
  else
    return 0;
 }
 QStringList KABCore::selectedUIDs() const
 {
  return mViewManager->selectedUids();
 }
 KABC::Resource *KABCore::requestResource( QWidget *parent )
 {
-  QPtrList<KABC::Resource> kabcResources = addressBook()->resources();
+  Q3PtrList<KABC::Resource> kabcResources = addressBook()->resources();
-  QPtrList<KRES::Resource> kresResources;
+  Q3PtrList<KRES::Resource> kresResources;
-  QPtrListIterator<KABC::Resource> resIt( kabcResources );
+  Q3PtrListIterator<KABC::Resource> resIt( kabcResources );
  KABC::Resource *resource;
  while ( ( resource = resIt.current() ) != 0 ) {
    ++resIt;
    if ( !resource->readOnly() ) {
      KRES::Resource *res = static_cast<KRES::Resource*>( resource );
      if ( res )
        kresResources.append( res );
    }
  }
  KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent );
  return static_cast<KABC::Resource*>( res );
 }
 #ifndef KAB_EMBEDDED
 KAboutData *KABCore::createAboutData()
 #else //KAB_EMBEDDED
 void KABCore::createAboutData()
 #endif //KAB_EMBEDDED
 {
  QString version;
 #include <../version>
    QMessageBox::about( this, "About KAddressbook/Pi",
                        "KAddressbook/Platform-independent\n"
                        "(KA/Pi) " +version + " - " +
 #ifdef DESKTOP_VERSION
                        "Desktop Edition\n"
 #else
                        "PDA-Edition\n"
                        "for: Zaurus 5500 / 7x0 / 8x0\n"
@@ -766,72 +776,72 @@ void KABCore::sendMail( const QString& emaillist )
 void KABCore::mailVCard()
 {
  QStringList uids = mViewManager->selectedUids();
  if ( !uids.isEmpty() )
    mailVCard( uids );
 }
 void KABCore::mailVCard( const QStringList& uids )
 {
  QStringList urls;
 //  QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
  QString dirName = "/tmp/" + KApplication::randomString( 8 );
  QDir().mkdir( dirName, true );
  for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
    KABC::Addressee a = mAddressBook->findByUid( *it );
    if ( a.isEmpty() )
      continue;
    QString name = a.givenName() + "_" + a.familyName() + ".vcf";
    QString fileName = dirName + "/" + name;
    QFile outFile(fileName);
-    if ( outFile.open(IO_WriteOnly) ) {  // file opened successfully
+    if ( outFile.open(QIODevice::WriteOnly) ) {  // file opened successfully
      KABC::VCardConverter converter;
      QString vcard;
      converter.addresseeToVCard( a, vcard );
-      QTextStream t( &outFile );  // use a text stream
+      Q3TextStream t( &outFile );  // use a text stream
-      t.setEncoding( QTextStream::UnicodeUTF8 );
+      t.setEncoding( Q3TextStream::UnicodeUTF8 );
      t << vcard;
      outFile.close();
      urls.append( fileName );
    }
  }
  bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") );
 /*US
  kapp->invokeMailer( QString::null, QString::null, QString::null,
                      QString::null,  // subject
                      QString::null,  // body
                      QString::null,
                      urls );  // attachments
 */
 }
 /**
  Beams the "WhoAmI contact.
 */
 void KABCore::beamMySelf()
 {
  KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI();
  if (!a.isEmpty())
  {
    QStringList uids;
    uids << a.uid();
@@ -987,69 +997,69 @@ void KABCore::beamVCard(const QStringList& uids)
  KABC::VCardConverter converter;
  QString description;
  QString datastream;
  for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
      KABC::Addressee a = mAddressBook->findByUid( *it );
      if ( a.isEmpty() )
          continue;
      if (description.isEmpty())
          description = a.formattedName();
      QString vcard;
      converter.addresseeToVCard( a, vcard );
      int start = 0;
      int next;
      while ( (next = vcard.find("TYPE=", start) )>= 0 ) {
          int semi = vcard.find(";", next);
          int dopp = vcard.find(":", next);
          int sep;
          if ( semi < dopp && semi >= 0 )
              sep = semi ;
          else
              sep = dopp;
          datastream +=vcard.mid( start, next - start);
          datastream +=vcard.mid( next+5,sep -next -5 ).upper();
          start = sep;
      }
      datastream += vcard.mid( start,vcard.length() );
  }
 #ifndef DESKTOP_VERSION
  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( QTextStream::Latin1 );
+      t.setEncoding( Q3TextStream::Latin1 );
      t <<datastream.latin1();
      outFile.close();
      Ir *ir = new Ir( this );
      connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
      ir->send( fileName, description, "text/x-vCard" );
  } else {
      qDebug("KA: Error open temp  beam file ");
      return;
  }
 #endif
 }
 void KABCore::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
  delete ir;
 #endif
  topLevelWidget()->raise();
  message( i18n("Beaming finished!") );
 }
 void KABCore::browse( const QString& url )
 {
 #ifndef KAB_EMBEDDED
  kapp->invokeBrowser( url );
 #else //KAB_EMBEDDED
  qDebug("KABCore::browse must be fixed");
 #endif //KAB_EMBEDDED
 }
@@ -1268,68 +1278,68 @@ void KABCore::contactModified( const KABC::Addressee &addr  )
 #if 0 // debug only
    KABC::Addressee ad = addr;
    ad.computeCsum( "123");
 #endif
 }
 void KABCore::addrModified( const KABC::Addressee &addr ,bool updateDetails )
 {
  Command *command = 0;
  QString uid;
  // check if it exists already
  KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() );
  if ( origAddr.isEmpty() )
    command = new PwNewCommand( mAddressBook, addr );
  else {
    command = new PwEditCommand( mAddressBook, origAddr, addr );
    uid = addr.uid();
  }
  UndoStack::instance()->push( command );
  RedoStack::instance()->clear();
  if ( updateDetails )
      mDetails->setAddressee( addr );
  setModified( true );
 }
 void KABCore::newContact()
 {
-  QPtrList<KABC::Resource> kabcResources = mAddressBook->resources();
+  Q3PtrList<KABC::Resource> kabcResources = mAddressBook->resources();
-  QPtrList<KRES::Resource> kresResources;
+  Q3PtrList<KRES::Resource> kresResources;
-  QPtrListIterator<KABC::Resource> it( kabcResources );
+  Q3PtrListIterator<KABC::Resource> it( kabcResources );
  KABC::Resource *resource;
  while ( ( resource = it.current() ) != 0 ) {
    ++it;
    if ( !resource->readOnly() ) {
      KRES::Resource *res = static_cast<KRES::Resource*>( resource );
      if ( res )
        kresResources.append( res );
    }
  }
  KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, this );
  resource = static_cast<KABC::Resource*>( res );
  if ( resource ) {
    KABC::Addressee addr;
    addr.setResource( resource );
    mEditorDialog->setAddressee( addr );
    mEditorDialog->setCaption( i18n("Edit new contact"));
    KApplication::execDialog ( mEditorDialog );
  } else
    return;
  // mEditorDict.insert( dialog->addressee().uid(), dialog );
 }
 void KABCore::addEmail( QString aStr )
 {
 #ifndef KAB_EMBEDDED
  QString fullName, email;
@@ -1827,138 +1837,138 @@ void KABCore::addressBookChanged()
  }
  mViewManager->refreshView();
 }
 AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
                                                             const char *name )
 {
    if ( mEditorDialog == 0 ) {
  mEditorDialog = new AddresseeEditorDialog( this, parent,
                                                 name ? name : "editorDialog" );
  connect( mEditorDialog, SIGNAL( contactModified( const KABC::Addressee& ) ),
           SLOT( contactModified( const KABC::Addressee& ) ) );
  //connect( mEditorDialog, SIGNAL( editorDestroyed( const QString& ) ),
  //       SLOT( slotEditorDestroyed( const QString& ) ) ;
    }
  return mEditorDialog;
 }
 void KABCore::slotEditorDestroyed( const QString &uid )
 {
    //mEditorDict.remove( uid );
 }
 void KABCore::initGUI()
 {
 #ifndef KAB_EMBEDDED
-  QHBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3HBoxLayout *topLayout = new Q3HBoxLayout( this );
  topLayout->setSpacing( KDialogBase::spacingHint() );
  mExtensionBarSplitter = new QSplitter( this );
  mExtensionBarSplitter->setOrientation( Qt::Vertical );
  mDetailsSplitter = new QSplitter( mExtensionBarSplitter );
-  QVBox *viewSpace = new QVBox( mDetailsSplitter );
+  Q3VBox *viewSpace = new Q3VBox( mDetailsSplitter );
  mIncSearchWidget = new IncSearchWidget( viewSpace );
  connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
           SLOT( incrementalSearch( const QString& ) ) );
  mViewManager = new ViewManager( this, viewSpace );
  viewSpace->setStretchFactor( mViewManager, 1 );
  mDetails = new ViewContainer( mDetailsSplitter );
  mJumpButtonBar = new JumpButtonBar( this, this );
  mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
  topLayout->addWidget( mExtensionBarSplitter );
  topLayout->setStretchFactor( mExtensionBarSplitter, 100 );
  topLayout->addWidget( mJumpButtonBar );
  //topLayout->setStretchFactor( mJumpButtonBar, 1 );
  mXXPortManager = new XXPortManager( this, this );
 #else //KAB_EMBEDDED
  //US initialize viewMenu before settingup viewmanager.
  //  Viewmanager needs this menu to plugin submenues.
-  viewMenu = new QPopupMenu( this );
+  viewMenu = new Q3PopupMenu( this );
-  settingsMenu = new QPopupMenu( this );
+  settingsMenu = new Q3PopupMenu( this );
  //filterMenu = new QPopupMenu( this );
-  ImportMenu = new QPopupMenu( this );
+  ImportMenu = new Q3PopupMenu( this );
-  ExportMenu = new QPopupMenu( this );
+  ExportMenu = new Q3PopupMenu( this );
-  syncMenu = new QPopupMenu( this );
+  syncMenu = new Q3PopupMenu( this );
-  changeMenu= new QPopupMenu( this );
+  changeMenu= new Q3PopupMenu( this );
-  beamMenu= new QPopupMenu( this );
+  beamMenu= new Q3PopupMenu( this );
 //US since we have no splitter for the embedded system, setup
 // a layout with two frames. One left and one right.
-  QBoxLayout *topLayout;
+  Q3BoxLayout *topLayout;
  // = new QHBoxLayout( this );
 //  QBoxLayout *topLayout = (QBoxLayout*)layout();
 //  QWidget *mainBox = new QWidget( this );
 //  QBoxLayout * mainBoxLayout  = new QHBoxLayout(mainBox);
 #ifdef DESKTOP_VERSION
-  topLayout = new QHBoxLayout( this );
+  topLayout = new Q3HBoxLayout( this );
  mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
  mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
  topLayout->addWidget(mMiniSplitter );
  mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter );
  mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
  mViewManager = new ViewManager( this, mExtensionBarSplitter  );
  mDetails = new ViewContainer( mMiniSplitter );
  mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter );
 #else
  if ( QApplication::desktop()->width() > 480 ) {
-      topLayout = new QHBoxLayout( this );
+      topLayout = new Q3HBoxLayout( this );
      mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this);
      mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
  } else {
-      topLayout = new QHBoxLayout( this );
+      topLayout = new Q3HBoxLayout( this );
      mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Vertical, this);
      mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down );
  }
  topLayout->addWidget(mMiniSplitter );
  mViewManager = new ViewManager( this,  mMiniSplitter );
  mDetails = new ViewContainer( mMiniSplitter );
   mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
   //eh->hide();
  // topLayout->addWidget(mExtensionManager );
 /*US
 #ifndef KAB_NOSPLITTER
  QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
  topLayout->setSpacing( 10 );
  mDetailsSplitter = new QSplitter( this );
  QVBox *viewSpace = new QVBox( mDetailsSplitter );
  mViewManager = new ViewManager( this, viewSpace );
  viewSpace->setStretchFactor( mViewManager, 1 );
  mDetails = new ViewContainer( mDetailsSplitter );
  topLayout->addWidget( mDetailsSplitter );
  topLayout->setStretchFactor( mDetailsSplitter, 100 );
@@ -2005,142 +2015,142 @@ void KABCore::initGUI()
  // mActionQuit->plug ( mMainWindow->toolBar());
  //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
  //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
  // mIncSearchWidget->hide();
  connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
           SLOT( incrementalSearch( const QString& ) ) );
  connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) );
  connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) );
  mJumpButtonBar = new JumpButtonBar( this, this );
  topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 // mMainWindow->getIconToolBar()->raise();
 #endif //KAB_EMBEDDED
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 #ifndef KAB_EMBEDDED
  connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
           SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
  // file menu
 
    mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
    //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
-    mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager,
+    mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", Qt::CTRL + Qt::Key_P, mViewManager,
                 SLOT( printView() ), actionCollection(), "kaddressbook_print" );
  
    mActionPrintDetails = new KAction( i18n( "&Print Details" ), "fileprint", 0, mDetails,
                 SLOT( printView() ), actionCollection(), "kaddressbook_print2" );
-  mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
+  mActionSave = new KAction( i18n( "&Save" ), "filesave", Qt::CTRL+Qt::Key_S, this,
                             SLOT( save() ), actionCollection(), "file_sync" );
-  mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
+  mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", Qt::CTRL+Qt::Key_N, this,
                             SLOT( newContact() ), actionCollection(), "file_new_contact" );
  mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
                                 this, SLOT( mailVCard() ),
                                 actionCollection(), "file_mail_vcard");
  mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this,
                               SLOT( export2phone() ), actionCollection(),
                               "kaddressbook_ex2phone" );
  mActionBeamVCard = 0;
 mActionBeam = 0;
 #ifndef DESKTOP_VERSION
  if ( Ir::supported() ) {
    mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this,
                               SLOT( beamVCard() ), actionCollection(),
                               "kaddressbook_beam_vcard" );
    mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this,
                               SLOT( beamMySelf() ), actionCollection(),
                               "kaddressbook_beam_myself" );
  }
 #endif
  mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
                                      this, SLOT( editContact2() ),
                                      actionCollection(), "file_properties" );
 #ifdef KAB_EMBEDDED
  // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() );
  mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0,
                                      mMainWindow, SLOT( exit() ),
                                      actionCollection(), "quit" );
 #endif //KAB_EMBEDDED
  // edit menu
  if ( mIsPart ) {
-    mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
+    mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", Qt::CTRL + Qt::Key_C, this,
                               SLOT( copyContacts() ), actionCollection(),
                               "kaddressbook_copy" );
-    mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this,
+    mActionCut = new KAction( i18n( "Cu&t" ), "editcut", Qt::CTRL + Qt::Key_X, this,
                              SLOT( cutContacts() ), actionCollection(),
                              "kaddressbook_cut" );
-    mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this,
+    mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", Qt::CTRL + Qt::Key_V, this,
                                SLOT( pasteContacts() ), actionCollection(),
                                "kaddressbook_paste" );
-    mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this,
+    mActionSelectAll = new KAction( i18n( "Select &All" ), Qt::CTRL + Qt::Key_A, this,
                  SLOT( selectAllContacts() ), actionCollection(),
                 "kaddressbook_select_all" );
-    mActionUndo = new KAction( i18n( "&Undo" ), "undo", CTRL + Key_Z, this,
+    mActionUndo = new KAction( i18n( "&Undo" ), "undo", Qt::CTRL + Qt::Key_Z, this,
                               SLOT( undo() ), actionCollection(),
                               "kaddressbook_undo" );
-    mActionRedo = new KAction( i18n( "Re&do" ), "redo", CTRL + SHIFT + Key_Z,
+    mActionRedo = new KAction( i18n( "Re&do" ), "redo", Qt::CTRL + Qt::SHIFT + Qt::Key_Z,
                               this, SLOT( redo() ), actionCollection(),
                               "kaddressbook_redo" );
  } else {
    mActionCopy = KStdAction::copy( this, SLOT( copyContacts() ), actionCollection() );
    mActionCut = KStdAction::cut( this, SLOT( cutContacts() ), actionCollection() );
    mActionPaste = KStdAction::paste( this, SLOT( pasteContacts() ), actionCollection() );
    mActionSelectAll = KStdAction::selectAll( this, SLOT( selectAllContacts() ), actionCollection() );
    mActionUndo = KStdAction::undo( this, SLOT( undo() ), actionCollection() );
    mActionRedo = KStdAction::redo( this, SLOT( redo() ), actionCollection() );
  }
  mActionDelete = new KAction( i18n( "&Delete Contact" ), "editdelete",
-                               Key_Delete, this, SLOT( deleteContacts() ),
+                               Qt::Key_Delete, this, SLOT( deleteContacts() ),
                               actionCollection(), "edit_delete" );
  mActionUndo->setEnabled( false );
  mActionRedo->setEnabled( false );
  // settings menu
 #ifdef KAB_EMBEDDED
 //US special menuentry to configure the addressbook resources. On KDE
 // you do that through the control center !!!
  mActionConfigResources = new KAction( i18n( "Configure &Resources..." ), "configure_resources", 0, this,
               SLOT( configureResources() ), actionCollection(),
               "kaddressbook_configure_resources" );
 #endif //KAB_EMBEDDED
  if ( mIsPart ) {
    mActionConfigKAddressbook = new KAction( i18n( "&Configure KAddressBook..." ), "configure", 0, this,
                 SLOT( openConfigDialog() ), actionCollection(),
                 "kaddressbook_configure" );
    //US not implemented yet
    //mActionConfigShortcuts = new KAction( i18n( "Configure S&hortcuts..." ), "configure_shortcuts", 0,
    //             this, SLOT( configureKeyBindings() ), actionCollection(),
    //             "kaddressbook_configure_shortcuts" );
 #ifdef KAB_EMBEDDED
  mActionConfigureToolbars = KStdAction::configureToolbars( this, SLOT( mMainWindow->configureToolbars() ), actionCollection() );
  mActionConfigureToolbars->setEnabled( false );
 #endif //KAB_EMBEDDED
  } else {
      mActionConfigKAddressbook = new KAction( i18n( "&Configure KA/Pi..." ), "configure", 0, this,
                                               SLOT( openConfigDialog() ), actionCollection(),
                                               "kaddressbook_configure" );  
@@ -2217,95 +2227,95 @@ void KABCore::initActions()
  
 mActionStorageHowto = new KAction( i18n( "Storage HowTo" ), 0,
                 this, SLOT( storagehowto() ), actionCollection(),
                 "storage" );
  
 mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0,
                 this, SLOT( synchowto() ), actionCollection(),
                 "sync" );
 mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0,
                 this, SLOT( kdesynchowto() ), actionCollection(),
                 "kdesync" );
 mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0,
                 this, SLOT( multisynchowto() ), actionCollection(),
                 "multisync" );
  mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
                 this, SLOT( createAboutData() ), actionCollection(),
                 "kaddressbook_about_data" );
 #endif //KAB_EMBEDDED
  clipboardDataChanged();
  connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
  connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
 }
 //US we need this function, to plug all actions into the correct menues.
 // KDE uses a XML format to plug the actions, but we work her without this overhead.
 void KABCore::addActionsManually()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 #ifdef KAB_EMBEDDED
-  QPopupMenu *fileMenu = new QPopupMenu( this );
+  Q3PopupMenu *fileMenu = new Q3PopupMenu( this );
-  QPopupMenu *editMenu = new QPopupMenu( this );
+  Q3PopupMenu *editMenu = new Q3PopupMenu( this );
-  QPopupMenu *helpMenu = new QPopupMenu( this );
+  Q3PopupMenu *helpMenu = new Q3PopupMenu( this );
  KToolBar* tb =  mMainWindow->toolBar();
  mMainWindow->setToolBarsMovable (false ); 
 #ifndef DESKTOP_VERSION
  if ( KABPrefs::instance()->mFullMenuBarVisible ) {
 #endif
      QMenuBar* mb = mMainWindow->menuBar();
      //US setup menubar.
      //Disable the following block if you do not want to have a menubar.
      mb->insertItem( i18n("&File"), fileMenu );
      mb->insertItem( i18n("&Edit"), editMenu );
      mb->insertItem( i18n("&View"), viewMenu );
      mb->insertItem( i18n("&Settings"), settingsMenu );
 #ifdef DESKTOP_VERSION
      mb->insertItem( i18n("Synchronize"), syncMenu );
 #else
      mb->insertItem( i18n("Sync"), syncMenu );
 #endif
      //mb->insertItem( i18n("&Change"), changeMenu );
      mb->insertItem( i18n("&Help"), helpMenu );
      mIncSearchWidget = new IncSearchWidget( tb );
      // tb->insertWidget(-1, 0, mIncSearchWidget);
 #ifndef DESKTOP_VERSION
  } else  {
      //US setup toolbar
      QPEMenuBar   *menuBarTB = new QPEMenuBar( tb );
-      QPopupMenu *popupBarTB = new QPopupMenu( this );
+      Q3PopupMenu *popupBarTB = new Q3PopupMenu( this );
      menuBarTB->insertItem( SmallIcon( "z_menu" ) , popupBarTB);
      tb->insertWidget(-1, 0, menuBarTB);
      mIncSearchWidget = new IncSearchWidget( tb );
      tb->enableMoving(false);
      popupBarTB->insertItem( i18n("&File"), fileMenu );
      popupBarTB->insertItem( i18n("&Edit"), editMenu );
      popupBarTB->insertItem( i18n("&View"), viewMenu );
      popupBarTB->insertItem( i18n("&Settings"), settingsMenu );
      popupBarTB->insertItem( i18n("Synchronize"), syncMenu );
      mViewManager->getFilterAction()->plug ( popupBarTB);
      //popupBarTB->insertItem( i18n("&Change selected"), changeMenu );
      popupBarTB->insertItem( i18n("&Help"), helpMenu );
      if (QApplication::desktop()->width() > 320 ) {
          // mViewManager->getFilterAction()->plug ( tb);
      }
  }
 #endif
  mIncSearchWidget->setSize();
  // mActionQuit->plug ( mMainWindow->toolBar());
  //US Now connect the actions with the menue entries.
 #ifdef DESKTOP_VERSION
  mActionPrint->plug( fileMenu );
  mActionPrintDetails->plug( fileMenu );
  fileMenu->insertSeparator();
 #endif
  mActionMail->plug( fileMenu );
  fileMenu->insertSeparator();
  mActionNewContact->plug( editMenu );
@@ -2602,65 +2612,65 @@ void KABCore::clipboardDataChanged()
 void KABCore::updateActionMenu()
 {
  UndoStack *undo = UndoStack::instance();
  RedoStack *redo = RedoStack::instance();
  if ( undo->isEmpty() )
    mActionUndo->setText( i18n( "Undo" ) );
  else
    mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
  mActionUndo->setEnabled( !undo->isEmpty() );
  if ( !redo->top() )
    mActionRedo->setText( i18n( "Redo" ) );
  else
    mActionRedo->setText( i18n( "Redo %1" ).arg( redo->top()->name() ) );
  mActionRedo->setEnabled( !redo->isEmpty() );
 }
 void KABCore::configureKeyBindings()
 {
 #ifndef KAB_EMBEDDED
  KKeyDialog::configure( actionCollection(), true );
 #else //KAB_EMBEDDED
  qDebug("KABCore::configureKeyBindings() not implemented");
 #endif //KAB_EMBEDDED
 }
 #ifdef KAB_EMBEDDED
 void KABCore::configureResources()
 {
-  KRES::KCMKResources dlg( this, "" , 0 );
+  KRES::KCMKResources dlg( this, "" , QStringList() );
  if ( !dlg.exec() )
    return;
  KMessageBox::information( this,  i18n("Please restart to get the \nchanged resources (re)loaded!\n") );
 }
 #endif //KAB_EMBEDDED
 /* this method will be called through the QCop interface from Ko/Pi to select addresses
 * for the attendees list of an event.
 */
 void KABCore::requestForNameEmailUidList(const QString& sourceChannel, const QString& uid)
 {
    qDebug("KABCore::requestForNameEmailUidList ");
  bool ok = false;
  mEmailSourceChannel = sourceChannel;
  mEmailSourceUID = uid; 
  QTimer::singleShot( 10,this, SLOT ( callContactdialog() ) );
    //callContactdialog();
 #if 0
  int wid = uid.toInt( &ok );
  qDebug("UID %s ", uid.latin1());
  if ( ok ) {
      if ( wid != QApplication::desktop()->width() ) {
          qDebug("KA/Pi: Request from different desktop geometry. Resizing ...");
          message( i18n("Resizing, please wait...") );
          mMainWindow->showMinimized();
          /*
          {
              QCopEnvelope e("QPE/Application/kapi", "callContactdialog()");
          }
          */
@@ -2698,65 +2708,65 @@ void KABCore::callContactdialog()
  KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
  uint i=0;
  for (i=0; i < list.count(); i++)
  {
        nameList.append(list[i].realName());
        emailList.append(list[i].preferredEmail());
        uidList.append(list[i].uid());
  }
  QString uid = mEmailSourceUID;
  //qDebug("%s %s ", sourceChannel.latin1(), uid.latin1());
  bool res = ExternalAppHandler::instance()->returnNameEmailUidListFromKAPI(mEmailSourceChannel, uid, nameList, emailList, uidList);
  running = false;
 }
 /* this method will be called through the QCop interface from Ko/Pi to select birthdays
 * to put them into the calendar.
 */
 void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString& uid)
 {
  //  qDebug("KABCore::requestForBirthdayList");
  QStringList birthdayList;
  QStringList anniversaryList;
  QStringList realNameList;
  QStringList preferredEmailList;
  QStringList assembledNameList;
  QStringList uidList;
  KABC::AddressBook::Iterator it;
    int count = 0;
    for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
        ++count;
    }
-    QProgressBar bar(count,0 );
+    Q3ProgressBar bar(count,0 );
    int w = 300;
    if ( QApplication::desktop()->width() < 320 )
        w = 220;
    int h = bar.sizeHint().height() ;
    int dw = QApplication::desktop()->width();
    int dh = QApplication::desktop()->height();
    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
    bar.show();
    bar.setCaption (i18n("Collecting birthdays - close to abort!") );
    qApp->processEvents();
    QDate bday;
    QString anni;
    QString formattedbday;
  for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it )  
  {
        if ( ! bar.isVisible() )
            return;
        bar.setProgress( count++ );
        qApp->processEvents();
        bday = (*it).birthday().date();
        anni = (*it).custom("KADDRESSBOOK", "X-Anniversary" );
        if ( bday.isValid() || !anni.isEmpty())
        {
          if (bday.isValid()) 
            formattedbday = KGlobal::locale()->formatDate(bday,  true, KLocale::ISODate);
          else
            formattedbday = "NOTVALID";
          if (anni.isEmpty())
            anni = "INVALID";
@@ -2879,65 +2889,65 @@ void KABCore::synchowto()
    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" );
 }
 void KABCore::kdesynchowto()
 {
    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" );
 }
 void KABCore::multisynchowto()
 {
    KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" );
 }
 void  KABCore::faq()
 {
  KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" );
 }
 #include <libkcal/syncdefines.h>
 KABC::Addressee KABCore::getLastSyncAddressee()
 {
    Addressee lse; 
    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
    //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
    lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
    if (lse.isEmpty()) {
        qDebug("KA: Creating new last-syncAddressee ");
        lse.setUid( "last-syncAddressee-"+mCurrentSyncDevice ); 
        QString sum = "";
        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
            sum = "E: ";
        lse.setFamilyName("!"+sum+mCurrentSyncDevice + i18n(" - sync event"));
        lse.setRevision( mLastAddressbookSync );
-        lse.setCategories( i18n("SyncEvent") );
+        lse.setCategories( QStringList(i18n("SyncEvent")) );
        mAddressBook->insertAddressee( lse );
    }
    return lse;
 }
 int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full )
 {
 
    //void setZaurusId(int id);
    // int zaurusId() const;
    //  void setZaurusUid(int id);
   // int zaurusUid() const;
   // void setZaurusStat(int id);
   // int zaurusStat() const;
    // 0 equal
    // 1 take local
    // 2 take remote
    // 3 cancel 
    QDateTime lastSync = mLastAddressbookSync;
    QDateTime localMod = local->revision();
    QDateTime remoteMod = remote->revision();
    QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
    if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
        bool remCh, locCh;
        remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
        //if ( remCh )
        //  qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
        locCh = ( localMod > mLastAddressbookSync );
        //qDebug("cahnged rem %d loc %d",remCh, locCh  );
        if ( !remCh && ! locCh ) {
            //qDebug("both not changed ");
@@ -3070,65 +3080,65 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
    //KABC::Addressee::List  addresseeLSyncSharp = local->getExternLastSyncAddressees();
    bool fullDateRange = false;
    local->resetTempSyncStat();
    mLastAddressbookSync = QDateTime::currentDateTime();
    if ( syncManager->syncWithDesktop() ) {
        // remote->removeSyncInfo( QString());//remove all info
        if (  KSyncManager::mRequestedSyncEvent.isValid() ) {
            mLastAddressbookSync = KSyncManager::mRequestedSyncEvent;
            qDebug("KA: using extern time for calendar sync: %s ", mLastAddressbookSync.toString().latin1() );
        } else {
            qDebug("KA: KSyncManager::mRequestedSyncEvent has invalid datatime ");
        }
    }
    QDateTime modifiedCalendar = mLastAddressbookSync;
    addresseeLSync = getLastSyncAddressee();
    qDebug("KA: Last Sync %s ", addresseeLSync.revision().toString().latin1());
    addresseeR = remote->findByUid("last-syncAddressee-"+mCurrentSyncName );
    if ( !addresseeR.isEmpty() ) {
        addresseeRSync = addresseeR;
        remote->removeAddressee(addresseeR );
    } else {
        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
            addresseeRSync = addresseeLSync         ;
        } else {
            //qDebug("FULLDATE 1");
            fullDateRange = true;
            Addressee newAdd;
            addresseeRSync = newAdd;
            addresseeRSync.setFamilyName(mCurrentSyncName + i18n(" - sync addressee"));
            addresseeRSync.setUid("last-syncAddressee-"+mCurrentSyncName ); 
            addresseeRSync.setRevision( mLastAddressbookSync );
-            addresseeRSync.setCategories( i18n("SyncAddressee") );
+            addresseeRSync.setCategories( QStringList(i18n("SyncAddressee")) );
        }
    }
    if ( addresseeLSync.revision() == mLastAddressbookSync ) {
        // qDebug("FULLDATE 2");
        fullDateRange = true;
    }
    if ( ! fullDateRange  ) {
        if ( addresseeLSync.revision() != addresseeRSync.revision() ) {
            
            // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); 
            //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
            fullDateRange = true;
            //qDebug("FULLDATE 3 %s %s", addresseeLSync.revision().toString().latin1() , addresseeRSync.revision().toString().latin1() );
        } 
    }
    // fullDateRange = true; // debug only!
    if ( fullDateRange )
        mLastAddressbookSync = QDateTime::currentDateTime().addDays( -100*365);
    else
        mLastAddressbookSync = addresseeLSync.revision();
    // for resyncing if own file has changed
    // PENDING fixme later when implemented
 #if 0
    if ( mCurrentSyncDevice == "deleteaftersync" ) {
        mLastAddressbookSync = loadedFileVersion;
        qDebug("setting mLastAddressbookSync ");
    }
 #endif
    // ********** setting filters ****************
    Filter filterIN  = mViewManager->getFilterByName( syncManager->mFilterInAB );
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ec6a9ec..4351720 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -1,171 +1,175 @@
 /*
    This file is part of KAddressbook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KABCORE_H
 #define KABCORE_H
 #include <kabc/field.h>
 #ifndef KAB_EMBEDDED
 #endif //KAB_EMBEDDED
-#include <qdict.h>
+#include <q3dict.h>
 #include <qtimer.h>
 #include <qwidget.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QPixmap>
+#include <QResizeEvent>
 #include <ksyncmanager.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
 namespace KABC {
 class AddressBook;
 }
 #ifndef KAB_EMBEDDED
 class KAboutData;
 class KConfig;
 class KAddressBookService;
 class LDAPSearchDialog;
 #else //KAB_EMBEDDED
 class KAddressBookMain;
 //US class QAction;
 #endif //KAB_EMBEDDED
 class KCMultiDialog;
 class KXMLGUIClient;
 class ExtensionManager;
 class XXPortManager;
 class JumpButtonBar;
 class IncSearchWidget;
 class KDGanttMinimizeSplitter;
 class KAction;
 class KActionCollection;
 class KToggleAction;
 class KSyncProfile;
 class QAction;
 class QMenuBar;
 class QSplitter;
 class ViewContainer;
 class ViewManager;
 class AddresseeEditorDialog;
 class Ir;
 class KABCore : public QWidget, public KSyncInterface
 {
  Q_OBJECT
  public:
    KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 );
    ~KABCore();
 #ifdef KAB_EMBEDDED
  //US added functionality
-    QPopupMenu* getViewMenu() {return viewMenu;}
+    Q3PopupMenu* getViewMenu() {return viewMenu;}
-    QPopupMenu* getFilterMenu() {return filterMenu;}
+    Q3PopupMenu* getFilterMenu() {return filterMenu;}
-    QPopupMenu* getSettingsMenu() {return settingsMenu;}
+    Q3PopupMenu* getSettingsMenu() {return settingsMenu;}
    void addActionsManually();
 #endif //KAB_EMBEDDED
    /**
      Restores the global settings.
     */
    void restoreSettings();
  
    /**
      Returns a pointer to the StdAddressBook of the application.
     */
    KABC::AddressBook *addressBook() const;
    /**
      Returns a pointer to the KConfig object of the application.
     */
    static KConfig *config();
    /**
      Returns a pointer to the global KActionCollection object. So
      other classes can register their actions easily.
     */
    KActionCollection *actionCollection() const;
    /**
      Returns the current search field of the Incremental Search Widget.
     */
    KABC::Field *currentSearchField() const;
    /**
      Returns the uid list of the currently selected contacts.
     */
    QStringList selectedUIDs() const;
    /**
      Displays the ResourceSelectDialog and returns the selected
      resource or a null pointer if no resource was selected by
      the user.
     */
    KABC::Resource *requestResource( QWidget *parent );
 #ifndef KAB_EMBEDDED
    static KAboutData *createAboutData();
 #endif //KAB_EMBEDDED
 #ifdef KAB_EMBEDDED
-    inline QPopupMenu* getImportMenu() { return ImportMenu;}
+    inline Q3PopupMenu* getImportMenu() { return ImportMenu;}
-    inline QPopupMenu* getExportMenu() { return ExportMenu;}
+    inline Q3PopupMenu* getExportMenu() { return ExportMenu;}
 #endif //KAB_EMBEDDED
  public slots:
 #ifdef KAB_EMBEDDED
    void createAboutData();
 #endif //KAB_EMBEDDED
    void setDetailsToggle();
    void showLicence();
    void faq();
    void whatsnew() ;
    void synchowto() ;
    void storagehowto() ;
    void multisynchowto() ;
    void kdesynchowto() ;
    void writeToPhone();
    /**
      Is called whenever a contact is selected in the view.
     */
    void setContactSelected( const QString &uid );
    /**
      Opens the preferred mail composer with all selected contacts as
      arguments.
     */
    void sendMail();
    /**
      Opens the preferred mail composer with the given contacts as
      arguments.
     */
@@ -337,93 +341,93 @@ class KABCore : public QWidget, public KSyncInterface
    /**
      Creates a KAddressBookPrinter, which will display the print
      dialog and do the printing.
     */
    void print();
    /**
      Registers a new GUI client, so plugins can register its actions.
     */
   void addGUIClient( KXMLGUIClient *client );
   void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
   void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
   void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
  signals:
    void contactSelected( const QString &name );
    void contactSelected( const QPixmap &pixmap );
  public slots:
    void loadDataAfterStart();
    void recieve(QString cmsg );
    void getFile( bool success,const QString & );
    void syncFileRequest(const QString &);
    void setDetailsVisible( bool visible );
    void setDetailsToState();
   
    void saveSettings();
  private slots:
    void updateToolBar();
    void updateMainWindow();
-    void receive( const QCString& cmsg, const QByteArray& data );
+    void receive( const Q3CString& cmsg, const QByteArray& data );
-    void receiveStart( const QCString& cmsg, const QByteArray& data );
+    void receiveStart( const Q3CString& cmsg, const QByteArray& data );
    void toggleBeamReceive( );
    void disableBR(bool);
    void setJumpButtonBarVisible( bool visible );
    void setJumpButtonBar( bool visible );
    void setCaptionBack();
    void resizeAndCallContactdialog();
    void callContactdialog();
    void doRingSync();
  void importFromOL();
    void extensionModified( const KABC::Addressee::List &list );
    void extensionChanged( int id );
    void clipboardDataChanged();
    void updateActionMenu();
    void configureKeyBindings();
    void removeVoice();
    void setFormattedName();
 #ifdef KAB_EMBEDDED
    void configureResources();
 #endif //KAB_EMBEDDED
    void slotEditorDestroyed( const QString &uid );
    void configurationChanged();
    void addressBookChanged();
  private:
-    QCString mCStringMess;
+    Q3CString mCStringMess;
    QByteArray mByteData;
    QString mEmailSourceChannel;
    QString mEmailSourceUID;
    void resizeEvent(QResizeEvent* e );
    bool mBRdisabled;
 #ifndef DESKTOP_VERSION
    QCopChannel* infrared;
 #endif
    QTimer *mMessageTimer;
    void initGUI();
    void initActions();
    QString getPhoneFile();
    AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
                                                        const char *name = 0 );
 KXMLGUIClient *mGUIClient;
  KABC::AddressBook *mAddressBook;
  ViewManager *mViewManager;
  // QSplitter *mDetailsSplitter;
  KDGanttMinimizeSplitter *mExtensionBarSplitter;
  ViewContainer *mDetails;
  KDGanttMinimizeSplitter* mMiniSplitter;
  XXPortManager *mXXPortManager;
  JumpButtonBar *mJumpButtonBar;
  IncSearchWidget *mIncSearchWidget;
  ExtensionManager *mExtensionManager;
  KCMultiDialog *mConfigureDialog;
@@ -457,84 +461,84 @@ class KABCore : public QWidget, public KSyncInterface
    KAction *mActionCopy;
    KAction *mActionCut;
    KAction *mActionPaste;
    KAction *mActionSelectAll;
    KAction *mActionUndo;
    KAction *mActionRedo;
    KAction *mActionDelete;
    //US settings menu
    KAction *mActionConfigResources;
    KAction *mActionConfigGlobal;
    KAction *mActionConfigKAddressbook;
    KAction *mActionConfigShortcuts;
    KAction *mActionConfigureToolbars;
    KAction *mActionKeyBindings;
    KToggleAction *mActionJumpBar;
    KToggleAction *mActionDetails;
    KAction *mActionWhoAmI;
    KAction *mActionCategories;
    KAction *mActionEditCategories;
    KAction *mActionManageCategories;
    KAction *mActionAboutKAddressbook;
    KAction *mActionLicence;
    KAction *mActionFaq;
    KAction *mActionWN;
    KAction *mActionSyncHowto;
    KAction *mActionStorageHowto;
    KAction *mActionKdeSyncHowto;
    KAction *mActionMultiSyncHowto;
    KAction *mActionDeleteView;
-    QPopupMenu *viewMenu;
+    Q3PopupMenu *viewMenu;
-    QPopupMenu *filterMenu;
+    Q3PopupMenu *filterMenu;
-    QPopupMenu *settingsMenu;
+    Q3PopupMenu *settingsMenu;
-    QPopupMenu *changeMenu;
+    Q3PopupMenu *changeMenu;
-    QPopupMenu *beamMenu;
+    Q3PopupMenu *beamMenu;
 //US    QAction *mActionSave;
-    QPopupMenu *ImportMenu;
+    Q3PopupMenu *ImportMenu;
-    QPopupMenu *ExportMenu;
+    Q3PopupMenu *ExportMenu;
    //LR additional methods
    KAction *mActionRemoveVoice;
    KAction *mActionSetFormattedName;
    KAction * mActionImportOL;
 #ifndef KAB_EMBEDDED
    KAddressBookService *mAddressBookService;
 #endif //KAB_EMBEDDED
    class KABCorePrivate;
    KABCorePrivate *d;
    //US    bool mBlockSaveFlag;
 #ifdef KAB_EMBEDDED
    KAddressBookMain *mMainWindow;  // should be the same like mGUIClient
 #endif //KAB_EMBEDDED
    //this are the overwritten callbackmethods from the syncinterface
    virtual bool sync(KSyncManager* manager, QString filename, int mode,QString resource);
    virtual bool syncExternal(KSyncManager* manager, QString resource);
    virtual void removeSyncInfo( QString syncProfile);
    bool readOLdata( KABC::AddressBook* local );
    bool writeOLdata( KABC::AddressBook* local );
    bool syncOL();
    bool syncPhone();
    void message( QString m , bool startTimer = true);
    // LR *******************************
    // sync stuff!
    QString sentSyncFile();
-    QPopupMenu *syncMenu;
+    Q3PopupMenu *syncMenu;
    KSyncManager* syncManager;
    int mGlobalSyncMode; 
    bool synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBook* remote,int mode);
    KABC::Addressee getLastSyncAddressee();
    QDateTime mLastAddressbookSync;
    int  takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, int mode , bool full );
    // *********************
    //OL sync stuff
    QString mOLsyncFolderID;
 };
 #endif
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 42d541b..6f9c995 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -1,60 +1,60 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 //US#ifdef KAB_EMBEDDED
 //#include <qstring.h>
 //#endif //KAB_EMBEDDED
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <stdlib.h>
 #include <libkdepim/kpimglobalprefs.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>
 #include <kglobalsettings.h>
 //US#include <kdebug.h> // defines kdDebug()
 #include "kabprefs.h"
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #endif
 KABPrefs *KABPrefs::sInstance = 0;
 static KStaticDeleter<KABPrefs> staticDeleterAB;
 KABPrefs::KABPrefs()
  : KPimPrefs("kaddressbookrc")
 {
  KPrefs::setCurrentGroup( "Views" );
  addItemBool( "HonorSingleClick", &mHonorSingleClick, false );
  KPrefs::setCurrentGroup( "General" );
  addItemBool( "AutomaticNameParsing", &mAutomaticNameParsing, true );
  addItemInt( "CurrentIncSearchField", &mCurrentIncSearchField, 0 );
 #ifdef KAB_EMBEDDED
  addItemBool("AskForDelete",&mAskForDelete,true);
  addItemBool("AskForQuit",&mAskForQuit,true);
@@ -62,65 +62,65 @@ KABPrefs::KABPrefs()
  addItemBool("ToolBarUp",&mToolBarUp, false );
  addItemBool("SearchWithReturn",&mSearchWithReturn, false );
  addItemBool("AutoSearchWithWildcard",&mAutoSearchWithWildcard, false );
  addItemBool("HideSearchOnSwitch",&mHideSearchOnSwitch, false );
  addItemFont("DetailsFont",&mDetailsFont,KGlobalSettings::generalFont());
 #endif //KAB_EMBEDDED
  KPrefs::setCurrentGroup( "MainWindow" );
  bool m_visible = false;
 #ifdef DESKTOP_VERSION
  m_visible = true;
 #endif
  addItemBool( "FullMenuBarVisible", &mFullMenuBarVisible, m_visible );
  addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false );
  addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true );
  addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter );
  addItemIntList( "DetailsSplitter", &mDetailsSplitter );
  addItemBool( "MultipleViewsAtOnce", &mMultipleViewsAtOnce, true );
  KPrefs::setCurrentGroup( "Extensions_General" );
  QStringList defaultExtensions;
  defaultExtensions << "merge";
  defaultExtensions << "distribution_list_editor";
  addItemInt( "CurrentExtension", &mCurrentExtension, 0 );
  addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions );
  KPrefs::setCurrentGroup( "Views" );
  QString defaultView = i18n( "Default Table View" );
  addItemString( "CurrentView", &mCurrentView, defaultView );
-  addItemStringList( "ViewNames", &mViewNames, defaultView );
+  addItemStringList( "ViewNames", &mViewNames, QStringList(defaultView) );
  KPrefs::setCurrentGroup( "Filters" );
  addItemInt( "CurrentFilter", &mCurrentFilter, 0 );
 }
 KABPrefs::~KABPrefs()
 {
    //qDebug("KABPrefs::~KABPrefs() ");
 if (sInstance == this)
     sInstance = staticDeleterAB.setObject(0);
 }
 
 KABPrefs *KABPrefs::instance()
 {
  if ( !sInstance ) {
 #ifdef KAB_EMBEDDED
    sInstance = staticDeleterAB.setObject( new KABPrefs() );
 #else  //KAB_EMBEDDED
    //US the following line has changed ???. Why
    staticDeleterAB.setObject( sInstance, new KABPrefs() );
 #endif //KAB_EMBEDDED
    sInstance->readConfig();
  }
  return sInstance;
 }
 void KABPrefs::setCategoryDefaults()
 {
  mCustomCategories.clear();
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index ddbc0c0..aff725e 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -1,99 +1,101 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KABPREFS_H
 #define KABPREFS_H
 #include <qstringlist.h>
-#include <qdict.h>
+#include <q3dict.h>
+//Added by qt3to4:
+#include <Q3ValueList>
 #include <libkdepim/kpimprefs.h>
 class KConfig;
 class KABPrefs : public KPimPrefs
 {
  public:
    virtual ~KABPrefs();
    static KABPrefs *instance();
    // General
    bool mHonorSingleClick;
    bool mAutomaticNameParsing;
    int mCurrentIncSearchField;
 #ifdef KAB_EMBEDDED
    // US introduce a nonconst way to return the config object.
    KConfig* getConfig();
    bool mToolBarHor;
    bool mToolBarUp;
    bool mAskForQuit;
    /** Set preferences to default values */
 //    void usrSetDefaults();
    /** Read preferences from config file */
 //    void usrReadConfig();
    /** Write preferences to config file */
 //    void usrWriteConfig();
 #endif //KAB_EMBEDDED
    void usrReadConfig();
    // GUI
    bool mFullMenuBarVisible;
    bool mJumpButtonBarVisible;
    bool mDetailsPageVisible;
    bool mMultipleViewsAtOnce;
    bool mSearchWithReturn;
    bool mAutoSearchWithWildcard;
    bool mHideSearchOnSwitch;
    bool mAskForDelete;
-    QValueList<int> mExtensionsSplitter;
+    Q3ValueList<int> mExtensionsSplitter;
-    QValueList<int> mDetailsSplitter;
+    Q3ValueList<int> mDetailsSplitter;
    // Extensions stuff
    int mCurrentExtension;
    QStringList mActiveExtensions;
    // Views stuff
    QString mCurrentView;
    QStringList mViewNames;
    // Filter
    int mCurrentFilter;
    void setCategoryDefaults();
    QFont mDetailsFont;
  private:
    KABPrefs();
    static KABPrefs *sInstance;
 };
 #endif
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index cd38e5f..4eb1f7f 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -1,81 +1,81 @@
        TEMPLATE= app
        CONFIG  = qt warn_on 
        TARGET  = kapi
 DESTDIR= ../bin
 include( ../variables.pri )
 INCLUDEPATH += . ./details  ./features  ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc  ../ interfaces 
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION
 unix : {
 staticlib: {
        TARGET  = kapi_linux
-LIBS += ../bin/libmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
+LIBS += ../bin/libxmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
+LIBS += ../bin/libxmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
+LIBS += ../bin/libxmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
+LIBS += ../bin/libxmicrokabc.a
-LIBS += ../bin/libmicrokde.a
+LIBS += ../bin/libxmicrokde.a
-LIBS += ../bin/libmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
+LIBS += ../bin/libxmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
+LIBS += ../bin/libxmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
+LIBS += ../bin/libxmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
+LIBS += ../bin/libxmicrokabc.a
-LIBS += ../bin/libmicrokde.a
+LIBS += ../bin/libxmicrokde.a
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 } else {
-LIBS += ../bin/libmicrokdepim.so
+LIBS += ../bin/libxmicrokdepim.so
-LIBS += ../bin/libmicrokde.so
+LIBS += ../bin/libxmicrokde.so
-LIBS += ../bin/libmicrokabc.so
+LIBS += ../bin/libxmicrokabc.so
-LIBS += ../bin/libmicrokcal.so
+LIBS += ../bin/libxmicrokcal.so
 #LIBS += -lldap
 }
 OBJECTS_DIR = obj/unix
 MOC_DIR = moc/unix
 }
 win32: {
 RC_FILE = winicons.rc
 DEFINES += _WIN32_
-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
+LIBS += ../bin/xmicrokabc.lib
 QMAKE_LINK += /NODEFAULTLIB:LIBC
 OBJECTS_DIR = obj/win
 MOC_DIR = moc/win
 #olimport section 
 importol {
 debug: {
 LIBS += mfc71ud.lib
 }
 release: {
 LIBS += mfc71u.lib
 }
 DEFINES +=  _OL_IMPORT_
 HEADERS = ../outport/msoutl9.h \
 kaimportoldialog.h 
 SOURCES = ../outport/msoutl9.cpp \
 kaimportoldialog.cpp 
 #olimport section end
        TARGET  = kapi_xp
 } else {
        TARGET  = kapi_me
 }
 }
 INTERFACES = \
 # filteredit_base.ui \
 # kofilterview_base.ui \
 HEADERS += \
 features/mergewidget.h \
 features/distributionlistwidget.h \
 kcmconfigs/addresseewidget.h \
 kcmconfigs/extensionconfigdialog.h \
@@ -175,32 +175,34 @@ addviewdialog.cpp \
 configurewidget.cpp \
 viewconfigurewidget.cpp \
 viewconfigurefieldspage.cpp \
 viewconfigurefilterpage.cpp \
 undo.cpp \
 undocmds.cpp \
 xxportmanager.cpp \
 xxportobject.cpp \
 xxportselectdialog.cpp \
 details/detailsviewcontainer.cpp \
 details/look_basic.cpp \
 details/look_html.cpp \
 views/kaddressbookiconview.cpp \
 views/kaddressbooktableview.cpp \
 views/kaddressbookcardview.cpp \
 views/configuretableviewdialog.cpp \
 views/configurecardviewdialog.cpp \
 views/cardview.cpp \
 views/contactlistview.cpp \
 views/colorlistbox.cpp \
 xxport/vcard_xxport.cpp \
 xxport/kde2_xxport.cpp \
 xxport/csv_xxport.cpp \
 xxport/csvimportdialog.cpp \
 xxport/opie_xxport.cpp \
 xxport/qtopia_xxport.cpp \
 xxport/sharpdtm_xxport.cpp \
 #details/look_details.cpp \
 #mainwindow.cpp \
 # calendarview.cpp \
 # timespanview.cpp
+#The following line was inserted by qt3to4
+QT += xml  qt3support 
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 64e3a4a..c4b2499 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -1,50 +1,50 @@
        TEMPLATE= app
        CONFIG  += qt warn_on 
        TARGET  = kapi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
 #DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
 #DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #DEFINES += KORG_NOLVALTERNATION
-LIBS += -lmicrokdepim
+LIBS += -lxmicrokdepim
-LIBS += -lmicrokde
+LIBS += -lxmicrokde
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokabc
+LIBS += -lxmicrokabc
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
 LIBS += -Wl,-export-dynamic
 LIBS += $(GCC3EXTRALIB1)
 LIBS += $(GCC3EXTRALIB2)
 INTERFACES = \
 # filteredit_base.ui \
 # kofilterview_base.ui \
 HEADERS = \
 features/mergewidget.h \
 features/distributionlistwidget.h \
 kcmconfigs/addresseewidget.h \
 kcmconfigs/extensionconfigdialog.h \
 kcmconfigs/kcmkabconfig.h \
 kcmconfigs/kabconfigwidget.h \
 addresseeeditordialog.h \
 addresseeeditorwidget.h \
 addresseditwidget.h \
 addresseeconfig.h \
 addresseeutil.h \
 emaileditwidget.h \
 filtereditdialog.h \
 kaddressbookmain.h \
 kabprefs.h \
 kabcore.h \
 viewmanager.h \
 extensionmanager.h \
 extensionwidget.h \
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index c417226..b317974 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -1,120 +1,123 @@
 /*
    This file is part of KAddressbook.
    Copyright (c) 1999 Don Sanders <dsanders@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifdef KAB_EMBEDDED
 #include "kabprefs.h"
 #include <kglobal.h>
 #include <qmessagebox.h>
-#include <qtoolbar.h>
+#include <q3toolbar.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <Q3CString>
+#include <QCloseEvent>
 #else //KAB_EMBEDDED
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #endif //KAB_EMBEDDED
 #include <klocale.h>
 #include "kabcore.h"
 #include "kaddressbookmain.h"
 #include "kactioncollection.h"
 #ifdef KAB_EMBEDDED
 KAddressBookMain::KAddressBookMain() : KMainWindow( 0, "abmain" )
 #else //KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainWindow( 0 ) 
-//MOC_SKIP_END
+#endif
 #endif //KAB_EMBEDDED
 {
    setIcon(SmallIcon( "ka24" )  );
 #if 0
  //US for embedded systems, create the toolbar before we initiate KABCore.
  // KABCore will fill the toolbar with menues and icons
-  QMainWindow::ToolBarDock tbd;
+  Qt::ToolBarDock tbd;
-  tbd = Top;
+  tbd = Qt::DockTop;
-  iconToolBar = new QToolBar( this );
+  iconToolBar = new Q3ToolBar( this );
  addToolBar (iconToolBar , tbd );
  iconToolBar->setHorizontalStretchable(true);  
 //US  iconToolBar->setWidth(300);
 #endif // 0
  mCore = new KABCore( this, true, this );
  
 #ifdef KAB_EMBEDDED
  setCaption( i18n( "KAddressbook/Pi" ) );
 #else //KAB_EMBEDDED
  setCaption( i18n( "Address Book Browser" ) );
 #endif //KAB_EMBEDDED
  //mCore->restoreSettings();
  initActions();
  setCentralWidget( mCore );
 //US  statusBar()->show();
 #ifndef KAB_EMBEDDED
  setStandardToolBarMenuEnabled(true);
  
  createGUI( "kaddressbookui.rc", false );
 #endif //KAB_EMBEDDED
  setAutoSaveSettings();
  mCore->restoreSettings();
 #ifndef DESKTOP_VERSION
-      QObject::connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), mCore, SLOT (receiveStart ( const QCString &, const QByteArray & )));
+      QObject::connect(qApp, SIGNAL (appMessage ( const Q3CString &, const QByteArray & )), mCore, SLOT (receiveStart ( const Q3CString &, const QByteArray & )));
 #endif
 }
 KAddressBookMain::~KAddressBookMain()
 {
    // mCore->saveSettings();
 }
 void KAddressBookMain::showMinimized () 
 {
    QWidget::showMinimized () ;
 }
 void KAddressBookMain::addEmail( QString addr )
 {
  mCore->addEmail( addr );
 }
 #ifndef KAB_EMBEDDED
 ASYNC KAddressBookMain::showContactEditor( QString uid )
 {
  mCore->editContact( uid );
 }
 #endif //KAB_EMBEDDED
 void KAddressBookMain::newContact()
 {
  mCore->newContact();
 }
 QString KAddressBookMain::getNameByPhone( QString phone )
 {
  return mCore->getNameByPhone( phone );
 }
@@ -206,36 +209,35 @@ void KAddressBookMain::closeEvent( QCloseEvent* ce )
  QString mess = i18n( "Close KA/Pi?");
  if ( mModified == true ) 
      mess += i18n( "\nChanges will be saved!");
  else
      mess += i18n( "\nNo unsaved changes detected!\nNothing will be  saved!");
  bool mQuit = true;
  if (mAskForQuit)
  { 
    
    int res = QMessageBox::information( this, "KA/Pi", mess , i18n("Yes!"), i18n("No"), 0, 0 );
    if (res == 0)
      mQuit = true;
    else
      mQuit = false;
  }
  if (mQuit == false)
    return;
  if (mModified == true)
  {
    save();
    mCore->saveSettings();
    //KABPrefs::instance()->writeConfig();
  }
  ce->accept();
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "kaddressbookmain.moc"
+#include "moc_kaddressbookmain.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index b6d9b4b..d3f5cc7 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -1,110 +1,112 @@
 /*
    This file is part of KAddressbook.
    Copyright (c) 1999 Don Sanders <dsanders@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KADDRESSBOOKMAIN_H
 #define KADDRESSBOOKMAIN_H
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QCloseEvent>
 #ifdef KAB_EMBEDDED
-class QToolBar;
+class Q3ToolBar;
 #include <qaction.h>
 //#include <qmainwindow.h>
 #include <kmainwindow.h>
 #else //KAB_EMBEDDED
 #include <kaction.h>
 #include <kapplication.h>
 #include <kmainwindow.h>
 #include "kaddressbookiface.h"
 #endif //KAB_EMBEDDED
 class KABCore;
 class KConfig;
 /**
  This class serves as the main window for KAddressBook.  It handles the
  menus, toolbars, and status bars.
 
  @short Main window class
  @author Don Sanders <dsanders@kde.org>
  @version 0.1
 */
 #ifdef KAB_EMBEDDED
 class KAddressBookMain : public KMainWindow
 #else //KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
-//MOC_SKIP_END
+#endif
 #endif //KAB_EMBEDDED
 {
  Q_OBJECT
  public:
    KAddressBookMain();
    virtual ~KAddressBookMain();
 #ifdef KAB_EMBEDDED
 //    QPEToolBar * getIconToolBar();
    // QToolBar * getIconToolBar();
 #endif //KAB_EMBEDDED
    
  public slots:
    void showMinimized () ;
    virtual void addEmail( QString addr );
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
    virtual ASYNC showContactEditor( QString uid );
-//MOC_SKIP_END
+#endif
 #endif //KAB_EMBEDDED
    virtual void newContact();
    virtual QString getNameByPhone( QString phone );
    virtual void save();
    virtual void exit();
  protected:
    void initActions();
 #ifdef KAB_EMBEDDED
    //US new method to setup menues and toolbars on embedded systems
    void createGUI();
 #endif //KAB_EMBEDDED
    
    /**
      This function is called when it is time for the app to save its
      properties for session management purposes.
     */
    void saveProperties( KConfig* );
    /**
      This function is called when this app is restored.  The KConfig
      object points to the session management config file that was saved
      with @ref saveProperties
     */
    void readProperties( KConfig* );
    void closeEvent( QCloseEvent* ce );
 
  protected slots:
    void configureToolbars();
    void configureKeys();
    void slotNewToolbarConfig();
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 86898e2..4823b37 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -3,64 +3,66 @@
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KAB_EMBEDDED
 #include <qapplication.h>
 #include <kabc/distributionlistdialog.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include "viewmanager.h"
 #endif //KAB_EMBEDDED
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <kabc/distributionlistdialog.h>
 #include <kabc/addressbook.h>
 #include <kdebug.h>
 #include "kaddressbookview.h"
 KAddressBookView::KAddressBookView( KABC::AddressBook *ab, QWidget *parent,
                                    const char *name )
    : QWidget( parent, name ), mAddressBook( ab ), mFieldList()
 {
 
  initGUI();
 }
 KAddressBookView::~KAddressBookView()
 {
 
 }
 QRegExp KAddressBookView::getRegExp( const QString s )
 {
    QRegExp re;
    
    if ( s.length() == 3  && s.mid(1,1) == "-" ) {
        QString pattern = "^[" + s.lower() +"]";
        re.setCaseSensitive(false);
        re.setPattern( pattern );
    } else {
        QString pattern = s.lower()+"*";
        re.setWildcard(true); // most people understand these better.
        re.setCaseSensitive(false);
@@ -104,85 +106,85 @@ QString KAddressBookView::selectedEmails()
        m = KABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), this );
      email = addr.fullEmail( m );
      if ( !first )
        emailAddrs += ", ";
      else
        first = false;
      emailAddrs += email;
    }
  }
  return emailAddrs;
 }
 KABC::Addressee::List KAddressBookView::addressees()
 {
  KABC::Addressee::List addresseeList;
  KABC::AddressBook::Iterator it;
  for (it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
    if ( mFilter.filterAddressee( *it ) )
      addresseeList.append( *it );
  }
  return addresseeList;
 }
 void KAddressBookView::initGUI()
 {
  // Create the layout
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
  // Add the view widget
  mViewWidget = new QWidget( this );
  layout->addWidget( mViewWidget );
 }
 KABC::Field::List KAddressBookView::fields() const
 {
  return mFieldList;
 }
 KABC::Field::List KAddressBookView::allFields() const
 {
  return KABC::Field::allFields(); 
 }
 void KAddressBookView::setFilter( const Filter &filter )
 {
  mFilter = filter;
 }
 KAddressBookView::DefaultFilterType KAddressBookView::defaultFilterType() const
 {
  return mDefaultFilterType;
 }
 const QString &KAddressBookView::defaultFilterName() const
 {
  return mDefaultFilterName;
 }
 KABC::AddressBook *KAddressBookView::addressBook() const
 {
  return mAddressBook;
 }
 QWidget *KAddressBookView::viewWidget()
 {
  return mViewWidget;
 }
 ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab,
                                                   QWidget *parent,
                                                   const char *name )
 {
  return new ViewConfigureWidget( ab, parent, name );
 }
 
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "kaddressbookview.moc"
+#include "moc_kaddressbookview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h
index 3a3f71a..e423cd7 100644
--- a/kaddressbook/kaddressbookview.h
+++ b/kaddressbook/kaddressbookview.h
@@ -1,75 +1,77 @@
+//Added by qt3to4:
+#include <QDropEvent>
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KADDRESSBOOKVIEW_H
 #define KADDRESSBOOKVIEW_H
 #ifndef KAB_EMBEDDED
 #include <klibloader.h>
 #endif //KAB_EMBEDDED
 class KConfig;
 class QDropEvent;
 #include <qstringlist.h>
 #include <kabc/field.h>
 #include <qwidget.h>
 #include <qregexp.h>
 #include "viewconfigurewidget.h"
 #include "filter.h"
 #ifdef DESKTOP_VERSION 
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
 #include <qprinter.h>
 #include <qpainter.h>
 #endif
 namespace KABC { class AddressBook; }
 /**
  Base class for all views in kaddressbook. This class implements
  all the common methods needed to provide a view to the user.
 
  To implement a specific view (table, card, etc), just inherit from
  this class and implement all the pure virtuals.
 
  @author Mike Pilone <mpilone@slac.com>
 */
 class KAddressBookView : public QWidget
 {
  Q_OBJECT
  public:
    enum DefaultFilterType { None = 0, Active = 1, Specific = 2 };
    
    KAddressBookView( KABC::AddressBook *ab, QWidget *parent, const char *name );
    virtual ~KAddressBookView();
    /**
      Must be overloaded in subclasses. Should return a list of
      all the uids of selected contacts.
     */
    virtual QStringList selectedUids() = 0;
    virtual void doSearch( const QString&  s ,KABC::Field *field ) = 0;
    virtual void scrollUP() = 0;
@@ -146,67 +148,67 @@ class KAddressBookView : public QWidget
      defaultFilterName()
     */
    DefaultFilterType defaultFilterType() const;
    
    /**
      @return The name of the default filter. This string is
      only valid if defaultFilterType() is returning SpecificFilter.
     */
    const QString &defaultFilterName() const;
    
    /**
      @return The address book.
     */
    KABC::AddressBook *addressBook() const;
    void printMyView() { emit printView() ;}
  public slots:
    /**
      Must be overloaded in subclasses to refresh the view.
      Refreshing includes updating the view to ensure that only items
      in the document are visible. If <i>uid</i> is valid, only the
      addressee with uid needs to be refreshed. This is an optimization
      only.
     */
    virtual void refresh( QString uid = QString::null ) = 0;
    /**
      This method must be overloaded in subclasses. Select (highlight)
      the addressee matching <i>uid</i>. If uid
      is equal to QString::null, then all addressees should be selected.
     */
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
    virtual void setSelected( QString uid = QString::null, bool selected = true ) = 0;
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
    //US my moc can not handle the default parameters. Is this a problem ???
    virtual void setSelected( QString uid, bool selected) = 0;
 #endif //KAB_EMBEDDED
  signals:
    void printView();
    /**
      This signal should be emitted by a subclass whenever an addressee
      is modified.
     */
    void modified();
    /**
      This signal should be emitted by a subclass whenever an addressee
      is selected. Selected means that the addressee was given the focus.
      Some widgets may call this 'highlighted'. The view is responsible for
      emitting this signal multiple times if multiple items are selected,
      with the last item selected being the last emit.
    
      @param uid The uid of the selected addressee.
    
      @see KListView
     */
    void selected( const QString &uid );
    void deleteRequest();
    /**
      This signal should be emitted by a subclass whenever an addressee
      is executed. This is defined by the KDE system wide config, but it
      either means single or doubleclicked.
    
@@ -233,67 +235,67 @@ class KAddressBookView : public QWidget
  protected: 
    
    /**
      Returns a list of the addressees that should be displayed. This method
      should always be used by the subclass to get a list of addressees. This
      method internally takes many factors into account, including the current
      filter.
     */
    KABC::Addressee::List addressees();
    /**
      This method returns the widget that should be used as the parent for
      all view components. By using this widget as the parent and not
      'this', the view subclass has the option of placing other widgets
      around the view (ie: search fields, etc). Do not delete this widget!
     */
    QWidget *viewWidget();
    QRegExp getRegExp( const QString );
  private:
    void initGUI();
    DefaultFilterType mDefaultFilterType;
    Filter mFilter;
    QString mDefaultFilterName;
    KABC::AddressBook *mAddressBook;
    KABC::Field::List mFieldList;
    
    QWidget *mViewWidget;
 };
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class ViewFactory : public KLibFactory
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
 class ViewFactory
 #endif //KAB_EMBEDDED
 {
  
  public:
    virtual KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent,
                                    const char *name = 0 ) = 0;
    /**
      @return The type of the view. This is normally a small one word
      string (ie: Table, Icon, Tree, etc).
     */
   virtual QString type() const = 0;
    
    /**
      @return The description of the view. This should be a 3 to
      4 line string (don't actually use return characters in the string)
      describing the features offered by the view.
     */
   virtual QString description() const = 0;
    
    /**
      Creates a config dialog for the view type. The default 
      implementation will return a ViewConfigDialog. This default
      dialog will allow the user to set the visible fields only. If
      you need more config options (as most views will), this method
      can be overloaded to return your sublcass of ViewConfigDialog.
      If this method is over loaded the base classes method should
      <B>not</B> be called.
     */
    virtual ViewConfigureWidget *configureWidget( KABC::AddressBook *ab,
diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 168d39e..8055085 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -1,238 +1,242 @@
 /*
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <kconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
 #include "addresseewidget.h"
 NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
                                const char *name )
  : QWidget( parent, name )
 {
  if (KGlobal::getOrientation() == KGlobal::Portrait)
  {
-    QGridLayout* layout = new QGridLayout( this, 1, 1, KDialog::marginHintSmall(),
+    Q3GridLayout* layout = new Q3GridLayout( this, 1, 1, KDialog::marginHintSmall(),
                                         KDialog::spacingHintSmall() );
    
    QLabel *label = new QLabel( i18n( title ), this );
    layout->addWidget( label, 0, 1 );
    
-    mBox = new QListBox( this );
+    mBox = new Q3ListBox( this );
    mBox->setMaximumSize(70, 70);
    layout->addMultiCellWidget( mBox, 0, 1, 0, 0 );
    KButtonBox *bbox = new KButtonBox( this, Qt::Vertical );
    mAddButton = bbox->addButton( i18n( "Add" ), this,  SLOT( add() ) );
    mRemoveButton = bbox->addButton( i18n( "Rem" ), this,  SLOT( remove() ) );
    bbox->layout();
    layout->addMultiCellWidget( bbox, 0, 1, 2,2);
    mEdit = new KLineEdit( this );
    layout->addWidget( mEdit, 1, 1 );
    //mEdit->setMinimumWidth(50);
 //    layout->addWidget( group );
      
  }
  else
  {
-    QHBoxLayout *layout = new QHBoxLayout( this );
+    Q3HBoxLayout *layout = new Q3HBoxLayout( this );
-    QGroupBox *group = new QGroupBox( 0, Qt::Vertical, title, this );
+    Q3GroupBox *group = new Q3GroupBox( 0, Qt::Vertical, title, this );
-    QGridLayout *groupLayout = new QGridLayout( group->layout(), 2, 2,
+    Q3GridLayout *groupLayout = new Q3GridLayout( group->layout(), 2, 2,
                                              KDialog::spacingHint() );
-    mBox = new QListBox( group );
+    mBox = new Q3ListBox( group );
    
    groupLayout->addWidget( mBox, 0, 0 );
    KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
    mAddButton = bbox->addButton( i18n( "Add" ), this,  SLOT( add() ) );
    mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  SLOT( remove() ) );
    bbox->layout();
    groupLayout->addWidget( bbox, 0, 1 );
    mEdit = new KLineEdit( group );
    groupLayout->addMultiCellWidget( mEdit, 1, 1, 0, 1 );
    
    layout->addWidget( group );
    
  }  
  mAddButton->setEnabled( false );
  mRemoveButton->setEnabled( false );
    
-  connect( mBox, SIGNAL( selectionChanged( QListBoxItem* ) ),
+  connect( mBox, SIGNAL( selectionChanged( Q3ListBoxItem* ) ),
-           SLOT( selectionChanged( QListBoxItem* ) ) );
+           SLOT( selectionChanged( Q3ListBoxItem* ) ) );
  connect( mEdit, SIGNAL( textChanged( const QString& ) ),
             SLOT( textChanged( const QString& ) ) );
  connect( mEdit, SIGNAL( returnPressed() ), SLOT( add() ) );
               
 }
 NamePartWidget::~NamePartWidget()
 {
 }
 void NamePartWidget::setNameParts( const QStringList &list )
 {
  mBox->clear();
  mBox->insertStringList( list );
 }
 QStringList NamePartWidget::nameParts() const
 {
  QStringList parts;
  for ( uint i = 0; i < mBox->count(); ++i )
    parts.append( mBox->text( i ) );
  return parts;
 }
 void NamePartWidget::add()
 {
  if ( !mEdit->text().isEmpty() ) {
    mBox->insertItem( mEdit->text() );
    emit modified();
  }
  mEdit->setText( "" );
 }
 void NamePartWidget::remove()
 {
  mBox->removeItem( mBox->currentItem() );
  if ( mBox->count() == 0 )
    selectionChanged( 0 );
  emit modified();
 }
-void NamePartWidget::selectionChanged( QListBoxItem *item )
+void NamePartWidget::selectionChanged( Q3ListBoxItem *item )
 {
  mRemoveButton->setEnabled( item != 0 );
 }
 void NamePartWidget::textChanged( const QString& text )
 {
  mAddButton->setEnabled( !text.isEmpty() );
 }
 AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
-  QGridLayout *layout;
+  Q3GridLayout *layout;
  mPrefix = new NamePartWidget( i18n( "Prefixes" ), this );
  mInclusion = new NamePartWidget( i18n( "Inclusions" ), this );
  mSuffix = new NamePartWidget( i18n( "Suffixes" ), this );
  QString dfn;
  if (QApplication::desktop()->width() > 320 )
      dfn = i18n( "Default formatted name:" );
  else
      dfn = i18n( "Def. formatted name:" );
      
  QLabel *label = new QLabel( dfn, this );
  mFormattedNameCombo = new KComboBox( this );
  mFormattedNameCombo->insertItem( i18n( "Empty" ) );
  mFormattedNameCombo->insertItem( i18n( "Simple Name" ) );
  mFormattedNameCombo->insertItem( i18n( "Full Name" ) );
  mFormattedNameCombo->insertItem( i18n( "Reverse Name" ) );
    
  if (KGlobal::getOrientation() == KGlobal::Portrait)
  {
-    layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(),
+    layout = new Q3GridLayout( this, 4, 2, KDialog::marginHintSmall(),
                                         KDialog::spacingHintSmall() );
    layout->addMultiCellWidget( mPrefix, 0, 0, 0, 1 );
    layout->addMultiCellWidget( mInclusion, 1, 1, 0, 1 );
    layout->addMultiCellWidget( mSuffix, 2, 2, 0, 1 );
    layout->addWidget( label, 3, 0 );
    layout->addWidget( mFormattedNameCombo, 3, 1 );
    
  }
  else
  {
-    layout = new QGridLayout( this, 2, 3, KDialog::marginHint(),
+    layout = new Q3GridLayout( this, 2, 3, KDialog::marginHint(),
                                         KDialog::spacingHint() );
    layout->addWidget( mPrefix, 0, 0 );
    layout->addWidget( mInclusion, 0, 1 );
    layout->addWidget( mSuffix, 0, 2 );
    layout->addWidget( label, 1, 0 );
    layout->addMultiCellWidget( mFormattedNameCombo, 1, 1, 1, 2 );
  }
  connect( mPrefix, SIGNAL( modified() ), SIGNAL( modified() ) );
  connect( mInclusion, SIGNAL( modified() ), SIGNAL( modified() ) );
  connect( mSuffix, SIGNAL( modified() ), SIGNAL( modified() ) );
  connect( mFormattedNameCombo, SIGNAL( activated( int ) ), SIGNAL( modified() ) );
 }
 AddresseeWidget::~AddresseeWidget()
 {
 }
 void AddresseeWidget::restoreSettings()
 {
  KConfig config( locateLocal("config", "kabcrc") );
  config.setGroup( "General" );
  mPrefix->setNameParts( config.readListEntry( "Prefixes" ) );
  mInclusion->setNameParts( config.readListEntry( "Inclusions" ) );
  mSuffix->setNameParts( config.readListEntry( "Suffixes" ) );
  mFormattedNameCombo->setCurrentItem( config.readNumEntry( "FormattedNameType", 1 ) );
 }
 void AddresseeWidget::saveSettings()
 {
    qDebug("AddresseeWidget::saveSettings() ");
  KConfig config( locateLocal("config","kabcrc") );
  config.setGroup( "General" );
  config.writeEntry( "Prefixes", mPrefix->nameParts() );
  config.writeEntry( "Inclusions", mInclusion->nameParts() );
  config.writeEntry( "Suffixes", mSuffix->nameParts() );
  config.writeEntry( "FormattedNameType", mFormattedNameCombo->currentItem() );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "addresseewidget.moc"
+#include "moc_addresseewidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h
index 09330c8..f2a95a8 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.h
+++ b/kaddressbook/kcmconfigs/addresseewidget.h
@@ -1,87 +1,87 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef ADDRESSEEWIDGET_H
 #define ADDRESSEEWIDGET_H
 #include <qwidget.h>
 class KComboBox;
 class KLineEdit;
-class QListBox;
+class Q3ListBox;
-class QListBoxItem;
+class Q3ListBoxItem;
 class QPushButton;
 class NamePartWidget : public QWidget
 {
  Q_OBJECT
  public:
    NamePartWidget( const QString &title, QWidget *parent,
                    const char *name = 0 );
    ~NamePartWidget();
    
    void setNameParts( const QStringList &list );
    QStringList nameParts() const;
  signals:
    void modified();
  private slots:
    void add();
    void remove();
-    void selectionChanged( QListBoxItem* );
+    void selectionChanged( Q3ListBoxItem* );
    void textChanged( const QString& );
  private:
    KLineEdit *mEdit;
-    QListBox *mBox;
+    Q3ListBox *mBox;
    QPushButton *mAddButton;
    QPushButton *mRemoveButton;
 };
 class AddresseeWidget : public QWidget
 {
  Q_OBJECT
  public:
    AddresseeWidget( QWidget *parent, const char *name = 0 );
    ~AddresseeWidget();
    
    void restoreSettings();
    void saveSettings();
  signals:
    void modified();
  private:
    KComboBox *mFormattedNameCombo;
    NamePartWidget *mPrefix;
    NamePartWidget *mInclusion;
    NamePartWidget *mSuffix;
 };
 #endif
diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
index e87b000..33b66ad 100644
--- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
+++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp
@@ -1,59 +1,62 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 #include <klocale.h>
 #include "configurewidget.h"
 #include "extensionconfigdialog.h"
 ExtensionConfigDialog::ExtensionConfigDialog( ExtensionFactory *factory, KConfig *config,
                                              QWidget *parent, const char *name )
  : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent,
                 name, true, true ), mWidget( 0 ), mConfig( config )
 {
-  QFrame *page = plainPage();
+  Q3Frame *page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 1, 1, marginHint(), spacingHint() );
+  Q3GridLayout *layout = new Q3GridLayout( page, 1, 1, marginHint(), spacingHint() );
  mWidget = factory->configureWidget( page, "ExtensionConfigWidget" );
  layout->addWidget( mWidget, 0, 0 );
  mWidget->restoreSettings( mConfig );
 }
 ExtensionConfigDialog::~ExtensionConfigDialog()
 {
 }
 void ExtensionConfigDialog::slotOk()
 {
  mWidget->saveSettings( mConfig );
  KDialogBase::slotOk();
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "extensionconfigdialog.moc"
+#include "moc_extensionconfigdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index 9e4db74..d2b7ef1 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -1,227 +1,231 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qcheckbox.h>
-#include <qframe.h>
+#include <q3frame.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klistview.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else // KAB_EMBEDDED
 #include <mergewidget.h>
 #include <distributionlistwidget.h>
 #endif // KAB_EMBEDDED
 #include "addresseewidget.h"
 #include "extensionconfigdialog.h"
 #include "extensionwidget.h"
 #include "kabprefs.h"
 #include "kabconfigwidget.h"
 #include <kglobalsettings.h>
-class ExtensionItem : public QCheckListItem
+class ExtensionItem : public Q3CheckListItem
 {
  public:
 #ifndef KAB_EMBEDDED
-    ExtensionItem( QListView *parent, const QString &text );
+    ExtensionItem( Q3ListView *parent, const QString &text );
    void setService( const KService::Ptr &ptr );
 #else //KAB_EMBEDDED
-    ExtensionItem( QListView *parent, const QString &text, const QString &name, const QString &comment );
+    ExtensionItem( Q3ListView *parent, const QString &text, const QString &name, const QString &comment );
    void setFactory( ExtensionFactory* fac );
 #endif //KAB_EMBEDDED
    bool configWidgetAvailable() const;
    ExtensionFactory *factory() const;
    virtual QString text( int column ) const;
  private:
 #ifndef KAB_EMBEDDED
    KService::Ptr mPtr;
 #else //KAB_EMBEDDED
    ExtensionFactory* mFactory;
    QString mName;
    QString mComment;
 #endif //KAB_EMBEDDED
 };
 KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *name )
  : KPrefsWidget( prefs, parent, name )
 {
  
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0,
                                            KDialog::spacingHintSmall() );
  QTabWidget *tabWidget = new QTabWidget( this );
  topLayout->addWidget( tabWidget );
  // General page
  QWidget *generalPage = new QWidget( this );
-  QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
+  Q3VBoxLayout *layout = new Q3VBoxLayout( generalPage, KDialog::marginHintSmall(),
                                            KDialog::spacingHintSmall() );
  QWidget *hBox = new QWidget( generalPage, "qhbox" );
-  QHBoxLayout *hboxLayout = new QHBoxLayout( hBox);
+  Q3HBoxLayout *hboxLayout = new Q3HBoxLayout( hBox);
  KPrefsWidFont *detailsFont =
      addWidFont(i18n("phone:123"),i18n("Details view font"),
                 &(KABPrefs::instance()->mDetailsFont),hBox);
  hboxLayout->addWidget(detailsFont->label());
  hboxLayout->addWidget(detailsFont->preview());
  hboxLayout->addWidget(detailsFont->button());
  hboxLayout->setMargin(KDialog::marginHintSmall() );
  hboxLayout->setSpacing(KDialog::spacingHintSmall());
  //hBox->setBackgroundColor( black);
  layout->addWidget( hBox );
  //general groupbox
   QWidget *vBox = new QWidget( generalPage, "qvbox" );
-  QVBoxLayout *boxLayout = new QVBoxLayout( vBox );
+  Q3VBoxLayout *boxLayout = new Q3VBoxLayout( vBox );
  boxLayout->setAlignment( Qt::AlignTop );
  boxLayout->setMargin(KDialog::marginHintSmall() );
  boxLayout->setSpacing( KDialog::spacingHintSmall() );
  mMenuBarBox = new QCheckBox( i18n( "Full Menu bar (restart)" ), vBox, "mremenuturn" );
  boxLayout->addWidget( mMenuBarBox );
  mSearchReturnBox = new QCheckBox( i18n( "Search only after <return> key pressed" ), vBox, "mreturn" );
  boxLayout->addWidget( mSearchReturnBox );
  mAutoSearchWithWildcardBox = new QCheckBox( i18n( "Search with '*' prefix (wildcard)" ), vBox, "mwildcard" );
  boxLayout->addWidget( mAutoSearchWithWildcardBox);
  mHideSearchOnSwitchBox = new QCheckBox( i18n( "Shrink searchfield in portrait view" ), vBox, "mswitch" );
  boxLayout->addWidget( mHideSearchOnSwitchBox );
 #ifdef DESKTOP_VERSION
  mHideSearchOnSwitchBox->hide();
 #endif
  mViewsSingleClickBox = new QCheckBox( i18n( "Show edit dialog on single click" ), vBox, "msingle" );
  boxLayout->addWidget( mViewsSingleClickBox );
  mNameParsing = new QCheckBox( i18n( "Automatic name parsing for new contacts" ), vBox, "mparse" );
  boxLayout->addWidget( mNameParsing );
  mMultipleViewsAtOnce = new QCheckBox( i18n( "Display List and Details at once (restart)" ), vBox, "mdisplay" );
  boxLayout->addWidget( mMultipleViewsAtOnce );
  mAskForDelete = new QCheckBox( i18n( "Ask before delete contact" ), vBox, "mdel" );
  boxLayout->addWidget( mAskForDelete );
  mAskForQuit = new QCheckBox( i18n( "Show exit confirmation" ), vBox, "mquit" );
  boxLayout->addWidget( mAskForQuit );
  layout->addWidget( vBox );
  tabWidget->addTab( generalPage, i18n( "General" ) );
  // Extension page
  QWidget *extensionPage = new QWidget( this );
-  QVBoxLayout *extensionLayout = new QVBoxLayout( extensionPage, KDialog::marginHintSmall(),
+  Q3VBoxLayout *extensionLayout = new Q3VBoxLayout( extensionPage, KDialog::marginHintSmall(),
                                            KDialog::spacingHintSmall() );
  //extensions groupbox
-  QGroupBox* groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage );
+  Q3GroupBox* groupBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage );
-  boxLayout = new QVBoxLayout( groupBox->layout() );
+  boxLayout = new Q3VBoxLayout( groupBox->layout() );
  boxLayout->setAlignment( Qt::AlignTop );
  boxLayout->setMargin(KDialog::marginHintSmall());
  boxLayout->setSpacing(KDialog::spacingHintSmall());
  groupBox->layout()->setMargin(1) ;
  groupBox->layout()->setSpacing(0);
  mExtensionView = new KListView( groupBox );
  mExtensionView->setAllColumnsShowFocus( true );
  mExtensionView->addColumn( i18n( "Name" ) );
  mExtensionView->addColumn( i18n( "Description" ) );
  //mExtensionView->setMaximumHeight(80);
  boxLayout->addWidget( mExtensionView );
  mConfigureButton = new QPushButton( i18n( "Configure..." ), groupBox );
  mConfigureButton->setEnabled( false );
  boxLayout->addWidget( mConfigureButton );
  extensionLayout->addWidget( groupBox );
  connect( mMenuBarBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
  connect( mNameParsing, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
  connect( mViewsSingleClickBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
  connect( mSearchReturnBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
  connect( mAutoSearchWithWildcardBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
  connect( mHideSearchOnSwitchBox, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
  connect( mMultipleViewsAtOnce, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
  connect( mAskForQuit, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
  connect( mAskForDelete, SIGNAL( toggled( bool ) ), this, SLOT( modified() ) );
-  connect( mExtensionView, SIGNAL( selectionChanged( QListViewItem* ) ),
+  connect( mExtensionView, SIGNAL( selectionChanged( Q3ListViewItem* ) ),
-           SLOT( selectionChanged( QListViewItem* ) ) );
+           SLOT( selectionChanged( Q3ListViewItem* ) ) );
-  connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ),
+  connect( mExtensionView, SIGNAL( clicked( Q3ListViewItem* ) ),
-           SLOT( itemClicked( QListViewItem* ) ) );
+           SLOT( itemClicked( Q3ListViewItem* ) ) );
  connect( mConfigureButton, SIGNAL( clicked() ),
           SLOT( configureExtension() ) );
  tabWidget->addTab( extensionPage, i18n( "Extensions" ) );
  // Addressee page
  mAddresseeWidget = new AddresseeWidget( this );
  tabWidget->addTab( mAddresseeWidget, i18n( "Contact" ) );
  connect( mAddresseeWidget, SIGNAL( modified() ), SLOT( modified() ) );
 }
 void KABConfigWidget::usrReadConfig()
 {
  KABPrefs* prefs = KABPrefs::instance();
  bool blocked = signalsBlocked();
  blockSignals( true );
  mMenuBarBox->setChecked( prefs->mFullMenuBarVisible);
  mNameParsing->setChecked( prefs->mAutomaticNameParsing );
  mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick );
  mSearchReturnBox->setChecked( prefs->mSearchWithReturn );
  mAutoSearchWithWildcardBox->setChecked( prefs->mAutoSearchWithWildcard );
  mHideSearchOnSwitchBox->setChecked( prefs->mHideSearchOnSwitch );
  mMultipleViewsAtOnce->setChecked( prefs->mMultipleViewsAtOnce );
  mAskForQuit->setChecked( prefs->mAskForQuit );
  mAskForDelete->setChecked( prefs->mAskForDelete );
  mAddresseeWidget->restoreSettings();
  restoreExtensionSettings();
@@ -266,159 +270,158 @@ void KABConfigWidget::restoreExtensionSettings()
    item->setService( *it );
    if ( activeExtensions.contains( item->factory()->identifier() ) )
      item->setOn( true );
  }
 #else //KAB_EMBEDDED
    ExtensionFactory *extensionFactory = new MergeFactory();
    ExtensionItem *item = new ExtensionItem( mExtensionView, "Merge",  "Merge", "Merge contacts");
    item->setFactory( extensionFactory );
    if ( activeExtensions.contains( extensionFactory->identifier() ) )
      item->setOn( true );
    extensionFactory = new DistributionListFactory();
    item = new ExtensionItem( mExtensionView, "Distribution List",  "Distribution List", "Manage Distribution Lists");
    item->setFactory( extensionFactory );
    if ( activeExtensions.contains( extensionFactory->identifier() ) )
      item->setOn( true );
 #endif //KAB_EMBEDDED
 }
 void KABConfigWidget::saveExtensionSettings()
 {
  QStringList activeExtensions;
-  QPtrList<QListViewItem> list;
+  Q3PtrList<Q3ListViewItem> list;
-  QListViewItemIterator it( mExtensionView );
+  Q3ListViewItemIterator it( mExtensionView );
  while ( it.current() ) {
    ExtensionItem *item = static_cast<ExtensionItem*>( it.current() );
    if ( item ) {
      if ( item->isOn() )
        activeExtensions.append( item->factory()->identifier() );
    }
    ++it;
  }
  KABPrefs::instance()->mActiveExtensions = activeExtensions;
 }
 void KABConfigWidget::configureExtension()
 {
  ExtensionItem *item = static_cast<ExtensionItem*>( mExtensionView->currentItem() );
  if ( !item )
    return;
 #ifndef KAB_EMBEDDED
  KConfig config( "kaddressbookrc" );
 #else //KAB_EMBEDDED
  KConfig config( locateLocal("config", "kaddressbookrc") );
 #endif //KAB_EMBEDDED
  config.setGroup( QString( "Extensions_%1" ).arg( item->factory()->identifier() ) );
  ExtensionConfigDialog dlg( item->factory(), &config, this );
  dlg.exec();
  config.sync();
 }
-void KABConfigWidget::selectionChanged( QListViewItem *i )
+void KABConfigWidget::selectionChanged( Q3ListViewItem *i )
 {
  ExtensionItem *item = static_cast<ExtensionItem*>( i );
  if ( !item )
    return;
  mConfigureButton->setEnabled( item->configWidgetAvailable() );
 }
-void KABConfigWidget::itemClicked( QListViewItem *item )
+void KABConfigWidget::itemClicked( Q3ListViewItem *item )
 {
  if ( item != 0 )
    modified();
 }
 #ifndef KAB_EMBEDDED
-ExtensionItem::ExtensionItem( QListView *parent, const QString &text )
+ExtensionItem::ExtensionItem( Q3ListView *parent, const QString &text )
-  : QCheckListItem( parent, text, CheckBox )
+  : Q3CheckListItem( parent, text, CheckBox )
 {
 }
 void ExtensionItem::setService( const KService::Ptr &ptr )
 {
  mPtr = ptr;
 }
 #else //KAB_EMBEDDED
-ExtensionItem::ExtensionItem( QListView *parent, const QString &text, const QString &name, const QString &comment )
+ExtensionItem::ExtensionItem( Q3ListView *parent, const QString &text, const QString &name, const QString &comment )
-  : QCheckListItem( parent, text, CheckBox )
+  : Q3CheckListItem( parent, text, CheckBox )
 {
  mName = name;
  mComment = comment;
 }
 void ExtensionItem::setFactory( ExtensionFactory* fac )
 {
  mFactory = fac;
 }
 #endif //KAB_EMBEDDED
 bool ExtensionItem::configWidgetAvailable() const
 {
 #ifndef KAB_EMBEDDED
  KLibFactory *factory = KLibLoader::self()->factory( mPtr->library().latin1() );
  if ( !factory )
    return false;
  ExtensionFactory *extensionFactory = static_cast<ExtensionFactory*>( factory );
  if ( !extensionFactory )
    return false;
  return extensionFactory->configureWidgetAvailable();
 #else //KAB_EMBEDDED
  return mFactory->configureWidgetAvailable();
 #endif //KAB_EMBEDDED
 }
 ExtensionFactory *ExtensionItem::factory() const
 {
 #ifndef KAB_EMBEDDED
  KLibFactory *factory = KLibLoader::self()->factory( mPtr->library().latin1() );
  if ( !factory )
    return 0;
  return static_cast<ExtensionFactory*>( factory );
 #else //KAB_EMBEDDED
  return mFactory;
 #endif //KAB_EMBEDDED
 }
 QString ExtensionItem::text( int column ) const
 {
 #ifndef KAB_EMBEDDED
  if ( column == 0 )
    return mPtr->name();
  else if ( column == 1 )
    return mPtr->comment();
  else
    return QString::null;
 #else //KAB_EMBEDDED
  if ( column == 0 )
    return mName;
  else if ( column == 1 )
    return mComment;
  else
    return QString::null;
 #endif //KAB_EMBEDDED
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "kabconfigwidget.moc"
+#include "moc_kabconfigwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h
index f2a6b1b..4b6e58c 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.h
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.h
@@ -1,78 +1,78 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KABCONFIGWIDGET_H
 #define KABCONFIGWIDGET_H
 #include <kprefswidget.h>
 class QCheckBox;
-class QListViewItem;
+class Q3ListViewItem;
 class QPushButton;
 class QComboBox;
 class QLineEdit;
 class KListView;
 class KABPrefs;
 class AddresseeWidget;
 class KABConfigWidget : public KPrefsWidget
 {
  Q_OBJECT
  public:
    KABConfigWidget(KABPrefs *prefs, QWidget *parent, const char *name = 0 );
  protected:
    /** Implement this to read custom configuration widgets. */
  virtual void usrReadConfig();
    /** Implement this to write custom configuration widgets. */
  virtual void usrWriteConfig();
  private slots:
    void configureExtension();
-    void selectionChanged( QListViewItem* );
+    void selectionChanged( Q3ListViewItem* );
-    void itemClicked( QListViewItem* );
+    void itemClicked( Q3ListViewItem* );
  private:
    void restoreExtensionSettings();
    void saveExtensionSettings();
    KListView *mExtensionView;
    QCheckBox *mSearchReturnBox;
    QCheckBox *mNameParsing;
    QCheckBox *mViewsSingleClickBox;
    QCheckBox *mAutoSearchWithWildcardBox;
    QCheckBox *mHideSearchOnSwitchBox;
    QCheckBox *mMultipleViewsAtOnce;
    QCheckBox *mAskForQuit;
    QCheckBox *mMenuBarBox;
    QCheckBox *mAskForDelete;
    QPushButton *mConfigureButton;
    AddresseeWidget *mAddresseeWidget;
 };
 #endif
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index cbfedbd..55ffcd8 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -1,92 +1,94 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #ifndef KAB_EMBEDDED
 #include <kaboutdata.h>
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 //#include <klocale.h>
 //#include <stdlib.h>
 #include "kabconfigwidget.h"
 #include "kcmkabconfig.h"
 #include "kabprefs.h"
 #include "kprefs.h"
 extern "C"
 {
  KCModule *create_kabconfig( QWidget *parent, const char * ) {
    return new KCMKabConfig( parent, "kcmkabconfig" );
  }
 }
 KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
  : KCModule( KABPrefs::instance(), parent, name )
 {
    //abort();
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
  mConfigWidget = new KABConfigWidget( (KABPrefs*)getPreferences(), this, "KABConfigWidget" );
  layout->addWidget( mConfigWidget );
  layout->setSpacing( 0 );
  layout->setMargin( 0 );
  connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) );
 }
 void KCMKabConfig::load()
 {
  mConfigWidget->readConfig();
 }
 void KCMKabConfig::save()
 {
  mConfigWidget->writeConfig();
 }
 void KCMKabConfig::defaults()
 {
  mConfigWidget->setDefaults();
 }
 #ifndef KAB_EMBEDDED
 const KAboutData* KCMKabConfig::aboutData() const
 {
  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ),
                                      I18N_NOOP( "KAddressBook Configure Dialog" ),
                                      0, 0, KAboutData::License_GPL,
                                      I18N_NOOP( "(c), 2003 Tobias Koenig" ) );
  about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
  return about;
 }
 #endif //KAB_EMBEDDED
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "kcmkabconfig.moc"
+#include "moc_kcmkabconfig.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp
index c117d34..8ebee19 100644
--- a/kaddressbook/keywidget.cpp
+++ b/kaddressbook/keywidget.cpp
@@ -1,87 +1,89 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qfile.h>
 #include <qinputdialog.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #include <kio/netaccess.h>
 #include <kmessagebox.h>
 #else //KAB_EMBEDDED
 #include <qmap.h>
 #include <qmessagebox.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <kurl.h>
 #endif //KAB_EMBEDDED
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <kfiledialog.h>
 #include <klocale.h>
 #include <ktempfile.h>
 #include "keywidget.h"
 KeyWidget::KeyWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
-  QGridLayout *layout = new QGridLayout( this, 2, 2, KDialog::marginHint(),
+  Q3GridLayout *layout = new Q3GridLayout( this, 2, 2, KDialog::marginHint(),
                                         KDialog::spacingHint() );
  QLabel *label = new QLabel( i18n( "Keys:" ), this );
  layout->addWidget( label, 0, 0 );
  mKeyCombo = new KComboBox( this );
  layout->addWidget( mKeyCombo, 0, 1 );
  mAddButton = new QPushButton( i18n( "Add" ), this );
  layout->addWidget( mAddButton, 1, 0 );
  mRemoveButton = new QPushButton( i18n( "Remove" ), this );
  mRemoveButton->setEnabled( false );
  layout->addWidget( mRemoveButton, 1, 1 );
  mExportButton = new QPushButton( i18n( "Export" ), this );
  mExportButton->setEnabled( false );
  layout->addMultiCellWidget( mExportButton, 2, 2, 0, 1 );
  connect( mAddButton, SIGNAL( clicked() ), SLOT( addKey() ) );
  connect( mRemoveButton, SIGNAL( clicked() ), SLOT( removeKey() ) );
  connect( mExportButton, SIGNAL( clicked() ), SLOT( exportKey() ) );
 }
 KeyWidget::~KeyWidget()
 {
 }
 void KeyWidget::setKeys( const KABC::Key::List &list )
 {
  mKeyList = list;
@@ -107,171 +109,171 @@ void KeyWidget::addKey()
  KABC::Key::TypeList typeList = KABC::Key::typeList();
  KABC::Key::TypeList::Iterator it;
  for ( it = typeList.begin(); it != typeList.end(); ++it ) {
    if ( (*it) != KABC::Key::Custom &&
         !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) {
      keyMap.insert( KABC::Key::typeLabel( *it ), *it );
      keyTypeNames.append( KABC::Key::typeLabel( *it ) );
    }
  }
  bool ok;
  QString name = QInputDialog::getItem( i18n( "Key type" ), i18n( "Select the key type." ), keyTypeNames, 0, true, &ok );
  
  
  if ( !ok || name.isEmpty() )
    return;
  int type = keyMap[ name ];
  if ( !keyTypeNames.contains( name ) )
    type = KABC::Key::Custom;
    
 #ifndef KAB_EMBEDDED    
  KURL url = KFileDialog::getOpenURL();
  if ( url.isEmpty() )
    return;
  QString tmpFile;
  if ( KIO::NetAccess::download( url, tmpFile ) ) {
    QFile file( tmpFile );
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
      QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
      KMessageBox::error( this, text.arg( url.url() ) );
      return;
    }
 #else //KAB_EMBEDDED    
  QString keyfile = KFileDialog::getOpenFileName( "huhu",
                                    "Select Key", this );
  
  if ( keyfile.isEmpty() )
    return;
  {
    QFile file( keyfile );
-    if ( !file.open( IO_ReadOnly ) ) {
+    if ( !file.open( QIODevice::ReadOnly ) ) {
      QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
      QString caption( i18n( "Error" ) );
      QMessageBox::critical( this, caption, text.arg( keyfile ) );
      return;
    }
  
 #endif //KAB_EMBEDDED    
  
-    QTextStream s( &file );
+    Q3TextStream s( &file );
    QString data;
-    s.setEncoding( QTextStream::UnicodeUTF8 );
+    s.setEncoding( Q3TextStream::UnicodeUTF8 );
    s >> data;
    file.close();
    KABC::Key key( data, type );
    if ( type == KABC::Key::Custom )
      key.setCustomTypeString( name );
    mKeyList.append( key );
    emit changed();
 #ifndef KAB_EMBEDDED    
    KIO::NetAccess::removeTempFile( tmpFile );
 #endif //KAB_EMBEDDED    
    
  }
  updateKeyCombo();
 }
 void KeyWidget::removeKey()
 {
  int pos = mKeyCombo->currentItem();  
  if ( pos == -1 )
    return;
  QString type = mKeyCombo->currentText();
  QString text = i18n( "<qt>Do you really want to remove the key <b>%1</b>?</qt>" );
  
  
 #ifndef KAB_EMBEDDED    
  if ( KMessageBox::questionYesNo( this, text.arg( type ) ) == KMessageBox::No )
    return;
 #else //KAB_EMBEDDED    
  QString caption = i18n( "Confirm Delete" );
  if (QMessageBox::information( this, caption,
                                      text.arg( type ),
                                      i18n("Yes!"), i18n("No"), 0, 0 ) == 1)
     return;
 #endif //KAB_EMBEDDED    
  mKeyList.remove( mKeyList.at( pos ) );
  emit changed();
  updateKeyCombo();
 }
 void KeyWidget::exportKey()
 {
  KABC::Key key = (*mKeyList.at( mKeyCombo->currentItem() ) );
 #ifndef KAB_EMBEDDED    
  KURL url = KFileDialog::getSaveURL();
  
  KTempFile tempFile;
-  QTextStream *s = tempFile.textStream();
+  Q3TextStream *s = tempFile.textStream();
-  s->setEncoding( QTextStream::UnicodeUTF8 );
+  s->setEncoding( Q3TextStream::UnicodeUTF8 );
  (*s) << key.textData();
  tempFile.close();
  KIO::NetAccess::upload( tempFile.name(), url, kapp->mainWidget() );
 #else //KAB_EMBEDDED    
  QString keyfile = KFileDialog::getSaveFileName( "huhu",
                                    "Save Key", this );
  
  if ( keyfile.isEmpty() )
    return;
  QFile file( keyfile );
-    if ( !file.open( IO_ReadWrite ) ) {
+    if ( !file.open( QIODevice::ReadWrite ) ) {
      QString text( i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ) );
      QString caption( i18n( "Error" ) );
      QMessageBox::critical( this, caption, text.arg( keyfile ) );
      return;
    }
-  QTextStream s( &file );
+  Q3TextStream s( &file );
-  s.setEncoding( QTextStream::UnicodeUTF8 );
+  s.setEncoding( Q3TextStream::UnicodeUTF8 );
  s << key.textData();
  file.close();
    
    
 #endif //KAB_EMBEDDED    
 }
 void KeyWidget::updateKeyCombo()
 {
  int pos = mKeyCombo->currentItem();
  mKeyCombo->clear();
  KABC::Key::List::Iterator it;
  for ( it = mKeyList.begin(); it != mKeyList.end(); ++it ) {
    if ( (*it).type() == KABC::Key::Custom )
      mKeyCombo->insertItem( (*it).customTypeString() );
    else
      mKeyCombo->insertItem( KABC::Key::typeLabel( (*it).type() ) );
  }
  mKeyCombo->setCurrentItem( pos );
  bool state = ( mKeyList.count() != 0 );
  mRemoveButton->setEnabled( state );
  mExportButton->setEnabled( state );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "keywidget.moc"
+#include "moc_keywidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 2f3531d..e373105 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,64 +1,63 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qcopchannel_qws.h> 
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qwindowsstyle.h>
-#include <qplatinumstyle.h>
+#include <q3mainwindow.h>
-#include <qmainwindow.h>
 #include <qmessagebox.h> 
 #include <stdlib.h>
 #endif
 #include <qtextcodec.h> 
 #include <kstandarddirs.h>
 #include <qregexp.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include <qdir.h>
 #include "kabprefs.h"
 #include "kaddressbookmain.h"
 #include "externalapphandler.h"
 #include <libkdepim/kpimglobalprefs.h>
 void dumpMissing();
 int main( int argc, char **argv )
 {
+    if(!getenv("QPEDIR")) putenv("QPEDIR=/usr/lib/kdepimpi");
 #ifndef DESKTOP_VERSION
  QPEApplication a( argc, argv );
  a.setKeepRunning ();
 #else
  QApplication a( argc, argv );
-  QApplication::setStyle( new QPlatinumStyle ());
 #ifdef _WIN32_
  QString hdir ( getenv( "HOME") );
  if ( hdir.isEmpty() ) {
    QString hd ("C:/" );
    //QMessageBox::information(0,"hh",QDir::homeDirPath()+" xx" +hd );
    if ( QDir::homeDirPath().lower() == hd.lower() ) {
      _putenv( "HOME=C:");
      //QMessageBox::information(0,"hh",QString ( getenv( "HOME") ) );
    }
  } else {
    QDir app_dir;
    if ( !app_dir.exists(hdir) )
      app_dir.mkdir (hdir);
  }
 #endif
 #endif
  bool exitHelp = false;
  if ( argc > 1 ) {
      QString command = argv[1];
      if (  command == "-help" ){
          printf("KA/E command line commands:\n");
          printf("  no command: Start KA/E in usual way\n");
          printf("  -help: This output\n");
          printf(" KA/E is exiting now. Bye!\n");
          exitHelp = true;
      }
  }
  if ( ! exitHelp ) {
    KGlobal::setAppName( "kaddressbook" );
 #ifndef DESKTOP_VERSION
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 199f3d6..96822d8 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -1,92 +1,94 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #else //KAB_EMBEDDED
 #include <kstandarddirs.h>
 #endif //KAB_EMBEDDED
 #include <kapplication.h>
 #include <kbuttonbox.h>
 #include <kconfig.h>
 #include <klineedit.h>
 #include <klistview.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include "nameeditdialog.h"
 NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type,
                                QWidget *parent, const char *name )
  : KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel,
                 Ok, parent, name, true )
 {
  QWidget *page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 5, 3 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 5, 3 );
  layout->setSpacing( spacingHint() );
  layout->addColSpacing( 2, 100 );
  QLabel *label;
  
  label = new QLabel( i18n( "Honorific prefixes:" ), page );
  layout->addWidget( label, 0, 0 );
  mPrefixCombo = new KComboBox( page );
  mPrefixCombo->setDuplicatesEnabled( false );
  mPrefixCombo->setEditable( true );
  label->setBuddy( mPrefixCombo );
  layout->addMultiCellWidget( mPrefixCombo, 0, 0, 1, 2 );
  
  label = new QLabel( i18n( "Given name:" ), page );
  layout->addWidget( label, 1, 0 );
  mGivenNameEdit = new KLineEdit( page );
  label->setBuddy( mGivenNameEdit );
  layout->addMultiCellWidget( mGivenNameEdit, 1, 1, 1, 2 );
  label = new QLabel( i18n( "Additional names:" ), page );
  layout->addWidget( label, 2, 0 );
  mAdditionalNameEdit = new KLineEdit( page );
  label->setBuddy( mAdditionalNameEdit );
  layout->addMultiCellWidget( mAdditionalNameEdit, 2, 2, 1, 2 );
  
  label = new QLabel( i18n( "Family names:" ), page );
  layout->addWidget( label, 3, 0 );
  mFamilyNameEdit = new KLineEdit( page );
  label->setBuddy( mFamilyNameEdit );
  layout->addMultiCellWidget( mFamilyNameEdit, 3, 3, 1, 2 );
  
  label = new QLabel( i18n( "Honorific suffixes:" ), page );
  layout->addWidget( label, 4, 0 );
@@ -266,35 +268,35 @@ void NameEditDialog::modified()
  mChanged = true;
 }
 void NameEditDialog::updateTypeCombo()
 {
  KABC::Addressee addr;
  addr.setPrefix( mPrefixCombo->currentText() );
  addr.setGivenName( mGivenNameEdit->text() );
  addr.setAdditionalName( mAdditionalNameEdit->text() );
  addr.setFamilyName( mFamilyNameEdit->text() );
  addr.setSuffix( mSuffixCombo->currentText() );
  int pos = mFormattedNameCombo->currentItem();
  mFormattedNameCombo->clear();
  mFormattedNameCombo->insertItem( i18n( "Custom" ) );
  mFormattedNameCombo->insertItem( formattedName( addr, SimpleName ) );
  mFormattedNameCombo->insertItem( formattedName( addr, FullName ) );
  mFormattedNameCombo->insertItem( formattedName( addr, ReverseName ) );
  mFormattedNameCombo->setCurrentItem( pos );
 }
 void NameEditDialog::slotHelp()
 {
 #ifndef KAB_EMBEDDED
  kapp->invokeHelp( "managing-contacts-automatic-nameparsing" );
 #else //KAB_EMBEDDED
 qDebug("NameEditDialog::slotHelp Help is not supported yet");
 #endif //KAB_EMBEDDED
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "nameeditdialog.moc"
+#include "moc_nameeditdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/old_mainwindow.cpp b/kaddressbook/old_mainwindow.cpp
index 0e886d9..7a445c7 100644
--- a/kaddressbook/old_mainwindow.cpp
+++ b/kaddressbook/old_mainwindow.cpp
@@ -287,71 +287,71 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
            mView->viewManager()->showWhatsNextView();
        }
    }
    showMaximized();
    raise();
 */    
 }
 QPixmap MainWindow::loadPixmap( QString name )
 {
  return KGlobal::iconLoader().loadPixmap( name );
 /*US use the advanced version of the iconloader
 #ifdef DESKTOP_VERSION
    QPixmap pixmapLoader; 
    QString file;
    file = QDir::homeDirPath()+"/kaddressbook/pics/" + name+".png";
    //qDebug("pixmap name %s ", file.latin1());
    pixmapLoader.load( file );
    return pixmapLoader;
 #else
 return Resource::loadPixmap( name ); 
 #endif
 */
 }
 void MainWindow::initActions()
 {
    iconToolBar->clear();
    KABPrefs *p = KABPrefs::instance();
    QPEMenuBar *menuBar1 = new QPEMenuBar( iconToolBar );
-    QPopupMenu *menuBar = new QPopupMenu( this );
+    Q3PopupMenu *menuBar = new Q3PopupMenu( this );
    menuBar1->insertItem( "ME", menuBar);
-    QPopupMenu *fileMenu = new QPopupMenu( this );
+    Q3PopupMenu *fileMenu = new Q3PopupMenu( this );
-    QPopupMenu *editMenu = new QPopupMenu( this );
+    Q3PopupMenu *editMenu = new Q3PopupMenu( this );
-    QPopupMenu *viewMenu = new QPopupMenu( this );
+    Q3PopupMenu *viewMenu = new Q3PopupMenu( this );
-    QPopupMenu *settingsMenu = new QPopupMenu( this );
+    Q3PopupMenu *settingsMenu = new Q3PopupMenu( this );
-    QPopupMenu *importMenu = new QPopupMenu( this );
+    Q3PopupMenu *importMenu = new Q3PopupMenu( this );
    menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
    QIconSet icon;
    icon = loadPixmap( pathString + "newtodo" );
    configureToolBarMenu->insertItem(icon, "New todo", 20 );
    QAction* nt_action = new QAction( "New Todo", icon, "New Todo...", 0, this );
    nt_action->addTo( actionMenu );
    connect( nt_action, SIGNAL( activated() ),
             mView, SLOT( newTodo() ) );
    
 /*
    QAction *action;
    QIconSet icon;
    // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
    configureToolBarMenu = new QPopupMenu( this );
    configureToolBarMenu->setCheckable( true );
 #ifdef DESKTOP_VERSION
    QString pathString = ""; 
 #else
    QString pathString = "kaddressbook/"; 
 #endif
    if ( QApplication::desktop()->width() < 480 ) 
        pathString += "icons16/";
    configureAgendaMenu = new QPopupMenu( menuBar );
    configureAgendaMenu->setCheckable( true );
    configureAgendaMenu->insertItem("Toggle Allday", 1 ); 
    configureAgendaMenu->insertSeparator(); 
    configureAgendaMenu->insertItem("Tiny", 4 ); 
    configureAgendaMenu->insertItem("Small", 6 );
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index df3b551..3661677 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -1,125 +1,131 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qstring.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
-#include <qlistview.h>
+#include <q3listview.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qcursor.h>
 #include <qtimer.h>
 #include <qapplication.h> 
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 #include <kbuttonbox.h>
 #include <klistview.h>
 #include <kapplication.h>
 #include <qapplication.h>
 #include <kconfig.h>
 #include <kmessagebox.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kabc/phonenumber.h>
 #include "typecombo.h"
 #include "phoneeditwidget.h"
 PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
  : QWidget(parent,name)
 {
-    QGridLayout* gridLayout = new QGridLayout ( this, 2,2 );
+    Q3GridLayout* gridLayout = new Q3GridLayout ( this, 2,2 );
    QLabel *temp = new QLabel( "", this );
    temp->setAlignment( Qt::AlignCenter );
    temp->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
    QPushButton *addBut = new QPushButton ( "add", this );
    addBut->setPixmap ( SmallIcon("plus"));
    addBut->setMaximumSize( addBut->sizeHint().height(),addBut->sizeHint().height() );
    connect(addBut,SIGNAL(clicked ()),SLOT(addNumber()));
-    sv = new QScrollView( this );
+    sv = new Q3ScrollView( this );
-    sv->setFrameStyle ( QFrame::Plain );
+    sv->setFrameStyle ( Q3Frame::Plain );
    sv->setLineWidth ( 0 ); 
    sv->setMidLineWidth ( 0 ); 
    mw = new QWidget ( sv->viewport() );
    sv->addChild(mw);
-    sv->setResizePolicy( QScrollView::AutoOneFit );
+    sv->setResizePolicy( Q3ScrollView::AutoOneFit );
-    mainLayout = new QVBoxLayout ( mw );
+    mainLayout = new Q3VBoxLayout ( mw );
    mainLayout->setMargin( 0 );
    mainLayout->setSpacing( 0 );
    gridLayout->setMargin( 2 );
    gridLayout->setSpacing( 4 );
    if ( QApplication::desktop()->width() == 240 || QApplication::desktop()->width() == 480 ) {
        gridLayout->addWidget( addBut, 0, 0 );
        gridLayout->addWidget( temp, 0, 1 );
        gridLayout->addMultiCellWidget( sv, 1,1 , 0,1 );
    } else {
        gridLayout->addWidget( temp, 1, 0 );
        gridLayout->addWidget( addBut, 0, 0 );
        gridLayout->addMultiCellWidget( sv, 0, 1, 1,1 );
    }
    setDefaults();
    mTypeNumberEditList.setAutoDelete( true );
-    mPopup = new QPopupMenu( this );
+    mPopup = new Q3PopupMenu( this );
    QStringList list = PhoneNumber::supportedTypeListNames();
    mPopupCount = list.count();
    int i = 0;
    while ( i < mPopupCount ) {
        mPopup->insertItem( list[ i ], i );
        ++i;
    }
    connect(mPopup,SIGNAL(activated(int)),this,SLOT(addNumberInt( int)));
    
 }
 PhoneEditWidget::~PhoneEditWidget()
 {
 }
 void  PhoneEditWidget::setDefaults()
 {
    mTypeNumberEditList.clear();
    PhoneTypeNumberEdit* edit = appendEditCombo();
    KABC::PhoneNumber phoneNumber;
    phoneNumber.setType( KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref );
    edit->setPhoneNumber( phoneNumber  );
    edit = appendEditCombo();
    KABC::PhoneNumber phoneNumber2;
    phoneNumber2.setType( KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref );
    edit->setPhoneNumber( phoneNumber2  );
    edit = appendEditCombo();
    KABC::PhoneNumber phoneNumber3;
    phoneNumber3.setType( KABC::PhoneNumber::Cell );
    edit->setPhoneNumber( phoneNumber3 );
 }
 void  PhoneEditWidget::addNumberInt( int index )
@@ -197,75 +203,75 @@ void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &li )
        }
        ++i;   
    }
    for ( it = list2.begin(); it != list2.end(); ++it ) {
            if ( (*it).type() == tList[ max-1 ] )
                list.append( (*it ) );  
    }
    for ( it = list.begin(); it != list.end(); ++it ) {
            PhoneTypeNumberEdit* editNew = appendEditCombo();
            editNew->setPhoneNumber( (*it ) );
    }
    
 }
 KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers()
 {
  KABC::PhoneNumber::List retList;
  PhoneTypeNumberEdit* edit = mTypeNumberEditList.first();
  while ( edit ) {
      if ( edit->isValid() ) {
          retList.append( edit->phoneNumber());
      }
      edit = mTypeNumberEditList.next();
  }
  return retList;
 }
 #if 0
 PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
-  QGridLayout *layout = new QGridLayout( this, 4, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( this, 4, 1 );
 //US  layout->setSpacing( KDialog::spacingHint() );
  layout->setSpacing( KDialogBase::spacingHintSmall() );
 QLabel* label = new QLabel( this );
 //US loadIcon call is ambiguous. Add one more parameter
 //US  label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop ) );
  label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
 //US  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
  layout->addWidget( label, 0, 0 ); 
  QPushButton *editButton = new QPushButton( i18n( "Edit Phone Numbers..." ),
                                             this ); 
  if ( QApplication::desktop()->width() < 640 ) 
      layout->addWidget( editButton, 0, 1 );
  else
      layout->addMultiCellWidget( editButton, 0, 0, 1, 3);
  mPrefCombo = new PhoneTypeCombo( mPhoneList, this );
  mPrefEdit = new KLineEdit( this );
  //mPrefEdit->setMinimumWidth( int(mPrefEdit->sizeHint().width() * 1.5) );
  mPrefCombo->setLineEdit( mPrefEdit );
  layout->addWidget( mPrefCombo, 1, 0 );
  layout->addWidget( mPrefEdit, 1, 1 );
  int x = 1, y = 2;
  if ( QApplication::desktop()->width() < 640 ) {
      ++x;
      y = 0;
  }
  mSecondCombo = new PhoneTypeCombo( mPhoneList, this );
  mSecondEdit = new KLineEdit( this );
  mSecondCombo->setLineEdit( mSecondEdit );
  layout->addWidget( mSecondCombo, x, y++ );
  layout->addWidget( mSecondEdit, x, y++ );
  y = 0;
  ++x;
  mThirdCombo = new PhoneTypeCombo( mPhoneList, this );
  mThirdEdit = new KLineEdit( this );
  mThirdCombo->setLineEdit( mThirdEdit );
@@ -298,75 +304,75 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
  connect( mPrefEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( slotPrefEditChanged() ) );
  connect( mSecondEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( slotSecondEditChanged() ) );
  connect( mThirdEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( slotThirdEditChanged() ) );
  connect( mFourthEdit, SIGNAL( textChanged( const QString& ) ),
           SLOT( slotFourthEditChanged() ) );
  connect( editButton, SIGNAL( clicked() ), SLOT( edit() ) );
  connect( mPrefCombo, SIGNAL( activated( int ) ),
           SLOT( updatePrefEdit() ) );
  connect( mSecondCombo, SIGNAL( activated( int ) ),
           SLOT( updateSecondEdit() ) );
  connect( mThirdCombo, SIGNAL( activated( int ) ),
           SLOT( updateThirdEdit() ) );
  connect( mFourthCombo, SIGNAL( activated( int ) ),
           SLOT( updateFourthEdit() ) );
 }
 PhoneEditWidget::~PhoneEditWidget()
 {
 }
 void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &list )
 {
  mPhoneList.clear();
  // Insert types for existing numbers.
  mPrefCombo->insertTypeList( list );
-  QValueList<int> defaultTypes;
+  Q3ValueList<int> defaultTypes;
  defaultTypes << KABC::PhoneNumber::Home;
  defaultTypes << KABC::PhoneNumber::Work;
  defaultTypes << KABC::PhoneNumber::Cell;
  defaultTypes << ( KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
  defaultTypes << ( KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax );
  // Insert default types.
  // Doing this for mPrefCombo is enough because the list is shared by all
  // combos.
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
  for( it = defaultTypes.begin(); it != defaultTypes.end(); ++it ) {
    if ( !mPrefCombo->hasType( *it ) )
      mPrefCombo->insertType( list, *it, PhoneNumber( "", *it ) );
  }
  updateCombos();
  mPrefCombo->selectType( defaultTypes[ 0 ] );
  mSecondCombo->selectType( defaultTypes[ 1 ] );
  mThirdCombo->selectType( defaultTypes[ 2 ] );
  mFourthCombo->selectType( defaultTypes[ 3 ] );
  updateLineEdits();
 }
 void PhoneEditWidget::updateLineEdits()
 {
  updatePrefEdit();
  updateSecondEdit();
  updateThirdEdit();
  updateFourthEdit();
 }
 void PhoneEditWidget::updateCombos()
 {
  mPrefCombo->updateTypes();
  mSecondCombo->updateTypes();
  mThirdCombo->updateTypes();
  mFourthCombo->updateTypes();
 }
 KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers()
@@ -458,274 +464,274 @@ void PhoneEditWidget::slotFourthEditChanged()
 }
 void PhoneEditWidget::updatePhoneNumber( PhoneTypeCombo *combo )
 {
  QLineEdit *edit = combo->lineEdit();
  if ( !edit ) return;
  PhoneNumber::List::Iterator it = combo->selectedElement();
  if ( it != mPhoneList.end() ) {
    (*it).setNumber( edit->text() );
  } 
  updateOtherEdit( combo, mPrefCombo );
  updateOtherEdit( combo, mSecondCombo );
  updateOtherEdit( combo, mThirdCombo );
  updateOtherEdit( combo, mFourthCombo );
  emit modified();
 }
 void PhoneEditWidget::updateOtherEdit( PhoneTypeCombo *combo, PhoneTypeCombo *otherCombo )
 {
  if ( combo == otherCombo ) return;
  if ( combo->currentItem() == otherCombo->currentItem() ) {
    updateEdit( otherCombo );
  }
 }
 ///////////////////////////////////////////
 // PhoneEditDialog
-class PhoneViewItem : public QListViewItem
+class PhoneViewItem : public Q3ListViewItem
 {
 public:
-  PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number );
+  PhoneViewItem( Q3ListView *parent, const KABC::PhoneNumber &number );
  void setPhoneNumber( const KABC::PhoneNumber &number )
  {
    mPhoneNumber = number;
    makeText();
  }
  QString key() { return mPhoneNumber.id(); }
  QString country() { return ""; }
  QString region() { return ""; }
  QString number() { return ""; }
  KABC::PhoneNumber phoneNumber() { return mPhoneNumber; }
 private:
  void makeText();
  KABC::PhoneNumber mPhoneNumber;
 };
-PhoneViewItem::PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number )
+PhoneViewItem::PhoneViewItem( Q3ListView *parent, const KABC::PhoneNumber &number )
-  : QListViewItem( parent ), mPhoneNumber( number )
+  : Q3ListViewItem( parent ), mPhoneNumber( number )
 { 
 #ifdef DESKTOP_VERSION
    setRenameEnabled ( 0, true );
 #endif
  makeText();
 }
 void PhoneViewItem::makeText()
 {
  /**
   * Will be used in future versions of kaddressbook/libkabc
    setText( 0, mPhoneNumber.country() );
    setText( 1, mPhoneNumber.region() );
    setText( 2, mPhoneNumber.number() );
    setText( 3, mPhoneNumber.typeLabel() );
   */
  setText( 0, mPhoneNumber.number() );
  setText( 1, mPhoneNumber.typeLabel() );
 }
 PhoneEditDialog::PhoneEditDialog( const KABC::PhoneNumber::List &list, QWidget *parent, const char *name )
  : KDialogBase( KDialogBase::Plain, i18n( "Edit Phone Numbers" ),
                 KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                 parent, name, true)
 {
  mPhoneNumberList = list;
  QWidget *page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 1, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 1, 2 );
  layout->setSpacing( spacingHint() );
  mListView = new KListView( page );
  mListView->setAllColumnsShowFocus( true );
  mListView->addColumn( i18n( "Number" ) );
  mListView->addColumn( i18n( "Type" ) );
-  KButtonBox *buttonBox = new KButtonBox( page, Vertical );
+  KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
  buttonBox->addButton( i18n( "&Add..." ), this, SLOT( slotAddPhoneNumber() ) );
  mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, SLOT( slotEditPhoneNumber() ) );
  mEditButton->setEnabled( false );
  mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, SLOT( slotRemovePhoneNumber() ) );
  mRemoveButton->setEnabled( false );
  buttonBox->layout();
  layout->addWidget( mListView, 0, 0 );
  layout->addWidget( buttonBox, 0, 1 );
  connect( mListView, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged()) );
-  connect( mListView, SIGNAL(doubleClicked( QListViewItem *, const QPoint &, int  )), this, SLOT( slotEditPhoneNumber()));
+  connect( mListView, SIGNAL(doubleClicked( Q3ListViewItem *, const QPoint &, int  )), this, SLOT( slotEditPhoneNumber()));
  KABC::PhoneNumber::List::Iterator it;
  for ( it = mPhoneNumberList.begin(); it != mPhoneNumberList.end(); ++it )
    new PhoneViewItem( mListView, *it );
  if (QApplication::desktop()->width() < 480 )    
      showMaximized();
  else
      resize( 400, 400 );
  mChanged = false;
 }
 PhoneEditDialog::~PhoneEditDialog()
 {
    qDebug("PhoneEditDialog::~PhoneEditDialog() ");
 }
 void PhoneEditDialog::slotAddPhoneNumber()
 {
  KABC::PhoneNumber tmp( "", 0 );
  PhoneTypeDialog dlg( tmp, this );
  if ( dlg.exec() ) {
-      QListViewItem* i = mListView->firstChild();
+      Q3ListViewItem* i = mListView->firstChild();
      KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
      bool insert = true;
      while ( i ) {
          PhoneViewItem* p = ( PhoneViewItem* ) i;
          KABC::PhoneNumber pn = p->phoneNumber();
          if ( (pn.type() | KABC::PhoneNumber::Pref)  == (phoneNumber.type() | KABC::PhoneNumber::Pref)  ) {
              if ( p->text(0).isEmpty()) {
                  p->setPhoneNumber( phoneNumber  );
                  mPhoneNumberList.remove( pn );
                  mPhoneNumberList.append( phoneNumber );
                  insert = false;
                  break;
              }
          }
          i = i->nextSibling();
      }
      if ( insert ) {
          mPhoneNumberList.append( phoneNumber );
          new PhoneViewItem( mListView, phoneNumber );
      }
      mChanged = true;
  }
 }
 void PhoneEditDialog::slotRemovePhoneNumber()
 {
  PhoneViewItem *item = static_cast<PhoneViewItem*>( mListView->currentItem() );
  if ( !item )
    return;
  mPhoneNumberList.remove( item->phoneNumber() );
-  QListViewItem *currItem = mListView->currentItem();
+  Q3ListViewItem *currItem = mListView->currentItem();
  mListView->takeItem( currItem );
  delete currItem;
  mChanged = true;
 }
 void PhoneEditDialog::slotEditPhoneNumber()
 {
  PhoneViewItem *item = static_cast<PhoneViewItem*>( mListView->currentItem() );
  if ( !item )
    return;
  PhoneTypeDialog dlg( item->phoneNumber(), this );
  if ( dlg.exec() ) {
    slotRemovePhoneNumber();
    KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
    mPhoneNumberList.append( phoneNumber );
    new PhoneViewItem( mListView, phoneNumber );
    mChanged = true;
  }
 }
 void PhoneEditDialog::slotSelectionChanged()
 {
  bool state = ( mListView->currentItem() != 0 );
  mRemoveButton->setEnabled( state );
  mEditButton->setEnabled( state );
 }
 const KABC::PhoneNumber::List &PhoneEditDialog::phoneNumbers()
 {
  return mPhoneNumberList;
 }
 bool PhoneEditDialog::changed() const
 {
  return mChanged;
 }
 ///////////////////////////////////////////
 // PhoneTypeDialog
 PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
                               QWidget *parent, const char *name)
  : KDialogBase( KDialogBase::Plain, i18n( "Edit Phone Number" ),
                KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                parent, name, true), mPhoneNumber( phoneNumber )
 {
  QWidget *page = plainPage();
  QLabel *label = 0;
-  QGridLayout *layout = new QGridLayout( page, 3, 2, marginHint(), spacingHint() );
+  Q3GridLayout *layout = new Q3GridLayout( page, 3, 2, marginHint(), spacingHint() );
  label = new QLabel( i18n( "Number:" ), page );
  layout->addWidget( label, 0, 0 );
  mNumber = new KLineEdit( page );
  layout->addWidget( mNumber, 0, 1 );
  mPreferredBox = new QCheckBox( i18n( "This is the preferred phone number" ), page );
  layout->addMultiCellWidget( mPreferredBox, 1, 1, 0, 1 );
-  mGroup = new QButtonGroup( 2, Horizontal, i18n( "Types" ), page );
+  mGroup = new Q3ButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
  layout->addMultiCellWidget( mGroup, 2, 2, 0, 1 );
  // fill widgets
  mNumber->setText( mPhoneNumber.number() );
  mTypeList = KABC::PhoneNumber::typeList();
  mTypeList.remove( KABC::PhoneNumber::Pref );
  KABC::PhoneNumber::TypeList::Iterator it;
  for ( it = mTypeList.begin(); it != mTypeList.end(); ++it )
    new QCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup );
  for ( int i = 0; i < mGroup->count(); ++i ) {
    int type = mPhoneNumber.type();
    QCheckBox *box = (QCheckBox*)mGroup->find( i );
    box->setChecked( type & mTypeList[ i ] );
  }
  mPreferredBox->setChecked( mPhoneNumber.type() & KABC::PhoneNumber::Pref );
  mNumber->setFocus();
  mNumber->setSelection( 0, 1024);
 }
 KABC::PhoneNumber PhoneTypeDialog::phoneNumber()
 {
  mPhoneNumber.setNumber( mNumber->text() );
  int type = 0;
  for ( int i = 0; i < mGroup->count(); ++i ) {
    QCheckBox *box = (QCheckBox*)mGroup->find( i );
    if ( box->isChecked() )
      type += mTypeList[ i ];
  }
  if ( mPreferredBox->isChecked() )
    mPhoneNumber.setType( type | KABC::PhoneNumber::Pref );
  else
    mPhoneNumber.setType( type & ~KABC::PhoneNumber::Pref );
  return mPhoneNumber;
 }
 #endif
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "phoneeditwidget.moc"
+#include "moc_phoneeditwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 5bb4226..2be3e2b 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -1,137 +1,141 @@
 #ifndef PHONEEDITWIDGET_H
 #define PHONEEDITWIDGET_H
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
 #include <qapplication.h> 
+#include <QDesktopWidget>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
-#include <qscrollview.h>
+#include <q3scrollview.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 #include "addresseeconfig.h"
 #include "typecombo.h"
-class QButtonGroup;
+class Q3ButtonGroup;
 class QCheckBox;
 class PhoneTypeNumberEdit;
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kabc/phonenumber.h>
 typedef TypeCombo<KABC::PhoneNumber> PhoneTypeCombo;
 /**
  Widget for editing phone numbers.
 */
 class PhoneEditWidget : public QWidget
 {
  Q_OBJECT
  public:
    PhoneEditWidget( QWidget *parent, const char *name = 0 );
    ~PhoneEditWidget();
    
    void setPhoneNumbers( const KABC::PhoneNumber::List &list );
    KABC::PhoneNumber::List phoneNumbers();
    //  void updateTypeCombo( const KABC::PhoneNumber::List&, KComboBox* );
    //KABC::PhoneNumber currentPhoneNumber( KComboBox*, int );
  signals:
    void modified();
    void  typeChange( int oldType, int newType );
  private slots:
    void bottomVisible();
    void addNumberInt( int );
    void deleteEdit(  PhoneTypeNumberEdit* ew );
    void addNumber();
    void pendingDelete();
  protected:
  private:
-    QScrollView* sv;
+    Q3ScrollView* sv;
-    QPopupMenu *mPopup;
+    Q3PopupMenu *mPopup;
    int mPopupCount;
    PhoneTypeNumberEdit* mPendingDelete;
    void setDefaults();
    PhoneTypeNumberEdit* appendEditCombo();
    QWidget* mw;
-    QVBoxLayout* mainLayout;
+    Q3VBoxLayout* mainLayout;
-    QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList;
+    Q3PtrList <PhoneTypeNumberEdit> mTypeNumberEditList;
    
 };
  
 class PhoneTypeNumberEdit : public QWidget
 {
  Q_OBJECT
 public:
    PhoneTypeNumberEdit( QWidget *parent, const char *name = 0 ) :QWidget( parent )
      {
-          QHBoxLayout * lay = new QHBoxLayout( this );
+          Q3HBoxLayout * lay = new Q3HBoxLayout( this );
          lay->setSpacing( 2 );
          lay->setMargin( 0 );
          mMinusButton = new QPushButton ( this );
          mMinusButton->setPixmap ( SmallIcon("minus"));
          mCombo = new KComboBox( this );
          if ( QApplication::desktop()->width() <= 640 )
-              mCombo->setSizeLimit ( 6 );
+              mCombo->setMaxVisibleItems ( 6 );
          mNumber = new KLineEdit( this );
          mMinusButton->setMaximumHeight( mNumber->sizeHint().height() + 6);
          lay->addWidget( mMinusButton  );
          lay->addWidget( mCombo );
          lay->addWidget( mNumber  );
          connect( mMinusButton , SIGNAL ( clicked() ), this, SLOT ( deleteNumber() ) );
          connect( mCombo , SIGNAL ( activated ( int ) ), this, SLOT ( comboTypeChange( int ) ) );
          connect( mNumber  , SIGNAL (  textChanged ( const QString & ) ), 
                   this, SLOT (  textChanged ( const QString & ) ) );
          mCombo->insertStringList(  PhoneNumber::supportedTypeListNames() );
      }
        ~PhoneTypeNumberEdit() {
            // qDebug("~PhoneTypeNumberEdit() ");
        }
  void setPhoneNumber( const KABC::PhoneNumber &phoneNumber )
  {
      mPhoneNumber = phoneNumber;
      int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() );
      mCombo->setCurrentItem( index );
      mNumber->setText( mPhoneNumber.number() );
      show();
      mNumber->setFocus();
  }
  KABC::PhoneNumber phoneNumber()
      {
          mPhoneNumber.setNumber( mNumber->text() );
          int index = mCombo->currentItem();
          mPhoneNumber.setType( PhoneNumber::supportedTypeList()[index]  );
          return mPhoneNumber;
      }
  bool isValid()
  {
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 4a2acc8..1c237c0 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -1,70 +1,72 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <kabc/secrecy.h>
 #include <kcombobox.h>
 #include <kdialog.h>
 #include "secrecywidget.h"
 SecrecyWidget::SecrecyWidget( QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
-  QVBoxLayout *layout = new QVBoxLayout( this, KDialog::marginHint(),
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this, KDialog::marginHint(),
                                         KDialog::spacingHint() );
  mSecrecyCombo = new KComboBox( this );
  layout->addWidget( mSecrecyCombo );
  KABC::Secrecy::TypeList list = KABC::Secrecy::typeList();
  KABC::Secrecy::TypeList::Iterator it;
  for ( it = list.begin(); it != list.end(); ++it )
    mSecrecyCombo->insertItem( KABC::Secrecy::typeLabel( *it ), *it );
  connect( mSecrecyCombo, SIGNAL( activated( const QString& ) ),
           SIGNAL( changed() ) );
 }
 SecrecyWidget::~SecrecyWidget()
 {
 }
 void SecrecyWidget::setSecrecy( const KABC::Secrecy &secrecy )
 {
 //US to avoid an indexoutofbounds error if value is invalid
  if (secrecy.isValid())
    mSecrecyCombo->setCurrentItem( secrecy.type() );
 }
 KABC::Secrecy SecrecyWidget::secrecy() const
 {
  KABC::Secrecy secrecy;
  secrecy.setType( mSecrecyCombo->currentItem() );
  return secrecy;
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "secrecywidget.moc"
+#include "moc_secrecywidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/undo.cpp b/kaddressbook/undo.cpp
index 4442087..a6c1580 100644
--- a/kaddressbook/undo.cpp
+++ b/kaddressbook/undo.cpp
@@ -85,35 +85,35 @@ void UndoStack::undo()
  
  RedoStack::instance()->push( command );
 }
 ////////////////////
 // RedoStack
 RedoStack* RedoStack::instance_ = 0;
 RedoStack::RedoStack()
 {
  mCommandStack.setAutoDelete( true );
 }
 RedoStack* RedoStack::instance()
 {
  if (!instance_)
    instance_ = new RedoStack();
  return instance_;
 }
 void RedoStack::redo()
 {
  Command *command;
  if (isEmpty())
    return;
    
  command = pop();
  command->redo();
  UndoStack::instance()->push( command );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "undo.moc"
+#include "moc_undo.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/undo.h b/kaddressbook/undo.h
index 843bc26..a8ba2ee 100644
--- a/kaddressbook/undo.h
+++ b/kaddressbook/undo.h
@@ -1,95 +1,95 @@
 /*
    This file is part of KAddressBook.
    Copyright (C) 1999 Don Sanders <sanders@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef UNDO_H
 #define UNDO_H
 #include <qobject.h>
-#include <qptrstack.h>
+#include <q3ptrstack.h>
 #include <qstring.h>
 class Command
 {
 public:
  Command() {}
  virtual ~Command() {};
  virtual QString name() = 0;
  virtual void redo() = 0; // egcs requires these methods to have
  virtual void undo() = 0; // implementations (Seems like a bug)
                           // pure virtual may not work
 };
 /** The Undo and Redo stacks now no longer inherit directly from a stack.
 * They now contain a stack internally and inherit from StackBase, which
 * has a signal for when the stack is modified. This is need to keep
 * the edit menu and toolbar up to date.
 *
 * Really this is a simple observable stack.
 */
 class StackBase : public QObject
 {
  Q_OBJECT
  
  public:
    StackBase() : QObject() {}
    
    void push(Command *c);
    bool isEmpty();
    Command *top();
    void clear();
    
  signals:
    void changed();
    
  protected:
    /** Protect the pop method so users must call undo/redo to properly
    * use the stack, however the subclasses need it to modify the stack.
    */
    Command *pop();
    
-    QPtrStack<Command> mCommandStack;
+    Q3PtrStack<Command> mCommandStack;
 };
 class UndoStack : public StackBase
 {
 public:
  static UndoStack *instance();
  void undo();
 protected:
  UndoStack();
  static UndoStack* instance_;
 };
 class RedoStack : public StackBase
 {
 public:
  static RedoStack *instance();
  void redo();
 protected:
  RedoStack();
  static RedoStack* instance_;
 };
 #endif
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index 5807dc0..e900b00 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -1,56 +1,56 @@
 /*
    This file is part of KAddressBook.
    Copyright (C) 1999 Don Sanders <sanders@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <kabc/addressbook.h>
 #include "addresseeutil.h"
 #include "addresseeconfig.h"
 #include "kabcore.h"
 #include "undocmds.h"
 extern bool pasteWithNewUid;
 /////////////////////////////////
 // PwDelete Methods
 PwDeleteCommand::PwDeleteCommand(KABC::AddressBook *doc, 
                                 const QStringList &uidList)
  : Command(), mDocument(doc), mAddresseeList(), mUidList(uidList)
 {
  redo();
 }
 PwDeleteCommand::~PwDeleteCommand()
 {
 }
 QString PwDeleteCommand::name()
 {
  return i18n( "Delete" );
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index 5daae1a..7366a0b 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -7,135 +7,139 @@
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef KAB_EMBEDDED
 #include <kcombobox.h>
 #include <qpushbutton.h>
 #include <kdebug.h>
 #else //KAB_EMBEDDED
 #include <qcombobox.h>
 #endif //KAB_EMBEDDED
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <qtoolbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qlabel.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3BoxLayout>
 #include "viewconfigurefieldspage.h"
-class FieldItem : public QListBoxText
+class FieldItem : public Q3ListBoxText
 {
  public:
-    FieldItem( QListBox *parent, KABC::Field *field )
+    FieldItem( Q3ListBox *parent, KABC::Field *field )
-      : QListBoxText( parent, field->label() ), mField( field ) {}
+      : Q3ListBoxText( parent, field->label() ), mField( field ) {}
    
-    FieldItem( QListBox *parent, KABC::Field *field, int index )
+    FieldItem( Q3ListBox *parent, KABC::Field *field, int index )
-      : QListBoxText( parent, field->label(), parent->item( index ) ),
+      : Q3ListBoxText( parent, field->label(), parent->item( index ) ),
        mField( field ) {}
    
    KABC::Field *field() { return mField; }
    
  private:
    KABC::Field *mField;
 };
 ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab,
                                                  QWidget *parent,
                                                  const char *name )
  : QWidget( parent, name ), mAddressBook( ab )
 {
  initGUI();
 }
 void ViewConfigureFieldsPage::restoreSettings( KConfig *config )
 {
  KABC::Field::List fields = KABC::Field::restoreFields( config, "KABCFields" );
  if ( fields.isEmpty() )
    fields = KABC::Field::defaultFields();
  
  KABC::Field::List::ConstIterator it;
  for( it = fields.begin(); it != fields.end(); ++it )
    new FieldItem( mSelectedBox, *it );
  slotShowFields( mCategoryCombo->currentItem() );
 }
 void ViewConfigureFieldsPage::saveSettings( KConfig *config )
 {
  KABC::Field::List fields;
  for( uint i = 0; i < mSelectedBox->count(); ++i ) {
    FieldItem *fieldItem = static_cast<FieldItem *>( mSelectedBox->item( i ) );
    fields.append( fieldItem->field() );
  }
  KABC::Field::saveFields( config, "KABCFields", fields );
 }
 void ViewConfigureFieldsPage::slotShowFields( int index )
 {
  int currentPos = mUnSelectedBox->currentItem();
  mUnSelectedBox->clear();
  int category;
  if ( index == 0 ) category = KABC::Field::All;
  else category = 1 << ( index - 1 );
  KABC::Field::List allFields = mAddressBook->fields( category );
  KABC::Field::List::ConstIterator it;
  for ( it = allFields.begin(); it != allFields.end(); ++it ) {
-    QListBoxItem *item = mSelectedBox->firstItem();
+    Q3ListBoxItem *item = mSelectedBox->firstItem();
    while( item ) {
      FieldItem *fieldItem = static_cast<FieldItem *>( item );
      if ( (*it)->equals( fieldItem->field() ) )
        break;
      item = item->next();
    }
    if ( !item )
      new FieldItem( mUnSelectedBox, *it );
  }
  mUnSelectedBox->sort();
  mUnSelectedBox->setCurrentItem( currentPos );
 }
 void ViewConfigureFieldsPage::slotSelect()
 {
  // insert selected items in the unselected list to the selected list,
  // directoy under the current item if selected, or at the bottonm if
  // nothing is selected in the selected list
  int where = mSelectedBox->currentItem();
 //US QListBoxItem::isSelected()) is not available in QT 2.x. Use selected instead.
  if ( !(where > -1 && mSelectedBox->item( where )->selected()) )
    where = mSelectedBox->count() - 1;
  for ( uint i = 0; i < mUnSelectedBox->count(); ++i )
    if ( mUnSelectedBox->isSelected( mUnSelectedBox->item( i ) ) ) {
      FieldItem *fieldItem = static_cast<FieldItem *>( mUnSelectedBox->item( i ) );
      new FieldItem( mSelectedBox, fieldItem->field(), where );
      where++;
    }
@@ -160,192 +164,192 @@ void ViewConfigureFieldsPage::slotButtonsEnabled()
  for( uint i = 0; i < mUnSelectedBox->count(); ++i )
 //US QListBoxItem::isSelected()) is not available in QT 2.x. Use selected instead.
    if ( mUnSelectedBox->item( i )->selected() ) {
      state = true;
      break;
    }
  mAddButton->setEnabled( state );
  int j = mSelectedBox->currentItem();
  state = ( j > -1 && mSelectedBox->isSelected( j ) );
  // up button: enabled if there is a current item > 0 and that is selected
  mUpButton->setEnabled( ( j > 0 && state ) );
  // down button: enabled if there is a current item < count - 2 and that is selected
  mDownButton->setEnabled( ( j > -1 && j < (int)mSelectedBox->count() - 1 && state ) );
  // remove button: enabled if any items are selected in the selected list
  state = false;
  for ( uint i = 0; i < mSelectedBox->count(); ++i )
 //US QListBoxItem::isSelected()) is not available in QT 2.x. Use selected instead.
    if ( mSelectedBox->item( i )->selected() ) {
      state = true;
      break;
    }
  mRemoveButton->setEnabled( state );
 }
 void ViewConfigureFieldsPage::slotMoveUp()
 {
  int i = mSelectedBox->currentItem();
  if ( i > 0 ) {
-    QListBoxItem *item = mSelectedBox->item( i );
+    Q3ListBoxItem *item = mSelectedBox->item( i );
    mSelectedBox->takeItem( item );
    mSelectedBox->insertItem( item, i - 1 );
    mSelectedBox->setCurrentItem( item );
    mSelectedBox->setSelected( i - 1, true );
  }
 }
 void ViewConfigureFieldsPage::slotMoveDown()
 {
  int i = mSelectedBox->currentItem();
  if ( i > -1 && i < (int)mSelectedBox->count() - 1 ) {
-    QListBoxItem *item = mSelectedBox->item( i );
+    Q3ListBoxItem *item = mSelectedBox->item( i );
    mSelectedBox->takeItem( item );
    mSelectedBox->insertItem( item, i + 1 );
    mSelectedBox->setCurrentItem( item );
    mSelectedBox->setSelected( i + 1, true );
  }
 }
 void ViewConfigureFieldsPage::initGUI()
 {
  //US change the orientation dependent on the following flag
  // right the flag is set only staticly.
  // 0 = 640x480 ; 1 = 240x320
  bool orientation = 1;
  
  setCaption( i18n("Select Fields to Display") );
-  QGridLayout *gl = 0;
+  Q3GridLayout *gl = 0;
  if (orientation == 0) 
-    gl = new QGridLayout( this , 6, 4, 0, KDialog::spacingHint() );
+    gl = new Q3GridLayout( this , 6, 4, 0, KDialog::spacingHint() );
  else
-    gl = new QGridLayout( this , 4, 6, 0, KDialog::spacingHint() );
+    gl = new Q3GridLayout( this , 4, 6, 0, KDialog::spacingHint() );
  #ifndef KAB_EMBEDDED
  mCategoryCombo = new KComboBox( false, this );
  #else //KAB_EMBEDDED
  mCategoryCombo = new QComboBox( false, this );
  #endif //KAB_EMBEDDED
  if ( QApplication::desktop()->width() < 320 )
      mCategoryCombo->setMaximumWidth( 70 );
  mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::All ) );
  mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Frequent ) );
  mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Address ) );
  mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Email ) );
  mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Personal ) );
  mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Organization ) );
  mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::CustomCategory ) );
  connect( mCategoryCombo, SIGNAL( activated(int) ), SLOT( slotShowFields(int) ) );
  gl->addWidget( mCategoryCombo, 0, 0 );
  QLabel *label = new QLabel( i18n( "&Selected\nfields:" ), this );
  if (orientation == 0) 
    gl->addWidget( label, 0, 2 );
  else
    gl->addWidget( label, 2, 0 );
    
-  mUnSelectedBox = new QListBox( this );
+  mUnSelectedBox = new Q3ListBox( this );
-  mUnSelectedBox->setSelectionMode( QListBox::Extended );
+  mUnSelectedBox->setSelectionMode( Q3ListBox::Extended );
  mUnSelectedBox->setMinimumHeight( 80 );
  if (orientation == 0) 
    gl->addWidget( mUnSelectedBox, 1, 0 );
  else
    gl->addWidget( mUnSelectedBox, 0, 1 );
-  mSelectedBox = new QListBox( this );
+  mSelectedBox = new Q3ListBox( this );
  //if ( QApplication::desktop()->width() < 320 ) {
  //  mUnSelectedBox->setMaximumWidth( 134 );
  //  mSelectedBox->setMaximumWidth( 134 );
  //}
-  mSelectedBox->setSelectionMode( QListBox::Extended );
+  mSelectedBox->setSelectionMode( Q3ListBox::Extended );
  mSelectedBox->setMinimumHeight( 80 );
  label->setBuddy( mSelectedBox );
  if (orientation == 0) 
    gl->addWidget( mSelectedBox, 1, 2 );
  else
    gl->addWidget( mSelectedBox, 2, 1 );
    
-  QBoxLayout *vb1 = 0;
+  Q3BoxLayout *vb1 = 0;
  if (orientation == 0) 
-    vb1 = new QBoxLayout( QBoxLayout::TopToBottom, KDialog::spacingHint() );
+    vb1 = new Q3BoxLayout( Q3BoxLayout::TopToBottom, KDialog::spacingHint() );
  else
-    vb1 = new QBoxLayout( QBoxLayout::LeftToRight, KDialog::spacingHint() );
+    vb1 = new Q3BoxLayout( Q3BoxLayout::LeftToRight, KDialog::spacingHint() );
  
  vb1->addStretch();
  mAddButton = new QToolButton( this );
  if (orientation == 0) 
    mAddButton->setIconSet( SmallIconSet( "1rightarrow" ) );
  else
    mAddButton->setIconSet( SmallIconSet( "1downarrow" ) );
  connect( mAddButton, SIGNAL( clicked() ), SLOT( slotSelect() ) );
  vb1->addWidget( mAddButton );
  mRemoveButton = new QToolButton( this );
  if (orientation == 0) 
    mRemoveButton->setIconSet( SmallIconSet( "1leftarrow" ) );
  else
    mRemoveButton->setIconSet( SmallIconSet( "1uparrow" ) );
  
  connect( mRemoveButton, SIGNAL( clicked() ), SLOT( slotUnSelect() ) );
  vb1->addWidget( mRemoveButton );
  vb1->addStretch();
  if (orientation == 0) 
    gl->addLayout( vb1, 1, 1 );
  else
    gl->addLayout( vb1, 1, 1 );
-  QBoxLayout *vb2 = 0;
+  Q3BoxLayout *vb2 = 0;
  if (orientation == 0) 
-    vb2 = new QBoxLayout( QBoxLayout::TopToBottom, KDialog::spacingHint() );
+    vb2 = new Q3BoxLayout( Q3BoxLayout::TopToBottom, KDialog::spacingHint() );
  else
-    vb2 = new QBoxLayout( QBoxLayout::LeftToRight, KDialog::spacingHint() );
+    vb2 = new Q3BoxLayout( Q3BoxLayout::LeftToRight, KDialog::spacingHint() );
  
  vb2->addStretch();
  mUpButton = new QToolButton( this );
    mUpButton->setIconSet( SmallIconSet( "1uparrow" ) );
  connect( mUpButton, SIGNAL( clicked() ), SLOT( slotMoveUp() ) );
  vb2->addWidget( mUpButton );
  mDownButton = new QToolButton( this );
  mDownButton->setIconSet( SmallIconSet( "1downarrow" ) );
  connect( mDownButton, SIGNAL( clicked() ), SLOT( slotMoveDown() ) );
  vb2->addWidget( mDownButton );
  vb2->addStretch();
  if (orientation == 0) 
    gl->addLayout( vb2, 1, 3 );
  else
    gl->addLayout( vb2, 3, 1 );
  
  QSize sizeHint = mUnSelectedBox->sizeHint();
  // make sure we fill the list with all items, so that we can
  // get the maxItemWidth we need to not truncate the view
  slotShowFields( 0 );
  //sizeHint = sizeHint.expandedTo( mSelectedBox->sizeHint() );
  //sizeHint.setWidth( mUnSelectedBox->maxItemWidth() );
  // mUnSelectedBox->setMinimumSize( sizeHint );
  //mSelectedBox->setMinimumSize( sizeHint );
  gl->activate();
  connect( mUnSelectedBox, SIGNAL( selectionChanged() ), SLOT( slotButtonsEnabled() ) );
  connect( mSelectedBox, SIGNAL( selectionChanged() ), SLOT( slotButtonsEnabled() ) );
-  connect( mSelectedBox, SIGNAL( currentChanged( QListBoxItem * ) ), SLOT( slotButtonsEnabled() ) );
+  connect( mSelectedBox, SIGNAL( currentChanged( Q3ListBoxItem * ) ), SLOT( slotButtonsEnabled() ) );
  slotButtonsEnabled();
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "viewconfigurefieldspage.moc"
+#include "moc_viewconfigurefieldspage.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h
index b27668c..42d132f 100644
--- a/kaddressbook/viewconfigurefieldspage.h
+++ b/kaddressbook/viewconfigurefieldspage.h
@@ -6,76 +6,76 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef VIEWCONFIGUREFIELDSPAGE_H 
 #define VIEWCONFIGUREFIELDSPAGE_H
 #include <qwidget.h>
 #include <kabc/field.h>
 #include <kabc/addressbook.h>
 #ifndef KAB_EMBEDDED
 class KComboBox;
 #else //KAB_EMBEDDED
 class QComboBox;
 #endif //KAB_EMBEDDED
-class QListBox;
+class Q3ListBox;
-class QListBoxItem;
+class Q3ListBoxItem;
 class QPushButton;
 class QToolButton;
 class ViewConfigureFieldsPage : public QWidget
 {
  Q_OBJECT
  public:
    ViewConfigureFieldsPage( KABC::AddressBook *ab, QWidget *parent = 0,
                             const char *name = 0 );
    void restoreSettings( KConfig* );
    void saveSettings( KConfig* );
  public slots:
    void slotSelect();
    void slotUnSelect();
    void slotMoveUp();
    void slotMoveDown();
    void slotShowFields( int );
    void slotButtonsEnabled();
  
  private:
    void initGUI();
    
 #ifndef KAB_EMBEDDED
    KComboBox *mCategoryCombo;
 #else //KAB_EMBEDDED
    QComboBox *mCategoryCombo;
 #endif //KAB_EMBEDDED
-    QListBox *mSelectedBox;
+    Q3ListBox *mSelectedBox;
-    QListBox *mUnSelectedBox;
+    Q3ListBox *mUnSelectedBox;
    QToolButton *mAddButton;
    QToolButton *mRemoveButton;
    QToolButton *mUpButton;
    QToolButton *mDownButton;
    KABC::AddressBook *mAddressBook;
 };
 #endif
diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp
index b085a5e..cdb778b 100644
--- a/kaddressbook/viewconfigurefilterpage.cpp
+++ b/kaddressbook/viewconfigurefilterpage.cpp
@@ -1,137 +1,140 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef KAB_EMBEDDED
 #include <kcombobox.h>
 #else //KAB_EMBEDDED
 #include <qcombobox.h>
 #endif //KAB_EMBEDDED
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
 #include <kconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include "filter.h"
 #include "viewconfigurefilterpage.h"
 ViewConfigureFilterPage::ViewConfigureFilterPage( QWidget *parent,
                                                  const char *name )
  : QWidget( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this, 0, KDialog::spacingHint() );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this, 0, KDialog::spacingHint() );
  
-  mFilterGroup = new QButtonGroup();
+  mFilterGroup = new Q3ButtonGroup();
  connect( mFilterGroup, SIGNAL( clicked( int ) ), SLOT( buttonClicked( int ) ) );
  
  QLabel *label = new QLabel( i18n( "The default filter will be activated whenever"
  " this view is displayed. This feature allows you to configure views that only"
  " interact with certain types of information based on the filter. Once the view"
  " is activated, the filter can be changed at anytime." ), this );
  label->setAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak );
  topLayout->addWidget( label );
  
  QWidget *spacer = new QWidget( this );
  spacer->setMinimumHeight( 5 );
  topLayout->addWidget( spacer );
  
  QRadioButton *button = new QRadioButton( i18n( "No default filter" ), this );
  mFilterGroup->insert( button );
  topLayout->addWidget( button );
  
  button = new QRadioButton( i18n( "Use last active filter" ), this );
  mFilterGroup->insert( button );
  topLayout->addWidget( button );
  
-  QBoxLayout *comboLayout = new QHBoxLayout();
+  Q3BoxLayout *comboLayout = new Q3HBoxLayout();
  topLayout->addLayout( comboLayout );
  button = new QRadioButton( i18n( "Use filter:" ), this );
  mFilterGroup->insert( button );
  comboLayout->addWidget( button );
  
 #ifndef KAB_EMBEDDED
  mFilterCombo = new KComboBox( this );
 #else //KAB_EMBEDDED
  mFilterCombo = new QComboBox( this );
 #endif //KAB_EMBEDDED
  comboLayout->addWidget( mFilterCombo );
 }
 ViewConfigureFilterPage::~ViewConfigureFilterPage()
 {
  delete mFilterGroup;
 }
    
 void ViewConfigureFilterPage::restoreSettings( KConfig *config )
 {
  mFilterCombo->clear();
  
 //US I had to adjust the whole method in order to work with QComboBoxes
 // in case of the Platformindependent version
  QString defaultfiltername = config->readEntry( "DefaultFilterName" );
  
  int id = config->readNumEntry( "DefaultFilterType", 1 );
  mFilterGroup->setButton( id );
  buttonClicked( id );
  
  // Load the filter combo
  Filter::List list = Filter::restore( config, "Filter" );
  Filter::List::Iterator it;
  for ( it = list.begin(); it != list.end(); ++it )
  {
    mFilterCombo->insertItem( (*it).name() );
  
    if ( id == 2 && (*it).name() == defaultfiltername) // has default filter
    {
        mFilterCombo->insertItem( (*it).name(), 0);
    }
    else
    {
      mFilterCombo->insertItem( (*it).name() );
    }
      
  }
    
 }
 void ViewConfigureFilterPage::saveSettings( KConfig *config )
 {
  config->writeEntry( "DefaultFilterName", mFilterCombo->currentText() );
  config->writeEntry( "DefaultFilterType", mFilterGroup->id( mFilterGroup->selected() ) );
 }
    
 void ViewConfigureFilterPage::buttonClicked( int id )
 {
  mFilterCombo->setEnabled( id == 2 );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "viewconfigurefilterpage.moc"
+#include "moc_viewconfigurefilterpage.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h
index 3be9564..fb39a61 100644
--- a/kaddressbook/viewconfigurefilterpage.h
+++ b/kaddressbook/viewconfigurefilterpage.h
@@ -1,63 +1,63 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef VIEWCONFIGUREFILTERPAGE
 #define VIEWCONFIGUREFILTERPAGE
 #include <qwidget.h>
-class QButtonGroup;
+class Q3ButtonGroup;
 #ifndef KAB_EMBEDDED
 class KComboBox;
 #else //KAB_EMBEDDED
 class QComboBox;
 #endif //KAB_EMBEDDED
 class KConfig;
 class ViewConfigureFilterPage : public QWidget
 {
  Q_OBJECT
  
  public:
    ViewConfigureFilterPage( QWidget *parent, const char *name = 0 );
    ~ViewConfigureFilterPage();
    
    void restoreSettings( KConfig* );
    void saveSettings( KConfig* );
    
  protected slots:
    void buttonClicked( int id );
    
  private:
 #ifndef KAB_EMBEDDED
    KComboBox *mFilterCombo;
 #else //KAB_EMBEDDED
    QComboBox *mFilterCombo;
 #endif //KAB_EMBEDDED
  
-    QButtonGroup *mFilterGroup;
+    Q3ButtonGroup *mFilterGroup;
 };
 #endif
diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 666e188..047df8c 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -1,159 +1,160 @@
 /*
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef KAB_EMBEDDED
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include "viewmanager.h"
 #endif //KAB_EMBEDDED
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QPixmap>
 #include <kjanuswidget.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include "viewconfigurewidget.h"
 #include "viewconfigurefieldspage.h"
 #include "viewconfigurefilterpage.h"
 ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, QWidget *parent,
                                          const char *name )
  : ConfigureWidget( ab, parent, name )
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this );
  
  mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed );
  
  topLayout->addWidget( mMainWidget );
  // Add the first page, the attributes
-  QVBox *page = addPage( i18n( "Fields" ), QString::null,
+  Q3VBox *page = addPage( i18n( "Fields" ), QString::null,
                         KGlobal::iconLoader()->loadIcon( "view_detailed",
                         KIcon::Panel, 16 ) );
 
  // Add the select fields page 
  mFieldsPage = new ViewConfigureFieldsPage( addressBook(), (QWidget*)page );
 //US  mFieldsPage->setMinimumSize(300,300);                         
  
  // Add the second page, the filter selection
  page = addPage( i18n( "Default Filter" ), QString::null, 
                  KGlobal::iconLoader()->loadIcon( "filter", 
                  KIcon::Panel, 16 ) );
                  
  mFilterPage = new ViewConfigureFilterPage( (QWidget*)page );
  //qDebug("+++++ViewConfigureWidget::ViewConfigureWidget ");
 }
 ViewConfigureWidget::~ViewConfigureWidget()
 {
    //qDebug("-----ViewConfigureWidget::~ViewConfigureWidget() ");
 }
 void ViewConfigureWidget::restoreSettings( KConfig *config )
 {
  mFieldsPage->restoreSettings( config );
  mFilterPage->restoreSettings( config );
 }
 void ViewConfigureWidget::saveSettings( KConfig *config )
 {
  mFieldsPage->saveSettings( config );
  mFilterPage->saveSettings( config );
 }
    
-QVBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
+Q3VBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
                                   const QPixmap &pixmap )
 {
  return mMainWidget->addVBoxPage( item, header, pixmap );
 }
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <stdlib.h>
 ViewConfigureDialog::ViewConfigureDialog( ViewConfigureWidget *wdg, const QString &viewName,
                                          QWidget *parent, const char *name )
  : KDialogBase( Swallow, i18n( "Modify View: " ) + viewName, Help | Ok | Cancel,
                 Ok, parent, name, true, true ), mConfigWidget( wdg )
 {
 //US, I have to change the way, how to connect the ViewConfigureWidget. It looks
 // like it has changed.
    //QFrame *topFrame = plainPage();
    if ( mConfigWidget ) {
    mConfigWidget->reparent(this, QPoint(0,0), true);
  // QVBoxLayout * layout = new QVBoxLayout( this );
  //layout->addWidget(mConfigWidget );
  //mConfigWidget->reparent(topFrame, QPoint(1,1), true);
  
  setMainWidget( mConfigWidget );
  }
 }
 ViewConfigureDialog::~ViewConfigureDialog()
 {
 }
 void ViewConfigureDialog::setWidget( ViewConfigureWidget *wdg )
 {
    mConfigWidget = wdg ;
    setMainWidget( mConfigWidget );
 }
 void ViewConfigureDialog::restoreSettings( KConfig *config )
 {
  mConfigWidget->restoreSettings( config );
 }
 void ViewConfigureDialog::saveSettings( KConfig *config )
 {
  mConfigWidget->saveSettings( config );
 }
 void ViewConfigureDialog::slotHelp()
 {
 #ifndef KAB_EMBEDDED
  kapp->invokeHelp( "using-views" );
 #else //KAB_EMBEDDED
  qDebug("ViewConfigureDialog::slotHelp not yet implemented");
 #endif //KAB_EMBEDDED
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "viewconfigurewidget.moc"
+#include "moc_viewconfigurewidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h
index 0c2b77c..e3b9b12 100644
--- a/kaddressbook/viewconfigurewidget.h
+++ b/kaddressbook/viewconfigurewidget.h
@@ -1,106 +1,106 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can rremovePageedistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef VIEWCONFIGUREWIDGET_H
 #define VIEWCONFIGUREWIDGET_H
 #include "configurewidget.h"
-class QVBox;
+class Q3VBox;
 #include <kdialogbase.h>
 #include <qpixmap.h>
 class KJanusWidget;
 class QString;
 class ViewConfigureFieldsPage;
 class ViewConfigureFilterPage;
 class ViewConfigureDialog;
 /**
  This widget is the base class for all view configuration widgets. The 
  author of a view may wish to inherit from this widget and add config pages
  that add custom config options. The default implementation of this widget
  is to show a page with the select fields widget. For simple views this may
  be sufficient.
 */
 class ViewConfigureWidget : public ConfigureWidget
 {
  Q_OBJECT
    
  public:
    ViewConfigureWidget( KABC::AddressBook *ab, QWidget *parent, const char *name = 0 );
    virtual ~ViewConfigureWidget();
    
    /**
      Reads the configuration from the config object and sets the values
      in the GUI. If this method is overloaded, be sure to call the base
      class's method.
      Do not change the group of the config object in this method.
     */
    virtual void restoreSettings( KConfig *config );
    
    /**
      Writes the configuration from the GUI to the config object. If this
      method is overloaded, be sure to call the base class's method.
      Do not change the group of the config object in this method.
     */
    virtual void saveSettings( KConfig *config );
 
    /**
      Use this method to add new pages to the widget.
     */
-    QVBox *addPage( const QString &item, const QString &header = QString::null,
+    Q3VBox *addPage( const QString &item, const QString &header = QString::null,
                    const QPixmap &pixmap = QPixmap() );
                                                            
  private:
    KJanusWidget *mMainWidget;    
    ViewConfigureFieldsPage *mFieldsPage;
    ViewConfigureFilterPage *mFilterPage;
 };
 class ViewConfigureDialog : public KDialogBase
 {
  Q_OBJECT
  public:
    ViewConfigureDialog( ViewConfigureWidget *wdg, const QString &viewName,
                         QWidget *parent, const char *name = 0 );
    ~ViewConfigureDialog();
    void restoreSettings( KConfig* );
    void saveSettings( KConfig* );
    void setWidget( ViewConfigureWidget *wdg );
  protected slots:
    void slotHelp();
  private:
    ViewConfigureWidget *mConfigWidget;
 };
 #endif
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index b5d9419..5cfe3ad 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -21,176 +21,180 @@
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef KAB_EMBEDDED
 #include <libkdepim/kvcarddrag.h>
 #include <kabc/vcardconverter.h>
 #include <kconfig.h>
 #include <kdeversion.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmultipledrag.h>
 #include <ktrader.h>
 #include <kurldrag.h>
 #include "addresseeutil.h"
 #else //KAB_EMBEDDED
 #include "views/kaddressbookiconview.h"
 #include "views/kaddressbooktableview.h"
 #include "views/kaddressbookcardview.h"
 #include "kaddressbookview.h"
 #include <qaction.h>
 #include <qmessagebox.h>
-#include <qpopupmenu.h>
+#include <q3popupmenu.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QDropEvent>
 #include <kconfigbase.h>
 #endif //KAB_EMBEDDED
 #include <kdebug.h>
 #include <kactionclasses.h>
 #include <qlayout.h>
 #include <qapplication.h>
-#include <qwidgetstack.h>
+#include <QDesktopWidget>
+#include <q3widgetstack.h>
 #include <kabc/addressbook.h>
 #include "filtereditdialog.h"
 #include "addviewdialog.h"
 #include "kabcore.h"
 #include "kabprefs.h"
 #include "viewmanager.h"
 ViewManager::ViewManager( KABCore *core, QWidget *parent, const char *name )
  : QWidget( parent, name ), mCore( core ), mActiveView( 0 )
 {
  initGUI();
  initActions();
  mViewDict.setAutoDelete( true );
  createViewFactories();
 }
 ViewManager::~ViewManager()
 {
  unloadViews();
  mViewFactoryDict.clear();
 }
 void ViewManager::scrollUP()
 {
    if ( mActiveView ) 
        mActiveView->scrollUP();
 }
 void ViewManager::scrollDOWN()
 {
    if ( mActiveView ) 
        mActiveView->scrollDOWN();
 }
 void ViewManager::restoreSettings()
 {
  mViewNameList = KABPrefs::instance()->mViewNames;
  QString activeViewName = KABPrefs::instance()->mCurrentView;
  mActionSelectView->setItems( mViewNameList );
  // Filter
  mFilterList = Filter::restore( mCore->config(), "Filter" );
  mActionSelectFilter->setItems( filterNames() );
  mActionSelectFilter->setCurrentItem( KABPrefs::instance()->mCurrentFilter );
  int cw = 150;
  if ( QApplication::desktop()->width() >= 800 )
      cw = 200;
  if (QApplication::desktop()->width() == 480 && !KABPrefs::instance()->mHideSearchOnSwitch)
      cw = 0; 
  mActionSelectFilter->setComboWidth( cw );
  // Tell the views to reread their config, since they may have
  // been modified by global settings
  QString _oldgroup = mCore->config()->group();
-  QDictIterator<KAddressBookView> it( mViewDict );
+  Q3DictIterator<KAddressBookView> it( mViewDict );
  for ( it.toFirst(); it.current(); ++it ) {
    KConfigGroupSaver saver( mCore->config(), it.currentKey() );
    it.current()->readConfig( mCore->config() );
  }
  setActiveView( activeViewName );
  mActionDeleteView->setEnabled( mViewNameList.count() > 1 );
 }
 void ViewManager::saveSettings()
 {
  QString _oldgroup = mCore->config()->group();
-  QDictIterator<KAddressBookView> it( mViewDict );
+  Q3DictIterator<KAddressBookView> it( mViewDict );
  for ( it.toFirst(); it.current(); ++it ) {
    KConfigGroupSaver saver( mCore->config(), it.currentKey() );
 #ifdef DESKTOP_VERSION
    (*it)->writeConfig( mCore->config() );
 #else
    (*it).writeConfig( mCore->config() );
 #endif
  }
  Filter::save( mCore->config(), "Filter", mFilterList );
  KABPrefs::instance()->mCurrentFilter = mActionSelectFilter->currentItem();
  // write the view name list
  KABPrefs::instance()->mViewNames = mViewNameList;
  KABPrefs::instance()->mCurrentView = mActiveView->caption();
 }
 QStringList ViewManager::selectedUids() const
 {
  if ( mActiveView )
    return mActiveView->selectedUids();
  else
    return QStringList();
 }
 QStringList ViewManager::selectedEmails() const
 {
  if ( mActiveView )
-    return mActiveView->selectedEmails();
+    return QStringList(mActiveView->selectedEmails());
  else
    return QStringList();
 }
 KABC::Addressee::List ViewManager::selectedAddressees() const
 {
  KABC::Addressee::List list;
  if ( mActiveView ) {
    QStringList uids = mActiveView->selectedUids();
    QStringList::Iterator it;
    for ( it = uids.begin(); it != uids.end(); ++it ) {
      KABC::Addressee addr = mCore->addressBook()->findByUid( *it );
      if ( !addr.isEmpty() )
        list.append( addr );
    }
  }
  return list;
 }
 //US added another method with no parameter, since my moc compiler does not support default parameters.
 void ViewManager::setSelected()
 {
  setSelected( QString::null, true );
 }
 void ViewManager::setSelected( const QString &uid, bool selected )
 {
  if ( mActiveView )
    mActiveView->setSelected( uid, selected );
 }
 void ViewManager::setListSelected(QStringList list)
@@ -527,65 +531,65 @@ void ViewManager::dropped( QDropEvent *e )
    for ( it = list.begin(); it != list.end(); ++it ) {
      if ( converter.vCardToAddressee( (*it).stripWhiteSpace(), addr ) ) {
        KABC::Addressee a = mCore->addressBook()->findByUid( addr.uid() );
        if ( a.isEmpty() ) {
          mCore->addressBook()->insertAddressee( addr );
          emit modified();
        }
      }
    }
    mActiveView->refresh();
  }
 #else //KAB_EMBEDDED
 qDebug("ViewManager::dropped() has to be changed!!" );
 #endif //KAB_EMBEDDED
 }
 void ViewManager::startDrag()
 {
  kdDebug(5720) << "ViewManager::startDrag: starting to drag" << endl;
 #ifndef KAB_EMBEDDED
  // Get the list of all the selected addressees
  KABC::Addressee::List addrList;
  QStringList uidList = selectedUids();
  QStringList::Iterator iter;
  for ( iter = uidList.begin(); iter != uidList.end(); ++iter )
    addrList.append( mCore->addressBook()->findByUid( *iter ) );
  KMultipleDrag *drag = new KMultipleDrag( this );
-  drag->addDragObject( new QTextDrag( AddresseeUtil::addresseesToClipboard(addrList), this ) );
+  drag->addDragObject( new Q3TextDrag( AddresseeUtil::addresseesToClipboard(addrList), this ) );
  KABC::Addressee::List::Iterator it;
  QStringList vcards;
  for ( it = addrList.begin(); it != addrList.end(); ++it ) {
    QString vcard = QString::null;
    KABC::VCardConverter converter;
    if ( converter.addresseeToVCard( *it, vcard ) )
      vcards.append( vcard );
  }
  drag->addDragObject( new KVCardDrag( vcards.join( "\r\n" ), this ) );
  drag->setPixmap( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) );
  drag->dragCopy();
 #else //KAB_EMBEDDED
 qDebug("ViewManager::startDrag() has to be changed!!" );
 #endif //KAB_EMBEDDED
 }
 void ViewManager::doSearch( const QString&  s,KABC::Field *field  )
 {
    if ( mActiveView ) 
        mActiveView->doSearch( s, field  );
 }
 void ViewManager::setActiveFilter( int index )
 {
  Filter currentFilter;
  if ( ( index - 1 ) < 0 )
    currentFilter = Filter();
  else
    currentFilter = mFilterList[ index - 1 ];
@@ -630,67 +634,67 @@ QStringList ViewManager::filterNames() const
    names.append( (*it).name() );
  return names;
 }
 Filter ViewManager::getFilterByName( const QString &name ) const
 {
  Filter::List::ConstIterator it;
  for ( it = mFilterList.begin(); it != mFilterList.end(); ++it )
    if ( name == (*it).name() )
      return (*it);
  return Filter();
 }
 int ViewManager::filterPosition( const QString &name ) const
 {
  int pos = 0;
  Filter::List::ConstIterator it;
  for ( it = mFilterList.begin(); it != mFilterList.end(); ++it, ++pos )
    if ( name == (*it).name() )
      return pos + 1;
  return 0;
 }
 void ViewManager::initActions()
 {
 //US      <ActionList name="view_loadedviews"/>
 //US      <Separator/>
 #ifdef KAB_EMBEDDED
-  QPopupMenu *viewmenu = (QPopupMenu*)mCore->getViewMenu();
+  Q3PopupMenu *viewmenu = (Q3PopupMenu*)mCore->getViewMenu();
-  QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu();
+  Q3PopupMenu *settingsmenu = (Q3PopupMenu*)mCore->getSettingsMenu();
-  QPopupMenu *filtermenu = (QPopupMenu*)mCore->getFilterMenu();
+  Q3PopupMenu *filtermenu = (Q3PopupMenu*)mCore->getFilterMenu();
 #endif //KAB_EMBEDDED
  mActionSelectView = new KSelectAction( i18n( "Select View" ), 0, mCore->actionCollection(), "select_view" );
 #if KDE_VERSION >= 309
  mActionSelectView->setMenuAccelsEnabled( false );
 #endif
  connect( mActionSelectView, SIGNAL( activated( const QString& ) ),
           SLOT( selectView( const QString& ) ) );
 #ifdef KAB_EMBEDDED
  mActionSelectView->plug(viewmenu);
  viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
  KAction *action;
  action = new KAction( i18n( "Modify View..." ), "configure", 0, this,
               SLOT( editView() ), mCore->actionCollection(), "view_modify" );
 #ifndef KAB_EMBEDDED
  action->setWhatsThis( i18n( "By pressing this button a dialog opens that allows you to modify the view of the addressbook. There you can add or remove fields that you want to be shown or hidden in the addressbook like the name for example." ) );
 #else //KAB_EMBEDDED
  action->plug(viewmenu);
 #endif //KAB_EMBEDDED
  action = new KAction( i18n( "Add View..." ), "window_new", 0, this,
               SLOT( addView() ), mCore->actionCollection(), "view_add" );
 #ifndef KAB_EMBEDDED
  action->setWhatsThis( i18n( "You can add a new view by choosing one of the dialog that appears after pressing the button. You have to give the view a name, so that you can distinguish between the different views." ) );
 #else //KAB_EMBEDDED
  action->plug(viewmenu);
 #endif //KAB_EMBEDDED
@@ -709,40 +713,40 @@ void ViewManager::initActions()
  action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
               SLOT( refreshView(const QString &) ), mCore->actionCollection(),
               "view_refresh" );
  action->setWhatsThis( i18n( "The view will be refreshed by pressing this button." ) );
 #else //KAB_EMBEDDED
  action = new KAction( i18n( "Refresh View" ), "reload", 0, this,
               SLOT( refreshView()), mCore->actionCollection(),
               "view_refresh" );
  action->plug(viewmenu);
  //viewmenu->insertSeparator();
 #endif //KAB_EMBEDDED
  action = new KAction( i18n( "Edit &Filters..." ), "filter", 0, this,
               SLOT( configureFilters() ), mCore->actionCollection(),
               "options_edit_filters" );
  mActionSelectFilter = new KSelectAction( i18n( "Select Filter" ), "filter", mCore->actionCollection(), "select_filter" );
 #if KDE_VERSION >= 309
  mActionSelectFilter->setMenuAccelsEnabled( false );
 #endif
  connect( mActionSelectFilter, SIGNAL( activated( int ) ),
           SLOT( setActiveFilter( int ) ) );
 #ifdef KAB_EMBEDDED
  action->plug(settingsmenu);
  mActionSelectFilter->plug(viewmenu,0);
 #endif //KAB_EMBEDDED
 }
 void ViewManager::initGUI()
 {
-    QHBoxLayout *layout = new QHBoxLayout( this, 0, 0 );
+    Q3HBoxLayout *layout = new Q3HBoxLayout( this, 0, 0 );
-  mViewWidgetStack = new QWidgetStack( this );
+  mViewWidgetStack = new Q3WidgetStack( this );
  layout->addWidget( mViewWidgetStack );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "viewmanager.moc"
+#include "moc_viewmanager.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h
index ab5d372..4bbdbc7 100644
--- a/kaddressbook/viewmanager.h
+++ b/kaddressbook/viewmanager.h
@@ -1,69 +1,71 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 #ifndef VIEWMANAGER_H
 #define VIEWMANAGER_H
 #include <qwidget.h>
 #include <qstringlist.h>
+//Added by qt3to4:
+#include <QDropEvent>
 #include <kaddressbookview.h>
-#include <qdict.h>
+#include <q3dict.h>
 #include "filter.h"
 class KAction;
 class KSelectAction;
 class KABCore;
-class QWidgetStack;
+class Q3WidgetStack;
 class QDropEvent;
 namespace KABC { class AddressBook; }
 /**
  The view manager manages the views and everything related to them. The
  manager will load the views at startup and display a view when told to
  make one active.
  The view manager will also create and manage all dialogs directly related to
  views (ie: AddView, ConfigureView, DeleteView, etc).
 */
 class ViewManager : public QWidget
 {
  Q_OBJECT
  public:
    ViewManager( KABCore *core, QWidget *parent, const char *name = 0 );
    ~ViewManager();
    void restoreSettings();
    void saveSettings();
    void doSearch( const QString&  s ,KABC::Field *field );
    void unloadViews(); 
    KSelectAction * getFilterAction() { return mActionSelectFilter; }
    Filter getFilterByName( const QString &name ) const;
    QStringList selectedUids() const;
    QStringList selectedEmails() const;
    KABC::Addressee::List selectedAddressees() const;
    void setListSelected(QStringList);
    void setFocusAV();
@@ -116,46 +118,46 @@ class ViewManager : public QWidget
    void executed( const QString &uid );
    /**
      Emitted whenever the address book is modified in some way.
     */
    void modified();
    /**
      Emitted whenever a url is dragged on a view.
     */
    void urlDropped( const KURL& );
  private slots:
    void selectView( const QString &name );
    void setActiveView( const QString &name );
    void setActiveFilter( int index );
    void configureFilters();
  private:
    void createViewFactories();
    QStringList filterNames() const;    
    int filterPosition( const QString &name ) const;
    QStringList viewNames() const;
    int viewPosition( const QString &name ) const;
    void initActions();
    void initGUI();
    KABCore *mCore;
    Filter mCurrentFilter;
    Filter::List mFilterList;
-    QDict<KAddressBookView> mViewDict;
+    Q3Dict<KAddressBookView> mViewDict;
-    QDict<ViewFactory> mViewFactoryDict;
+    Q3Dict<ViewFactory> mViewFactoryDict;
    QStringList mViewNameList;
-    QWidgetStack *mViewWidgetStack;
+    Q3WidgetStack *mViewWidgetStack;
    KAddressBookView *mActiveView;
    
    KAction *mActionDeleteView;
    KSelectAction *mActionSelectFilter;
    KSelectAction *mActionSelectView;
 };
 #endif
diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp
index b6e053f..1a29f41 100644
--- a/kaddressbook/views/cardview.cpp
+++ b/kaddressbook/views/cardview.cpp
@@ -5,106 +5,114 @@
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 //BEGIN Includes
 #include "cardview.h"
 #include <limits.h>
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qdatetime.h>
 #include <qlabel.h>
 #include <qstyle.h>
 #include <qcursor.h>
 #include <qtooltip.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QKeyEvent>
+#include <Q3PtrList>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QMouseEvent>
+#include <QEvent>
+#include <QWheelEvent>
 #include "kabprefs.h"
 #include <kdebug.h>
 #include <kglobalsettings.h>
 //END includes
 #define MIN_ITEM_WIDTH 80
 //BEGIN Helpers
 //////////////////////////////////////
 // CardViewTip
 class CardViewTip : public QLabel {
  public:
    CardViewTip(QWidget *parent=0, const char *name=0) : QLabel( parent, name )
    {
      setPalette( QToolTip::palette() );
      setFrameStyle( Panel|Plain );
      setMidLineWidth(0);
      setIndent(1);
    }
    ~CardViewTip() {};
  protected:
    void leaveEvent( QEvent * )
    {
      hide();
    }
 };
 //////////////////////////////////////
 // CardViewItemList
 //
 // Warning: make sure you use findRef() instead of find() to find an
 //          item! Only the pointer value is unique in the list.
 //
-class CardViewItemList : public QPtrList<CardViewItem>
+class CardViewItemList : public Q3PtrList<CardViewItem>
 {
  protected:
-    virtual int compareItems(QPtrCollection::Item item1,
+    virtual int compareItems(Q3PtrCollection::Item item1,
-                             QPtrCollection::Item item2)
+                             Q3PtrCollection::Item item2)
    {
      CardViewItem *cItem1 = (CardViewItem*)item1;
      CardViewItem *cItem2 = (CardViewItem*)item2;
      if ( cItem1 == cItem2 )
          return 0;
      if ((cItem1 == 0) || (cItem2 == 0))
          return cItem1 ? -1 : 1;
      if (cItem1->caption() < cItem2->caption())
        return -1;
      else if (cItem1->caption() > cItem2->caption())
        return 1;
      return 0;
    }
  private:
    /*int find( const CardViewItem * )
    {
      qDebug("DON'T USE CardViewItemList::find( item )! Use findRef( item )!");
    }*/
 };
 //////////////////////////////////////
 // CardViewSeparator
 class CardViewSeparator
 {
  friend class CardView;
@@ -132,112 +140,112 @@ class CardViewSeparator
    CardView *mView;
    QRect mRect;
 };
 //END Helpers
 //BEGIN Private Data
 class CardViewPrivate
 {
  public:
    CardViewPrivate()
     : mSelectionMode( CardView::Multi ),
       mDrawCardBorder( true ),
       mDrawFieldLabels( true ),
       mDrawSeparators( true),
       mSepWidth( 2 ),
       mShowEmptyFields( false ),
       mLayoutDirty( true ),
       mLastClickOnItem( false ),
       mItemMargin( 0 ),
       mItemSpacing( 10 ),
       mItemWidth( 200 ),
       mMaxFieldLines( INT_MAX ),
       mCurrentItem( 0L ),
       mLastClickPos( QPoint(0, 0) ),
       mResizeAnchor(0),
       mRubberBandAnchor( 0 ),
       mCompText( QString::null )
    {};
    CardViewItemList mItemList;
-    QPtrList<CardViewSeparator> mSeparatorList;
+    Q3PtrList<CardViewSeparator> mSeparatorList;
    QFontMetrics *mFm;
    QFontMetrics *mBFm;         // bold font
    QFont mHeaderFont;           // custom header font
    CardView::SelectionMode mSelectionMode;
    bool mDrawCardBorder;
    bool mDrawFieldLabels;
    bool mDrawSeparators;
    int mSepWidth;
    bool mShowEmptyFields;
    bool mLayoutDirty;
    bool mLastClickOnItem;
    uint mItemMargin;           // internal margin in items
    uint mItemSpacing;          // spacing between items, column seperators and border
    int mItemWidth;             // width of all items
    uint mMaxFieldLines;        // Max lines to dispaly pr field
    CardViewItem *mCurrentItem;
    QPoint mLastClickPos;
    QTimer *mTimer;             // times out if mouse rests for more than 500 msecs
    CardViewTip *mTip;          // passed to the item under a resting cursor to display full text
    bool mOnSeparator;          // set/reset on mouse movement
    // for resizing by dragging the separators
    int mResizeAnchor;          // uint, ulong? the mouse down separator left
    int mRubberBandAnchor;      // for erasing rubber bands
    // data used for resizing.
    // as they are beeded by each mouse move while resizing, we store them here,
    // saving 8 calculations in each mouse move.
    int colspace;               // amount of space between items pr column
    uint first;                 // the first col to anchor at for painting rubber bands
    int firstX;                 // X position of first in pixel
    int pressed;                // the colummn that was pressed on at resizing start
    int span;                   // pressed - first
    // key completion
    QString mCompText;          // current completion string
    QDateTime mCompUpdated;     // ...was updated at this time
 };
 class CardViewItemPrivate
 {
  public:
    CardViewItemPrivate() :
        mSelected( false ),
        x( 0 ),
        y( 0 ){};
        
    QString mCaption;
-    QPtrList< CardViewItem::Field > mFieldList;
+    Q3PtrList< CardViewItem::Field > mFieldList;
    bool mSelected;
    int x;                      // horizontal position, set by the view
    int y;                      // vertical position, set by the view
    int maxLabelWidth;          // the width of the widest label, according to the view font.
    int hcache;                 // height cache
 };
 //END Private Data
 //BEGIN CardViewItem
 CardViewItem::CardViewItem(CardView *parent, QString caption)
  : d(new CardViewItemPrivate()), mView(parent)
 {
  d->mCaption = caption;
  initialize();
 }
 CardViewItem::~CardViewItem()
 {
  // Remove ourself from the view
  if (mView != 0)
    mView->takeItem(this);
  delete d;
  d = 0;
 }
 void CardViewItem::initialize()
 {
  d->mSelected = false;
  d->mFieldList.setAutoDelete(true);
@@ -284,65 +292,65 @@ void CardViewItem::paintCard(QPainter *p, QColorGroup &cg)
  // Draw a simple box
  if (isSelected())
    pen = QPen(cg.highlight(), 1);
  else
    pen = QPen(cg.button(), 1);
  p->setPen(pen);
  // Draw the border - this is only draw if the user asks for it.
  if (drawBorder)
    p->drawRect( mg, mg, w, h );
  // set the proper pen color for the caption box
  if (isSelected())
    brush = cg.brush(QColorGroup::Highlight);
  else
    brush = cg.brush(QColorGroup::Button);
  p->fillRect(mg, mg, w, 4 + bFm.height(), brush);
  // Now paint the caption
  p->save();
  QFont bFont = mView->headerFont();
  //bFont.setBold(true);
  p->setFont(bFont);
  if (isSelected())
    p->setPen(cg.highlightedText());
  else
    p->setPen(cg.buttonText());
  p->drawText(2+mg, 2+mg + bFm.ascent()/*bFm.height()*//*-bFm.descent()*//*-bFm.leading()*/, trimString(d->mCaption, w-4, bFm));
  p->restore();
  // Go through the fields and draw them
-  QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
+  Q3PtrListIterator< CardViewItem::Field > iter(d->mFieldList);
  QString label, value;
  int yPos = mg + 4 + bFm.height()/* + 1*/ + fm.height(); // why the + 1 ??? (anders)
  p->setPen(cg.text());
  int fh = fm.height();
  int cln( 0 );
  QString tmp;
  int maxLines = mView->maxFieldLines();
  for (iter.toFirst(); iter.current(); ++iter)
  {
    value = (*iter)->second;
    if ( value.isEmpty() && ! mView->d->mShowEmptyFields )
      continue;
    if (drawLabels)
    {
      label = trimString((*iter)->first, labelWidth, fm);
      p->drawText(labelXPos, yPos, label + ":");
    }
 /* US original     
    for (cln=0; cln <= maxLines; cln++)
    {
      tmp = value.section('\n',cln,cln);
      if ( !tmp.isEmpty() ) p->drawText( valueXPos, yPos + cln*fh, trimString( tmp, valueWidth, fm ) );
      else break;
    }
 */
 //US new implementation
    QStringList strlst = QStringList::split('\n', value, true);
    for (cln=0; cln <= maxLines && cln <= (int)strlst.count(); cln++)
@@ -379,107 +387,107 @@ void CardViewItem::paintCard(QPainter *p, QColorGroup &cg)
 }
 const QString &CardViewItem::caption() const
 {
  return d->mCaption;
 }
 int CardViewItem::height( bool allowCache ) const
 {
  // use cache
  if ( allowCache && d->hcache )
    return d->hcache;
  // Base height:
  //  2 for line width
  //  2 for top caption pad
  //  2 for bottom caption pad
  //   2 pad for the end
  // + 2 times the advised margin
  int baseHeight = 8 + ( 2 * mView->itemMargin() );
  //  size of font for each field
  //  2 pad for each field
  // anders: if the view does not show empty fields, check for value
  bool sef = mView->showEmptyFields();
  int fh = mView->d->mFm->height();//lineSpacing(); // font height
  //int sp = QMAX( 0, 2- mView->d->mFm->leading() ); // field spacing NOTE make a property
  int fieldHeight = 0;
  int lines;
  int maxLines( mView->maxFieldLines() );
-  QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
+  Q3PtrListIterator< CardViewItem::Field > iter(d->mFieldList);
  for (iter.toFirst(); iter.current(); ++iter)
  {
    if ( !sef && (*iter)->second.isEmpty() )
      continue;
-    lines = QMIN( (*iter)->second.contains('\n') + 1, maxLines );
+    lines = QMIN( (*iter)->second.count('\n') + 1, maxLines );
    fieldHeight += ( lines * fh ) + 2;//sp;
  }
  // height of caption font (bold)
  fieldHeight += mView->d->mBFm->height();
  d->hcache = baseHeight + fieldHeight;
  return d->hcache;
 }
 bool CardViewItem::isSelected() const
 {
  return d->mSelected;
 }
 void CardViewItem::setSelected(bool selected)
 {
  d->mSelected = selected;
 }
 void CardViewItem::insertField(const QString &label, const QString &value)
 {
  CardViewItem::Field *f = new CardViewItem::Field(label, value);
  d->mFieldList.append(f);
  d->hcache=0;
  if (mView)
  {
    mView->setLayoutDirty(true);
    d->maxLabelWidth = QMAX( mView->d->mFm->width( label ), d->maxLabelWidth );
  }
 }
 void CardViewItem::removeField(const QString &label)
 {
  CardViewItem::Field *f;
-  QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
+  Q3PtrListIterator< CardViewItem::Field > iter(d->mFieldList);
  for (iter.toFirst(); iter.current(); ++iter)
  {
    f = *iter;
    if (f->first == label)
      break;
  }
  if (*iter)
    d->mFieldList.remove(*iter);
  d->hcache = 0;
  if (mView)
    mView->setLayoutDirty(true);
 }
 void CardViewItem::clearFields()
 {
  d->mFieldList.clear();
  d->hcache = 0;
  if (mView)
    mView->setLayoutDirty(true);
 }
 QString CardViewItem::trimString(const QString &text, int width,
                                 QFontMetrics &fm)
 {
  if (fm.width(text) <= width)
    return text;
  QString dots = "...";
  int dotWidth = fm.width(dots);
@@ -494,204 +502,204 @@ QString CardViewItem::trimString(const QString &text, int width,
  // Now trim the last char, since it put the width over the top
  trimmed = trimmed.left(trimmed.length()-1);
  trimmed += dots;
  return trimmed;
 }
 CardViewItem *CardViewItem::nextItem()
 {
  CardViewItem *item = 0;
  if (mView)
    item = mView->itemAfter(this);
  return item;
 }
 void CardViewItem::repaintCard()
 {
  if (mView)
    mView->repaintItem(this);
 }
 void CardViewItem::setCaption(const QString &caption)
 {
  d->mCaption = caption;
  repaintCard();
 }
 QString CardViewItem::fieldValue(const QString &label)
 {
-  QPtrListIterator< CardViewItem::Field > iter(d->mFieldList);
+  Q3PtrListIterator< CardViewItem::Field > iter(d->mFieldList);
  for (iter.toFirst(); iter.current(); ++iter)
    if ((*iter)->first == label)
        return (*iter)->second;
  return QString();
 }
 void CardViewItem::showFullString( const QPoint &itempos, CardViewTip *tip )
 {
  bool trimmed( false );
  QString s;
  int mrg = mView->itemMargin();
  int y = mView->d->mBFm->height() + 6 + mrg;
  int w = mView->itemWidth() - (2*mrg);
  int lw;
  bool drawLabels = mView->drawFieldLabels();
  bool isLabel = drawLabels && itempos.x() < w/2 ? true : false;
  if ( itempos.y() < y )
  {
    if ( itempos.y() < 8 + mrg || itempos.y() > y - 4 )
      return;
    // this is the caption
    s = caption();
    trimmed = mView->d->mBFm->width( s ) > w - 4;
    y = 2 + mrg;
    lw = 0;
    isLabel=true;
  } else {
    // find the field
    Field *f = fieldAt( itempos );
    if ( !f || ( !mView->showEmptyFields() && f->second.isEmpty() ) )
      return;
    // y position:
    // header font height + 4px hader margin + 2px leading + item margin
    // + actual field index * (fontheight + 2px leading)
    int maxLines = mView->maxFieldLines();
    bool se = mView->showEmptyFields();
    int fh = mView->d->mFm->height();
 //    {
    Field *_f;
    for (_f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next())
      if ( se || ! _f->second.isEmpty() )
-        y += ( QMIN(_f->second.contains('\n')+1, maxLines) * fh ) + 2;
+        y += ( QMIN(_f->second.count('\n')+1, maxLines) * fh ) + 2;
 //    }
    if ( isLabel && itempos.y() > y + fh )
      return;
    // label or data?
    s = isLabel ? f->first : f->second;
    // trimmed?
    int colonWidth = mView->d->mFm->width(":");
    lw = drawLabels ?         // label width
      QMIN( w/2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) :
      0;
    int mw = isLabel ? lw - colonWidth : w - lw - (mrg*2); // max width for string
    if ( isLabel )
    {
      trimmed = mView->d->mFm->width( s ) > mw - colonWidth;
    } else {
      QRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) );
-      trimmed = r.width() > mw || r.height()/fh >  QMIN(s.contains('\n') + 1, maxLines);
+      trimmed = r.width() > mw || r.height()/fh >  QMIN(s.count('\n') + 1, maxLines);
    }
  }
  if ( trimmed )
  {
    tip->setFont( (isLabel && !lw) ? mView->headerFont() : mView->font() ); // if condition is true, a header
    tip->setText( s );
    tip->adjustSize();
    // find a proper position
    int lx;
    lx = isLabel || !drawLabels ? mrg : lw + mrg + 2 /*-1*/;
    QPoint pnt(mView->contentsToViewport( QPoint(d->x, d->y) ));
    pnt += QPoint(lx, y);
    if ( pnt.x() < 0 )
      pnt.setX( 0 );
    if ( pnt.x() + tip->width() > mView->visibleWidth() )
      pnt.setX( mView->visibleWidth() - tip->width() );
    if ( pnt.y() + tip->height() > mView->visibleHeight() )
      pnt.setY( QMAX( 0, mView->visibleHeight() - tip->height() ) );
    // show
    tip->move( pnt );
    tip->show();
  }
 }
 CardViewItem::Field *CardViewItem::fieldAt( const QPoint & itempos ) const
 {
  int ypos = mView->d->mBFm->height() + 7 + mView->d->mItemMargin;
  int iy = itempos.y();
  // skip below caption
  if ( iy <= ypos )
    return 0;
  // try find a field
  bool showEmpty = mView->showEmptyFields();
  int fh = mView->d->mFm->height();
  int maxLines = mView->maxFieldLines();
  Field *f;
  for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() )
  {
    if ( showEmpty || !f->second.isEmpty() )
-      ypos += ( QMIN( f->second.contains('\n')+1, maxLines ) *fh)+2;
+      ypos += ( QMIN( f->second.count('\n')+1, maxLines ) *fh)+2;
    if ( iy <= ypos )
      break;
  }
  return f ? f : 0;
 }
 //END CardViewItem
 //BEGIN CardView
 CardView::CardView(QWidget *parent, const char *name)
-  : QScrollView(parent, name),
+  : Q3ScrollView(parent, name),
    d(new CardViewPrivate())
 {
    mFlagKeyPressed = false;
    mFlagBlockKeyPressed = false;
  d->mItemList.setAutoDelete(true);
  d->mSeparatorList.setAutoDelete(true);
  QFont f = font();
  d->mFm = new QFontMetrics(f);
  f.setBold(true);
  d->mHeaderFont = f;
  d->mBFm = new QFontMetrics(f);
  d->mTip = ( new CardViewTip( viewport() ) ),
  d->mTip->hide();
  d->mTimer = ( new QTimer(this, "mouseTimer") ),
  viewport()->setMouseTracking( true );
  viewport()->setFocusProxy(this);
-  viewport()->setFocusPolicy(WheelFocus);
+  viewport()->setFocusPolicy(Qt::WheelFocus);
-  viewport()->setBackgroundMode(PaletteBase);
+  viewport()->setBackgroundMode(Qt::PaletteBase);
  connect( d->mTimer, SIGNAL(timeout()), this, SLOT(tryShowFullText()) );
 //US  setBackgroundMode(PaletteBackground, PaletteBase);
-  setBackgroundMode(PaletteBackground);
+  setBackgroundMode(Qt::PaletteBackground);
  // no reason for a vertical scrollbar
  setVScrollBarMode(AlwaysOff);
 }
 CardView::~CardView()
 {
    delete d->mFm;
    delete d->mBFm;
    delete d;
    d = 0;
 }
 void CardView::insertItem(CardViewItem *item)
 {
  d->mItemList.inSort(item);
  setLayoutDirty(true);
 }
 void CardView::takeItem(CardViewItem *item)
 {
  if ( d->mCurrentItem == item )
    d->mCurrentItem = item->nextItem();
  d->mItemList.take(d->mItemList.findRef(item));
  setLayoutDirty(true);
 }
 void CardView::clear()
 {
  d->mItemList.clear();
@@ -710,113 +718,113 @@ void CardView::setCurrentItem( CardViewItem *item )
  if ( !item )
    return;
  else if ( item->cardView() != this )
  {
    kdDebug(5720)<<"CardView::setCurrentItem: Item ("<<item<<") not owned! Backing out.."<<endl;
    return;
  }
  else if ( item == currentItem() )
  {
    return;
  }
  if ( d->mSelectionMode == Single )
  {
    setSelected( item, true );
  }
  else
  {
    CardViewItem *it = d->mCurrentItem;
    d->mCurrentItem = item;
    if ( it )
      it->repaintCard();
    item->repaintCard();
  }
  if ( ! d->mOnSeparator )
    ensureItemVisible( item );
  emit currentChanged( item );
 }
 CardViewItem *CardView::itemAt(const QPoint &viewPos)
 {
  CardViewItem *item = 0;
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
  bool found = false;
  for (iter.toFirst(); iter.current() && !found; ++iter)
  {
    item = *iter;
    //if (item->d->mRect.contains(viewPos))
    if (QRect(item->d->x, item->d->y, d->mItemWidth, item->height()).contains(viewPos))
      found = true;
  }
  if (found)
    return item;
  return 0;
 }
 QRect CardView::itemRect(const CardViewItem *item)
 {
  //return item->d->mRect;
  return QRect(item->d->x, item->d->y, d->mItemWidth, item->height());
 }
 void CardView::ensureItemVisible(const CardViewItem *item)
 {
  ensureVisible(item->d->x                , item->d->y, d->mItemSpacing, 0);
  ensureVisible(item->d->x + d->mItemWidth, item->d->y, d->mItemSpacing, 0);
 }
 void CardView::repaintItem(const CardViewItem *item)
 {
  //repaintContents(item->d->mRect);
  repaintContents(  QRect(item->d->x, item->d->y, d->mItemWidth, item->height()) );
 }
 void CardView::setSelectionMode(CardView::SelectionMode mode)
 {
  selectAll(false);
  d->mSelectionMode = mode;
 }
 CardView::SelectionMode CardView::selectionMode() const
 {
  return d->mSelectionMode;
 }
 void CardView::selectAll(bool state)
 {
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
  if (!state)
  {
    for (iter.toFirst(); iter.current(); ++iter)
    {
      if ((*iter)->isSelected())
      {
        (*iter)->setSelected(false);
        (*iter)->repaintCard();
      }
    }
    //emit selectionChanged();  // WARNING FIXME
    emit selectionChanged(0);
  }
  else if (d->mSelectionMode != CardView::Single)
  {
    for (iter.toFirst(); iter.current(); ++iter)
    {
      (*iter)->setSelected(true);
    }
    if (d->mItemList.count() > 0)
    {
      // emit, since there must have been at least one selected
      emit selectionChanged();
      //repaint();//???
      viewport()->update();
    }
  }
 }
 void CardView::setSelected(CardViewItem *item, bool selected)
 {
@@ -849,65 +857,65 @@ void CardView::setSelected(CardViewItem *item, bool selected)
    {
      emit selectionChanged();
      emit selectionChanged(0);
    }
  }
  else if (d->mSelectionMode == CardView::Multi)
  {
    item->setSelected(selected);
    item->repaintCard();
    emit selectionChanged();
  }
  else if (d->mSelectionMode == CardView::Extended)
  {
    bool b = signalsBlocked();
    blockSignals(true);
    selectAll(false);
    blockSignals(b);
    item->setSelected(selected);
    item->repaintCard();
    emit selectionChanged();
  }
 }
 bool CardView::isSelected(CardViewItem *item) const
 {
  return (item && item->isSelected());
 }
 CardViewItem *CardView::selectedItem() const
 {
  // find the first selected item
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
  for (iter.toFirst(); iter.current(); ++iter)
  {
    if ((*iter)->isSelected())
      return *iter;
  }
  return 0;
 }
 CardViewItem *CardView::firstItem() const
 {
  return d->mItemList.first();
 }
 int CardView::childCount() const
 {
  return d->mItemList.count();
 }
 /*US
 CardViewItem *CardView::findItem(const QString &text, const QString &label,
                                 Qt::StringComparisonMode compare)
 {
  // IF the text is empty, we will return null, since empty text will
  // match anything!
  if (text.isEmpty())
    return 0;
  QPtrListIterator<CardViewItem> iter(d->mItemList);
  if (compare & Qt::BeginsWith)
  {
    QString value;
    for (iter.toFirst(); iter.current(); ++iter)
@@ -926,211 +934,211 @@ CardViewItem *CardView::findItem(const QString &text, const QString &label,
 }
 */
 uint CardView::columnWidth()
 {
  return d->mDrawSeparators ?
    d->mItemWidth + ( 2 * d->mItemSpacing ) + d->mSepWidth :
    d->mItemWidth + d->mItemSpacing;
 }
 void CardView::drawContents(QPainter *p, int clipx, int clipy,
                            int clipw, int cliph)
 {
    //QScrollView::drawContents(p, clipx, clipy, clipw, cliph);
 if (d->mLayoutDirty)
   calcLayout();
  //kdDebug() << "CardView::drawContents: " << clipx << ", " << clipy
  //          << ", " << clipw << ", " << cliph << endl;
  QColorGroup cg = viewport()->palette().active(); // allow setting costum colors in the viewport pale
  int cX, cY;
  contentsToViewport ( clipx, clipy, cX, cY ); 
  QRect clipRect(clipx, clipy, clipw, cliph);
  QRect cardRect;
  QRect sepRect;
  CardViewItem *item;
  CardViewSeparator *sep;
  // make sure the viewport is a pure background
  viewport()->erase( QRect ( cX, cY , clipw, cliph ) );
  // Now tell the cards to draw, if they are in the clip region
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
  for (iter.toFirst(); iter.current(); ++iter)
  {
    item = *iter;
    cardRect.setRect( item->d->x, item->d->y, d->mItemWidth, item->height() );
    if (clipRect.intersects(cardRect) || clipRect.contains(cardRect))
    {
      //kdDebug() << "\trepainting card at: " << cardRect.x() << ", "
      //          << cardRect.y() << endl;
      // Tell the card to paint
      p->save();
      p->translate(cardRect.x(), cardRect.y());
      item->paintCard(p, cg);
      p->restore();
    }
  }
  // Followed by the separators if they are in the clip region
-  QPtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
+  Q3PtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
  for (sepIter.toFirst(); sepIter.current(); ++sepIter)
  {
    sep = *sepIter;
    sepRect = sep->mRect;
    if (clipRect.intersects(sepRect) || clipRect.contains(sepRect))
    {
      p->save();
      p->translate(sepRect.x(), sepRect.y());
      sep->paintSeparator(p, cg);
      p->restore();
    }
  }
 }
 void CardView::resizeEvent(QResizeEvent *e)
 {
-  QScrollView::resizeEvent(e);
+  Q3ScrollView::resizeEvent(e);
  setLayoutDirty(true);
 }
 void CardView::calcLayout()
 {
  //kdDebug() << "CardView::calcLayout:" << endl;
  // Start in the upper left corner and layout all the
  // cars using their height and width
  int maxWidth = 0;
  int maxHeight = 0;
  int xPos = 0;
  int yPos = 0;
  int cardSpacing = d->mItemSpacing;
  // delete the old separators
  d->mSeparatorList.clear();
-  QPtrListIterator<CardViewItem> iter(d->mItemList);
+  Q3PtrListIterator<CardViewItem> iter(d->mItemList);
  CardViewItem *item = 0;
  CardViewSeparator *sep = 0;
  xPos += cardSpacing;
  for (iter.toFirst(); iter.current(); ++iter)
  {
    item = *iter;
    yPos += cardSpacing;
    if (yPos + item->height() + cardSpacing >= height() - horizontalScrollBar()->height())
    {
      maxHeight = QMAX(maxHeight, yPos);
      // Drawing in this column would be greater than the height
      // of the scroll view, so move to next column
      yPos = cardSpacing;
      xPos += cardSpacing + maxWidth;
      if (d->mDrawSeparators)
      {
        // Create a separator since the user asked
        sep = new CardViewSeparator(this);
        sep->mRect.moveTopLeft(QPoint(xPos, yPos+d->mItemMargin));
        xPos += d->mSepWidth + cardSpacing;
        d->mSeparatorList.append(sep);
      }
      maxWidth = 0;
    }
    item->d->x = xPos;
    item->d->y = yPos;
    yPos += item->height();
    maxWidth = QMAX(maxWidth, d->mItemWidth);
  }
  xPos += maxWidth;
  resizeContents( xPos + cardSpacing, maxHeight );
  // Update the height of all the separators now that we know the
  // max height of a column
-  QPtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
+  Q3PtrListIterator<CardViewSeparator> sepIter(d->mSeparatorList);
  for (sepIter.toFirst(); sepIter.current(); ++sepIter)
  {
    (*sepIter)->mRect.setHeight(maxHeight - 2*cardSpacing - 2*d->mItemMargin);
  }
  d->mLayoutDirty = false;
 }
 CardViewItem *CardView::itemAfter(CardViewItem *item)
 {
  /*int pos = */d->mItemList.findRef(item);
  return d->mItemList.next();//at(pos+1);
 }
 uint CardView::itemMargin()
 {
  return d->mItemMargin;
 }
 void CardView::setItemMargin( uint margin )
 {
  if ( margin == d->mItemMargin )
    return;
  d->mItemMargin = margin;
  setLayoutDirty( true );
 }
 uint CardView::itemSpacing()
 {
  return d->mItemSpacing;
 }
 void CardView::setItemSpacing( uint spacing )
 {
  if ( spacing == d->mItemSpacing )
    return;
  d->mItemSpacing = spacing;
  setLayoutDirty( true );
 }
 void CardView::contentsMousePressEvent(QMouseEvent *e)
 {
-  QScrollView::contentsMousePressEvent(e);
+  Q3ScrollView::contentsMousePressEvent(e);
  QPoint pos = e->pos();
  d->mLastClickPos = pos;
  CardViewItem *item = itemAt(pos);
  if (item == 0)
  {
    d->mLastClickOnItem = false;
    if ( d->mOnSeparator)
    {
      d->mResizeAnchor = e->x()+contentsX();
      d->colspace = (2*d->mItemSpacing) /*+ (2*d->mItemMargin)*/;
      int ccw = d->mItemWidth + d->colspace + d->mSepWidth;
      d->first = (contentsX()+d->mSepWidth)/ccw;
      d->pressed = (d->mResizeAnchor+d->mSepWidth)/ccw;
      d->span = d->pressed - d->first;
      d->firstX = d->first * ccw;
      if ( d->firstX ) d->firstX -= d->mSepWidth;            // (no sep in col 0)
    }
    else
    {
      selectAll(false);
    }
    return;
  }
  d->mLastClickOnItem = true;
  CardViewItem *other = d->mCurrentItem;
  setCurrentItem( item );
@@ -1142,413 +1150,413 @@ void CardView::contentsMousePressEvent(QMouseEvent *e)
  {
    // make sure it isn't already selected
    if (item->isSelected())
      return;
    bool b = signalsBlocked();
    blockSignals(true);
    selectAll(false);
    blockSignals(b);
    item->setSelected(true);
    item->repaintCard();
    emit selectionChanged(item);
  }
  else if (d->mSelectionMode == CardView::Multi)
  {
    // toggle the selection
    item->setSelected(!item->isSelected());
    item->repaintCard();
    emit selectionChanged();
  }
  else if (d->mSelectionMode == CardView::Extended)
  {
    if ((e->button() & Qt::LeftButton) &&
             (e->state() & Qt::ShiftButton))
    {
      if ( item == other ) return;
      bool s = ! item->isSelected();
-      if ( s && ! (e->state() & ControlButton) )
+      if ( s && ! (e->state() & Qt::ControlButton) )
      {
        bool b = signalsBlocked();
        blockSignals(true);
        selectAll(false);
        blockSignals(b);
      }
      int from, to, a, b;
      a = d->mItemList.findRef( item );
      b = d->mItemList.findRef( other );
      from = a < b ? a : b;
      to = a > b ? a : b;
      //kdDebug()<<"selecting items "<<from<<" - "<<to<<" ( "<<s<<" )"<<endl;
      CardViewItem *aItem;
      for ( ; from <= to; from++ )
      {
        aItem = d->mItemList.at( from );
        aItem->setSelected( s );
        repaintItem( aItem );
      }
      emit selectionChanged();
    }
    else if ((e->button() & Qt::LeftButton) &&
        (e->state() & Qt::ControlButton))
    {
      item->setSelected(!item->isSelected());
      item->repaintCard();
      emit selectionChanged();
    }
    else if (e->button() & Qt::LeftButton)
    {
      bool b = signalsBlocked();
      blockSignals(true);
      selectAll(false);
      blockSignals(b);
      item->setSelected(true);
      item->repaintCard();
      emit selectionChanged();
    }
  }
 }
 void CardView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
-  QScrollView::contentsMouseReleaseEvent(e);
+  Q3ScrollView::contentsMouseReleaseEvent(e);
  if ( d->mResizeAnchor )
  {
    // finish the resizing:
        unsetCursor();
    // hide rubber bands
    int newiw = d->mItemWidth - ((d->mResizeAnchor - d->mRubberBandAnchor)/d->span);
    drawRubberBands( 0 );
    // we should move to reflect the new position if we are scrolled.
    if ( contentsX() )
    {
      int newX = QMAX( 0, ( d->pressed * ( newiw + d->colspace + d->mSepWidth ) ) - e->x() );
      setContentsPos( newX, contentsY() );
    }
    // set new item width
    setItemWidth( newiw );
    // reset anchors
    d->mResizeAnchor = 0;
    d->mRubberBandAnchor = 0;
    return;
  }
  // If there are accel keys, we will not emit signals
  if ((e->state() & Qt::ShiftButton) || (e->state() & Qt::ControlButton))
    return;
  // Get the item at this position
  CardViewItem *item = itemAt(e->pos());
  if (item && KABPrefs::instance()->mHonorSingleClick)
  {
    emit executed(item);
  }
 }
 void CardView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
-  QScrollView::contentsMouseDoubleClickEvent(e);
+  Q3ScrollView::contentsMouseDoubleClickEvent(e);
  CardViewItem *item = itemAt(e->pos());
  if (item)
  {
    d->mCurrentItem = item;
  }
  if (item && !KABPrefs::instance()->mHonorSingleClick)
  {
      emit executed(item);
  } else
      emit doubleClicked(item);
 }
 void CardView::contentsMouseMoveEvent( QMouseEvent *e )
 {
  // resizing
  if ( d->mResizeAnchor )
  {
    int x = e->x();
    if ( x != d->mRubberBandAnchor )
      drawRubberBands( x );
      return;
  }
        
  if (d->mLastClickOnItem && (e->state() & Qt::LeftButton) &&
     ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) {
          
     startDrag();
         return;
  }
  d->mTimer->start( 500 );
  // see if we are over a separator
  // only if we actually have them painted?
  if ( d->mDrawSeparators  )
  {
    int colcontentw = d->mItemWidth + (2*d->mItemSpacing);
    int colw = colcontentw + d->mSepWidth;
    int m = e->x()%colw;
    if ( m >= colcontentw && m > 0 )
    {
-      setCursor( SplitVCursor ); // Why does this fail sometimes?
+      setCursor( Qt::SplitVCursor ); // Why does this fail sometimes?
      d->mOnSeparator = true;
    }
    else
    {
-      setCursor( ArrowCursor );
+      setCursor( Qt::ArrowCursor );
      d->mOnSeparator = false;
    }
  }
 }
 void CardView::enterEvent( QEvent * )
 {
  d->mTimer->start( 500 );
 }
 void CardView::leaveEvent( QEvent * )
 {
  d->mTimer->stop();
  if (d->mOnSeparator)
  {
    d->mOnSeparator = false;
-    setCursor( ArrowCursor );
+    setCursor( Qt::ArrowCursor );
   }
 }
 void CardView::focusInEvent( QFocusEvent * )
 {
  if (!d->mCurrentItem && d->mItemList.count() )
  {
    setCurrentItem( d->mItemList.first() );
  }
  else if ( d->mCurrentItem )
  {
    d->mCurrentItem->repaintCard();
  }
 }
 void CardView::focusOutEvent( QFocusEvent * )
 {
  if (d->mCurrentItem)
    d->mCurrentItem->repaintCard();
 }
 void CardView::keyPressEvent( QKeyEvent *e )
 {
  if ( ! ( childCount() && d->mCurrentItem ) )
  {
    e->ignore();
    return;
  }
  if ( mFlagBlockKeyPressed )
      return;
  qApp->processEvents();
  if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
      e->accept();
      return;
  } 
  if (! e->isAutoRepeat() )
      mFlagKeyPressed = true;
  uint pos = d->mItemList.findRef( d->mCurrentItem );
  CardViewItem *aItem = 0L; // item that gets the focus
  CardViewItem *old = d->mCurrentItem;
  switch ( e->key() )
  {
-    case Key_Up:
+      case Qt::Key_Up:
    if ( pos > 0 )
    {
      aItem = d->mItemList.at( pos - 1 );
      setCurrentItem( aItem );
    }
    break;
-    case Key_Down:
+      case Qt::Key_Down:
    if ( pos < d->mItemList.count() - 1 )
    {
      aItem = d->mItemList.at( pos + 1 );
      setCurrentItem( aItem );
    }
    break;
-    case Key_Left:
+      case Qt::Key_Left:
    {
      // look for an item in the previous/next column, starting from
      // the vertical middle of the current item.
      // FIXME use nice calculatd measures!!!
      QPoint aPoint( d->mCurrentItem->d->x, d->mCurrentItem->d->y );
      aPoint -= QPoint( 30,-(d->mCurrentItem->height()/2) );
      aItem = itemAt( aPoint );
      // maybe we hit some space below an item
      while ( !aItem && aPoint.y() > 27 )
      {
        aPoint -= QPoint( 0, 16 );
        aItem = itemAt( aPoint );
      }
      if ( aItem )
        setCurrentItem( aItem );
    }
    break;
-    case Key_Right:
+      case Qt::Key_Right:
    {
      // FIXME use nice calculated measures!!!
      QPoint aPoint( d->mCurrentItem->d->x + d->mItemWidth, d->mCurrentItem->d->y );
      aPoint += QPoint( 30,(d->mCurrentItem->height()/2) );
      aItem = itemAt( aPoint );
      while ( !aItem && aPoint.y() > 27 )
      {
        aPoint -= QPoint( 0, 16 );
        aItem = itemAt( aPoint );
      }
      if ( aItem )
        setCurrentItem( aItem );
    }
    break;
-    case Key_Home:
+      case Qt::Key_Home:
    aItem = d->mItemList.first();
    setCurrentItem( aItem );
    break;
-    case Key_End:
+      case Qt::Key_End:
    aItem = d->mItemList.last();
    setCurrentItem( aItem );
    break;
-    case Key_Prior: // PageUp
+      case Qt::Key_Prior: // PageUp
    {
      // QListView: "Make the item above the top visible and current"
      // TODO if contentsY(), pick the top item of the leftmost visible column
      if ( contentsX() <= 0 )
        return;
      int cw = columnWidth();
      int theCol = ( QMAX( 0, ( contentsX()/cw) * cw ) ) + d->mItemSpacing;
      aItem = itemAt( QPoint( theCol + 1, d->mItemSpacing + 1 ) );
      if ( aItem )
        setCurrentItem( aItem );
    }
    break;
-    case Key_Next:  // PageDown
+      case Qt::Key_Next:  // PageDown
    {
      // QListView: "Make the item below the bottom visible and current"
      // find the first not fully visible column.
      // TODO: consider if a partly visible (or even hidden) item at the
      //       bottom of the rightmost column exists
      int cw = columnWidth();
      int theCol = ( (( contentsX() + visibleWidth() )/cw) * cw ) + d->mItemSpacing + 1;
      // if separators are on, we may need to we may be one column further right if only the spacing/sep is hidden
      if ( d->mDrawSeparators && cw - (( contentsX() + visibleWidth() )%cw) <= int( d->mItemSpacing + d->mSepWidth ) )
        theCol += cw;
      // make sure this is not too far right
      while ( theCol > contentsWidth() )
        theCol -= columnWidth();
      aItem = itemAt( QPoint( theCol, d->mItemSpacing + 1 ) );
      if ( aItem )
        setCurrentItem( aItem );
    }
    break;
-    case Key_Space:
+      case Qt::Key_Space:
    setSelected( d->mCurrentItem, !d->mCurrentItem->isSelected() );
    emit selectionChanged();
    break;
-    case Key_Return:
+      case Qt::Key_Return:
-    case Key_Enter: 
+      case Qt::Key_Enter: 
        {
            emit returnPressed( d->mCurrentItem );
            emit executed( d->mCurrentItem );
        }
    break;
    default:
-    if ( (e->state() & ControlButton) && e->key() == Key_A )
+    if ( (e->state() & Qt::ControlButton) && e->key() == Qt::Key_A )
    {
      // select all
      selectAll( true );
      break;
    }
    // if we have a string, do autosearch
    else if ( ! e->text().isEmpty() && e->text()[0].isPrint() )
    {
    }
    break;
  }
  // handle selection
  if ( aItem )
  {
    if ( d->mSelectionMode == CardView::Extended )
    {
-      if ( (e->state() & ShiftButton) )
+      if ( (e->state() & Qt::ShiftButton) )
      {
        // shift button: toggle range
        // if control button is pressed, leave all items
        // and toggle selection current->old current
        // otherwise, ??????
        bool s = ! aItem->isSelected();
        int from, to, a, b;
        a = d->mItemList.findRef( aItem );
        b = d->mItemList.findRef( old );
        from = a < b ? a : b;
        to = a > b ? a : b;
        if ( to - from > 1 )
        {
          bool b = signalsBlocked();
          blockSignals(true);
          selectAll(false);
          blockSignals(b);
        }
        //kdDebug()<<"selecting items "<<from<<" - "<<to<<" ( "<<s<<" )"<<endl;
        CardViewItem *item;
        for ( ; from <= to; from++ )
        {
          item = d->mItemList.at( from );
          item->setSelected( s );
          repaintItem( item );
        }
        emit selectionChanged();
      }
-      else if ( (e->state() & ControlButton) )
+      else if ( (e->state() & Qt::ControlButton) )
      {
        // control button: do nothing
      }
      else
      {
        // no button: move selection to this item
        bool b = signalsBlocked();
        blockSignals(true);
        selectAll(false);
        blockSignals(b);
        setSelected( aItem, true );
        emit selectionChanged();
      }
    }
  }
 }
 void CardView::contentsWheelEvent( QWheelEvent * e )
 {
  scrollBy(2*e->delta()/-3, 0);
 }
 void CardView::setLayoutDirty(bool dirty)
 {
  if (d->mLayoutDirty != dirty)
  {
    d->mLayoutDirty = dirty;
    repaint();
  }
 }
@@ -1609,142 +1617,142 @@ bool CardView::showEmptyFields() const
 }
 void CardView::startDrag()
 {
  // The default implementation is a no-op. It must be
  // reimplemented in a subclass to be useful
 }
 void CardView::tryShowFullText()
 {
  d->mTimer->stop();
  // if we have an item
  QPoint cpos = viewportToContents( viewport()->mapFromGlobal( QCursor::pos() ) );
  CardViewItem *item = itemAt( cpos );
  if ( item )
  {
    // query it for a value to display
    //QString s = item ? item->caption() : "(no item)";
    //kdDebug()<<"MOUSE REST: "<<s<<endl;
    QPoint ipos = cpos - itemRect( item ).topLeft();
    item->showFullString( ipos, d->mTip );
  }
 }
 void CardView::drawRubberBands( int pos )
 {
  if ( pos && ((pos-d->firstX)/d->span) - d->colspace - d->mSepWidth < MIN_ITEM_WIDTH ) return;
  int tmpcw = (d->mRubberBandAnchor-d->firstX)/d->span;
  int x = d->firstX + tmpcw - d->mSepWidth - contentsX();
  int h = visibleHeight();
  QPainter p( viewport() );
-  p.setRasterOp( XorROP );
+  p.setCompositionMode( QPainter::CompositionMode_Xor );
-  p.setPen( gray );
+  p.setPen( Qt::gray );
-  p.setBrush( gray );
+  p.setBrush( Qt::gray );
  uint n = d->first;
  // erase
  if ( d->mRubberBandAnchor )
    do {
      p.drawRect( x, 0, 2, h );
      x += tmpcw;
      n++;
    } while ( x < visibleWidth() && n < d->mSeparatorList.count() );
  // paint new
  if ( ! pos ) return;
  tmpcw = (pos - d->firstX)/d->span;
  n = d->first;
  x = d->firstX + tmpcw - d->mSepWidth - contentsX();
  do {
      p.drawRect( x, 0, 2, h );
      x += tmpcw;
      n++;
  } while ( x < visibleWidth() && n < d->mSeparatorList.count() );
  d->mRubberBandAnchor = pos;
 }
 int CardView::itemWidth() const
 {
  return d->mItemWidth;
 }
 void CardView::setItemWidth( int w )
 {
  if ( w == d->mItemWidth )
    return;
  if ( w < MIN_ITEM_WIDTH )
    w = MIN_ITEM_WIDTH;
  d->mItemWidth = w;
  setLayoutDirty( true );
 #ifndef KAB_EMBEDDED  
  updateContents();
 #else //KAB_EMBEDDED  
 //US  updateContents( d->contentsX(), d->contentsY(), visibleWidth(), visibleHeight() );
 qDebug("CardView::setItemWidth has to be verified");  
  updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() );
 #endif //KAB_EMBEDDED  
 }
 void CardView::setHeaderFont( const QFont &fnt )
 {
  d->mHeaderFont = fnt;
  delete d->mBFm;
  d->mBFm = new QFontMetrics( fnt );
 }
 QFont CardView::headerFont() const
 {
  return d->mHeaderFont;
 }
 void CardView::setFont( const QFont &fnt )
 {
-  QScrollView::setFont( fnt );
+  Q3ScrollView::setFont( fnt );
  delete d->mFm;
  d->mFm = new QFontMetrics( fnt );
 }
 int CardView::separatorWidth()
 {
  return d->mSepWidth;
 }
 void CardView::setSeparatorWidth( int width )
 {
  d->mSepWidth = width;
  setLayoutDirty( true ); // hmm, actually I could just adjust the x'es...
 }
 int CardView::maxFieldLines() const
 {
  return d->mMaxFieldLines;
 }
 void CardView::setMaxFieldLines( int howmany )
 {
  d->mMaxFieldLines = howmany ? howmany : INT_MAX;
  // FIXME update, forcing the items to recalc height!!
 }
 void CardView::keyReleaseEvent ( QKeyEvent * e )
 {
    if ( mFlagBlockKeyPressed )
        return;
   if ( !e->isAutoRepeat() ) {
        mFlagBlockKeyPressed = true;
        qApp->processEvents();
        mFlagBlockKeyPressed = false;
        mFlagKeyPressed = false;
   }
-   QScrollView::keyReleaseEvent ( e );
+   Q3ScrollView::keyReleaseEvent ( e );
 }
 //END Cardview
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "cardview.moc"
+#include "moc_cardview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h
index 2ea3771..9c245ea 100644
--- a/kaddressbook/views/cardview.h
+++ b/kaddressbook/views/cardview.h
@@ -1,41 +1,49 @@
 #ifndef CARDVIEW_H
 #define CARDVIEW_H
-#include <qscrollview.h>
+#include <q3scrollview.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <qstring.h>
 #include <qrect.h>
 #include <qpair.h>
 #include <qpoint.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <QResizeEvent>
+#include <QFocusEvent>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
 class QLabel;
 class QPainter;
 class QResizeEvent;
 class QMouseEvent;
 class CardView;
 class CardViewPrivate;
 class CardViewItemPrivate;
 class CardViewTip;
 /** Represents a single card (item) in the card view. A card has a caption
 * and a list of fields. A Field is a label<->value pair. The labels in a
 * card should be unique, since they will be used to index the values.
 */
 class CardViewItem
 {
  friend class CardView;
  public:
    /** A single field in the card view. The first item is the label
    * and the second item is the value.
    */
    typedef QPair<QString, QString> Field;
    /** Constructor.
    *
    * @param parent The CardView that this card should be displayed on.
    * @param caption The caption of the card. This is the text that will
    * appear at the top of the card. This is also the string that will
    * be used to sort the cards in the view.
    */
    CardViewItem(CardView *parent, QString caption = QString::null);
@@ -119,65 +127,65 @@ class CardViewItem
    /** Sets the card as selected. This is usually only called from the
    * card view.
    */
    void setSelected(bool selected);
  private:
    /** Sets the default values.
    */
    void initialize();
    /** Trims a string to the width <i>width</i> using the font metrics
    * to determine the width of each char. If the string is longer than
    * <i>width</i>, then the string will be trimmed and a '...' will
    * be appended.
    */
    QString trimString(const QString &text, int width, QFontMetrics &fm);
    CardViewItemPrivate *d;
    CardView *mView;
 };
 /** The CardView is a method of displaying data in cards. This idea is
 * similar to the idea of a rolodex or business cards. Each card has a
 * caption and a list of fields, which are label<->value pairs. The CardView
 * displays multiple cards in a grid. The Cards are sorted based on their
 * caption.
 *
 * The CardView class is designed to mirror the API of the QListView or
 * QIconView. The CardView is also completely independant of KAddressBook and
 * can be used elsewhere. With the exception of a few simple config checks,
 * the CardView is also 100% independant of KDE.
 */
-class CardView : public QScrollView
+class CardView : public Q3ScrollView
 {
  friend class CardViewItem;
  Q_OBJECT
  public:
    /** Constructor.
    */
    CardView(QWidget *parent, const char *name);
    virtual ~CardView();
    /** Inserts the item into the card view. This method does not have
    * to be called if you created the item with a proper parent. Once
    * inserted, the CardView takes ownership of the item.
    */
    void insertItem(CardViewItem *item);
    /** Takes the item from the view. The item will not be deleted and
    * ownership of the item is returned to the caller.
    */
    void takeItem(CardViewItem *item);
    /** Clears the view and deletes all card view items
    */
    void clear();
    /** @return The current item, the item that has the focus.
    * Whenever the view has focus, this item has a focus rectangle painted
    * at it's border.
    * @sa setCurrentItem()
    */
    CardViewItem *currentItem();
diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp
index 2bddca6..46a59a1 100644
--- a/kaddressbook/views/colorlistbox.cpp
+++ b/kaddressbook/views/colorlistbox.cpp
@@ -1,113 +1,118 @@
 /*
 *   kmail: KDE mail client
 *   This file: Copyright (C) 2000 Espen Sand, espen@kde.org
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 */
 #include <qpainter.h>
+//Added by qt3to4:
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QDragMoveEvent>
+#include <QDragLeaveEvent>
 #include <kcolordialog.h>
 #ifndef KAB_EMBEDDED
 #include <kcolordrag.h>
 #endif //KAB_EMBEDDED
 #include "colorlistbox.h"
 #ifdef DESKTOP_VERSION
 #include <qcolordialog.h>
 #endif
-ColorListBox::ColorListBox( QWidget *parent, const char *name, WFlags f )
+ColorListBox::ColorListBox( QWidget *parent, const char *name, Qt::WFlags f )
  :KListBox( parent, name, f ), mCurrentOnDragEnter(-1)
 {
  connect( this, SIGNAL(selected(int)), this, SLOT(newColor(int)) );
-  connect( this, SIGNAL(clicked(QListBoxItem *)), this, SLOT(slotNewColor(QListBoxItem *)) );
+  connect( this, SIGNAL(clicked(Q3ListBoxItem *)), this, SLOT(slotNewColor(Q3ListBoxItem *)) );
  setAcceptDrops( true);
 }
 void ColorListBox::setEnabled( bool state )
 {
  if( state == isEnabled() )
  {
    return;
  }
-  QListBox::setEnabled( state );
+  Q3ListBox::setEnabled( state );
  for( uint i=0; i<count(); i++ )
  {
    updateItem( i );
  }
 }
 void ColorListBox::setColor( uint index, const QColor &color )
 {
  if( index < count() )
  {
    ColorListItem *colorItem = (ColorListItem*)item(index);
    colorItem->setColor(color);
    updateItem( colorItem );
  }
 }
 QColor ColorListBox::color( uint index ) const
 {
  if( index < count() )
  {
    ColorListItem *colorItem = (ColorListItem*)item(index);
    return( colorItem->color() );
  }
  else
  {
-    return( black );
+    return( Qt::black );
  }
 }
-void ColorListBox::slotNewColor(QListBoxItem * i)
+void ColorListBox::slotNewColor(Q3ListBoxItem * i)
 {
    if ( i )
        newColor( index( i ) );
 }
 void ColorListBox::newColor( int index )
 {
  if( isEnabled() == false )
  {
    return;
  }
  if( (uint)index < count() )
  {
    QColor c = color( index );
 #ifndef KAB_EMBEDDED
    if( KColorDialog::getColor( c, this ) != QDialog::Rejected )
    {
      setColor( index, c );
    }
 #else //KAB_EMBEDDED
 #ifdef DESKTOP_VERSION
    QColor col = QColorDialog::getColor ( c ); 
    if ( col.isValid () ) {
        setColor( index, col );
    }
 #else
    KColorDialog* k =  new KColorDialog( this );
    k->setColor( c );
    int res = k->exec();
    if ( res ) {
      setColor( index, k->getColor() );
@@ -169,77 +174,77 @@ void ColorListBox::dragMoveEvent( QDragMoveEvent *e )
 #else //KAB_EMBEDDED
 qDebug("ColorListBox::dragMoveEvent drag&drop currently not supported");
 #endif //KAB_EMBEDDED
  
 }
 void ColorListBox::dropEvent( QDropEvent *e )
 {
 #ifndef KAB_EMBEDDED
  QColor color;
  if( KColorDrag::decode( e, color ) )
  {
    int index = currentItem();
    if( index != -1 )
    {
      ColorListItem *colorItem = (ColorListItem*)item(index);
      colorItem->setColor(color);
      triggerUpdate( false ); // Redraw item
    }
    mCurrentOnDragEnter = -1;
  }
  
 #else //KAB_EMBEDDED
 qDebug("ColorListBox::dropEvent drag&drop currently not supported");
 #endif //KAB_EMBEDDED
  
 }
 ColorListItem::ColorListItem( const QString &text, const QColor &color )
-  : QListBoxItem(), mColor( color ), mBoxWidth( 30 )
+  : Q3ListBoxItem(), mColor( color ), mBoxWidth( 30 )
 {
  setText( text );
 }
 const QColor &ColorListItem::color( void )
 {
  return( mColor );
 }
 void ColorListItem::setColor( const QColor &color )
 {
  mColor = color;
 }
 void ColorListItem::paint( QPainter *p )
 {
  QFontMetrics fm = p->fontMetrics();
  int h = fm.height();
  p->drawText( mBoxWidth+3*2, fm.ascent() + fm.leading()/2, text() );
  p->setPen( Qt::black );
  p->drawRect( 3, 1, mBoxWidth, h-1 );
  p->fillRect( 4, 2, mBoxWidth-2, h-3, mColor );
 }
-int ColorListItem::height(const QListBox *lb ) const
+int ColorListItem::height(const Q3ListBox *lb ) const
 {
  return( lb->fontMetrics().lineSpacing()+1 );
 }
-int ColorListItem::width(const QListBox *lb ) const
+int ColorListItem::width(const Q3ListBox *lb ) const
 {
  return( mBoxWidth + lb->fontMetrics().width( text() ) + 6 );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "colorlistbox.moc"
+#include "moc_colorlistbox.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h
index bb91484..31a8085 100644
--- a/kaddressbook/views/colorlistbox.h
+++ b/kaddressbook/views/colorlistbox.h
@@ -1,77 +1,82 @@
 /*
 *   kmail: KDE mail client
 *   This file: Copyright (C) 2000 Espen Sand, espen@kde.org
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 *   This program is distributed in the hope that it will be useful,
 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *   GNU General Public License for more details.
 *
 *   You should have received a copy of the GNU General Public License
 *   along with this program; if not, write to the Free Software
 *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 */
 #ifndef _COLOR_LISTBOX_H_
 #define _COLOR_LISTBOX_H_
 #include <klistbox.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDragLeaveEvent>
+#include <QDropEvent>
+#include <QDragEnterEvent>
 class QDragEnterEvent;
 class QDragLeaveEvent;
 class QDragMoveEvent;
 class QDropEvent;
 class ColorListBox : public KListBox
 {
  Q_OBJECT
  public:
-    ColorListBox( QWidget *parent=0, const char * name=0, WFlags f=0 );
+    ColorListBox( QWidget *parent=0, const char * name=0, Qt::WFlags f=0 );
    void setColor( uint index, const QColor &color );
    QColor color( uint index ) const;
  public slots:
    virtual void setEnabled( bool state );
  protected:
    void dragEnterEvent( QDragEnterEvent *e );
    void dragLeaveEvent( QDragLeaveEvent *e );
    void dragMoveEvent( QDragMoveEvent *e );
    void dropEvent( QDropEvent *e );
  private slots:
    void newColor( int index );
-    void slotNewColor(QListBoxItem * i);
+    void slotNewColor(Q3ListBoxItem * i);
  private:
    int mCurrentOnDragEnter;
 };
-class ColorListItem : public QListBoxItem
+class ColorListItem : public Q3ListBoxItem
 {
  public:
    ColorListItem( const QString &text, const QColor &color=Qt::black );
    const QColor &color( void );
    void  setColor( const QColor &color );
  protected:
    virtual void paint( QPainter * );
-    virtual int height( const QListBox * ) const;
+    virtual int height( const Q3ListBox * ) const;
-    virtual int width( const QListBox * ) const;
+    virtual int width( const Q3ListBox * ) const;
  private:
    QColor mColor;
    int mBoxWidth;
 };
 #endif
diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp
index e0fbd21..b6327fe 100644
--- a/kaddressbook/views/configurecardviewdialog.cpp
+++ b/kaddressbook/views/configurecardviewdialog.cpp
@@ -1,124 +1,127 @@
 /*
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qstring.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kconfig.h>
 #include <kfontdialog.h>
 #ifndef KAB_EMBEDDED    
 #include <kpushbutton.h>
 #else //KAB_EMBEDDED    
 #include <qpushbutton.h>
 #endif //KAB_EMBEDDED    
 #include "colorlistbox.h"
 #include "configurecardviewdialog.h"
 /////////////////////////////////
 // ConfigureCardViewDialog
 ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, QWidget *parent, 
                                                  const char *name )
  : ViewConfigureWidget( ab, parent, name )
 {
 #ifndef KAB_EMBEDDED    
  QWidget *page = addPage( i18n( "Look & Feel" ), QString::null,
                           DesktopIcon( "looknfeel" ) );
 #else //KAB_EMBEDDED    
  QWidget *page = addPage( i18n( "Look & Feel" ), QString::null,
                           KGlobal::iconLoader()->loadIcon( "looknfeel",
                           KIcon::Panel ) );
 #endif //KAB_EMBEDDED    
                           
  mAdvancedPage = new CardViewLookNFeelPage( page );
 }
                                           
 ConfigureCardViewWidget::~ConfigureCardViewWidget()
 {
 }
    
 void ConfigureCardViewWidget::restoreSettings( KConfig *config )
 {
  ViewConfigureWidget::restoreSettings( config );
  mAdvancedPage->restoreSettings( config );
 }
 void ConfigureCardViewWidget::saveSettings( KConfig *config )
 {
  ViewConfigureWidget::saveSettings( config );
  mAdvancedPage->saveSettings( config );
 }
    
 ////////////////////////
 // CardViewLookNFeelPage
 CardViewLookNFeelPage::CardViewLookNFeelPage( QWidget *parent, const char *name )
-  : QVBox( parent, name )
+  : Q3VBox( parent, name )
 {
  initGUI();
 }
 CardViewLookNFeelPage::~CardViewLookNFeelPage()
 {
 }
 void CardViewLookNFeelPage::restoreSettings( KConfig *config )
 {
  // colors
  cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) );
  QColor c;
 qDebug("CardViewLookNFeelPage::restoreSettings make base color configurable");  
  
 #ifndef KAB_EMBEDDED  
  c = KGlobalSettings::baseColor();
 #else //KAB_EMBEDDED  
  c = QColor(0,0,0);
 #endif //KAB_EMBEDDED  
  
  c = colorGroup().background();
  lbColors->insertItem( new ColorListItem( i18n("Background Color"),
        config->readColorEntry( "BackgroundColor", &c ) ) );
  c = colorGroup().foreground();
  lbColors->insertItem( new ColorListItem( i18n("Text Color"),
        config->readColorEntry( "TextColor", &c ) ) );
  c = colorGroup().button();
  lbColors->insertItem( new ColorListItem( i18n("Header, Border and Separator Color"),
        config->readColorEntry( "HeaderColor", &c ) ) );
  c = colorGroup().buttonText();
  lbColors->insertItem( new ColorListItem( i18n("Header Text Color"),
@@ -205,165 +208,165 @@ void CardViewLookNFeelPage::setHeaderFont()
  if ( KFontDialog::getFont( f,false, this ) == QDialog::Accepted )
    updateFontLabel( f, lHeaderFont );
 #else //KAB_EMBEDDED  
  bool ok;
  QFont fout = KFontDialog::getFont( f, ok);
  if ( ok )
    updateFontLabel( fout, lHeaderFont );
 #endif //KAB_EMBEDDED  
 }
 void CardViewLookNFeelPage::enableFonts()
 {
  vbFonts->setEnabled( cbEnableCustomFonts->isChecked() );
  if ( cbEnableCustomFonts->isChecked() )
      vbFonts->setFocus();
 }
 void CardViewLookNFeelPage::enableColors()
 {
  lbColors->setEnabled( cbEnableCustomColors->isChecked() );
  if ( cbEnableCustomColors->isChecked() )
      lbColors->setFocus();
 }
 void CardViewLookNFeelPage::initGUI()
 {
  int spacing = KDialog::spacingHint();
  int margin = KDialog::marginHint();
  
  QTabWidget *tabs = new QTabWidget( this );
  // Layout
-  QVBox *loTab = new QVBox( this, "layouttab" );
+  Q3VBox *loTab = new Q3VBox( this, "layouttab" );
  
  loTab->setSpacing( spacing );
  loTab->setMargin( margin );
  
-  QGroupBox *gbGeneral = new QGroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
+  Q3GroupBox *gbGeneral = new Q3GroupBox( 1, Qt::Horizontal, i18n("General"), loTab );
  
  cbDrawSeps = new QCheckBox( i18n("Draw &separators"), gbGeneral );
-  QHBox *hbSW = new QHBox( gbGeneral );
+  Q3HBox *hbSW = new Q3HBox( gbGeneral );
  QLabel *lSW = new QLabel( i18n("Separator &width:"), hbSW );
  sbSepWidth = new QSpinBox( 1, 50, 1, hbSW );
  lSW->setBuddy( sbSepWidth);
-  QHBox *hbPadding = new QHBox( gbGeneral );
+  Q3HBox *hbPadding = new Q3HBox( gbGeneral );
  QLabel *lSpacing = new QLabel( i18n("&Padding:"), hbPadding );
  sbSpacing = new QSpinBox( 0, 100, 1, hbPadding );
  lSpacing->setBuddy( sbSpacing );
-  QGroupBox *gbCards = new QGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
+  Q3GroupBox *gbCards = new Q3GroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab );
-  QHBox *hbMargin = new QHBox( gbCards );
+  Q3HBox *hbMargin = new Q3HBox( gbCards );
  QLabel *lMargin = new QLabel( i18n("&Margin:"), hbMargin );
  sbMargin = new QSpinBox( 0, 100, 1, hbMargin );
  lMargin->setBuddy( sbMargin );
  cbDrawBorders = new QCheckBox( i18n("Draw &borders"), gbCards );
  loTab->setStretchFactor( new QWidget( loTab ), 1 );
  
-  QWhatsThis::add( sbMargin, i18n(
+  Q3WhatsThis::add( sbMargin, i18n(
        "The item margin is the distance (in pixels) between the item edge and the item data. Most noticeably, "
        "incrementing the item margin will add space between the focus rectangle and the item data."
        ) );
-  QWhatsThis::add( lMargin, QWhatsThis::textFor( sbMargin ) );
+  /* TODO:hacker: Q3WhatsThis::add( lMargin, Q3WhatsThis::textFor( sbMargin ) ); */
-  QWhatsThis::add( sbSpacing, i18n(
+  Q3WhatsThis::add( sbSpacing, i18n(
        "The Item Spacing decides the distance (in pixels) between the items and anything else: the view "
        "borders, other items or column separators."
        ) );
-  QWhatsThis::add( lSpacing, QWhatsThis::textFor( sbSpacing ) );
+  /* TODO:hacker: Q3WhatsThis::add( lSpacing, Q3WhatsThis::textFor( sbSpacing ) ); */
-  QWhatsThis::add( sbSepWidth, i18n("Sets the width of column separators") );
+  Q3WhatsThis::add( sbSepWidth, i18n("Sets the width of column separators") );
-  QWhatsThis::add( lSW, QWhatsThis::textFor( sbSepWidth ) );
+  /* TODO:hacker: Q3WhatsThis::add( lSW, Q3WhatsThis::textFor( sbSepWidth ) ); */
  
  tabs->addTab( loTab, i18n("&Layout") );
    
  // Colors
-  QVBox *colorTab = new QVBox( this, "colortab" );
+  Q3VBox *colorTab = new Q3VBox( this, "colortab" );
  colorTab->setSpacing( spacing );
  colorTab->setMargin( spacing );
  cbEnableCustomColors = new QCheckBox( i18n("&Enable custom Colors"), colorTab );
  connect( cbEnableCustomColors, SIGNAL(clicked()), this, SLOT(enableColors()) );
  lbColors = new ColorListBox( colorTab );
  tabs->addTab( colorTab, i18n("&Colors") );
  
-  QWhatsThis::add( cbEnableCustomColors, i18n(
+  Q3WhatsThis::add( cbEnableCustomColors, i18n(
        "If custom colors are enabled, you may choose the colors for the view below. "
        "Otherwise colors from your current KDE color scheme are used."
        ) );
-  QWhatsThis::add( lbColors, i18n(
+  Q3WhatsThis::add( lbColors, i18n(
        "Double click or press RETURN on a item to select a color for the related strings in the view."
        ) );
  
  // Fonts
-  QVBox *fntTab = new QVBox( this, "fonttab" );
+  Q3VBox *fntTab = new Q3VBox( this, "fonttab" );
  
  fntTab->setSpacing( spacing );
  fntTab->setMargin( spacing );
  
  cbEnableCustomFonts = new QCheckBox( i18n("&Enable custom fonts"), fntTab );
  connect( cbEnableCustomFonts, SIGNAL(clicked()), this, SLOT(enableFonts()) );
  
  vbFonts = new QWidget( fntTab );
-  QGridLayout *gFnts = new QGridLayout( vbFonts, 2, 3 );
+  Q3GridLayout *gFnts = new Q3GridLayout( vbFonts, 2, 3 );
  gFnts->setSpacing( spacing );
  gFnts->setAutoAdd( true );
  gFnts->setColStretch( 1, 1 );  
  QLabel *lTFnt = new QLabel( i18n("&Text font:"), vbFonts );
  lTextFont = new QLabel( vbFonts );
-  lTextFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
+  lTextFont->setFrameStyle( Q3Frame::Panel|Q3Frame::Sunken );
 #ifndef KAB_EMBEDDED    
  btnFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
  btnFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
  
  lTFnt->setBuddy( btnFont );
  
  connect( btnFont, SIGNAL(clicked()), this, SLOT(setTextFont()) );
  
  QLabel *lHFnt = new QLabel( i18n("&Header font:"), vbFonts );
  lHeaderFont = new QLabel( vbFonts );
-  lHeaderFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
+  lHeaderFont->setFrameStyle( Q3Frame::Panel|Q3Frame::Sunken );
 #ifndef KAB_EMBEDDED    
  btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
  btnHeaderFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
  lHFnt->setBuddy( btnHeaderFont );
  connect( btnHeaderFont, SIGNAL(clicked()), this, SLOT(setHeaderFont()) );
  
  fntTab->setStretchFactor( new QWidget( fntTab ), 1 );
-  QWhatsThis::add( cbEnableCustomFonts, i18n(
+  Q3WhatsThis::add( cbEnableCustomFonts, i18n(
        "If custom fonts are enabled, you may choose which fonts to use for this view below. "
        "Otherwise the default KDE font will be used, in bold style for the header and "
        "normal style for the data."
        ) );
          
  tabs->addTab( fntTab, i18n("&Fonts") );
  
  // Behaviour
-  QVBox *behaviourTab = new QVBox( this );
+  Q3VBox *behaviourTab = new Q3VBox( this );
  behaviourTab->setMargin( margin );
  behaviourTab->setSpacing( spacing );
  
  cbShowEmptyFields = new QCheckBox( i18n("Show &empty fields"), behaviourTab );
  cbShowFieldLabels = new QCheckBox( i18n("Show field &labels"), behaviourTab );
  behaviourTab->setStretchFactor( new QWidget( behaviourTab ), 1 );
  tabs->addTab( behaviourTab, i18n("Be&havior") );
    
 }
 void CardViewLookNFeelPage::updateFontLabel( QFont fnt, QLabel *l )
 {
  l->setFont( fnt );
  l->setText(  QString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "configurecardviewdialog.moc"
+#include "moc_configurecardviewdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h
index 7a62226..4af475d 100644
--- a/kaddressbook/views/configurecardviewdialog.h
+++ b/kaddressbook/views/configurecardviewdialog.h
@@ -1,112 +1,114 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef CONFIGURECARDVIEWDIALOG_H
 #define CONFIGURECARDVIEWDIALOG_H
 #include "viewconfigurewidget.h"
-#include <qvbox.h>
+#include <q3vbox.h>
 #include <qwidget.h>
 #include <qfont.h>
+//Added by qt3to4:
+#include <QLabel>
 class QString;
 class QWidget;
 class QCheckBox;
 class QLabel;
 class KConfig;
 namespace KABC { class AddressBook; }
 class CardViewLookAndFeelPage;
 /**
  Configure dialog for the card view. This dialog inherits from the
  standard view dialog in order to add a custom page for the card
  view.
 */
 class ConfigureCardViewWidget : public ViewConfigureWidget
 {
  public:
    ConfigureCardViewWidget( KABC::AddressBook *ab, QWidget *parent, const char *name );
    virtual ~ConfigureCardViewWidget();
    
    virtual void restoreSettings( KConfig* );
    virtual void saveSettings( KConfig* );
    
  private:
    class CardViewLookNFeelPage *mAdvancedPage;
 };
 /**
    Card View Advanced LookNFeel settings widget:
    this is a tabbed widget with 3 tabs:
    Fonts
    * text font
    * header font
    
    Colors
    * background color
    * text color
    * highlight color
    * title/sep text color
    * title/sep bg color
    
    Layout
    * item margin
    * item spacing
 */
-class CardViewLookNFeelPage : public QVBox {
+class CardViewLookNFeelPage : public Q3VBox {
  Q_OBJECT
  
  public:
    CardViewLookNFeelPage( QWidget *parent=0, const char *name=0 );
    ~CardViewLookNFeelPage();
  
    void restoreSettings( KConfig* );
    void saveSettings( KConfig* );
  
  private slots:
    void setTextFont();
    void setHeaderFont();
    void enableFonts();
    void enableColors();
  
  private:
    void initGUI();
    void updateFontLabel( QFont, QLabel * );
    
    QCheckBox *cbEnableCustomFonts, 
              *cbEnableCustomColors,
              *cbDrawSeps, *cbDrawBorders,
              *cbShowFieldLabels, *cbShowEmptyFields;
    class ColorListBox *lbColors;
    QLabel *lTextFont, *lHeaderFont;
 #ifndef KAB_EMBEDDED    
    class KPushButton *btnFont, *btnHeaderFont;
 #else //KAB_EMBEDDED    
    class QPushButton *btnFont, *btnHeaderFont;
 #endif //KAB_EMBEDDED    
    class QSpinBox *sbMargin, *sbSpacing, *sbSepWidth;
diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp
index c329cd9..7ed897a 100644
--- a/kaddressbook/views/configuretableviewdialog.cpp
+++ b/kaddressbook/views/configuretableviewdialog.cpp
@@ -1,119 +1,122 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qstring.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qtabwidget.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 #include <kglobal.h>
 #include <klocale.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 #include <kiconloader.h>
 #include <kfontdialog.h>
 #ifndef KAB_EMBEDDED    
 #include <kimageio.h>
 #else //KAB_EMBEDDED    
 #endif //KAB_EMBEDDED    
 #include <kconfig.h>
 #include "colorlistbox.h"
 #include "configuretableviewdialog.h"
 ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab,
                                                    QWidget *parent, 
                                                    const char *name )
  : ViewConfigureWidget( ab, parent, name )
 {
  QWidget *page = addPage( i18n( "Look & Feel" ), QString::null,
                           KGlobal::iconLoader()->loadIcon( "looknfeel",
                           KIcon::Panel ) );
  
  mPage = new LookAndFeelPage( page );
 }
                                           
 ConfigureTableViewWidget::~ConfigureTableViewWidget()
 {
 }
 void ConfigureTableViewWidget::restoreSettings( KConfig *config )
 {
  ViewConfigureWidget::restoreSettings( config );
  mPage->restoreSettings( config );
 }
 void ConfigureTableViewWidget::saveSettings( KConfig *config )
 {
  ViewConfigureWidget::saveSettings( config );
  mPage->saveSettings( config );
 }
 LookAndFeelPage::LookAndFeelPage(QWidget *parent, const char *name)
-  : QVBox(parent, name)
+  : Q3VBox(parent, name)
 {
  initGUI();
  
  // Set initial state
  enableBackgroundToggled(mBackgroundBox->isChecked());
 }
    
 void LookAndFeelPage::restoreSettings( KConfig *config )
 {
  mAlternateButton->setChecked(config->readBoolEntry("ABackground", true));
  mLineButton->setChecked(config->readBoolEntry("SingleLine", false));
  mToolTipBox->setChecked(config->readBoolEntry("ToolTips", true));
      
  if (!mAlternateButton->isChecked() & !mLineButton->isChecked())
    mNoneButton->setChecked(true);
  
  mBackgroundBox->setChecked(config->readBoolEntry("Background", false));
  mBackgroundName->lineEdit()->setText(config->readEntry("BackgroundName"));
  // colors
  cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) );
  QColor c;
  //qDebug("LookAndFeelPage::restoreSettings make base color configurable");  
  
 #ifndef KAB_EMBEDDED  
  c = KGlobalSettings::baseColor();
 #else //KAB_EMBEDDED  
  c = QColor(0,0,0);
 #endif //KAB_EMBEDDED  
  
  c = colorGroup().background();
  lbColors->insertItem( new ColorListItem( i18n("Background Color"),
@@ -200,146 +203,146 @@ void LookAndFeelPage::setHeaderFont()
  if ( KFontDialog::getFont( f,false, this ) == QDialog::Accepted )
    updateFontLabel( f, lHeaderFont );
 #else //KAB_EMBEDDED  
  bool ok;
  QFont fout = KFontDialog::getFont( f, ok);
  if ( ok )
    updateFontLabel( fout, lHeaderFont );
 #endif //KAB_EMBEDDED  
 }
 void LookAndFeelPage::enableFonts()
 {
  vbFonts->setEnabled( cbEnableCustomFonts->isChecked() );
  if ( cbEnableCustomFonts->isChecked() )
      vbFonts->setFocus();
 }
 void LookAndFeelPage::enableColors()
 {
    lbColors->setEnabled( cbEnableCustomColors->isChecked() );
    if ( cbEnableCustomColors->isChecked() )
        lbColors->setFocus();
 }
    
 void LookAndFeelPage::initGUI()
 {
  int spacing = KDialog::spacingHint();
  int margin = KDialog::marginHint();
  
  QTabWidget *tabs = new QTabWidget( this );
  // General
-  QVBox *generalTab = new QVBox( this, "generaltab" );
+  Q3VBox *generalTab = new Q3VBox( this, "generaltab" );
  
  generalTab->setSpacing( spacing );
  generalTab->setMargin( margin );
-  QButtonGroup *group = new QButtonGroup(1, Qt::Horizontal, 
+  Q3ButtonGroup *group = new Q3ButtonGroup(1, Qt::Horizontal, 
                                         i18n("Row Separator"), generalTab);
      
  mAlternateButton = new QRadioButton(i18n("Alternating backgrounds"),
                                      group, "mAlternateButton");
  mLineButton = new QRadioButton(i18n("Single line"), group, "mLineButton");
  mNoneButton = new QRadioButton(i18n("None"), group, "mNoneButton");
      
  mBackgroundBox = new QCheckBox(i18n("Enable background image:"), generalTab,
                                 "mBackgroundBox");
  connect(mBackgroundBox, SIGNAL(toggled(bool)),
          SLOT(enableBackgroundToggled(bool)));
  // LR image not implemented
  mBackgroundBox->setEnabled( false );
  mBackgroundName = new KURLRequester(generalTab, "mBackgroundName");
 #ifndef KAB_EMBEDDED    
  mBackgroundName->setMode(KFile::File | KFile::ExistingOnly |
                           KFile::LocalOnly);
  mBackgroundName->setFilter(KImageIO::pattern(KImageIO::Reading));
 #endif //KAB_EMBEDDED    
  
  // ToolTip Checkbox
  mToolTipBox = new QCheckBox(i18n("Enable contact tooltips"), generalTab,
                              "mToolTipBox");
  tabs->addTab( generalTab, i18n("&General") );
    
  // Colors
-  QVBox *colorTab = new QVBox( this, "colortab" );
+  Q3VBox *colorTab = new Q3VBox( this, "colortab" );
  colorTab->setSpacing( spacing );
  colorTab->setMargin( spacing );
  cbEnableCustomColors = new QCheckBox( i18n("&Enable custom Colors"), colorTab );
  connect( cbEnableCustomColors, SIGNAL(clicked()), this, SLOT(enableColors()) );
  lbColors = new ColorListBox( colorTab );
  tabs->addTab( colorTab, i18n("&Colors") );
  
-  QWhatsThis::add( cbEnableCustomColors, i18n(
+  Q3WhatsThis::add( cbEnableCustomColors, i18n(
        "If custom colors are enabled, you may choose the colors for the view below. "
        "Otherwise colors from your current KDE color scheme are used."
        ) );
-  QWhatsThis::add( lbColors, i18n(
+  Q3WhatsThis::add( lbColors, i18n(
        "Double click or press RETURN on a item to select a color for the related strings in the view."
        ) );
  
  // Fonts
-  QVBox *fntTab = new QVBox( this, "fonttab" );
+  Q3VBox *fntTab = new Q3VBox( this, "fonttab" );
  
  fntTab->setSpacing( spacing );
  fntTab->setMargin( spacing );
  
  cbEnableCustomFonts = new QCheckBox( i18n("&Enable custom fonts"), fntTab );
  connect( cbEnableCustomFonts, SIGNAL(clicked()), this, SLOT(enableFonts()) );
  
  vbFonts = new QWidget( fntTab );
-  QGridLayout *gFnts = new QGridLayout( vbFonts, 2, 3 );
+  Q3GridLayout *gFnts = new Q3GridLayout( vbFonts, 2, 3 );
  gFnts->setSpacing( spacing );
  gFnts->setAutoAdd( true );
  gFnts->setColStretch( 1, 1 );  
  QLabel *lTFnt = new QLabel( i18n("&Text font:"), vbFonts );
  lTextFont = new QLabel( vbFonts );
-  lTextFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
+  lTextFont->setFrameStyle( Q3Frame::Panel|Q3Frame::Sunken );
 #ifndef KAB_EMBEDDED    
  btnFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
  btnFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
  
  lTFnt->setBuddy( btnFont );
  
  connect( btnFont, SIGNAL(clicked()), this, SLOT(setTextFont()) );
  
  QLabel *lHFnt = new QLabel( i18n("&Header font:"), vbFonts );
  lHeaderFont = new QLabel( vbFonts );
-  lHeaderFont->setFrameStyle( QFrame::Panel|QFrame::Sunken );
+  lHeaderFont->setFrameStyle( Q3Frame::Panel|Q3Frame::Sunken );
 #ifndef KAB_EMBEDDED    
  btnHeaderFont = new KPushButton( i18n("Choose..."), vbFonts );
 #else //KAB_EMBEDDED    
  btnHeaderFont = new QPushButton( i18n("Choose..."), vbFonts );
 #endif //KAB_EMBEDDED    
  lHFnt->setBuddy( btnHeaderFont );
  connect( btnHeaderFont, SIGNAL(clicked()), this, SLOT(setHeaderFont()) );
  
  fntTab->setStretchFactor( new QWidget( fntTab ), 1 );
-  QWhatsThis::add( cbEnableCustomFonts, i18n(
+  Q3WhatsThis::add( cbEnableCustomFonts, i18n(
        "If custom fonts are enabled, you may choose which fonts to use for this view below. "
        "Otherwise the default KDE font will be used, in bold style for the header and "
        "normal style for the data."
        ) );
          
  tabs->addTab( fntTab, i18n("&Fonts") );
 }
 void LookAndFeelPage::enableBackgroundToggled(bool enabled)
 {
  mBackgroundName->setEnabled(enabled);
 }
 void LookAndFeelPage::updateFontLabel( QFont fnt, QLabel *l )
 {
  l->setFont( fnt );
  l->setText(  QString( fnt.family() + " %1" ).arg( fnt.pointSize() ) );
 }
-#ifndef KAB_EMBEDDED    
+#ifndef KAB_EMBEDDED_
-#include "configuretableviewdialog.moc"
+#include "moc_configuretableviewdialog.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h
index 003ccf8..8125fc9 100644
--- a/kaddressbook/views/configuretableviewdialog.h
+++ b/kaddressbook/views/configuretableviewdialog.h
@@ -1,98 +1,100 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef CONFIGURETABLEVIEWDIALOG_H
 #define CONFIGURETABLEVIEWDIALOG_H
 #include "viewconfigurewidget.h"
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <QLabel>
 class QString;
 class QWidget;
 class QRadioButton;
 class QCheckBox;
 class KURLRequester;
 class KConfig;
 class QLabel;
 namespace KABC { class AddressBook; }
 class LookAndFeelPage;
 /**
  Configure dialog for the table view. This dialog inherits from the
  standard view dialog in order to add a custom page for the table
  view.
 */
 class ConfigureTableViewWidget : public ViewConfigureWidget
 {
  public:
    ConfigureTableViewWidget( KABC::AddressBook *ab, QWidget *parent, const char *name );
    virtual ~ConfigureTableViewWidget();
    
    virtual void restoreSettings( KConfig* );
    virtual void saveSettings( KConfig* );
    
  private:
    void initGUI();
    
    LookAndFeelPage *mPage;
 };
 /**
  Internal class. It is only defined here for moc
 */
-class LookAndFeelPage : public QVBox
+class LookAndFeelPage : public Q3VBox
 {
  Q_OBJECT
  
  public:
    LookAndFeelPage( QWidget *parent, const char *name = 0 );
    ~LookAndFeelPage() {}
    
    void restoreSettings( KConfig* );
    void saveSettings( KConfig* );
    
  protected slots:
    void enableBackgroundToggled( bool );
    void setTextFont();
    void setHeaderFont();
    void enableFonts();
    void enableColors();
  private:
    void initGUI();
    void updateFontLabel( QFont, QLabel * );
    QCheckBox *cbEnableCustomFonts,
      *cbEnableCustomColors;
    class ColorListBox *lbColors;
    QLabel *lTextFont, *lHeaderFont;
    class QPushButton *btnFont, *btnHeaderFont;
    class QWidget* vbFonts;
    QRadioButton *mAlternateButton;
    QRadioButton *mLineButton;
    QRadioButton *mNoneButton;
    QCheckBox *mToolTipBox;
diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp
index 9accf78..227645d 100644
--- a/kaddressbook/views/contactlistview.cpp
+++ b/kaddressbook/views/contactlistview.cpp
@@ -1,98 +1,104 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
-#include <qheader.h>
+#include <q3header.h>
-#include <qiconset.h>
+#include <qicon.h>
 #include <qimage.h>
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qcombobox.h>
 #include <qpainter.h>
 #include <qbrush.h>
 #include <qevent.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QKeyEvent>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kapplication.h>
 #include <kurl.h>
 #include "kaddressbooktableview.h"
 #include "contactlistview.h"
 /////////////////////////////////
 // DynamicTip Methods
 DynamicTip::DynamicTip( ContactListView *parent)
-  : QToolTip( parent )
+  /* TODO:hacker:: QToolTip( parent ) */
 {
 }
 void DynamicTip::maybeTip( const QPoint &pos )
 {
+    /* TODO:hacker: 
 static bool ishidden = true;
  if (!parentWidget()->inherits( "ContactListView" ))
    return;
  ContactListView *plv = (ContactListView*)parentWidget();
  if (!plv->tooltips())
    return;
  QPoint posVp = plv->viewport()->pos();
-  QListViewItem *lvi = plv->itemAt( pos - posVp );
+  Q3ListViewItem *lvi = plv->itemAt( pos - posVp );
  if (!lvi)
    return;
 #ifndef KAB_EMBEDDED    
  ContactListViewItem *plvi = dynamic_cast< ContactListViewItem* >(lvi);
 #else //KAB_EMBEDDED    
  ContactListViewItem *plvi = (ContactListViewItem*)(lvi);
 #endif //KAB_EMBEDDED    
  
  if (!plvi)
    return;
        if (ishidden) {
  QString s;
  QRect r = plv->itemRect( lvi );
  r.moveBy( posVp.x(), posVp.y() );
    //kdDebug() << "Tip rec: " << r.x() << "," << r.y() << "," << r.width()
    //          << "," << r.height() << endl;
  KABC::Addressee a = plvi->addressee();
  if (a.isEmpty())
    return;
  s += i18n("label: value", "%1: %2").arg(a.formattedNameLabel())
                                     .arg(a.formattedName());
  s += '\n';
  s += i18n("label: value", "%1: %2").arg(a.organizationLabel())
                                       .arg(a.organization());
  QString notes = a.note().stripWhiteSpace();
@@ -122,111 +128,111 @@ void DynamicTip::maybeTip( const QPoint &pos )
            linew = lastw;
          }
          else
            i = QMAX( a, i-1 );
        }
      if ( notes[i] == '\n' || doBreak ) {
        s += notes.mid( a, i - a + (doBreak?1:0) ) +"\n";
        a = i + 1;
        lastSpace = a;
        linew = 0;
      }
      if ( notes[i].isSpace() ) {
        lastSpace = i;
        lastw = linew;
      }
      if ( lastSpace <= a ) {
        lastw = linew;
      }
      ++i;
    }
  }
  tip( r, s );
    }
        else
        hide();
        ishidden = !ishidden;
-      
+      */
 }
 ///////////////////////////
 // ContactListViewItem Methods
 ContactListViewItem::ContactListViewItem(const KABC::Addressee &a,
                                         ContactListView *parent,
                                         KABC::AddressBook *doc,
                                         const KABC::Field::List &fields )
  : KListViewItem(parent), mAddressee(a), mFields( fields ),
    parentListView( parent ), mDocument(doc)
 {
  refresh();
 }
 QString ContactListViewItem::key(int column, bool ascending) const
 {
 #ifndef DESKTOP_VERSION
    int lan = KGlobal::locale()->language();
    //qDebug("language %d ", lan);
    if ( lan == 1 ) { //GERMAN
-        QString ret = QListViewItem::key(column, ascending).lower().utf8();
+        QString ret = Q3ListViewItem::key(column, ascending).lower().utf8();
        int start = -1;
        while ( (start = ret.find( 'ä', start+1)) > 0 ) {
            ret.at(start-1) = 'a';
        }
        start = -1;
        while ( (start = ret.find( 'ö', start+1)) > 0 ) {
            ret.at(start-1) = 'o';
        }
        start = -1;
        while ( (start = ret.find( 'ü', start+1)) > 0 ) {
            ret.at(start-1) = 'o';
        }
        start = -1;
        while ( (start = ret.find( 'ß', start+1)) > 0 ) {
            ret.at(start-1) = 's';
        }
        //qDebug("conv string %s ", ret.latin1());
        return ret;
        
    }
    else
 #endif
-        return QListViewItem::key(column, ascending).lower();
+        return Q3ListViewItem::key(column, ascending).lower();
 }
 void ContactListViewItem::paintCell(QPainter * p,
                                                    const QColorGroup & cg,
                                    int column,
                                    int width,
                                    int align)
 {
  KListViewItem::paintCell(p, cg, column, width, align);
  if ( !p )
    return;
  if (parentListView->singleLine()) {
    p->setPen( parentListView->alternateColor() );
    p->drawLine( 0, height() - 1, width, height() - 1 );
  }
 }
 ContactListView *ContactListViewItem::parent()
 {
  return parentListView;
 }
 void ContactListViewItem::refresh()
 {
  // Update our addressee, since it may have changed else were
  mAddressee = mDocument->findByUid(mAddressee.uid());
  if (mAddressee.isEmpty())
    return;
@@ -259,130 +265,130 @@ ContactListView::ContactListView(KAddressBookTableView *view,
  setAlternateBackgroundEnabled(mABackground);
  setAcceptDrops( true );
  viewport()->setAcceptDrops( true );
  setAllColumnsShowFocus( true );
  setShowSortIndicator(true);
  
  setSelectionModeExt( KListView::Extended   );
  setDropVisualizer(false);
  // setFrameStyle(QFrame::NoFrame);
  //setLineWidth ( 0 );
  //setMidLineWidth ( 0 );
  //setMargin ( 0 );
 #ifndef KAB_EMBEDDED  
  connect(this, SIGNAL(dropped(QDropEvent*)),
          this, SLOT(itemDropped(QDropEvent*)));
 #endif //KAB_EMBEDDED  
          
  new DynamicTip( this );
 }
 void ContactListView::printMe()
 {
 #ifdef DESKTOP_VERSION 
    QPrinter printer;
    if (!printer.setup() )
        return;
    QPainter p;
    p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
    float dx, dy;
    int wid = (m.width() * 9)/10;
    dx = (float) wid/(float)contentsWidth ();
    dy  = (float)(m.height()) / (float)contentsHeight ();
    float scale;
    // scale to fit the width or height of the paper
    if ( dx < dy )
        scale = dx;
    else
        scale = dy;
    p.translate( m.width()/10,0 );
    p.scale( scale, scale );
    qDebug("scale %f ", scale);
    drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
    p.end();
    qDebug("Why does it not print??? ");
 #endif  
 }
 void ContactListView::setAlternateColor(const QColor &m_AlternateColor)
 {
  mAlternateColor = m_AlternateColor;
 }
 void ContactListView::paintEmptyArea( QPainter * p, const QRect & rect )
 {
  QBrush b = palette().brush(QPalette::Active, QColorGroup::Base);
  // Get the brush, which will have the background pixmap if there is one.
  if (b.pixmap())
  {
    p->drawTiledPixmap( rect.left(), rect.top(), rect.width(), rect.height(),
      *(b.pixmap()),
      rect.left() + contentsX(),
      rect.top() + contentsY() );
  }
  else
  {
    // Do a normal paint
    KListView::paintEmptyArea(p, rect);
  }
 }
 void ContactListView::contentsMousePressEvent(QMouseEvent* e)
 {
  presspos = e->pos();
  KListView::contentsMousePressEvent(e);
 }
 // To initiate a drag operation
 void ContactListView::contentsMouseMoveEvent( QMouseEvent *e )
 {
-  if ((e->state() & LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
+  if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) {
    emit startAddresseeDrag();
  }
  else
    KListView::contentsMouseMoveEvent( e );
 }
 bool ContactListView::acceptDrag(QDropEvent *e) const
 {
 #ifndef KAB_EMBEDDED  
-  return QTextDrag::canDecode(e);
+  return Q3TextDrag::canDecode(e);
 #else //KAB_EMBEDDED  
 qDebug("ContactListView::acceptDrag has to be fixed");
  return false;
 #endif //KAB_EMBEDDED  
 }
 void ContactListView::itemDropped(QDropEvent *e)
 {
  contentsDropEvent(e);
 }
 void ContactListView::contentsDropEvent( QDropEvent *e )
 {
  emit addresseeDropped(e);
 }
 void ContactListView::setAlternateBackgroundEnabled(bool enabled)
 {
  mABackground = enabled;
  if (mABackground)
  {
    setAlternateBackground(mAlternateColor);
  }
  else
  {
    setAlternateBackground(QColor());
  }
 }
 void ContactListView::setBackgroundPixmap(const QString &filename)
 {
@@ -395,35 +401,35 @@ void ContactListView::setBackgroundPixmap(const QString &filename)
  qDebug("ContactListView::setBackgroundPixmap has to be verified");
 //US    setPaletteBackgroundPixmap(QPixmap(filename));
    KListView::setBackgroundPixmap((const QPixmap&)QPixmap(filename));
  }
  
 }
 void ContactListView::keyPressEvent ( QKeyEvent * e )
 { 
    if ( mFlagBlockKeyPressed )
        return;
    qApp->processEvents();
    if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
        e->accept();
        return;
    } 
    if (! e->isAutoRepeat() )
        mFlagKeyPressed = true;
    KListView::keyPressEvent ( e );
 }
 void ContactListView::keyReleaseEvent ( QKeyEvent * e )
 {
    if ( mFlagBlockKeyPressed )
        return;
   if ( !e->isAutoRepeat() ) {
        mFlagBlockKeyPressed = true;
        qApp->processEvents();
        mFlagBlockKeyPressed = false;
        mFlagKeyPressed = false;
   }
   KListView::keyReleaseEvent ( e );
 }
-#ifndef KAB_EMBEDDED    
+#ifndef KAB_EMBEDDED_
-#include "contactlistview.moc"
+#include "moc_contactlistview.cpp"
 #endif //KAB_EMBEDDED    
diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h
index 46477e1..c92b002 100644
--- a/kaddressbook/views/contactlistview.h
+++ b/kaddressbook/views/contactlistview.h
@@ -1,55 +1,59 @@
 #ifndef CONTACTLISTVIEW_H
 #define CONTACTLISTVIEW_H
 #include <qcolor.h>
 #include <qpixmap.h>
 #include <qtooltip.h>
 #include <qstring.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QMouseEvent>
+#include <QKeyEvent>
 #include <klistview.h>
 #include <kabc/field.h>
 #include <kabc/addressee.h>
 #include <kabc/addressbook.h>
 class QDropEvent;
 class KAddressBookTableView;
 class ContactListView;
 /** The whole tooltip design needs a lot of work. Currently it is
 * hacked together to function.
 */
-class DynamicTip : public QToolTip
+class DynamicTip /* TODO:hacker: : public QToolTip */
 {
  public:
    DynamicTip( ContactListView * parent );
  protected:
    void maybeTip( const QPoint & );
    
  private:
 };
 class ContactListViewItem : public KListViewItem
 {
 public:
  ContactListViewItem(const KABC::Addressee &a, ContactListView* parent, 
                      KABC::AddressBook *doc, const KABC::Field::List &fields );
  const KABC::Addressee &addressee() const { return mAddressee; }
  virtual void refresh();
  virtual ContactListView* parent();
  virtual QString key ( int, bool ) const;
  
  /** Adds the border around the cell if the user wants it.
  * This is how the single line config option is implemented.
  */
  virtual void paintCell(QPainter * p, const QColorGroup & cg, 
                         int column, int width, int align );
 private:
  KABC::Addressee mAddressee;
  KABC::Field::List mFields;
  ContactListView *parentListView;
  KABC::AddressBook *mDocument;
diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp
index b503652..1e5a556 100644
--- a/kaddressbook/views/kaddressbookcardview.cpp
+++ b/kaddressbook/views/kaddressbookcardview.cpp
@@ -1,62 +1,67 @@
 /*
    This file is part of KAddressBook.
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qevent.h>
-#include <qiconview.h>
+#include <q3iconview.h>
 #include <qlayout.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 #include <qapplication.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
+#include <QDragEnterEvent>
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include "kabprefs.h"
 #include "viewmanager.h"
 #include "kaddressbookcardview.h"
 #ifndef KAB_EMBEDDED
 extern "C" {
  void *init_libkaddrbk_cardview()
  {
    return ( new CardViewFactory );
  }
 }
 #endif //KAB_EMBEDDED
 ////////////////////////////////
 // AddresseeCardViewItem  (internal class)
 class AddresseeCardViewItem : public CardViewItem
 {
  public:
    AddresseeCardViewItem(const KABC::Field::List &fields,
                          bool showEmptyFields,
                          KABC::AddressBook *doc, const KABC::Addressee &a,
                          CardView *parent)
      : CardViewItem(parent, a.realName() ),
@@ -96,116 +101,116 @@ class AddresseeCardViewItem : public CardViewItem
          // We might want to make this the first field. hmm... -mpilone
          setCaption( mAddressee.realName() );
        }
    }
  private:
    KABC::Field::List mFields;
    bool mShowEmptyFields;
    KABC::AddressBook *mDocument;
    KABC::Addressee mAddressee;
 };
 ///////////////////////////////
 // AddresseeCardView
 AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name)
  : CardView(parent, name)
 {
  setAcceptDrops(true);
 }
 AddresseeCardView::~AddresseeCardView()
 {
 }
 void AddresseeCardView::printMe()
 {
 #ifdef DESKTOP_VERSION 
    QPrinter printer;
    if (!printer.setup() )
        return;
    QPainter p;
    p.begin ( &printer  );
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
    float dx, dy;
    int wid = (m.width() * 9)/10;
    dx = (float) wid/(float)contentsWidth ();
    dy  = (float)(m.height()) / (float)contentsHeight ();
    float scale;
    // scale to fit the width or height of the paper
    if ( dx < dy )
        scale = dx;
    else
        scale = dy;
    p.translate( m.width()/10,0 );
    p.scale( scale, scale );
    drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
    p.end();
    repaint();
 #endif  
 }
 void AddresseeCardView::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KAB_EMBEDDED
-  if (QTextDrag::canDecode(e))
+  if (Q3TextDrag::canDecode(e))
    e->accept();
 #else //KAB_EMBEDDED
 qDebug("AddresseeCardView::dragEnterEvent drag&drop is not implemented");
 #endif //KAB_EMBEDDED
 }
 void AddresseeCardView::dropEvent(QDropEvent *e)
 {
  emit addresseeDropped(e);
 }
 void AddresseeCardView::startDrag()
 {
  emit startAddresseeDrag();
 }
 ///////////////////////////////
 // KAddressBookCardView
 KAddressBookCardView::KAddressBookCardView( KABC::AddressBook *ab,
                                            QWidget *parent, const char *name )
    : KAddressBookView( ab, parent, name )
 {
    mShowEmptyFields = false;
    // Init the GUI
-    QVBoxLayout *layout = new QVBoxLayout(viewWidget());
+    Q3VBoxLayout *layout = new Q3VBoxLayout(viewWidget());
    mCardView = new AddresseeCardView(viewWidget(), "mCardView");
    mCardView->setSelectionMode(CardView::Extended);
    layout->addWidget(mCardView);
    // Connect up the signals
    connect(mCardView, SIGNAL(executed(CardViewItem *)),
            this, SLOT(addresseeExecuted(CardViewItem *)));
    connect(mCardView, SIGNAL(selectionChanged()),
            this, SLOT(addresseeSelected()));
    connect(mCardView, SIGNAL(addresseeDropped(QDropEvent*)),
            this, SIGNAL(dropped(QDropEvent*)));
    connect(mCardView, SIGNAL(startAddresseeDrag()),
            this, SIGNAL(startDrag()));
    connect(this, SIGNAL(printView()),
            mCardView , SLOT(printMe()));
 }
 KAddressBookCardView::~KAddressBookCardView()
 {
 }
 void KAddressBookCardView::setFocusAV()
 {
    if ( mCardView )
        mCardView->setFocus();
 }
 void KAddressBookCardView::scrollUP()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mCardView, ev ); 
    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
@@ -491,35 +496,35 @@ void KAddressBookCardView::addresseeExecuted(CardViewItem *item)
      emit executed(aItem->addressee().uid());
    }
 }
 void KAddressBookCardView::addresseeSelected()
 {
    CardViewItem *item;
    AddresseeCardViewItem *aItem;
    bool found = false;
    for (item = mCardView->firstItem(); item && !found;
         item = item->nextItem())
    {
        if (item->isSelected())
        {
 #ifndef KAB_EMBEDDED
            aItem = dynamic_cast<AddresseeCardViewItem*>(item);
 #else //KAB_EMBEDDED
            aItem = (AddresseeCardViewItem*)(item);
 #endif //KAB_EMBEDDED
            if ( aItem )
            {
                emit selected(aItem->addressee().uid());
                found = true;
            }
        }
    }
    if (!found)
        emit selected(QString::null);
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "kaddressbookcardview.moc"
+#include "moc_kaddressbookcardview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h
index 2a71f7e..8f8e48b 100644
--- a/kaddressbook/views/kaddressbookcardview.h
+++ b/kaddressbook/views/kaddressbookcardview.h
@@ -1,59 +1,62 @@
 #ifndef KADDRESSBOOKCARDVIEW_H
 #define KADDRESSBOOKCARDVIEW_H
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #include <qstring.h>
+//Added by qt3to4:
+#include <QDragEnterEvent>
+#include <QDropEvent>
 #ifndef KAB_EMBEDDED
 #include <kiconview.h>
 #else //KAB_EMBEDDED
 #include <klocale.h>
 #endif //KAB_EMBEDDED
 #include "cardview.h"
 #include "kaddressbookview.h"
 #include "configurecardviewdialog.h"
 class QDragEnterEvent;
 class QDragEntryEvent;
 class QDropEvent;
 class KConfig;
 class AddresseeCardView;
 /**
  This view uses the CardView class to create a card view. At some
  point in the future I think this will be the default view of
  KAddressBook.
 */
 class KAddressBookCardView : public KAddressBookView
 {
  Q_OBJECT
    
  public:
    KAddressBookCardView( KABC::AddressBook *ab, QWidget *parent,
                          const char *name = 0 );
    virtual ~KAddressBookCardView();
    void doSearch( const QString&  s,KABC::Field *field  );
    virtual QStringList selectedUids();
    virtual QString type() const { return "Card"; }
diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp
index d6ddec3..3a41a4b 100644
--- a/kaddressbook/views/kaddressbookiconview.cpp
+++ b/kaddressbook/views/kaddressbookiconview.cpp
@@ -1,165 +1,173 @@
 /*
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef KAB_EMBEDDED
-#include <qiconview.h>
+#include <q3iconview.h>
 #include <qstringlist.h>
 #include <kabc/addressee.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #else //KAB_EMBEDDED
 #endif //KAB_EMBEDDED
+//Added by qt3to4:
+#include <QDropEvent>
+#include <Q3ValueList>
+#include <QPixmap>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
 #include <kabc/addressbook.h>
 #include "kabprefs.h"
 #include "viewmanager.h"
 #include "kaddressbookiconview.h"
 #include <qlayout.h>
 #include <qregexp.h>
 #include <qapplication.h>
 #include <kglobal.h>
 /*US transfered to the headerfile
 class IconViewFactory : public ViewFactory
 {
  public:
    KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
    {
      return new KAddressBookIconView( ab, parent, name );
    }
    QString type() const { return "Icon"; }
    
    QString description() const { return i18n( "Icons represent contacts. Very simple view." ); }
 };
 */
 extern "C" {
  void *init_libkaddrbk_iconview()
  {
    return ( new IconViewFactory );
  }
 }
 ////////////////////////////////
 // AddresseeIconView (internal class)
 #ifndef KAB_EMBEDDED
 AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
  : KIconView(parent, name)
 #else //KAB_EMBEDDED
 AddresseeIconView::AddresseeIconView(QWidget *parent, const char *name)
-  : QIconView(parent, name)
+  : Q3IconView(parent, name)
 #endif //KAB_EMBEDDED
 {
-  setSelectionMode( QIconView::Extended );
+  setSelectionMode( Q3IconView::Extended );
-  setResizeMode( QIconView::Adjust );
+  setResizeMode( Q3IconView::Adjust );
  setWordWrapIconText( true );
  setGridX( 100 );
  setItemsMovable(false);
  setSorting(true, true);
  
 //US ???  setMode( KIconView::Select );
  
 #ifndef KAB_EMBEDDED
-  connect(this, SIGNAL(dropped(QDropEvent*, const QValueList<QIconDragItem>&)),
+  connect(this, SIGNAL(dropped(QDropEvent*, const Q3ValueList<Q3IconDragItem>&)),
-          this, SLOT(itemDropped(QDropEvent*, const QValueList<QIconDragItem>&)));
+          this, SLOT(itemDropped(QDropEvent*, const Q3ValueList<Q3IconDragItem>&)));
 #endif //KAB_EMBEDDED
 }
 AddresseeIconView::~AddresseeIconView()
 {
 }
 void AddresseeIconView::itemDropped(QDropEvent *e, 
-                                    const QValueList<QIconDragItem> &)
+                                    const Q3ValueList<Q3IconDragItem> &)
 {
  emit addresseeDropped(e);
 }
-QDragObject *AddresseeIconView::dragObject()
+Q3DragObject *AddresseeIconView::dragObject()
 {
  emit startAddresseeDrag();
  
  // We never want IconView to start the drag
  return 0;
 }
 ////////////////////////////////
 // AddresseeIconViewItem  (internal class)
 #ifndef KAB_EMBEDDED
 class AddresseeIconViewItem : public KIconViewItem
 #else //KAB_EMBEDDED
-class AddresseeIconViewItem : public QIconViewItem
+class AddresseeIconViewItem : public Q3IconViewItem
 #endif //KAB_EMBEDDED
 {
  public:
 #ifndef KAB_EMBEDDED
    AddresseeIconViewItem(const KABC::Field::List &fields,
                          KABC::AddressBook *doc, const KABC::Addressee &a, 
-                          QIconView *parent)
+                          Q3IconView *parent)
      : KIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #else //KAB_EMBEDDED
    AddresseeIconViewItem(const KABC::Field::List &fields,
                          KABC::AddressBook *doc, const KABC::Addressee &a,
-                          QIconView *parent)
+                          Q3IconView *parent)
-      : QIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
+      : Q3IconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
 #endif //KAB_EMBEDDED
      {
          if ( mFields.isEmpty() ) {
            mFields = KABC::Field::defaultFields();
          }
          refresh();
      }
      
    const KABC::Addressee &addressee() const { return mAddressee; }
    
    void refresh()
    {
        // Update our addressee, since it may have changed elsewhere
        mAddressee = mDocument->findByUid(mAddressee.uid());
        
        if (!mAddressee.isEmpty())
          setText( mAddressee.givenName() + " " + mAddressee.familyName() );
        QPixmap icon;
      
        KABC::Picture pic = mAddressee.photo();
        if ( pic.data().isNull() )
          pic = mAddressee.logo();
        if ( pic.isIntern() && !pic.data().isNull() ) {
          QImage img = pic.data();
 #ifndef KAB_EMBEDDED
        if ( img.width() > img.height() )
          icon = img.scaleWidth( 32 );
        else
          icon = img.scaleHeight( 32 );
 #else //KAB_EMBEDDED
@@ -171,126 +179,126 @@ class AddresseeIconViewItem : public QIconViewItem
            if ( wid > hei ) {
                hei = (hei*max)/wid;
                wid = max;
            } else {
                wid = (wid*max)/hei;
                hei = max;
            }
        }
        qDebug("AddresseeIconViewItem::refresh - scale here dependend of the displaysize and the right factor");
        icon.convertFromImage(img.smoothScale(wid, hei));
 #endif //KAB_EMBEDDED
          
        } else {
            icon = KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop, 128 );
        }
      setPixmap( icon );
    }
    
  private:
    KABC::Field::List mFields;
    KABC::AddressBook *mDocument;
    KABC::Addressee mAddressee;
 };
 ///////////////////////////////
 // KAddressBookView
 KAddressBookIconView::KAddressBookIconView( KABC::AddressBook *ab,
                                            QWidget *parent, const char *name)
    : KAddressBookView( ab, parent, name )
 {
    // Init the GUI
-    QVBoxLayout *layout = new QVBoxLayout(viewWidget());
+    Q3VBoxLayout *layout = new Q3VBoxLayout(viewWidget());
    
    mIconView = new AddresseeIconView(viewWidget(), "mIconView");
    layout->addWidget(mIconView);
    
    // Connect up the signals
    
 //US method executed is part of KIconView
 //US    connect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US            this, SLOT(addresseeExecuted(QIconViewItem *)));
-    connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
+    connect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
-            this, SLOT(addresseeExecuted(QIconViewItem *)));
+            this, SLOT(addresseeExecuted(Q3IconViewItem *)));
    
    connect(mIconView, SIGNAL(selectionChanged()),
            this, SLOT(addresseeSelected()));
    connect(mIconView, SIGNAL(addresseeDropped(QDropEvent*)),
            this, SIGNAL(dropped(QDropEvent*)));
    connect(mIconView, SIGNAL(startAddresseeDrag()),
            this, SIGNAL(startDrag()));
 }
 KAddressBookIconView::~KAddressBookIconView()
 {
 }
 void KAddressBookIconView::setFocusAV()
 {
    if ( mIconView )
        mIconView->setFocus();
 }
 void KAddressBookIconView::scrollUP()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mIconView, ev ); 
 }
 void KAddressBookIconView::scrollDOWN()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
    QApplication::postEvent( mIconView, ev );
 }
 void KAddressBookIconView::readConfig(KConfig *config)
 {
  KAddressBookView::readConfig(config);
    
 //US method executed is part of KIconView
 //US  disconnect(mIconView, SIGNAL(executed(QIconViewItem *)),
 //US             this, SLOT(addresseeExecuted(QIconViewItem *)));
-  disconnect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
+  disconnect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
-             this, SLOT(addresseeExecuted(QIconViewItem *)));
+             this, SLOT(addresseeExecuted(Q3IconViewItem *)));
 //US method executed is part of KIconView. Use selectionChanged instead
 /*US
  if (KABPrefs::instance()->mHonorSingleClick)
    connect(mIconView, SIGNAL(executed(QIconViewItem *)),
            this, SLOT(addresseeExecuted(QIconViewItem *)));
  else
    connect(mIconView, SIGNAL(doubleClicked(QIconViewItem *)),
            this, SLOT(addresseeExecuted(QIconViewItem *)));
 */
-    connect(mIconView, SIGNAL(selectionChanged(QIconViewItem *)),
+    connect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
-            this, SLOT(addresseeExecuted(QIconViewItem *)));
+            this, SLOT(addresseeExecuted(Q3IconViewItem *)));
            
 }
 void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
 {
    mIconView->clear();
    mIconList.clear();
    if ( s.isEmpty() || s == "*" ) {
        refresh();
        return;
    }  
    QRegExp re = getRegExp( s );
    if (!re.isValid())
        return; 
    KABC::Addressee::List addresseeList = addressees();
    KABC::Addressee::List::Iterator it;  
    if (  field ) {
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
 #if QT_VERSION >= 0x030000
            if (re.search(field->value( *it ).lower()) == 0)
 #else
                if (re.match(field->value( *it ).lower()) == 0)
 #endif
                    mIconList.append(new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                 
        }
    } else {
        KABC::Field::List fieldList = allFields();
        KABC::Field::List::ConstIterator fieldIt;
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
@@ -307,175 +315,175 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
                            mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                            match = true;
                            break;
                        }
            } 
            if ( ! match ) {
                if ( (*it).matchPhoneNumber( &re ) ) { 
                    mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                    match = true;
                    break;
                }
            }
            if ( ! match ) {
                if ( (*it).matchAddress( &re ) ) { 
                    mIconList.append( new AddresseeIconViewItem( fields(), addressBook(), *it, mIconView ));
                    match = true;
                    break;
                }
            }
        }
    }
    mIconView->arrangeItemsInGrid( true ); 
    if ( mIconView->firstItem() ) {
        mIconView->setCurrentItem ( mIconView->firstItem() );
        mIconView->setSelected ( mIconView->firstItem() , true );
    }
    else
        emit selected(QString::null);
 }
 QStringList KAddressBookIconView::selectedUids()
 {
    QStringList uidList;
-    QIconViewItem *item;
+    Q3IconViewItem *item;
    AddresseeIconViewItem *aItem;
    
    for (item = mIconView->firstItem(); item; item = item->nextItem())
    {
        if (item->isSelected())
        {
 #ifndef KAB_EMBEDDED
            aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
            aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
            if (aItem)
                uidList << aItem->addressee().uid();
        }
    }
    
    return uidList;
 }
    
 void KAddressBookIconView::refresh(QString uid)
 {
-  QIconViewItem *item;
+  Q3IconViewItem *item;
  AddresseeIconViewItem *aItem;
    
  if ( uid.isNull() ) {
    // Rebuild the view
    mIconView->clear();
    mIconList.clear();
        
    KABC::Addressee::List addresseeList = addressees();
    KABC::Addressee::List::Iterator iter;
    for ( iter = addresseeList.begin(); iter != addresseeList.end(); ++iter ) {
        if ( (*iter).uid().left(2) == "la" && (*iter).uid().left(19) == QString("last-syncAddressee-") )
                continue;
        aItem = new AddresseeIconViewItem( fields(), addressBook(), *iter, mIconView );
    }
    mIconView->arrangeItemsInGrid( true );
    for ( item = mIconView->firstItem(); item; item = item->nextItem() )
        {
 #ifndef KAB_EMBEDDED
          AddresseeIconViewItem* aivi = dynamic_cast<AddresseeIconViewItem*>( item );
 #else //KAB_EMBEDDED
          AddresseeIconViewItem* aivi = (AddresseeIconViewItem*)( item );
 #endif //KAB_EMBEDDED
      mIconList.append( aivi );
        }
  } else {
    // Try to find the one to refresh
    for ( item = mIconView->firstItem(); item; item = item->nextItem() ) {
 #ifndef KAB_EMBEDDED
      aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
      aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
      if ((aItem) && (aItem->addressee().uid() == uid)) {
        aItem->refresh();
        mIconView->arrangeItemsInGrid( true );
        return;
      }
    }
    refresh( QString::null );
  }
 }
 void KAddressBookIconView::setSelected(QString uid, bool selected)
 {
-    QIconViewItem *item;
+    Q3IconViewItem *item;
    AddresseeIconViewItem *aItem;
    
    if (uid.isNull())
    {
        mIconView->selectAll(selected);
    }
    else
    {
        bool found = false;
        for (item = mIconView->firstItem(); item && !found; 
             item = item->nextItem())
         {
 #ifndef KAB_EMBEDDED
             aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
             aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
             if ((aItem) && (aItem->addressee().uid() == uid))
             {
                 mIconView->setSelected(aItem, selected);
                 mIconView->ensureItemVisible( aItem );
                 found = true;
             }
         }
    }
 }
   
-void KAddressBookIconView::addresseeExecuted(QIconViewItem *item)
+void KAddressBookIconView::addresseeExecuted(Q3IconViewItem *item)
 {
 #ifndef KAB_EMBEDDED
    AddresseeIconViewItem *aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
    AddresseeIconViewItem *aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
    if (aItem) {
        emit executed(aItem->addressee().uid());
    }
 }
 void KAddressBookIconView::addresseeSelected()
 {
-    QIconViewItem *item;
+    Q3IconViewItem *item;
    AddresseeIconViewItem *aItem;
    
    bool found = false;
    for (item = mIconView->firstItem(); item && !found; 
         item = item->nextItem())
    {
      if (item->isSelected())
      {
 #ifndef KAB_EMBEDDED
        aItem = dynamic_cast<AddresseeIconViewItem*>(item);
 #else //KAB_EMBEDDED
        aItem = (AddresseeIconViewItem*)(item);
 #endif //KAB_EMBEDDED
        if (aItem)
        {
          emit selected(aItem->addressee().uid());
          found = true;
        }
      }
    }
    
    if (!found)
        emit selected(QString::null);
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "kaddressbookiconview.moc"
+#include "moc_kaddressbookiconview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h
index b0b9fea..6fad4c6 100644
--- a/kaddressbook/views/kaddressbookiconview.h
+++ b/kaddressbook/views/kaddressbookiconview.h
@@ -1,134 +1,137 @@
 /*                                                                      
    This file is part of KAddressBook.                                  
    Copyright (c) 2002 Mike Pilone <mpilone@slac.com>                   
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef KADDRESSBOOKICONVIEW_H
 #define KADDRESSBOOKICONVIEW_H
 #include <qstring.h>
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <QDropEvent>
 #ifndef KAB_EMBEDDED
 #include <kiconview.h>
 #else //KAB_EMBEDDED
-#include <qiconview.h>
+#include <q3iconview.h>
-#include <qptrlist.h>
+#include <q3ptrlist.h>
 #include <klocale.h>
 #endif //KAB_EMBEDDED
 #include "kaddressbookview.h"
-class QIconViewItem;
+class Q3IconViewItem;
 class KConfig;
 class AddresseeIconView;
 class AddresseeIconViewItem;
-class QIconDragItem;
+class Q3IconDragItem;
 class KAddressBookIconView;
 namespace KABC { class AddressBook; }
 /** This is an example kaddressbook view that is implemented using
 * KIconView. This view is not the most useful view, but it displays
 * how simple implementing a new view can be.
 */
 class KAddressBookIconView : public KAddressBookView
 {
  Q_OBJECT
    
  public:
    KAddressBookIconView( KABC::AddressBook *ab, QWidget *parent,
                          const char *name = 0 );
    virtual ~KAddressBookIconView();
    
    virtual QStringList selectedUids();
    virtual QString type() const { return "Icon"; }
    void doSearch( const QString&  s ,KABC::Field *field );
    
    virtual void readConfig(KConfig *config);
    virtual void scrollUP();
    virtual void scrollDOWN();
    virtual void setFocusAV();
    
  public slots:
    void refresh(QString uid = QString::null);
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
    void setSelected(QString uid = QString::null, bool selected = true);
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
 //US my MOC do not like default parameters ???
    void setSelected(QString uid, bool selected);
 #endif //KAB_EMBEDDED
  
  protected slots:
-    void addresseeExecuted(QIconViewItem *item);
+    void addresseeExecuted(Q3IconViewItem *item);
    void addresseeSelected();
  
  private:
    AddresseeIconView *mIconView;
-    QPtrList<AddresseeIconViewItem> mIconList;
+    Q3PtrList<AddresseeIconViewItem> mIconList;
 };
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class AddresseeIconView : public KIconView
-//MOC_SKIP_END
+#endif
 #else //KAB_EMBEDDED
-class AddresseeIconView : public QIconView
+class AddresseeIconView : public Q3IconView
 #endif //KAB_EMBEDDED
 {
  Q_OBJECT
  
  public:
    AddresseeIconView(QWidget *parent, const char *name);
    ~AddresseeIconView();
    
  signals:
    void addresseeDropped(QDropEvent *);
    void startAddresseeDrag();
  
  protected:
-    virtual QDragObject *dragObject();
+    virtual Q3DragObject *dragObject();
    
  protected slots:
-    void itemDropped(QDropEvent *, const QValueList<QIconDragItem> &);
+    void itemDropped(QDropEvent *, const Q3ValueList<Q3IconDragItem> &);
 };
 class IconViewFactory : public ViewFactory
 {
  public:
    KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
    {
      return new KAddressBookIconView( ab, parent, name );
    }
    QString type() const { return "Icon"; }
    QString description() const { return i18n( "Icons represent contacts. Very simple view." ); }
 };
 /*
 extern "C" {
  void *init_libkaddrbk_iconview()
  {
    return ( new IconViewFactory );
  }
 }
 */
 #endif
diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 272f2eb..7efaaa9 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -1,162 +1,166 @@
 // $Id$
-#include <qvbox.h>
+#include <q3vbox.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qwidget.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qcombobox.h>
 #include <qapplication.h>
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qevent.h>
-#include <qurl.h>
+#include <q3url.h>
 #include <qpixmap.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 #include <kabc/addressbook.h>
 #include <kapplication.h>
 #include <kconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 //US#include "configuretableviewdialog.h"
 #include "contactlistview.h"
 #include "kabprefs.h"
 #include "undocmds.h"
 #include "viewmanager.h"
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qregexp.h>
 #include "kaddressbooktableview.h"
 KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
                                              QWidget *parent, const char *name )
  : KAddressBookView( ab, parent, name )
 {
-  mainLayout = new QVBoxLayout( viewWidget(), 2 );
+  mainLayout = new Q3VBoxLayout( viewWidget(), 2 );
  // The list view will be created when the config is read.
  mListView = 0;
 }
 KAddressBookTableView::~KAddressBookTableView()
 {
 }
 void KAddressBookTableView::setFocusAV()
 {
    if ( mListView )
        mListView->setFocus();
 }
 void KAddressBookTableView::scrollUP()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mListView, ev );  
    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Up, 0,0 );
    QApplication::postEvent( mListView, ev ); 
 }
 void KAddressBookTableView::scrollDOWN()
 {
    QKeyEvent * ev = new QKeyEvent ( QEvent::KeyPress, Qt::Key_Down, 0,0 );
    QApplication::postEvent( mListView, ev );
    ev = new QKeyEvent ( QEvent::KeyRelease, Qt::Key_Down, 0,0 );
    QApplication::postEvent( mListView, ev ); 
 }
 void KAddressBookTableView::reconstructListView()
 {
    if (mListView)
    {
        disconnect(mListView, SIGNAL(selectionChanged()),
                   this, SLOT(addresseeSelected()));
-        disconnect(mListView, SIGNAL(executed(QListViewItem*)),
+        disconnect(mListView, SIGNAL(executed(Q3ListViewItem*)),
-                   this, SLOT(addresseeExecuted(QListViewItem*)));
+                   this, SLOT(addresseeExecuted(Q3ListViewItem*)));
-        disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
+        disconnect(mListView, SIGNAL(doubleClicked(Q3ListViewItem*)),
-                   this, SLOT(addresseeExecuted(QListViewItem*)));
+                   this, SLOT(addresseeExecuted(Q3ListViewItem*)));
        disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
                   SIGNAL(startDrag()));
-        disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
+        disconnect(mListView, SIGNAL(returnPressed(Q3ListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
        disconnect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
                   SIGNAL(dropped(QDropEvent*)));
        delete mListView;
    }
  mListView = new ContactListView( this, addressBook(), viewWidget() );
  
    connect(this, SIGNAL(printView()),
            mListView , SLOT(printMe()));
  //US set singleClick manually, because it is no global configparameter in embedded space 
  mListView->setSingleClick(KABPrefs::instance()->mHonorSingleClick);
  // Add the columns
  KABC::Field::List fieldList = fields();
  KABC::Field::List::ConstIterator it;
  int c = 0;
  for( it = fieldList.begin(); it != fieldList.end(); ++it ) {
      mListView->addColumn( (*it)->label() );
-      mListView->setColumnWidthMode(c++, QListView::Manual);
+      mListView->setColumnWidthMode(c++, Q3ListView::Manual);
 //US
      //  qDebug("KAddressBookTableView::reconstructListView: field %s", (*it)->label().latin1());
  }
  connect(mListView, SIGNAL(selectionChanged()),
          this, SLOT(addresseeSelected()));
  connect(mListView, SIGNAL(startAddresseeDrag()), this,
          SIGNAL(startDrag()));
  connect(mListView, SIGNAL(addresseeDropped(QDropEvent*)), this,
          SIGNAL(dropped(QDropEvent*)));
  if (KABPrefs::instance()->mHonorSingleClick) {
    //    qDebug("KAddressBookTableView::reconstructListView single");
-    connect(mListView, SIGNAL(executed(QListViewItem*)),
+    connect(mListView, SIGNAL(executed(Q3ListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
  } else {
    //    qDebug("KAddressBookTableView::reconstructListView double");
-    connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
+    connect(mListView, SIGNAL(doubleClicked(Q3ListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
  }
-    connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
+    connect(mListView, SIGNAL(returnPressed(Q3ListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
    connect(mListView, SIGNAL(signalDelete()),
          this, SLOT(addresseeDeleted()));
 //US performceimprovement. Refresh is done from the outside
 //US refresh();
  mListView->setSorting( 0, true );
  mainLayout->addWidget( mListView );
  mainLayout->activate();
  mListView->show();
 }
 void KAddressBookTableView::doSearch( const QString&  s, KABC::Field *field  )
 {
    mListView->clear();
    if ( s.isEmpty() || s == "*" ) {
        refresh();
        return;
    }  
    QRegExp re = getRegExp( s );
    if (!re.isValid())
        return; 
    KABC::Addressee::List addresseeList = addressees();
    KABC::Addressee::List::Iterator it; 
    if (  field ) {
        for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) { 
            if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
                continue;
 #if QT_VERSION >= 0x030000
            if (re.search(field->value( *it ).lower()) == 0)
 #else
                if (re.match(field->value( *it ).lower()) == 0)
@@ -315,178 +319,178 @@ void KAddressBookTableView::refresh(QString uid)
        nextUID = nextItem->addressee().uid();
      currentUID = currentItem->addressee().uid();
    }
    mListView->clear();
    currentItem = 0;
    KABC::Addressee::List addresseeList = addressees();
    KABC::Addressee::List::Iterator it;
    for (it = addresseeList.begin(); it != addresseeList.end(); ++it ) {
        if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
            continue;
      ContactListViewItem *item = new ContactListViewItem(*it, mListView, addressBook(), fields());
      if ( (*it).uid() == currentUID )
        currentItem = item;
      else if ( (*it).uid() == nextUID && !currentItem )
        currentItem = item;
    }
    // Sometimes the background pixmap gets messed up when we add lots
    // of items.
    mListView->repaint();
    if ( !currentItem ) 
        currentItem =  (ContactListViewItem *)mListView->firstChild();
    if ( currentItem ) {
      mListView->setCurrentItem( currentItem );
      mListView->ensureItemVisible( currentItem );
      mListView->setSelected( currentItem, true );
    }
  } else {
    // Only need to update on entry. Iterate through and try to find it
    ContactListViewItem *ceItem;
-    QListViewItemIterator it( mListView );
+    Q3ListViewItemIterator it( mListView );
    while ( it.current() ) {
 #ifndef KAB_EMBEDDED
      ceItem = dynamic_cast<ContactListViewItem*>( it.current() );
 #else //KAB_EMBEDDED
      ceItem = (ContactListViewItem*)( it.current() );
 #endif //KAB_EMBEDDED
      if ( ceItem && ceItem->addressee().uid() == uid ) {
        ceItem->refresh();
        return;
      }
      ++it;
    }
    refresh( QString::null );
  }
 }
 QStringList KAddressBookTableView::selectedUids()
 {
    QStringList uidList;
-    QListViewItem *item;
+    Q3ListViewItem *item;
    ContactListViewItem *ceItem;
    for(item = mListView->firstChild(); item; item = item->itemBelow())
    {
        if (mListView->isSelected( item ))
        {
 #ifndef KAB_EMBEDDED
            ceItem = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
            ceItem = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
            if (ceItem != 0L)
                uidList << ceItem->addressee().uid();
        }
    }
    if ( uidList.count() == 0 )
        if ( mListView->currentItem() ) {
            ceItem = (ContactListViewItem*)(mListView->currentItem()) ;
            uidList << ceItem->addressee().uid();
        }
    return uidList;
 }
 void KAddressBookTableView::setSelected(QString uid, bool selected)
 {
-    QListViewItem *item;
+    Q3ListViewItem *item;
    ContactListViewItem *ceItem;
    if (uid.isNull())
    {
        mListView->selectAll(selected);
    }
    else
    {
        for(item = mListView->firstChild(); item; item = item->itemBelow())
        {
 #ifndef KAB_EMBEDDED
            ceItem = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
            ceItem = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
            if ((ceItem != 0L) && (ceItem->addressee().uid() == uid))
            {
                mListView->setSelected(item, selected);
                if (selected)
                    mListView->ensureItemVisible(item);
            }
        }
    }
 }
 void KAddressBookTableView::addresseeSelected()
 {
    // We need to try to find the first selected item. This might not be the
    // last selected item, but when QListView is in multiselection mode,
    // there is no way to figure out which one was
    // selected last.
-    QListViewItem *item;
+    Q3ListViewItem *item;
    bool found =false;
    for (item = mListView->firstChild(); item && !found;
         item = item->nextSibling())
    {
        if (item->isSelected())
        {
            found = true;
 #ifndef KAB_EMBEDDED
            ContactListViewItem *ceItem
                 = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
            ContactListViewItem *ceItem
                 = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
            if ( ceItem ) emit selected(ceItem->addressee().uid());
        }
    }
    if (!found)
        emit selected(QString::null);
 }
-void KAddressBookTableView::addresseeExecuted(QListViewItem *item)
+void KAddressBookTableView::addresseeExecuted(Q3ListViewItem *item)
 {
    if (item)
    {
 #ifndef KAB_EMBEDDED
        ContactListViewItem *ceItem
               = dynamic_cast<ContactListViewItem*>(item);
 #else //KAB_EMBEDDED
            ContactListViewItem *ceItem
                 = (ContactListViewItem*)(item);
 #endif //KAB_EMBEDDED
       if (ceItem)
       {
           emit executed(ceItem->addressee().uid());
       }
    }
    else
    {
        emit executed(QString::null);
    }
 }
 void KAddressBookTableView::addresseeDeleted()
 {
         emit deleteRequest();
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "kaddressbooktableview.moc"
+#include "moc_kaddressbooktableview.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h
index 38db7b4..c3cb038 100644
--- a/kaddressbook/views/kaddressbooktableview.h
+++ b/kaddressbook/views/kaddressbooktableview.h
@@ -1,117 +1,119 @@
 #ifndef KADDRESSBOOKTABLEVIEW_H
 #define KADDRESSBOOKTABLEVIEW_H
 #ifndef KAB_EMBEDDED
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <qwidget.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qstring.h>
 #include <qdialog.h>
-#include <qtabdialog.h>
+#include <q3tabdialog.h>
 #include <qstringlist.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 #include "undo.h"
 #else //KAB_EMBEDDED
 #include "views/configuretableviewdialog.h"
 #endif //KAB_EMBEDDED
 #include "klocale.h"
 #include "kaddressbookview.h"
+//Added by qt3to4:
+#include <Q3VBoxLayout>
-class QListViewItem;
+class Q3ListViewItem;
-class QListBox;
+class Q3ListBox;
-class QVBoxLayout;
+class Q3VBoxLayout;
 class KConfig;
 class ContactListViewItem;
 class ContactListView;
 namespace KABC { class AddressBook; }
 /**
 * This class is the table view for kaddressbook. This view is a KListView
 * with multiple columns for the selected fields.
 *
 * @short Table View
 * @author Don Sanders <dsanders@kde.org>
 * @version 0.1
 */
 class KAddressBookTableView : public KAddressBookView
 {
 friend class ContactListView;
  Q_OBJECT
  public:
    KAddressBookTableView( KABC::AddressBook *ab, QWidget *parent,
                           const char *name = 0 );
    virtual ~KAddressBookTableView();
    virtual void refresh(QString uid = QString::null);
    virtual QStringList selectedUids();
    virtual void setSelected(QString uid = QString::null, bool selected = false);
    virtual void readConfig(KConfig *config);
    virtual void writeConfig(KConfig *config);
    virtual QString type() const { return "Table"; }
    void doSearch( const QString&  s ,KABC::Field *field );
    virtual void scrollUP();
    virtual void scrollDOWN();
    virtual void setFocusAV();
  public slots:
    virtual void reconstructListView();
  protected slots:
    /** Called whenever the user selects an addressee in the list view.
    */
    void addresseeSelected();
    void addresseeDeleted();
    /** Called whenever the user executes an addressee. In terms of the
    * list view, this is probably a double click
    */
-    void addresseeExecuted(QListViewItem*);
+    void addresseeExecuted(Q3ListViewItem*);
  private:
-    QVBoxLayout *mainLayout;
+    Q3VBoxLayout *mainLayout;
    ContactListView *mListView;
 };
 class TableViewFactory : public ViewFactory
 {
  public:
    KAddressBookView *view( KABC::AddressBook *ab, QWidget *parent, const char *name )
    {
      return new KAddressBookTableView( ab, parent, name );
    }
    QString type() const { return "Table"; }
    QString description() const { return i18n( "A listing of contacts in a table. Each cell of "
                                  "the table holds a field of the contact." ); }
    ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, QWidget *parent,
                                          const char *name = 0 )
    {
      return new ConfigureTableViewWidget( ab, parent, name );
    }
 };
 /*US
 extern "C" {
  void *init_libkaddrbk_tableview()
  {
    return ( new TableViewFactory );
  }
 }
 */
diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp
index 7281003..ed5807f 100644
--- a/kaddressbook/xxport/csv_xxport.cpp
+++ b/kaddressbook/xxport/csv_xxport.cpp
@@ -1,65 +1,65 @@
 /*
    This file is part of KAddressbook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <qfile.h>
 #include <qregexp.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
 #include "csvimportdialog.h"
 #include "csv_xxport.h"
 #ifndef KAB_EMBEDDED
 class CSVXXPortFactory : public XXPortFactory
 {
  public:
    XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
    {
      return new CSVXXPort( ab, parent, name );
    }
 };
 #endif //KAB_EMBEDDED
 extern "C"
@@ -75,120 +75,118 @@ extern "C"
 }
 CSVXXPort::CSVXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
  : XXPortObject( ab, parent, name )
 {
  createImportAction( i18n( "Import CSV List..." ) );
  createExportAction( i18n( "Export CSV List..." ) );
 }
 bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString& )
 {
 #ifndef KAB_EMBEDDED
  KURL url = KFileDialog::getSaveURL( "addressbook.csv" );
  if ( url.isEmpty() )
      return true;
  if ( !url.isLocalFile() ) {
    KTempFile tmpFile;
    if ( tmpFile.status() != 0 ) {
      QString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" );
      KMessageBox::error( parentWidget(), txt.arg( url.url() )
                          .arg( strerror( tmpFile.status() ) ) );
      return false;
    }
    doExport( tmpFile.file(), list );
    tmpFile.close();
    return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() );
  } else {
    QFile file( url.path() );
-    if ( !file.open( IO_WriteOnly ) ) {
+    if ( !file.open( QIODevice::WriteOnly ) ) {
      QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
      KMessageBox::error( parentWidget(), txt.arg( url.path() ) );
      return false;
    }
    doExport( &file, list );
    file.close();
    return true;
  }
 #else //KAB_EMBEDDED
  QString fileName = KFileDialog::getSaveFileName( "addressbook.csv", i18n("Save file"), parentWidget() );
  if ( fileName.isEmpty() )
      return false;
  QFile file( fileName );
-  if ( !file.open( IO_WriteOnly ) ) {
+  if ( !file.open( QIODevice::WriteOnly ) ) {
    QString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" );
    KMessageBox::error( parentWidget(), txt.arg( fileName ) );
    return false;
  }
  doExport( &file, list );
  file.close();
  return true;
 #endif //KAB_EMBEDDED
 }
 KABC::AddresseeList CSVXXPort::importContacts( const QString& ) const
 {
  CSVImportDialog dlg( addressBook(), parentWidget() );
  if ( dlg.exec() )
    return dlg.contacts();
  else
    return KABC::AddresseeList();
 }
 void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
 {
-  QTextStream t( fp );
+  Q3TextStream t( fp );
  t.setCodec( QTextCodec::codecForName("utf8") );
  KABC::AddresseeList::ConstIterator iter;
  KABC::Field::List fields = addressBook()->fields();
  KABC::Field::List::Iterator fieldIter;
  bool first = true;
  // First output the column headings
  for ( fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) {
    if ( !first )
      t << ",";
    t << "\"" << (*fieldIter)->label() << "\"";
    first = false;
  }
  t << "\n";
  // Then all the addressee objects
  KABC::Addressee addr;
  for ( iter = list.begin(); iter != list.end(); ++iter ) {
    addr = *iter;
    first = true;
    for ( fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) {
      if ( !first )
        t << ",";
      t << "\"" << (*fieldIter)->value( addr ) << "\"";
      first = false;
    }
    t << "\n";
  }
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "csv_xxport.moc"
+#include "moc_csv_xxport.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp
index 862241e..7959cac 100644
--- a/kaddressbook/xxport/csvimportdialog.cpp
+++ b/kaddressbook/xxport/csvimportdialog.cpp
@@ -1,91 +1,95 @@
 /*
   This file is part of KAddressBook.
   Copyright (C) 2003 Tobias Koenig <tokoe@kde.org>
                 based on the code of KSpread's CSV Import Dialog 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
   License as published by the Free Software Foundation; either
   version 2 of the License, or (at your option) any later version.
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #ifdef DESKTOP_VERSION
 #include <qinputdialog.h>
 #else
 #include <qtcompat/qinputdialog.h>
 #endif
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
-#include <qtable.h>
+#include <q3table.h>
 #include <qlayout.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfile.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3ValueList>
+#include <Q3GridLayout>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kfiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #ifdef DESKTOP_VERSION
-#include "qtable.h"
+#include "q3table.h"
 #else
 #include "qcombotableitem.h"
 #endif
 #include "csvimportdialog.h"
 CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent,
                                  const char * name )
  : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 | 
                 User2, Ok, parent, name, true, true ),
    mAdjustRows( false ),
    mStartLine( 0 ),
    mTextQuote( '"' ),
    mDelimiter( "," ),
    mAddressBook( ab )
 {
  initGUI();
  mTypeMap.insert( i18n( "Undefined" ), Undefined );
  mTypeMap.insert( KABC::Addressee::formattedNameLabel(), FormattedName );
  mTypeMap.insert( KABC::Addressee::familyNameLabel(), FamilyName );
  mTypeMap.insert( KABC::Addressee::givenNameLabel(), GivenName );
  mTypeMap.insert( KABC::Addressee::additionalNameLabel(), AdditionalName );
  mTypeMap.insert( KABC::Addressee::prefixLabel(), Prefix );
  mTypeMap.insert( KABC::Addressee::suffixLabel(), Suffix );
  mTypeMap.insert( KABC::Addressee::nickNameLabel(), NickName );
  mTypeMap.insert( KABC::Addressee::birthdayLabel(), Birthday );
  mTypeMap.insert( KABC::Addressee::homeAddressStreetLabel(), HomeAddressStreet );
  mTypeMap.insert( KABC::Addressee::homeAddressLocalityLabel(), 
                   HomeAddressLocality );
  mTypeMap.insert( KABC::Addressee::homeAddressRegionLabel(), HomeAddressRegion );
  mTypeMap.insert( KABC::Addressee::homeAddressPostalCodeLabel(), 
@@ -132,133 +136,133 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent,
  for ( it = fields.begin(); it != fields.end(); ++it, ++count )
    mTypeMap.insert( (*it)->label(), count );
  connect( mDelimiterBox, SIGNAL( clicked( int ) ),
           this, SLOT( delimiterClicked( int ) ) );
  connect( mDelimiterEdit, SIGNAL( returnPressed() ),
           this, SLOT( returnPressed() ) );
  connect( mDelimiterEdit, SIGNAL( textChanged ( const QString& ) ),
           this, SLOT( textChanged ( const QString& ) ) );
  connect( mComboLine, SIGNAL( activated( const QString& ) ),
           this, SLOT( lineSelected( const QString& ) ) );
  connect( mComboCodec, SIGNAL( activated( const QString& ) ),
           this, SLOT( codecChanged( const QString& ) ) );
  connect( mComboQuote, SIGNAL( activated( const QString& ) ),
           this, SLOT( textquoteSelected( const QString& ) ) );
  connect( mIgnoreDuplicates, SIGNAL( stateChanged( int ) ),
           this, SLOT( ignoreDuplicatesChanged( int ) ) );
  connect( mUrlRequester, SIGNAL( returnPressed( const QString& ) ),
           this, SLOT( setFile( const QString& ) ) );
  connect( mUrlRequester, SIGNAL( urlSelected( const QString& ) ),
           this, SLOT( setFile( const QString& ) ) );
  connect( mUrlRequester->lineEdit(), SIGNAL( textChanged ( const QString& ) ),
           this, SLOT( urlChanged( const QString& ) ) );
  connect( this, SIGNAL( user1Clicked() ),
           this, SLOT( applyTemplate() ) );
 
  connect( this, SIGNAL( user2Clicked() ),
           this, SLOT( saveTemplate() ) );
  // if ( QApplication::desktop()->width() < 321 ) 
-      QIconSet  icon = SmallIcon("filesave");
+      QIcon  icon = SmallIcon("filesave");
     
    findButton( User2 )->setIconSet (icon ) ;
    icon = SmallIcon("fileopen");
    findButton( User1 )->setIconSet (icon ) ;
    int wid = findButton( User2 )->sizeHint().height();
    findButton( User2 )->setMaximumWidth( wid+4  );
    findButton( User1 )->setMaximumWidth( wid+4  );
 }
 CSVImportDialog::~CSVImportDialog()
 {
 }
 KABC::AddresseeList CSVImportDialog::contacts() const
 {
  KABC::AddresseeList contacts;
  for ( int row = 1; row < mTable->numRows(); ++row ) {
    KABC::Addressee a;
    bool emptyRow = true;
    KABC::Address addrHome( KABC::Address::Home );
    KABC::Address addrWork( KABC::Address::Work );
    for ( int col = 0; col < mTable->numCols(); ++col ) {
      
-      QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, col ) );
+      Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0, col ) );
      if ( !item ) {
        qDebug( "ERROR: item cast failed" );
        continue;
      }
      QString value = mTable->text( row, col );
      if ( !value.isEmpty() )
        emptyRow = false;
      switch ( posToType( item->currentItem() ) ) 
      {
        case Undefined:
          continue;
          break;
        case FormattedName:
          a.setFormattedName( value );
          break;
        case GivenName:
          a.setGivenName( value );
          break;
        case FamilyName:
          a.setFamilyName( value );
          break;
        case AdditionalName:
          a.setAdditionalName( value );
          break;
        case Prefix:
          a.setPrefix( value );
          break;
        case Suffix:
          a.setSuffix( value );
          break;
        case NickName:
          a.setNickName( value );
          break;
        case Birthday:
 //US
 //the generated code had the following format: 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));
          }
          break;
        case Email:
          if ( !value.isEmpty() )
            a.insertEmail( value, true );
          break;
        case Role:
          a.setRole( value );
          break;
        case Title:
          a.setTitle( value );
          break;
        case Mailer:
          a.setMailer( value );
          break;
        case URL:
          a.setUrl( value );
          break;
        case Organization:
          a.setOrganization( value );
          break;
        case Note:
            if ( a.note().isEmpty() )
                a.setNote( value );
            else {
                a.setNote( a.note()+"\n"+value );
            }
          break;
      case Categories:
          a.insertCategory( value );
          break;
        case HomePhone:
@@ -353,332 +357,332 @@ KABC::AddresseeList CSVImportDialog::contacts() const
          KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory );
          KABC::Field::List::Iterator it;
          int counter = 0;
          for ( it = fields.begin(); it != fields.end(); ++it ) {
            if ( counter == (int)( posToType( item->currentItem() ) - mCustomCounter ) ) 
            {
              (*it)->setValue( a, value );
              break;
            }
            ++counter;
          }
          break;
      }
    }
    if ( !addrHome.isEmpty() )
      a.insertAddress( addrHome );
    if ( !addrWork.isEmpty() )
      a.insertAddress( addrWork );
    if ( !emptyRow && !a.isEmpty() )
      contacts.append( a );
  }
  return contacts;
 }
 void CSVImportDialog::initGUI()
 {
  QWidget* page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 1, 1, marginHintSmall(), 
+  Q3GridLayout *layout = new Q3GridLayout( page, 1, 1, marginHintSmall(), 
                                         spacingHintSmall() );
-  QHBoxLayout *hbox = new QHBoxLayout();
+  Q3HBoxLayout *hbox = new Q3HBoxLayout();
  hbox->setSpacing( spacingHint() );
  
  QLabel *label = new QLabel( i18n( "File to import:" ), page );
  hbox->addWidget( label );
  mUrlRequester = new KURLRequester( page );
  mUrlRequester->setFilter( "*.csv" );
  hbox->addWidget( mUrlRequester );
  layout->addMultiCellLayout( hbox, 0, 0, 0, 2 );
  // Delimiter: comma, semicolon, tab, space, other
-  mDelimiterBox = new QButtonGroup( i18n( "Delimiter" ), page );
+  mDelimiterBox = new Q3ButtonGroup( i18n( "Delimiter" ), page );
  mDelimiterBox->setColumnLayout( 0, Qt::Vertical );
  mDelimiterBox->layout()->setSpacing( spacingHint() );
  mDelimiterBox->layout()->setMargin( marginHint() );
-  QGridLayout *delimiterLayout = new QGridLayout( mDelimiterBox->layout() );
+  Q3GridLayout *delimiterLayout = new Q3GridLayout( mDelimiterBox->layout() );
  delimiterLayout->setAlignment( Qt::AlignTop );
  layout->addMultiCellWidget( mDelimiterBox, 1, 1, 0, 2 );
  mRadioComma = new QRadioButton( i18n( "Comma" ), mDelimiterBox );
  mRadioComma->setChecked( true );
  delimiterLayout->addWidget( mRadioComma, 0, 0 );
  mRadioSemicolon = new QRadioButton( i18n( "Semicolon" ), mDelimiterBox );
  delimiterLayout->addWidget( mRadioSemicolon, 0, 1 );
  mRadioTab = new QRadioButton( i18n( "Tabulator" ), mDelimiterBox );
  delimiterLayout->addWidget( mRadioTab, 1, 0 );
  mRadioSpace = new QRadioButton( i18n( "Space" ), mDelimiterBox );
  delimiterLayout->addWidget( mRadioSpace, 1, 1 );
  mRadioOther = new QRadioButton( i18n( "Other" ), mDelimiterBox );
  delimiterLayout->addWidget( mRadioOther, 0, 2 );
  mDelimiterEdit = new QLineEdit( mDelimiterBox );
  delimiterLayout->addWidget( mDelimiterEdit, 1, 2 );
  mComboLine = new QComboBox( false, page );
  mComboLine->insertItem( i18n( "1" ) );
  layout->addWidget( mComboLine, 3, 1 );
  mComboQuote = new QComboBox( false, page );
  mComboQuote->insertItem( i18n( "\"" ), 0 );
  mComboQuote->insertItem( i18n( "'" ), 1 );
  mComboQuote->insertItem( i18n( "None" ), 2 );
  layout->addWidget( mComboQuote, 3, 0 );
  mComboCodec = new QComboBox( false, page );
  mComboCodec->insertItem( i18n( "UTF8" ), 0 );
  mComboCodec->insertItem( i18n( "LATIN1" ), 1 );
  mComboCodec->insertItem( i18n( "LOCALE" ), 2 );
  layout->addWidget( mComboCodec, 3, 2 );
  label = new QLabel( i18n( "Start at line:" ), page );
  layout->addWidget( label, 2, 1 );
  label = new QLabel( i18n( "Textquote:" ), page );
  layout->addWidget( label, 2, 0 );
  label = new QLabel( i18n( "Codec:" ), page );
  layout->addWidget( label, 2, 2 );
  mIgnoreDuplicates = new QCheckBox( page );
  mIgnoreDuplicates->setText( i18n( "Ignore duplicate delimiters" ) );
  layout->addMultiCellWidget( mIgnoreDuplicates, 4, 4, 0, 2 );
-  mTable = new QTable( 0, 0, page );
+  mTable = new Q3Table( 0, 0, page );
-  mTable->setSelectionMode( QTable::NoSelection );
+  mTable->setSelectionMode( Q3Table::NoSelection );
  //mTable->horizontalHeader()->hide();
  layout->addMultiCellWidget( mTable, 5, 5, 0, 2 );
 /*US
  setButtonText( User1, i18n( "Apply Template" ) );
  setButtonText( User2, i18n( "Save Template" ) );
 */  
  enableButtonOK( false );
  findButton( User1 )->setEnabled( false );
  findButton( User2 )->setEnabled( false );
 
 #ifdef DESKTOP_VERSION
  resize( 640, 480 );
 #else
  showMaximized();
 #endif
 }
 void CSVImportDialog::fillTable()
 {
  int row, column;
  bool lastCharDelimiter = false;
  bool ignoreDups = mIgnoreDuplicates->isChecked();
  enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD,
         S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START;
  QChar x;
  QString field = "";
  // store previous assignment
-  QValueList<int> mTypeOld = mTypeStore;
+  Q3ValueList<int> mTypeOld = mTypeStore;
  
  mTypeStore.clear();
  for ( column = 0; column < mTable->numCols(); ++column ) {
-    QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, column ) );
+    Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0, column ) );
    if ( !item || mClearTypeStore )
      mTypeStore.append( typeToPos( Undefined ) );
    else if ( item )
      mTypeStore.append( item->currentItem() );
  }
  clearTable();
  
  row = column = 1;
  if ( mComboCodec->currentItem () == 0 ) {
      mData = QString::fromUtf8( mFileArray.data() );
  } else  if ( mComboCodec->currentItem () == 1 ) {
      mData = QString::fromLatin1( mFileArray.data() );
  } else  {
      mData = QString::fromLocal8Bit( mFileArray.data() );
  } 
-  QTextStream inputStream( mData, IO_ReadOnly );
+  Q3TextStream inputStream( mData, QIODevice::ReadOnly );
  if ( mComboCodec->currentItem () == 0 ) {
-      inputStream.setEncoding( QTextStream::UnicodeUTF8 );
+      inputStream.setEncoding( Q3TextStream::UnicodeUTF8 );
  } else  if ( mComboCodec->currentItem () == 1 ) {
-      inputStream.setEncoding( QTextStream::Latin1 );
+      inputStream.setEncoding( Q3TextStream::Latin1 );
  } else  {
-      inputStream.setEncoding( QTextStream::Locale );
+      inputStream.setEncoding( Q3TextStream::Locale );
  } 
  int maxColumn = 0;
  while ( !inputStream.atEnd() ) {
    inputStream >> x; // read one char
    if ( x == '\r' ) inputStream >> x; // eat '\r', to handle DOS/LOSEDOWS files correctly
    switch ( state ) {
     case S_START :
      if ( x == mTextQuote ) {
        state = S_QUOTED_FIELD;
-      } else if ( x == mDelimiter ) {
+      } else if ( QString(x) == mDelimiter ) {
        if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) )
          ++column;
        lastCharDelimiter = true;
      } else if ( x == '\n' ) {
        ++row;
        column = 1;
      } else {
        field += x;
        state = S_MAYBE_NORMAL_FIELD;
      }
      break;
     case S_QUOTED_FIELD :
      if ( x == mTextQuote ) {
        state = S_MAYBE_END_OF_QUOTED_FIELD;
      } else if ( x == '\n' &&  mTextQuote.isNull() ) {
        setText( row - mStartLine + 1, column, field );
        field = "";
        if ( x == '\n' ) {
          ++row;
          column = 1;
        } else {
          if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) )
            ++column;
          lastCharDelimiter = true;
        }
        state = S_START;
      } else {
        field += x;
      }
      break;
     case S_MAYBE_END_OF_QUOTED_FIELD :
      if ( x == mTextQuote ) {
        field += x;
        state = S_QUOTED_FIELD;
-      } else if ( x == mDelimiter || x == '\n' ) {
+      } else if ( QString(x) == mDelimiter || x == '\n' ) {
        setText( row - mStartLine + 1, column, field );
        field = "";
        if ( x == '\n' ) {
          ++row;
          column = 1;
        } else {
          if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) )
            ++column;
          lastCharDelimiter = true;
        }
        state = S_START;
      } else {
        state = S_END_OF_QUOTED_FIELD;
      }
      break;
     case S_END_OF_QUOTED_FIELD :
-      if ( x == mDelimiter || x == '\n' ) {
+      if ( QString(x) == mDelimiter || x == '\n' ) {
        setText( row - mStartLine + 1, column, field );
        field = "";
        if ( x == '\n' ) {
          ++row;
          column = 1;
        } else {
          if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) )
            ++column;
          lastCharDelimiter = true;
        }
        state = S_START;
      } else {
        state = S_END_OF_QUOTED_FIELD;
      }
      break;
     case S_MAYBE_NORMAL_FIELD :
      if ( x == mTextQuote ) {
        field = "";
        state = S_QUOTED_FIELD;
        break;
      }
     case S_NORMAL_FIELD :
-      if ( x == mDelimiter || x == '\n' ) {
+      if ( QString(x) == mDelimiter || x == '\n' ) {
        setText( row - mStartLine + 1, column, field );
        field = "";
        if ( x == '\n' ) {
          ++row;
          column = 1;
        } else {
          if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) )
            ++column;
          lastCharDelimiter = true;
        }
        state = S_START;
      } else {
        field += x;
      }
    }
-    if ( x != mDelimiter )
+    if ( QString(x) != mDelimiter )
      lastCharDelimiter = false;
    if ( column > maxColumn )
      maxColumn = column;
  }
  // file with only one line without '\n'
  if ( field.length() > 0 ) {
    setText( row - mStartLine + 1, column, field );
    ++row;
    field = "";
  }
  adjustRows( row - mStartLine );
  mTable->setNumCols( maxColumn );
 //US begin
  QStringList keys;  
  uint iii = 0, count = mTypeMap.count();
  while ( iii < count ) {
      keys << "dummy";
      ++iii;
  }
  QMap<QString, uint>::ConstIterator it;
  for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it)
      keys[( it.data() )] =  it.key();
 //US end
  
  for ( column = 0; column < mTable->numCols(); ++column ) {
   
 //US    QComboTableItem *item = new QComboTableItem( mTable, mTypeMap.keys() );
-    QComboTableItem *item = new QComboTableItem( mTable, keys );
+    Q3ComboTableItem *item = new Q3ComboTableItem( mTable, keys );
    mTable->setItem( 0, column, item );
    if ( column < mTypeStore.count() )
      item->setCurrentItem( mTypeStore[ column ] );
    else
      item->setCurrentItem( typeToPos( Undefined ) );
    
    mTable->adjustColumn( column );
  }
 }
 void CSVImportDialog::clearTable()
 {
  for ( int row = 0; row < mTable->numRows(); ++row )
    for ( int column = 0; column < mTable->numCols(); ++column )
      mTable->clearCell( row, column );
 }
 void CSVImportDialog::fillComboBox()
 {
  mComboLine->clear();
  for ( int row = 1; row < mTable->numRows() + 1; ++row )
    mComboLine->insertItem( QString::number( row ), row - 1 );
 }
 void CSVImportDialog::setText( int row, int col, const QString& text )
 {
  if ( row < 1 ) // skipped by the user
    return;
  if ( mTable->numRows() < row ) {
    mTable->setNumRows( row + 5000 ); // We add 5000 at a time to limit recalculations
    mAdjustRows = true;
@@ -735,65 +739,65 @@ void CSVImportDialog::delimiterClicked( int id )
   case 3: // space
    mDelimiter = " ";
    break;
   case 1: // semicolon
    mDelimiter = ";";
    break;
  }
  fillTable();
 }
 void CSVImportDialog::textquoteSelected( const QString& mark )
 {
  if ( mComboQuote->currentItem() == 2 )
    mTextQuote = 0;
  else
    mTextQuote = mark[ 0 ];
  fillTable();
 }
 void CSVImportDialog::lineSelected( const QString& line )
 {
  mStartLine = line.toInt() - 1;
  fillTable();
 }
 void CSVImportDialog::slotOk()
 {
  bool assigned = false;
  for ( int column = 0; column < mTable->numCols(); ++column ) {
-    QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, 
+    Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0, 
                                                           column ) );
    if ( item && posToType( item->currentItem() ) != Undefined )
      assigned = true;
  }
    
  if ( assigned )
    KDialogBase::slotOk();
  else
    KMessageBox::sorry( this, i18n( "You have to assign at least one column." ) );
 }
 void CSVImportDialog::applyTemplate()
 {
  QMap<uint,int> columnMap;
  QMap<QString, QString> fileMap;
  QStringList templates;
  // load all template files
 /*US  QStringList list = KGlobal::dirs()->findAllResources( "data" , QString( kapp->name() ) +
      "/csv-templates/*.desktop", true, true );
 */      
  QStringList list = KGlobal::dirs()->findAllResources( "data" , KGlobal::getAppName() +
      "/csv-templates/*.desktop", true, true );
  for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
  {
    
 //US    KSimpleConfig config( *it, true );
    KConfig config( *it );
    if ( !config.hasGroup( "csv column map" ) )
            continue;
@@ -807,163 +811,163 @@ void CSVImportDialog::applyTemplate()
  bool ok = false;
  QString tmp;
  tmp = QInputDialog::getItem( i18n( "Template Selection" ),
                  i18n( "Please select a template\nthat matches the CSV file." ),
                  templates, 0, false, &ok, this );
  if ( !ok )
    return;
 //US  KSimpleConfig config( fileMap[ tmp ], true );
  KConfig config( fileMap[ tmp ] );
  config.setGroup( "General" );
 //US  uint numColumns = config.readUnsignedNumEntry( "Columns" );
  uint numColumns = (uint)config.readNumEntry( "Columns" );
  
  mDelimiterEdit->setText( config.readEntry( "DelimiterOther" ) );
  mDelimiterBox->setButton( config.readNumEntry( "DelimiterType" ) );
  delimiterClicked( config.readNumEntry( "DelimiterType" ) );
  int quoteType = config.readNumEntry( "QuoteType" );
  mComboQuote->setCurrentItem( quoteType );
  textquoteSelected( mComboQuote->currentText() );
  // create the column map
  config.setGroup( "csv column map" );
  for ( uint i = 0; i < numColumns; ++i ) {
    int col = config.readNumEntry( QString::number( i ) );
    columnMap.insert( i, col );
  }
  
  // apply the column map
  for ( uint column = 0; column < columnMap.count(); ++column ) {
    int type = columnMap[ column ];
-    QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0,
+    Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0,
                                                           column ) );
    if ( item )
      item->setCurrentItem( typeToPos( type ) );
  }
 }
 void CSVImportDialog::saveTemplate()
 {
 /*US
  QString fileName = KFileDialog::getSaveFileName(
                     locateLocal( "data", QString( kapp->name() ) + "/csv-templates/" ),
                     "*.desktop", this );
 */  
  QString fileName = KFileDialog::getSaveFileName(
                     locateLocal( "data", KGlobal::getAppName() + "/csv-templates/" )+
                     "*.desktop",i18n("Save file name") , this );
  if ( fileName.isEmpty() )
    return;
  if ( !fileName.contains( ".desktop" ) ) 
    fileName += ".desktop";
  QString name = QInputDialog::getText( i18n( "Template name" ), i18n( "Please enter a name for the template" ) );
  if ( name.isEmpty() )
    return;
  KConfig config( fileName );
  config.setGroup( "General" );
  config.writeEntry( "Columns", mTable->numCols() );
  config.writeEntry( "DelimiterType", mDelimiterBox->id( mDelimiterBox->selected() ) );
  config.writeEntry( "DelimiterOther", mDelimiterEdit->text() );
  config.writeEntry( "QuoteType", mComboQuote->currentItem() );
  config.setGroup( "Misc" );
  config.writeEntry( "Name", name );
  config.setGroup( "csv column map" );
  for ( uint column = 0; column < mTable->numCols(); ++column ) {
-    QComboTableItem *item = static_cast<QComboTableItem*>( mTable->item( 0, 
+    Q3ComboTableItem *item = static_cast<Q3ComboTableItem*>( mTable->item( 0, 
                                                           column ) );
    if ( item )
      config.writeEntry( QString::number( column ), posToType( 
                         item->currentItem() ) );
    else
      config.writeEntry( QString::number( column ), 0 );
  }
  config.sync();
 }
 QString CSVImportDialog::getText( int row, int col )
 {
  return mTable->text( row, col );
 }
 uint CSVImportDialog::posToType( int pos ) const
 {
    return pos;
 #if 0
  uint counter = 0;
  QMap<QString, uint>::ConstIterator it;
  for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it, ++counter )
    if ( counter == (uint)pos )
      return it.data();
  return 0;
 #endif
 }
 int CSVImportDialog::typeToPos( uint type ) const
 {
    return type;
 #if 0
  uint counter = 0;
  QMap<QString, uint>::ConstIterator it;
  for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it, ++counter )
    if ( it.data() == type )
      return counter;
  return -1;
 #endif
 }
 void CSVImportDialog::ignoreDuplicatesChanged( int )
 {
  fillTable();
 }
 void CSVImportDialog::setFile( const QString &fileName )
 {
  if ( fileName.isEmpty() )
    return;
  QFile file( fileName );
-  if ( !file.open( IO_ReadOnly ) ) {
+  if ( !file.open( QIODevice::ReadOnly ) ) {
    KMessageBox::sorry( this, i18n( "Cannot open input file!" ) );
    file.close();
    return;
  }
  mFileArray = file.readAll();
  file.close();
  mClearTypeStore = true;
  clearTable();
  mTable->setNumCols( 0 );
  mTable->setNumRows( 0 );
  fillTable();
  mClearTypeStore = false;
  fillComboBox();
 }
 void CSVImportDialog::urlChanged( const QString &file )
 {
  bool state = !file.isEmpty();
  enableButtonOK( state );
 
  findButton( User1 )->setEnabled( state );
  findButton( User2 )->setEnabled( state );
 
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include <csvimportdialog.moc>
+#include <moc_csvimportdialog.cpp>
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h
index 2661420..520f3fa 100644
--- a/kaddressbook/xxport/csvimportdialog.h
+++ b/kaddressbook/xxport/csvimportdialog.h
@@ -4,123 +4,123 @@
                 based on the code of KSpread's CSV Import Dialog 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Library General Public
   License as published by the Free Software Foundation; either
   version 2 of the License, or (at your option) any later version.
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   Library General Public License for more details.
   You should have received a copy of the GNU Library General Public License
   along with this library; see the file COPYING.LIB.  If not, write to
   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
   Boston, MA 02111-1307, USA.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef CSV_IMPORT_DLG_H
 #define CSV_IMPORT_DLG_H
 #include <kabc/addressbook.h>
 #include <kabc/addresseelist.h>
 #include <kdialogbase.h>
-#include <qvaluelist.h>
+#include <q3valuelist.h>
 class KURLRequester;
-class QButtonGroup;
+class Q3ButtonGroup;
 class QComboBox;
 class QCheckBox;
 class QLineEdit;
 class QPushButton;
 class QRadioButton;
-class QTable;
+class Q3Table;
 class CSVImportDialog : public KDialogBase
 {
  Q_OBJECT
  public:
    CSVImportDialog( KABC::AddressBook *ab, QWidget *parent,
                     const char *name = 0 );
    ~CSVImportDialog();
    KABC::AddresseeList contacts() const;
  protected slots:
    virtual void slotOk();
  private slots:
    void returnPressed();
    void delimiterClicked( int id );
    void lineSelected( const QString& line );
    void textquoteSelected( const QString& mark );
    void textChanged ( const QString & );
    void ignoreDuplicatesChanged( int );
    void setFile( const QString& );
    void urlChanged( const QString& );
    void codecChanged ( const QString& );
    void applyTemplate();
    void saveTemplate();
  private:
    enum { Undefined, FormattedName, FamilyName, GivenName, AdditionalName,
           Prefix, Suffix, NickName, Birthday,
           HomeAddressStreet, HomeAddressLocality, HomeAddressRegion, 
           HomeAddressPostalCode, HomeAddressCountry, HomeAddressLabel,
           BusinessAddressStreet, BusinessAddressLocality, BusinessAddressRegion,
           BusinessAddressPostalCode, BusinessAddressCountry, 
           BusinessAddressLabel,
           HomePhone, BusinessPhone, MobilePhone, HomeFax, BusinessFax, MobileWorkPhone,
           Isdn, Pager, Email, Mailer, Title, Role, Organization, Note, URL, Categories
         };
-    QTable* mTable;
+    Q3Table* mTable;
-    QButtonGroup* mDelimiterBox;
+    Q3ButtonGroup* mDelimiterBox;
    QRadioButton* mRadioComma;
    QRadioButton* mRadioSemicolon;
    QRadioButton* mRadioTab;
    QRadioButton* mRadioSpace;
    QRadioButton* mRadioOther;
    QLineEdit* mDelimiterEdit;
    QComboBox* mComboLine;
    QComboBox* mComboQuote;
    QComboBox* mComboCodec;
    QCheckBox* mIgnoreDuplicates;
    KURLRequester* mUrlRequester;
    void initGUI();
    void fillTable();
    void clearTable();
    void fillComboBox();
    void setText( int row, int col, const QString& text );
    void adjustRows( int rows );
    QString getText( int row, int col );
    uint posToType( int pos ) const;
    int typeToPos( uint type ) const;
    bool mAdjustRows;
    int mStartLine;
    QChar mTextQuote;
    QString mDelimiter;
    QString mData;
    QByteArray mFileArray;
    QMap<QString, uint> mTypeMap;
    KABC::AddressBook *mAddressBook;
    int mCustomCounter;
    bool mClearTypeStore;
-    QValueList<int> mTypeStore;
+    Q3ValueList<int> mTypeStore;
 };
 #endif
diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp
index 03efc1b..72d3fc2 100644
--- a/kaddressbook/xxport/kde2_xxport.cpp
+++ b/kaddressbook/xxport/kde2_xxport.cpp
@@ -87,35 +87,35 @@ KABC::AddresseeList KDE2XXPort::importContacts( const QString& ) const
    return KABC::AddresseeList();
  }
 #ifndef KAB_EMBEDDED
  int result = KMessageBox::questionYesNoCancel( parentWidget(),
      i18n( "Override previously imported entries?" ),
      i18n( "Import KDE 2 Addressbook" ) );
 #else //KAB_EMBEDDED
  int result = KMessageBox::warningYesNoCancel( parentWidget(),
      i18n( "Override previously imported entries?" ),
      i18n( "Import KDE 2 Addressbook" ) );
 #endif //KAB_EMBEDDED
  if ( !result ) return KABC::AddresseeList();
  KProcess proc;
  if ( result == KMessageBox::Yes ) {
    proc << "kab2kabc";
    proc << "--override";
  } else if ( result == KMessageBox::No )
    proc << "kab2kabc";
  else
    kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl;
  proc.start( KProcess::Block );
  addressBook()->load();
  return KABC::AddresseeList();
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "kde2_xxport.moc"
+#include "moc_kde2_xxport.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 9a8fa68..64b9071 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -1,65 +1,67 @@
 /*
  This file is part of KAddressbook.
  Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
  (at your option) any later version.
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  GNU General Public License for more details.
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  As a special exception, permission is given to link this program
  with any edition of Qt, and distribute the resulting executable,
  without including the source code for Qt in the source distribution.
 */
 /*
  Enhanced Version of the file for platform independent KDE tools.
  Copyright (c) 2004 Ulf Schenk
  $Id$
 */
 #include <qfile.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qfileinfo.h>
+//Added by qt3to4:
+#include <Q3CString>
 #include <kabc/vcardconverter.h>
 #include <kabc/vcardparser/vcardtool.h>
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
 #include "xxportmanager.h"
 #include "vcard_xxport.h"
 #ifndef KAB_EMBEDDED
 class VCardXXPortFactory : public XXPortFactory
 {
 public:
    XXPortObject *xxportObject( KABC::AddressBook *ab, QWidget *parent, const char *name )
    {
        return new VCardXXPort( ab, parent, name );
    }
 };
 #endif //KAB_EMBEDDED
 extern "C"
 {
@@ -73,160 +75,160 @@ extern "C"
    }
 }
 VCardXXPort::VCardXXPort( KABC::AddressBook *ab, QWidget *parent, const char *name )
    : XXPortObject( ab, parent, name )
 {
    createImportAction( i18n( "Import vCard..." ) );
    //US KABC::VCardConverter does not support the export of 2.1 addressbooks.
    //US createExportAction( i18n( "Export vCard 2.1..." ), "v21" );
    createExportAction( i18n( "Export vCard 3.0..." ), "v30" );
 }
 bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
 {
    QString name;
    if ( list.count() == 1 )
        name = list[ 0 ].givenName() + "_" + list[ 0 ].familyName() + ".vcf";
    else
        name = "addressbook.vcf";
 #ifndef KAB_EMBEDDED
    QString fileName = KFileDialog::getSaveFileName( name );
 #else //KAB_EMBEDDED
    QString fileName = KFileDialog::getSaveFileName( name, i18n("Save file"), parentWidget() );
 #endif //KAB_EMBEDDED
    if ( fileName.isEmpty() )
        return false;
    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( parentWidget(), text.arg( fileName ) );
        return false;
    }
-    QTextStream t( &outFile );
+    Q3TextStream t( &outFile );
-    t.setEncoding( QTextStream::UnicodeUTF8 );
+    t.setEncoding( Q3TextStream::UnicodeUTF8 );
    KABC::Addressee::List::ConstIterator it;
    for ( it = list.begin(); it != list.end(); ++it ) {
        KABC::VCardConverter converter;
        QString vcard;
        KABC::VCardConverter::Version version;
        if ( data == "v21" )
            version = KABC::VCardConverter::v2_1;
        else
            version = KABC::VCardConverter::v3_0;
        converter.addresseeToVCard( *it, vcard, version );
        t << vcard << "\r\n\r\n";
    }
    outFile.close();
    return true;
 }
 KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
 {
    QString fileName;
    KABC::AddresseeList addrList;
    KURL url;
 #ifndef KAB_EMBEDDED
    if ( !XXPortManager::importData.isEmpty() )
        addrList = parseVCard( XXPortManager::importData );
    else {
        if ( XXPortManager::importURL.isEmpty() )
            {
                url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
            }
        else
            url = XXPortManager::importURL;
        if ( url.isEmpty() )
            return addrList;
        QString caption( i18n( "vCard Import Failed" ) );
        if ( KIO::NetAccess::download( url, fileName ) ) {
            QFile file( fileName );
-            file.open( IO_ReadOnly );
+            file.open( QIODevice::ReadOnly );
            QByteArray rawData = file.readAll();
            file.close();
            QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
            addrList = parseVCard( data );
            if ( !url.isLocalFile() )
                KIO::NetAccess::removeTempFile( fileName );
        } else {
            QString text = i18n( "<qt>Unable to access <b>%1</b>.</qt>" );
            KMessageBox::error( parentWidget(), text.arg( url.url() ), caption );
        }
    }
 #else //KAB_EMBEDDED
    if ( !XXPortManager::importData.isEmpty() )
        addrList = parseVCard( XXPortManager::importData );
    else {
        if ( XXPortManager::importURL.isEmpty() )
            {
                fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
                if ( fileName.isEmpty() )
                    return addrList;
                QFileInfo fi ( fileName );
                if ( !fi.isFile() )
                    return addrList;
            }
        else
            {
                //US      url = XXPortManager::importURL;
                qDebug("VCardXXPort::importContacts  Urls at the moment not supported");
                if ( url.isEmpty() )
                    return addrList;
            }
        QFile file( fileName );
-        if ( file.open( IO_ReadOnly ) ) {
+        if ( file.open( QIODevice::ReadOnly ) ) {
-            QCString rawData ( file.readAll().data(),file.size()+1);
+            Q3CString rawData ( file.readAll().data(),file.size()+1);
            file.close();
            int start = 0;
 #ifndef DESKTOP_VERSION            
            while ( start < rawData.size()-2 ) {
                if ( rawData.at( start ) == '\r' ) 
                    if ( rawData.at( start+1 ) == '\n' )
                        if ( rawData.at( start+2 ) == ' ' ) {
                            rawData.remove(start,3);
                            --start;
                        }
                ++start;
            }
 #endif
            int ret = KMessageBox::warningYesNoCancel( 0, i18n("Select import format!\nDefault and standard is Utf8.\nLatin1 may be the right\nfor some West Europian languages."), i18n("Import Format"), i18n("Utf8"), i18n("Latin1") );
            if (  ret == KMessageBox::Cancel )
                return addrList;
            if ( ret == KMessageBox::Yes )
                addrList = parseVCard( QString::fromUtf8( rawData.data() ) );
            else
                addrList = parseVCard( QString::fromLatin1( rawData.data() ) );
        }
    }
 #endif //KAB_EMBEDDED
    return addrList;
 }
 KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
 {
    KABC::VCardTool tool;
@@ -238,35 +240,35 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
      QStringList dataList = QStringList::split( "\r\n\r\n", data );
      for ( uint i = 0; i < numVCards && i < dataList.count(); ++i ) {
      KABC::Addressee addr;
      bool ok = false;
      if ( dataList[ i ].contains( "VERSION:3.0" ) )
      ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v3_0 );
      else if ( dataList[ i ].contains( "VERSION:2.1" ) )
      ok = converter.vCardToAddressee( dataList[ i ], addr, KABC::VCardConverter::v2_1 );
      else {
      KMessageBox::sorry( parentWidget(), i18n( "Not supported vCard version." ) );
      continue;
      }
      if ( !addr.isEmpty() && ok )
      addrList.append( addr );
      else {
      QString text = i18n( "The selected file does not include a valid vCard. "
      "Please check the file and try again." );
      KMessageBox::sorry( parentWidget(), text );
      }
      }
    */
    if ( addrList.isEmpty()  ) {
        QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" );
        KMessageBox::sorry( parentWidget(), text );
    }
    return addrList;
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "vcard_xxport.moc"
+#include "moc_vcard_xxport.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 405f7ec..95b240d 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -1,64 +1,66 @@
 /*
    This file is part of KAddressbook.
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <qlayout.h>
 #include <qlist.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else //KAB_EMBEDDED
 extern "C"
 {
  void* init_microkaddrbk_csv_xxport();
  void* init_microkaddrbk_kde2_xxport();
  void* init_microkaddrbk_vcard_xxport();
  //  void* init_microkaddrbk_opie_xxport();
  void* init_microkaddrbk_qtopia_xxport();
  void* init_microkaddrbk_sharpdtm_xxport();
 }
 #endif //KAB_EMBEDDED
 #include <addresseeview.h>
 #include "kabcore.h"
 #include "undocmds.h"
 #include "xxportselectdialog.h"
 #include "xxportmanager.h"
 #include "nameeditdialog.h"
 KURL XXPortManager::importURL = KURL();
@@ -188,83 +190,80 @@ void XXPortManager::slotExport( const QString &identifier, const QString &data )
    return;
  if ( !obj->exportContacts( addrList, data ) )
    KMessageBox::error( mCore, i18n( "Unable to export contacts." ) );
  else
    KMessageBox::information( mCore, i18n( "contacts successfully exported." ) );
 }
 void XXPortManager::loadPlugins()
 {
  mXXPortObjects.clear();
 #ifndef KAB_EMBEDDED
  KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort" );
  KTrader::OfferList::ConstIterator it;
  for ( it = plugins.begin(); it != plugins.end(); ++it ) {
    if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
      continue;
    KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
    if ( !factory ) {
      kdDebug(5720) << "XXPortManager::loadExtensions(): Factory creation failed" << endl;
      continue;
    }
    XXPortFactory *xxportFactory = static_cast<XXPortFactory*>( factory );
    if ( !xxportFactory ) {
      kdDebug(5720) << "XXPortManager::loadExtensions(): Cast failed" << endl;
      continue;
    }
 #else //KAB_EMBEDDED
-  QList<XXPortFactory> factorylist;
+  QList<XXPortFactory*> factorylist;
  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_csv_xxport()));
  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_kde2_xxport()));
  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_vcard_xxport()));
  //US  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_opie_xxport()));
  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_qtopia_xxport()));
  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_sharpdtm_xxport()));
-  QListIterator<XXPortFactory> it(factorylist);
+  for(QList<XXPortFactory*>::iterator it=factorylist.begin();it!=factorylist.end();++it) {
-  for ( ; it.current(); ++it )
+    XXPortFactory *xxportFactory = *it;
-  {
-    XXPortFactory *xxportFactory = it.current();
 #endif //KAB_EMBEDDED
    XXPortObject *obj = xxportFactory->xxportObject( mCore->addressBook(), mCore );
    if ( obj ) {
      mCore->addGUIClient( obj );
      mXXPortObjects.insert( obj->identifier(), obj );
      connect( obj, SIGNAL( exportActivated( const QString&, const QString& ) ),
               this, SLOT( slotExport( const QString&, const QString& ) ) );
      connect( obj, SIGNAL( importActivated( const QString&, const QString& ) ),
               this, SLOT( slotImport( const QString&, const QString& ) ) );
    }
  }
 }
 PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent,
                              const char *name )
  : KDialogBase( Plain, i18n( "Import this contact?" ), Ok | User1| User2, Ok, parent,
                 name, true, true ,i18n( "Import all!" ),i18n( "No" ) )
 {
  QWidget *page = plainPage();
-  QVBoxLayout *layout = new QVBoxLayout( page, marginHint(), spacingHint() );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( page, marginHint(), spacingHint() );
  connect( this, SIGNAL( user1Clicked() ), this, SLOT ( slotClose() ) );
  connect( this, SIGNAL( user2Clicked() ), this, SLOT ( slotCancel() ) );
  KABC::AddresseeView *view = new KABC::AddresseeView( page );
  view->setAddressee( addr );
  layout->addWidget( view );
 #ifdef DESKTOP_VERSION
  resize( 640, 480 );
 #else
  showMaximized();
 #endif
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "xxportmanager.moc"
+#include "moc_xxportmanager.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index e801d9b..0528922 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -3,78 +3,78 @@
    Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #ifndef XXPORTMANAGER_H
 #define XXPORTMANAGER_H
-#include <qdict.h>
+#include <q3dict.h>
 #include <qobject.h>
 #include <kurl.h>
 #include "xxportobject.h"
 class KABCore;
 class XXPortManager : public QObject
 {
  Q_OBJECT
  public:
    XXPortManager( KABCore *core, QObject *parent, const char *name = 0 );
    ~XXPortManager();
    void restoreSettings();
    void saveSettings();
    static KURL importURL;
    static QString importData;
  public slots:
    void importVCard( const KURL &url );
    void importVCard( const KURL &url, bool showPreview );
    void importVCard( const QString &vCard, bool showPreview );
  signals:
    void modified();
  protected slots: 
    void noPreview();
    void slotImport( const QString&, const QString& );
    void slotExport( const QString&, const QString& );
  private:
    void loadPlugins();
-    QDict<XXPortObject> mXXPortObjects;
+    Q3Dict<XXPortObject> mXXPortObjects;
    KABCore *mCore;
    bool mShowPreview;
 };
 #endif
diff --git a/kaddressbook/xxportobject.cpp b/kaddressbook/xxportobject.cpp
index bd9d986..2d8d0ff 100644
--- a/kaddressbook/xxportobject.cpp
+++ b/kaddressbook/xxportobject.cpp
@@ -242,35 +242,35 @@ KABC::AddresseeList XXPortResourceObject::_importContacts( const QString& identi
  KABC::Resource* mResource = (KABC::Resource*)(mFactory->resource( this->identifier(), 0 ));
  if (mResource == 0)
    return KABC::AddresseeList();
  KABC::AddresseeList adrlst;
  if (fileName != QString::null)
          mResource->setFileName( fileName );
  KABC::TmpAddressBook tmpAB;
  bool res = tmpAB.addResource( mResource );
  if (res == false)
  {
        delete mResource;
        return KABC::AddresseeList();
  }
  res = tmpAB.load();
  adrlst = tmpAB.allAddressees();
  //remove resource deletes also the Resourceobject, if the linkcount is 0
  tmpAB.removeResource( mResource );
  return adrlst;
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "xxportobject.moc"
+#include "moc_xxportobject.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index 278cab0..088bffa 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -7,113 +7,118 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    As a special exception, permission is given to link this program
    with any edition of Qt, and distribute the resulting executable,
    without including the source code for Qt in the source distribution.
 */
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 $Id$
 */
 #include <kabc/addressbook.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <qapplication.h>
-#include <qbuttongroup.h>
+#include <QDesktopWidget>
+#include <q3buttongroup.h>
 #include <qcombobox.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qstringlist.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 #include "kabcore.h"
 #include "kabprefs.h"
 #include "xxportselectdialog.h"
 XXPortSelectDialog::XXPortSelectDialog( KABCore *core, bool sort,
                                        QWidget* parent, const char* name )
    : KDialogBase( Plain, i18n( "Choose contact selection" ), Help | Ok | Cancel,
                   Ok, parent, name, true, true ), mCore( core ),
      mUseSorting( sort )
 {
  initGUI();
  connect( mFiltersCombo, SIGNAL( activated( int ) ),
           SLOT( filterChanged( int ) ) );
-  connect( mCategoriesView, SIGNAL( clicked( QListViewItem* ) ),
+  connect( mCategoriesView, SIGNAL( clicked( Q3ListViewItem* ) ),
-           SLOT( categoryClicked( QListViewItem* ) ) );
+           SLOT( categoryClicked( Q3ListViewItem* ) ) );
  // setup filters
 #ifndef KAB_EMBEDDED
  mFilters = Filter::restore( kapp->config(), "Filter" );
  Filter::List::iterator filterIt;
 #else //KAB_EMBEDDED
  mFilters = Filter::restore( KGlobal::config(), "Filter" );
  Filter::List::Iterator filterIt;
 #endif //KAB_EMBEDDED
  QStringList filters;
  for ( filterIt = mFilters.begin(); filterIt != mFilters.end(); ++filterIt )
    filters.append( (*filterIt).name() );
  mFiltersCombo->insertStringList( filters );
  mUseFilters->setEnabled( filters.count() > 0 );
  // setup categories
  QStringList categories =  KABPrefs::instance()->mCustomCategories;
  QStringList::Iterator it;
  for ( it = categories.begin(); it != categories.end(); ++it )
-    new QCheckListItem( mCategoriesView, *it, QCheckListItem::CheckBox );
+    new Q3CheckListItem( mCategoriesView, *it, Q3CheckListItem::CheckBox );
  mUseCategories->setEnabled( categories.count() > 0 );
  int count = mCore->selectedUIDs().count();
  mUseSelection->setEnabled( count != 0 );
  mUseSelection->setChecked( count  > 1 );
  mSortTypeCombo->insertItem( i18n( "Ascending" ) );
  mSortTypeCombo->insertItem( i18n( "Descending" ) );
  mFields = mCore->addressBook()->fields( KABC::Field::All );
  KABC::Field::List::Iterator fieldIt;
  for ( fieldIt = mFields.begin(); fieldIt != mFields.end(); ++fieldIt )
    mFieldCombo->insertItem( (*fieldIt)->label() );
 }
 QStringList XXPortSelectDialog::uids()
 {
    QStringList uidlist;
    KABC::AddresseeList list = contacts();
    KABC::Addressee::List::Iterator it;
    for ( it = list.begin(); it != list.end(); ++it )
        uidlist.append((*it).uid());
    return uidlist;
 }
 void XXPortSelectDialog::tagSelected()
 {
  if ( mUseSelection->isChecked() ) {
    QStringList selection = mCore->selectedUIDs();
    KABC::AddressBook::Iterator it;
    for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it ) {
        if ( selection.findIndex((*it).uid()) >= 0 )
@@ -181,162 +186,160 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
    for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it ) {
      QStringList tmp( (*it).categories() );
      QStringList::Iterator tmpIt;
      for ( tmpIt = tmp.begin(); tmpIt != tmp.end(); ++tmpIt )
        if ( categorieList.contains( *tmpIt ) ) {
          if ((*it).uid().left( 19 ) != QString("last-syncAddressee-") )
              list.append( *it );
          break;
        }
    }
  } else {
    // create a string list of all entries:
    KABC::AddressBook::Iterator it;
    for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it )
          if ((*it).uid().left( 19 ) != QString("last-syncAddressee-") )
              list.append( *it );
  }
  if ( mUseSorting ) {
    list.setReverseSorting( mSortTypeCombo->currentItem() == 1 );
    uint pos = mFieldCombo->currentItem();
    if ( pos < mFields.count() )
      list.sortByField( mFields[ pos ] );
  }
  return list;
 }
 QStringList XXPortSelectDialog::categories() const
 {
  QStringList list;
-  QListViewItemIterator it( mCategoriesView );
+  Q3ListViewItemIterator it( mCategoriesView );
  for ( ; it.current(); ++it ) {
-    QCheckListItem* qcli = static_cast<QCheckListItem*>(it.current());
+    Q3CheckListItem* qcli = static_cast<Q3CheckListItem*>(it.current());
    if ( qcli->isOn() )
      list.append( it.current()->text( 0 ) );
  }
  return list;
 }
 void XXPortSelectDialog::filterChanged( int )
 {
  mUseFilters->setChecked( true );
 }
-void XXPortSelectDialog::categoryClicked( QListViewItem *i )
+void XXPortSelectDialog::categoryClicked( Q3ListViewItem *i )
 {
-  QCheckListItem *qcli = static_cast<QCheckListItem*>( i );
+  Q3CheckListItem *qcli = static_cast<Q3CheckListItem*>( i );
  if ( qcli->isOn() )
    mUseCategories->setChecked( true );
 }
 void XXPortSelectDialog::slotHelp()
 {
 #ifndef KAB_EMBEDDED
  kapp->invokeHelp( "import-and-export" );
 #else //KAB_EMBEDDED
  qDebug("XXPortSelectDialog::slotHelp is not implemented yet");
 #endif //KAB_EMBEDDED
 }
 void XXPortSelectDialog::initGUI()
 {
-  QFrame *page = plainPage();
+  Q3Frame *page = plainPage();
-  QVBoxLayout *topLayout = new QVBoxLayout( page, KDialog::marginHintSmall(),
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( page, KDialog::marginHintSmall(),
                                            KDialog::spacingHintSmall() );
  QLabel *label = new QLabel( i18n( "Which contacts do you want to select?" ), page );
  topLayout->addWidget( label );
-  mButtonGroup = new QButtonGroup( i18n( "Contact Selection" ), page );
+  mButtonGroup = new Q3ButtonGroup( i18n( "Contact Selection" ), page );
  mButtonGroup->setColumnLayout( 0, Qt::Vertical );
  mButtonGroup->layout()->setSpacing( KDialog::spacingHint() );
  mButtonGroup->layout()->setMargin( KDialog::marginHint() );
-  QGridLayout *groupLayout = new QGridLayout( mButtonGroup->layout() );
+  Q3GridLayout *groupLayout = new Q3GridLayout( mButtonGroup->layout() );
  groupLayout->setAlignment( Qt::AlignTop );
  mUseWholeBook = new QRadioButton( i18n( "&All" ), mButtonGroup );
  mUseWholeBook->setChecked( true );
-  QWhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) );
+  Q3WhatsThis::add( mUseWholeBook, i18n( "Select the entire address book" ) );
  groupLayout->addWidget( mUseWholeBook, 0, 0 );
  mUseSelection = new QRadioButton( i18n( "&Selected" ), mButtonGroup );
-  QWhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n"
+  Q3WhatsThis::add( mUseSelection, i18n( "Only contacts selected in KAddressBook.\n"
                                        "This option is disabled if no contacts are selected." ) );
  groupLayout->addWidget( mUseSelection, 1, 0 );
  mUseFilters = new QRadioButton( i18n( "By matching &filter" ), mButtonGroup );
-  QWhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n"
+  Q3WhatsThis::add( mUseFilters, i18n( "Only contacts matching the selected filter.\n"
                                     "This option is disabled if you haven't defined any filters" ) );
  groupLayout->addWidget( mUseFilters, 2, 0 );
  mUseCategories = new QRadioButton( i18n( "By Cate&gories" ), mButtonGroup );
-  QWhatsThis::add( mUseCategories, i18n( "Only contacts who are members of a category that is checked on the list to the left.\n"
+  Q3WhatsThis::add( mUseCategories, i18n( "Only contacts who are members of a category that is checked on the list to the left.\n"
                                       "This option is disabled if you have no categories." ) );
  groupLayout->addWidget( mUseCategories, 3, 0 );
  mFiltersCombo = new QComboBox( false, mButtonGroup );
  mFiltersCombo->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  QWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) );
+  Q3WhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to select." ) );
  groupLayout->addWidget( mFiltersCombo, 2, 1 );
-  mCategoriesView = new QListView( mButtonGroup );
+  mCategoriesView = new Q3ListView( mButtonGroup );
  mCategoriesView->addColumn( "" );
  mCategoriesView->header()->hide();
-  QWhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) );
+  Q3WhatsThis::add( mCategoriesView, i18n( "Check the categories whose members you want to select." ) );
  groupLayout->addWidget( mCategoriesView, 3, 1 );
  mCategoriesView->setSizePolicy(QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
  //if (QApplication::desktop()->height() == 480 )
  // mCategoriesView->setMaximumHeight( 240 );
  topLayout->addWidget( mButtonGroup );
-  QButtonGroup *sortingGroup = new QButtonGroup( i18n( "Sorting" ), page );
+  Q3ButtonGroup *sortingGroup = new Q3ButtonGroup( i18n( "Sorting" ), page );
  sortingGroup->setColumnLayout( 0, Qt::Vertical );
-  QGridLayout *sortLayout = new QGridLayout( sortingGroup->layout(), 2, 2,
+  Q3GridLayout *sortLayout = new Q3GridLayout( sortingGroup->layout(), 2, 2,
                                             KDialog::spacingHint() );
  sortLayout->setAlignment( Qt::AlignTop );
  label = new QLabel( i18n( "Criterion:" ), sortingGroup );
  sortLayout->addWidget( label, 0, 0 );
 #ifndef KAB_EMBEDDED
  mFieldCombo = new KComboBox( false, sortingGroup );
 #else //KAB_EMBEDDED
  //US Combobox is not editable anyway
  mFieldCombo = new KComboBox( sortingGroup );
 #endif //KAB_EMBEDDED
  sortLayout->addWidget( mFieldCombo, 0, 1 );
  label = new QLabel( i18n( "Order:" ), sortingGroup );
  sortLayout->addWidget( label, 1, 0 );
 #ifndef KAB_EMBEDDED
  mSortTypeCombo = new KComboBox( false, sortingGroup );
 #else //KAB_EMBEDDED
  //US Combobox is not editable anyway
  mSortTypeCombo = new KComboBox( sortingGroup );
 #endif //KAB_EMBEDDED
  sortLayout->addWidget( mSortTypeCombo, 1, 1 );
  topLayout->addWidget( sortingGroup );
  if ( !mUseSorting )
    sortingGroup->hide(); 
  if (QApplication::desktop()->width() <= 640 ) {
      showMaximized();
 #ifndef DESKTOP_VERSION
  hideButtons();
 #endif
  }
 }
-#ifndef KAB_EMBEDDED
+#ifndef KAB_EMBEDDED_
-#include "xxportselectdialog.moc"
+#include "moc_xxportselectdialog.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h
index 28b1fef..208f4f9 100644
--- a/kaddressbook/xxportselectdialog.h
+++ b/kaddressbook/xxportselectdialog.h
@@ -1,83 +1,83 @@
 /*                                                                      
    This file is part of KAddressBook.
    Copyright (c) 2002 Anders Lund <anders.lund@lund.tdcadsl.dk>
                       Tobias Koenig <tokoe@kde.org>
                                                                        
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or   
    (at your option) any later version.                                 
                                                                        
    This program is distributed in the hope that it will be useful,     
    but WITHOUT ANY WARRANTY; without even the implied warranty of      
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
    GNU General Public License for more details.                        
                                                                        
    You should have received a copy of the GNU General Public License   
    along with this program; if not, write to the Free Software         
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                        
    As a special exception, permission is given to link this program    
    with any edition of Qt, and distribute the resulting executable,    
    without including the source code for Qt in the source distribution.
 */                                                                      
 #ifndef XXPORTSELECTDIALOG_H
 #define XXPORTSELECTDIALOG_H
 #include <kabc/addresseelist.h>
 #include <kabc/field.h>
 #include <kdialogbase.h>
 #include "filter.h"
-class QButtonGroup;
+class Q3ButtonGroup;
 class QComboBox;
-class QListView;
+class Q3ListView;
-class QListViewItem;
+class Q3ListViewItem;
 class QRadioButton;
 class KABCore;
 class KComboBox;
 class XXPortSelectDialog : public KDialogBase
 {
  Q_OBJECT
  public:
    XXPortSelectDialog( KABCore *core, bool sort, QWidget* parent,
                        const char* name = 0 );
    KABC::AddresseeList contacts();
    void tagSelected();
    QStringList uids();
  private slots:
    void filterChanged( int );
-    void categoryClicked( QListViewItem * i );
+    void categoryClicked( Q3ListViewItem * i );
  protected slots:
    void slotHelp();
  private:
    void initGUI();
    QStringList categories() const;
-    QButtonGroup* mButtonGroup;
+    Q3ButtonGroup* mButtonGroup;
    QRadioButton* mUseCategories;
    QRadioButton* mUseFilters;
    QRadioButton* mUseWholeBook;
    QRadioButton* mUseSelection;
    QComboBox* mFiltersCombo;
-    QListView* mCategoriesView;
+    Q3ListView* mCategoriesView;
    KComboBox *mFieldCombo;
    KComboBox *mSortTypeCombo;
    KABCore *mCore;
    KABC::AddresseeList mAddresseeList;
    Filter::List mFilters;
    KABC::Field::List mFields;
    bool mUseSorting;
 };
 #endif