Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

9 files changed, 68 insertions, 68 deletions

diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp
index 7ff421d..0c20264 100644
--- a/src/app/historyAction.cpp
+++ b/src/app/historyAction.cpp
@@ -46,8 +46,8 @@ HistoryCollection::HistoryCollection( TDEActionCollection *ac, TQObject *parent,
         , m_f( new HistoryAction( i18n( "Forward" ), "forward",  TDEStdAccel::forward(), ac, "go_forward" ) )
         , m_receiver( 0 )
 {
-    connect( m_b, TQT_SIGNAL(activated()), TQT_SLOT(pop()) );
-    connect( m_f, TQT_SIGNAL(activated()), TQT_SLOT(pop()) );
+    connect( m_b, TQ_SIGNAL(activated()), TQ_SLOT(pop()) );
+    connect( m_f, TQ_SIGNAL(activated()), TQ_SLOT(pop()) );
 }
 
 void
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index fc855dd..d1ae91f 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -57,13 +57,13 @@ MainWindow::MainWindow()
         KMessageBox::error( this, i18n("Filelight is not installed properly, consequently its menus and toolbars will appear reduced or even empty") );
     delete buttons;
 
-    connect( m_part, TQT_SIGNAL(started( TDEIO::Job* )), TQT_SLOT(scanStarted()) );
-    connect( m_part, TQT_SIGNAL(completed()), TQT_SLOT(scanCompleted()) );
-    connect( m_part, TQT_SIGNAL(canceled( const TQString& )), TQT_SLOT(scanFailed()) );
+    connect( m_part, TQ_SIGNAL(started( TDEIO::Job* )), TQ_SLOT(scanStarted()) );
+    connect( m_part, TQ_SIGNAL(completed()), TQ_SLOT(scanCompleted()) );
+    connect( m_part, TQ_SIGNAL(canceled( const TQString& )), TQ_SLOT(scanFailed()) );
 
     //TODO test these
-    connect( m_part, TQT_SIGNAL(canceled( const TQString& )), m_histories, TQT_SLOT(stop()) );
-    connect( BrowserExtension::childObject( m_part ), TQT_SIGNAL(openURLNotify()), TQT_SLOT(urlAboutToChange()) );
+    connect( m_part, TQ_SIGNAL(canceled( const TQString& )), m_histories, TQ_SLOT(stop()) );
+    connect( BrowserExtension::childObject( m_part ), TQ_SIGNAL(openURLNotify()), TQ_SLOT(urlAboutToChange()) );
 
     TDEConfig* const config = TDEGlobal::config();
     config->setGroup( "general" );
@@ -82,18 +82,18 @@ MainWindow::setupActions() //singleton function
     m_combo->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
     m_combo->setDuplicatesEnabled( false );
 
-    KStdAction::open( this, TQT_SLOT(slotScanDirectory()), ac, "scan_directory" );
-    KStdAction::quit( this, TQT_SLOT(close()), ac );
-    KStdAction::up( this, TQT_SLOT(slotUp()), ac );
-    KStdAction::configureToolbars(this, TQT_SLOT(configToolbars()), ac);
-    KStdAction::keyBindings(this, TQT_SLOT(configKeys()), ac);
+    KStdAction::open( this, TQ_SLOT(slotScanDirectory()), ac, "scan_directory" );
+    KStdAction::quit( this, TQ_SLOT(close()), ac );
+    KStdAction::up( this, TQ_SLOT(slotUp()), ac );
+    KStdAction::configureToolbars(this, TQ_SLOT(configToolbars()), ac);
+    KStdAction::keyBindings(this, TQ_SLOT(configKeys()), ac);
 
-    new TDEAction( i18n( "Scan &Home Directory" ), "folder_home", CTRL+Key_Home, this, TQT_SLOT(slotScanHomeDirectory()), ac, "scan_home" );
-    new TDEAction( i18n( "Scan &Root Directory" ), "folder_red", 0, this, TQT_SLOT(slotScanRootDirectory()), ac, "scan_root" );
-    new TDEAction( i18n( "Rescan" ), "reload", TDEStdAccel::reload(), m_part, TQT_SLOT(rescan()), ac, "scan_rescan" );
-    new TDEAction( i18n( "Stop" ), "process-stop", TQt::Key_Escape, this, TQT_SLOT(slotAbortScan()), ac, "scan_stop" );
-    new TDEAction( i18n( "Clear Location Bar" ), TDEApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, m_combo, TQT_SLOT(clearEdit()), ac, "clear_location" );
-    new TDEAction( i18n( "Go" ), "key_enter", 0, m_combo, TQT_SIGNAL(returnPressed()), ac, "go" );
+    new TDEAction( i18n( "Scan &Home Directory" ), "folder_home", CTRL+Key_Home, this, TQ_SLOT(slotScanHomeDirectory()), ac, "scan_home" );
+    new TDEAction( i18n( "Scan &Root Directory" ), "folder_red", 0, this, TQ_SLOT(slotScanRootDirectory()), ac, "scan_root" );
+    new TDEAction( i18n( "Rescan" ), "reload", TDEStdAccel::reload(), m_part, TQ_SLOT(rescan()), ac, "scan_rescan" );
+    new TDEAction( i18n( "Stop" ), "process-stop", TQt::Key_Escape, this, TQ_SLOT(slotAbortScan()), ac, "scan_stop" );
+    new TDEAction( i18n( "Clear Location Bar" ), TDEApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, m_combo, TQ_SLOT(clearEdit()), ac, "clear_location" );
+    new TDEAction( i18n( "Go" ), "key_enter", 0, m_combo, TQ_SIGNAL(returnPressed()), ac, "go" );
 
     KWidgetAction *combo = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, 0, 0, ac, "location_bar" );
     m_recentScans = new TDERecentFilesAction( i18n( "&Recent Scans" ), 0, ac, "scan_recent", 8 );
