From kde-commits  Fri Jan 30 12:25:19 2009
From: Laurent Montel <montel () kde ! org>
Date: Fri, 30 Jan 2009 12:25:19 +0000
To: kde-commits
Subject: branches/work/konvi-kde4/src/dcc
Message-Id: <1233318319.864213.30004.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123331834217313

SVN commit 918644 by mlaurent:

Port++


 M  +13 -9     resumedialog.cpp  
 M  +2 -2      resumedialog.h  


--- branches/work/konvi-kde4/src/dcc/resumedialog.cpp #918643:918644
@@ -31,21 +31,21 @@
 DccResumeDialog::ReceiveAction DccResumeDialog::ask(DccTransferRecv* item, const QString& message, int enabledActions, ReceiveAction defaultAction)
 {
     int enabledButtonCodes = 0;
-    KDialogBase::ButtonCode defaultButtonCode = KDialogBase::Ok;
+    KDialog::ButtonCode defaultButtonCode = KDialog::Ok;
 
     if(enabledActions & RA_Rename || enabledActions & RA_Overwrite)
-        enabledButtonCodes |= KDialogBase::Ok;
+        enabledButtonCodes |= KDialog::Ok;
     if(enabledActions & RA_Resume)
-        enabledButtonCodes |= KDialogBase::User1;
+        enabledButtonCodes |= KDialog::User1;
     if(enabledActions & RA_Cancel)
-        enabledButtonCodes |= KDialogBase::Cancel;
+        enabledButtonCodes |= KDialog::Cancel;
 
     if(defaultAction == RA_Rename || defaultAction == RA_Overwrite)
-        defaultButtonCode = KDialogBase::Ok;
+        defaultButtonCode = KDialog::Ok;
     else if(defaultAction == RA_Resume)
-        defaultButtonCode = KDialogBase::User1;
+        defaultButtonCode = KDialog::User1;
     else if(defaultAction == RA_Cancel)
-        defaultButtonCode = KDialogBase::Cancel;
+        defaultButtonCode = KDialog::Cancel;
 
     DccResumeDialog dlg(item, i18n("DCC Receive Question"), message, enabledActions, enabledButtonCodes, defaultButtonCode);
     dlg.exec();
@@ -59,12 +59,16 @@
 }
 
 DccResumeDialog::DccResumeDialog(DccTransferRecv* item, const QString& caption, const QString& message, int enabledActions, int enabledButtonCodes, 
-				 KDialogBase::ButtonCode defaultButtonCode)
-: KDialogBase(0, "dcc_resume_dialog", true, caption, enabledButtonCodes, defaultButtonCode, true)
+				 KDialog::ButtonCode defaultButtonCode)
+: KDialog(0) 
 , m_item(item)
 , m_enabledActions(enabledActions)
 , m_selectedAction(RA_Cancel)
 {
+    setCaption(caption);
+    setModal(true);
+    setButtons(enabledButtonCodes);
+    setDefaultButton(defaultButtonCode)
     if(enabledButtonCodes & KDialogBase::User1)
         setButtonText(KDialogBase::User1, i18n("&Resume"));
 
--- branches/work/konvi-kde4/src/dcc/resumedialog.h #918643:918644
@@ -19,7 +19,7 @@
 class KUrlRequester;
 class DccTransferRecv;
 
-class DccResumeDialog : public KDialogBase
+class DccResumeDialog : public KDialog
 {
     Q_OBJECT
 
@@ -45,7 +45,7 @@
         void updateDialogButtons();
 
     protected:
-        DccResumeDialog(DccTransferRecv* item, const QString& caption, const QString& message, int enabledActions, int enabledButtonCodes, KDialogBase::ButtonCode defaultButtonCode);
+        DccResumeDialog(DccTransferRecv* item, const QString& caption, const QString& message, int enabledActions, int enabledButtonCodes, KDialog::ButtonCode defaultButtonCode);
 
         // UI
         KUrlRequester* m_urlreqFileURL;