Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

11 files changed, 134 insertions, 134 deletions

diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp
index 734241ca..fc483c45 100644
--- a/kuickshow/src/defaultswidget.cpp
+++ b/kuickshow/src/defaultswidget.cpp
@@ -37,7 +37,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
   imFiltered = 0L;
 
   cbEnableMods = new TQCheckBox( i18n("Apply default image modifications"), this );
-  connect( cbEnableMods, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( enableWidgets(bool) ));
+  connect( cbEnableMods, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( enableWidgets(bool) ));
 
   // create all the widgets
 
@@ -52,8 +52,8 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
   sbMaxUpScaleFactor = new KIntNumInput( gbScale, "upscale factor" );
   sbMaxUpScaleFactor->setRange( 1, 100, 1, false );
 
-  connect(cbUpScale, TQT_SIGNAL( toggled(bool)), sbMaxUpScaleFactor,
-            TQT_SLOT( setEnabled(bool) ));
+  connect(cbUpScale, TQ_SIGNAL( toggled(bool)), sbMaxUpScaleFactor,
+            TQ_SLOT( setEnabled(bool) ));
 
   // --
 
@@ -99,7 +99,7 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
 
   lbImFiltered = new TQLabel( i18n("Modified"), gbPreview );
   imFiltered = new ImlibWidget( 0L, imOrig->getImlibData(), gbPreview, "" );
-  connect( imFiltered, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotNoImage() ));
+  connect( imFiltered, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotNoImage() ));
 
   ////
   ////////////////
@@ -159,16 +159,16 @@ DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name)
   ////////////////
 
   // connect them all to the update slot
-  connect( cbDownScale,        TQT_SIGNAL( clicked() ), TQT_SLOT( updatePreview() ));
-  connect( cbUpScale,          TQT_SIGNAL( clicked() ), TQT_SLOT( updatePreview() ));
-  connect( cbFlipVertically,   TQT_SIGNAL( clicked() ), TQT_SLOT( updatePreview() ));
-  connect( cbFlipHorizontally, TQT_SIGNAL( clicked() ), TQT_SLOT( updatePreview() ));
-  connect( sbMaxUpScaleFactor, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( updatePreview() ));
-  connect( sbBrightness, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( updatePreview() ));
-  connect( sbContrast,   TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( updatePreview() ));
-  connect( sbGamma,      TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( updatePreview() ));
-
-  connect( comboRotate,  TQT_SIGNAL( activated(int) ), TQT_SLOT( updatePreview() ));
+  connect( cbDownScale,        TQ_SIGNAL( clicked() ), TQ_SLOT( updatePreview() ));
+  connect( cbUpScale,          TQ_SIGNAL( clicked() ), TQ_SLOT( updatePreview() ));
+  connect( cbFlipVertically,   TQ_SIGNAL( clicked() ), TQ_SLOT( updatePreview() ));
+  connect( cbFlipHorizontally, TQ_SIGNAL( clicked() ), TQ_SLOT( updatePreview() ));
+  connect( sbMaxUpScaleFactor, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updatePreview() ));
+  connect( sbBrightness, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updatePreview() ));
+  connect( sbContrast,   TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updatePreview() ));
+  connect( sbGamma,      TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( updatePreview() ));
+
+  connect( comboRotate,  TQ_SIGNAL( activated(int) ), TQ_SLOT( updatePreview() ));
 
 
   TQString filename = locate( "data", "kuickshow/pics/calibrate.png" );
diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp
index 2874db06..c3e18505 100644
--- a/kuickshow/src/filefinder.cpp
+++ b/kuickshow/src/filefinder.cpp
@@ -37,12 +37,12 @@ FileFinder::FileFinder( TQWidget *parent, const char *name )
     setHandleSignals( true ); // we want the completionbox signals
     completionBox()->setTabHandling( true );
 
-    connect( completionBox(), TQT_SIGNAL( userCancelled(const TQString&) ),
-             TQT_SLOT( hide() ));
-    connect( completionBox(), TQT_SIGNAL( activated( const TQString& ) ),
-             TQT_SLOT( slotAccept( const TQString& )));
-    connect( this, TQT_SIGNAL( returnPressed( const TQString& )),
-             TQT_SLOT( slotAccept( const TQString& ) ));
+    connect( completionBox(), TQ_SIGNAL( userCancelled(const TQString&) ),
+             TQ_SLOT( hide() ));
+    connect( completionBox(), TQ_SIGNAL( activated( const TQString& ) ),
+             TQ_SLOT( slotAccept( const TQString& )));
+    connect( this, TQ_SIGNAL( returnPressed( const TQString& )),
+             TQ_SLOT( slotAccept( const TQString& ) ));
 
     KURLCompletion *comp = new KURLCompletion();
     comp->setReplaceHome( true );
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index 379abd84..d65e98b4 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -55,21 +55,21 @@ FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name )
     dirCompletionObject()->setCompletionMode( TDEGlobalSettings::CompletionAuto);
 
     slotViewChanged();
