Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 102 insertions, 102 deletions

diff --git a/khexedit/optiondialog.cpp b/khexedit/optiondialog.cpp
index 49a33b7..6db0334 100644
--- a/khexedit/optiondialog.cpp
+++ b/khexedit/optiondialog.cpp
@@ -116,10 +116,10 @@ void COptionDialog::setupLayoutPage( void )
   modeList.append( i18n("Binary Mode") );
   modeList.append( i18n("Text Only Mode") );
   mLayout.formatCombo->insertStringList( modeList );
-  connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)),
-	   TQT_SLOT(slotModeSelectorChanged(int)) );
-  connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.formatCombo, TQ_SIGNAL(activated(int)),
+	   TQ_SLOT(slotModeSelectorChanged(int)) );
+  connect( mLayout.formatCombo, TQ_SIGNAL(activated(int)),
+    TQ_SLOT(slotChanged()) );
   gbox->addWidget( mLayout.formatCombo, 0, 1 );
 
   //
@@ -129,18 +129,18 @@ void COptionDialog::setupLayoutPage( void )
   mLayout.lineSizeSpin = new TQSpinBox( page );
   mLayout.lineSizeSpin->setMinimumWidth( fontMetrics().width("M") * 10 );
   mLayout.lineSizeSpin->setRange( 1, 10000 );
-  connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)),
-	   TQT_SLOT(slotLineSizeChanged(int) ) );
-  connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.lineSizeSpin, TQ_SIGNAL(valueChanged(int)),
+	   TQ_SLOT(slotLineSizeChanged(int) ) );
+  connect( mLayout.lineSizeSpin, TQ_SIGNAL(valueChanged(int)),
+    TQ_SLOT(slotChanged()) );
   gbox->addWidget( mLayout.lineSizeSpin, 1, 1 );
 
   mLayout.columnSizeSpin = new TQSpinBox( page );
   mLayout.columnSizeSpin->setRange( 1, 10000 );
-  connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)),
-	   TQT_SLOT(slotColumnSizeChanged(int) ) );
-  connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)),
-    TQT_SLOT(slotChanged() ) );
+  connect( mLayout.columnSizeSpin, TQ_SIGNAL(valueChanged(int)),
+	   TQ_SLOT(slotColumnSizeChanged(int) ) );
+  connect( mLayout.columnSizeSpin, TQ_SIGNAL(valueChanged(int)),
+    TQ_SLOT(slotChanged() ) );
   gbox->addWidget( mLayout.columnSizeSpin, 2, 1 );
 
   text = i18n("Default l&ine size [bytes]:");
@@ -158,14 +158,14 @@ void COptionDialog::setupLayoutPage( void )
   text = i18n("Line size is &fixed (use scrollbar when required)");
   mLayout.lockLineCheck = new TQCheckBox( text, page );
   gbox->addMultiCellWidget( mLayout.lockLineCheck, 4, 4, 0, 1, AlignLeft );
-  connect( mLayout.lockLineCheck, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.lockLineCheck, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT(slotChanged()) );
 
   text = i18n("Loc&k column at end of line (when column size>1)");
   mLayout.lockColumnCheck = new TQCheckBox( text, page );
   gbox->addMultiCellWidget( mLayout.lockColumnCheck, 5, 5, 0, 1 );
-  connect( mLayout.lockColumnCheck, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.lockColumnCheck, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT(slotChanged()) );
 
   hline = new TQFrame( page );
   hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine );
@@ -179,8 +179,8 @@ void COptionDialog::setupLayoutPage( void )
 
   mLayout.gridCombo = new TQComboBox( false, page );
   mLayout.gridCombo->insertStringList( gridList );
