Fixed the qdialog::accept problem

2 files changed, 4 insertions, 3 deletions

diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 6bc4129..d8c1aca 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -7,115 +7,116 @@
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     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 <qlayout.h>
 #include <qapplication.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 #include "addresseeeditorwidget.h"
 #include "kabcore.h"
 
 #include "addresseeeditordialog.h"
 
 AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
                                               const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), 
                  KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
                  KDialogBase::Ok, parent, name, true )
 {
 
 
   QWidget *page = plainPage();
   
   QVBoxLayout *layout = new QVBoxLayout( page );
 
   mEditorWidget = new AddresseeEditorWidget( core, false, page );
   connect( mEditorWidget, SIGNAL( modified( const KABC::Addressee::List& ) ),
            SLOT( widgetModified() ) );
   layout->addWidget( mEditorWidget );
   
   enableButton( KDialogBase::Apply, false );
   if ( QApplication::desktop()->width()  < 480 ) {
       hideButtons();
   }
 }
 
 AddresseeEditorDialog::~AddresseeEditorDialog()
 {
     qDebug("AddresseeEditorDialog::~AddresseeEditorDialog()");
     //emit editorDestroyed( mEditorWidget->addressee().uid() );
 }
 
 void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr )
 {
   enableButton( KDialogBase::Apply, false );
   
   mEditorWidget->setAddressee( addr );
 }
 
 KABC::Addressee AddresseeEditorDialog::addressee()
 {
   return mEditorWidget->addressee();
 }
 
 bool AddresseeEditorDialog::dirty()
 {
   return mEditorWidget->dirty();
 }
 
 void AddresseeEditorDialog::slotApply()
 {
   if ( mEditorWidget->dirty() ) {
     mEditorWidget->save();
     emit contactModified( mEditorWidget->addressee() );
   }
 
   enableButton( KDialogBase::Apply, false );
   
   KDialogBase::slotApply();
 }
 
 void AddresseeEditorDialog:: accept () 
 {
     slotOk();
 
 }
 void AddresseeEditorDialog::slotOk()
 {
   slotApply();
   
-  KDialogBase::slotOk();
-  
+  //KDialogBase::slotOk();
+  emit okClicked();
+  QDialog::accept();
 }
 
 void AddresseeEditorDialog::widgetModified()
 {
   enableButton( KDialogBase::Apply, true );
 }
   
 void AddresseeEditorDialog::slotCancel()
 {
   KDialogBase::slotCancel();
   
  
 }
 
 #ifndef KAB_EMBEDDED    
 #include "addresseeeditordialog.moc"
 #endif //KAB_EMBEDDED    
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 2251207..c953058 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -167,124 +167,124 @@ void KDialogBase::setMainWidget( QWidget *widget )
 {
   kdDebug() << "KDialogBase::setMainWidget()" << endl;
 
   mMainWidget = widget;
   initLayout();
 }
 
 void KDialogBase::setButtonText( ButtonCode id, const QString &text )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     button->setText( text );
   }
 }
 
 void KDialogBase::enableButton( ButtonCode id, bool state )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     button->setEnabled( state );
   }
 }
 
 QPushButton *KDialogBase::findButton( ButtonCode id )
 {
   QPushButton *button = 0;
   switch ( id ) {
     case Ok:
       button = mOkButton;
       break;
     case Apply:
       button = mApplyButton;
       break;
     case User1:
       button = mUser1Button;
       break;
     case User2:
       button = mUser2Button;
       break;
     case Cancel:
       button = mCancelButton;
       break;  
     case Default:
       button = mDefaultButton;
       break;
     case Close:
       button = mCloseButton;
       break;
     default:
       break;      
   }
   return button;
 }
 
 void KDialogBase::enableButtonOK( bool state )
 {
   enableButton( Ok, state );
 }
 
 void KDialogBase::enableButtonApply( bool state )
 {
   enableButton( Apply, state );
 }
 
 void KDialogBase::showButton( ButtonCode id, bool show )
 {
   QPushButton *button = findButton( id );
   if ( button ) {
     if ( show ) button->show();
     else button->hide();
   }
 }
 
 int KDialogBase::pageIndex( QWidget *widget ) const
 {
   return 0;
 }
 
 
 bool KDialogBase::showPage( int index )
 {
     tabWidget()->setCurrentPage( index );return false;
 }
 
 QFrame *KDialogBase::plainPage()
 {
   if ( !mPlainPage ) {
     mPlainPage = new QFrame( this );
     setMainWidget( mPlainPage );
   }
   return mPlainPage;
 }
 
 void KDialogBase::slotOk()
 {
   emit okClicked();
-  QDialog::accept();
+  accept();
 }
 
 void KDialogBase::slotApply()
 {
   emit applyClicked();
 }
 
 void KDialogBase::slotCancel()
 {
   emit cancelClicked();
   reject();
 }
 
 void KDialogBase::slotClose()
 {
   emit closeClicked();
   reject();
 }
 
 void KDialogBase::slotUser1()
 {
   emit user1Clicked();
 }
 void KDialogBase::slotUser2()
 {
   emit user2Clicked();
 }