initial public commit of qt4 portp1

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
@@ -13,42 +13,49 @@
     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 <qlistview.h>
+#include <q3listbox.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>
@@ -58,46 +65,46 @@
 #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()
 { 
@@ -117,31 +124,31 @@ KABC::Address::List AddressEditWidget::addresses()
 }
 
 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();
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int> configList = mConfig->noDefaultAddrTypes();
+  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();
@@ -172,25 +179,25 @@ void AddressEditWidget::edit()
       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();
     }
@@ -246,38 +253,38 @@ void AddressEditWidget::updateAddressEdit()
 
 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();
@@ -302,32 +309,32 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list,
 
   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() ) );
 
@@ -574,27 +581,27 @@ void AddressEditDialog::fillCountryCombo()
 
   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 ] );
@@ -608,15 +615,15 @@ 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    
-#include "addresseditwidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -24,31 +24,31 @@
 #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.
  */
@@ -72,27 +72,27 @@ class AddressEditWidget : public QWidget
 
   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
 {
@@ -111,27 +111,27 @@ class AddressEditDialog : public KDialogBase
     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;
@@ -142,18 +142,18 @@ class AddressEditDialog : public KDialogBase
 /**
   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
@@ -17,24 +17,26 @@
     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()
@@ -68,27 +70,27 @@ void AddresseeConfig::setUid( const QString & 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
@@ -17,39 +17,41 @@
     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 );
-    QValueList<int> noDefaultAddrTypes() const;
+    void setNoDefaultAddrTypes( const Q3ValueList<int> &types );
+    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
@@ -14,45 +14,48 @@
                                                                         
     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();
   }
 }
 
@@ -109,15 +112,15 @@ void AddresseeEditorDialog::slotOk()
 void AddresseeEditorDialog::widgetModified()
 {
   enableButton( KDialogBase::Apply, true );
 }
   
 void AddresseeEditorDialog::slotCancel()
 {
   KDialogBase::slotCancel();
   
  
 }
 
-#ifndef KAB_EMBEDDED    
-#include "addresseeeditordialog.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -13,41 +13,45 @@
     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>
@@ -121,25 +125,25 @@ void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr )
 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();
@@ -151,25 +155,25 @@ void AddresseeEditorWidget::initGUI()
 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
@@ -318,35 +322,35 @@ void AddresseeEditorWidget::setupTab1()
   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 );
   
@@ -402,25 +406,25 @@ void AddresseeEditorWidget::setCompany2FN()
     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
@@ -603,25 +607,25 @@ qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
   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
@@ -682,25 +686,25 @@ void AddresseeEditorWidget::setupTab2()
   
   //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 );
@@ -726,25 +730,25 @@ void AddresseeEditorWidget::setupTab2()
           ++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 );
@@ -795,25 +799,25 @@ void AddresseeEditorWidget::setupTab2()
       ++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 );
@@ -917,52 +921,52 @@ void AddresseeEditorWidget::setupTab2_1()
   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->setWordWrap( QTextEdit::WidgetWidth );
+  mNoteEdit = new Q3TextEdit( tab2_2 );
+  mNoteEdit->setWordWrap( Q3TextEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #else //KAB_EMBEDDED    
-  mNoteEdit = new QMultiLineEdit( tab2_2 );
-  mNoteEdit->setWordWrap( QMultiLineEdit::WidgetWidth );
+  mNoteEdit = new Q3MultiLineEdit( tab2_2 );
+  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
   //////////////////////////////////////
@@ -996,25 +1000,25 @@ qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be
 //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 );
 */
@@ -1421,15 +1425,15 @@ void AddresseeEditorWidget::pageChanged( QWidget *wdg )
 }
 
 QString AddresseeEditorWidget::title() const
 {
   return i18n( "Contact Editor" );
 }
 
 QString AddresseeEditorWidget::identifier() const
 {
   return i18n( "contact_editor" );
 }
 
-#ifndef KAB_EMBEDDED    
-#include "addresseeeditorwidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -16,42 +16,42 @@
     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;
@@ -146,44 +146,44 @@ class AddresseeEditorWidget : public ExtensionWidget
     // 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    
diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp
index 366384a..a860f6d 100644
--- a/kaddressbook/addresseeutil.cpp
+++ b/kaddressbook/addresseeutil.cpp
@@ -37,25 +37,25 @@ QString AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list
   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;
     }
 
diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp
index 6def26b..b52a83c 100644
--- a/kaddressbook/addviewdialog.cpp
+++ b/kaddressbook/addviewdialog.cpp
@@ -16,66 +16,68 @@
     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
@@ -104,15 +106,15 @@ QString AddViewDialog::viewType()const
 }
 
 void AddViewDialog::clicked( int id )
 {
   mTypeId = id;
 }
 
 void AddViewDialog::textChanged( const QString &text )
 {
   enableButton( KDialogBase::Ok, !text.isEmpty() );
 }
 
-#ifndef KAB_EMBEDDED
-#include "addviewdialog.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -16,58 +16,58 @@
     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
@@ -13,67 +13,70 @@
     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
 }
@@ -150,15 +153,15 @@ KABC::Addressee ViewContainer::addressee()
   if ( !mCurrentLook )
     return empty;
   else
     return mCurrentLook->addressee();
 }
 
 void ViewContainer::setReadOnly( bool state )
 {
   if ( mCurrentLook )
     mCurrentLook->setReadOnly( state );
 }
 
-#ifndef KAB_EMBEDDED
-#include "detailsviewcontainer.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -15,30 +15,30 @@
     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
@@ -85,19 +85,19 @@ class ViewContainer : public QWidget
       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
@@ -17,25 +17,25 @@
     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;
 }
@@ -61,15 +61,15 @@ void KABBasicLook::restoreSettings( KConfig* )
 void KABBasicLook::saveSettings( KConfig* )
 {
 }
 
 KABLookFactory::KABLookFactory( QWidget *parent, const char *name )
   : mParent( parent ), mName( name )
 {
 }
 
 KABLookFactory::~KABLookFactory()
 {
 }
-#ifndef KAB_EMBEDDED
-#include "look_basic.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -16,41 +16,41 @@
     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.
      */
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
@@ -180,28 +180,28 @@ void KABDetailedView::mouseMoveEvent( QMouseEvent *e )
     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 );
-  QPopupMenu *menuBG = new QPopupMenu( &menu );
-  mMenuBorderedBG = new QPopupMenu( &menu );
-  mMenuTiledBG = new QPopupMenu( &menu );
+  Q3PopupMenu menu( this );
+  Q3PopupMenu *menuBG = new Q3PopupMenu( &menu );
+  mMenuBorderedBG = new Q3PopupMenu( &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() ) {
@@ -405,15 +405,15 @@ void KABDetailedView::restoreSettings( KConfig *config )
   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
-#include "look_details.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -121,26 +121,26 @@ class KABDetailedView : public KABBasicLook
 
     QPixmap mDefaultBGImage;
 
     KToggleAction *mActionShowAddresses;
     KToggleAction *mActionShowEmails;
     KToggleAction *mActionShowPhones;
     KToggleAction *mActionShowURLs;
 
     const int mGrid;
     QStringList mBorders;
     QStringList mTiles;
 
-    QPopupMenu *mMenuBorderedBG;
-    QPopupMenu *mMenuTiledBG;
+    Q3PopupMenu *mMenuBorderedBG;
+    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()
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
@@ -15,25 +15,25 @@
     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()
@@ -42,15 +42,15 @@ 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
-#include "look_html.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -19,52 +19,54 @@
     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 );
