Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

11 files changed, 115 insertions, 115 deletions

diff --git a/libkscan/gammadialog.cpp b/libkscan/gammadialog.cpp
index 2c6c601a..4ff60be9 100644
--- a/libkscan/gammadialog.cpp
+++ b/libkscan/gammadialog.cpp
@@ -41,13 +41,13 @@ GammaDialog::GammaDialog( TQWidget *parent ) :
 
     /* This connect is for recalculating the table every time a new
      * Bright., Contrast or Gamma-Value is set */
-    connect( gt, TQT_SIGNAL(tableChanged()), gt, TQT_SLOT(getTable()));
+    connect( gt, TQ_SIGNAL(tableChanged()), gt, TQ_SLOT(getTable()));
 
     gtDisp = new DispGamma( page );
     gtDisp->setValueRef( gt->getArrayPtr() );
     gtDisp->resize( 280, 280 );
 
-    connect( gt, TQT_SIGNAL(tableChanged()), gtDisp, TQT_SLOT( repaint()));
+    connect( gt, TQ_SIGNAL(tableChanged()), gtDisp, TQ_SLOT( repaint()));
 
     // setCaption( i18n( "Gamma Table" ));
 
@@ -67,17 +67,17 @@ GammaDialog::GammaDialog( TQWidget *parent ) :
     wBright   = new KScanSlider ( page, i18n("Brightness"), -50.0, 50.0 );
     TQ_CHECK_PTR(wBright);
     wBright->slSetSlider( 0 );
-    connect( wBright, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setBrightness(int)));
+    connect( wBright, TQ_SIGNAL(valueChanged(int)), gt, TQ_SLOT(setBrightness(int)));
 
     wContrast = new KScanSlider ( page, i18n("Contrast") , -50.0, 50.0 );
     TQ_CHECK_PTR(wContrast);
     wContrast->slSetSlider( 0 );
-    connect( wContrast, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setContrast(int)));
+    connect( wContrast, TQ_SIGNAL(valueChanged(int)), gt, TQ_SLOT(setContrast(int)));
 
     wGamma    = new KScanSlider ( page, i18n("Gamma"),  30.0, 300.0 );
     TQ_CHECK_PTR(wGamma);
     wGamma->slSetSlider(100);
-    connect( wGamma, TQT_SIGNAL(valueChanged(int)), gt, TQT_SLOT(setGamma(int)));
+    connect( wGamma, TQ_SIGNAL(valueChanged(int)), gt, TQ_SLOT(setGamma(int)));
 
     /* and add the Sliders */
     lvSliders->addWidget( wBright,   1 );
diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp
index c4b2c680..0003520e 100644
--- a/libkscan/img_canvas.cpp
+++ b/libkscan/img_canvas.cpp
@@ -114,8 +114,8 @@ ImageCanvas::ImageCanvas(TQWidget *parent,
     update_scaled_pixmap();
 
     // timer-Start and stop
-    connect( this, TQT_SIGNAL( newRect()), TQT_SLOT( newRectSlot()));
-    connect( this, TQT_SIGNAL( noRect()),  TQT_SLOT( noRectSlot()));
+    connect( this, TQ_SIGNAL( newRect()), TQ_SLOT( newRectSlot()));
+    connect( this, TQ_SIGNAL( noRect()),  TQ_SLOT( noRectSlot()));
 
     //zoomOut();scrollview/scrollview
     viewport()->setCursor( crossCursor );
diff --git a/libkscan/imgscaledialog.cpp b/libkscan/imgscaledialog.cpp
index 2726baf9..05ccc8ec 100644
--- a/libkscan/imgscaledialog.cpp
+++ b/libkscan/imgscaledialog.cpp
@@ -45,8 +45,8 @@ ImgScaleDialog::ImgScaleDialog( TQWidget *parent, int curr_sel,
    TQ_CHECK_PTR(radios);
    radios->setTitle( i18n("Select Image Zoom") );
 
-   connect( radios, TQT_SIGNAL( clicked( int )),
-	    this, TQT_SLOT( setSelValue( int )));
+   connect( radios, TQ_SIGNAL( clicked( int )),
+	    this, TQ_SLOT( setSelValue( int )));
 
    // left gap: smaller Image
    TQRadioButton *rb25 = new TQRadioButton (i18n ("25 %"), radios);
@@ -109,10 +109,10 @@ ImgScaleDialog::ImgScaleDialog( TQWidget *parent, int curr_sel,
    sn.setNum(curr_sel );
    leCust->setValidator( new KIntValidator( leCust ) );
    leCust->setText(sn );
-   connect( leCust, TQT_SIGNAL( textChanged( const TQString& )),
-	    this, TQT_SLOT( customChanged( const TQString& )));
-   connect( rbCust, TQT_SIGNAL( toggled( bool )),
-	    this, TQT_SLOT(enableAndFocus(bool)));
+   connect( leCust, TQ_SIGNAL( textChanged( const TQString& )),
+	    this, TQ_SLOT( customChanged( const TQString& )));
+   connect( rbCust, TQ_SIGNAL( toggled( bool )),
+	    this, TQ_SLOT(enableAndFocus(bool)));
    leCust->setEnabled( rbCust->isChecked());
 
 
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp
index a4d46da5..8dad6e2a 100644
--- a/libkscan/kscandevice.cpp
+++ b/libkscan/kscandevice.cpp
@@ -135,8 +135,8 @@ KScanOption *KScanDevice::getGuiElement( const TQCString& name, TQWidget *parent
       w = so->createWidget( parent, desc, tooltip );
       if( w )
       {
-	 connect( so,   TQT_SIGNAL( optionChanged( KScanOption* ) ),
-		  this, TQT_SLOT(   slOptChanged( KScanOption* )));
+	 connect( so,   TQ_SIGNAL( optionChanged( KScanOption* ) ),
+		  this, TQ_SLOT(   slOptChanged( KScanOption* )));
 	 w->setEnabled( so->active() );
       }
       else
@@ -209,7 +209,7 @@ KScanDevice::KScanDevice( TQObject *parent )
             }
         }
 #if 0
-        connect( this, TQT_SIGNAL(sigOptionsChanged()), TQT_SLOT(slReloadAll()));
+        connect( this, TQ_SIGNAL(sigOptionsChanged()), TQ_SLOT(slReloadAll()));
 #endif
 	gammaTables = new KScanOptSet( "GammaTables" );
      }
@@ -218,7 +218,7 @@ KScanDevice::KScanDevice( TQObject *parent )
         kdDebug(29000) << "ERROR: sane_init failed -> SANE installed ?" << endl;
      }
 
-    connect( this, TQT_SIGNAL( sigScanFinished( KScanStat )), TQT_SLOT( slScanFinished( KScanStat )));
+    connect( this, TQ_SIGNAL( sigScanFinished( KScanStat )), TQ_SLOT( slScanFinished( KScanStat )));
 
 }
 
@@ -1105,8 +1105,8 @@ KScanStat KScanDevice::acquire_data( bool isPreview )
 	 if( sane_get_select_fd( scanner_handle, &fd ) == SANE_STATUS_GOOD )
 	 {
 	    sn = new TQSocketNotifier( fd, TQSocketNotifier::Read, this );
-	    TQObject::connect( sn, TQT_SIGNAL(activated(int)),
-			      this, TQT_SLOT( doProcessABlock() ) );
+	    TQObject::connect( sn, TQ_SIGNAL(activated(int)),
+			      this, TQ_SLOT( doProcessABlock() ) );
 
 	 }
       }
