[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeui
From:       Hamish Rodda <rodda () kde ! org>
Date:       2006-05-06 3:27:24
Message-ID: 1146886044.405111.22977.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 537855 by rodda:

Port to KDialog from KDialogBase


 M  +9 -5      kedittoolbar.cpp  
 M  +2 -2      kedittoolbar.h  


--- trunk/KDE/kdelibs/kdeui/kedittoolbar.cpp #537854:537855
@@ -340,7 +340,7 @@
 
 KEditToolbar::KEditToolbar(KActionCollection *collection, const QString& file,
                            bool global, QWidget* parent)
-  : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent),
+  : KDialog(parent),
     m_widget(new KEditToolbarWidget(QLatin1String(s_defaultToolbar), collection, file, global, this))
 {
     init();
@@ -352,7 +352,7 @@
 KEditToolbar::KEditToolbar(const QString& defaultToolbar, KActionCollection *collection,
                            const QString& file, bool global,
                            QWidget* parent)
-  : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent ),
+  : KDialog(parent),
     m_widget(new KEditToolbarWidget(defaultToolbar, collection, file, global, this))
 {
     init();
@@ -362,7 +362,7 @@
 }
 
 KEditToolbar::KEditToolbar(KXMLGUIFactory* factory, QWidget* parent)
-    : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent),
+    : KDialog(parent),
       m_widget(new KEditToolbarWidget(QLatin1String(s_defaultToolbar), factory, this))
 {
     init();
@@ -371,7 +371,7 @@
 
 KEditToolbar::KEditToolbar(const QString& defaultToolbar,KXMLGUIFactory* factory,
                            QWidget* parent)
-    : KDialogBase(Swallow, i18n("Configure Toolbars"), Default|Ok|Apply|Cancel, Ok, parent),
+    : KDialog(parent),
       m_widget(new KEditToolbarWidget(defaultToolbar, factory, this))
 {
     init();
@@ -384,6 +384,10 @@
     d->m_accept = false;
     d->m_factory = 0;
 
+    setCaption(i18n("Configure Toolbars"));
+    setButtonMask(Default|Ok|Apply|Cancel);
+    setDefaultButton(Ok);
+
     setMainWidget(m_widget);
 
     connect(m_widget, SIGNAL(enableOk(bool)), SLOT(acceptOK(bool)));
@@ -1362,7 +1366,7 @@
 }
 
 void KEditToolbar::virtual_hook( int id, void* data )
-{ KDialogBase::virtual_hook( id, data ); }
+{ KDialog::virtual_hook( id, data ); }
 
 void KEditToolbarWidget::virtual_hook( int id, void* data )
 { KXMLGUIClient::virtual_hook( id, data ); }
--- trunk/KDE/kdelibs/kdeui/kedittoolbar.h #537854:537855
@@ -20,7 +20,7 @@
 #define KEDITTOOLBAR_H
 
 #include <kxmlguiclient.h>
-#include <kdialogbase.h>
+#include <kdialog.h>
 
 class KProcess;
 class KActionCollection;
@@ -105,7 +105,7 @@
  *
  * @author Kurt Granroth <granroth@kde.org>
  */
-class KDEUI_EXPORT KEditToolbar : public KDialogBase
+class KDEUI_EXPORT KEditToolbar : public KDialog
 {
     Q_OBJECT
 public:
[prev in list] [next in list] [prev in thread] [next in thread]