@@ -128,42 +130,42 @@ void EmailEditWidget::textChanged( const QString &text )
   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 );
@@ -263,15 +265,15 @@ 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
-#include "emaileditwidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -20,29 +20,29 @@
     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 QListBox;
-class QTextEdit;
+class Q3ListView;
+class Q3ListBox;
+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
 {
@@ -80,22 +80,22 @@ class EmailEditDialog : public KDialogBase
     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
@@ -13,61 +13,63 @@
     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()
 {
@@ -139,36 +141,36 @@ void ExtensionManager::setActiveExtension( int id )
 //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;
 
@@ -235,15 +237,15 @@ void ExtensionManager::createExtensionWidgets()
       }
     }
 
     hbl->addStretch();
 
 #endif //KAB_EMBEDDED
 
 
   mActionExtensions->setItems( extensionNames );
   mCurrentExtensionWidget = 0;
 }
 
-#ifndef KAB_EMBEDDED
-#include "extensionmanager.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -15,35 +15,35 @@
     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 <qscrollview.h>
-#include <qptrlist.h>
+#include <q3hbox.h>
+#include <q3scrollview.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();
 
@@ -71,19 +71,19 @@ class ExtensionManager : public QScrollView
     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
@@ -69,16 +69,15 @@ QString ExtensionWidget::title() const
 }
 
 QString ExtensionWidget::identifier() const
 {
   return "<bug!!!>";
 }
 
 ConfigureWidget *ExtensionFactory::configureWidget( QWidget*, const char* )
 {
   return 0;
 }
 
-#ifndef KAB_EMBEDDED
-#include "extensionwidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -77,27 +77,27 @@ class ExtensionWidget : public QWidget
 
   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; }
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
@@ -12,31 +12,38 @@
     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>
 
@@ -68,30 +75,30 @@ class DistributionListFactory : public ExtensionFactory
       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" ) );
       }
     }
@@ -112,25 +119,25 @@ class ContactItem : public QListViewItem
       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
@@ -157,26 +164,26 @@ DistributionListWidget::DistributionListWidget( KABCore *core, QWidget *parent,
 
   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* ) ),
-           SLOT( dropped( QDropEvent*, QListViewItem* ) ) );
+  connect( mContactView, SIGNAL( dropped( QDropEvent*, Q3ListViewItem* ) ),
+           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() );
@@ -401,101 +408,101 @@ void DistributionListWidget::contactsSelectionChanged()
 }
 
 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();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = plainPage();
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
-  mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
   topLayout->addWidget( mButtonGroup );
 
   QStringList::ConstIterator it;
   for( it = emails.begin(); it != emails.end(); ++it ) {
     QRadioButton *button = new QRadioButton( *it, mButtonGroup );
     if ( (*it) == current ) {
       button->setDown( true );
     }
   }
 }
 
 QString EmailSelector::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
   if ( button )
     return button->text();
 
   return QString::null;
 }
 
 QString EmailSelector::getEmail( const QStringList &emails,
                                  const QString &current, QWidget *parent )
 {
   EmailSelector dlg( emails, current, parent );
   dlg.exec();
 
   return dlg.selected();
 }
 
 
-#ifndef KAB_EMBEDDED
-#include "distributionlistwidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -19,54 +19,59 @@
     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();
@@ -111,25 +116,25 @@ class DistributionListView : public KListView
 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 );
     }
 
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
@@ -14,24 +14,26 @@
                                                                         
     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>
@@ -54,29 +56,29 @@ class MergeFactory : public ExtensionFactory
       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;
@@ -85,25 +87,25 @@ class ContactItem : public QListViewItem
   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 );
@@ -205,25 +207,25 @@ void MergeWidget::mergeAndRemove()
   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() );
@@ -360,15 +362,15 @@ void MergeWidget::doMerge( const KABC::Addressee &addr )
     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
-#include "mergewidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -20,25 +20,25 @@
     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:
diff --git a/kaddressbook/filter.cpp b/kaddressbook/filter.cpp
index 12ab1e3..6462310 100644
--- a/kaddressbook/filter.cpp
+++ b/kaddressbook/filter.cpp
@@ -209,25 +209,25 @@ Filter::List Filter::restore( KConfig *config, QString baseGroup )
     }
 
     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;
 }
diff --git a/kaddressbook/filter.h b/kaddressbook/filter.h
index f4ae123..508436d 100644
--- a/kaddressbook/filter.h
+++ b/kaddressbook/filter.h
@@ -17,41 +17,41 @@
     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 );
 
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index ef9b979..40698a7 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -19,104 +19,106 @@
     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 <qhbox.h>
+#include <q3buttongroup.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 );
 
@@ -132,48 +134,48 @@ Filter FilterEditDialog::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 )
 {
@@ -263,53 +265,53 @@ void FilterDialog::remove()
   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 * ) ),