diff --git a/libkscan/kscanoption.cpp b/libkscan/kscanoption.cpp
index 4a820ee9..db116203 100644
--- a/libkscan/kscanoption.cpp
+++ b/libkscan/kscanoption.cpp
@@ -1085,8 +1085,8 @@ TQWidget *KScanOption::createWidget( TQWidget *parent, const TQString& w_desc,
     case BOOL:
       /* Widget Type is ToggleButton */
       w = new  TQCheckBox( text, parent, "AUTO_TOGGLE_BUTTON" );
-      connect( w, TQT_SIGNAL(clicked()), this,
-	       TQT_SLOT(slWidgetChange()));
+      connect( w, TQ_SIGNAL(clicked()), this,
+	       TQ_SLOT(slWidgetChange()));
       break;
     case SINGLE_VAL:
       /* Widget Type is Entry-Field */
@@ -1120,8 +1120,8 @@ TQWidget *KScanOption::createWidget( TQWidget *parent, const TQString& w_desc,
   if( w )
     {
       internal_widget = w;
-      connect( this, TQT_SIGNAL( optionChanged( KScanOption*)),
-	       TQT_SLOT( slRedrawWidget( KScanOption* )));
+      connect( this, TQ_SIGNAL( optionChanged( KScanOption*)),
+	       TQ_SLOT( slRedrawWidget( KScanOption* )));
       TQString tt = tooltip;
       if( tt.isEmpty() && desc )
 	tt = TQString::fromLocal8Bit( desc->desc );
@@ -1143,8 +1143,8 @@ TQWidget *KScanOption::comboBox( TQWidget *parent, const TQString& text )
 
   KScanCombo *cb = new KScanCombo( parent, text, list);
 
-  connect( cb, TQT_SIGNAL( valueChanged( const TQCString& )), this,
-	   TQT_SLOT( slWidgetChange( const TQCString& )));
+  connect( cb, TQ_SIGNAL( valueChanged( const TQCString& )), this,
+	   TQ_SLOT( slWidgetChange( const TQCString& )));
 
   return( cb );
 }
@@ -1153,8 +1153,8 @@ TQWidget *KScanOption::comboBox( TQWidget *parent, const TQString& text )
 TQWidget *KScanOption::entryField( TQWidget *parent, const TQString& text )
 {
   KScanEntry *ent = new KScanEntry( parent, text );
-  connect( ent, TQT_SIGNAL( valueChanged( TQCString )), this,
-	   TQT_SLOT( slWidgetChange( TQCString )));
+  connect( ent, TQ_SIGNAL( valueChanged( TQCString )), this,
+	   TQ_SLOT( slWidgetChange( TQCString )));
 	
   return( ent );
 }
@@ -1167,8 +1167,8 @@ TQWidget *KScanOption::KSaneSlider( TQWidget *parent, const TQString& text )
 
   KScanSlider *slider = new KScanSlider( parent, text, min, max );
   /* Connect to the options change Slot */
-  connect( slider, TQT_SIGNAL( valueChanged(int)), this,
-	   TQT_SLOT( slWidgetChange(int)));
+  connect( slider, TQ_SIGNAL( valueChanged(int)), this,
+	   TQ_SLOT( slWidgetChange(int)));
 
   return( slider );
 }
diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp
index 01179b8d..03988072 100644
--- a/libkscan/kscanslider.cpp
+++ b/libkscan/kscanslider.cpp
@@ -49,8 +49,8 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text,
        m_stdButt->setPixmap( loader->loadIcon( "edit-undo",TDEIcon::Small ));
 
        /* connect the button click to setting the value */
-       connect( m_stdButt, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slRevertValue()));
+       connect( m_stdButt, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(slRevertValue()));
 
        TQToolTip::add( m_stdButt,
 		      i18n( "Revert value back to its standard value %1" ).arg( stdValue ));
@@ -73,11 +73,11 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text,
 
 
     /* make spin box changes change the slider */
-    connect( m_spin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slSliderChange(int)));
+    connect( m_spin, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slSliderChange(int)));
 
     /* Handle internal number display */
-    // connect(slider, TQT_SIGNAL(valueChanged(int)), numdisp, TQT_SLOT( setNum(int) ));
-    connect(slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT( slSliderChange(int) ));
+    // connect(slider, TQ_SIGNAL(valueChanged(int)), numdisp, TQ_SLOT( setNum(int) ));
+    connect(slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT( slSliderChange(int) ));
 
     /* set Value 0 to the widget */
     slider->setValue( (int) min -1 );
@@ -159,10 +159,10 @@ KScanEntry::KScanEntry( TQWidget *parent, const TQString& text )
 
     entry = new TQLineEdit( this, "AUTO_ENTRYFIELD_E" );
     l1->setBuddy( entry );
-    connect( entry, TQT_SIGNAL( textChanged(const TQString& )),
-	     this, TQT_SLOT( slEntryChange(const TQString&)));
-    connect( entry, TQT_SIGNAL( returnPressed()),
-	     this,  TQT_SLOT( slReturnPressed()));
+    connect( entry, TQ_SIGNAL( textChanged(const TQString& )),
+	     this, TQ_SLOT( slEntryChange(const TQString&)));
+    connect( entry, TQ_SIGNAL( returnPressed()),
+	     this,  TQ_SLOT( slReturnPressed()));
 
     hb->addWidget( entry,3 );
     hb->activate();
@@ -249,10 +249,10 @@ void KScanCombo::createCombo( const TQString& text )
 
     combo = new TQComboBox( this, "AUTO_COMBO" );
 
-    connect( combo, TQT_SIGNAL(activated( const TQString &)), this,
-             TQT_SLOT( slComboChange( const TQString &)));
-    connect( combo, TQT_SIGNAL(activated( int )),
-	     this,  TQT_SLOT(slFireActivated(int)));
+    connect( combo, TQ_SIGNAL(activated( const TQString &)), this,
+             TQ_SLOT( slComboChange( const TQString &)));
+    connect( combo, TQ_SIGNAL(activated( int )),
+	     this,  TQ_SLOT(slFireActivated(int)));
 
 }
 