-    connect( this, TQT_SIGNAL( viewChanged( KFileView * )),
-	     TQT_SLOT( slotViewChanged() ));
+    connect( this, TQ_SIGNAL( viewChanged( KFileView * )),
+	     TQ_SLOT( slotViewChanged() ));
 
-    connect( dirLister(), TQT_SIGNAL( clear() ), TQT_SLOT( slotItemsCleared() ));
-    connect( dirLister(), TQT_SIGNAL( deleteItem( KFileItem * ) ),
-	     TQT_SLOT( slotItemDeleted( KFileItem *) ));
+    connect( dirLister(), TQ_SIGNAL( clear() ), TQ_SLOT( slotItemsCleared() ));
+    connect( dirLister(), TQ_SIGNAL( deleteItem( KFileItem * ) ),
+	     TQ_SLOT( slotItemDeleted( KFileItem *) ));
 
-    connect( this, TQT_SIGNAL( fileHighlighted( const KFileItem * )),
-	     TQT_SLOT( slotHighlighted( const KFileItem * )));
+    connect( this, TQ_SIGNAL( fileHighlighted( const KFileItem * )),
+	     TQ_SLOT( slotHighlighted( const KFileItem * )));
 
-    connect( this, TQT_SIGNAL(urlEntered(const KURL&)),
-             TQT_SLOT( slotURLEntered( const KURL& )));
+    connect( this, TQ_SIGNAL(urlEntered(const KURL&)),
+             TQ_SLOT( slotURLEntered( const KURL& )));
 
     // should actually be KDirOperator's job!
-    connect( this, TQT_SIGNAL( finishedLoading() ), TQT_SLOT( slotFinishedLoading() ));
+    connect( this, TQ_SIGNAL( finishedLoading() ), TQ_SLOT( slotFinishedLoading() ));
 }
 
 FileWidget::~FileWidget()
@@ -201,11 +201,11 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e )
 		
                 if ( !m_fileFinder ) {
 		    m_fileFinder = new FileFinder( this, "file finder" );
-		    connect( m_fileFinder, TQT_SIGNAL( completion(const TQString&)),
-			     TQT_SLOT( findCompletion( const TQString& )));
+		    connect( m_fileFinder, TQ_SIGNAL( completion(const TQString&)),
+			     TQ_SLOT( findCompletion( const TQString& )));
 		    connect( m_fileFinder,
-			     TQT_SIGNAL( enterDir( const TQString& ) ),
-			     TQT_SLOT( slotReturnPressed( const TQString& )));
+			     TQ_SIGNAL( enterDir( const TQString& ) ),
+			     TQ_SLOT( slotReturnPressed( const TQString& )));
 		    m_fileFinder->move( width()  - m_fileFinder->width(),
 					height() - m_fileFinder->height() );
 		}
diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp
index d51fe7d9..db8d5c7c 100644
--- a/kuickshow/src/generalwidget.cpp
+++ b/kuickshow/src/generalwidget.cpp
@@ -47,8 +47,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
   logo->setTipText( i18n( "Open KuickShow Website" ) );
   logo->setUseTips( true );
 
-  connect( logo, TQT_SIGNAL( leftClickedURL( const TQString & ) ),
-            TQT_SLOT( slotURLClicked( const TQString & ) ) );
+  connect( logo, TQ_SIGNAL( leftClickedURL( const TQString & ) ),
+            TQ_SLOT( slotURLClicked( const TQString & ) ) );
 
   layout->addWidget( logo, 0, AlignRight );
 
@@ -92,7 +92,7 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name )
 
   cbOwnPalette = new TQCheckBox( i18n("Use own color palette"),
                                 gbox2, "pal");