-           SLOT( selectionChanged( QListBoxItem * ) ) );
-  connect( mFilterListBox, SIGNAL( doubleClicked ( QListBoxItem * ) ),
+  connect( mFilterListBox, SIGNAL( selectionChanged( Q3ListBoxItem * ) ),
+           SLOT( selectionChanged( Q3ListBoxItem * ) ) );
+  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
-#include "filtereditdialog.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -22,56 +22,55 @@
 */
 
 /*
 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;
@@ -89,21 +88,21 @@ class FilterEditDialog : public KDialogBase
 
   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
@@ -18,67 +18,74 @@
 
     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 );
 
@@ -158,34 +165,34 @@ void GeoWidget::editGeoData()
 
     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 );
-  QGridLayout *sexagesimalLayout = new QGridLayout( sexagesimalGroup->layout(),
+  Q3GroupBox *sexagesimalGroup = new Q3GroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page );
+  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 );
@@ -420,26 +427,26 @@ void GeoDialog::loadCityList()
 #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 ) ) {
-    QTextStream s( &file );
+  if ( file.open( QIODevice::ReadOnly ) ) {
+    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 );
@@ -543,25 +550,25 @@ int GeoDialog::nearestCity( double x, double y )
                   ( (*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 )
 {
@@ -615,15 +622,15 @@ void GeoMapWidget::paintEvent( QPaintEvent* )
 
   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
-#include "geowidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -18,24 +18,28 @@
 
     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;
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index eec5e08..6ecf66d 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -28,92 +28,96 @@
 #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 );
-  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 3, 2,
+  Q3GroupBox *photoBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
+  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 );
-  boxLayout = new QGridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
+  Q3GroupBox *logoBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
+  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& ) ),
@@ -171,25 +175,25 @@ void ImageWidget::setPhoto( const KABC::Picture &photo )
   }
   
   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  
 
@@ -223,25 +227,25 @@ void ImageWidget::setLogo( const KABC::Picture &logo )
   }
 
   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" );
@@ -283,15 +287,15 @@ void ImageWidget::updateGUI()
 
 QPixmap ImageWidget::loadPixmap( const QString &url )
 {
 
   QPixmap pixmap;
 
   if ( url.isEmpty() )
     return pixmap;
   pixmap.load( url );
   return pixmap;
 }
 
-#ifndef KAB_EMBEDDED
-#include "imagewidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -16,24 +16,27 @@
     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
 {
diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 5f8b83d..a54d1cd 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -16,47 +16,51 @@
     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);
 
   
@@ -167,15 +171,15 @@ KABC::Field *IncSearchWidget::currentField()const
 
 void IncSearchWidget::setCurrentItem( int pos )
 {
   mFieldCombo->setCurrentItem( pos );
   announceFieldChanged();
 }
 
 int IncSearchWidget::currentItem() const
 {
   
   return mFieldCombo->currentItem();
 }
-#ifndef KAB_EMBEDDED
-#include "incsearchwidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -16,26 +16,29 @@
     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
 {
@@ -64,27 +67,27 @@ void JumpButton::setCharacter( const QString &character )
 }
 
 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  
@@ -243,15 +246,15 @@ void JumpButtonBar::sortListLocaleAware( QStringList &list )
       if ( QString::compare( *j2, *j1 ) < 0 )
 #endif //KAB_EMBEDDED      
         qSwap( *j1, *j2 );
 
       ++j1;
       ++j2;
     }
     ++beginIt;
     --walkBackIt;
   }
 }
 
-#ifndef KAB_EMBEDDED
-#include "jumpbuttonbar.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -17,29 +17,32 @@
     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.
@@ -67,18 +70,18 @@ class JumpButtonBar : public QWidget
       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
@@ -30,36 +30,46 @@ $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>
@@ -79,25 +89,25 @@ $Id$
 #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>
 
@@ -120,30 +130,30 @@ $Id$
 
 
 #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"
@@ -166,30 +176,30 @@ $Id$
 // 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 );
@@ -198,30 +208,30 @@ class KABCatPrefs : public QDialog
     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 );
@@ -236,47 +246,47 @@ public:
     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  ); 
-        QHBox* temphb;
-        temphb = new QHBox( this );
+        lab->setAlignment (Qt::AlignHCenter  ); 
+        Q3HBox* temphb;
+        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; 
@@ -398,41 +408,41 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const
   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 )
@@ -444,52 +454,52 @@ KABCore::~KABCore()
     //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;
@@ -551,25 +561,25 @@ void KABCore::restoreSettings()
   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 );
@@ -641,28 +651,28 @@ KABC::Field *KABCore::currentSearchField() const
     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;
-  QPtrListIterator<KABC::Resource> resIt( kabcResources );
+  Q3PtrList<KRES::Resource> kresResources;
+  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 );
@@ -786,32 +796,32 @@ void KABCore::mailVCard( const QStringList& uids )
   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
-      t.setEncoding( QTextStream::UnicodeUTF8 );
+      Q3TextStream t( &outFile );  // use a text stream
+      t.setEncoding( Q3TextStream::UnicodeUTF8 );
       t << vcard;
 
       outFile.close();
 
       urls.append( fileName );
     }
   }
 
   bool result = ExternalAppHandler::instance()->mailToMultipleContacts( QString::null, urls.join(", ") );
 
 
 /*US
@@ -1007,29 +1017,29 @@ void KABCore::beamVCard(const QStringList& uids)
           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
 
 }
@@ -1288,28 +1298,28 @@ void KABCore::addrModified( const KABC::Addressee &addr ,bool updateDetails )
 
   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;
-  QPtrListIterator<KABC::Resource> it( kabcResources );
+  Q3PtrList<KRES::Resource> kresResources;
+  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 );
@@ -1847,98 +1857,98 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( QWidget *parent,
 
   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 );
-  settingsMenu = new QPopupMenu( this );
+  viewMenu = new Q3PopupMenu( this );
+  settingsMenu = new Q3PopupMenu( this );
   //filterMenu = new QPopupMenu( this );
-  ImportMenu = new QPopupMenu( this );
-  ExportMenu = new QPopupMenu( this );
-  syncMenu = new QPopupMenu( this );
-  changeMenu= new QPopupMenu( this );
-  beamMenu= new QPopupMenu( this );
+  ImportMenu = new Q3PopupMenu( this );
+  ExportMenu = new Q3PopupMenu( this );
+  syncMenu = new Q3PopupMenu( this );
+  changeMenu= new Q3PopupMenu( 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();
@@ -2025,35 +2035,35 @@ 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;
@@ -2074,53 +2084,53 @@ void KABCore::initActions()
                                       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" );
@@ -2237,27 +2247,27 @@ void KABCore::initActions()
   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 );
-  QPopupMenu *editMenu = new QPopupMenu( this );
-  QPopupMenu *helpMenu = new QPopupMenu( this );
+  Q3PopupMenu *fileMenu = new Q3PopupMenu( this );
+  Q3PopupMenu *editMenu = new Q3PopupMenu( 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 );
@@ -2267,25 +2277,25 @@ void KABCore::addActionsManually()
       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 );
@@ -2622,25 +2632,25 @@ void KABCore::updateActionMenu()
 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)
@@ -2718,25 +2728,25 @@ void KABCore::requestForBirthdayList(const QString& sourceChannel, const QString
   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;
@@ -2899,25 +2909,25 @@ KABC::Addressee KABCore::getLastSyncAddressee()
     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);
@@ -3090,25 +3100,25 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
 
     } 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;
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ec6a9ec..4351720 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -19,29 +19,33 @@
     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;
@@ -76,27 +80,27 @@ 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;}
-    QPopupMenu* getFilterMenu() {return filterMenu;}
-    QPopupMenu* getSettingsMenu() {return settingsMenu;}
+    Q3PopupMenu* getViewMenu() {return viewMenu;}
+    Q3PopupMenu* getFilterMenu() {return filterMenu;}
+    Q3PopupMenu* getSettingsMenu() {return settingsMenu;}
     void addActionsManually();
 #endif //KAB_EMBEDDED
     /**
       Restores the global settings.
      */
     void restoreSettings();
 
   
 
     /**
       Returns a pointer to the StdAddressBook of the application.
      */
@@ -126,26 +130,26 @@ class KABCore : public QWidget, public KSyncInterface
     /**
       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 QPopupMenu* getExportMenu() { return ExportMenu;}
+    inline Q3PopupMenu* getImportMenu() { return ImportMenu;}
+    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() ;
@@ -357,26 +361,26 @@ class KABCore : public QWidget, public KSyncInterface
     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 receiveStart( const QCString& cmsg, const QByteArray& data );
+    void receive( const Q3CString& 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 );
@@ -385,25 +389,25 @@ class KABCore : public QWidget, public KSyncInterface
     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();
@@ -477,32 +481,32 @@ class KABCore : public QWidget, public KSyncInterface
     KAction *mActionManageCategories;
     KAction *mActionAboutKAddressbook;
     KAction *mActionLicence;
     KAction *mActionFaq;
     KAction *mActionWN;
     KAction *mActionSyncHowto;
     KAction *mActionStorageHowto;
     KAction *mActionKdeSyncHowto;
     KAction *mActionMultiSyncHowto;
 
     KAction *mActionDeleteView;
 
-    QPopupMenu *viewMenu;
-    QPopupMenu *filterMenu;
-    QPopupMenu *settingsMenu;
-    QPopupMenu *changeMenu;
-    QPopupMenu *beamMenu;
+    Q3PopupMenu *viewMenu;
+    Q3PopupMenu *filterMenu;
+    Q3PopupMenu *settingsMenu;
+    Q3PopupMenu *changeMenu;
+    Q3PopupMenu *beamMenu;
 //US    QAction *mActionSave;
-    QPopupMenu *ImportMenu;
-    QPopupMenu *ExportMenu;
+    Q3PopupMenu *ImportMenu;
+    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;
@@ -515,25 +519,25 @@ class KABCore : public QWidget, public KSyncInterface
     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;
 
 };
 
diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 42d541b..6f9c995 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -16,25 +16,25 @@
     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"
@@ -82,25 +82,25 @@ KABPrefs::KABPrefs()
 
 
   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);
 }
diff --git a/kaddressbook/kabprefs.h b/kaddressbook/kabprefs.h
index ddbc0c0..aff725e 100644
--- a/kaddressbook/kabprefs.h
+++ b/kaddressbook/kabprefs.h
@@ -16,25 +16,27 @@
     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();
 
@@ -64,26 +66,26 @@ class KABPrefs : public KPimPrefs
     void usrReadConfig();
 
 
     // GUI
     bool mFullMenuBarVisible;
     bool mJumpButtonBarVisible;
     bool mDetailsPageVisible;
     bool mMultipleViewsAtOnce;
     bool mSearchWithReturn;
     bool mAutoSearchWithWildcard;
     bool mHideSearchOnSwitch;
     bool mAskForDelete;
-    QValueList<int> mExtensionsSplitter;
-    QValueList<int> mDetailsSplitter;
+    Q3ValueList<int> mExtensionsSplitter;
+    Q3ValueList<int> mDetailsSplitter;
 
     // Extensions stuff
     int mCurrentExtension;
     QStringList mActiveExtensions;
 
     // Views stuff
     QString mCurrentView;
     QStringList mViewNames;
 
     // Filter
     int mCurrentFilter;
 
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index cd38e5f..4eb1f7f 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -4,58 +4,58 @@ 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/libmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
-LIBS += ../bin/libmicrokde.a
-LIBS += ../bin/libmicrokabc_qtopia.a
-LIBS += ../bin/libmicrokabc_file.a
-LIBS += ../bin/libmicrokabc_dir.a
-LIBS += ../bin/libmicrokdepim.a
-LIBS += ../bin/libmicrokcal.a
-LIBS += ../bin/libmicrokabc.a
-LIBS += ../bin/libmicrokde.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_dir.a
+LIBS += ../bin/libxmicrokdepim.a
+LIBS += ../bin/libxmicrokcal.a
+LIBS += ../bin/libxmicrokabc.a
+LIBS += ../bin/libxmicrokde.a
+LIBS += ../bin/libxmicrokabc_qtopia.a
+LIBS += ../bin/libxmicrokabc_file.a
+LIBS += ../bin/libxmicrokabc_dir.a
+LIBS += ../bin/libxmicrokdepim.a
+LIBS += ../bin/libxmicrokcal.a
+LIBS += ../bin/libxmicrokabc.a
+LIBS += ../bin/libxmicrokde.a
 LIBS += ../libical/lib/libical.a
 LIBS += ../libical/lib/libicalss.a
 
 } else {
-LIBS += ../bin/libmicrokdepim.so
-LIBS += ../bin/libmicrokde.so
-LIBS += ../bin/libmicrokabc.so
-LIBS += ../bin/libmicrokcal.so
+LIBS += ../bin/libxmicrokdepim.so
+LIBS += ../bin/libxmicrokde.so
+LIBS += ../bin/libxmicrokabc.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/microkcal.lib
-LIBS += ../bin/microkde.lib
-LIBS += ../bin/microkabc.lib
+LIBS += ../bin/xmicrokdepim.lib
+LIBS += ../bin/xmicrokcal.lib
+LIBS += ../bin/xmicrokde.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_
@@ -195,12 +195,14 @@ 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
@@ -3,28 +3,28 @@ 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 += -lmicrokde
+LIBS += -lxmicrokdepim
+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 \
 
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index c417226..b317974 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -16,53 +16,56 @@
     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;
-  tbd = Top;
-  iconToolBar = new QToolBar( this );
+  Qt::ToolBarDock tbd;
+  tbd = Qt::DockTop;
+  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
@@ -76,25 +79,25 @@ KAddressBookMain::KAddressBookMain() : DCOPObject( "KAddressBookIface" ), KMainW
 //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 () ;
 }
@@ -226,16 +229,15 @@ void KAddressBookMain::closeEvent( QCloseEvent* ce )
     return;
 
   if (mModified == true)
   {
     save();
     mCore->saveSettings();
     //KABPrefs::instance()->writeConfig();
   }
 
   ce->accept();
 }
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbookmain.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -15,76 +15,78 @@
     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
     
diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp
index 86898e2..4823b37 100644
--- a/kaddressbook/kaddressbookview.cpp
+++ b/kaddressbook/kaddressbookview.cpp
@@ -23,24 +23,26 @@
 
 #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()
 {
  
@@ -124,25 +126,25 @@ KABC::Addressee::List KAddressBookView::addressees()
   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
 {
@@ -174,15 +176,15 @@ 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
-#include "kaddressbookview.moc"
+#ifndef KAB_EMBEDDED_
+#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,12 +1,14 @@
+//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
@@ -31,25 +33,25 @@
 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.
@@ -166,27 +168,27 @@ class KAddressBookView : public QWidget
       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.
      */
@@ -253,27 +255,27 @@ class KAddressBookView : public QWidget
     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).
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
@@ -12,102 +12,106 @@
     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 );