-  connect( mLayout.gridCombo, TQT_SIGNAL(activated(int)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.gridCombo, TQ_SIGNAL(activated(int)),
+    TQ_SLOT(slotChanged()) );
 
   text = i18n("&Gridlines between text:");
   label = new TQLabel( mLayout.gridCombo, text, page );
@@ -191,14 +191,14 @@ void COptionDialog::setupLayoutPage( void )
   mLayout.leftSepWidthSpin = new TQSpinBox( page );
   mLayout.leftSepWidthSpin->setRange( 0, 20 );
   gbox->addWidget( mLayout.leftSepWidthSpin, 8, 1 );
-  connect( mLayout.leftSepWidthSpin, TQT_SIGNAL(valueChanged(int)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.leftSepWidthSpin, TQ_SIGNAL(valueChanged(int)),
+    TQ_SLOT(slotChanged()) );
 
   mLayout.rightSepWidthSpin = new TQSpinBox( page );
   mLayout.rightSepWidthSpin->setRange( 0, 20 );
   gbox->addWidget( mLayout.rightSepWidthSpin, 9, 1 );
-  connect( mLayout.rightSepWidthSpin, TQT_SIGNAL(valueChanged(int)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.rightSepWidthSpin, TQ_SIGNAL(valueChanged(int)),
+    TQ_SLOT(slotChanged()) );
 
   text = i18n("&Left separator width [pixels]:");
   mLayout.leftSepLabel = new TQLabel( mLayout.leftSepWidthSpin, text, page );
@@ -211,14 +211,14 @@ void COptionDialog::setupLayoutPage( void )
   mLayout.separatorSpin = new TQSpinBox( page );
   mLayout.separatorSpin->setRange( 0, 20 );
   gbox->addWidget( mLayout.separatorSpin, 10, 1 );
-  connect( mLayout.separatorSpin, TQT_SIGNAL(valueChanged(int)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.separatorSpin, TQ_SIGNAL(valueChanged(int)),
+    TQ_SLOT(slotChanged()) );
 
   mLayout.edgeSpin = new TQSpinBox( page );
   mLayout.edgeSpin->setRange( 0, 20 );
   gbox->addWidget( mLayout.edgeSpin, 11, 1 );
-  connect( mLayout.edgeSpin, TQT_SIGNAL(valueChanged(int)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.edgeSpin, TQ_SIGNAL(valueChanged(int)),
+    TQ_SLOT(slotChanged()) );
 
   text = i18n("&Separator margin width [pixels]:");
   label = new TQLabel( mLayout.separatorSpin, text, page );
@@ -231,15 +231,15 @@ void COptionDialog::setupLayoutPage( void )
   text = i18n("Column separation is e&qual to one character");
   mLayout.columnCheck = new TQCheckBox( text, page );
   gbox->addMultiCellWidget( mLayout.columnCheck, 12, 12, 0, 1, AlignLeft );
-  connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)),
-	   TQT_SLOT( slotColumnSepCheck(bool)));
-  connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT( slotChanged()));
+  connect( mLayout.columnCheck, TQ_SIGNAL(toggled(bool)),
+	   TQ_SLOT( slotColumnSepCheck(bool)));
+  connect( mLayout.columnCheck, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT( slotChanged()));
 
   mLayout.columnSepSpin = new TQSpinBox( page );
   mLayout.columnSepSpin->setRange( 1, 100 );
-  connect( mLayout.columnSepSpin, TQT_SIGNAL(valueChanged(int)),
-    TQT_SLOT(slotChanged()) );
+  connect( mLayout.columnSepSpin, TQ_SIGNAL(valueChanged(int)),
+    TQ_SLOT(slotChanged()) );
 
   text = i18n("Column separa&tion [pixels]:");
   mLayout.columnSepLabel = new TQLabel( mLayout.columnSepSpin, text, page );
@@ -265,10 +265,10 @@ void COptionDialog::setupCursorPage( void )
 
   text = i18n("Do not b&link");
   mCursor.blinkCheck = new TQCheckBox( i18n("Do not b&link"), group );
-  connect( mCursor.blinkCheck, TQT_SIGNAL(toggled(bool)),
-	   TQT_SLOT( slotBlinkIntervalCheck(bool)));
-  connect( mCursor.blinkCheck, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT( slotChanged()));
+  connect( mCursor.blinkCheck, TQ_SIGNAL(toggled(bool)),
+	   TQ_SLOT( slotBlinkIntervalCheck(bool)));
+  connect( mCursor.blinkCheck, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT( slotChanged()));
 
   TQHBox *hbox = new TQHBox( group );
   mCursor.blinkLabel = new TQLabel( i18n("&Blink interval [ms]:" ), hbox );
@@ -278,8 +278,8 @@ void COptionDialog::setupCursorPage( void )
   mCursor.blinkSpin->setSteps( 100, 100 );
   mCursor.blinkSpin->setValue( 500 );
   mCursor.blinkLabel->setBuddy(mCursor.blinkSpin);
-  connect( mCursor.blinkSpin, TQT_SIGNAL(valueChanged(int)),
-    TQT_SLOT( slotChanged()));
+  connect( mCursor.blinkSpin, TQ_SIGNAL(valueChanged(int)),
+    TQ_SLOT( slotChanged()));
 
   group = new TQVButtonGroup( i18n("Shape"), page );
   group->layout()->setMargin( spacingHint() );
@@ -287,14 +287,14 @@ void COptionDialog::setupCursorPage( void )
 
   text = i18n("Always &use block (rectangular) cursor");
   mCursor.blockCheck = new TQCheckBox( text, group );
-  connect( mCursor.blockCheck, TQT_SIGNAL(toggled(bool)),
-	   TQT_SLOT( slotBlockCursorCheck(bool)));
-  connect( mCursor.blockCheck, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT( slotChanged()));
+  connect( mCursor.blockCheck, TQ_SIGNAL(toggled(bool)),
+	   TQ_SLOT( slotBlockCursorCheck(bool)));
+  connect( mCursor.blockCheck, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT( slotChanged()));
   text = i18n("Use &thick cursor in insert mode");
   mCursor.thickCheck = new TQCheckBox( text, group );
-  connect( mCursor.thickCheck, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT( slotChanged()));
+  connect( mCursor.thickCheck, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT( slotChanged()));
 
   text = i18n("Cursor Behavior When Editor Loses Focus");
   group = new TQVButtonGroup( text, page );
@@ -306,12 +306,12 @@ void COptionDialog::setupCursorPage( void )
   mCursor.hideRadio = new TQRadioButton( i18n("H&ide"), group, "radio2" );
   text = i18n("Do &nothing");
   mCursor.nothingRadio = new TQRadioButton( text, group, "radio3" );
-  connect( mCursor.stopRadio, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT( slotChanged()));
-  connect( mCursor.hideRadio, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT( slotChanged()));
-  connect( mCursor.nothingRadio, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT( slotChanged()));
+  connect( mCursor.stopRadio, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT( slotChanged()));
+  connect( mCursor.hideRadio, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT( slotChanged()));
+  connect( mCursor.nothingRadio, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT( slotChanged()));
 
   topLayout->addStretch(10);
 }