@@ -103,9 +103,9 @@ MainWindow::setupActions() //singleton function
     m_recentScans->loadEntries( TDEGlobal::config() );
     combo->setAutoSized( true ); //FIXME what does this do?
 
-    connect( m_recentScans, TQT_SIGNAL(urlSelected( const KURL& )), TQT_SLOT(slotScanUrl( const KURL& )) );
-    connect( m_combo, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotComboScan()) );
-    connect( m_histories, TQT_SIGNAL(activated( const KURL& )), TQT_SLOT(slotScanUrl( const KURL& )) );
+    connect( m_recentScans, TQ_SIGNAL(urlSelected( const KURL& )), TQ_SLOT(slotScanUrl( const KURL& )) );
+    connect( m_combo, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotComboScan()) );
+    connect( m_histories, TQ_SIGNAL(activated( const KURL& )), TQ_SLOT(slotScanUrl( const KURL& )) );
 }
 
 bool
diff --git a/src/part/part.cpp b/src/part/part.cpp
index ee020f6..2d291cc 100644
--- a/src/part/part.cpp
+++ b/src/part/part.cpp
@@ -57,22 +57,22 @@ Part::Part( TQWidget *parentWidget, const char *widgetName, TQObject *parent, co
     m_map = new RadialMap::Widget( widget() );
     m_map->hide();
 
-    KStdAction::zoomIn( m_map, TQT_SLOT(zoomIn()), actionCollection() );
-    KStdAction::zoomOut( m_map, TQT_SLOT(zoomOut()), actionCollection() );
-    KStdAction::preferences( this, TQT_SLOT(configFilelight()), actionCollection(), "configure_filelight" )->setText( i18n( "Configure Filelight..." ) );
+    KStdAction::zoomIn( m_map, TQ_SLOT(zoomIn()), actionCollection() );
+    KStdAction::zoomOut( m_map, TQ_SLOT(zoomOut()), actionCollection() );
+    KStdAction::preferences( this, TQ_SLOT(configFilelight()), actionCollection(), "configure_filelight" )->setText( i18n( "Configure Filelight..." ) );
 
-    connect( m_map, TQT_SIGNAL(created( const Directory* )), TQT_SIGNAL(completed()) );
-    connect( m_map, TQT_SIGNAL(created( const Directory* )), TQT_SLOT(mapChanged( const Directory* )) );
-    connect( m_map, TQT_SIGNAL(activated( const KURL& )), TQT_SLOT(updateURL( const KURL& )) );
+    connect( m_map, TQ_SIGNAL(created( const Directory* )), TQ_SIGNAL(completed()) );
+    connect( m_map, TQ_SIGNAL(created( const Directory* )), TQ_SLOT(mapChanged( const Directory* )) );
+    connect( m_map, TQ_SIGNAL(activated( const KURL& )), TQ_SLOT(updateURL( const KURL& )) );
 
     // TODO make better system
-    connect( m_map, TQT_SIGNAL(giveMeTreeFor( const KURL& )), TQT_SLOT(updateURL( const KURL& )) );
-    connect( m_map, TQT_SIGNAL(giveMeTreeFor( const KURL& )), TQT_SLOT(openURL( const KURL& )) );
+    connect( m_map, TQ_SIGNAL(giveMeTreeFor( const KURL& )), TQ_SLOT(updateURL( const KURL& )) );
+    connect( m_map, TQ_SIGNAL(giveMeTreeFor( const KURL& )), TQ_SLOT(openURL( const KURL& )) );
 
-    connect( m_manager, TQT_SIGNAL(completed( Directory* )), TQT_SLOT(scanCompleted( Directory* )) );
-    connect( m_manager, TQT_SIGNAL(aboutToEmptyCache()), m_map, TQT_SLOT(invalidate()) );
+    connect( m_manager, TQ_SIGNAL(completed( Directory* )), TQ_SLOT(scanCompleted( Directory* )) );
+    connect( m_manager, TQ_SIGNAL(aboutToEmptyCache()), m_map, TQ_SLOT(invalidate()) );
 
-    TQTimer::singleShot( 0, this, TQT_SLOT(postInit()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(postInit()) );
 }
 
 void
@@ -81,7 +81,7 @@ Part::postInit()
    if( m_url.isEmpty() ) //if url is not empty openURL() has been called immediately after ctor, which happens
    {
       TQWidget *summary = new SummaryWidget( widget(), "summaryWidget" );
-      connect( summary, TQT_SIGNAL(activated( const KURL& )), TQT_SLOT(openURL( const KURL& )) );
+      connect( summary, TQ_SIGNAL(activated( const KURL& )), TQ_SLOT(openURL( const KURL& )) );
       summary->show();
 
       //FIXME KXMLGUI is b0rked, it should allow us to set this
@@ -167,8 +167,8 @@ Part::configFilelight()
 {
     TQWidget *dialog = new SettingsDialog( widget(), "settings_dialog" );
 
-    connect( dialog, TQT_SIGNAL(canvasIsDirty( int )), m_map, TQT_SLOT(refresh( int )) );
-    connect( dialog, TQT_SIGNAL(mapIsInvalid()), m_manager, TQT_SLOT(emptyCache()) );
+    connect( dialog, TQ_SIGNAL(canvasIsDirty( int )), m_map, TQ_SLOT(refresh( int )) );
+    connect( dialog, TQ_SIGNAL(mapIsInvalid()), m_manager, TQ_SLOT(emptyCache()) );
 
     dialog->show(); //deletes itself
 }
@@ -184,8 +184,8 @@ Part::start( const KURL &url )
 {
    if( !m_started ) {
       m_statusbar->addStatusBarItem( new ProgressBox( statusBar(), this ), 0, true );
-      connect( m_map, TQT_SIGNAL(mouseHover( const TQString& )), statusBar(), TQT_SLOT(message( const TQString& )) );
-      connect( m_map, TQT_SIGNAL(created( const Directory* )), statusBar(), TQT_SLOT(clear()) );
+      connect( m_map, TQ_SIGNAL(mouseHover( const TQString& )), statusBar(), TQ_SLOT(message( const TQString& )) );
+      connect( m_map, TQ_SIGNAL(created( const Directory* )), statusBar(), TQ_SLOT(clear()) );
       m_started = true;
    }
 
@@ -230,7 +230,7 @@ Part::scanCompleted( Directory *tree )
       emit setWindowCaption( TQString() );
 
       statusBar()->clear();
-//      TQTimer::singleShot( 2000, statusBar(), TQT_SLOT(clear()) );
+//      TQTimer::singleShot( 2000, statusBar(), TQ_SLOT(clear()) );
 
       m_url = KURL();
    }
diff --git a/src/part/progressBox.cpp b/src/part/progressBox.cpp
index 2b0d093..ba8fef5 100644
--- a/src/part/progressBox.cpp
+++ b/src/part/progressBox.cpp
@@ -22,10 +22,10 @@ ProgressBox::ProgressBox( TQWidget *parent, TQObject *part )
    setText( 999999 );
    setMinimumWidth( sizeHint().width() );
 
-   connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(report()) );
-   connect( part, TQT_SIGNAL(started( TDEIO::Job* )), TQT_SLOT(start()) );
-   connect( part, TQT_SIGNAL(completed()), TQT_SLOT(stop()) );
-   connect( part, TQT_SIGNAL(canceled( const TQString& )), TQT_SLOT(halt()) );
+   connect( &m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(report()) );
+   connect( part, TQ_SIGNAL(started( TDEIO::Job* )), TQ_SLOT(start()) );
+   connect( part, TQ_SIGNAL(completed()), TQ_SLOT(stop()) );
+   connect( part, TQ_SIGNAL(canceled( const TQString& )), TQ_SLOT(halt()) );
 }
 
 void
