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

[Laurent Montel]

SVN commit 553894 by mlaurent:

Port++


 M  +6 -6      classpropdlg.cpp  
 M  +2 -1      codegenerationwizard.cpp  
 M  +2 -2      settingsdlg.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classpropdlg.cpp #553893:553894
@@ -38,10 +38,10 @@
         : KPageDialog(parent) {
     setCaption( i18n("Properties") );
     setButtons( Ok | Apply | Cancel | Help );
-    setDefaultButtons(Ok );
+    setDefaultButton( Ok );
     setModal( true );
     enableButtonSeparator( true );
-    setTypeFace( KPageDialog::List );
+    setFaceType( KPageDialog::List );
     m_pWidget = 0;
     m_pGenPage = 0;
     m_pAttPage = 0;
@@ -81,17 +81,17 @@
     KPageWidgetItem *pageItem = new KPageWidgetItem( page, i18n("General") );
     pageItem->setHeader( i18n("General Settings") );
     pageItem->setIcon(  DesktopIcon( "misc") );
-    addPage( page );
+    addPage( pageItem );
     page -> setMinimumSize(310, 330);
     QHBoxLayout * topLayout = new QHBoxLayout(page);
     m_pGenPage = new ClassGenPage(m_pDoc, page, o);
     topLayout -> addWidget(m_pGenPage);
 
     QFrame * newPage = new QFrame();
-    pageItem = new KPageWidgetItem( page, i18n("Color") );
+    pageItem = new KPageWidgetItem(newPage, i18n("Color") );
     pageItem->setHeader( i18n("Widget Colors") );
     setIcon( DesktopIcon( "colors") );
-    addPage( newPage);
+    addPage( pageItem);
 
     QHBoxLayout * m_pColorLayout = new QHBoxLayout(newPage);
     m_pColorPage = new UMLWidgetColorPage(newPage, o);
@@ -167,7 +167,7 @@
 
 void ClassPropDlg::slotOk() {
     slotApply();
-    KDialogBase::accept();
+    KDialog::accept();
 }
 
 void ClassPropDlg::slotApply() {
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codegenerationwizard.cpp #553893:553894
@@ -26,7 +26,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <qapplication.h>
-
+#include <QListView>
+#include <QListViewItem>
 #include "codegenerationwizard.h"
 #include "codegenerationoptionspage.h"
 #include "../classifier.h"
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/settingsdlg.h #553893:553894
@@ -23,7 +23,7 @@
 //kde includes
 #include <kcombobox.h>
 #include <kfontdialog.h>
-#include <kdialog.h>
+#include <kpagedialog.h>
 #include <kcolorbutton.h>
 #include <knuminput.h>
 //app includes
@@ -40,7 +40,7 @@
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
 
-class SettingsDlg : public KDialogBase {
+class SettingsDlg : public KPageDialog {
 
     Q_OBJECT