-    QGridLayout *groupLayout = new QGridLayout( group->layout(), 2, 2,
+    Q3GroupBox *group = new Q3GroupBox( 0, Qt::Vertical, title, this );
+    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* ) ),
-           SLOT( selectionChanged( QListBoxItem* ) ) );
+  connect( mBox, SIGNAL( selectionChanged( Q3ListBoxItem* ) ),
+           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 )
 {
@@ -134,72 +138,72 @@ void NamePartWidget::add()
   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() ) );
@@ -224,15 +228,15 @@ void AddresseeWidget::restoreSettings()
 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
-#include "addresseewidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -20,54 +20,54 @@
     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 QListBoxItem;
+class Q3ListBox;
+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();
     
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
@@ -13,47 +13,50 @@
     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();
-  QGridLayout *layout = new QGridLayout( page, 1, 1, marginHint(), spacingHint() );
+  Q3Frame *page = plainPage();
+  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
-#include "extensionconfigdialog.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -13,34 +13,38 @@
     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 <qgroupbox.h>
+#include <q3frame.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>
@@ -48,85 +52,85 @@
 #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 );
 
@@ -145,31 +149,31 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   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 );
-  boxLayout = new QVBoxLayout( groupBox->layout() );
+  Q3GroupBox* groupBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Extensions (restart)" ), extensionPage );
+  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 );
@@ -180,28 +184,28 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
 
   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* ) ),
-           SLOT( selectionChanged( QListViewItem* ) ) );
-  connect( mExtensionView, SIGNAL( clicked( QListViewItem* ) ),
-           SLOT( itemClicked( QListViewItem* ) ) );
+  connect( mExtensionView, SIGNAL( selectionChanged( Q3ListViewItem* ) ),
+           SLOT( selectionChanged( Q3ListViewItem* ) ) );
+  connect( mExtensionView, SIGNAL( clicked( Q3ListViewItem* ) ),
+           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() ) );
 
 }
 