@@ -53,7 +53,7 @@ ProgressBox::halt()
 {
    // canceled by stop button
    m_timer.stop();
-   TQTimer::singleShot( 2000, this, TQT_SLOT(hide()) );
+   TQTimer::singleShot( 2000, this, TQ_SLOT(hide()) );
 }
 
 void
diff --git a/src/part/radialMap/widget.cpp b/src/part/radialMap/widget.cpp
index 7534998..f2e20f7 100644
--- a/src/part/radialMap/widget.cpp
+++ b/src/part/radialMap/widget.cpp
@@ -28,9 +28,9 @@ RadialMap::Widget::Widget( TQWidget *parent, const char *name )
    const TQBitmap *cursor = KCursor::handCursor().bitmap();
    m_tip = new SegmentTip(cursor ? cursor->height() : 16);
 
-   connect( this, TQT_SIGNAL(created( const Directory* )), TQT_SLOT(sendFakeMouseEvent()) );
-   connect( this, TQT_SIGNAL(created( const Directory* )), TQT_SLOT(update()) );
-   connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(resizeTimeout()) );
+   connect( this, TQ_SIGNAL(created( const Directory* )), TQ_SLOT(sendFakeMouseEvent()) );
+   connect( this, TQ_SIGNAL(created( const Directory* )), TQ_SLOT(update()) );
+   connect( &m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(resizeTimeout()) );
 }
 
 TQString
diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp
index 1ad7f6d..863f906 100644
--- a/src/part/radialMap/widgetEvents.cpp
+++ b/src/part/radialMap/widgetEvents.cpp
@@ -213,7 +213,7 @@ RadialMap::Widget::mousePressEvent( TQMouseEvent *e )
                 if (userIntention == KMessageBox::Continue) {
                     TDEIO::Job *job = TDEIO::del( url );
                     job->setWindow( this );
-                    connect( job, TQT_SIGNAL(result( TDEIO::Job* )), TQT_SLOT(deleteJobFinished( TDEIO::Job* )) );
+                    connect( job, TQ_SIGNAL(result( TDEIO::Job* )), TQ_SLOT(deleteJobFinished( TDEIO::Job* )) );
                     TQApplication::setOverrideCursor( KCursor::workingCursor() );
                 }
             }
diff --git a/src/part/remoteLister.cpp b/src/part/remoteLister.cpp
index b57fcfd..dc2d04f 100644
--- a/src/part/remoteLister.cpp
+++ b/src/part/remoteLister.cpp
@@ -70,9 +70,9 @@ namespace Filelight
       setShowingDotFiles( true ); //stupid KDirLister API function names
       setMainWindow( parent );
 
-      //use TQT_SIGNAL(result(TDEIO::Job*)) instead and then use Job::error()
-      connect( this, TQT_SIGNAL(completed()), TQT_SLOT(completed()) );
-      connect( this, TQT_SIGNAL(canceled()), TQT_SLOT(canceled()) );
+      //use TQ_SIGNAL(result(TDEIO::Job*)) instead and then use Job::error()
+      connect( this, TQ_SIGNAL(completed()), TQ_SLOT(completed()) );
+      connect( this, TQ_SIGNAL(canceled()), TQ_SLOT(canceled()) );
 
       //we do this non-recursively - it is the only way!
       openURL( url );
@@ -97,7 +97,7 @@ namespace Filelight
       //as usual KDE documentation didn't suggest I needed to do this at all
       //I had to figure it out myself
       // -- avoid crash
-      TQTimer::singleShot( 0, this, TQT_SLOT(_completed()) );
+      TQTimer::singleShot( 0, this, TQ_SLOT(_completed()) );
    }
 
    void