@@ -328,10 +328,10 @@ void COptionDialog::setupColorPage( void )
 
   text = i18n("&Use system colors (as chosen in Control Center)");
   mColor.checkSystem = new TQCheckBox( text, page );
-  connect( mColor.checkSystem, TQT_SIGNAL(toggled(bool)),
-	   TQT_SLOT( slotColorSystem(bool)));
-  connect( mColor.checkSystem, TQT_SIGNAL(toggled(bool)),
-    TQT_SLOT( slotChanged()));
+  connect( mColor.checkSystem, TQ_SIGNAL(toggled(bool)),
+	   TQ_SLOT( slotColorSystem(bool)));
+  connect( mColor.checkSystem, TQ_SIGNAL(toggled(bool)),
+    TQ_SLOT( slotChanged()));
   topLayout->addWidget( mColor.checkSystem );
 
   TQFrame *hline = new TQFrame( page );
@@ -365,7 +365,7 @@ void COptionDialog::setupColorPage( void )
     mColor.colorList->insertItem( listItem );
   }
   mColor.colorList->setCurrentItem(0);
-  connect( mColor.colorList, TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( slotChanged() ) );
+  connect( mColor.colorList, TQ_SIGNAL( dataChanged() ), this, TQ_SLOT( slotChanged() ) );
 }
 
 
@@ -380,10 +380,10 @@ void COptionDialog::setupFontPage( void )
 
   text = i18n("&Use system font (as chosen in Control Center)");
   mFont.checkSystem = new TQCheckBox( text, page );