diff --git a/libkscan/massscandialog.cpp b/libkscan/massscandialog.cpp
index fb686bab..2a805fe6 100644
--- a/libkscan/massscandialog.cpp
+++ b/libkscan/massscandialog.cpp
@@ -84,13 +84,13 @@ MassScanDialog::MassScanDialog( TQWidget *parent )
   	bigdad->addLayout( l_but );
 
    TQPushButton *b_start = new TQPushButton( i18n("Start Scan"), this, "ButtOK" );
-   connect( b_start, TQT_SIGNAL(clicked()), this, TQT_SLOT( slStartScan()) );
+   connect( b_start, TQ_SIGNAL(clicked()), this, TQ_SLOT( slStartScan()) );
 
    TQPushButton *b_cancel = new TQPushButton( i18n("Stop"), this, "ButtCancel" );
-   connect( b_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slStopScan()) );
+   connect( b_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slStopScan()) );
 
    TQPushButton *b_finish = new KPushButton( KStdGuiItem::close(), this, "ButtFinish" );
-   connect( b_finish, TQT_SIGNAL(clicked()), this, TQT_SLOT(slFinished()) );
+   connect( b_finish, TQ_SIGNAL(clicked()), this, TQ_SLOT(slFinished()) );
 
    l_but->addWidget( b_start );
    l_but->addWidget( b_cancel );
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index b899c76f..2409dd08 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -147,16 +147,16 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     /* Actions for the previewer zoom */
     TDEAction *act;
     act =  new TDEAction(i18n("Scale to W&idth"), "scaletowidth", CTRL+Key_I,
-		       this, TQT_SLOT( slScaleToWidth()), this, "preview_scaletowidth" );
+		       this, TQ_SLOT( slScaleToWidth()), this, "preview_scaletowidth" );
     act->plug( img_canvas->contextMenu());
 
     act = new TDEAction(i18n("Scale to &Height"), "scaletoheight", CTRL+Key_H,
-		      this, TQT_SLOT( slScaleToHeight()), this, "preview_scaletoheight" );
+		      this, TQ_SLOT( slScaleToHeight()), this, "preview_scaletoheight" );
     act->plug( img_canvas->contextMenu());
 
     /*Signals: Control the custom-field and show size of selection */
-    connect( img_canvas, TQT_SIGNAL(newRect()),      this, TQT_SLOT(slCustomChange()));
-    connect( img_canvas, TQT_SIGNAL(newRect(TQRect)), this, TQT_SLOT(slNewDimen(TQRect)));
+    connect( img_canvas, TQ_SIGNAL(newRect()),      this, TQ_SLOT(slCustomChange()));
+    connect( img_canvas, TQ_SIGNAL(newRect(TQRect)), this, TQ_SLOT(slNewDimen(TQRect)));
 
     /* Stuff for the preview-Notification */
     left->addWidget( new TQLabel( i18n("<B>Preview</B>"), frame ), 1);
@@ -174,8 +174,8 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     pre_format_combo->insertItem( i18n( "10x15 cm" ), ID_10_15 );
     pre_format_combo->insertItem( i18n( "Letter" ), ID_LETTER);
 
-    connect( pre_format_combo, TQT_SIGNAL(activated (int)),
-             this, TQT_SLOT( slFormatChange(int)));
+    connect( pre_format_combo, TQ_SIGNAL(activated (int)),
+             this, TQ_SLOT( slFormatChange(int)));
 
     left->addWidget( pre_format_combo, 1 );
 
@@ -190,7 +190,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     portrait_id = bgroup->id( rb2 );
     bgroup->setButton( portrait_id );
 
-    connect(bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slOrientChange(int)));
+    connect(bgroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slOrientChange(int)));
 
     int rblen = 5+w+12;  // 12 for the button?
     rb1->setGeometry( 5, 6, rblen, h );
@@ -211,22 +211,22 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     d->m_cbBackground = new TQComboBox( hbox );
     d->m_cbBackground->insertItem(i18n("Black"), BG_ITEM_BLACK );
     d->m_cbBackground->insertItem(i18n("White"), BG_ITEM_WHITE );
-    connect( d->m_cbBackground, TQT_SIGNAL(activated(int) ),
-             this, TQT_SLOT( slScanBackgroundChanged( int )));
+    connect( d->m_cbBackground, TQ_SIGNAL(activated(int) ),
+             this, TQ_SLOT( slScanBackgroundChanged( int )));
 
 
     TQToolTip::add( d->m_cbBackground,
                    i18n("Select whether a scan of the empty\n"
                         "scanner glass results in a\n"
                         "black or a white image."));
