diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp
index 2bdb1d9..aa19b9c 100644
--- a/kbarcode/barcodedialog.cpp
+++ b/kbarcode/barcodedialog.cpp
@@ -208,7 +208,7 @@ void BarCodeDialog::copy()
     DocumentItemDrag* drag = new DocumentItemDrag();
     drag->setDocumentItem( &list );
 
-    kapp->tqclipboard()->setData( drag, TQClipboard::Clipboard );
+    kapp->clipboard()->setData( drag, TQClipboard::Clipboard );
 }
 
 #include "barcodedialog.moc"
diff --git a/kbarcode/barcodedialogs.cpp b/kbarcode/barcodedialogs.cpp
index 9856689..69c7f08 100644
--- a/kbarcode/barcodedialogs.cpp
+++ b/kbarcode/barcodedialogs.cpp
@@ -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 );
diff --git a/kbarcode/barcodeprinterdlg.cpp b/kbarcode/barcodeprinterdlg.cpp
index 4a76091..5093418 100644
--- a/kbarcode/barcodeprinterdlg.cpp
+++ b/kbarcode/barcodeprinterdlg.cpp
@@ -31,7 +31,7 @@ BarcodePrinterDlg::BarcodePrinterDlg(TQWidget *parent, const char *name)
     : KDialogBase( KDialogBase::Plain, i18n("Barcode Printer"),
       KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name)
 {
-    TQGridLayout* tqlayout = new TQGridLayout( plainPage(), 6, 6 );
+    TQGridLayout* layout = new TQGridLayout( plainPage(), 6, 6 );
     
     TQLabel* label = new TQLabel( i18n("&Output Format:"), plainPage() );
     comboFormat = new KComboBox( false, plainPage() );
@@ -47,13 +47,13 @@ BarcodePrinterDlg::BarcodePrinterDlg(TQWidget *parent, const char *name)
     comboDevice = new KComboBox( true, plainPage() );
     label3->setBuddy( comboDevice );
     
-    tqlayout->addWidget( label, 0, 0 );
-    tqlayout->addMultiCellWidget( comboFormat, 0, 0, 1, 2 );
-    tqlayout->addMultiCellWidget( checkFile, 1, 1, 1, 2 );
-    tqlayout->addWidget( label2, 2, 0 );
-    tqlayout->addWidget( requester, 2, 1 );
-    tqlayout->addWidget( label3, 3, 0 );
-    tqlayout->addMultiCellWidget( comboDevice, 3, 3, 1, 2 );
+    layout->addWidget( label, 0, 0 );
+    layout->addMultiCellWidget( comboFormat, 0, 0, 1, 2 );
+    layout->addMultiCellWidget( checkFile, 1, 1, 1, 2 );
+    layout->addWidget( label2, 2, 0 );
+    layout->addWidget( requester, 2, 1 );
+    layout->addWidget( label3, 3, 0 );
+    layout->addMultiCellWidget( comboDevice, 3, 3, 1, 2 );
     
     comboFormat->insertItem( i18n("TEC Printer (TEC)") );
     comboFormat->insertItem( i18n("Zebra Printer (ZPL)") );
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index c99b089..6e5bdc2 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -394,7 +394,7 @@ void BatchWizard::setupStackPage4()
     TQFrame* buttons = new TQFrame( stack4 );
     buttons->setMargin( 10 );
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( buttons );
+    TQVBoxLayout* layout = new TQVBoxLayout( buttons );
     TQSpacerItem* spacer1 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
     TQSpacerItem* spacer2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
@@ -413,12 +413,12 @@ void BatchWizard::setupStackPage4()
     TQToolTip::add( buttonRemoveAddress, i18n("Remove selected contacts from the list of contacts which will be printed.") );
     TQToolTip::add( buttonRemoveAllAddress, i18n("Remove all contacts from the list of contacts which will be printed.") );
 
-    tqlayout->addItem( spacer1 );
-    tqlayout->addWidget( buttonAddAllAddress );
-    tqlayout->addWidget( buttonAddAddress );
-    tqlayout->addWidget( buttonRemoveAddress );
-    tqlayout->addWidget( buttonRemoveAllAddress );
-    tqlayout->addItem( spacer2 );
+    layout->addItem( spacer1 );
+    layout->addWidget( buttonAddAllAddress );
+    layout->addWidget( buttonAddAddress );
+    layout->addWidget( buttonRemoveAddress );
+    layout->addWidget( buttonRemoveAllAddress );
+    layout->addItem( spacer2 );
 
     mainLayout->addWidget( list1 );
     mainLayout->addWidget( buttons );
@@ -873,7 +873,7 @@ void BatchWizard::loadFromFile()
 
 void BatchWizard::loadFromClipboard() 
 {
-    TQClipboard *cb = KApplication::tqclipboard();
+    TQClipboard *cb = KApplication::clipboard();
     loadData( cb->text() );
 }
 
diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp
index 7b83e57..ca7c016 100644
--- a/kbarcode/configdialog.cpp
+++ b/kbarcode/configdialog.cpp
@@ -64,13 +64,13 @@ ConfigDialog::~ConfigDialog()
 void ConfigDialog::setupTab1( )
 {
     TQFrame* box = addPage( i18n("SQL Settings"), "", BarIcon("connect_no") );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( box, 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( box, 6, 6 );
     TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
     sqlwidget = new SqlWidget( false, box, "sqlwidget" );
 
-    tqlayout->addWidget( sqlwidget );
-    tqlayout->addItem( spacer );
+    layout->addWidget( sqlwidget );
+    layout->addItem( spacer );
 }
 
 void ConfigDialog::setupTab2()
@@ -218,9 +218,9 @@ void ConfigDialog::setupTab5()
 
     TQButtonGroup* bg = new TQButtonGroup( i18n("On New Article"), box );
     bg->setColumnLayout(0, Qt::Vertical );
-    bg->tqlayout()->setSpacing( 6 );
-    bg->tqlayout()->setMargin( 11 );
-    TQGridLayout* bgLayout = new TQGridLayout( bg->tqlayout() );
+    bg->layout()->setSpacing( 6 );
+    bg->layout()->setMargin( 11 );
+    TQGridLayout* bgLayout = new TQGridLayout( bg->layout() );
 
     TQStringList alist, glist;
     alist.append( i18n("No Line Break") );
@@ -259,9 +259,9 @@ void ConfigDialog::setupTab5()
 
     TQButtonGroup* bg2 = new TQButtonGroup( i18n("On New Group"), box );
     bg2->setColumnLayout(0, Qt::Vertical );
-    bg2->tqlayout()->setSpacing( 6 );
-    bg2->tqlayout()->setMargin( 11 );
-    TQGridLayout* bg2Layout = new TQGridLayout( bg2->tqlayout() );
+    bg2->layout()->setSpacing( 6 );
+    bg2->layout()->setMargin( 11 );
+    TQGridLayout* bg2Layout = new TQGridLayout( bg2->layout() );
 
     onNewGroup1 = new KComboBox( false, bg2 );
     onNewGroup2 = new KComboBox( false, bg2 );
diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
index 2f8e78e..7b42227 100644
--- a/kbarcode/csvimportdlg.cpp
+++ b/kbarcode/csvimportdlg.cpp
@@ -91,7 +91,7 @@ CSVImportDlg::~CSVImportDlg()
 void CSVImportDlg::createPage1()
 {
     TQFrame* box = addPage( i18n("&Import Data") );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( box, 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( box, 6, 6 );
     TQGridLayout* grid = new TQGridLayout( 2 );
 
     requester = new KURLRequester( box );
@@ -114,7 +114,7 @@ void CSVImportDlg::createPage1()
     table->setReadOnly( true );
 
     frame = new TQFrame( box );
-    TQHBoxLayout* tqlayout2 = new TQHBoxLayout( frame, 6, 6 );
+    TQHBoxLayout* layout2 = new TQHBoxLayout( frame, 6, 6 );
     
     spinCol = new KIntNumInput( frame );
     spinCol->setLabel( i18n("Column:"), AlignLeft | AlignVCenter );
@@ -123,10 +123,10 @@ void CSVImportDlg::createPage1()
     comboField = new KComboBox( false, frame );
     buttonSet = new KPushButton( i18n("Set"), frame );
     
-    tqlayout2->addWidget( spinCol );
-    tqlayout2->addWidget( new TQLabel( i18n("Database field to use for this column:"), frame ) );
-    tqlayout2->addWidget( comboField );
-    tqlayout2->addWidget( buttonSet );
+    layout2->addWidget( spinCol );
+    layout2->addWidget( new TQLabel( i18n("Database field to use for this column:"), frame ) );
+    layout2->addWidget( comboField );
+    layout2->addWidget( buttonSet );
     
     grid->addWidget( new TQLabel( i18n("File to import:"), box ), 0, 0 );
     grid->addWidget( requester, 0, 1 );
@@ -139,17 +139,17 @@ void CSVImportDlg::createPage1()
     grid->addWidget( checkLoadAll, 4, 0 );
     grid->addWidget( spinLoadOnly, 4, 1 );
 
-    tqlayout->addLayout( grid );
-    tqlayout->addWidget( table );
-    tqlayout->setStretchFactor( table, 2 );
-    tqlayout->addWidget( frame );
+    layout->addLayout( grid );
+    layout->addWidget( table );
+    layout->setStretchFactor( table, 2 );
+    layout->addWidget( frame );
 }
 
 void CSVImportDlg::createPage2()
 {
     labelprinterdata* lb = PrinterSettings::getInstance()->getData();
     TQFrame* mainBox = addPage( i18n("&Import Settings") );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( mainBox, 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( mainBox, 6, 6 );
     TQSpacerItem* spacer1 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     TQSpacerItem* spacer2 = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
 
@@ -163,10 +163,10 @@ void CSVImportDlg::createPage2()
     groupFixed = new TQGroupBox( i18n("Fixed Field Width File"), hboxFrame );
 
     groupCSV->setColumnLayout(0, Qt::Vertical );
-    groupCSV->tqlayout()->setSpacing( 6 );
-    groupCSV->tqlayout()->setMargin( 11 );
+    groupCSV->layout()->setSpacing( 6 );
+    groupCSV->layout()->setMargin( 11 );
 
-    TQVBoxLayout* vbox = new TQVBoxLayout( groupCSV->tqlayout() );
+    TQVBoxLayout* vbox = new TQVBoxLayout( groupCSV->layout() );
     TQGridLayout* grid = new TQGridLayout( 2, 2 );
     grid->setSpacing( 6 );
     grid->setMargin( 11 );
@@ -196,9 +196,9 @@ void CSVImportDlg::createPage2()
     vbox->addItem( spacer1 );
 
     groupFixed->setColumnLayout(0, Qt::Horizontal );
-    groupFixed->tqlayout()->setSpacing( 6 );
-    groupFixed->tqlayout()->setMargin( 11 );
-    TQHBoxLayout* groupFixedLayout = new TQHBoxLayout( groupFixed->tqlayout() );
+    groupFixed->layout()->setSpacing( 6 );
+    groupFixed->layout()->setMargin( 11 );
+    TQHBoxLayout* groupFixedLayout = new TQHBoxLayout( groupFixed->layout() );
     groupFixedLayout->setAlignment( TQt::AlignTop );
 
     listWidth = new KListBox( groupFixed );
@@ -214,17 +214,17 @@ void CSVImportDlg::createPage2()
     spinNumber->setValue( 1 );
     spinNumber->setFocus();
 
-    TQVBoxLayout* tqlayout2 = new TQVBoxLayout( 0, 6, 6 );
-    tqlayout2->addWidget( buttonAdd );
-    tqlayout2->addWidget( buttonRemove );
-    tqlayout2->addWidget( spinNumber );
-    tqlayout2->addItem( spacer2 );
+    TQVBoxLayout* layout2 = new TQVBoxLayout( 0, 6, 6 );
+    layout2->addWidget( buttonAdd );
+    layout2->addWidget( buttonRemove );
+    layout2->addWidget( spinNumber );
+    layout2->addItem( spacer2 );
     
     groupFixedLayout->addWidget( listWidth );
-    groupFixedLayout->addLayout( tqlayout2 );
+    groupFixedLayout->addLayout( layout2 );
 
-    tqlayout->addWidget( buttonGroup );
-    tqlayout->addWidget( hboxFrame );
+    layout->addWidget( buttonGroup );
+    layout->addWidget( hboxFrame );
 
     radioCSVFile->setChecked( true );
 }
diff --git a/kbarcode/definitiondialog.cpp b/kbarcode/definitiondialog.cpp
index ae3cb64..e72626d 100644
--- a/kbarcode/definitiondialog.cpp
+++ b/kbarcode/definitiondialog.cpp
@@ -80,7 +80,7 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent,  const char* name, bool mo
 {
     resize( 465, 345 );
     setCaption( i18n( "Add Label Definition" ) );
-    TQHBoxLayout* tqlayout = new TQHBoxLayout( this, 6, 6 );
+    TQHBoxLayout* layout = new TQHBoxLayout( this, 6, 6 );
     DefinitionDialogLayout = new TQVBoxLayout( 0, 11, 6, "DefinitionDialogLayout");
 
     Layout17 = new TQHBoxLayout( 0, 0, 6, "Layout17"); 
@@ -202,8 +202,8 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent,  const char* name, bool mo
     DefinitionDialogLayout->addLayout( Layout16 );
 
     preview = new LabelPreview( this );
-    tqlayout->addLayout( DefinitionDialogLayout );
-    tqlayout->addWidget( preview );
+    layout->addLayout( DefinitionDialogLayout );
+    layout->addWidget( preview );
 
     l = new TQLabel( this );
     setExtension( l );
diff --git a/kbarcode/kactionmap.cpp b/kbarcode/kactionmap.cpp
index 89852fe..ae70698 100644
--- a/kbarcode/kactionmap.cpp
+++ b/kbarcode/kactionmap.cpp
@@ -106,7 +106,7 @@ void KActionMapDlg::updateEnabledState()
 KActionMap::KActionMap( KActionCollection* actions, TQWidget* parent, const char* name )
     : TQWidget( parent, name ), m_actions( actions ), m_showMenuTree( true ), m_grayOutItems( false )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
 
     m_listView   = new KListView( this );
 #if TDE_VERSION >= 0x030500
@@ -123,9 +123,9 @@ KActionMap::KActionMap( KActionCollection* actions, TQWidget* parent, const char
     m_listView->setAllColumnsShowFocus( true );
 
 #if TDE_VERSION >= 0x030500
-    tqlayout->addWidget( m_searchLine );
+    layout->addWidget( m_searchLine );
 #endif 
-    tqlayout->addWidget( m_listView );
+    layout->addWidget( m_listView );
 
     connect( m_listView, TQT_SIGNAL( executed( TQListViewItem* ) ), this, TQT_SLOT( slotExecuteAction( TQListViewItem* ) ) );
     connect( actions, TQT_SIGNAL( inserted( KAction* ) ), this, TQT_SLOT( slotActionCollectionChanged() ) );
diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp
index 3d13069..02dc92c 100644
--- a/kbarcode/kbarcode.cpp
+++ b/kbarcode/kbarcode.cpp
@@ -45,7 +45,7 @@ KBarcode::KBarcode( TQWidget *parent, const char *name, WFlags f)
 {
     TQGroupBox* w = new TQGroupBox( this );
     w->setColumnLayout(0, Qt::Vertical );
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( w->tqlayout() );
+    TQVBoxLayout* layout = new TQVBoxLayout( w->layout() );
     setCentralWidget( w );
 
     buttonSingle = new KPushButton( i18n("Barcode &Generator..."), w );
@@ -59,10 +59,10 @@ KBarcode::KBarcode( TQWidget *parent, const char *name, WFlags f)
     buttonEditor->setIconSet( BarIconSet( "edit" ) );
     buttonBatch->setIconSet( BarIconSet( "fileprint" ) );
 
-    tqlayout->addWidget( buttonSingle );
-    tqlayout->addWidget( buttonEditor );
-    tqlayout->addWidget( buttonBatch );
-    tqlayout->addWidget( buttonData );
+    layout->addWidget( buttonSingle );
+    layout->addWidget( buttonEditor );
+    layout->addWidget( buttonBatch );
+    layout->addWidget( buttonData );
 
     connect( buttonSingle, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this),  TQT_SLOT( startBarcode() ) );
     connect( buttonEditor, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this),  TQT_SLOT( startLabelEditor() ) );
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index e9246e8..fbe61c4 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -978,12 +978,12 @@ void LabelEditor::copy()
 
     DocumentItemDrag* drag = new DocumentItemDrag();
     drag->setDocumentItem( &items );
-    kapp->tqclipboard()->setData( drag, TQClipboard::Clipboard );
+    kapp->clipboard()->setData( drag, TQClipboard::Clipboard );
 }
 
 void LabelEditor::paste()
 {
-    TQMimeSource* data = TQApplication::tqclipboard()->data();
+    TQMimeSource* data = TQApplication::clipboard()->data();
     if ( DocumentItemDrag::canDecode( data ) )
         DocumentItemDrag::decode( data, cv, m_token, history );
 }
diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp
index 4e09a67..3c73623 100644
--- a/kbarcode/multilineeditdlg.cpp
+++ b/kbarcode/multilineeditdlg.cpp
@@ -36,7 +36,7 @@
 MultiLineEditor::MultiLineEditor( TokenProvider* token, TQWidget *parent, const char *name )
     : TQWidget( parent, name ), m_token( token )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 );
 
 //    ksc = new KSpellConfig( this );
 
@@ -52,8 +52,8 @@ MultiLineEditor::MultiLineEditor( TokenProvider* token, TQWidget *parent, const
     
     setupActions();
 
-    tqlayout->addWidget( area );
-    tqlayout->addWidget( editor );
+    layout->addWidget( area );
+    layout->addWidget( editor );
 
 }
 
diff --git a/kbarcode/newlabel.cpp b/kbarcode/newlabel.cpp
index d8a3016..f51c3c0 100644
--- a/kbarcode/newlabel.cpp
+++ b/kbarcode/newlabel.cpp
@@ -55,9 +55,9 @@ NewLabel::NewLabel( TQWidget* parent,  const char* name, bool change, WFlags fl
     TQGroupBox* group1 = new TQGroupBox( this );
     group1->setTitle( i18n( "Label" ) );
     group1->setColumnLayout(0, Qt::Vertical );
-    group1->tqlayout()->setSpacing( 6 );
-    group1->tqlayout()->setMargin( 11 );
-    TQGridLayout* group1Layout = new TQGridLayout( group1->tqlayout() );
+    group1->layout()->setSpacing( 6 );
+    group1->layout()->setMargin( 11 );
+    TQGridLayout* group1Layout = new TQGridLayout( group1->layout() );
     group1Layout->setAlignment( TQt::AlignTop );
     
     TextLabel2 = new TQLabel( group1, "TextLabel2" );
@@ -89,10 +89,10 @@ NewLabel::NewLabel( TQWidget* parent,  const char* name, bool change, WFlags fl
     TextLabel4 = new TQLabel( this, "TextLabel4" );
     preview = new LabelPreview( this, "preview" );
 
-    TQHBoxLayout* htqlayout = new TQHBoxLayout( 0, 6, 6 );    
-    htqlayout->addWidget( TextLabel4 );
-    htqlayout->addWidget( preview );
-    NewLabelLayout->addLayout( htqlayout );
+    TQHBoxLayout* hlayout = new TQHBoxLayout( 0, 6, 6 );    
+    hlayout->addWidget( TextLabel4 );
+    hlayout->addWidget( preview );
+    NewLabelLayout->addLayout( hlayout );
     TQSpacerItem* spacer_3 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     NewLabelLayout->addItem( spacer_3 );
 
diff --git a/kbarcode/smalldialogs.cpp b/kbarcode/smalldialogs.cpp
index 6c1a873..82fe63a 100644
--- a/kbarcode/smalldialogs.cpp
+++ b/kbarcode/smalldialogs.cpp
@@ -35,16 +35,16 @@ AddAllDialog::AddAllDialog(TQWidget *parent, const char *name )
     : KDialogBase( KDialogBase::Plain, i18n("Add Barcode_basic"),
       KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name)
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 6, 6 );
 
     group = new KLineEdit( plainPage() );
     number = new KIntNumInput( plainPage() );
     number->setLabel( i18n( "Number of labels:" ) );
     number->setRange( 1, 10000, 1, false );
 
-    tqlayout->addWidget( new TQLabel( i18n("Group:"), plainPage() ) );
-    tqlayout->addWidget( group );
-    tqlayout->addWidget( number );
+    layout->addWidget( new TQLabel( i18n("Group:"), plainPage() ) );
+    layout->addWidget( group );
+    layout->addWidget( number );
 }
 
 TQString AddAllDialog::groupName() const
@@ -79,7 +79,7 @@ void AddItemsDialog::init()
     plainPage()->setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Sunken );
     plainPage()->setLineWidth( 2 );
 
-    TQHBoxLayout* tqlayout = new TQHBoxLayout( plainPage(), 6, 6 );
+    TQHBoxLayout* layout = new TQHBoxLayout( plainPage(), 6, 6 );
 
     group = new KLineEdit( plainPage() );
     article = new KLineEdit( plainPage() );
@@ -88,11 +88,11 @@ void AddItemsDialog::init()
     number->setLabel( i18n( "Number of labels:" ), KNumInput::AlignLeft | KNumInput::AlignVCenter );
     number->setRange( 1, 10000, 1, false );
 
-    tqlayout->addWidget( number );
-    tqlayout->addWidget( new TQLabel( i18n("Article:" ), plainPage() ) );
-    tqlayout->addWidget( article );
-    tqlayout->addWidget( new TQLabel( i18n("Group:"), plainPage() ) );
-    tqlayout->addWidget( group );
+    layout->addWidget( number );
+    layout->addWidget( new TQLabel( i18n("Article:" ), plainPage() ) );
+    layout->addWidget( article );
+    layout->addWidget( new TQLabel( i18n("Group:"), plainPage() ) );
+    layout->addWidget( group );
 
     setButtonText( KDialogBase::User1, i18n("&Add") );
 
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index 79ae9d7..9300807 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -511,14 +511,14 @@ const TQString SqlTables::getBarcodeMaxLength( const TQString & name )
 SqlWidget::SqlWidget( bool showlabel, TQWidget* parent, const char* name )
     : TQWidget( parent, name )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    TQVBoxLayout* layout = new TQVBoxLayout( this );
 
     TQGroupBox* groupDatabase = new TQGroupBox( this );
     groupDatabase->setTitle( i18n( "Database Settings" ) );
     groupDatabase->setColumnLayout(0, Qt::Vertical );
-    groupDatabase->tqlayout()->setSpacing( 6 );
-    groupDatabase->tqlayout()->setMargin( 11 );
-    TQVBoxLayout* groupDatabaseLayout = new TQVBoxLayout( groupDatabase->tqlayout() );
+    groupDatabase->layout()->setSpacing( 6 );
+    groupDatabase->layout()->setMargin( 11 );
+    TQVBoxLayout* groupDatabaseLayout = new TQVBoxLayout( groupDatabase->layout() );
     groupDatabaseLayout->setAlignment( TQt::AlignTop );
 
     TQGridLayout* grid = new TQGridLayout( 2, 2 );
@@ -576,7 +576,7 @@ SqlWidget::SqlWidget( bool showlabel, TQWidget* parent, const char* name )
     if( showlabel )
         groupDatabaseLayout->addWidget( new TQLabel( i18n("<b>You have to test your database settings before you can procede.</b>"), groupDatabase ) );
 
-    tqlayout->add( groupDatabase );
+    layout->add( groupDatabase );
 
     connect( buttonTest, TQT_SIGNAL( clicked() ), this, TQT_SLOT( testSettings() ) );
 
diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp
index 79347f2..3cb9455 100644
--- a/kbarcode/textlineedit.cpp
+++ b/kbarcode/textlineedit.cpp
@@ -33,7 +33,7 @@
 TextLineEditor::TextLineEditor( TokenProvider* token, TQWidget *parent, const char *name )
     : TQWidget( parent, name ), m_token( token )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 );
+    TQVBoxLayout* layout = new TQVBoxLayout( this, 6, 6 );
 
 
 
@@ -48,8 +48,8 @@ TextLineEditor::TextLineEditor( TokenProvider* token, TQWidget *parent, const ch
     
     setupActions();
 
-    tqlayout->addWidget( area );
-    tqlayout->addWidget( editor );
+    layout->addWidget( area );
+    layout->addWidget( editor );
 
     
 
diff --git a/kbarcode/tokendialog.cpp b/kbarcode/tokendialog.cpp
index 1a3de7d..b936548 100644
--- a/kbarcode/tokendialog.cpp
+++ b/kbarcode/tokendialog.cpp
@@ -125,9 +125,9 @@ void TokenDialog::setupStack2Page1()
 {
     stack2Page1 = new TQWidget();
 
-    TQVBoxLayout* tqlayout = new TQVBoxLayout( stack2Page1 );
+    TQVBoxLayout* layout = new TQVBoxLayout( stack2Page1 );
     TQSplitter* splitter = new TQSplitter( stack2Page1 );
-    tqlayout->addWidget( splitter );
+    layout->addWidget( splitter );
     
     TQVBox* left = new TQVBox( splitter );
     TQVBox* right = new TQVBox( splitter );