1 files changed, 9 insertions, 7 deletions

diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp
index e72face..09df47f 100644
--- a/kaddressbook/emaileditwidget.cpp
+++ b/kaddressbook/emaileditwidget.cpp
@@ -15,60 +15,62 @@
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qcheckbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qstring.h>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #endif //KAB_EMBEDDED
 #include <kconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 #include "emaileditwidget.h"
 
 EmailEditWidget::EmailEditWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2, 2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2, 2 );
   topLayout->setSpacing( KDialog::spacingHint() );
   QLabel* label = new QLabel( this );
 
   label->setPixmap( KGlobal::iconLoader()->loadIcon( "mail_send", KIcon::Desktop, 0) );
 
   topLayout->addWidget( label, 0, 0 );
-  label->setAlignment( AlignCenter );
+  label->setAlignment( Qt::AlignCenter );
   QPushButton *editButton = new QPushButton( i18n( "Edit Email Addresses..." ), this);
   topLayout->addWidget( editButton,  0, 1 );
   label = new QLabel( i18n( "Email:" ), this );
   topLayout->addWidget( label, 1, 0 );
 
   mEmailEdit = new KLineEdit( this );
   connect( mEmailEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( textChanged( const QString& ) ) );
   connect( mEmailEdit, SIGNAL( textChanged( const QString& ) ),
            SIGNAL( modified() ) );
   label->setBuddy( mEmailEdit );
   topLayout->addWidget( mEmailEdit, 1, 1 );
 
  
   connect( editButton, SIGNAL( clicked() ), SLOT( edit() ) );
 
@@ -124,50 +126,50 @@ void EmailEditWidget::textChanged( const QString &text )
 {
   if ( mEmailList.count() > 0 )
     mEmailList.remove( mEmailList.begin() );
 
   mEmailList.prepend( text );
 }
 
 
 EmailEditDialog::EmailEditDialog( const QStringList &list, QWidget *parent,
                                   const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Email Addresses" ),
                  KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok,
                  parent, name, true )
 {
   QWidget *page = plainPage();
 
-  QGridLayout *topLayout = new QGridLayout( page, 4, 3 );
+  Q3GridLayout *topLayout = new Q3GridLayout( page, 4, 3 );
 
   QLabel *label = new QLabel( i18n( "Email address:" ), page );
   topLayout->addWidget( label, 0, 0 );
 
   mEmailEdit = new KLineEdit( page );
   label->setBuddy( mEmailEdit );
   topLayout->addWidget( mEmailEdit, 0, 1 );
   connect( mEmailEdit, SIGNAL( returnPressed() ), SLOT( add() ) );
   connect( mEmailEdit, SIGNAL( textChanged( const QString& ) ),
            SLOT( emailChanged() ) );
 
   mAddButton = new QPushButton( i18n( "Add" ), page );
   mAddButton->setEnabled( false );
   connect( mAddButton, SIGNAL( clicked() ), SLOT( add() ) );
   topLayout->addWidget( mAddButton, 0, 2 );
 
-  mEmailListBox = new QListBox( page );
+  mEmailListBox = new Q3ListBox( page );
 
   // Make sure there is room for the scrollbar
   mEmailListBox->setMinimumHeight( mEmailListBox->sizeHint().height() + 30 );
   connect( mEmailListBox, SIGNAL( highlighted( int ) ),
            SLOT( selectionChanged( int ) ) );
   topLayout->addMultiCellWidget( mEmailListBox, 1, 3, 0, 1 );
 
   mEditButton = new QPushButton( i18n( "Change" ), page );
   connect( mEditButton, SIGNAL( clicked() ), SLOT( edit() ) );
   topLayout->addWidget( mEditButton, 1, 2 );
 
   mRemoveButton = new QPushButton( i18n( "Remove" ), page );
   connect( mRemoveButton, SIGNAL( clicked() ), SLOT( remove() ) );
   topLayout->addWidget( mRemoveButton, 2, 2 );
 
   mStandardButton = new QPushButton( i18n( "Set Standard" ), page );
@@ -259,19 +261,19 @@ void EmailEditDialog::standard()
 }
 
 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