-  connect( cbOwnPalette, TQT_SIGNAL( clicked() ), this, TQT_SLOT( useOwnPalette() ) );
+  connect( cbOwnPalette, TQ_SIGNAL( clicked() ), this, TQ_SLOT( useOwnPalette() ) );
 
   cbFastRemap = new TQCheckBox( i18n("Fast palette remapping"), gbox2, "remap");
 
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index 8f957cb9..6b934f18 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -146,103 +146,103 @@ void ImageWindow::updateActions()
 void ImageWindow::setupActions()
 {
     new TDEAction( i18n("Show Next Image"), TDEStdAccel::next(),
-                 this, TQT_SLOT( slotRequestNext() ),
+                 this, TQ_SLOT( slotRequestNext() ),
                  m_actions, "next_image" );
     new TDEAction( i18n("Show Previous Image"), TDEStdAccel::prior(),
-                 this, TQT_SLOT( slotRequestPrevious() ),
+                 this, TQ_SLOT( slotRequestPrevious() ),
                  m_actions, "previous_image" );
 
     new TDEAction( i18n("Delete Image"), SHIFT + Key_Delete,
-                 this, TQT_SLOT( imageDelete() ),
+                 this, TQ_SLOT( imageDelete() ),
                  m_actions, "delete_image" );
     new TDEAction( i18n("Move Image to Trash"), Key_Delete,
-                 this, TQT_SLOT( imageTrash() ),
+                 this, TQ_SLOT( imageTrash() ),
                  m_actions, "trash_image" );
 
     new TDEAction( i18n("Zoom In"), Key_Plus,
-                 this, TQT_SLOT( zoomIn() ),
+                 this, TQ_SLOT( zoomIn() ),
                  m_actions, "zoom_in" );
     new TDEAction( i18n("Zoom Out"), Key_Minus,
-                 this, TQT_SLOT( zoomOut() ),
+                 this, TQ_SLOT( zoomOut() ),
                  m_actions, "zoom_out" );
     new TDEAction( i18n("Restore Original Size"), Key_O,
-                 this, TQT_SLOT( showImageOriginalSize() ),
+                 this, TQ_SLOT( showImageOriginalSize() ),
                  m_actions, "original_size" );
     new TDEAction( i18n("Maximize"), Key_M,
-                 this, TQT_SLOT( maximize() ),
+                 this, TQ_SLOT( maximize() ),
                  m_actions, "maximize" );
 
     new TDEAction( i18n("Rotate 90 Degrees"), Key_9,
-                 this, TQT_SLOT( rotate90() ),
+                 this, TQ_SLOT( rotate90() ),
                  m_actions, "rotate90" );
     new TDEAction( i18n("Rotate 180 Degrees"), Key_8,
-                 this, TQT_SLOT( rotate180() ),
+                 this, TQ_SLOT( rotate180() ),
                  m_actions, "rotate180" );
     new TDEAction( i18n("Rotate 270 Degrees"), Key_7,
-                 this, TQT_SLOT( rotate270() ),
+                 this, TQ_SLOT( rotate270() ),
                  m_actions, "rotate270" );
 
     new TDEAction( i18n("Flip Horizontally"), Key_Asterisk,
-                 this, TQT_SLOT( flipHoriz() ),
+                 this, TQ_SLOT( flipHoriz() ),
                  m_actions, "flip_horicontally" );
     new TDEAction( i18n("Flip Vertically"), Key_Slash,
-                 this, TQT_SLOT( flipVert() ),
+                 this, TQ_SLOT( flipVert() ),
                  m_actions, "flip_vertically" );
 
     new TDEAction( i18n("Print Image..."), TDEStdAccel::print(),
-                 this, TQT_SLOT( printImage() ),
+                 this, TQ_SLOT( printImage() ),
                  m_actions, "print_image" );
-    KStdAction::saveAs( this, TQT_SLOT( saveImage() ),
+    KStdAction::saveAs( this, TQ_SLOT( saveImage() ),
                  m_actions, "save_image_as" );
 
-    KStdAction::close( this, TQT_SLOT( close() ),
+    KStdAction::close( this, TQ_SLOT( close() ),
                  m_actions, "close_image" );
     // --------
     new TDEAction( i18n("More Brightness"), Key_B,
-                 this, TQT_SLOT( moreBrightness() ),
+                 this, TQ_SLOT( moreBrightness() ),
                  m_actions, "more_brightness" );
     new TDEAction( i18n("Less Brightness"), SHIFT + Key_B,
-                 this, TQT_SLOT( lessBrightness() ),
+                 this, TQ_SLOT( lessBrightness() ),
                  m_actions, "less_brightness" );
     new TDEAction( i18n("More Contrast"), Key_C,
-                 this, TQT_SLOT( moreContrast() ),
+                 this, TQ_SLOT( moreContrast() ),
                  m_actions, "more_contrast" );
     new TDEAction( i18n("Less Contrast"), SHIFT + Key_C,
-                 this, TQT_SLOT( lessContrast() ),
+                 this, TQ_SLOT( lessContrast() ),
                  m_actions, "less_contrast" );
     new TDEAction( i18n("More Gamma"), Key_G,
-                 this, TQT_SLOT( moreGamma() ),
+                 this, TQ_SLOT( moreGamma() ),
                  m_actions, "more_gamma" );
     new TDEAction( i18n("Less Gamma"), SHIFT + Key_G,
-                 this, TQT_SLOT( lessGamma() ),
+                 this, TQ_SLOT( lessGamma() ),
                  m_actions, "less_gamma" );
 
     // --------
     new TDEAction( i18n("Scroll Up"), Key_Up,
-                 this, TQT_SLOT( scrollUp() ),
+                 this, TQ_SLOT( scrollUp() ),
                  m_actions, "scroll_up" );
     new TDEAction( i18n("Scroll Down"), Key_Down,
-                 this, TQT_SLOT( scrollDown() ),
+                 this, TQ_SLOT( scrollDown() ),
                  m_actions, "scroll_down" );
     new TDEAction( i18n("Scroll Left"), Key_Left,
-                 this, TQT_SLOT( scrollLeft() ),
+                 this, TQ_SLOT( scrollLeft() ),
                  m_actions, "scroll_left" );
     new TDEAction( i18n("Scroll Right"), Key_Right,
-                 this, TQT_SLOT( scrollRight() ),
+                 this, TQ_SLOT( scrollRight() ),
                  m_actions, "scroll_right" );
     // --------
     new TDEAction( i18n("Pause Slideshow"), Key_P,
-                 this, TQT_SLOT( pauseSlideShow() ),
+                 this, TQ_SLOT( pauseSlideShow() ),
                  m_actions, "kuick_slideshow_pause" );
 
-    TDEAction *fullscreenAction = KStdAction::fullScreen(this, TQT_SLOT( toggleFullscreen() ), m_actions, 0 );
+    TDEAction *fullscreenAction = KStdAction::fullScreen(this, TQ_SLOT( toggleFullscreen() ), m_actions, 0 );
 
     TDEAction *reloadAction = new TDEAction( i18n("Reload Image"), TDEStdAccel::shortcut(TDEStdAccel::Reload),
-                                         this, TQT_SLOT( reload() ),
+                                         this, TQ_SLOT( reload() ),
                                          m_actions, "reload_image" );
 
     new TDEAction( i18n("Properties"), ALT + Key_Return,
-                 this, TQT_SLOT( slotProperties() ),
+                 this, TQ_SLOT( slotProperties() ),
                  m_actions, "properties" );
 
     m_actions->readShortcutSettings();
diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp
index 033d73db..631e540d 100644
--- a/kuickshow/src/imlibwidget.cpp
+++ b/kuickshow/src/imlibwidget.cpp
@@ -117,8 +117,8 @@ void ImlibWidget::init()
     setBackgroundMode( PaletteBackground );
 
     imageCache = new ImageCache( id, 4 ); // cache 4 images (FIXME?)
-    connect( imageCache, TQT_SIGNAL( sigBusy() ), TQT_SLOT( setBusyCursor() ));
-    connect( imageCache, TQT_SIGNAL( sigIdle() ), TQT_SLOT( restoreCursor() ));
+    connect( imageCache, TQ_SIGNAL( sigBusy() ), TQ_SLOT( setBusyCursor() ));
+    connect( imageCache, TQ_SIGNAL( sigIdle() ), TQ_SLOT( restoreCursor() ));
 
     win = XCreateSimpleWindow(x11Display(), winId(), 0,0,w,h,0,0,0);
 }
@@ -206,7 +206,7 @@ bool ImlibWidget::cacheImage( const KURL& url )
         if ( !file->download() ) {
             return false;
         }
-        connect( file, TQT_SIGNAL( downloaded( KuickFile * )), TQT_SLOT( cacheImage( KuickFile * )) );
+        connect( file, TQ_SIGNAL( downloaded( KuickFile * )), TQ_SLOT( cacheImage( KuickFile * )) );
         return true; // optimistic
     }
 }