-    connect( d->m_cbAutoSel, TQT_SIGNAL(toggled(bool) ), TQT_SLOT(slAutoSelToggled(bool)));
+    connect( d->m_cbAutoSel, TQ_SIGNAL(toggled(bool) ), TQ_SLOT(slAutoSelToggled(bool)));
 
     (void) new TQLabel( i18n("scanner background"), d->m_autoSelGroup );
 
     TQLabel *l1= new TQLabel( i18n("Thresh&old:"), d->m_autoSelGroup );
     d->m_sliderThresh = new TQSlider( 0, 254, 10, d->m_autoSelThresh,  TQt::Horizontal,
                                      d->m_autoSelGroup );
-    connect( d->m_sliderThresh, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slSetAutoSelThresh(int)));
+    connect( d->m_sliderThresh, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slSetAutoSelThresh(int)));
     TQToolTip::add( d->m_sliderThresh,
                    i18n("Threshold for autodetection.\n"
                         "All pixels higher (on black background)\n"
@@ -237,7 +237,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
 #if 0  /** Dustsize-Slider: No deep impact on result **/
     (void) new TQLabel( i18n("Dust size:"), grBox );
     d->m_sliderDust = new TQSlider( 0, 50, 5, d->m_dustsize,  TQt::Horizontal, grBox );
-    connect( d->m_sliderDust, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slSetAutoSelDustsize(int)));
+    connect( d->m_sliderDust, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slSetAutoSelDustsize(int)));
 #endif
 
     /* disable Autoselbox as long as no scanner is connected */
@@ -251,10 +251,10 @@ Previewer::Previewer(TQWidget *parent, const char *name )
     TQLabel *l2 = new TQLabel( i18n("width - mm" ), gbox );
     TQLabel *l3 = new TQLabel( i18n("height - mm" ), gbox );
 
-    connect( this, TQT_SIGNAL(setScanWidth(const TQString&)),
-             l2, TQT_SLOT(setText(const TQString&)));
-    connect( this, TQT_SIGNAL(setScanHeight(const TQString&)),
-             l3, TQT_SLOT(setText(const TQString&)));
+    connect( this, TQ_SIGNAL(setScanWidth(const TQString&)),
+             l2, TQ_SLOT(setText(const TQString&)));
+    connect( this, TQ_SIGNAL(setScanHeight(const TQString&)),
+             l3, TQ_SLOT(setText(const TQString&)));
 
     /* size indicator */
     TQHBox *hb = new TQHBox( gbox );
@@ -265,8 +265,8 @@ Previewer::Previewer(TQWidget *parent, const char *name )
                                "changing its background color." ));
     indi->setText( i18n("-") );
 
-    connect( this, TQT_SIGNAL( setSelectionSize(long)),
-             indi, TQT_SLOT(   setSizeInByte   (long)) );
+    connect( this, TQ_SIGNAL( setSelectionSize(long)),
+             indi, TQ_SLOT(   setSizeInByte   (long)) );
 
     left->addWidget( gbox, 1 );
 
diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp
index 2a989212..8c852bea 100644
--- a/libkscan/scandialog.cpp
+++ b/libkscan/scandialog.cpp
@@ -79,13 +79,13 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal )
 
     m_scanParams = 0;
     m_device = new KScanDevice( this );
-    connect(m_device, TQT_SIGNAL(sigNewImage(TQImage *, ImgScanInfo*)),
-            this, TQT_SLOT(slotFinalImage(TQImage *, ImgScanInfo *)));
+    connect(m_device, TQ_SIGNAL(sigNewImage(TQImage *, ImgScanInfo*)),
+            this, TQ_SLOT(slotFinalImage(TQImage *, ImgScanInfo *)));
 
-    connect( m_device, TQT_SIGNAL(sigScanStart()), this, TQT_SLOT(slotScanStart()));
-    connect( m_device, TQT_SIGNAL(sigScanFinished(KScanStat)),
-	     this, TQT_SLOT(slotScanFinished(KScanStat)));
-    connect( m_device, TQT_SIGNAL(sigAcquireStart()), this, TQT_SLOT(slotAcquireStart()));
+    connect( m_device, TQ_SIGNAL(sigScanStart()), this, TQ_SLOT(slotScanStart()));
+    connect( m_device, TQ_SIGNAL(sigScanFinished(KScanStat)),
+	     this, TQ_SLOT(slotScanFinished(KScanStat)));
+    connect( m_device, TQ_SIGNAL(sigAcquireStart()), this, TQ_SLOT(slotAcquireStart()));
     /* Create a preview widget to the right side of the splitter */
     m_previewer = new Previewer( splitter );
     TQ_CHECK_PTR(m_previewer );
