commit

1 files changed, 8 insertions, 8 deletions

diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h
index 6a514ed..c730c7b 100644
--- a/kaddressbook/phoneeditwidget.h
+++ b/kaddressbook/phoneeditwidget.h
@@ -53,36 +53,39 @@ class PhoneEditWidget : public QScrollView
 
   public:
     PhoneEditWidget( QWidget *parent, const char *name = 0 );
     ~PhoneEditWidget();
     
     void setPhoneNumbers( const KABC::PhoneNumber::List &list );
     KABC::PhoneNumber::List phoneNumbers();
 
     //  void updateTypeCombo( const KABC::PhoneNumber::List&, KComboBox* );
     //KABC::PhoneNumber currentPhoneNumber( KComboBox*, int );
 
   signals:
     void modified();
     void  typeChange( int oldType, int newType );
 
   private slots:
+    void deleteEdit(  PhoneTypeNumberEdit* ew );
     void  addNumber();
+    void pendingDelete();
   protected:
 
   private:
+    PhoneTypeNumberEdit* mPendingDelete;
     void setDefaults();
     PhoneTypeNumberEdit* appendEditCombo();
     QWidget* mw;
     QVBoxLayout* mainLayout;
     QPtrList <PhoneTypeNumberEdit> mTypeNumberEditList;
     
     KABC::PhoneNumber::List mPhoneList;
 };
   
 
 
 
 
 #if 0
 class PhoneEditWidget : public QWidget
 {
@@ -199,89 +202,86 @@ public:
       {
           QHBoxLayout * lay = new QHBoxLayout( this );
           lay->setSpacing( KDialogBase::spacingHintSmall() );
           lay->setMargin( KDialogBase::marginHintSmall() );
           mMinusButton = new QPushButton ( this );
           mMinusButton->setPixmap ( SmallIcon("minus"));
           mCombo = new KComboBox( this );
           mNumber = new KLineEdit( this );
           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() );
-          mIsValid = true;
       }
-
+        ~PhoneTypeNumberEdit() {
+            // qDebug("~PhoneTypeNumberEdit() ");
+        }
   void setPhoneNumber( const KABC::PhoneNumber &phoneNumber )
   {
       mPhoneNumber = phoneNumber;
       int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() );
       mCombo->setCurrentItem( index );
       mNumber->setText( mPhoneNumber.number() );
-      mIsValid = true;
       show();
 
   }
   KABC::PhoneNumber phoneNumber()
       {
           mPhoneNumber.setNumber( mNumber->text() );
           int index = mCombo->currentItem();
           mPhoneNumber.setType( PhoneNumber::supportedTypeList()[index]  );
           return mPhoneNumber;
       }
   bool isValid()
   {
-      if ( !mIsValid ) return false;
       if ( mNumber->text().isEmpty() )return false;
       return true;
   }
   private slots:
   void  typeExternalChanged( int oldType, int newType )
   {
       if ( mPhoneNumber.type() == newType ) {
           mPhoneNumber.setType(oldType);
           int index = PhoneNumber::typeListIndex4Type( mPhoneNumber.type() );
           mCombo->setCurrentItem( index );
       }
   }
   void deleteNumber()
   { 
-      emit modified();
-      hide();
-      mIsValid = false;
+      emit deleteMe( this );
   }
   void comboTypeChange( int index )
   {
       int old = mPhoneNumber.type();
       int newT = PhoneNumber::supportedTypeList()[index];
       if ( old != newT ) {
           emit modified();
           emit typeChange ( old, newT );
           mPhoneNumber.setType(newT );
       }
 
   }
   int currentType()
   {
       return mCombo->currentItem();
   }
   void textChanged ( const QString & )
   {
       emit modified();
   }
  signals:
 void  typeChange( int oldType, int newType );
  void modified();
+ void deleteMe(  PhoneTypeNumberEdit* );
 
 private:
- bool mIsValid;
   KABC::PhoneNumber mPhoneNumber;
   QPushButton* mMinusButton;
   KComboBox *mCombo;
   KLineEdit *mNumber;
 };
 
 #endif