@@ -286,26 +290,26 @@ void KABConfigWidget::restoreExtensionSettings()
     if ( activeExtensions.contains( extensionFactory->identifier() ) )
       item->setOn( true );
 
 
 #endif //KAB_EMBEDDED
 
 }
 
 void KABConfigWidget::saveExtensionSettings()
 {
   QStringList activeExtensions;
 
-  QPtrList<QListViewItem> list;
-  QListViewItemIterator it( mExtensionView );
+  Q3PtrList<Q3ListViewItem> list;
+  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;
 }
 
@@ -319,52 +323,52 @@ void KABConfigWidget::configureExtension()
   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 )
-  : QCheckListItem( parent, text, CheckBox )
+ExtensionItem::ExtensionItem( Q3ListView *parent, const QString &text )
+  : 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 )
-  : QCheckListItem( parent, text, CheckBox )
+ExtensionItem::ExtensionItem( Q3ListView *parent, const QString &text, const QString &name, const QString &comment )
+  : Q3CheckListItem( parent, text, CheckBox )
 {
   mName = name;
   mComment = comment;
 }
 
 
 void ExtensionItem::setFactory( ExtensionFactory* fac )
 {
   mFactory = fac;
 }
 #endif //KAB_EMBEDDED
 
@@ -409,16 +413,15 @@ QString ExtensionItem::text( int column ) const
   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
-#include "kabconfigwidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -18,25 +18,25 @@
 
     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
 
@@ -44,26 +44,26 @@ class KABConfigWidget : public KPrefsWidget
     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 itemClicked( QListViewItem* );
+    void selectionChanged( Q3ListViewItem* );
+    void itemClicked( Q3ListViewItem* );
 
   private:
     void restoreExtensionSettings();
     void saveExtensionSettings();
 
     KListView *mExtensionView;
     QCheckBox *mSearchReturnBox;
     QCheckBox *mNameParsing;
     QCheckBox *mViewsSingleClickBox;
     QCheckBox *mAutoSearchWithWildcardBox;
     QCheckBox *mHideSearchOnSwitchBox;
     QCheckBox *mMultipleViewsAtOnce;
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
@@ -13,24 +13,26 @@
     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"
 
@@ -39,25 +41,25 @@
 
 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();
 }
@@ -78,15 +80,15 @@ 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
-#include "kcmkabconfig.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -19,49 +19,51 @@
     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 );
@@ -127,55 +129,55 @@ void KeyWidget::addKey()
   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 );
@@ -212,47 +214,47 @@ void KeyWidget::removeKey()
 
   updateKeyCombo();
 }
 
 void KeyWidget::exportKey()
 {
   KABC::Key key = (*mKeyList.at( mKeyCombo->currentItem() ) );
 
 #ifndef KAB_EMBEDDED    
   KURL url = KFileDialog::getSaveURL();
   
   KTempFile tempFile;
-  QTextStream *s = tempFile.textStream();
-  s->setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream *s = tempFile.textStream();
+  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 );
-  s.setEncoding( QTextStream::UnicodeUTF8 );
+  Q3TextStream s( &file );
+  s.setEncoding( Q3TextStream::UnicodeUTF8 );
   s << key.textData();
   file.close();
     
     
 #endif //KAB_EMBEDDED    
 
 }
 
 void KeyWidget::updateKeyCombo()
 {
   int pos = mKeyCombo->currentItem();
   mKeyCombo->clear();
@@ -263,15 +265,15 @@ void KeyWidget::updateKeyCombo()
       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
-#include "keywidget.moc"
+#ifndef KAB_EMBEDDED_
+#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,44 +1,43 @@
 #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 <qmainwindow.h>
+#include <q3mainwindow.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) )
diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp
index 199f3d6..96822d8 100644
--- a/kaddressbook/nameeditdialog.cpp
+++ b/kaddressbook/nameeditdialog.cpp
@@ -14,30 +14,32 @@
                                                                         
     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 <qlistview.h>
+#include <q3listbox.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>
@@ -48,25 +50,25 @@
 #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 );
   
@@ -286,15 +288,15 @@ void NameEditDialog::updateTypeCombo()
   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
-#include "nameeditdialog.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -307,31 +307,31 @@ QPixmap MainWindow::loadPixmap( QString name )
     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 );
-    QPopupMenu *editMenu = new QPopupMenu( this );
-    QPopupMenu *viewMenu = new QPopupMenu( this );
-    QPopupMenu *settingsMenu = new QPopupMenu( this );
-    QPopupMenu *importMenu = new QPopupMenu( this );
+    Q3PopupMenu *fileMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *editMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *viewMenu = new Q3PopupMenu( this );
+    Q3PopupMenu *settingsMenu = new Q3PopupMenu( 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() ) );
diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index df3b551..3661677 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -18,88 +18,94 @@
 
     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 <qlistview.h>
-#include <qbuttongroup.h>
-#include <qhbox.h>
+#include <q3listbox.h>
+#include <q3listview.h>
+#include <q3buttongroup.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->setFrameStyle ( QFrame::Plain );
+    sv = new Q3ScrollView( this );
+    sv->setFrameStyle ( Q3Frame::Plain );
     sv->setLineWidth ( 0 ); 
     sv->setMidLineWidth ( 0 ); 
     mw = new QWidget ( sv->viewport() );
     sv->addChild(mw);
-    sv->setResizePolicy( QScrollView::AutoOneFit );
-    mainLayout = new QVBoxLayout ( mw );
+    sv->setResizePolicy( Q3ScrollView::AutoOneFit );
+    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()
@@ -217,35 +223,35 @@ KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers()
           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 );
@@ -318,35 +324,35 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
 
 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 ] );
 
@@ -478,50 +484,50 @@ void PhoneEditWidget::updatePhoneNumber( PhoneTypeCombo *combo )
 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 )
-  : QListViewItem( parent ), mPhoneNumber( number )
+PhoneViewItem::PhoneViewItem( Q3ListView *parent, const KABC::PhoneNumber &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
 
@@ -535,69 +541,69 @@ void PhoneViewItem::makeText()
   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;
@@ -611,25 +617,25 @@ void PhoneEditDialog::slotAddPhoneNumber()
       }
       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;
 
@@ -664,35 +670,35 @@ bool PhoneEditDialog::changed() const
 }
 
 ///////////////////////////////////////////
 // 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 );
 
@@ -717,15 +723,15 @@ KABC::PhoneNumber PhoneTypeDialog::phoneNumber()
     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
-#include "phoneeditwidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -18,34 +18,38 @@
     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 <qscrollview.h>
+#include <q3ptrlist.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.
 */
@@ -67,51 +71,51 @@ class PhoneEditWidget : public QWidget
     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;
-    QPopupMenu *mPopup;
+    Q3ScrollView* sv;
+    Q3PopupMenu *mPopup;
     int mPopupCount;
     PhoneTypeNumberEdit* mPendingDelete;
     void setDefaults();
     PhoneTypeNumberEdit* appendEditCombo();
     QWidget* mw;
-    QVBoxLayout* mainLayout;
-    QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList;
+    Q3VBoxLayout* mainLayout;
+    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() {
diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp
index 4a2acc8..1c237c0 100644
--- a/kaddressbook/secrecywidget.cpp
+++ b/kaddressbook/secrecywidget.cpp
@@ -13,35 +13,37 @@
     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() ) );
 }
