From eb2073e6ea51d3fa4666ecd9d8f5b2900d3ef7e5 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sat, 13 May 2006 15:08:16 +0000
Subject: [PATCH] If an Ok button is present in a KDialog, it should always be
 the default button (as discussed on IRC),  so there is no need to set it
 manually. That the Ok button is currently not the default button is simply a
 bug in kdeui and needs to be fixed there

svn path=/trunk/KDE/kdepim/; revision=540477
---
 chiasmuskeyselector.cpp         | 1 -
 expirypropertiesdialog.cpp      | 1 -
 kmpopfiltercnfrmdlg.cpp         | 1 -
 mailinglistpropertiesdialog.cpp | 1 -
 newfolderdialog.cpp             | 1 -
 sievedebugdialog.cpp            | 1 -
 6 files changed, 6 deletions(-)

diff --git a/chiasmuskeyselector.cpp b/chiasmuskeyselector.cpp
index f912de461..56a90789e 100644
--- a/chiasmuskeyselector.cpp
+++ b/chiasmuskeyselector.cpp
@@ -16,7 +16,6 @@ ChiasmusKeySelector::ChiasmusKeySelector( QWidget* parent, const QString& captio
   : KDialog( parent, caption, Ok|Cancel )
 {
   setObjectName( "chiasmusKeySelector" );
-  setDefaultButton( Ok );
   QWidget *page = new QWidget( this );
   setMainWidget(page);
 
diff --git a/expirypropertiesdialog.cpp b/expirypropertiesdialog.cpp
index c3db7dfdf..e5475c660 100644
--- a/expirypropertiesdialog.cpp
+++ b/expirypropertiesdialog.cpp
@@ -36,7 +36,6 @@ ExpiryPropertiesDialog::ExpiryPropertiesDialog( KMFolderTree* tree, KMFolder* fo
                    KDialog::Ok|KDialog::Cancel ),
       mFolder( folder )
 {
-  setDefaultButton( KDialog::Ok );
   setModal( false );
   setObjectName( "expiry_properties" );
   setAttribute( Qt::WA_DeleteOnClose );
diff --git a/kmpopfiltercnfrmdlg.cpp b/kmpopfiltercnfrmdlg.cpp
index 2da6bc3b5..2becf160a 100644
--- a/kmpopfiltercnfrmdlg.cpp
+++ b/kmpopfiltercnfrmdlg.cpp
@@ -288,7 +288,6 @@ KMPopFilterCnfrmDlg::KMPopFilterCnfrmDlg( const QList<KMPopHeaders *> & aHeaders
                                           bool aShowLaterMsgs, QWidget *aParent )
       : KDialog( aParent, i18n("POP Filter"), Ok | Help )
 {
-  setDefaultButton( Ok );
   unsigned int rulesetCount = 0;
   //mHeaders = aHeaders;
   mShowLaterMsgs = aShowLaterMsgs;
diff --git a/mailinglistpropertiesdialog.cpp b/mailinglistpropertiesdialog.cpp
index 20a4fe0c7..1750f5664 100644
--- a/mailinglistpropertiesdialog.cpp
+++ b/mailinglistpropertiesdialog.cpp
@@ -56,7 +56,6 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( QWidget* p
 {
   setObjectName( "mailinglist_properties" );
   setModal( false );
-  setDefaultButton( KDialog::Ok );
   setAttribute( Qt::WA_DeleteOnClose );
   QLabel* label;
   mLastItem = 0;
diff --git a/newfolderdialog.cpp b/newfolderdialog.cpp
index 1cc1003d7..09d6bd986 100644
--- a/newfolderdialog.cpp
+++ b/newfolderdialog.cpp
@@ -64,7 +64,6 @@ NewFolderDialog::NewFolderDialog( QWidget* parent, KMFolder *folder )
 {
   setModal( false );
   setObjectName( "new_folder_dialog" );
-  setDefaultButton( KDialog::Ok );
   setAttribute( Qt::WA_DeleteOnClose );
   if ( folder ) {
     setCaption( i18n("New Subfolder of %1", folder->prettyURL() ) );
diff --git a/sievedebugdialog.cpp b/sievedebugdialog.cpp
index 99b6f2d3b..7f794c3f0 100644
--- a/sievedebugdialog.cpp
+++ b/sievedebugdialog.cpp
@@ -190,7 +190,6 @@ SieveDebugDialog::SieveDebugDialog( QWidget *parent )
 :   KDialog( parent, i18n( "Sieve Diagnostics" ), KDialog::Ok ),
     mSieveJob( 0 )
 {
-    setDefaultButton( KDialog::Ok );
     // Collect all accounts
     AccountManager *am = kmkernel->acctMgr();
     assert( am );