summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-07-06 20:10:47 (UTC)
committer zautrix <zautrix>2004-07-06 20:10:47 (UTC)
commit3db5c4e190d1031f2471516f8a52114f06d1a3eb (patch) (unidiff)
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()
91 KDialogBase::slotApply(); 91 KDialogBase::slotApply();
92} 92}
93 93
94void AddresseeEditorDialog:: accept () 94void AddresseeEditorDialog:: accept ()
95{ 95{
96 slotOk(); 96 slotOk();
97 97
98} 98}
99void AddresseeEditorDialog::slotOk() 99void AddresseeEditorDialog::slotOk()
100{ 100{
101 slotApply(); 101 slotApply();
102 102
103 KDialogBase::slotOk(); 103 //KDialogBase::slotOk();
104 104 emit okClicked();
105 QDialog::accept();
105} 106}
106 107
107void AddresseeEditorDialog::widgetModified() 108void AddresseeEditorDialog::widgetModified()
108{ 109{
109 enableButton( KDialogBase::Apply, true ); 110 enableButton( KDialogBase::Apply, true );
110} 111}
111 112
112void AddresseeEditorDialog::slotCancel() 113void AddresseeEditorDialog::slotCancel()
113{ 114{
114 KDialogBase::slotCancel(); 115 KDialogBase::slotCancel();
115 116
116 117
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 )
251QFrame *KDialogBase::plainPage() 251QFrame *KDialogBase::plainPage()
252{ 252{
253 if ( !mPlainPage ) { 253 if ( !mPlainPage ) {
254 mPlainPage = new QFrame( this ); 254 mPlainPage = new QFrame( this );
255 setMainWidget( mPlainPage ); 255 setMainWidget( mPlainPage );
256 } 256 }
257 return mPlainPage; 257 return mPlainPage;
258} 258}
259 259
260void KDialogBase::slotOk() 260void KDialogBase::slotOk()
261{ 261{
262 emit okClicked(); 262 emit okClicked();
263 QDialog::accept(); 263 accept();
264} 264}
265 265
266void KDialogBase::slotApply() 266void KDialogBase::slotApply()
267{ 267{
268 emit applyClicked(); 268 emit applyClicked();
269} 269}
270 270
271void KDialogBase::slotCancel() 271void KDialogBase::slotCancel()
272{ 272{
273 emit cancelClicked(); 273 emit cancelClicked();
274 reject(); 274 reject();
275} 275}