@@ -93,8 +93,8 @@ ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal )
     /* ... and connect to the selector-slots. They communicate user's
      * selection to the scanner parameter engine */
     /* a new preview signal */
-    connect( m_device, TQT_SIGNAL( sigNewPreview( TQImage*, ImgScanInfo* )),
-             this, TQT_SLOT( slotNewPreview( TQImage* )));
+    connect( m_device, TQ_SIGNAL( sigNewPreview( TQImage*, ImgScanInfo* )),
+             this, TQ_SLOT( slotNewPreview( TQImage* )));
 
     m_previewer->setEnabled( false ); // will be enabled in setup()
 
@@ -136,10 +136,10 @@ void ScanDialog::createOptionsTab( void )
 
    /* Note: flag must be inverted because of question is 'the other way round' */
    cb_askOnStart->setChecked( !skipDialog );
-   connect( cb_askOnStart, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotAskOnStartToggle(bool)));
+   connect( cb_askOnStart, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotAskOnStartToggle(bool)));
 
    cb_network->setChecked( !onlyLocal );
-   connect( cb_network, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotNetworkToggle(bool)));
+   connect( cb_network, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotNetworkToggle(bool)));
 
 
    TQWidget *spaceEater = new TQWidget( page );
@@ -230,13 +230,13 @@ bool ScanDialog::setup()
    }
 
    m_scanParams = new ScanParams( splitter );
-   connect( m_previewer->getImageCanvas(), TQT_SIGNAL( newRect(TQRect)),
-	    m_scanParams, TQT_SLOT(slCustomScanSize(TQRect)));
-   connect( m_previewer->getImageCanvas(), TQT_SIGNAL( noRect()),
-	    m_scanParams, TQT_SLOT(slMaximalScanSize()));
+   connect( m_previewer->getImageCanvas(), TQ_SIGNAL( newRect(TQRect)),
+	    m_scanParams, TQ_SLOT(slCustomScanSize(TQRect)));
+   connect( m_previewer->getImageCanvas(), TQ_SIGNAL( noRect()),
+	    m_scanParams, TQ_SLOT(slMaximalScanSize()));
 
-   connect( m_scanParams, TQT_SIGNAL( scanResolutionChanged( int, int )),
-	    m_previewer, TQT_SLOT( slNewScanResolutions( int, int )));
+   connect( m_scanParams, TQ_SIGNAL( scanResolutionChanged( int, int )),
+	    m_previewer, TQ_SLOT( slNewScanResolutions( int, int )));
 
 
    /* continue to attach a real scanner */
diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp
index 3dafbc6e..99b3f1ff 100644
--- a/libkscan/scanparams.cpp
+++ b/libkscan/scanparams.cpp
@@ -157,9 +157,9 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice )
    (void) new KSeparator( KSeparator::HLine, this);
    KButtonBox *kbb = new KButtonBox( this );
    TQPushButton* pb = kbb->addButton( KGuiItem( i18n( "Final S&can" ), "scanner" ) );
-   connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slStartScan()) );
+   connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slStartScan()) );
    pb = kbb->addButton( i18n( "&Preview Scan" ));
-   connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slAcquirePreview()) );
+   connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slAcquirePreview()) );
    kbb->layout();
 
    /* Initialise the progress dialog */
@@ -169,12 +169,12 @@ bool ScanParams::connectDevice( KScanDevice *newScanDevice )
    progressDialog->setAutoClose( true );
    progressDialog->setAutoReset( true );
 
-   connect( sane_device, TQT_SIGNAL(sigScanProgress(int)),
-	    progressDialog, TQT_SLOT(setProgress(int)));
+   connect( sane_device, TQ_SIGNAL(sigScanProgress(int)),
+	    progressDialog, TQ_SLOT(setProgress(int)));
 
    /* Connect the Progress Dialogs cancel-Button */
-   connect( progressDialog, TQT_SIGNAL( cancelled() ), sane_device,
-	    TQT_SLOT( slStopScanning() ) );
+   connect( progressDialog, TQ_SIGNAL( cancelled() ), sane_device,
+	    TQ_SLOT( slStopScanning() ) );
 
    return( true );
 }
@@ -260,8 +260,8 @@ TQScrollView *ScanParams::scannerParams( )
       hb->setStretchFactor( cb, 5 );
 
       initialise( so );
-      connect( so, TQT_SIGNAL(guiChange(KScanOption*)),
-	       this, TQT_SLOT(slReloadAllGui( KScanOption* )));
+      connect( so, TQ_SIGNAL(guiChange(KScanOption*)),
+	       this, TQ_SLOT(slReloadAllGui( KScanOption* )));
    }
 
    /* Add a button for Source-Selection */