@@ -105,7 +105,7 @@ namespace Filelight
    {
       debug() << "canceled: " << url().prettyURL() << endl;
 
-      TQTimer::singleShot( 0, this, TQT_SLOT(_completed()) );
+      TQTimer::singleShot( 0, this, TQ_SLOT(_completed()) );
    }
 
    void
diff --git a/src/part/settingsDialog.cpp b/src/part/settingsDialog.cpp
index fe408a7..aac6d88 100644
--- a/src/part/settingsDialog.cpp
+++ b/src/part/settingsDialog.cpp
@@ -30,26 +30,26 @@ SettingsDialog::SettingsDialog( TQWidget *parent, const char *name )
     //read in settings before you make all those nasty connections!
     reset(); //makes dialog reflect global settings
 
-    connect( &m_timer, TQT_SIGNAL(timeout()), TQT_SIGNAL(mapIsInvalid()) );
+    connect( &m_timer, TQ_SIGNAL(timeout()), TQ_SIGNAL(mapIsInvalid()) );
 
-    connect( m_addButton,    TQT_SIGNAL( clicked() ), TQT_SLOT( addDirectory() ) );
-    connect( m_removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeDirectory() ) );
-    connect( m_resetButton,  TQT_SIGNAL( clicked() ), TQT_SLOT( reset() ) );
-    connect( m_closeButton,  TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) );
+    connect( m_addButton,    TQ_SIGNAL( clicked() ), TQ_SLOT( addDirectory() ) );
+    connect( m_removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeDirectory() ) );
+    connect( m_resetButton,  TQ_SIGNAL( clicked() ), TQ_SLOT( reset() ) );
+    connect( m_closeButton,  TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) );
 
-    connect( colourSchemeGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(changeScheme( int )) );
-    connect( contrastSlider, TQT_SIGNAL(valueChanged( int )), TQT_SLOT(changeContrast( int )) );
-    connect( contrastSlider, TQT_SIGNAL(sliderReleased()), TQT_SLOT(slotSliderReleased()) );
+    connect( colourSchemeGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(changeScheme( int )) );
+    connect( contrastSlider, TQ_SIGNAL(valueChanged( int )), TQ_SLOT(changeContrast( int )) );
+    connect( contrastSlider, TQ_SIGNAL(sliderReleased()), TQ_SLOT(slotSliderReleased()) );
 
-    connect( scanAcrossMounts,       TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( startTimer() ) );
-    connect( dontScanRemoteMounts,   TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( startTimer() ) );
-    connect( dontScanRemovableMedia, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( startTimer() ) );
+    connect( scanAcrossMounts,       TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( startTimer() ) );
+    connect( dontScanRemoteMounts,   TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( startTimer() ) );
+    connect( dontScanRemovableMedia, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( startTimer() ) );
 
-    connect( useAntialiasing,    TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleUseAntialiasing( bool ) ) );
-    connect( varyLabelFontSizes, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleVaryLabelFontSizes( bool ) ) );
-    connect( showSmallFiles,     TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( toggleShowSmallFiles( bool ) ) );
+    connect( useAntialiasing,    TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleUseAntialiasing( bool ) ) );
+    connect( varyLabelFontSizes, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleVaryLabelFontSizes( bool ) ) );
+    connect( showSmallFiles,     TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( toggleShowSmallFiles( bool ) ) );
 
-    connect( minFontPitch, TQT_SIGNAL ( valueChanged( int ) ), TQT_SLOT( changeMinFontPitch( int ) ) );
+    connect( minFontPitch, TQ_SIGNAL ( valueChanged( int ) ), TQ_SLOT( changeMinFontPitch( int ) ) );
 
     m_addButton->setIconSet( SmallIcon( "document-open" ) );
     m_resetButton->setIconSet( SmallIcon( "edit-undo" ) );
diff --git a/src/part/summaryWidget.cpp b/src/part/summaryWidget.cpp
index ad9c093..00f1934 100644
--- a/src/part/summaryWidget.cpp
+++ b/src/part/summaryWidget.cpp
@@ -134,7 +134,7 @@ SummaryWidget::createDiskMaps()
 
         map->create( tree ); //must be done when visible
 
-        connect( map, TQT_SIGNAL(activated( const KURL& )), TQT_SIGNAL(activated( const KURL& )) );
+        connect( map, TQ_SIGNAL(activated( const KURL& )), TQ_SIGNAL(activated( const KURL& )) );
     }
 }