diff --git a/kbarcode/barcodecombo.cpp b/kbarcode/barcodecombo.cpp
index 5393a8f..e1e9dd8 100644
--- a/kbarcode/barcodecombo.cpp
+++ b/kbarcode/barcodecombo.cpp
@@ -122,8 +122,8 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
     grid->addWidget( labelStandard, 1, 0 );
 
     comboStandard = new BarcodeCombo( this, "comboStandard" );
-    connect( comboStandard, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( encodingChanged() ) );
-    connect( comboStandard, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( changed() ) );
+    connect( comboStandard, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( encodingChanged() ) );
+    connect( comboStandard, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( changed() ) );
     grid->addMultiCellWidget( comboStandard, 1, 1, 1, 3 );
     labelStandard->setBuddy( comboStandard );
     
@@ -133,8 +133,8 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
     data = new KLineEdit( this, "data" );
 
     labelData->setBuddy( data );
-    connect( data, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( changed() ) );
-    connect( data, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotValidateValue() ) );
+    connect( data, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( changed() ) );
+    connect( data, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotValidateValue() ) );
     grid->addMultiCellWidget( data, 2, 2, 1, 3 );
 
     multi = new KTextEdit( this );
@@ -145,13 +145,13 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
     multi->setVScrollBarMode( TQScrollView::AlwaysOn );
     multi->setHScrollBarMode( TQScrollView::AlwaysOn );
     multi->hide();
-    connect( multi, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( changed() ) );    
+    connect( multi, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( changed() ) );    
     grid->addMultiCellWidget( multi, 3, 3, 1, 3 );
     
     checkText = new TQCheckBox( this, "checkText" );
     checkText->setText( i18n( "&Display text" ) );
     checkText->setChecked( true );
-    connect( checkText, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changed() ) );
+    connect( checkText, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changed() ) );
     grid->addWidget( checkText, 4, 1 );
 
     buttonAdvanced = new KPushButton( i18n("&Advanced..."), this );
@@ -166,31 +166,31 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
     spinMargin->setLabel( i18n( "&Margin:" ), KNumInput::AlignLeft | KNumInput::AlignVCenter );
     spinMargin->setRange( 0, 10000, 1, false );
     spinMargin->setValue( 10 );
-    connect( spinMargin, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( changed() ) );
+    connect( spinMargin, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( changed() ) );
     grid->addMultiCellWidget( spinMargin, 5, 5, 0, 1 );
 
     spinRotation = new KIntNumInput( this );
     spinRotation->setLabel( i18n( "&Rotation:" ), KNumInput::AlignLeft | KNumInput::AlignVCenter );
     spinRotation->setRange( 0, 360, 90, false );
     spinRotation->setValue( 0 );
-    connect( spinRotation, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( changed() ) );
+    connect( spinRotation, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( changed() ) );
     grid->addMultiCellWidget( spinRotation, 5, 5, 2, 3 );
 
     spinScale = new KIntNumInput( spinMargin, 1000, this );
     spinScale->setLabel( i18n("&Scale (in permille):"), KNumInput::AlignLeft | KNumInput::AlignVCenter );
     spinScale->setRange( 100, 10000, 100, false );
     spinScale->setValue( 1000 );
-    connect( spinScale, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( changed() ) );
+    connect( spinScale, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( changed() ) );
     grid->addMultiCellWidget( spinScale, 6, 6, 0, 1 );
 
     spinCut = new KIntNumInput( spinRotation, 100, this );
     spinCut->setLabel( i18n("&Crop:"), KNumInput::AlignLeft | KNumInput::AlignVCenter );
     spinCut->setRange( 1, 100, 1, false );
-    connect( spinCut, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( changed() ) );
+    connect( spinCut, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( changed() ) );
     grid->addMultiCellWidget( spinCut, 6, 6, 2, 3 );
 
-    connect( buttonAdvanced, TQT_SIGNAL( clicked() ), this, TQT_SLOT( advanced() ) );
-    connect( buttonToken, TQT_SIGNAL( clicked() ), this, TQT_SLOT( tokens() ) );
+    connect( buttonAdvanced, TQ_SIGNAL( clicked() ), this, TQ_SLOT( advanced() ) );
+    connect( buttonToken, TQ_SIGNAL( clicked() ), this, TQ_SLOT( tokens() ) );
 
     m_enabledata = true;
     m_multi = false;
@@ -200,7 +200,7 @@ BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name )
 void BarcodeWidget::getData( Barkode & barcode )
 {
     // make sure all changes are applied to the barcode
-    // even if not all widgets have emitted their changed TQT_SIGNAL yet
+    // even if not all widgets have emitted their changed TQ_SIGNAL yet
     this->changed();
 
     barcode = m_barcode;
diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp
index b63f267..df57d6c 100644
--- a/kbarcode/barcodedialog.cpp
+++ b/kbarcode/barcodedialog.cpp
@@ -82,10 +82,10 @@ BarCodeDialog::BarCodeDialog( TQWidget* parent,  const char* name )
     
     barcode = new TQLabel( sv->viewport(), "barcode" );
     sv->addChild( barcode );
-    connect( buttonGenerate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( generate() ) );
-    connect( buttonSave, TQT_SIGNAL( clicked() ), this, TQT_SLOT( save() ) );
-    connect( buttonPrint, TQT_SIGNAL( clicked() ), this, TQT_SLOT( print() ) );
-    connect( buttonCopy, TQT_SIGNAL( clicked() ), this, TQT_SLOT( copy() ) );
+    connect( buttonGenerate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( generate() ) );
+    connect( buttonSave, TQ_SIGNAL( clicked() ), this, TQ_SLOT( save() ) );
+    connect( buttonPrint, TQ_SIGNAL( clicked() ), this, TQ_SLOT( print() ) );
+    connect( buttonCopy, TQ_SIGNAL( clicked() ), this, TQ_SLOT( copy() ) );
 
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
@@ -103,7 +103,7 @@ BarCodeDialog::BarCodeDialog( TQWidget* parent,  const char* name )
     BarCodeDialogLayout->addLayout( Layout5 );
     BarCodeDialogLayout->setStretchFactor( Layout6, 2 );
 
-    connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() ) );
+    connect( buttonClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() ) );
     
     buttonGenerate->setDefault( true );
     
diff --git a/kbarcode/barcodedialogs.cpp b/kbarcode/barcodedialogs.cpp
index 5426ca7..89f6135 100644
--- a/kbarcode/barcodedialogs.cpp
+++ b/kbarcode/barcodedialogs.cpp
@@ -388,10 +388,10 @@ SequenceDlg::SequenceDlg( TQWidget *parent, const char *name )
     
     main->addWidget( group );
 
-    connect( checkSequence, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioNumbers, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioAlpha, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioAlphaNum, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( checkSequence, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioNumbers, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioAlpha, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioAlphaNum, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 }
 
 void SequenceDlg::setData( Barkode* b )
diff --git a/kbarcode/barcodeprinterdlg.cpp b/kbarcode/barcodeprinterdlg.cpp
index 5470dd0..3ae416b 100644
--- a/kbarcode/barcodeprinterdlg.cpp
+++ b/kbarcode/barcodeprinterdlg.cpp
@@ -68,7 +68,7 @@ BarcodePrinterDlg::BarcodePrinterDlg(TQWidget *parent, const char *name)
     comboDevice->insertItem( "/dev/usb/lp1" );
     comboDevice->insertItem( "/dev/usb/lp2" );
     
-    connect( checkFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( checkFile, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 
 //    KFileDialog fd( TQString(), "*.zpl|Zebra Printer Language (*.zpl)\n*.ipl|Intermec Printer Language (*.ipl)", this, "fd", true );
     
diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index e5fc395..13c41fc 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -134,7 +134,7 @@ void BatchWizard::setupPage1()
 
     addPage( page1, i18n("File Selection") );
 
-    connect( m_url, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
+    connect( m_url, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
 }
 
 void BatchWizard::setupPage2()
@@ -154,10 +154,10 @@ void BatchWizard::setupPage2()
     pageLayout->addWidget( group );
     pageLayout->addItem( spacer );
 
-    connect( radioSimple, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioSqlArticles, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioVarImport, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioAddressBook, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( radioSimple, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioSqlArticles, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioVarImport, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioAddressBook, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 
     addPage( page2, i18n("Data Source") );
 }
@@ -193,8 +193,8 @@ void BatchWizard::setupPage4()
 
     addPage( page4, i18n("Import Variables") );
 
-    connect( buttonTableInsert, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTableInsert() ) );
-    connect( buttonTableRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTableRemove() ) );
+    connect( buttonTableInsert, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTableInsert() ) );
+    connect( buttonTableRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTableRemove() ) );
 }
 
 void BatchWizard::setupPage5()
@@ -274,15 +274,15 @@ void BatchWizard::setupPage10()
     pageLayout->addWidget( labelInfo );
     pageLayout->addWidget( checkKeepOpen );
 
