6 files changed, 70 insertions, 58 deletions

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
@@ -23,8 +23,12 @@
 
-#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>
 
@@ -47,3 +51,3 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
   {
-    QGridLayout* layout = new QGridLayout( this, 1, 1, KDialog::marginHintSmall(),
+    Q3GridLayout* layout = new Q3GridLayout( this, 1, 1, KDialog::marginHintSmall(),
                                          KDialog::spacingHintSmall() );
@@ -53,3 +57,3 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
     
-    mBox = new QListBox( this );
+    mBox = new Q3ListBox( this );
     mBox->setMaximumSize(70, 70);
@@ -72,9 +76,9 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
   {
-    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 );
     
@@ -99,4 +103,4 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
 
-  connect( mBox, SIGNAL( selectionChanged( QListBoxItem* ) ),
-           SLOT( selectionChanged( QListBoxItem* ) ) );
+  connect( mBox, SIGNAL( selectionChanged( Q3ListBoxItem* ) ),
+           SLOT( selectionChanged( Q3ListBoxItem* ) ) );
   connect( mEdit, SIGNAL( textChanged( const QString& ) ),
@@ -145,3 +149,3 @@ void NamePartWidget::remove()
 
-void NamePartWidget::selectionChanged( QListBoxItem *item )
+void NamePartWidget::selectionChanged( Q3ListBoxItem *item )
 {
@@ -159,3 +163,3 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
 {
-  QGridLayout *layout;
+  Q3GridLayout *layout;
 
@@ -180,3 +184,3 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   {
-    layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(),
+    layout = new Q3GridLayout( this, 4, 2, KDialog::marginHintSmall(),
                                          KDialog::spacingHintSmall() );
@@ -192,3 +196,3 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   {
-    layout = new QGridLayout( this, 2, 3, KDialog::marginHint(),
+    layout = new Q3GridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
@@ -235,4 +239,4 @@ void AddresseeWidget::saveSettings()
 
-#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
@@ -31,4 +31,4 @@ class KLineEdit;
 
-class QListBox;
-class QListBoxItem;
+class Q3ListBox;
+class Q3ListBoxItem;
 class QPushButton;
@@ -54,3 +54,3 @@ class NamePartWidget : public QWidget
 
-    void selectionChanged( QListBoxItem* );
+    void selectionChanged( Q3ListBoxItem* );
     void textChanged( const QString& );
@@ -60,3 +60,3 @@ class NamePartWidget : public QWidget
 
-    QListBox *mBox;
+    Q3ListBox *mBox;
     QPushButton *mAddButton;
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
@@ -24,2 +24,5 @@
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 
@@ -36,4 +39,4 @@ ExtensionConfigDialog::ExtensionConfigDialog( ExtensionFactory *factory, KConfig
 {
-  QFrame *page = plainPage();
-  QGridLayout *layout = new QGridLayout( page, 1, 1, marginHint(), spacingHint() );
+  Q3Frame *page = plainPage();
+  Q3GridLayout *layout = new Q3GridLayout( page, 1, 1, marginHint(), spacingHint() );
 
@@ -56,4 +59,4 @@ void ExtensionConfigDialog::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
@@ -24,4 +24,4 @@
 #include <qcheckbox.h>
-#include <qframe.h>
-#include <qgroupbox.h>
+#include <q3frame.h>
+#include <q3groupbox.h>
 #include <qlayout.h>
@@ -33,3 +33,7 @@
 #include <qfile.h>
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <Q3PtrList>
+#include <Q3VBoxLayout>
 
@@ -59,3 +63,3 @@
 
-class ExtensionItem : public QCheckListItem
+class ExtensionItem : public Q3CheckListItem
 {
@@ -64,6 +68,6 @@ class ExtensionItem : public QCheckListItem
 #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 );
@@ -92,3 +96,3 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this, 0,
                                             KDialog::spacingHintSmall() );
@@ -100,3 +104,3 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   QWidget *generalPage = new QWidget( this );
-  QVBoxLayout *layout = new QVBoxLayout( generalPage, KDialog::marginHintSmall(),
+  Q3VBoxLayout *layout = new Q3VBoxLayout( generalPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
@@ -105,3 +109,3 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   QWidget *hBox = new QWidget( generalPage, "qhbox" );
-  QHBoxLayout *hboxLayout = new QHBoxLayout( hBox);
+  Q3HBoxLayout *hboxLayout = new Q3HBoxLayout( hBox);
   KPrefsWidFont *detailsFont =
@@ -119,3 +123,3 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
    QWidget *vBox = new QWidget( generalPage, "qvbox" );
-  QVBoxLayout *boxLayout = new QVBoxLayout( vBox );
+  Q3VBoxLayout *boxLayout = new Q3VBoxLayout( vBox );
   boxLayout->setAlignment( Qt::AlignTop );
@@ -156,3 +160,3 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   QWidget *extensionPage = new QWidget( this );
-  QVBoxLayout *extensionLayout = new QVBoxLayout( extensionPage, KDialog::marginHintSmall(),
+  Q3VBoxLayout *extensionLayout = new Q3VBoxLayout( extensionPage, KDialog::marginHintSmall(),
                                             KDialog::spacingHintSmall() );
@@ -161,4 +165,4 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
 
-  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 );
@@ -191,6 +195,6 @@ KABConfigWidget::KABConfigWidget( KABPrefs* prefs, QWidget *parent, const char *
   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() ),
@@ -297,4 +301,4 @@ void KABConfigWidget::saveExtensionSettings()
 
-  QPtrList<QListViewItem> list;
-  QListViewItemIterator it( mExtensionView );
+  Q3PtrList<Q3ListViewItem> list;
+  Q3ListViewItemIterator it( mExtensionView );
   while ( it.current() ) {
@@ -330,3 +334,3 @@ void KABConfigWidget::configureExtension()
 
-void KABConfigWidget::selectionChanged( QListViewItem *i )
+void KABConfigWidget::selectionChanged( Q3ListViewItem *i )
 {
@@ -339,3 +343,3 @@ void KABConfigWidget::selectionChanged( QListViewItem *i )
 
-void KABConfigWidget::itemClicked( QListViewItem *item )
+void KABConfigWidget::itemClicked( Q3ListViewItem *item )
 {
@@ -346,4 +350,4 @@ void KABConfigWidget::itemClicked( QListViewItem *item )
 #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 )
 {
@@ -356,4 +360,4 @@ void ExtensionItem::setService( const KService::Ptr &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 )
 {
@@ -420,5 +424,4 @@ QString ExtensionItem::text( int column ) const
 
-#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
@@ -29,3 +29,3 @@
 class QCheckBox;
-class QListViewItem;
+class Q3ListViewItem;
 class QPushButton;
@@ -55,4 +55,4 @@ class KABConfigWidget : public KPrefsWidget
     void configureExtension();
-    void selectionChanged( QListViewItem* );
-    void itemClicked( QListViewItem* );
+    void selectionChanged( Q3ListViewItem* );
+    void itemClicked( Q3ListViewItem* );
 
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
@@ -24,2 +24,4 @@
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
 
@@ -50,3 +52,3 @@ KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name )
     //abort();
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
   mConfigWidget = new KABConfigWidget( (KABPrefs*)getPreferences(), this, "KABConfigWidget" );
@@ -89,4 +91,4 @@ const KAboutData* KCMKabConfig::aboutData() const
 
-#ifndef KAB_EMBEDDED
-#include "kcmkabconfig.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kcmkabconfig.cpp"
 #endif //KAB_EMBEDDED