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

List:       kde-commits
Subject:    KDE/kdeutils/khexedit
From:       Laurent Montel <montel () kde ! org>
Date:       2006-11-27 15:46:34
Message-ID: 1164642394.467272.20013.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 608443 by mlaurent:

Byebye Q3WidgetStack


 M  +10 -10    dialog.cc  
 M  +2 -2      dialog.h  
 M  +7 -7      exportdialog.cc  
 M  +2 -2      exportdialog.h  


--- trunk/KDE/kdeutils/khexedit/dialog.cc #608442:608443
@@ -807,7 +807,7 @@
   vbox->addWidget( separator );
 
 
-  mWidgetStack = new Q3WidgetStack( mainWidget(), "pagestack" );
+  mWidgetStack = new QStackedWidget ( mainWidget() );
   if( mWidgetStack == 0 ) { return; }
   vbox->addWidget( mWidgetStack );
 
@@ -815,7 +815,7 @@
   makeOperandLayout();
   makeBitSwapLayout();
   makeRotateLayout();
-  mWidgetStack->raiseWidget( (int)OperandPage );
+  mWidgetStack->setCurrentIndex( (int)OperandPage );
 
 
   Q3ButtonGroup *group = new Q3ButtonGroup( i18n("Options"), mainWidget() );
@@ -848,7 +848,7 @@
 {
   QFrame *page = new QFrame( mainWidget() );
   if( page == 0 ) { return; }
-  mWidgetStack->addWidget( page, EmptyPage );
+  mWidgetStack->insertWidget( EmptyPage, page );
 }
 
 
@@ -858,7 +858,7 @@
 
   QFrame *page = new QFrame( mainWidget() );
   if( page == 0 ) { return; }
-  mWidgetStack->addWidget( page, OperandPage );
+  mWidgetStack->insertWidget( OperandPage,page );
 
   QVBoxLayout *vbox = new QVBoxLayout( page );
   vbox->setSpacing( spacingHint() );
@@ -904,7 +904,7 @@
   QString text;
 
   QFrame *page = new QFrame( mainWidget() );
-  mWidgetStack->addWidget( page, BitSwapPage );
+  mWidgetStack->insertWidget( BitSwapPage,page );
 
   QVBoxLayout *vbox = new QVBoxLayout( page );
   vbox->setSpacing( spacingHint() );
@@ -936,7 +936,7 @@
   QString text;
 
   QFrame *page = new QFrame( mainWidget() );
-  mWidgetStack->addWidget( page, RotatePage );
+  mWidgetStack->insertWidget( RotatePage,page );
 
   QVBoxLayout *vbox = new QVBoxLayout( page );
   vbox->setSpacing( spacingHint() );
@@ -1062,22 +1062,22 @@
 {
   if( index <= 2 )
   {
-    mWidgetStack->raiseWidget( OperandPage );
+    mWidgetStack->setCurrentIndex( OperandPage );
     mCheckBackward->setEnabled( true );
   }
   else if( index <= 4 )
   {
-    mWidgetStack->raiseWidget( EmptyPage );
+    mWidgetStack->setCurrentIndex( EmptyPage );
     mCheckBackward->setEnabled( true );
   }
   else if( index <= 6 )
   {
-    mWidgetStack->raiseWidget( RotatePage );
+    mWidgetStack->setCurrentIndex( RotatePage );
     mCheckBackward->setEnabled( false );
   }
   else
   {
-    mWidgetStack->raiseWidget( BitSwapPage );
+    mWidgetStack->setCurrentIndex( BitSwapPage );
     mCheckBackward->setEnabled( true );
   }
 }
--- trunk/KDE/kdeutils/khexedit/dialog.h #608442:608443
@@ -34,7 +34,7 @@
 #include <qradiobutton.h>
 #include <QSpinBox>
 #include <QString>
-#include <q3widgetstack.h>
+#include <QStackedWidget>
 //Added by qt3to4:
 #include <QShowEvent>
 
@@ -271,7 +271,7 @@
     void filterData( SFilterControl &fc );
 
   private:
-    Q3WidgetStack *mWidgetStack;
+    QStackedWidget *mWidgetStack;
     QLabel    *mOperandFormatLabel;
     QLabel    *mOperandInputLabel;
     QComboBox *mOperandSelector;
--- trunk/KDE/kdeutils/khexedit/exportdialog.cc #608442:608443
@@ -262,7 +262,7 @@
   if( topLayout == 0 ) { return; }
   topLayout->setSpacing( spacingHint() );
 
-  mOptionStack = new Q3WidgetStack( page, "stack" );
+  mOptionStack = new QStackedWidget( page );
   if( mOptionStack == 0 ) { return; }
   topLayout->addWidget( mOptionStack );
 
@@ -270,7 +270,7 @@
   makeHtmlOption();
   makeRtfOption();
   makeCArrayOption();
-  mOptionStack->raiseWidget( (int)option_text );
+  mOptionStack->setCurrentIndex( (int)option_text );
 
   QSize size = mOptionStack->sizeHint();
   size += QSize(spacingHint()*2, spacingHint()*2);
@@ -282,7 +282,7 @@
 {
   QFrame *page = new QFrame( mOptionPage->widget() );
   if( page == 0 ) { return; }
-  mOptionStack->addWidget( page, option_text );
+  mOptionStack->insertWidget( option_text,page );
 
   QVBoxLayout *topLayout = new QVBoxLayout( page );
   topLayout->setSpacing( spacingHint() );
@@ -296,7 +296,7 @@
 {
   QFrame *page = new QFrame( mOptionPage->widget() );
   if( page == 0 ) { return; }
-  mOptionStack->addWidget( page, option_html );
+  mOptionStack->insertWidget( option_html, page );
 
   QString text;
   QVBoxLayout *topLayout = new QVBoxLayout( page );
@@ -380,7 +380,7 @@
 {
   QFrame *page = new QFrame( mOptionPage->widget() );
   if( page == 0 ) { return; }
-  mOptionStack->addWidget( page, option_rtf );
+  mOptionStack->insertWidget( option_rtf, page);
 
   QVBoxLayout *topLayout = new QVBoxLayout( page );
   topLayout->setSpacing( spacingHint() );
@@ -393,7 +393,7 @@
 void CExportDialog::makeCArrayOption( void )
 {
   QFrame *page = new QFrame( mOptionPage->widget() );
-  mOptionStack->addWidget( page, option_carray );
+  mOptionStack->insertWidget( option_carray, page );
 
   QString text;
   QVBoxLayout *topLayout = new QVBoxLayout( page );
@@ -461,7 +461,7 @@
 {
   mDestination.formatCombo->setCurrentIndex(index);
   mDestination.fileExtraLabel->setEnabled( index == option_html );
-  mOptionStack->raiseWidget( index );
+  mOptionStack->setCurrentIndex( index );
 }
 
 
--- trunk/KDE/kdeutils/khexedit/exportdialog.h #608442:608443
@@ -31,7 +31,7 @@
 class QLabel;
 class QLineEdit;
 class QSpinBox;
-class Q3WidgetStack;
+class QStackedWidget;
 class KSimpleConfig;
 
 #include <kpagedialog.h>
@@ -116,7 +116,7 @@
     void exportCArray( const SExportCArray &e );
 
   private:
-    Q3WidgetStack *mOptionStack;
+    QStackedWidget *mOptionStack;
     SDestinationWidgets  mDestination;
     SHtmlWidgets  mHtml;
     SArrayWidgets mArray;
[prev in list] [next in list] [prev in thread] [next in thread]