[Uml-devel] KDE/kdesdk/umbrello/umbrello/dialogs

[Laurent Montel]

SVN commit 553905 by mlaurent:

Continue to port it


 M  +4 -6      codegenerationwizard.cpp  
 M  +1 -1      codegenerationwizard.h  
 M  +3 -3      overwritedialogue.cpp  
 M  +1 -1      selectopdlg.h  
 M  +7 -2      settingsdlg.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp #553904:553905
@@ -26,8 +26,6 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <qapplication.h>
-#include <QListView>
-#include <QListViewItem>
 #include "codegenerationwizard.h"
 #include "codegenerationoptionspage.h"
 #include "../classifier.h"
@@ -224,14 +222,14 @@
     return (CodeGenerator*) NULL;
 }
 
-void CodeGenerationWizard::moveSelectedItems(QListView* fromList, QListView* toList) {
-   QListViewItemIterator it(fromList, QListViewItemIterator::Selected);
+void CodeGenerationWizard::moveSelectedItems(Q3ListView* fromList, Q3ListView* toList) {
+   Q3ListViewItemIterator it(fromList, Q3ListViewItemIterator::Selected);
     while (it.current()) {
-        QListViewItem* selectedItem = it.current();
+        Q3ListViewItem* selectedItem = it.current();
 
         QString name = selectedItem->text(0);
         if (!toList->findItem(name, 0)) {
-            new QListViewItem(toList, name);
+            new Q3ListViewItem(toList, name);
         }
 
         ++it;
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.h #553904:553905
@@ -78,7 +78,7 @@
      * second. An item is added to the second list only if it isn't already
      * there (no duplicated items are created).
      */
-    void moveSelectedItems(QListView* fromList, QListView* toList);
+    void moveSelectedItems(Q3ListView* fromList, Q3ListView* toList);
 
     UMLApp* m_app;
     UMLDoc* m_doc;
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/overwritedialogue.cpp #553904:553905
@@ -45,9 +45,9 @@
     m_applyToAllRemaining->setChecked(applyToAllRemaining);
     layout->addWidget(m_applyToAllRemaining);
 
-    setButtonText(KDialogBase::Ok, i18n("&Overwrite"));
-    setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name"));
-    setButtonText(KDialogBase::Cancel, i18n("&Do Not Generate File"));
+    setButtonText(KDialog::Ok, i18n("&Overwrite"));
+    setButtonText(KDialog::Apply, i18n("&Generate Similar File Name"));
+    setButtonText(KDialog::Cancel, i18n("&Do Not Generate File"));
 }
 
 OverwriteDialogue::~OverwriteDialogue() {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/selectopdlg.h #553904:553905
@@ -39,7 +39,7 @@
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
 
-class SelectOpDlg : public KDialogBase
+class SelectOpDlg : public KDialog
 {
     Q_OBJECT
 public:
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.cpp #553904:553905
@@ -30,8 +30,13 @@
 #include "../dialog_utils.h"
 
 SettingsDlg::SettingsDlg( QWidget * parent, Settings::OptionState *state )
-        : KDialogBase( IconList, i18n("Umbrello Setup"),
-               Help | Default | Apply | Ok | Cancel, Ok, parent, 0, true, true ) {
+        : KPageDialog( parent) {
+    setCaption(i18n("Umbrello Setup") );
+    setButtons( Help | Default | Apply | Ok | Cancel );
+    setDefaultButton( Ok );
+    setModal( true );
+    enableButtonSeparator( true );
+    setFaceType( KPageDialog::List );
     m_bChangesApplied = false;
     m_pOptionState = state;
     setHelp( "umbrello/index.html", QString::null );