@@ -647,8 +647,8 @@ KuickImage * ImageCache::getKuimage( KuickFile * file,
 
 	Imlib_set_image_modifier( myId, im, &mod );
 	kuim = new KuickImage( file, im, myId );
-	connect( kuim, TQT_SIGNAL( startRendering() ),   TQT_SLOT( slotBusy() ));
-	connect( kuim, TQT_SIGNAL( stoppedRendering() ), TQT_SLOT( slotIdle() ));
+	connect( kuim, TQ_SIGNAL( startRendering() ),   TQ_SLOT( slotBusy() ));
+	connect( kuim, TQ_SIGNAL( stoppedRendering() ), TQ_SLOT( slotIdle() ));
 
 	kuickList.insert( 0, kuim );
 	fileList.prepend( file );
diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp
index baee42b8..a6c520b9 100644
--- a/kuickshow/src/kuickconfigdlg.cpp
+++ b/kuickshow/src/kuickconfigdlg.cpp
@@ -64,7 +64,7 @@ KuickConfigDialog::KuickConfigDialog( TDEActionCollection *_coll, TQWidget *pare
     box = addVBoxPage( i18n("Bro&wser Shortcuts") );
     browserKeyChooser = new KKeyChooser( coll, box );
 
-    connect( this, TQT_SIGNAL( defaultClicked() ), TQT_SLOT( resetDefaults() ));
+    connect( this, TQ_SIGNAL( defaultClicked() ), TQ_SLOT( resetDefaults() ));
 }
 
 KuickConfigDialog::~KuickConfigDialog()
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
index 0f970f85..9b5aab44 100644
--- a/kuickshow/src/kuickfile.cpp
+++ b/kuickshow/src/kuickfile.cpp
@@ -86,8 +86,8 @@ bool KuickFile::download()
 
     m_job = TDEIO::file_copy( m_url, destURL, -1, true, false, false ); // handling progress ourselves
     m_job->setAutoErrorHandlingEnabled( true );
-    connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), TQT_SLOT( slotResult( TDEIO::Job * ) ));
-    connect( m_job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long )), TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ));
+    connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), TQ_SLOT( slotResult( TDEIO::Job * ) ));
+    connect( m_job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long )), TQ_SLOT( slotProgress( TDEIO::Job *, unsigned long ) ));
 
     // TODO: generify background/foreground downloading?
 
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 6e48642a..9ff903b3 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -111,7 +111,7 @@ KuickShow::KuickShow( const char *name )
     resize( 400, 500 );
 
     m_slideTimer = new TQTimer( this );
