layout bugfixes

2 files changed, 1 insertions, 7 deletions

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index af149a0..0564e85 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -106,7 +106,6 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
   QString dynamicPart;
 
   dynamicPart += getPhoneNumbers( true );
-  qDebug("dynamic preferred %s ",dynamicPart.latin1() );
   QStringList emails = mAddressee.emails();
   QStringList::ConstIterator emailIt;
   QString type = i18n( "Email" );
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 50b6b6d..4db0a20 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -300,7 +300,7 @@ void AddresseeEditorWidget::setupTab1()
   layout->addMultiCellWidget( bar, 10, 10, 0, 6 );
 */  
   ///////////////////////////////////////
-  QHBox *categoryBox = new QHBox( tab1 );
+      QHBox *categoryBox = new QHBox( tab1 ,"cato");
   categoryBox->setSpacing( KDialogBase::spacingHint() );
   categoryBox->setMargin( KDialogBase::marginHintSmall() );
   
@@ -614,19 +614,16 @@ void AddresseeEditorWidget::setupTab2()
       if ( QApplication::desktop()->width() == 640 ) {
           QHBox * nbox = new QHBox ( tab2 );
           label = new QLabel( i18n( "Nick name:" )+" ", nbox );
-          layout->addWidget( label, iii, 1 );
           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 );
-          layout->addWidget( label, iii, 1 );
           mSpouseEdit = new KLineEdit(  nbox );
           connect( mSpouseEdit, SIGNAL( textChanged( const QString& ) ),
                    SLOT( textChanged( const QString& ) ) );
           label->setBuddy( mSpouseEdit );
-          layout->addWidget( mSpouseEdit, iii, 2 );
           layout->addMultiCellWidget( nbox, iii, iii, 1, 2 );
           ++iii;
 
@@ -661,7 +658,6 @@ void AddresseeEditorWidget::setupTab2()
       if ( QApplication::desktop()->width() == 640 ) {
           QHBox * nbox = new QHBox ( tab2 );
           label = new QLabel( i18n( "Birthday:" )+" ", nbox );
-          layout->addWidget( label, iii, 1 );
           mBirthdayPicker = new KDateEdit(  nbox  );
           mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
@@ -671,7 +667,6 @@ void AddresseeEditorWidget::setupTab2()
           label->setBuddy( mBirthdayPicker );
   
           label = new QLabel(  " "+i18n( "Anniversary:" )+" ",  nbox  );
-          layout->addWidget( label, iii, 1 );
           mAnniversaryPicker = new KDateEdit(  nbox  );
           mAnniversaryPicker->setHandleInvalid( true );
           connect( mAnniversaryPicker, SIGNAL( dateChanged( QDate ) ),