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

List:       kde-commits
Subject:    [kdelibs/frameworks] kdeui/dialogs: Port away from KDialog
From:       Kevin Ottens <ervin+bluesystems () kde ! org>
Date:       2012-12-13 17:14:00
Message-ID: 20121213171400.B8EDBA60D2 () git ! kde ! org
[Download RAW message or body]

Git commit ffeefb1bf17bebf88f82b61d26fd0baeda257661 by Kevin Ottens.
Committed on 12/12/2012 at 14:09.
Pushed by ervin into branch 'frameworks'.

Port away from KDialog

M  +5    -6    kdeui/dialogs/ktip.cpp
M  +2    -2    kdeui/dialogs/ktip.h

http://commits.kde.org/kdelibs/ffeefb1bf17bebf88f82b61d26fd0baeda257661

diff --git a/kdeui/dialogs/ktip.cpp b/kdeui/dialogs/ktip.cpp
index b839285..b271958 100644
--- a/kdeui/dialogs/ktip.cpp
+++ b/kdeui/dialogs/ktip.cpp
@@ -38,8 +38,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kaboutdata.h>
 #include <kconfig.h>
+#include <kconfiggroup.h>
 #include <kdebug.h>
 #include <kcomponentdata.h>
+#include <kiconloader.h>
 #include <klocalizedstring.h>
 #include <krandom.h>
 #include <kseparator.h>
@@ -225,11 +227,10 @@ void KTipDialog::Private::_k_showOnStart( bool on )
 
 
 KTipDialog::KTipDialog( KTipDatabase *database, QWidget *parent )
-  : KDialog( parent ),
+  : QDialog( parent ),
     d( new Private( this ) )
 {
-  setButtons( KDialog::None );
-  setCaption( i18n( "Tip of the Day" ) );
+  setWindowTitle( i18n( "Tip of the Day" ) );
 
   /**
    * Parent is 0L when TipDialog is used as a mainWidget. This should
@@ -241,9 +242,7 @@ KTipDialog::KTipDialog( KTipDatabase *database, QWidget *parent )
 
   setWindowIcon(KDE::icon("ktip"));
 
-  QWidget *widget = new QWidget( this );
-  setMainWidget( widget );
-  QVBoxLayout *mainLayout = new QVBoxLayout( widget );
+  QVBoxLayout *mainLayout = new QVBoxLayout( this );
   mainLayout->setMargin( 0 );
 
   if ( isTipDialog ) {
diff --git a/kdeui/dialogs/ktip.h b/kdeui/dialogs/ktip.h
index 4fb59b5..32c0474 100644
--- a/kdeui/dialogs/ktip.h
+++ b/kdeui/dialogs/ktip.h
@@ -26,9 +26,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef KTIP_H
 #define KTIP_H
 
+#include <QDialog>
 #include <QtCore/QStringList>
 
-#include <kdialog.h>
 #include <kdeui_export.h>
 
 /**
@@ -101,7 +101,7 @@ class KDEUI_EXPORT KTipDatabase
  *
  * @author Matthias Hoelzer-Kluepfel <mhk@caldera.de>
  */
-class KDEUI_EXPORT KTipDialog : public KDialog
+class KDEUI_EXPORT KTipDialog : public QDialog
 {
   Q_OBJECT
 

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