summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-07-06 20:10:47 (UTC)
committer zautrix <zautrix>2004-07-06 20:10:47 (UTC)
commit3db5c4e190d1031f2471516f8a52114f06d1a3eb (patch) (side-by-side diff)
treedbccf9780829b25c01a2a65439409591b8da422e
parent9c1abdb6194f9539b26d9f3045bde5cd91960dd0 (diff)
downloadkdepimpi-3db5c4e190d1031f2471516f8a52114f06d1a3eb.zip
kdepimpi-3db5c4e190d1031f2471516f8a52114f06d1a3eb.tar.gz
kdepimpi-3db5c4e190d1031f2471516f8a52114f06d1a3eb.tar.bz2
Fixed the qdialog::accept problem
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/addresseeeditordialog.cpp5
-rw-r--r--microkde/kdialogbase.cpp2
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
@@ -91,26 +91,27 @@ void AddresseeEditorDialog::slotApply()
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();
diff --git a/microkde/kdialogbase.cpp b/microkde/kdialogbase.cpp
index 2251207..c953058 100644
--- a/microkde/kdialogbase.cpp
+++ b/microkde/kdialogbase.cpp
@@ -251,25 +251,25 @@ bool KDialogBase::showPage( int index )
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();
}