@@ -56,15 +58,15 @@ void SecrecyWidget::setSecrecy( const KABC::Secrecy &secrecy )
   if (secrecy.isValid())
     mSecrecyCombo->setCurrentItem( secrecy.type() );
 }
 
 KABC::Secrecy SecrecyWidget::secrecy() const
 {
   KABC::Secrecy secrecy;
   secrecy.setType( mSecrecyCombo->currentItem() );
 
   return secrecy;
 }
 
-#ifndef KAB_EMBEDDED
-#include "secrecywidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -105,15 +105,15 @@ RedoStack* RedoStack::instance()
 
 void RedoStack::redo()
 {
   Command *command;
   if (isEmpty())
     return;
     
   command = pop();
   command->redo();
   UndoStack::instance()->push( command );
 }
 
-#ifndef KAB_EMBEDDED
-#include "undo.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -16,25 +16,25 @@
     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
 };
@@ -58,25 +58,25 @@ class StackBase : public QObject
     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_;
 };
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index 5807dc0..e900b00 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -12,25 +12,25 @@
     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"
diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp
index 5daae1a..7366a0b 100644
--- a/kaddressbook/viewconfigurefieldspage.cpp
+++ b/kaddressbook/viewconfigurefieldspage.cpp
@@ -27,38 +27,42 @@
 #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 )
-      : QListBoxText( parent, field->label() ), mField( field ) {}
+    FieldItem( Q3ListBox *parent, KABC::Field *field )
+      : Q3ListBoxText( parent, field->label() ), mField( field ) {}
     
-    FieldItem( QListBox *parent, KABC::Field *field, int index )
-      : QListBoxText( parent, field->label(), parent->item( index ) ),
+    FieldItem( Q3ListBox *parent, KABC::Field *field, int 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 )
@@ -97,25 +101,25 @@ 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();
@@ -180,59 +184,59 @@ void ViewConfigureFieldsPage::slotButtonsEnabled()
 //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 ) );
@@ -240,50 +244,50 @@ void ViewConfigureFieldsPage::initGUI()
   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->setSelectionMode( QListBox::Extended );
+  mUnSelectedBox = new Q3ListBox( this );
+  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 );
@@ -292,29 +296,29 @@ void ViewConfigureFieldsPage::initGUI()
   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 );
@@ -331,21 +335,21 @@ void ViewConfigureFieldsPage::initGUI()
   // 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
-#include "viewconfigurefieldspage.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -26,26 +26,26 @@
 
 #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 QListBoxItem;
+class Q3ListBox;
+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* );
@@ -59,23 +59,23 @@ class ViewConfigureFieldsPage : public QWidget
 
     void slotShowFields( int );
     void slotButtonsEnabled();
   
   private:
     void initGUI();
     
 #ifndef KAB_EMBEDDED
     KComboBox *mCategoryCombo;
 #else //KAB_EMBEDDED
     QComboBox *mCategoryCombo;
 #endif //KAB_EMBEDDED
-    QListBox *mSelectedBox;
-    QListBox *mUnSelectedBox;
+    Q3ListBox *mSelectedBox;
+    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
@@ -18,66 +18,69 @@
                                                                         
     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 );
@@ -123,15 +126,15 @@ void ViewConfigureFilterPage::restoreSettings( KConfig *config )
 
 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
-#include "viewconfigurefilterpage.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -17,25 +17,25 @@
     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
@@ -48,16 +48,16 @@ class ViewConfigureFilterPage : public QWidget
     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
@@ -15,58 +15,61 @@
     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", 
@@ -84,31 +87,31 @@ 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();
@@ -143,17 +146,15 @@ 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
-#include "viewconfigurewidget.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -19,25 +19,25 @@
     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
@@ -65,25 +65,25 @@ class ViewConfigureWidget : public ConfigureWidget
     /**
       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
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index b5d9419..5cfe3ad 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -41,36 +41,40 @@ $Id$
 #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();
@@ -108,39 +112,39 @@ void ViewManager::restoreSettings()
   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();
 
@@ -152,25 +156,25 @@ void ViewManager::saveSettings()
 
 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 );
@@ -547,25 +551,25 @@ 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();
@@ -650,27 +654,27 @@ int ViewManager::filterPosition( const QString &name ) const
     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();
-  QPopupMenu *settingsmenu = (QPopupMenu*)mCore->getSettingsMenu();
-  QPopupMenu *filtermenu = (QPopupMenu*)mCore->getFilterMenu();
+  Q3PopupMenu *viewmenu = (Q3PopupMenu*)mCore->getViewMenu();
+  Q3PopupMenu *settingsmenu = (Q3PopupMenu*)mCore->getSettingsMenu();
+  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);
@@ -729,20 +733,20 @@ void ViewManager::initActions()
   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 );
-  mViewWidgetStack = new QWidgetStack( this );
+    Q3HBoxLayout *layout = new Q3HBoxLayout( this, 0, 0 );
+  mViewWidgetStack = new Q3WidgetStack( this );
   layout->addWidget( mViewWidgetStack );
 }
 
-#ifndef KAB_EMBEDDED
-#include "viewmanager.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -17,33 +17,35 @@
     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).
  */
@@ -136,26 +138,26 @@ class ViewManager : public QWidget
     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;
-    QDict<ViewFactory> mViewFactoryDict;
+    Q3Dict<KAddressBookView> mViewDict;
+    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
@@ -25,24 +25,32 @@
 #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 {
@@ -62,29 +70,29 @@ class CardViewTip : public QLabel {
       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,
-                             QPtrCollection::Item item2)
+    virtual int compareItems(Q3PtrCollection::Item item1,
+                             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;
@@ -152,25 +160,25 @@ class CardViewPrivate
        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
@@ -199,25 +207,25 @@ class CardViewPrivate
 };
 
 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)
@@ -304,25 +312,25 @@ void CardViewItem::paintCard(QPainter *p, QColorGroup &cg)
   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 )
@@ -399,30 +407,30 @@ int CardViewItem::height( bool allowCache ) const
   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;
@@ -441,25 +449,25 @@ void CardViewItem::insertField(const QString &label, const QString &value)
 
   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)
@@ -514,25 +522,25 @@ 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;
@@ -560,42 +568,42 @@ void CardViewItem::showFullString( const QPoint &itempos, CardViewTip *tip )
       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);
@@ -617,61 +625,61 @@ CardViewItem::Field *CardViewItem::fieldAt( const QPoint & itempos ) const
   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()->setBackgroundMode(PaletteBase);
+  viewport()->setFocusPolicy(Qt::WheelFocus);
+  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;
 }
@@ -730,25 +738,25 @@ void CardView::setCurrentItem( CardViewItem *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;
 
@@ -778,25 +786,25 @@ 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);
@@ -869,25 +877,25 @@ void CardView::setSelected(CardViewItem *item, bool selected)
     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();
@@ -946,83 +954,83 @@ void CardView::drawContents(QPainter *p, int clipx, int clipy,
   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())
     {
@@ -1047,25 +1055,25 @@ void CardView::calcLayout()
     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);
@@ -1092,25 +1100,25 @@ uint CardView::itemSpacing()
 
 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();
@@ -1162,25 +1170,25 @@ void CardView::contentsMousePressEvent(QMouseEvent *e)
     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;
@@ -1210,25 +1218,25 @@ void CardView::contentsMousePressEvent(QMouseEvent *e)
       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() );
@@ -1248,25 +1256,25 @@ void CardView::contentsMouseReleaseEvent(QMouseEvent *e)
 
   // 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
@@ -1293,47 +1301,47 @@ void CardView::contentsMouseMoveEvent( QMouseEvent *e )
 
   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();
