1 files changed, 23 insertions, 23 deletions

diff --git a/kbarcode/barcodedialogs.cpp b/kbarcode/barcodedialogs.cpp
index 9856689..e18bd02 100644
--- a/kbarcode/barcodedialogs.cpp
+++ b/kbarcode/barcodedialogs.cpp
@@ -25,7 +25,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmap.h>
 #include <tqradiobutton.h>
 #include <tqtooltip.h>
@@ -103,14 +103,14 @@ void AdvancedBarcodeDialog::getData( Barkode* b )
 TBarcodeDlg::TBarcodeDlg(TQWidget *parent, const char *name )
     : TQWidget( parent, name )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 );
 
     TQGroupBox* gb  = new TQGroupBox( i18n("TBarcode"), this );
     gb->setColumnLayout(0, Qt::Vertical );
-    gb->tqlayout()->setSpacing( 6 );
-    gb->tqlayout()->setMargin( 11 );
+    gb->layout()->setSpacing( 6 );
+    gb->layout()->setMargin( 11 );
     gb->setEnabled( Barkode::haveTBarcode() || Barkode::haveTBarcode2() );
-    TQVBoxLayout* gbLayout = new TQVBoxLayout( gb->tqlayout() );
+    TQVBoxLayout* gbLayout = new TQVBoxLayout( gb->layout() );
 
     spinModule = new KDoubleNumInput( gb );
     spinModule->setLabel( i18n("Module width (mm):"), AlignLeft | AlignVCenter );
@@ -144,7 +144,7 @@ TBarcodeDlg::TBarcodeDlg(TQWidget *parent, const char *name )
                                     "tbarcode documentation for details. Normaly you do not want to change "
                                     "this value.</qt>") );
     
-    tqlayout->addWidget( gb );
+    layout->addWidget( gb );
 }
 
 void TBarcodeDlg::setData( Barkode* b )
@@ -253,14 +253,14 @@ void TBarcodeDlg::getData( Barkode* b ) const
 PDF417BarcodeDlg::PDF417BarcodeDlg(TQWidget *parent, const char *name )
     : TQWidget( parent, name )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 );
 
     TQGroupBox* gpdf  = new TQGroupBox( i18n("PDF417"), this );
     gpdf->setColumnLayout(0, Qt::Vertical );
-    gpdf->tqlayout()->setSpacing( 6 );
-    gpdf->tqlayout()->setMargin( 11 );
+    gpdf->layout()->setSpacing( 6 );
+    gpdf->layout()->setMargin( 11 );
     gpdf->setEnabled( Barkode::haveTBarcode() || Barkode::havePDFBarcode() );
-    TQVBoxLayout* gpdfLayout = new TQVBoxLayout( gpdf->tqlayout() );
+    TQVBoxLayout* gpdfLayout = new TQVBoxLayout( gpdf->layout() );
 
     spinRow = new KIntNumInput( gpdf );
     spinRow->setLabel( i18n("Rows:"),  AlignLeft | AlignVCenter );
@@ -277,7 +277,7 @@ PDF417BarcodeDlg::PDF417BarcodeDlg(TQWidget *parent, const char *name )
     gpdfLayout->addWidget( spinRow );
     gpdfLayout->addWidget( spinCol );
     gpdfLayout->addWidget( spinErr );
-    tqlayout->addWidget( gpdf );
+    layout->addWidget( gpdf );
 }
 
 void PDF417BarcodeDlg::setData( Barkode* b )
@@ -365,9 +365,9 @@ SequenceDlg::SequenceDlg( TQWidget *parent, const char *name )
 
     TQButtonGroup* group = new TQButtonGroup( i18n("Sequence"), this );
     group->setColumnLayout(0, Qt::Vertical );
-    group->tqlayout()->setSpacing( 6 );
-    group->tqlayout()->setMargin( 11 );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( group->tqlayout() );
+    group->layout()->setSpacing( 6 );
+    group->layout()->setMargin( 11 );
+    TQVBoxLayout* layout = new TQVBoxLayout( group->layout() );
 
     checkSequence = new TQCheckBox( i18n("&Enable sequence"), group );
                                                                                                         
@@ -383,12 +383,12 @@ SequenceDlg::SequenceDlg( TQWidget *parent, const char *name )
     spinStart->setLabel( i18n("Start:"), AlignLeft | AlignVCenter );
     spinStart->setRange( -100000, 100000, 1, false );
     
-    tqlayout->addWidget( checkSequence );
-    tqlayout->addWidget( radioNumbers );
-    tqlayout->addWidget( radioAlpha );
-    tqlayout->addWidget( radioAlphaNum );
-    tqlayout->addWidget( spinStep );
-    tqlayout->addWidget( spinStart );
+    layout->addWidget( checkSequence );
+    layout->addWidget( radioNumbers );
+    layout->addWidget( radioAlpha );
+    layout->addWidget( radioAlphaNum );
+    layout->addWidget( spinStep );
+    layout->addWidget( spinStart );
     
     main->addWidget( group );
 
@@ -443,10 +443,10 @@ ColorDlg::ColorDlg(TQWidget *parent, const char *name)
 {
     TQGroupBox* gb  = new TQGroupBox( i18n("Colors"), this );
     gb->setColumnLayout(0, Qt::Vertical );
-    gb->tqlayout()->setSpacing( 6 );
-    gb->tqlayout()->setMargin( 11 );
+    gb->layout()->setSpacing( 6 );
+    gb->layout()->setMargin( 11 );
     gb->setEnabled( Barkode::havePurePostscriptBarcode() );
-    TQGridLayout* gbLayout = new TQGridLayout( gb->tqlayout() );
+    TQGridLayout* gbLayout = new TQGridLayout( gb->layout() );
 
     buttonBarColor = new KColorButton( gb );
     buttonBackColor = new KColorButton( gb );