-    connect( m_slideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( nextSlide() ));
+    connect( m_slideTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( nextSlide() ));
 
 
     TDEConfig *kc = TDEGlobal::config();
@@ -231,39 +231,39 @@ void KuickShow::initGUI( const KURL& startDir )
 
     redirectDeleteAndTrashActions(coll);
 
-    connect( fileWidget, TQT_SIGNAL( fileSelected( const KFileItem * ) ),
-             this, TQT_SLOT( slotSelected( const KFileItem * ) ));
+    connect( fileWidget, TQ_SIGNAL( fileSelected( const KFileItem * ) ),
+             this, TQ_SLOT( slotSelected( const KFileItem * ) ));
 
-    connect( fileWidget, TQT_SIGNAL( fileHighlighted( const KFileItem * )),
-             this, TQT_SLOT( slotHighlighted( const KFileItem * ) ));
+    connect( fileWidget, TQ_SIGNAL( fileHighlighted( const KFileItem * )),
+             this, TQ_SLOT( slotHighlighted( const KFileItem * ) ));
 
-    connect( fileWidget, TQT_SIGNAL( urlEntered( const KURL&  )),
-             this, TQT_SLOT( dirSelected( const KURL& )) );
+    connect( fileWidget, TQ_SIGNAL( urlEntered( const KURL&  )),
+             this, TQ_SLOT( dirSelected( const KURL& )) );
 
 
     fileWidget->setAcceptDrops(true);
-    connect( fileWidget, TQT_SIGNAL( dropped( const KFileItem *, TQDropEvent *, const KURL::List & )),
-             this, TQT_SLOT( slotDropped( const KFileItem *, TQDropEvent *, const KURL::List &)) );
+    connect( fileWidget, TQ_SIGNAL( dropped( const KFileItem *, TQDropEvent *, const KURL::List & )),
+             this, TQ_SLOT( slotDropped( const KFileItem *, TQDropEvent *, const KURL::List &)) );
 
     // setup actions