-    connect( radioPrinter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioImage, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioBarcode, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( radioPrinter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioImage, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioBarcode, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 
-    connect( radioImageFilenameArticle, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioImageFilenameBarcode, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioImageFilenameCustom, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( radioImageFilenameArticle, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioImageFilenameBarcode, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioImageFilenameCustom, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 
-    connect( imageDirPath, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
+    connect( imageDirPath, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
 
     addPage( page10, i18n("Output Device") );
 }
@@ -309,9 +309,9 @@ void BatchWizard::setupStackPage1()
     buttonRemoveAll = new KPushButton( i18n("R&emove All"), hButtonBox );
 
     TDEPopupMenu* mnuImport = new TDEPopupMenu( this );
-    mnuImport->insertItem( i18n("Import from File ..."), this, TQT_SLOT( loadFromFile() ) );
-    mnuImport->insertItem( i18n("Import from Clipboard ..."), this, TQT_SLOT( loadFromClipboard() ) );
-    mnuImport->insertItem( i18n("Import barcode_basic"), this, TQT_SLOT( addAllItems() ) );
+    mnuImport->insertItem( i18n("Import from File ..."), this, TQ_SLOT( loadFromFile() ) );
+    mnuImport->insertItem( i18n("Import from Clipboard ..."), this, TQ_SLOT( loadFromClipboard() ) );
+    mnuImport->insertItem( i18n("Import barcode_basic"), this, TQ_SLOT( addAllItems() ) );
     buttonImport->setPopup( mnuImport );
 
     sqlList = new TDEListView( stack1 );
@@ -320,16 +320,16 @@ void BatchWizard::setupStackPage1()
     sqlList->addColumn( i18n("Article Number") );
     sqlList->addColumn( i18n("Group") );
     sqlList->setAllColumnsShowFocus( true );
-    connect( sqlList, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)),
-             this, TQT_SLOT(changeItem(TQListViewItem*,const TQPoint &,int)));
+    connect( sqlList, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint &,int)),
+             this, TQ_SLOT(changeItem(TQListViewItem*,const TQPoint &,int)));
 
-    connect( customerName, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerNameChanged(int) ) );
-    connect( customerId, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerIdChanged(int) ) );
-    connect( buttonAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addItem() ) );
-    connect( buttonEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( editItem() ) );
-    connect( buttonRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeItem() ) );
-    connect( buttonRemoveAll, TQT_SIGNAL( clicked() ), sqlList, TQT_SLOT( clear() ) );
-    connect( buttonRemoveAll, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( customerName, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerNameChanged(int) ) );
+    connect( customerId, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerIdChanged(int) ) );
+    connect( buttonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addItem() ) );
+    connect( buttonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( editItem() ) );
+    connect( buttonRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeItem() ) );
+    connect( buttonRemoveAll, TQ_SIGNAL( clicked() ), sqlList, TQ_SLOT( clear() ) );
+    connect( buttonRemoveAll, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 
     page3->addWidget( stack1 );
 }
@@ -362,11 +362,11 @@ void BatchWizard::setupStackPage2()
     new TQLabel( i18n("Available Variables:"), box );
     m_varList = new TDEListBox( box );
 
-    connect( radioImportManual, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioImportSql, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioImportCSV, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( importSqlQuery, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
-    connect( importCsvFile, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
+    connect( radioImportManual, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioImportSql, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioImportCSV, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( importSqlQuery, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
+    connect( importCsvFile, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
 
     page3->addWidget( stack2 );
 }
@@ -452,10 +452,10 @@ void BatchWizard::setupStackPage4()
     listSelectedAddress->setColumnWidthMode( 1, TQListView::Maximum );
     listSelectedAddress->setColumnWidthMode( 2, TQListView::Maximum );
 
-    connect( buttonAddAddress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAddress() ) );
-    connect( buttonRemoveAddress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveAddress() ) );
-    connect( buttonAddAllAddress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAllAddress() ) );
-    connect( buttonRemoveAllAddress, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveAllAddress() ) );
+    connect( buttonAddAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAddress() ) );
+    connect( buttonRemoveAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveAddress() ) );
+    connect( buttonAddAllAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAllAddress() ) );
+    connect( buttonRemoveAllAddress, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveAllAddress() ) );
 
     page3->addWidget( stack4 );
 }
@@ -725,8 +725,8 @@ void BatchWizard::addItem()
 {
     DSSmallDialogs::AddItemsDialog aid( this, "aid" );
     aid.setGroupCompletion( compGroup );
-    connect( &aid, TQT_SIGNAL( add( const TQString &, const TQString &, int) ),
-             this, TQT_SLOT( slotAddItem( const TQString &, const TQString &, int) ) );
+    connect( &aid, TQ_SIGNAL( add( const TQString &, const TQString &, int) ),
+             this, TQ_SLOT( slotAddItem( const TQString &, const TQString &, int) ) );
 
     aid.exec();
 }
diff --git a/kbarcode/commands.cpp b/kbarcode/commands.cpp
index ea1c790..cf9c761 100644
--- a/kbarcode/commands.cpp
+++ b/kbarcode/commands.cpp
@@ -59,7 +59,7 @@ CommandUtils::CommandUtils(TCanvasItem* item)
     c = m_canvas_item->canvas();
     /* NOT NEEDED:
     if( m_canvas_item && m_canvas_item->item() )
-        connect( m_canvas_item->item(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( documentItemDeleted() ) );
+        connect( m_canvas_item->item(), TQ_SIGNAL( destroyed() ), this, TQ_SLOT( documentItemDeleted() ) );
     */
 }
 
@@ -125,7 +125,7 @@ void NewItemCommand::execute()
 	    m_item->addRef();
 
 	    /* NOT NEEDED:
-            connect( m_object, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( documentItemDeleted() ) );
+            connect( m_object, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( documentItemDeleted() ) );
 	    */
         }
     }
@@ -506,7 +506,7 @@ DeleteCommand::~DeleteCommand()
     {
         DocumentItem* item = m_canvas_item->item();
         if( item )
-            item->disconnect( item, TQT_SIGNAL( destroyed() ), this, 0 );
+            item->disconnect( item, TQ_SIGNAL( destroyed() ), this, 0 );
         delete m_canvas_item;
     }
 }
diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp
index c8b95a7..51b0d0a 100644
--- a/kbarcode/configdialog.cpp
+++ b/kbarcode/configdialog.cpp
@@ -192,7 +192,7 @@ void ConfigDialog::setupTab4()
     date = new KLineEdit( box );
     labelDate = new TQLabel( box );
     
-    connect( date, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateDatePreview() ) );
+    connect( date, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateDatePreview() ) );
 
     spinGrid = new KIntNumInput( 0, box );
     spinGrid->setLabel( i18n("Grid:" ), AlignLeft | AlignVCenter );
diff --git a/kbarcode/confwizard.cpp b/kbarcode/confwizard.cpp
index f5e89e7..2d7631c 100644
--- a/kbarcode/confwizard.cpp
+++ b/kbarcode/confwizard.cpp
@@ -66,9 +66,9 @@ ConfWizard::ConfWizard( TQWidget* parent,  const char* name, bool modal )
     setNextEnabled( page_2, false );
     helpButton()->hide();
     
-    connect( buttonCreate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( create() ) );
-    connect( buttonExample, TQT_SIGNAL( clicked() ), this, TQT_SLOT( example() ) );
-    connect( checkDatabase, TQT_SIGNAL( clicked() ), this, TQT_SLOT( useDatabase() ) );
+    connect( buttonCreate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( create() ) );
+    connect( buttonExample, TQ_SIGNAL( clicked() ), this, TQ_SLOT( example() ) );
+    connect( checkDatabase, TQ_SIGNAL( clicked() ), this, TQ_SLOT( useDatabase() ) );
 }
 
 ConfWizard::~ConfWizard()
@@ -134,7 +134,7 @@ void ConfWizard::setupPage2()
     checkDatabase->setChecked( true );
 
     sqlwidget = new SqlWidget( true, page_2, "sqlwidget" );
-    connect( sqlwidget, TQT_SIGNAL( databaseWorking( bool ) ), this, TQT_SLOT( testSettings( bool ) ) );
+    connect( sqlwidget, TQ_SIGNAL( databaseWorking( bool ) ), this, TQ_SLOT( testSettings( bool ) ) );
         
     TQSpacerItem* spacer_5 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
     pageLayout_2->addWidget( checkDatabase );
diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp
index 551e220..00e9b57 100644
--- a/kbarcode/csvimportdlg.cpp
+++ b/kbarcode/csvimportdlg.cpp
@@ -63,20 +63,20 @@ CSVImportDlg::CSVImportDlg(TQWidget *parent, const char *name )
     createPage1();
     createPage2();
 