@@ -277,7 +277,7 @@ TQScrollView *ScanParams::scannerParams( )
       if( l.count() > 1 )
       {
 	 pb_source_sel = new TQPushButton( i18n("Source..."), hb );
-	 connect( pb_source_sel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slSourceSelect()));
+	 connect( pb_source_sel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slSourceSelect()));
 	 initialise( &source );
 	 hb->setStretchFactor( pb_source_sel, 3 );
 
@@ -302,8 +302,8 @@ TQScrollView *ScanParams::scannerParams( )
       if( so )
       {
 	 initialise(so);
-	 connect( so,   TQT_SIGNAL(guiChange(KScanOption*)),
-		  this, TQT_SLOT(slReloadAllGui( KScanOption* )));
+	 connect( so,   TQ_SIGNAL(guiChange(KScanOption*)),
+		  this, TQ_SLOT(slReloadAllGui( KScanOption* )));
       }
    }
 
@@ -316,8 +316,8 @@ TQScrollView *ScanParams::scannerParams( )
       if( so )
       {
 	 initialise(so);
-	 connect( so,   TQT_SIGNAL(guiChange(KScanOption*)),
-		  this, TQT_SLOT(slReloadAllGui( KScanOption* )));
+	 connect( so,   TQ_SIGNAL(guiChange(KScanOption*)),
+		  this, TQ_SLOT(slReloadAllGui( KScanOption* )));
       }
    }
 
@@ -330,8 +330,8 @@ TQScrollView *ScanParams::scannerParams( )
       if( so )
       {
 	 initialise(so);
-	 connect( so,   TQT_SIGNAL(guiChange(KScanOption*)),
-		  this, TQT_SLOT(slReloadAllGui( KScanOption* )));
+	 connect( so,   TQ_SIGNAL(guiChange(KScanOption*)),
+		  this, TQ_SLOT(slReloadAllGui( KScanOption* )));
       }
    }
 
@@ -349,11 +349,11 @@ TQScrollView *ScanParams::scannerParams( )
       so->slRedrawWidget( so );
 
       /* connect to slot that passes the resolution to the previewer */
-      connect( so, TQT_SIGNAL(guiChange(KScanOption*)),
-	       this, TQT_SLOT( slNewXResolution(KScanOption*)));
+      connect( so, TQ_SIGNAL(guiChange(KScanOption*)),
+	       this, TQ_SLOT( slNewXResolution(KScanOption*)));
 
-      connect( so, TQT_SIGNAL(guiChange(KScanOption*)),
-	       this, TQT_SLOT(slReloadAllGui( KScanOption* )));
+      connect( so, TQ_SIGNAL(guiChange(KScanOption*)),
+	       this, TQ_SLOT(slReloadAllGui( KScanOption* )));
 
       xy_resolution_bind =
 	 sane_device->getGuiElement(SANE_NAME_RESOLUTION_BIND, pbox,
@@ -364,8 +364,8 @@ TQScrollView *ScanParams::scannerParams( )
 	 initialise( xy_resolution_bind );
 	 xy_resolution_bind->slRedrawWidget( xy_resolution_bind );
 	 /* Connect to Gui-change-Slot */
-	 connect( xy_resolution_bind, TQT_SIGNAL(guiChange(KScanOption*)),
-		  this, TQT_SLOT(slReloadAllGui( KScanOption* )));
+	 connect( xy_resolution_bind, TQ_SIGNAL(guiChange(KScanOption*)),
+		  this, TQ_SLOT(slReloadAllGui( KScanOption* )));
       }
 
       /* Resolution Setting -> Y-Resolution Setting */
@@ -451,8 +451,8 @@ TQScrollView *ScanParams::scannerParams( )
 				       SANE_TITLE_CUSTOM_GAMMA,
 				       SANE_DESC_CUSTOM_GAMMA );
       initialise( so );