-    TDEAction *open = KStdAction::open( this, TQT_SLOT( slotOpenURL() ),
+    TDEAction *open = KStdAction::open( this, TQ_SLOT( slotOpenURL() ),
                                       coll, "openURL" );
 
-    TDEAction *print = KStdAction::print( this, TQT_SLOT( slotPrint() ),
+    TDEAction *print = KStdAction::print( this, TQ_SLOT( slotPrint() ),
                                         coll, "kuick_print" );
     print->setText( i18n("Print Image...") );
 
     TDEAction *configure = new TDEAction( i18n("Configure %1...").arg( TDEGlobal::instance()->aboutData()->programName() ), "configure",
                                       TDEShortcut(),
-                                      this, TQT_SLOT( configuration() ),
+                                      this, TQ_SLOT( configuration() ),
                                       coll, "kuick_configure" );
     TDEAction *slide = new TDEAction( i18n("Start Slideshow" ), "ksslide",
                                   TDEShortcut( Key_F2 ),
-                                  this, TQT_SLOT( startSlideShow() ),
+                                  this, TQ_SLOT( startSlideShow() ),
                                   coll, "kuick_slideshow" );
     TDEAction *about = new TDEAction( i18n( "About KuickShow" ), "about",
                                   TDEShortcut(),
-                                  this, TQT_SLOT( about() ), coll, "about" );
+                                  this, TQ_SLOT( about() ), coll, "about" );
 
     oneWindowAction = new TDEToggleAction( i18n("Open Only One Image Window"),
                                          "window-new",
@@ -272,21 +272,21 @@ void KuickShow::initGUI( const KURL& startDir )
 
     m_toggleBrowserAction = new TDEToggleAction( i18n("Show File Browser"), TDEShortcut( Key_Space ), coll, "toggleBrowser" );
     m_toggleBrowserAction->setCheckedState(i18n("Hide File Browser"));
-    connect( m_toggleBrowserAction, TQT_SIGNAL( toggled( bool ) ),
-             TQT_SLOT( toggleBrowser() ));
+    connect( m_toggleBrowserAction, TQ_SIGNAL( toggled( bool ) ),
+             TQ_SLOT( toggleBrowser() ));
 
     TDEAction *showInOther = new TDEAction( i18n("Show Image"), TDEShortcut(),
-                                        this, TQT_SLOT( slotShowInOtherWindow() ),
+                                        this, TQ_SLOT( slotShowInOtherWindow() ),
                                         coll, "kuick_showInOtherWindow" );
     TDEAction *showInSame = new TDEAction( i18n("Show Image in Active Window"),
                                        TDEShortcut(),
-                                       this, TQT_SLOT( slotShowInSameWindow() ),
+                                       this, TQ_SLOT( slotShowInSameWindow() ),
                                        coll, "kuick_showInSameWindow" );
     TDEAction *showFullscreen = new TDEAction( i18n("Show Image in Fullscreen Mode"),
-					   TDEShortcut(), this, TQT_SLOT( slotShowFullscreen() ),
+					   TDEShortcut(), this, TQ_SLOT( slotShowFullscreen() ),
 					   coll, "kuick_showFullscreen" );
 
-    TDEAction *quit = KStdAction::quit( this, TQT_SLOT(slotQuit()), coll, "quit");
+    TDEAction *quit = KStdAction::quit( this, TQ_SLOT(slotQuit()), coll, "quit");
 
     // remove TQString() parameter -- ellis
     coll->readShortcutSettings( TQString() );
@@ -394,10 +394,10 @@ void KuickShow::initGUI( const KURL& startDir )
     addressToolBar->insertWidget( ID_ADDRESSBAR, 1, cmbPath);
     addressToolBar->setItemAutoSized( ID_ADDRESSBAR );
 
-    connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )),
-             this, TQT_SLOT( slotSetURL( const KURL& )));
-    connect( cmbPath, TQT_SIGNAL( returnPressed()),
-             this, TQT_SLOT( slotURLComboReturnPressed()));
+    connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )),
+             this, TQ_SLOT( slotSetURL( const KURL& )));
+    connect( cmbPath, TQ_SIGNAL( returnPressed()),
+             this, TQ_SLOT( slotURLComboReturnPressed()));
 
 
     fileWidget->initActions();
@@ -422,14 +422,14 @@ void KuickShow::redirectDeleteAndTrashActions(TDEActionCollection *coll)
     if (action)
     {
         action->disconnect(fileWidget);
-        connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotDeleteCurrentImage()));
+        connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotDeleteCurrentImage()));
     }
 
     action = coll->action("trash");
     if (action)
     {
         action->disconnect(fileWidget);
-        connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotTrashCurrentImage()));
+        connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotTrashCurrentImage()));
     }
 }
 