-  connect( mFont.checkSystem, TQT_SIGNAL(toggled(bool)),
-	   this, TQT_SLOT( slotFontSystem(bool)));
-  connect( mFont.checkSystem, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFont.checkSystem, TQ_SIGNAL(toggled(bool)),
+	   this, TQ_SLOT( slotFontSystem(bool)));
+  connect( mFont.checkSystem, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
   topLayout->addWidget( mFont.checkSystem );
 
   TQFrame *hline = new TQFrame( page );
@@ -396,8 +396,8 @@ void COptionDialog::setupFontPage( void )
   fixFont.setBold(true);
   mFont.chooser->setFont( fixFont, true );
   mFont.chooser->setSampleText( i18n("KHexEdit editor font") );
-  connect( mFont.chooser, TQT_SIGNAL(fontSelected(const TQFont &)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFont.chooser, TQ_SIGNAL(fontSelected(const TQFont &)),
+    this, TQ_SLOT( slotChanged()));
 
   hline = new TQFrame( page );
   hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine );
@@ -408,8 +408,8 @@ void COptionDialog::setupFontPage( void )
 
   mFont.nonPrintInput = new TQLineEdit( page );
   mFont.nonPrintInput->setMaxLength( 1 );
-  connect( mFont.nonPrintInput, TQT_SIGNAL(textChanged(const TQString &)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFont.nonPrintInput, TQ_SIGNAL(textChanged(const TQString &)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("&Map non printable characters to:");
   TQLabel *nonPrintLabel = new TQLabel( mFont.nonPrintInput, text, page );
@@ -440,8 +440,8 @@ void COptionDialog::setupFilePage( void )
   modeList.append( i18n("All Recent Documents") );
   mFile.openCombo->insertStringList( modeList );
   mFile.openCombo->setMinimumWidth( mFile.openCombo->sizeHint().width() );
-  connect( mFile.openCombo, TQT_SIGNAL(activated(int)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFile.openCombo, TQ_SIGNAL(activated(int)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("Open doc&uments on startup:");
   TQLabel *label = new TQLabel( mFile.openCombo, text, page );
@@ -456,8 +456,8 @@ void COptionDialog::setupFilePage( void )
   mFile.gotoOffsetCheck->setEnabled( false );
   // ### END
   topLayout->addWidget( mFile.gotoOffsetCheck, 0, AlignLeft );
-  connect( mFile.gotoOffsetCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFile.gotoOffsetCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   TQFrame *hline = new TQFrame( page );
   hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine );
@@ -466,20 +466,20 @@ void COptionDialog::setupFilePage( void )
   text = i18n("Open document with &write protection enabled");
   mFile.writeProtectCheck = new TQCheckBox( text, page );
   topLayout->addWidget( mFile.writeProtectCheck, 0, AlignLeft );
-  connect( mFile.writeProtectCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFile.writeProtectCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("&Keep cursor position after reloading document");
   mFile.reloadOffsetCheck = new TQCheckBox( text, page );
   topLayout->addWidget( mFile.reloadOffsetCheck, 0, AlignLeft );
-  connect( mFile.reloadOffsetCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFile.reloadOffsetCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("&Make a backup when saving document");
   mFile.backupCheck = new TQCheckBox( text, page );
   topLayout->addWidget( mFile.backupCheck, 0, AlignLeft );
-  connect( mFile.backupCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFile.backupCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   hline = new TQFrame( page );
   hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine );
@@ -493,8 +493,8 @@ void COptionDialog::setupFilePage( void )
                           "when the program is closed.\n"
                           "Note: it will not erase any document of the recent document list "
                           "created by TDE." ) );
-  connect( mFile.discardRecentCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mFile.discardRecentCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("Cl&ear \"Recent\" Document List");
   TQPushButton *discardRecentButton = new TQPushButton( page );
@@ -504,8 +504,8 @@ void COptionDialog::setupFilePage( void )
                           "Note: it will not erase any document of the recent document list "
                           "created by TDE." ) );
   topLayout->addWidget( discardRecentButton, 0, AlignCenter );
-  connect( discardRecentButton, TQT_SIGNAL(clicked()),
-	   TQT_SIGNAL(removeRecentFiles()) );
+  connect( discardRecentButton, TQ_SIGNAL(clicked()),
+	   TQ_SIGNAL(removeRecentFiles()) );
 
   topLayout->addStretch(10);
 }
@@ -526,57 +526,57 @@ void COptionDialog::setupMiscPage( void )
   text = i18n("Auto&matic copy to clipboard when selection is ready");
   mMisc.autoCheck = new TQCheckBox( text, page );
   topLayout->addWidget( mMisc.autoCheck, 0, AlignLeft );
-  connect( mMisc.autoCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.autoCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("&Editor starts in \"insert\" mode" );
   mMisc.insertCheck = new TQCheckBox( text, page );
   topLayout->addWidget( mMisc.insertCheck, 0, AlignLeft );
-  connect( mMisc.insertCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.insertCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("Confirm &wrapping (to beginning or end) during search");
   mMisc.confirmWrapCheck = new TQCheckBox( text, page );
   topLayout->addWidget( mMisc.confirmWrapCheck, 0, AlignLeft );
-  connect( mMisc.confirmWrapCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.confirmWrapCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("Cursor jumps to &nearest byte when moved");
   mMisc.cursorJumpCheck = new TQCheckBox( text, page );
   topLayout->addWidget( mMisc.cursorJumpCheck, 0, AlignLeft );
-  connect( mMisc.cursorJumpCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.cursorJumpCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   TQVButtonGroup *group = new TQVButtonGroup( i18n("Sounds"), page );
   group->layout()->setMargin( spacingHint() );
   topLayout->addWidget( group );
   text = i18n("Make sound on data &input (eg. typing) failure");
   mMisc.inputCheck = new TQCheckBox( text, group );
-  connect( mMisc.inputCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.inputCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
   text = i18n("Make sound on &fatal failure");
   mMisc.fatalCheck = new TQCheckBox( text, group );
-  connect( mMisc.fatalCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.fatalCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   group = new TQVButtonGroup( i18n("Bookmark Visibility"), page );
   group->layout()->setMargin( spacingHint() );
   topLayout->addWidget( group );
   text = i18n("Use visible bookmarks in the offset column");
   mMisc.bookmarkColumnCheck = new TQCheckBox( text, group );
-  connect( mMisc.bookmarkColumnCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.bookmarkColumnCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
   text = i18n("Use visible bookmarks in the editor fields");
   mMisc.bookmarkEditorCheck = new TQCheckBox( text, group );
-  connect( mMisc.bookmarkEditorCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.bookmarkEditorCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("Confirm when number of printed pages will e&xceed limit");
   mMisc.thresholdCheck = new TQCheckBox( text, page );
-  connect( mMisc.thresholdCheck, TQT_SIGNAL(clicked()),
-	   TQT_SLOT( slotThresholdConfirm()));
-  connect( mMisc.thresholdCheck, TQT_SIGNAL(toggled(bool)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.thresholdCheck, TQ_SIGNAL(clicked()),
+	   TQ_SLOT( slotThresholdConfirm()));
+  connect( mMisc.thresholdCheck, TQ_SIGNAL(toggled(bool)),
+    this, TQ_SLOT( slotChanged()));
   topLayout->addWidget( mMisc.thresholdCheck, 0, AlignLeft );
 
   TQGridLayout *glay = new TQGridLayout( 3, 3 );
@@ -588,8 +588,8 @@ void COptionDialog::setupMiscPage( void )
   mMisc.thresholdSpin->setRange( 5, INT_MAX );
   mMisc.thresholdSpin->setSteps( 5, 5 );
   mMisc.thresholdSpin->setValue( 5 );
-  connect( mMisc.thresholdSpin, TQT_SIGNAL(valueChanged(int)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.thresholdSpin, TQ_SIGNAL(valueChanged(int)),
+    this, TQ_SLOT( slotChanged()));
 
   text = i18n("&Threshold [pages]:" );
   mMisc.thresholdLabel = new TQLabel( mMisc.thresholdSpin, text, page );
@@ -605,8 +605,8 @@ void COptionDialog::setupMiscPage( void )
   mMisc.undoSpin->setRange( 10, 10000 );
   mMisc.undoSpin->setSteps( 5, 5 );
   mMisc.undoSpin->setValue( 50 );
-  connect( mMisc.undoSpin, TQT_SIGNAL(valueChanged(int)),
-    this, TQT_SLOT( slotChanged()));
+  connect( mMisc.undoSpin, TQ_SIGNAL(valueChanged(int)),
+    this, TQ_SLOT( slotChanged()));
 
   label = new TQLabel( mMisc.undoSpin, i18n("&Undo limit:"), page );
   glay->addWidget( label, 2, 0 );
@@ -1053,7 +1053,7 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void )
 CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f )
   :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1)
 {
-  connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) );
+  connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) );
   setAcceptDrops( true);
 }