-      connect( so,   TQT_SIGNAL(guiChange(KScanOption*)),
-	       this, TQT_SLOT(slReloadAllGui( KScanOption* )));
+      connect( so,   TQ_SIGNAL(guiChange(KScanOption*)),
+	       this, TQ_SLOT(slReloadAllGui( KScanOption* )));
    }
    else
    {
@@ -465,14 +465,14 @@ TQScrollView *ScanParams::scannerParams( )
    pb_edit_gtable = new TQPushButton( i18n("Edit..."), hb1 );
    TQ_CHECK_PTR(pb_edit_gtable);
 
-   connect( pb_edit_gtable, TQT_SIGNAL( clicked () ),
-	    this, TQT_SLOT( slEditCustGamma () ) );
+   connect( pb_edit_gtable, TQ_SIGNAL( clicked () ),
+	    this, TQ_SLOT( slEditCustGamma () ) );
    setEditCustomGammaTableState();
 
    /* This connection cares for enabling/disabling the edit-Button */
    if(so )
-	   connect( so,   TQT_SIGNAL(guiChange(KScanOption*)),
-		    this, TQT_SLOT(slOptionNotify(KScanOption*)));
+	   connect( so,   TQ_SIGNAL(guiChange(KScanOption*)),
+		    this, TQ_SLOT(slOptionNotify(KScanOption*)));
 
    /* my Epson Perfection backends offer a list of user defined gamma values */
 
@@ -664,8 +664,8 @@ void ScanParams::virtualScannerParams( void )
    /* Selection if virt. Scanner or SANE Debug */
    bg_virt_scan_mode = new TQButtonGroup( 2, TQt::Horizontal,
 					 this, "GroupBoxVirtScanner" );
-   connect( bg_virt_scan_mode, TQT_SIGNAL(clicked(int)),
-	    this, TQT_SLOT( slVirtScanModeSelect(int)));
+   connect( bg_virt_scan_mode, TQ_SIGNAL(clicked(int)),
+	    this, TQ_SLOT( slVirtScanModeSelect(int)));
 
    TQRadioButton *rb1 = new TQRadioButton( i18n("SANE debug (pnm only)"),
 					 bg_virt_scan_mode, "VirtScanSANEDebug" );
@@ -696,8 +696,8 @@ void ScanParams::virtualScannerParams( void )
       top->addLayout( hb );
       w = virt_filename->widget();
       w->setMinimumHeight( (w->sizeHint()).height());
-      connect( w, TQT_SIGNAL(returnPressed()), this,
-	       TQT_SLOT( slCheckGlob()));
+      connect( w, TQ_SIGNAL(returnPressed()), this,
+	       TQ_SLOT( slCheckGlob()));
 
       hb->addWidget( w, 12 );
 
@@ -705,7 +705,7 @@ void ScanParams::virtualScannerParams( void )
       pb_file_sel->setPixmap(miniFloppyPixmap);
       //hb->addStretch( 1 );
       hb->addWidget( pb_file_sel, 1 );
-      connect( pb_file_sel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slFileSelect()));
+      connect( pb_file_sel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slFileSelect()));
 
    }
 
@@ -863,8 +863,8 @@ void ScanParams::slEditCustGamma( void )
     kdDebug(29000) << "Old gamma table: " << old_gt.getGamma() << ", " << old_gt.getBrightness() << ", " << old_gt.getContrast() << endl;
 
     GammaDialog gdiag( this );
-    connect( &gdiag, TQT_SIGNAL( gammaToApply(KGammaTable*) ),
-	     this,     TQT_SLOT( slApplyGamma(KGammaTable*) ) );
+    connect( &gdiag, TQ_SIGNAL( gammaToApply(KGammaTable*) ),
+	     this,     TQ_SLOT( slApplyGamma(KGammaTable*) ) );
 
     gdiag.setGt( old_gt );
 
diff --git a/libkscan/scansourcedialog.cpp b/libkscan/scansourcedialog.cpp
index e0e7a0d4..cf0408ab 100644
--- a/libkscan/scansourcedialog.cpp
+++ b/libkscan/scansourcedialog.cpp
@@ -59,7 +59,7 @@ ScanSourceDialog::ScanSourceDialog( TQWidget *parent, const TQStrList list, ADF_
    sources = new KScanCombo( vbox,
 			     i18n("Select the Scanner document source:"),
 			     xx);
-   connect( sources, TQT_SIGNAL( activated(int)), this, TQT_SLOT( slChangeSource(int)));
+   connect( sources, TQ_SIGNAL( activated(int)), this, TQ_SLOT( slChangeSource(int)));
 
 
    /* Button Group for ADF-Behaviour */
@@ -70,7 +70,7 @@ ScanSourceDialog::ScanSourceDialog( TQWidget *parent, const TQStrList list, ADF_
    {
       bgroup = new TQVButtonGroup( i18n("Advanced ADF-Options"), vbox, "ADF_BGROUP" );
 
-      connect( bgroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT( slNotifyADF(int)));
+      connect( bgroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT( slNotifyADF(int)));
 
       /* Two buttons inside */
       TQRadioButton *rbADFTillEnd = new TQRadioButton( i18n("Scan until ADF reports out of paper"),