@@ -537,19 +537,19 @@ bool KuickShow::showImage( const KFileItem *fi,
             m_viewer->setFullscreen( fullscreen );
             s_viewers.append( m_viewer );
 
-            connect( m_viewer, TQT_SIGNAL( destroyed() ), TQT_SLOT( viewerDeleted() ));
-            connect( m_viewer, TQT_SIGNAL( sigFocusWindow( ImageWindow *) ),
-                     this, TQT_SLOT( slotSetActiveViewer( ImageWindow * ) ));
-            connect( m_viewer, TQT_SIGNAL( sigImageError(const KuickFile *, const TQString& ) ),
-                     this, TQT_SLOT( messageCantLoadImage(const KuickFile *, const TQString &) ));
-            connect( m_viewer, TQT_SIGNAL( requestImage( ImageWindow *, int )),
-                     this, TQT_SLOT( slotAdvanceImage( ImageWindow *, int )));
-	    connect( m_viewer, TQT_SIGNAL( pauseSlideShowSignal() ),
-		     this, TQT_SLOT( pauseSlideShow() ) );
-            connect( m_viewer, TQT_SIGNAL (deleteImage (ImageWindow *)),
-                     this, TQT_SLOT (slotDeleteCurrentImage (ImageWindow *)));
-            connect( m_viewer, TQT_SIGNAL (trashImage (ImageWindow *)),
-                     this, TQT_SLOT (slotTrashCurrentImage (ImageWindow *)));
+            connect( m_viewer, TQ_SIGNAL( destroyed() ), TQ_SLOT( viewerDeleted() ));
+            connect( m_viewer, TQ_SIGNAL( sigFocusWindow( ImageWindow *) ),
+                     this, TQ_SLOT( slotSetActiveViewer( ImageWindow * ) ));
+            connect( m_viewer, TQ_SIGNAL( sigImageError(const KuickFile *, const TQString& ) ),
+                     this, TQ_SLOT( messageCantLoadImage(const KuickFile *, const TQString &) ));
+            connect( m_viewer, TQ_SIGNAL( requestImage( ImageWindow *, int )),
+                     this, TQ_SLOT( slotAdvanceImage( ImageWindow *, int )));
+	    connect( m_viewer, TQ_SIGNAL( pauseSlideShowSignal() ),
+		     this, TQ_SLOT( pauseSlideShow() ) );
+            connect( m_viewer, TQ_SIGNAL (deleteImage (ImageWindow *)),
+                     this, TQ_SLOT (slotDeleteCurrentImage (ImageWindow *)));
+            connect( m_viewer, TQ_SIGNAL (trashImage (ImageWindow *)),
+                     this, TQ_SLOT (slotTrashCurrentImage (ImageWindow *)));
             if ( s_viewers.count() == 1 && moveToTopLeft ) {
                 // we have to move to 0x0 before showing _and_
                 // after showing, otherwise we get some bogus geometry()
@@ -698,7 +698,7 @@ void KuickShow::tryShowNextImage()
         if (!haveBrowser())
         {
             // ### when simply calling toggleBrowser(), this main window is completely messed up
-            TQTimer::singleShot(0, this, TQT_SLOT(toggleBrowser()));
+            TQTimer::singleShot(0, this, TQ_SLOT(toggleBrowser()));
         }
         m_viewer->deleteLater();
     }
@@ -952,7 +952,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
                         if ( fileWidget->dirLister()->rootItem() )
                         {
                             fileWidget->setCurrentItem( file->url().fileName() );
-                            TQTimer::singleShot( 0, this, TQT_SLOT( slotReplayEvent()));
+                            TQTimer::singleShot( 0, this, TQ_SLOT( slotReplayEvent()));
                         }
                         else // finished, but no root-item -- probably an error, kill repeat-item!
                         {
@@ -962,8 +962,8 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e )
                     else // not finished yet
                     {
                         fileWidget->setInitialItem( file->url().fileName() );
-                        connect( fileWidget, TQT_SIGNAL( finished() ),
-                                 TQT_SLOT( slotReplayEvent() ));
+                        connect( fileWidget, TQ_SIGNAL( finished() ),
+                                 TQ_SLOT( slotReplayEvent() ));
                     }
 
                     return true;
@@ -1081,12 +1081,12 @@ void KuickShow::configuration()
     dialog->resize( 540, 510 );
     dialog->setIcon( kapp->miniIcon() );
 
-    connect( dialog, TQT_SIGNAL( okClicked() ),
-             this, TQT_SLOT( slotConfigApplied() ) );
-    connect( dialog, TQT_SIGNAL( applyClicked() ),
-             this, TQT_SLOT( slotConfigApplied() ) );
-    connect( dialog, TQT_SIGNAL( finished() ),
-             this, TQT_SLOT( slotConfigClosed() ) );
+    connect( dialog, TQ_SIGNAL( okClicked() ),
+             this, TQ_SLOT( slotConfigApplied() ) );
+    connect( dialog, TQ_SIGNAL( applyClicked() ),
+             this, TQ_SLOT( slotConfigApplied() ) );
+    connect( dialog, TQ_SIGNAL( finished() ),
+             this, TQ_SLOT( slotConfigClosed() ) );
 
     fileWidget->actionCollection()->action( "kuick_configure" )->setEnabled( false );
     dialog->show();
@@ -1294,8 +1294,8 @@ void KuickShow::abortDelayedEvent()
 
 void KuickShow::slotReplayEvent()
 {
-    disconnect( fileWidget, TQT_SIGNAL( finished() ),
-                this, TQT_SLOT( slotReplayEvent() ));
+    disconnect( fileWidget, TQ_SIGNAL( finished() ),
+                this, TQ_SLOT( slotReplayEvent() ));
 
     DelayedRepeatEvent *e = m_delayedRepeatItem;
     m_delayedRepeatItem = 0L; // otherwise, eventFilter aborts
@@ -1346,13 +1346,13 @@ void KuickShow::delayAction(DelayedRepeatEvent *event)
          fileWidget->dirLister()->rootItem() )
     {
         fileWidget->setCurrentItem( url.fileName() );
-        TQTimer::singleShot( 0, this, TQT_SLOT( doReplay()));
+        TQTimer::singleShot( 0, this, TQ_SLOT( doReplay()));
     }
     else
     {
         fileWidget->setInitialItem( url.fileName() );
-        connect( fileWidget, TQT_SIGNAL( finished() ),
-                 TQT_SLOT( doReplay() ));
+        connect( fileWidget, TQ_SIGNAL( finished() ),
+                 TQ_SLOT( doReplay() ));
     }
 }
 