@@ -1359,145 +1367,145 @@ void CardView::keyPressEvent( QKeyEvent *e )
   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 Key_Enter: 
+      case Qt::Key_Return:
+      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;
 
@@ -1510,25 +1518,25 @@ void CardView::keyPressEvent( QKeyEvent *e )
         }
 
         //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 );
@@ -1629,27 +1637,27 @@ void CardView::tryShowFullText()
   }
 }
 
 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.setPen( gray );
-  p.setBrush( gray );
+  p.setCompositionMode( QPainter::CompositionMode_Xor );
+  p.setPen( Qt::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;
@@ -1690,25 +1698,25 @@ 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;
@@ -1727,24 +1735,24 @@ void CardView::setMaxFieldLines( int howmany )
 }
 
 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
-#include "cardview.moc"
+#ifndef KAB_EMBEDDED_
+#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,21 +1,29 @@
 #ifndef CARDVIEW_H
 #define CARDVIEW_H
 
-#include <qscrollview.h>
-#include <qptrlist.h>
+#include <q3scrollview.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
@@ -139,25 +147,25 @@ class CardViewItem
 
 /** 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
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
@@ -10,53 +10,58 @@
  *   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);
@@ -66,28 +71,28 @@ void ColorListBox::setColor( uint index, const QColor &color )
 }
 
 
 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;
   }
 
@@ -189,25 +194,25 @@ void ColorListBox::dropEvent( QDropEvent *e )
     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 )
@@ -220,26 +225,26 @@ 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
-#include "colorlistbox.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -13,65 +13,70 @@
  *   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 width( const QListBox * ) const;
+    virtual int height( const Q3ListBox * ) 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
@@ -16,29 +16,32 @@
     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 <qgroupbox.h>
+#include <q3vbox.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    
@@ -80,25 +83,25 @@ void ConfigureCardViewWidget::restoreSettings( KConfig *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 ) );
@@ -225,145 +228,145 @@ void CardViewLookNFeelPage::enableColors()
   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 ) );
-  QWhatsThis::add( sbSpacing, i18n(
+  /* TODO:hacker: Q3WhatsThis::add( lMargin, Q3WhatsThis::textFor( sbMargin ) ); */
+  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 ) );
-  QWhatsThis::add( sbSepWidth, i18n("Sets the width of column separators") );
-  QWhatsThis::add( lSW, QWhatsThis::textFor( sbSepWidth ) );
+  /* TODO:hacker: Q3WhatsThis::add( lSpacing, Q3WhatsThis::textFor( sbSpacing ) ); */
+  Q3WhatsThis::add( sbSepWidth, i18n("Sets the width of column separators") );
+  /* 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
-#include "configurecardviewdialog.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -17,27 +17,29 @@
     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;
 
 /**
@@ -68,25 +70,25 @@ class ConfigureCardViewWidget : public ViewConfigureWidget
     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();
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
@@ -18,29 +18,32 @@
                                                                         
     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 <qbuttongroup.h>
+#include <q3vbox.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    
@@ -75,25 +78,25 @@ void ConfigureTableViewWidget::restoreSettings( KConfig *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));
@@ -220,30 +223,30 @@ void LookAndFeelPage::enableColors()
     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
@@ -253,93 +256,93 @@ void LookAndFeelPage::initGUI()
   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    
-#include "configuretableviewdialog.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -17,25 +17,27 @@
     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;
@@ -54,25 +56,25 @@ class ConfigureTableViewWidget : public ViewConfigureWidget
     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 );
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
@@ -12,67 +12,73 @@
     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 <qiconset.h>
+#include <q3header.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;
 
@@ -142,71 +148,71 @@ void DynamicTip::maybeTip( const QPoint &pos )
         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;
@@ -279,25 +285,25 @@ ContactListView::ContactListView(KAddressBookTableView *view,
 
           
   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 );
@@ -334,35 +340,35 @@ void ContactListView::paintEmptyArea( QPainter * p, const QRect & 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 )
@@ -415,15 +421,15 @@ void ContactListView::keyPressEvent ( QKeyEvent * 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    
-#include "contactlistview.moc"
+#ifndef KAB_EMBEDDED_
+#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,35 +1,39 @@
 #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
 {
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
@@ -12,31 +12,36 @@
     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"
@@ -116,48 +121,48 @@ AddresseeCardView::AddresseeCardView(QWidget *parent, const char *name)
 
 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()
@@ -167,25 +172,25 @@ void AddresseeCardView::startDrag()
 
 
 ///////////////////////////////
 // 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*)));
@@ -511,15 +516,15 @@ void KAddressBookCardView::addresseeSelected()
             if ( aItem )
             {
                 emit selected(aItem->addressee().uid());
                 found = true;
             }
         }
     }
 
     if (!found)
         emit selected(QString::null);
 
 }
-#ifndef KAB_EMBEDDED
-#include "kaddressbookcardview.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -16,24 +16,27 @@
     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;
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
@@ -13,37 +13,45 @@
     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:
@@ -64,82 +72,82 @@ extern "C" {
   {
     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 );
-  setResizeMode( QIconView::Adjust );
+  setSelectionMode( Q3IconView::Extended );
+  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>&)),
-          this, SLOT(itemDropped(QDropEvent*, const QValueList<QIconDragItem>&)));
+  connect(this, SIGNAL(dropped(QDropEvent*, const Q3ValueList<Q3IconDragItem>&)),
+          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)
-      : QIconViewItem(parent), mFields( fields ), mDocument(doc), mAddressee(a)
+                          Q3IconView *parent)
+      : 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()
     {
@@ -191,36 +199,36 @@ class AddresseeIconViewItem : public QIconViewItem
     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 *)),
-            this, SLOT(addresseeExecuted(QIconViewItem *)));
+    connect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
+            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()
 {
 }
@@ -239,38 +247,38 @@ void KAddressBookIconView::scrollUP()
 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 *)),
-             this, SLOT(addresseeExecuted(QIconViewItem *)));
+  disconnect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
+             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 *)),
-            this, SLOT(addresseeExecuted(QIconViewItem *)));
+    connect(mIconView, SIGNAL(selectionChanged(Q3IconViewItem *)),
+            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())
@@ -327,47 +335,47 @@ void KAddressBookIconView::doSearch( const QString&  s ,KABC::Field *field )
     }
     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;
@@ -397,25 +405,25 @@ void KAddressBookIconView::refresh(QString uid)
       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())
          {
@@ -426,40 +434,40 @@ void KAddressBookIconView::setSelected(QString uid, bool selected)
 #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);
@@ -467,15 +475,15 @@ void KAddressBookIconView::addresseeSelected()
         if (aItem)
         {
           emit selected(aItem->addressee().uid());
           found = true;
         }
       }
     }
     
     if (!found)
         emit selected(QString::null);
 }
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbookiconview.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -16,38 +16,41 @@
     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 <qptrlist.h>
+#include <q3iconview.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
     
@@ -59,65 +62,65 @@ class KAddressBookIconView : public KAddressBookView
     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"; }
 
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,57 +1,61 @@
 // $Id$
 
-#include <qvbox.h>
-#include <qlistbox.h>
+#include <q3vbox.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();
@@ -68,75 +72,75 @@ 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*)),
-                   this, SLOT(addresseeExecuted(QListViewItem*)));
-        disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
-                   this, SLOT(addresseeExecuted(QListViewItem*)));
+        disconnect(mListView, SIGNAL(executed(Q3ListViewItem*)),
+                   this, SLOT(addresseeExecuted(Q3ListViewItem*)));
+        disconnect(mListView, SIGNAL(doubleClicked(Q3ListViewItem*)),
+                   this, SLOT(addresseeExecuted(Q3ListViewItem*)));
         disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
                    SIGNAL(startDrag()));
-        disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+        disconnect(mListView, SIGNAL(returnPressed(Q3ListViewItem*)),
+          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*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(executed(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
   } else {
     //    qDebug("KAddressBookTableView::reconstructListView double");
-    connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(doubleClicked(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
   }
-    connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(returnPressed(Q3ListViewItem*)),
+          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();
 }
 
@@ -335,47 +339,47 @@ void KAddressBookTableView::refresh(QString uid)
     // 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
 
@@ -385,25 +389,25 @@ QStringList KAddressBookTableView::selectedUids()
     }
     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);
@@ -420,49 +424,49 @@ void KAddressBookTableView::setSelected(QString uid, bool 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)
@@ -478,15 +482,15 @@ void KAddressBookTableView::addresseeExecuted(QListViewItem *item)
 
 void KAddressBookTableView::addresseeDeleted()
 {
 
          emit deleteRequest();
 
 }
 
 
 
 
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbooktableview.moc"
+#ifndef KAB_EMBEDDED_
+#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,43 +1,45 @@
 #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 QListBox;
-class QVBoxLayout;
+class Q3ListViewItem;
+class Q3ListBox;
+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.
  *
@@ -70,28 +72,28 @@ friend class ContactListView;
   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 );
     }
 
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
@@ -21,25 +21,25 @@
     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>
 
@@ -95,45 +95,45 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
       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
@@ -142,25 +142,25 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const QString&
 
 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 << ",";
 
@@ -178,17 +178,15 @@ void CSVXXPort::doExport( QFile *fp, const KABC::AddresseeList &list )
     for ( fieldIter = fields.begin(); fieldIter != fields.end(); ++fieldIter ) {
       if ( !first )
         t << ",";
 
       t << "\"" << (*fieldIter)->value( addr ) << "\"";
       first = false;
     }
 
     t << "\n";
   }
 }
 
-#ifndef KAB_EMBEDDED
-#include "csv_xxport.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -18,54 +18,58 @@
    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( '"' ),
@@ -152,50 +156,50 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, QWidget *parent,
   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() ) ) 
       {
@@ -220,25 +224,25 @@ KABC::AddresseeList CSVImportDialog::contacts() const
         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;
@@ -373,44 +377,44 @@ KABC::AddresseeList CSVImportDialog::contacts() const
 
     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 );
@@ -441,26 +445,26 @@ void CSVImportDialog::initGUI()
   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->setSelectionMode( QTable::NoSelection );
+  mTable = new Q3Table( 0, 0, page );
+  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 );
  
@@ -474,68 +478,68 @@ void CSVImportDialog::initGUI()
 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 :
@@ -552,81 +556,81 @@ void CSVImportDialog::fillTable()
             ++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 = "";
   }
@@ -640,25 +644,25 @@ void CSVImportDialog::fillTable()
   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()
 {
@@ -755,25 +759,25 @@ void CSVImportDialog::textquoteSelected( const QString& mark )
 
 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()
@@ -827,25 +831,25 @@ void CSVImportDialog::applyTemplate()
   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 );
@@ -869,25 +873,25 @@ void CSVImportDialog::saveTemplate()
   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 )
@@ -925,25 +929,25 @@ int CSVImportDialog::typeToPos( uint type ) const
 
 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 );
@@ -955,15 +959,15 @@ void CSVImportDialog::setFile( const QString &fileName )
 
 void CSVImportDialog::urlChanged( const QString &file )
 {
   bool state = !file.isEmpty();
 
   enableButtonOK( state );
  
   findButton( User1 )->setEnabled( state );
   findButton( User2 )->setEnabled( state );
  
 }
 
-#ifndef KAB_EMBEDDED
-#include <csvimportdialog.moc>
+#ifndef KAB_EMBEDDED_
+#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
@@ -24,35 +24,35 @@ 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;
 
@@ -76,26 +76,26 @@ class CSVImportDialog : public KDialogBase
   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;
-    QButtonGroup* mDelimiterBox;
+    Q3Table* mTable;
+    Q3ButtonGroup* mDelimiterBox;
     QRadioButton* mRadioComma;
     QRadioButton* mRadioSemicolon;
     QRadioButton* mRadioTab;
     QRadioButton* mRadioSpace;
     QRadioButton* mRadioOther;
     QLineEdit* mDelimiterEdit;
     QComboBox* mComboLine;
     QComboBox* mComboQuote;
     QComboBox* mComboCodec;
     QCheckBox* mIgnoreDuplicates;
     KURLRequester* mUrlRequester;
 
@@ -110,17 +110,17 @@ class CSVImportDialog : public KDialogBase
     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
@@ -107,15 +107,15 @@ KABC::AddresseeList KDE2XXPort::importContacts( const QString& ) const
   } 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
-#include "kde2_xxport.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -20,26 +20,28 @@
   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>
@@ -93,32 +95,32 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &list, const QString
         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 );
-    t.setEncoding( QTextStream::UnicodeUTF8 );
+    Q3TextStream t( &outFile );
+    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;
 
@@ -144,25 +146,25 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
         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 );
@@ -187,26 +189,26 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
                 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 ) ) {
-            QCString rawData ( file.readAll().data(),file.size()+1);
+        if ( file.open( QIODevice::ReadOnly ) ) {
+            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;
             }
@@ -258,15 +260,15 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
       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
-#include "vcard_xxport.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -21,24 +21,26 @@
     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"
@@ -208,63 +210,60 @@ void XXPortManager::loadPlugins()
       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 ( ; it.current(); ++it )
-  {
-    XXPortFactory *xxportFactory = it.current();
+  for(QList<XXPortFactory*>::iterator it=factorylist.begin();it!=factorylist.end();++it) {
+    XXPortFactory *xxportFactory = *it;
 #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
-#include "xxportmanager.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -23,25 +23,25 @@
 
 /*
 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
 
@@ -62,19 +62,19 @@ class XXPortManager : public QObject
 
   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
@@ -262,15 +262,15 @@ KABC::AddresseeList XXPortResourceObject::_importContacts( const QString& identi
   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
-#include "xxportobject.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -27,73 +27,78 @@ 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* ) ),
-           SLOT( categoryClicked( QListViewItem* ) ) );
+  connect( mCategoriesView, SIGNAL( clicked( Q3ListViewItem* ) ),
+           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 )
@@ -201,112 +206,112 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
     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
@@ -326,17 +331,15 @@ void XXPortSelectDialog::initGUI()
   topLayout->addWidget( sortingGroup );
 
   if ( !mUseSorting )
     sortingGroup->hide(); 
   if (QApplication::desktop()->width() <= 640 ) {
       showMaximized();
 #ifndef DESKTOP_VERSION
   hideButtons();
 #endif
   }
 }
 
-#ifndef KAB_EMBEDDED
-#include "xxportselectdialog.moc"
+#ifndef KAB_EMBEDDED_
+#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
@@ -21,63 +21,63 @@
     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 QListViewItem;
+class Q3ListView;
+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