-    connect( requester, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( settingsChanged() ) );
-    connect( buttonSet, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setCol() ) );
-    connect( comboSQL, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( updateFields() ) );
-    connect( databaseName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( updateFields() ) );
-    connect( comboEncoding, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( settingsChanged() ) );
-    connect( table->horizontalHeader(), TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( updateCol( int ) ) );
-    connect( radioCSVFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioFixedFile, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( buttonAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addWidth() ) );
-    connect( buttonRemove,TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeWidth() ) );
-    connect( comment, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( settingsChanged() ) );
-    connect( quote, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( settingsChanged() ) );
-    connect( separator, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( settingsChanged() ) );
-    connect( checkLoadAll, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( requester, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( settingsChanged() ) );
+    connect( buttonSet, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setCol() ) );
+    connect( comboSQL, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( updateFields() ) );
+    connect( databaseName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( updateFields() ) );
+    connect( comboEncoding, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( settingsChanged() ) );
+    connect( table->horizontalHeader(), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( updateCol( int ) ) );
+    connect( radioCSVFile, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioFixedFile, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( buttonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addWidth() ) );
+    connect( buttonRemove,TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeWidth() ) );
+    connect( comment, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( settingsChanged() ) );
+    connect( quote, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( settingsChanged() ) );
+    connect( separator, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( settingsChanged() ) );
+    connect( checkLoadAll, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 
     updateFields();
     enableControls();
diff --git a/kbarcode/databasebrowser.cpp b/kbarcode/databasebrowser.cpp
index 17aba81..649c348 100644
--- a/kbarcode/databasebrowser.cpp
+++ b/kbarcode/databasebrowser.cpp
@@ -49,10 +49,10 @@ DatabaseBrowser::DatabaseBrowser( TQString _database, TQWidget *parent, const ch
 
     database = _database;
 
-    connect( table, TQT_SIGNAL( cursorChanged( TQSql::Op ) ),
-             SqlTables::getInstance(), TQT_SIGNAL( tablesChanged() ) );
+    connect( table, TQ_SIGNAL( cursorChanged( TQSql::Op ) ),
+             SqlTables::getInstance(), TQ_SIGNAL( tablesChanged() ) );
 
-    connect( this, TQT_SIGNAL( connectedSQL() ), this, TQT_SLOT( setupSql() ) );
+    connect( this, TQ_SIGNAL( connectedSQL() ), this, TQ_SLOT( setupSql() ) );
 
     findDlg = 0;
     
@@ -81,10 +81,10 @@ void DatabaseBrowser::setupActions()
     DSMainWindow::setupActions();
     TDEPopupMenu* editMenu = new TDEPopupMenu( this );
 
-    TDEAction* acut = KStdAction::cut( this, TQT_SLOT( cut() ), actionCollection() );
-    TDEAction* acopy = KStdAction::copy( this, TQT_SLOT( copy() ), actionCollection() );
-    TDEAction* apaste = KStdAction::paste( this, TQT_SLOT( paste() ), actionCollection() );
-    TDEAction* afind = KStdAction::find( this, TQT_SLOT( find() ), actionCollection() );
+    TDEAction* acut = KStdAction::cut( this, TQ_SLOT( cut() ), actionCollection() );
+    TDEAction* acopy = KStdAction::copy( this, TQ_SLOT( copy() ), actionCollection() );
+    TDEAction* apaste = KStdAction::paste( this, TQ_SLOT( paste() ), actionCollection() );
+    TDEAction* afind = KStdAction::find( this, TQ_SLOT( find() ), actionCollection() );
     menuBar()->insertItem( i18n("&Edit"), editMenu, -1, 1 );
 
     acut->plug( editMenu );
@@ -93,10 +93,10 @@ void DatabaseBrowser::setupActions()
     
     editMenu->insertSeparator();
     afind->plug( editMenu );
-    KStdAction::findNext( this, TQT_SLOT( findNext() ), actionCollection() )->plug( editMenu );
+    KStdAction::findNext( this, TQ_SLOT( findNext() ), actionCollection() )->plug( editMenu );
     editMenu->insertSeparator();
     TDEAction* aimport = new TDEAction( i18n("&Import CSV File..."), "",
-                                0, this, TQT_SLOT(import()), actionCollection(), "import" );
+                                0, this, TQ_SLOT(import()), actionCollection(), "import" );
     aimport->plug( editMenu );
         
     acut->plug( toolBar() );
@@ -141,7 +141,7 @@ void DatabaseBrowser::find()
     findDlg->setText( m_find );
     findDlg->setDirection( m_direction );
     findDlg->setCaseSensitive( m_case );
-    connect( findDlg, TQT_SIGNAL( search() ), this, TQT_SLOT( findNext() ) );
+    connect( findDlg, TQ_SIGNAL( search() ), this, TQ_SLOT( findNext() ) );
     
     findDlg->exec();
     
diff --git a/kbarcode/definitiondialog.cpp b/kbarcode/definitiondialog.cpp
index ea9409e..35a5e03 100644
--- a/kbarcode/definitiondialog.cpp
+++ b/kbarcode/definitiondialog.cpp
@@ -209,17 +209,17 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent,  const char* name, bool mo
     setExtension( l );
     setOrientation(TQt::Vertical );
 
-    connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
-    connect( buttonAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( add() ) );
-
-    connect( editWidth, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
-    connect( editHeight, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
-    connect( editHGap, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
-    connect( editVGap, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
-    connect( editTGap, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
-    connect( editLGap, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
-    connect( editNumH, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
-    connect( editNumV, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updatePreview() ) );
+    connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
+    connect( buttonAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( add() ) );
+
+    connect( editWidth, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+    connect( editHeight, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+    connect( editHGap, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+    connect( editVGap, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+    connect( editTGap, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+    connect( editLGap, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+    connect( editNumH, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
+    connect( editNumV, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updatePreview() ) );
 
     comboProducer->setInsertionPolicy( TQComboBox::NoInsertion );
     comboType->setInsertionPolicy( TQComboBox::NoInsertion );
@@ -232,9 +232,9 @@ DefinitionDialog::DefinitionDialog( TQWidget* parent,  const char* name, bool mo
     for( unsigned int i = 0; i < list.count(); i++ )
         types[i] = Definition::getTypes( list[i] );
 
-    connect( comboProducer, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updateType() ) );
-    connect( comboType, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( updateText() ) );
-    connect( buttonInfo, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleExtension() ) );
+    connect( comboProducer, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updateType() ) );
+    connect( comboType, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( updateText() ) );
+    connect( buttonInfo, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleExtension() ) );
 
     drawGraphic();
     updateType();
diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp
index abba796..ae826fa 100644
--- a/kbarcode/dsmainwindow.cpp
+++ b/kbarcode/dsmainwindow.cpp
@@ -50,7 +50,7 @@ DSMainWindow::DSMainWindow(TQWidget *parent, const char *name, WFlags f)
     loadConfig();
 
     setAutoSaveSettings( TQString("Window") + name, true );
-    connect( kapp, TQT_SIGNAL( aboutToQuit() ), this,  TQT_SLOT( saveConfig() ) );
+    connect( kapp, TQ_SIGNAL( aboutToQuit() ), this,  TQ_SLOT( saveConfig() ) );
 
     if( first && startwizard ) {
         wizard();
@@ -65,24 +65,24 @@ DSMainWindow::~DSMainWindow()
 
 void DSMainWindow::setupActions()
 {
-    TDEAction* quitAct = KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
-    TDEAction* closeAct = KStdAction::close( this, TQT_SLOT( close() ), actionCollection(), "close" );
-    TDEAction* configureAct = KStdAction::preferences( KBarcodeSettings::getInstance(), TQT_SLOT(configure()), actionCollection() );
+    TDEAction* quitAct = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+    TDEAction* closeAct = KStdAction::close( this, TQ_SLOT( close() ), actionCollection(), "close" );
+    TDEAction* configureAct = KStdAction::preferences( KBarcodeSettings::getInstance(), TQ_SLOT(configure()), actionCollection() );
     TDEAction* wizardAct = new TDEAction( i18n("&Start Configuration Wizard..."), BarIcon("wizard"), 0, this, 
-                                TQT_SLOT(wizard()), actionCollection(), "wizard" );
+                                TQ_SLOT(wizard()), actionCollection(), "wizard" );
 
-    connectAct = new TDEAction(i18n("&Connect to Database"), BarIcon("connect_no"), 0, this,  TQT_SLOT(connectMySQL()),
+    connectAct = new TDEAction(i18n("&Connect to Database"), BarIcon("connect_no"), 0, this,  TQ_SLOT(connectMySQL()),
                                 actionCollection(),"connect" );
 
 
     TDEAction* newTablesAct = new TDEAction( i18n("&Create Tables"), "", 0, this, 
-                                TQT_SLOT(newTables()), actionCollection(), "tables" );
+                                TQ_SLOT(newTables()), actionCollection(), "tables" );
 
     importLabelDefAct = new TDEAction( i18n("&Import Label Definitions"), "", 0, SqlTables::getInstance(),
-                                TQT_SLOT(importLabelDef()), actionCollection(), "import" );
+                                TQ_SLOT(importLabelDef()), actionCollection(), "import" );
 
     importExampleAct = new TDEAction( i18n("&Import Example Data"), "", 0, SqlTables::getInstance(),
-                                TQT_SLOT(importExampleData()), actionCollection(), "import" );
+                                TQ_SLOT(importExampleData()), actionCollection(), "import" );
                                 
     TDEPopupMenu* file = new TDEPopupMenu( this );
     TDEPopupMenu* settings = new TDEPopupMenu( this );
@@ -90,12 +90,12 @@ void DSMainWindow::setupActions()
     int helpid = hlpMenu->idAt( 0 );
     hlpMenu->removeItem( helpid );
     hlpMenu->insertItem( SmallIconSet("contents"), i18n("&Help"),
-        this, TQT_SLOT(appHelpActivated()), Key_F1, -1, 0 );
-    hlpMenu->insertItem( SmallIconSet("barcode"), i18n("&Barcode Help..."), this, TQT_SLOT( startInfo() ), 0, -1, 1 );
+        this, TQ_SLOT(appHelpActivated()), Key_F1, -1, 0 );
+    hlpMenu->insertItem( SmallIconSet("barcode"), i18n("&Barcode Help..."), this, TQ_SLOT( startInfo() ), 0, -1, 1 );
     hlpMenu->insertSeparator(3);
-    hlpMenu->insertItem( i18n("&Donate..."), this, TQT_SLOT( donations() ), 0, -1, 4 );
+    hlpMenu->insertItem( i18n("&Donate..."), this, TQ_SLOT( donations() ), 0, -1, 4 );
     hlpMenu->insertSeparator(5);
-    hlpMenu->insertItem( SmallIconSet("computer"), i18n("&System Check..."), this, TQT_SLOT(showCheck() ), 0, -1, 6 );
+    hlpMenu->insertItem( SmallIconSet("computer"), i18n("&System Check..."), this, TQ_SLOT(showCheck() ), 0, -1, 6 );
     menuBar()->insertItem( i18n("&File"), file );
     menuBar()->insertItem( i18n("&Settings"), settings );
     menuBar()->insertItem( i18n("&Help"), hlpMenu );
diff --git a/kbarcode/dstextedit.cpp b/kbarcode/dstextedit.cpp
index 9a51d8f..88c5e0f 100644
--- a/kbarcode/dstextedit.cpp
+++ b/kbarcode/dstextedit.cpp
@@ -22,7 +22,7 @@
 DSTextEdit::DSTextEdit( TQWidget* parent, const char* name )
     : KTextEdit( parent, name )
 {
-    connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( fixParagraphs() ) );
+    connect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( fixParagraphs() ) );
 }
 
 void DSTextEdit::fixParagraphs()
@@ -46,7 +46,7 @@ void DSTextEdit::fixParagraphs()
         chars.append( paragraphLength( i ) );
 
     // disconnect us first as we change the text here
-    disconnect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( fixParagraphs() ) );
+    disconnect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( fixParagraphs() ) );
 
     getCursorPosition( &para, &index );
     getSelection( &paraFrom, &indexFrom, &paraTo, &indexTo );
@@ -105,7 +105,7 @@ void DSTextEdit::fixParagraphs()
     this->setSelection( paraFrom, indexFrom, paraTo, indexTo );
 
 
-    connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( fixParagraphs() ) );
+    connect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( fixParagraphs() ) );
 }
 
 /*
diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp
index fce7aa2..70317fa 100644
--- a/kbarcode/kbarcode.cpp
+++ b/kbarcode/kbarcode.cpp
@@ -64,28 +64,28 @@ KBarcode::KBarcode( TQWidget *parent, const char *name, WFlags f)
     layout->addWidget( buttonBatch );
     layout->addWidget( buttonData );
 
-    connect( buttonSingle, TQT_SIGNAL( clicked() ), this,  TQT_SLOT( startBarcode() ) );
-    connect( buttonEditor, TQT_SIGNAL( clicked() ), this,  TQT_SLOT( startLabelEditor() ) );
-    connect( buttonBatch, TQT_SIGNAL( clicked() ), this,  TQT_SLOT( startBatchPrint() ) );
-    connect( SqlTables::getInstance(), TQT_SIGNAL( connectedSQL() ), this,  TQT_SLOT( enableData() ) );
+    connect( buttonSingle, TQ_SIGNAL( clicked() ), this,  TQ_SLOT( startBarcode() ) );
+    connect( buttonEditor, TQ_SIGNAL( clicked() ), this,  TQ_SLOT( startLabelEditor() ) );
+    connect( buttonBatch, TQ_SIGNAL( clicked() ), this,  TQ_SLOT( startBatchPrint() ) );
+    connect( SqlTables::getInstance(), TQ_SIGNAL( connectedSQL() ), this,  TQ_SLOT( enableData() ) );
     
     setupActions();
     show();
 
     TDEAction* editLabelDefAct = new TDEAction(i18n("&Edit Label Definitions"), "",
-                                0, this,  TQT_SLOT(editLabelDef()), actionCollection(), "design" );
+                                0, this,  TQ_SLOT(editLabelDef()), actionCollection(), "design" );
 
     TDEAction* editArticleAct = new TDEAction(i18n("&Edit Articles"), "",
-                                0, this,  TQT_SLOT(editArticles()), actionCollection(), "design" );
+                                0, this,  TQ_SLOT(editArticles()), actionCollection(), "design" );
 
     TDEAction* editCustomerAct = new TDEAction(i18n("&Edit Customers"), "",
-                                0, this,  TQT_SLOT(editCustomers()), actionCollection(), "design" );
+                                0, this,  TQ_SLOT(editCustomers()), actionCollection(), "design" );
 
     TDEAction* editCustomerTextAct = new TDEAction(i18n("&Edit Customer Text"), "",
-                                0, this,  TQT_SLOT(editCustomerText()), actionCollection() );
+                                0, this,  TQ_SLOT(editCustomerText()), actionCollection() );
 
     TDEAction* importCSVAct = new TDEAction(i18n("&Import CSV File..."), "",
-                                0, this,  TQT_SLOT(importCSV()), actionCollection() );
+                                0, this,  TQ_SLOT(importCSV()), actionCollection() );
                                 
     TDEPopupMenu* data = new TDEPopupMenu( buttonData );
     editLabelDefAct->plug( data );
diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp
index a4fde3d..f903969 100644
--- a/kbarcode/labeleditor.cpp
+++ b/kbarcode/labeleditor.cpp
@@ -159,14 +159,14 @@ LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name
 //    if( isFirstStart() )
 //        moveDockWindow( tools, TQt::DockLeft );
 
-    connect( cv, TQT_SIGNAL( doubleClickedItem(TCanvasItem*) ), this,  TQT_SLOT( doubleClickedItem(TCanvasItem*) ) );
-    connect( cv, TQT_SIGNAL( showContextMenu(TQPoint) ), this,  TQT_SLOT( showContextMenu(TQPoint) ) );
-    connect( cv, TQT_SIGNAL( movedSomething() ), this,  TQT_SLOT( setEdited() ) );
-    connect( KBarcodeSettings::getInstance(), TQT_SIGNAL( updateGrid( int ) ), cv, TQT_SLOT( updateGUI() ) );
-    connect( kapp, TQT_SIGNAL( aboutToQuit() ), this,  TQT_SLOT( saveConfig() ) );
+    connect( cv, TQ_SIGNAL( doubleClickedItem(TCanvasItem*) ), this,  TQ_SLOT( doubleClickedItem(TCanvasItem*) ) );
+    connect( cv, TQ_SIGNAL( showContextMenu(TQPoint) ), this,  TQ_SLOT( showContextMenu(TQPoint) ) );
+    connect( cv, TQ_SIGNAL( movedSomething() ), this,  TQ_SLOT( setEdited() ) );
+    connect( KBarcodeSettings::getInstance(), TQ_SIGNAL( updateGrid( int ) ), cv, TQ_SLOT( updateGUI() ) );
+    connect( kapp, TQ_SIGNAL( aboutToQuit() ), this,  TQ_SLOT( saveConfig() ) );
  
-    connect( history, TQT_SIGNAL( commandExecuted() ), cv, TQT_SLOT( updateGUI() ) );
-    connect( history, TQT_SIGNAL( commandExecuted() ), this,  TQT_SLOT( setEdited() ) );
+    connect( history, TQ_SIGNAL( commandExecuted() ), cv, TQ_SLOT( updateGUI() ) );
+    connect( history, TQ_SIGNAL( commandExecuted() ), this,  TQ_SLOT( setEdited() ) );
 
     if( !_filename.isEmpty() )
         openUrl( _filename );
@@ -247,8 +247,8 @@ void LabelEditor::clearLabel()
     createCommandHistory();
     createCommandHistoryActions();
 
-    connect( history, TQT_SIGNAL( commandExecuted() ), cv, TQT_SLOT( updateGUI() ) );
-    connect( history, TQT_SIGNAL( commandExecuted() ), this,  TQT_SLOT( setEdited() ) );
+    connect( history, TQ_SIGNAL( commandExecuted() ), cv, TQ_SLOT( updateGUI() ) );
+    connect( history, TQ_SIGNAL( commandExecuted() ), this,  TQ_SLOT( setEdited() ) );
 
     m_edited = false;
 
@@ -437,47 +437,47 @@ bool LabelEditor::newLabel()
 
 void LabelEditor::setupActions()
 {
-    TDEAction* newAct = KStdAction::openNew( this, TQT_SLOT(startEditor()), actionCollection() );
-    TDEAction* loadAct = KStdAction::open( this, TQT_SLOT(startLoadEditor()), actionCollection() );
-    TDEAction* quitAct = KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
-    TDEAction* closeAct = KStdAction::close( this, TQT_SLOT( close() ), actionCollection(), "close" );
-    closeLabelAct = new TDEAction( i18n("Close &Label" ), 0, 0, this,  TQT_SLOT( closeLabel() ), actionCollection() );
-
-    recentAct = new TDERecentFilesAction( i18n("&Recent Files"), 0, this,  TQT_SLOT( loadRecentEditor( const KURL& ) ) );
-
-    TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "document-print" ), 0, this,  TQT_SLOT( batchPrint() ), actionCollection() );
-
-    saveAct = KStdAction::save( this, TQT_SLOT( save() ), actionCollection(), "save" );
-    saveAsAct = KStdAction::saveAs( this, TQT_SLOT( saveas() ), actionCollection(), "saveas" );
-    descriptionAct = new TDEAction( i18n("&Change description..."), 0, 0, this,  TQT_SLOT(changeDes()), actionCollection() );
-    deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("edit-delete") ), Key_Delete, cv, TQT_SLOT( deleteCurrent() ), actionCollection() );
-    editPropAct = new TDEAction( i18n("&Properties..."), 0, 0, this,  TQT_SLOT( doubleClickedCurrent() ), actionCollection() );
-    printAct = KStdAction::print( this, TQT_SLOT( print() ), actionCollection(), "print" );
-    bcpAct = new TDEAction( i18n("Print to &Barcode Printer..."), 0, 0, this,  TQT_SLOT( printBCP() ), actionCollection() );
-    imgAct = new TDEAction( i18n("Print to &Image..."), 0, 0, this,  TQT_SLOT(printImage() ), actionCollection() );
-    changeSizeAct = new TDEAction( i18n("&Change Label..."), 0, 0, this,  TQT_SLOT( changeSize() ), actionCollection() );
-    barcodeAct = new TDEAction( i18n("Insert &Barcode"), TQIconSet( BarIcon("barcode") ), 0, this,  TQT_SLOT( insertBarcode() ), actionCollection() );
+    TDEAction* newAct = KStdAction::openNew( this, TQ_SLOT(startEditor()), actionCollection() );
+    TDEAction* loadAct = KStdAction::open( this, TQ_SLOT(startLoadEditor()), actionCollection() );
+    TDEAction* quitAct = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+    TDEAction* closeAct = KStdAction::close( this, TQ_SLOT( close() ), actionCollection(), "close" );
+    closeLabelAct = new TDEAction( i18n("Close &Label" ), 0, 0, this,  TQ_SLOT( closeLabel() ), actionCollection() );
+
+    recentAct = new TDERecentFilesAction( i18n("&Recent Files"), 0, this,  TQ_SLOT( loadRecentEditor( const KURL& ) ) );
+
+    TDEAction* importPrintFileAct = new TDEAction( i18n("&Import and Print Batch File..."), BarIconSet( "document-print" ), 0, this,  TQ_SLOT( batchPrint() ), actionCollection() );
+
+    saveAct = KStdAction::save( this, TQ_SLOT( save() ), actionCollection(), "save" );
+    saveAsAct = KStdAction::saveAs( this, TQ_SLOT( saveas() ), actionCollection(), "saveas" );
+    descriptionAct = new TDEAction( i18n("&Change description..."), 0, 0, this,  TQ_SLOT(changeDes()), actionCollection() );
+    deleteAct = new TDEAction( i18n("&Delete Object"), TQIconSet( BarIcon("edit-delete") ), Key_Delete, cv, TQ_SLOT( deleteCurrent() ), actionCollection() );
+    editPropAct = new TDEAction( i18n("&Properties..."), 0, 0, this,  TQ_SLOT( doubleClickedCurrent() ), actionCollection() );
+    printAct = KStdAction::print( this, TQ_SLOT( print() ), actionCollection(), "print" );
+    bcpAct = new TDEAction( i18n("Print to &Barcode Printer..."), 0, 0, this,  TQ_SLOT( printBCP() ), actionCollection() );
+    imgAct = new TDEAction( i18n("Print to &Image..."), 0, 0, this,  TQ_SLOT(printImage() ), actionCollection() );
+    changeSizeAct = new TDEAction( i18n("&Change Label..."), 0, 0, this,  TQ_SLOT( changeSize() ), actionCollection() );
+    barcodeAct = new TDEAction( i18n("Insert &Barcode"), TQIconSet( BarIcon("barcode") ), 0, this,  TQ_SLOT( insertBarcode() ), actionCollection() );
     barcodeAct->setEnabled( Barkode::haveBarcode() );
 
-    pictureAct = new TDEAction( i18n("Insert &Picture"), TQIconSet( BarIcon("inline_image") ), 0, this,  TQT_SLOT( insertPicture() ), actionCollection() );
-    textAct = new TDEAction( i18n("Insert &Text"), TQIconSet( BarIcon("text") ), 0, this,  TQT_SLOT( insertText() ), actionCollection() );
-    textDataAct = new TDEAction( i18n("Insert &Data Field"), TQIconSet( BarIcon("contents") ), 0, this,  TQT_SLOT( insertDataText() ), actionCollection() );
-    textLineAct = new TDEAction( i18n("Insert &Text Line"), TQIconSet( BarIcon("text") ), 0, this,  TQT_SLOT( insertTextLine() ), actionCollection() );
-    lineAct = new TDEAction( i18n("Insert &Line"), TQIconSet( BarIcon("kbarcodelinetool") ), 0, this,  TQT_SLOT( insertLine() ), actionCollection() );
-    rectAct = new TDEAction( i18n("Insert &Rectangle"), TQIconSet( BarIcon("kbarcoderect") ), 0, this,  TQT_SLOT( insertRect() ), actionCollection() );
-    circleAct = new TDEAction( i18n("Insert &Ellipse"), TQIconSet( BarIcon("kbarcodeellipse") ), 0, this,  TQT_SLOT( insertCircle() ), actionCollection() );
-    spellAct = KStdAction::spelling( this, TQT_SLOT(spellCheck()), actionCollection(), "spell" );
-    gridAct = new TDEToggleAction( i18n("&Grid"), TQIconSet( BarIcon("kbarcodegrid") ), 0, this,  TQT_SLOT( toggleGrid() ), actionCollection() );
-    previewAct = new TDEAction( i18n("&Preview..."), 0, 0, this,  TQT_SLOT( preview() ), actionCollection() );
+    pictureAct = new TDEAction( i18n("Insert &Picture"), TQIconSet( BarIcon("inline_image") ), 0, this,  TQ_SLOT( insertPicture() ), actionCollection() );
+    textAct = new TDEAction( i18n("Insert &Text"), TQIconSet( BarIcon("text") ), 0, this,  TQ_SLOT( insertText() ), actionCollection() );
+    textDataAct = new TDEAction( i18n("Insert &Data Field"), TQIconSet( BarIcon("contents") ), 0, this,  TQ_SLOT( insertDataText() ), actionCollection() );
+    textLineAct = new TDEAction( i18n("Insert &Text Line"), TQIconSet( BarIcon("text") ), 0, this,  TQ_SLOT( insertTextLine() ), actionCollection() );
+    lineAct = new TDEAction( i18n("Insert &Line"), TQIconSet( BarIcon("kbarcodelinetool") ), 0, this,  TQ_SLOT( insertLine() ), actionCollection() );
+    rectAct = new TDEAction( i18n("Insert &Rectangle"), TQIconSet( BarIcon("kbarcoderect") ), 0, this,  TQ_SLOT( insertRect() ), actionCollection() );
+    circleAct = new TDEAction( i18n("Insert &Ellipse"), TQIconSet( BarIcon("kbarcodeellipse") ), 0, this,  TQ_SLOT( insertCircle() ), actionCollection() );
+    spellAct = KStdAction::spelling( this, TQ_SLOT(spellCheck()), actionCollection(), "spell" );
+    gridAct = new TDEToggleAction( i18n("&Grid"), TQIconSet( BarIcon("kbarcodegrid") ), 0, this,  TQ_SLOT( toggleGrid() ), actionCollection() );
+    previewAct = new TDEAction( i18n("&Preview..."), 0, 0, this,  TQ_SLOT( preview() ), actionCollection() );
     sep = new TDEActionSeparator( this );
-    cutAct = KStdAction::cut( this, TQT_SLOT( cut() ), actionCollection(), "cut" );
-    copyAct = KStdAction::copy( this, TQT_SLOT( copy() ), actionCollection(), "copy" );
-    pasteAct = KStdAction::paste( this, TQT_SLOT( paste() ), actionCollection(), "paste" );
-    selectAllAct = KStdAction::selectAll( cv, TQT_SLOT( selectAll() ), actionCollection(), "select_all" );
-    deSelectAllAct = KStdAction::deselect( cv, TQT_SLOT( deSelectAll() ), actionCollection(), "de_select_all" );
-    addressBookAct = new TDEAction( i18n("Address&book"), TQIconSet( BarIcon("kaddressbook") ), 0, this,  TQT_SLOT( launchAddressBook() ), actionCollection() );
+    cutAct = KStdAction::cut( this, TQ_SLOT( cut() ), actionCollection(), "cut" );
+    copyAct = KStdAction::copy( this, TQ_SLOT( copy() ), actionCollection(), "copy" );
+    pasteAct = KStdAction::paste( this, TQ_SLOT( paste() ), actionCollection(), "paste" );
+    selectAllAct = KStdAction::selectAll( cv, TQ_SLOT( selectAll() ), actionCollection(), "select_all" );
+    deSelectAllAct = KStdAction::deselect( cv, TQ_SLOT( deSelectAll() ), actionCollection(), "de_select_all" );
+    addressBookAct = new TDEAction( i18n("Address&book"), TQIconSet( BarIcon("kaddressbook") ), 0, this,  TQ_SLOT( launchAddressBook() ), actionCollection() );
     TDEAction* singleBarcodeAct = new TDEAction(i18n("&Create Single Barcode..."), "",
-                                0, this,  TQT_SLOT(startBarcodeGen()),
+                                0, this,  TQ_SLOT(startBarcodeGen()),
                                 actionCollection(), "create" );
     singleBarcodeAct->setEnabled( Barkode::haveBarcode() );
 
@@ -505,7 +505,7 @@ void LabelEditor::setupActions()
     gridAct->plug( tools );
 
     DSMainWindow::setupActions();
-    connect( recentAct, TQT_SIGNAL( urlSelected( const KURL& ) ), this,  TQT_SLOT( startLoadRecentEditor( const KURL& ) ) );
+    connect( recentAct, TQ_SIGNAL( urlSelected( const KURL& ) ), this,  TQ_SLOT( startLoadRecentEditor( const KURL& ) ) );
 
     TDEPopupMenu* fileMenu = new TDEPopupMenu( this );
     editMenu = new TDEPopupMenu( this );
@@ -579,22 +579,22 @@ void LabelEditor::setupContextMenu()
     m_mnuContext->setCheckable( true );
     
     TDEPopupMenu* orderMenu = new TDEPopupMenu( m_mnuContext );
-    orderMenu->insertItem( i18n("&On Top"), this,  TQT_SLOT( onTopCurrent() ) );
-    orderMenu->insertItem( i18n("&Raise"), this,  TQT_SLOT( raiseCurrent() ) );
-    orderMenu->insertItem( i18n("&Lower"), this,  TQT_SLOT( lowerCurrent() ) );
-    orderMenu->insertItem( i18n("&To Background"), this,  TQT_SLOT( backCurrent() ) );
+    orderMenu->insertItem( i18n("&On Top"), this,  TQ_SLOT( onTopCurrent() ) );
+    orderMenu->insertItem( i18n("&Raise"), this,  TQ_SLOT( raiseCurrent() ) );
+    orderMenu->insertItem( i18n("&Lower"), this,  TQ_SLOT( lowerCurrent() ) );
+    orderMenu->insertItem( i18n("&To Background"), this,  TQ_SLOT( backCurrent() ) );
 
     TDEPopupMenu* centerMenu = new TDEPopupMenu( m_mnuContext );
-    centerMenu->insertItem( i18n("Center &Horizontally"), this,  TQT_SLOT( centerHorizontal() ) );
-    centerMenu->insertItem( i18n("Center &Vertically"), this,  TQT_SLOT( centerVertical() ) );
+    centerMenu->insertItem( i18n("Center &Horizontally"), this,  TQ_SLOT( centerHorizontal() ) );
+    centerMenu->insertItem( i18n("Center &Vertically"), this,  TQ_SLOT( centerVertical() ) );
 
     m_mnuContext->insertItem( i18n("&Order"), orderMenu );
     m_mnuContext->insertItem( i18n("&Center"), centerMenu );
     m_mnuContext->insertSeparator();
-    m_mnuContext->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), cv, TQT_SLOT( deleteCurrent() ) );
-    m_mnuContext->insertItem( i18n("&Protect Position and Size"), this,  TQT_SLOT( lockItem() ), 0, ID_LOCK_ITEM );
+    m_mnuContext->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), cv, TQ_SLOT( deleteCurrent() ) );
+    m_mnuContext->insertItem( i18n("&Protect Position and Size"), this,  TQ_SLOT( lockItem() ), 0, ID_LOCK_ITEM );
     m_mnuContext->insertSeparator();
-    m_mnuContext->insertItem( i18n("&Properties"), this,  TQT_SLOT( doubleClickedCurrent() ) );
+    m_mnuContext->insertItem( i18n("&Properties"), this,  TQ_SLOT( doubleClickedCurrent() ) );
 }
 
 void LabelEditor::insertBarcode()
diff --git a/kbarcode/main.cpp b/kbarcode/main.cpp
index 2e05e99..50f3aba 100644
--- a/kbarcode/main.cpp
+++ b/kbarcode/main.cpp
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
     setupDirs();
 
     KImageIO::registerFormats();
-    a.connect( &a, TQT_SIGNAL(lastWindowClosed()), &a, TQT_SLOT(quit()));
+    a.connect( &a, TQ_SIGNAL(lastWindowClosed()), &a, TQ_SLOT(quit()));
 
     KBarcode* kbc = new KBarcode( 0, "KBarcodeMainWindow" );
 
diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp
index 33ed0ab..6208982 100644
--- a/kbarcode/multilineeditdlg.cpp
+++ b/kbarcode/multilineeditdlg.cpp
@@ -65,76 +65,76 @@ void MultiLineEditor::setupActions()
 {
     ac = new TDEActionCollection( this );
 
-    TDEAction* action_export = new TDEAction( i18n("Export"), "fileexport", 0, this,  TQT_SLOT( save() ), ac );
+    TDEAction* action_export = new TDEAction( i18n("Export"), "fileexport", 0, this,  TQ_SLOT( save() ), ac );
 
     //
     // Edit Actions
     //
-    TDEAction *action_undo = KStdAction::undo( editor, TQT_SLOT( undo() ), ac );
+    TDEAction *action_undo = KStdAction::undo( editor, TQ_SLOT( undo() ), ac );
     action_undo->setEnabled( false );
-    connect( editor, TQT_SIGNAL( undoAvailable(bool) ), action_undo, TQT_SLOT( setEnabled(bool) ) );
+    connect( editor, TQ_SIGNAL( undoAvailable(bool) ), action_undo, TQ_SLOT( setEnabled(bool) ) );
 
     
-    TDEAction *action_redo = KStdAction::redo( editor, TQT_SLOT( redo() ), ac );
+    TDEAction *action_redo = KStdAction::redo( editor, TQ_SLOT( redo() ), ac );
     action_redo->setEnabled( false );
-    connect( editor, TQT_SIGNAL( redoAvailable(bool) ), action_redo, TQT_SLOT( setEnabled(bool) ) );
+    connect( editor, TQ_SIGNAL( redoAvailable(bool) ), action_redo, TQ_SLOT( setEnabled(bool) ) );
 
-    TDEAction *action_cut = KStdAction::cut( editor, TQT_SLOT( cut() ), ac );
+    TDEAction *action_cut = KStdAction::cut( editor, TQ_SLOT( cut() ), ac );
     action_cut->setEnabled( false );
-    connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_cut, TQT_SLOT( setEnabled(bool) ) );
+    connect( editor, TQ_SIGNAL( copyAvailable(bool) ), action_cut, TQ_SLOT( setEnabled(bool) ) );
 
-    TDEAction *action_copy = KStdAction::copy( editor, TQT_SLOT( copy() ), ac );
+    TDEAction *action_copy = KStdAction::copy( editor, TQ_SLOT( copy() ), ac );
     action_copy->setEnabled( false );
-    connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_copy, TQT_SLOT( setEnabled(bool) ) );
+    connect( editor, TQ_SIGNAL( copyAvailable(bool) ), action_copy, TQ_SLOT( setEnabled(bool) ) );
 
-    TDEAction* action_paste = KStdAction::paste( editor, TQT_SLOT( paste() ), ac );
+    TDEAction* action_paste = KStdAction::paste( editor, TQ_SLOT( paste() ), ac );
 
     //
     // Character Formatting
     //
     action_bold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, ac, "format_bold" );
-    connect( action_bold, TQT_SIGNAL( toggled(bool) ), editor, TQT_SLOT( setBold(bool) ) );
+    connect( action_bold, TQ_SIGNAL( toggled(bool) ), editor, TQ_SLOT( setBold(bool) ) );
 
     action_italic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, ac, "format_italic" );
-    connect( action_italic, TQT_SIGNAL( toggled(bool) ), editor, TQT_SLOT( setItalic(bool) ) );
+    connect( action_italic, TQ_SIGNAL( toggled(bool) ), editor, TQ_SLOT( setItalic(bool) ) );
 
     action_underline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, ac, "format_underline" );
-    connect( action_underline, TQT_SIGNAL( toggled(bool) ), editor, TQT_SLOT( setUnderline(bool) ) );
+    connect( action_underline, TQ_SIGNAL( toggled(bool) ), editor, TQ_SLOT( setUnderline(bool) ) );
 
-    TDEAction* action_color = new TDEAction( i18n("Text &Color..."), "colorpicker", 0, this,  TQT_SLOT( formatColor() ), ac, "format_color" );
+    TDEAction* action_color = new TDEAction( i18n("Text &Color..."), "colorpicker", 0, this,  TQ_SLOT( formatColor() ), ac, "format_color" );
 
     //
     // Font
     //
     action_font = new TDEFontAction( i18n("&Font"), 0, ac, "format_font" );
-    connect( action_font, TQT_SIGNAL( activated( const TQString & ) ), editor, TQT_SLOT( setFamily( const TQString & ) ) );
+    connect( action_font, TQ_SIGNAL( activated( const TQString & ) ), editor, TQ_SLOT( setFamily( const TQString & ) ) );
 
     action_font_size = new TDEFontSizeAction( i18n("Font &Size"), 0, ac, "format_font_size" );
-    connect( action_font_size, TQT_SIGNAL( fontSizeChanged(int) ), editor, TQT_SLOT( setPointSize(int) ) );
+    connect( action_font_size, TQ_SIGNAL( fontSizeChanged(int) ), editor, TQ_SLOT( setPointSize(int) ) );
 
     //
     // Alignment
     //
     action_align_left = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0, ac, "format_align_left" );
-    connect( action_align_left, TQT_SIGNAL( toggled(bool) ), this,  TQT_SLOT( setAlignLeft(bool) ) );
+    connect( action_align_left, TQ_SIGNAL( toggled(bool) ), this,  TQ_SLOT( setAlignLeft(bool) ) );
 
     action_align_center = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" );
-    connect( action_align_center, TQT_SIGNAL( toggled(bool) ), this,  TQT_SLOT( setAlignCenter(bool) ) );
+    connect( action_align_center, TQ_SIGNAL( toggled(bool) ), this,  TQ_SLOT( setAlignCenter(bool) ) );
 
     action_align_right = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0, ac, "format_align_right" );
-    connect( action_align_right, TQT_SIGNAL( toggled(bool) ), this,  TQT_SLOT( setAlignRight(bool) ) );
+    connect( action_align_right, TQ_SIGNAL( toggled(bool) ), this,  TQ_SLOT( setAlignRight(bool) ) );
 
     action_align_justify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" );
-    connect( action_align_justify, TQT_SIGNAL( toggled(bool) ), this,  TQT_SLOT( setAlignJustify(bool) ) );
+    connect( action_align_justify, TQ_SIGNAL( toggled(bool) ), this,  TQ_SLOT( setAlignJustify(bool) ) );
 
     action_align_left->setExclusiveGroup( "alignment" );
     action_align_center->setExclusiveGroup( "alignment" );
     action_align_right->setExclusiveGroup( "alignment" );
     action_align_justify->setExclusiveGroup( "alignment" );
 
-    //TDEAction* action_spell = KStdAction::spelling( this, TQT_SLOT( checkSpelling() ), ac );
+    //TDEAction* action_spell = KStdAction::spelling( this, TQ_SLOT( checkSpelling() ), ac );
 
-    TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, this,  TQT_SLOT( insertNewField() ), ac, "text_data_act");        action_export->plug( toolBar );
+    TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, this,  TQ_SLOT( insertNewField() ), ac, "text_data_act");        action_export->plug( toolBar );
     
     toolBar->insertSeparator();
     action_undo->plug( toolBar );
@@ -165,9 +165,9 @@ void MultiLineEditor::setupActions()
     //
     updateActions();
 
-    connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), this,  TQT_SLOT( updateFont() ) );
-    connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), this,  TQT_SLOT( updateCharFmt() ) );
-    connect( editor, TQT_SIGNAL( cursorPositionChanged( int,int ) ), this,  TQT_SLOT( updateAligment() ) );
+    connect( editor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), this,  TQ_SLOT( updateFont() ) );
+    connect( editor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), this,  TQ_SLOT( updateCharFmt() ) );
+    connect( editor, TQ_SIGNAL( cursorPositionChanged( int,int ) ), this,  TQ_SLOT( updateAligment() ) );
 }
 
 TQString MultiLineEditor::text()
@@ -279,7 +279,7 @@ void MultiLineEditor::checkSpelling()
     spell = new KSpell( this, i18n("Spell Checking"), 0, 0, 0, true, true, KSpell::HTML );
     spell->setAutoDelete( true );
     spell->check( s, true );
-    connect( spell, TQT_SIGNAL( done(const TQString &) ), this,  TQT_SLOT( spellCheckDone(const TQString &) ) );
+    connect( spell, TQ_SIGNAL( done(const TQString &) ), this,  TQ_SLOT( spellCheckDone(const TQString &) ) );
 
     spell->cleanUp();
 #endif
diff --git a/kbarcode/newlabel.cpp b/kbarcode/newlabel.cpp
index e4f6081..9c60eff 100644
--- a/kbarcode/newlabel.cpp
+++ b/kbarcode/newlabel.cpp
@@ -115,14 +115,14 @@ NewLabel::NewLabel( TQWidget* parent,  const char* name, bool change, WFlags fl
     Layout1->addWidget( buttonCancel );
     NewLabelLayout->addLayout( Layout1 );
 
-    connect( comboProducer, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( updateType() ) );
-    connect( comboProducer, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( updateText() ) );
-    connect( comboType, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( updateText() ) );
-    connect( checkEmpty, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updateText() ) );
+    connect( comboProducer, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( updateType() ) );
+    connect( comboProducer, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( updateText() ) );
+    connect( comboType, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( updateText() ) );
+    connect( checkEmpty, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updateText() ) );
     
-    connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT(accept() ) );
-    connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT(reject() ) );
-    connect( buttonOwnFormat, TQT_SIGNAL( clicked() ), this, TQT_SLOT(add() ) );
+    connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT(accept() ) );
+    connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT(reject() ) );
+    connect( buttonOwnFormat, TQ_SIGNAL( clicked() ), this, TQ_SLOT(add() ) );
     fillData();
     updateType();
     updateText();
diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp
index 4acfcb7..fe4bb24 100644
--- a/kbarcode/previewdialog.cpp
+++ b/kbarcode/previewdialog.cpp
@@ -127,17 +127,17 @@ PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filena
     Layout->addLayout( vbox );
     Layout->addLayout( buttons );
 
-    connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
-    connect( buttonAddr, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAddress() ) );
+    connect( buttonClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
+    connect( buttonAddr, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectAddress() ) );
     // TODO:
     // remove this ugly hack! The finished label is only shown when I call
     // updateChanges() twice. I have no idea why!
-    connect( buttonUpdate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updatechanges() ) );
-    connect( buttonUpdate, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updatechanges() ) );
+    connect( buttonUpdate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updatechanges() ) );
+    connect( buttonUpdate, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updatechanges() ) );
     // end ugly hack
     
-    connect( customerName, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerNameChanged(int) ) );
-    connect( customerId, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( customerIdChanged(int) ) );
+    connect( customerName, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerNameChanged(int) ) );
+    connect( customerId, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( customerIdChanged(int) ) );
 
     TDEConfig* config = kapp->config();
     config->setGroup( "PreviewDialog" );
diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp
index 66c3d56..cf0de20 100644
--- a/kbarcode/printersettings.cpp
+++ b/kbarcode/printersettings.cpp
@@ -76,7 +76,7 @@ PrinterSettings::PrinterSettings()
     lpdata = new labelprinterdata;
     loadConfig();
 
-    connect( kapp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( saveConfig() ) );
+    connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
 }
 
 PrinterSettings::~PrinterSettings()
diff --git a/kbarcode/propertywidget.cpp b/kbarcode/propertywidget.cpp
index 37fd234..cd60ca0 100644
--- a/kbarcode/propertywidget.cpp
+++ b/kbarcode/propertywidget.cpp
@@ -106,7 +106,7 @@ PropertyBorder::PropertyBorder( TQWidget* parent )
     grid->addWidget( comboLine, 3, 1 );
     
     
-    connect( checkBorder, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( checkBorder, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 }
 
 void PropertyBorder::applySettings( DocumentItem* item, KMacroCommand* command )
@@ -231,8 +231,8 @@ PropertyBarcode::PropertyBarcode( TokenProvider* token, TQWidget* parent )
     barcode = new BarcodeWidget( this, "barcode" );
     barcode->setTokenProvider( token );
 
-    //connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT( defaults() ) );
-    connect( comboComplex, TQT_SIGNAL( activated(int) ), this, TQT_SLOT(changedCombo() ) );
+    //connect( this, TQ_SIGNAL( defaultClicked() ), this, TQ_SLOT( defaults() ) );
+    connect( comboComplex, TQ_SIGNAL( activated(int) ), this, TQ_SLOT(changedCombo() ) );
     
     grid->addWidget( TextLabel1, 0, 0 );
     grid->addWidget( comboComplex, 0, 1 );
@@ -361,7 +361,7 @@ PropertySize::PropertySize( TQWidget* parent )
     
     grid->addWidget( box, 0, 0 );
     
-    connect( checkLock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() )); 
+    connect( checkLock, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() )); 
 }
 
 void PropertySize::enableControls()
@@ -502,9 +502,9 @@ PropertyImage::PropertyImage( TokenProvider* token, TQWidget* parent )
     grid->addMultiCellWidget( checkMirrorH, 5, 5, 0, 1 );
     grid->addMultiCellWidget( checkMirrorV, 6, 6, 0, 1 );
 
-    connect( radioImageExpression, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioImagePath, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( buttonToken, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTokens() ) );
+    connect( radioImageExpression, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioImagePath, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( buttonToken, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTokens() ) );
 }
 
 void PropertyImage::applySettings( DocumentItem* item, KMacroCommand* command )
diff --git a/kbarcode/rectsettingsdlg.cpp b/kbarcode/rectsettingsdlg.cpp
index 7fc8964..10e6958 100644
--- a/kbarcode/rectsettingsdlg.cpp
+++ b/kbarcode/rectsettingsdlg.cpp
@@ -81,7 +81,7 @@ RectSettingsDlg::RectSettingsDlg(TQWidget *parent, const char *name )
     grid->addWidget( new TQLabel( i18n("Line Style:"), frame ), 5, 0 );
     grid->addWidget( comboLine, 5, 1 );
 
-    connect( checkBorder, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( checkBorder, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 }
 
 RectSettingsDlg::~RectSettingsDlg()
diff --git a/kbarcode/smalldialogs.cpp b/kbarcode/smalldialogs.cpp
index 2088970..7fec4ca 100644
--- a/kbarcode/smalldialogs.cpp
+++ b/kbarcode/smalldialogs.cpp
@@ -98,8 +98,8 @@ void AddItemsDialog::init()
 
     setupSql();
 
-    connect( SqlTables::getInstance(), TQT_SIGNAL( tablesChanged() ), this, TQT_SLOT( setupSql() ) );
-    connect( SqlTables::getInstance(), TQT_SIGNAL( connectedSQL() ), this, TQT_SLOT( setupSql() ) );
+    connect( SqlTables::getInstance(), TQ_SIGNAL( tablesChanged() ), this, TQ_SLOT( setupSql() ) );
+    connect( SqlTables::getInstance(), TQ_SIGNAL( connectedSQL() ), this, TQ_SLOT( setupSql() ) );
 }
 
 void AddItemsDialog::slotUser1()
diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp
index baae883..d5dc9a5 100644
--- a/kbarcode/sqltables.cpp
+++ b/kbarcode/sqltables.cpp
@@ -89,7 +89,7 @@ SqlTables::SqlTables( TQObject* parent )
     connected = false;
     loadConfig();
 
-    connect( kapp, TQT_SIGNAL( aboutToQuit() ), this, TQT_SLOT( saveConfig() ) );
+    connect( kapp, TQ_SIGNAL( aboutToQuit() ), this, TQ_SLOT( saveConfig() ) );
 }
 
 SqlTables::~SqlTables()
@@ -584,7 +584,7 @@ SqlWidget::SqlWidget( bool showlabel, TQWidget* parent, const char* name )
 
     layout->add( groupDatabase );
 
-    connect( buttonTest, TQT_SIGNAL( clicked() ), this, TQT_SLOT( testSettings() ) );
+    connect( buttonTest, TQ_SIGNAL( clicked() ), this, TQ_SLOT( testSettings() ) );
 
     const mysqldata & sqldata = SqlTables::getInstance()->getData();
     m_username->setText( sqldata.username );
diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp
index 39d1831..3ea4113 100644
--- a/kbarcode/textlineedit.cpp
+++ b/kbarcode/textlineedit.cpp
@@ -68,26 +68,26 @@ void TextLineEditor::setupActions()
     ac = new TDEActionCollection( this );
 
    
-    TDEAction *action_undo = KStdAction::undo( editor, TQT_SLOT( undo() ), ac );
+    TDEAction *action_undo = KStdAction::undo( editor, TQ_SLOT( undo() ), ac );
     action_undo->setEnabled( false );
-    connect( editor, TQT_SIGNAL( undoAvailable(bool) ), action_undo, TQT_SLOT( setEnabled(bool) ) );
+    connect( editor, TQ_SIGNAL( undoAvailable(bool) ), action_undo, TQ_SLOT( setEnabled(bool) ) );
 
     
-    TDEAction *action_redo = KStdAction::redo( editor, TQT_SLOT( redo() ), ac );
+    TDEAction *action_redo = KStdAction::redo( editor, TQ_SLOT( redo() ), ac );
     action_redo->setEnabled( false );
-    connect( editor, TQT_SIGNAL( redoAvailable(bool) ), action_redo, TQT_SLOT( setEnabled(bool) ) );
+    connect( editor, TQ_SIGNAL( redoAvailable(bool) ), action_redo, TQ_SLOT( setEnabled(bool) ) );
 
-    TDEAction *action_cut = KStdAction::cut( editor, TQT_SLOT( cut() ), ac );
+    TDEAction *action_cut = KStdAction::cut( editor, TQ_SLOT( cut() ), ac );
     action_cut->setEnabled( false );
-    connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_cut, TQT_SLOT( setEnabled(bool) ) );
+    connect( editor, TQ_SIGNAL( copyAvailable(bool) ), action_cut, TQ_SLOT( setEnabled(bool) ) );
 
-    TDEAction *action_copy = KStdAction::copy( editor, TQT_SLOT( copy() ), ac );
+    TDEAction *action_copy = KStdAction::copy( editor, TQ_SLOT( copy() ), ac );
     action_copy->setEnabled( false );
-    connect( editor, TQT_SIGNAL( copyAvailable(bool) ), action_copy, TQT_SLOT( setEnabled(bool) ) );
+    connect( editor, TQ_SIGNAL( copyAvailable(bool) ), action_copy, TQ_SLOT( setEnabled(bool) ) );
 
-    TDEAction* action_paste = KStdAction::paste( editor, TQT_SLOT( paste() ), ac );
+    TDEAction* action_paste = KStdAction::paste( editor, TQ_SLOT( paste() ), ac );
 
-    TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, this, TQT_SLOT( insertNewField() ), ac, "text_data_act");
+    TDEAction* textDataAct = new TDEAction( i18n("Insert &Data Field"), "contents", 0, this, TQ_SLOT( insertNewField() ), ac, "text_data_act");
    
     action_undo->plug( toolBar );
     action_redo->plug( toolBar );
@@ -122,7 +122,7 @@ void TextLineEditor::setupActions()
     textDataAct->plug( tool2Bar );
 
     action_font_type = new KComboBox(tool2Bar,"font_type") ;
-    connect( action_font_type, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setFontType(int) ) );
+    connect( action_font_type, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setFontType(int) ) );
     action_font_type->insertStringList(fuentes) ;
     
     
@@ -131,8 +131,8 @@ void TextLineEditor::setupActions()
     mag_vert = new KIntNumInput( tool3Bar,"magvert" );
     TQLabel* labelh = new TQLabel( i18n("&Mag. Hor.:"), tool3Bar );
     mag_hor = new KIntNumInput( tool3Bar,"maghor" );
-    connect( mag_vert, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setVerMag(int) ) );
-    connect( mag_hor, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( setHorMag(int) ) );  
+    connect( mag_vert, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setVerMag(int) ) );
+    connect( mag_hor, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( setHorMag(int) ) );  
     mag_vert->setRange( 1, 9, 1, false );
     mag_hor->setRange( 1, 9, 1, false );
         
diff --git a/kbarcode/tokendialog.cpp b/kbarcode/tokendialog.cpp
index d27ae44..aa12ebe 100644
--- a/kbarcode/tokendialog.cpp
+++ b/kbarcode/tokendialog.cpp
@@ -114,9 +114,9 @@ void TokenDialog::setupStackPage2()
 
     radioVariable->setChecked( true );
 
-    connect( radioVariable, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioSQLQuery, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioJavaScript, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
+    connect( radioVariable, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioSQLQuery, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioJavaScript, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
 
     page2->addWidget( stackPage2 );
 }
@@ -160,8 +160,8 @@ void TokenDialog::setupStack2Page1()
     right->setStretchFactor( allList, 2 );
     splitter->setSizes( sizes );
 
-    connect( category, TQT_SIGNAL( executed( TQListBoxItem* ) ), this, TQT_SLOT( categoryChanged( TQListBoxItem* ) ) );
-    connect( allList, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( itemChanged( TQListViewItem* ) ) );
+    connect( category, TQ_SIGNAL( executed( TQListBoxItem* ) ), this, TQ_SLOT( categoryChanged( TQListBoxItem* ) ) );
+    connect( allList, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( itemChanged( TQListViewItem* ) ) );
 
     initAll();
 
@@ -178,8 +178,8 @@ void TokenDialog::setupStack2Page2()
     labelList->setColumnWidthMode( 0, TQListView::Maximum );
     labelList->setColumnWidthMode( 1, TQListView::Maximum );
 
-    connect( labelList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( enableControls() ) );
-    connect( labelList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( accept() ) );
+    connect( labelList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( enableControls() ) );
+    connect( labelList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( accept() ) );
 
     page3->addWidget( stack2Page2 );
 }
@@ -202,11 +202,11 @@ void TokenDialog::setupStack2Page3()
     if( !listVariable->count() )
         radioVariableExisting->setEnabled( false );
 
-    connect( radioVariableNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( radioVariableExisting, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableControls() ) );
-    connect( editVariable, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
-    connect( listVariable, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( enableControls() ) );
-    connect( listVariable, TQT_SIGNAL( doubleClicked( TQListBoxItem*, const TQPoint & ) ), this, TQT_SLOT( accept() ) );
+    connect( radioVariableNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( radioVariableExisting, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableControls() ) );
+    connect( editVariable, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
+    connect( listVariable, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( enableControls() ) );
+    connect( listVariable, TQ_SIGNAL( doubleClicked( TQListBoxItem*, const TQPoint & ) ), this, TQ_SLOT( accept() ) );
 
     page3->addWidget( stack2Page3 );
 }
@@ -232,8 +232,8 @@ void TokenDialog::setupStack2Page4()
     textQueryResults = new TQTextBrowser( stack2Page4 );
     textQueryResults->setReadOnly( true );
 
-    connect( buttonQuery, TQT_SIGNAL( clicked() ), this, TQT_SLOT( testQuery() ) );
-    connect( editQuery, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( enableControls() ) );
+    connect( buttonQuery, TQ_SIGNAL( clicked() ), this, TQ_SLOT( testQuery() ) );
+    connect( editQuery, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( enableControls() ) );
         
     page3->addWidget( stack2Page4 );
 }
@@ -245,7 +245,7 @@ void TokenDialog::setupStack2Page5()
     editJavaScript = new DSTextEdit( stack2Page5 );
     editJavaScript->setText( i18n("/* Place your JavaScript code into this text field. */\n") );
 
-    connect( editJavaScript, TQT_SIGNAL( textChanged() ), TQT_SLOT( enableControls() ) );
+    connect( editJavaScript, TQ_SIGNAL( textChanged() ), TQ_SLOT( enableControls() ) );
 
     page3->addWidget( stack2Page5 );
 }