@@ -1361,8 +1361,8 @@ void KuickShow::doReplay()
     if (!m_delayedRepeatItem)
         return;
 
-    disconnect( fileWidget, TQT_SIGNAL( finished() ),
-                this, TQT_SLOT( doReplay() ));
+    disconnect( fileWidget, TQ_SIGNAL( finished() ),
+                this, TQ_SLOT( doReplay() ));
 
     switch (m_delayedRepeatItem->action)
     {
@@ -1424,7 +1424,7 @@ void KuickShow::deleteAllViewers()
 {
     TQValueListIterator<ImageWindow*> it = s_viewers.begin();
     for ( ; it != s_viewers.end(); ++it ) {
-        (*it)->disconnect( TQT_SIGNAL( destroyed() ), this, TQT_SLOT( viewerDeleted() ));
+        (*it)->disconnect( TQ_SIGNAL( destroyed() ), this, TQ_SLOT( viewerDeleted() ));
         (*it)->close( true );
     }
 
diff --git a/kuickshow/src/kurlwidget.cpp b/kuickshow/src/kurlwidget.cpp
index 342c78c5..4cab4a79 100644
--- a/kuickshow/src/kurlwidget.cpp
+++ b/kuickshow/src/kurlwidget.cpp
@@ -27,7 +27,7 @@ KURLWidget::KURLWidget(const TQString& text, TQWidget *parent, const char *name)
     : KURLLabel( parent, name )
 {
     setText( text );
-    connect( this, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( run() ));
+    connect( this, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( run() ));
     setUseTips( true );
 }
 
diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp
index feefec43..3146370e 100644
--- a/kuickshow/src/printing.cpp
+++ b/kuickshow/src/printing.cpp
@@ -229,7 +229,7 @@ KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name )
     m_scale->setEnabled( false ); // ###
     grid->addMultiCellWidget( m_scale, 0, 0, 0, 1 );
     group->insert( m_scale );
-    connect( m_scale, TQT_SIGNAL( toggled( bool )), TQT_SLOT( toggleScaling( bool )));
+    connect( m_scale, TQ_SIGNAL( toggled( bool )), TQ_SLOT( toggleScaling( bool )));
 
     m_units = new KComboBox( false, widget, "unit combobox" );
     grid->addWidget( m_units, 0, 2, AlignLeft );