1 files changed, 33 insertions, 27 deletions

diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp
index df3b551..3661677 100644
--- a/kaddressbook/phoneeditwidget.cpp
+++ b/kaddressbook/phoneeditwidget.cpp
@@ -29,6 +29,6 @@
 #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>
@@ -36,2 +36,8 @@
 #include <qapplication.h> 
+//Added by qt3to4:
+#include <Q3ValueList>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
@@ -59,3 +65,3 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
 {
-    QGridLayout* gridLayout = new QGridLayout ( this, 2,2 );
+    Q3GridLayout* gridLayout = new Q3GridLayout ( this, 2,2 );
 
@@ -69,4 +75,4 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
 
-    sv = new QScrollView( this );
-    sv->setFrameStyle ( QFrame::Plain );
+    sv = new Q3ScrollView( this );
+    sv->setFrameStyle ( Q3Frame::Plain );
     sv->setLineWidth ( 0 ); 
@@ -75,4 +81,4 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
     sv->addChild(mw);
-    sv->setResizePolicy( QScrollView::AutoOneFit );
-    mainLayout = new QVBoxLayout ( mw );
+    sv->setResizePolicy( Q3ScrollView::AutoOneFit );
+    mainLayout = new Q3VBoxLayout ( mw );
     mainLayout->setMargin( 0 );
@@ -92,3 +98,3 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
     mTypeNumberEditList.setAutoDelete( true );
-    mPopup = new QPopupMenu( this );
+    mPopup = new Q3PopupMenu( this );
     QStringList list = PhoneNumber::supportedTypeListNames();
@@ -228,3 +234,3 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
 {
-  QGridLayout *layout = new QGridLayout( this, 4, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( this, 4, 1 );
 //US  layout->setSpacing( KDialog::spacingHint() );
@@ -238,3 +244,3 @@ PhoneEditWidget::PhoneEditWidget( QWidget *parent, const char *name )
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, 0 ) );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
 //US  layout->addMultiCellWidget( label, 0, 1, 3, 3 );
@@ -329,3 +335,3 @@ void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &list )
 
-  QValueList<int> defaultTypes;
+  Q3ValueList<int> defaultTypes;
   defaultTypes << KABC::PhoneNumber::Home;
@@ -339,3 +345,3 @@ void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &list )
   // combos.
-  QValueList<int>::ConstIterator it;
+  Q3ValueList<int>::ConstIterator it;
   for( it = defaultTypes.begin(); it != defaultTypes.end(); ++it ) {
@@ -489,6 +495,6 @@ void PhoneEditWidget::updateOtherEdit( PhoneTypeCombo *combo, PhoneTypeCombo *ot
 
-class PhoneViewItem : public QListViewItem
+class PhoneViewItem : public Q3ListViewItem
 {
 public:
-  PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number );
+  PhoneViewItem( Q3ListView *parent, const KABC::PhoneNumber &number );
 
@@ -513,4 +519,4 @@ private:
 
-PhoneViewItem::PhoneViewItem( QListView *parent, const KABC::PhoneNumber &number )
-  : QListViewItem( parent ), mPhoneNumber( number )
+PhoneViewItem::PhoneViewItem( Q3ListView *parent, const KABC::PhoneNumber &number )
+  : Q3ListViewItem( parent ), mPhoneNumber( number )
 { 
@@ -546,3 +552,3 @@ PhoneEditDialog::PhoneEditDialog( const KABC::PhoneNumber::List &list, QWidget *
 
-  QGridLayout *layout = new QGridLayout( page, 1, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( page, 1, 2 );
   layout->setSpacing( spacingHint() );
@@ -554,3 +560,3 @@ PhoneEditDialog::PhoneEditDialog( const KABC::PhoneNumber::List &list, QWidget *
 
-  KButtonBox *buttonBox = new KButtonBox( page, Vertical );
+  KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical );
 
@@ -567,3 +573,3 @@ PhoneEditDialog::PhoneEditDialog( const KABC::PhoneNumber::List &list, QWidget *
   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()));
 
@@ -590,3 +596,3 @@ void PhoneEditDialog::slotAddPhoneNumber()
   if ( dlg.exec() ) {
-      QListViewItem* i = mListView->firstChild();
+      Q3ListViewItem* i = mListView->firstChild();
       KABC::PhoneNumber phoneNumber = dlg.phoneNumber();
@@ -622,3 +628,3 @@ void PhoneEditDialog::slotRemovePhoneNumber()
   mPhoneNumberList.remove( item->phoneNumber() );
-  QListViewItem *currItem = mListView->currentItem();
+  Q3ListViewItem *currItem = mListView->currentItem();
   mListView->takeItem( currItem );
@@ -675,3 +681,3 @@ PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
   QLabel *label = 0;
-  QGridLayout *layout = new QGridLayout( page, 3, 2, marginHint(), spacingHint() );
+  Q3GridLayout *layout = new Q3GridLayout( page, 3, 2, marginHint(), spacingHint() );
 
@@ -685,3 +691,3 @@ PhoneTypeDialog::PhoneTypeDialog( const KABC::PhoneNumber &phoneNumber,
 
-  mGroup = new QButtonGroup( 2, Horizontal, i18n( "Types" ), page );
+  mGroup = new Q3ButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page );
   layout->addMultiCellWidget( mGroup, 2, 2, 0, 1 );
@@ -728,4 +734,4 @@ KABC::PhoneNumber PhoneTypeDialog::phoneNumber()
 #endif
-#ifndef KAB_EMBEDDED
-#include "phoneeditwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_phoneeditwidget.cpp"
 #endif //KAB_EMBEDDED