Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ed7858de3a395180d6ec0c03d8358610b36938ea)

13 files changed, 101 insertions, 101 deletions

diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp
index c28d49f..48fd9de 100644
--- a/kdat/ArchiveInfoWidget.cpp
+++ b/kdat/ArchiveInfoWidget.cpp
@@ -88,8 +88,8 @@ ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name )
     l1_4->addStretch( 1 );
     l1_4->addWidget( _apply );
 
-    connect( _archiveName, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotTextChanged( const TQString& ) ) );
-    connect( _apply      , TQT_SIGNAL( clicked() )                 , this, TQT_SLOT( slotApply() ) );
+    connect( _archiveName, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotTextChanged( const TQString& ) ) );
+    connect( _apply      , TQ_SIGNAL( clicked() )                 , this, TQ_SLOT( slotApply() ) );
 }
 
 ArchiveInfoWidget::~ArchiveInfoWidget()
diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index 834567e..752c643 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -132,17 +132,17 @@ BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir,
 
     _ok = new KPushButton( KStdGuiItem::ok(), this );
     _ok->setFixedSize( 80, _ok->sizeHint().height() );
-    connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
+    connect( _ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOK() ) );
     _ok->setEnabled( FALSE );
 
     _save = new TQPushButton( i18n( "Save Log..." ), this );
     _save->setFixedSize( 80, _save->sizeHint().height() );
-    connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
+    connect( _save, TQ_SIGNAL( clicked() ), _log, TQ_SLOT( save() ) );
     _save->setEnabled( FALSE );
 
     _abort = new KPushButton( KStdGuiItem::cancel(), this );
     _abort->setFixedSize( 80, _abort->sizeHint().height() );
-    connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
+    connect( _abort, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbort() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
 
@@ -214,7 +214,7 @@ void BackupDlg::show()
     }
 
     _tarParser = new TarParser();
-    connect( _tarParser, TQT_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQT_SLOT( slotEntry( const TQString &, int, int, int ) ) );
+    connect( _tarParser, TQ_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQ_SLOT( slotEntry( const TQString &, int, int, int ) ) );
 
     _proc = new TDEProcess();
     *_proc << Options::instance()->getTarCommand();
@@ -281,8 +281,8 @@ void BackupDlg::show()
         return;
     }          
 
-    connect( _proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
-    connect( _proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotStdout( TDEProcess*, char*, int ) ) );
+    connect( _proc, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) );
+    connect( _proc, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotStdout( TDEProcess*, char*, int ) ) );
 
     startTimer( 1000 );
 
diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp
index 23dc6d2..3a5e6c0 100644
--- a/kdat/BackupOptDlg.cpp
+++ b/kdat/BackupOptDlg.cpp
@@ -43,10 +43,10 @@ BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, cons
 
     KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this );
     ok->setFixedSize( 80, ok->sizeHint().height() );
-    connect( ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
+    connect( ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) );
     KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this );
     cancel->setFixedSize( 80, ok->sizeHint().height() );
-    connect( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
+    connect( cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
     l1->addWidget( _profile, 1 );
diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp
index 3b347d3..07f7c35 100644
--- a/kdat/BackupProfileInfoWidget.cpp
+++ b/kdat/BackupProfileInfoWidget.cpp
@@ -77,11 +77,11 @@ BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char*
     l1_2->addStretch( 1 );
     l1_2->addWidget( _apply );
 
-    connect( setSelection, TQT_SIGNAL( clicked() )                 , this, TQT_SLOT( slotSetSelection() ) );
-    connect( getSelection, TQT_SIGNAL( clicked() )                 , this, TQT_SLOT( slotGetSelection() ) );
-    connect( _name       , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
-    connect( _profile    , TQT_SIGNAL( sigSomethingChanged() )     , this, TQT_SLOT( slotSomethingChanged() ) );
-    connect( _apply      , TQT_SIGNAL( clicked() )                 , this, TQT_SLOT( slotApply() ) );
+    connect( setSelection, TQ_SIGNAL( clicked() )                 , this, TQ_SLOT( slotSetSelection() ) );
+    connect( getSelection, TQ_SIGNAL( clicked() )                 , this, TQ_SLOT( slotGetSelection() ) );
+    connect( _name       , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
+    connect( _profile    , TQ_SIGNAL( sigSomethingChanged() )     , this, TQ_SLOT( slotSomethingChanged() ) );
+    connect( _apply      , TQ_SIGNAL( clicked() )                 , this, TQ_SLOT( slotApply() ) );
 }
 
 BackupProfileInfoWidget::~BackupProfileInfoWidget()
diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp
index 2675adf..7a80b29 100644
--- a/kdat/BackupProfileWidget.cpp
+++ b/kdat/BackupProfileWidget.cpp
@@ -64,7 +64,7 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
 
     _incremental = new TQCheckBox( i18n( "GNU listed incremental" ), two );
     _incremental->setFixedHeight( _incremental->sizeHint().height() );
-    connect( _incremental, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIncrementalToggled( bool ) ) );
+    connect( _incremental, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIncrementalToggled( bool ) ) );
 
     _snapshotLabel = new TQLabel( i18n( "Snapshot file:" ), two );
     _snapshotLabel->setFixedSize( _snapshotLabel->sizeHint() );
@@ -109,12 +109,12 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name )
 
     l2->addStretch( 1 );
 
-    connect( _archiveName   , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
-    connect( _workingDir    , TQT_SIGNAL( activated( const TQString & ) )  , this, TQT_SLOT( slotWorkingDirActivated( const TQString & ) ) );
-    connect( _oneFilesystem , TQT_SIGNAL( toggled( bool ) )           , this, TQT_SLOT( slotToggled( bool ) ) );
-    connect( _incremental   , TQT_SIGNAL( toggled( bool ) )           , this, TQT_SLOT( slotIncrementalToggled( bool ) ) );
-    connect( _snapshotFile  , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
-    connect( _removeSnapshot, TQT_SIGNAL( toggled( bool ) )           , this, TQT_SLOT( slotToggled( bool ) ) );
+    connect( _archiveName   , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
+    connect( _workingDir    , TQ_SIGNAL( activated( const TQString & ) )  , this, TQ_SLOT( slotWorkingDirActivated( const TQString & ) ) );
+    connect( _oneFilesystem , TQ_SIGNAL( toggled( bool ) )           , this, TQ_SLOT( slotToggled( bool ) ) );
+    connect( _incremental   , TQ_SIGNAL( toggled( bool ) )           , this, TQ_SLOT( slotIncrementalToggled( bool ) ) );
+    connect( _snapshotFile  , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
+    connect( _removeSnapshot, TQ_SIGNAL( toggled( bool ) )           , this, TQ_SLOT( slotToggled( bool ) ) );
 }
 
 BackupProfileWidget::~BackupProfileWidget()
diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp
index 14be994..ec67426 100644
--- a/kdat/FormatOptDlg.cpp
+++ b/kdat/FormatOptDlg.cpp
@@ -94,9 +94,9 @@ FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char*
     _entry->setFocus();
     _entry->selectAll();
 
-    connect( _entry, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( okClicked() ) );
-    connect( ok    , TQT_SIGNAL( clicked() )      , this, TQT_SLOT( okClicked() ) );
-    connect( cancel, TQT_SIGNAL( clicked() )      , this, TQT_SLOT( reject() ) );
+    connect( _entry, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( okClicked() ) );
+    connect( ok    , TQ_SIGNAL( clicked() )      , this, TQ_SLOT( okClicked() ) );
+    connect( cancel, TQ_SIGNAL( clicked() )      , this, TQ_SLOT( reject() ) );
 
     int size = Options::instance()->getDefaultTapeSize();
     if ( ( size >= 1024*1024 ) && ( size % ( 1024*1024 ) == 0 ) ) {
diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index 2cfedcf..b7abf1d 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -109,17 +109,17 @@ IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name )
 
     _ok = new KPushButton( KStdGuiItem::ok(), this );
     _ok->setFixedSize( 80, _ok->sizeHint().height() );
-    connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
+    connect( _ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOK() ) );
     _ok->setEnabled( FALSE );
 
     _save = new TQPushButton( i18n( "Save Log..." ), this );
     _save->setFixedSize( 80, _save->sizeHint().height() );
-    connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
+    connect( _save, TQ_SIGNAL( clicked() ), _log, TQ_SLOT( save() ) );
     _save->setEnabled( FALSE );
 
     _abort = new TQPushButton( i18n( "Abort" ), this );
     _abort->setFixedSize( 80, _abort->sizeHint().height() );
-    connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
+    connect( _abort, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbort() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
 
@@ -263,7 +263,7 @@ void IndexDlg::timerEvent( TQTimerEvent* )
 
         delete _tarParser;
         _tarParser = new TarParser();
-        connect( _tarParser, TQT_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQT_SLOT( slotEntry( const TQString &, int, int, int ) ) );
+        connect( _tarParser, TQ_SIGNAL( sigEntry( const TQString &, int, int, int ) ), this, TQ_SLOT( slotEntry( const TQString &, int, int, int ) ) );
 
         int endBlock = 0;
         int leftover = 0;
diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp
index 8e5e2a1..d47144f 100644
--- a/kdat/KDatMainWindow.cpp
+++ b/kdat/KDatMainWindow.cpp
@@ -98,55 +98,55 @@ KDatMainWindow::KDatMainWindow()
 
     // Create object popup menus.
     _tapeDriveMenu = new TQPopupMenu();
-    _tapeDriveMenu->insertItem( i18n( "Mount Tape" )         , this, TQT_SLOT( fileMountTape() ) );
-    _tapeDriveMenu->insertItem( i18n( "Recreate Tape Index" ), this, TQT_SLOT( fileIndexTape() ) );
+    _tapeDriveMenu->insertItem( i18n( "Mount Tape" )         , this, TQ_SLOT( fileMountTape() ) );
+    _tapeDriveMenu->insertItem( i18n( "Recreate Tape Index" ), this, TQ_SLOT( fileIndexTape() ) );
     _tapeDriveMenu->insertSeparator();
-    _tapeDriveMenu->insertItem( i18n( "Format Tape..." ), this, TQT_SLOT( fileFormatTape() ) );
+    _tapeDriveMenu->insertItem( i18n( "Format Tape..." ), this, TQ_SLOT( fileFormatTape() ) );
 
     _archiveMenu = new TQPopupMenu();
-    _archiveMenu->insertItem( i18n( "Delete Archive" ), this, TQT_SLOT( fileDeleteArchive() ) );
+    _archiveMenu->insertItem( i18n( "Delete Archive" ), this, TQ_SLOT( fileDeleteArchive() ) );
 
     _mountedArchiveMenu = new TQPopupMenu();
-    _mountedArchiveMenu->insertItem( i18n( "Verify..." )     , this, TQT_SLOT( fileVerify() ) );
-    _mountedArchiveMenu->insertItem( i18n( "Restore..." )    , this, TQT_SLOT( fileRestore() ) );
+    _mountedArchiveMenu->insertItem( i18n( "Verify..." )     , this, TQ_SLOT( fileVerify() ) );
+    _mountedArchiveMenu->insertItem( i18n( "Restore..." )    , this, TQ_SLOT( fileRestore() ) );
     _mountedArchiveMenu->insertSeparator();
-    _mountedArchiveMenu->insertItem( i18n( "Delete Archive" ), this, TQT_SLOT( fileDeleteArchive() ) );
+    _mountedArchiveMenu->insertItem( i18n( "Delete Archive" ), this, TQ_SLOT( fileDeleteArchive() ) );
 
     _mountedTapeFileMenu = new TQPopupMenu();
-    _mountedTapeFileMenu->insertItem( i18n( "Verify..." ) , this, TQT_SLOT( fileVerify() ) );
-    _mountedTapeFileMenu->insertItem( i18n( "Restore..." ), this, TQT_SLOT( fileRestore() ) );
+    _mountedTapeFileMenu->insertItem( i18n( "Verify..." ) , this, TQ_SLOT( fileVerify() ) );
+    _mountedTapeFileMenu->insertItem( i18n( "Restore..." ), this, TQ_SLOT( fileRestore() ) );
 
     _localFileMenu = new TQPopupMenu();
-    _localFileMenu->insertItem( i18n( "Backup..." ), this, TQT_SLOT( fileBackup() ) );
+    _localFileMenu->insertItem( i18n( "Backup..." ), this, TQ_SLOT( fileBackup() ) );
 
     _tapeMenu = new TQPopupMenu();
-    _tapeMenu->insertItem( i18n( "Delete Tape Index" ), this, TQT_SLOT( fileDeleteIndex() ) );
+    _tapeMenu->insertItem( i18n( "Delete Tape Index" ), this, TQ_SLOT( fileDeleteIndex() ) );
 
     _backupProfileRootMenu = new TQPopupMenu();
-    _backupProfileRootMenu->insertItem( i18n( "Create Backup Profile" ), this, TQT_SLOT( fileNewBackupProfile() ) );
+    _backupProfileRootMenu->insertItem( i18n( "Create Backup Profile" ), this, TQ_SLOT( fileNewBackupProfile() ) );
 
     _backupProfileMenu = new TQPopupMenu();
-    _backupProfileMenu->insertItem( i18n( "Backup..." ), this, TQT_SLOT( fileBackup() ) );
+    _backupProfileMenu->insertItem( i18n( "Backup..." ), this, TQ_SLOT( fileBackup() ) );
     _backupProfileMenu->insertSeparator();
-    _backupProfileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQT_SLOT( fileDeleteBackupProfile() ) );
+    _backupProfileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQ_SLOT( fileDeleteBackupProfile() ) );
 
     _fileMenu = new TQPopupMenu;
-    _fileMenu->insertItem( i18n( "Backup..." )            , this, TQT_SLOT( fileBackup() ) );
-    _fileMenu->insertItem( i18n( "Restore..." )           , this, TQT_SLOT( fileRestore() ) );
-    _fileMenu->insertItem( i18n( "Verify..." )            , this, TQT_SLOT( fileVerify() ) );
-    _fileMenu->insertItem( i18n( "Mount Tape" )           , this, TQT_SLOT( fileMountTape() ) );
-    _fileMenu->insertItem( i18n( "Recreate Tape Index" )  , this, TQT_SLOT( fileIndexTape() ) );
-    _fileMenu->insertItem( i18n( "Create Backup Profile" ), this, TQT_SLOT( fileNewBackupProfile() ) );
+    _fileMenu->insertItem( i18n( "Backup..." )            , this, TQ_SLOT( fileBackup() ) );
+    _fileMenu->insertItem( i18n( "Restore..." )           , this, TQ_SLOT( fileRestore() ) );
+    _fileMenu->insertItem( i18n( "Verify..." )            , this, TQ_SLOT( fileVerify() ) );
+    _fileMenu->insertItem( i18n( "Mount Tape" )           , this, TQ_SLOT( fileMountTape() ) );
+    _fileMenu->insertItem( i18n( "Recreate Tape Index" )  , this, TQ_SLOT( fileIndexTape() ) );
+    _fileMenu->insertItem( i18n( "Create Backup Profile" ), this, TQ_SLOT( fileNewBackupProfile() ) );
     _fileMenu->insertSeparator();
-    _fileMenu->insertItem( i18n( "Delete Archive" )       , this, TQT_SLOT( fileDeleteArchive() ) );
-    _fileMenu->insertItem( i18n( "Delete Index" )         , this, TQT_SLOT( fileDeleteIndex() ) );
-    _fileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQT_SLOT( fileDeleteBackupProfile() ) );
-    _fileMenu->insertItem( i18n( "Format Tape..." )       , this, TQT_SLOT( fileFormatTape() ) );
+    _fileMenu->insertItem( i18n( "Delete Archive" )       , this, TQ_SLOT( fileDeleteArchive() ) );
+    _fileMenu->insertItem( i18n( "Delete Index" )         , this, TQ_SLOT( fileDeleteIndex() ) );
+    _fileMenu->insertItem( i18n( "Delete Backup Profile" ), this, TQ_SLOT( fileDeleteBackupProfile() ) );
+    _fileMenu->insertItem( i18n( "Format Tape..." )       , this, TQ_SLOT( fileFormatTape() ) );
     _fileMenu->insertSeparator();
-    _fileMenu->insertItem( SmallIcon("system-log-out"), i18n( "&Quit" )                , this, TQT_SLOT( fileQuit() ), CTRL + Key_Q );
+    _fileMenu->insertItem( SmallIcon("system-log-out"), i18n( "&Quit" )                , this, TQ_SLOT( fileQuit() ), CTRL + Key_Q );
 
     _editMenu = new TQPopupMenu;
-    _editMenu->insertItem( SmallIcon("configure"), i18n( "Configure KDat..." )       , this, TQT_SLOT( editPreferences() ) );
+    _editMenu->insertItem( SmallIcon("configure"), i18n( "Configure KDat..." )       , this, TQ_SLOT( editPreferences() ) );
 
     _menu = new KMenuBar( this );
     _menu->insertItem( i18n( "&File" ), _fileMenu );
@@ -157,15 +157,15 @@ KDatMainWindow::KDatMainWindow()
 
     _toolbar = new TDEToolBar( this );
 
-    _toolbar->insertButton( *ImageCache::instance()->getTapeUnmounted(), 0, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileMountTape() ), TRUE, i18n( "Mount/unmount tape" ) );
+    _toolbar->insertButton( *ImageCache::instance()->getTapeUnmounted(), 0, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( fileMountTape() ), TRUE, i18n( "Mount/unmount tape" ) );
 
     _toolbar->insertSeparator();
 
-    _toolbar->insertButton( *ImageCache::instance()->getBackup() , 1, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileBackup() ) , TRUE, i18n( "Backup" ) );
+    _toolbar->insertButton( *ImageCache::instance()->getBackup() , 1, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( fileBackup() ) , TRUE, i18n( "Backup" ) );
     _toolbar->setButtonIconSet( 1, BarIconSet("kdat_backup"));
-    _toolbar->insertButton( *ImageCache::instance()->getRestore(), 2, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileRestore() ), TRUE, i18n( "Restore" ) );
+    _toolbar->insertButton( *ImageCache::instance()->getRestore(), 2, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( fileRestore() ), TRUE, i18n( "Restore" ) );
     _toolbar->setButtonIconSet( 2, BarIconSet("kdat_restore"));
-    _toolbar->insertButton( *ImageCache::instance()->getVerify() , 3, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( fileVerify() ) , TRUE, i18n( "Verify" ) );
+    _toolbar->insertButton( *ImageCache::instance()->getVerify() , 3, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( fileVerify() ) , TRUE, i18n( "Verify" ) );
     _toolbar->setButtonIconSet( 3, BarIconSet("kdat_verify"));
     addToolBar( _toolbar );
 
@@ -197,12 +197,12 @@ KDatMainWindow::KDatMainWindow()
     _tree->setMinimumHeight( 300 );
 #endif /* KDAT_HORIZONTAL_LAYOUT */
 
-    connect( _tree, TQT_SIGNAL( expanding( KTreeViewItem*, bool& ) ), this, TQT_SLOT( localExpanding( KTreeViewItem*, bool& ) ) );
-    connect( _tree, TQT_SIGNAL( expanded( int ) ), this, TQT_SLOT( localExpanded( int ) ) );
-    connect( _tree, TQT_SIGNAL( collapsed( int ) ), this, TQT_SLOT( localCollapsed( int ) ) );
-    connect( _tree, TQT_SIGNAL( selected( int ) ), this, TQT_SLOT( localSelected( int ) ) );
-    connect( _tree, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( localHighlighted( int ) ) );
-    connect( _tree, TQT_SIGNAL( popupMenu( int, const TQPoint& ) ), this, TQT_SLOT( localPopupMenu( int, const TQPoint& ) ) );
+    connect( _tree, TQ_SIGNAL( expanding( KTreeViewItem*, bool& ) ), this, TQ_SLOT( localExpanding( KTreeViewItem*, bool& ) ) );
+    connect( _tree, TQ_SIGNAL( expanded( int ) ), this, TQ_SLOT( localExpanded( int ) ) );
+    connect( _tree, TQ_SIGNAL( collapsed( int ) ), this, TQ_SLOT( localCollapsed( int ) ) );
+    connect( _tree, TQ_SIGNAL( selected( int ) ), this, TQ_SLOT( localSelected( int ) ) );
+    connect( _tree, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( localHighlighted( int ) ) );
+    connect( _tree, TQ_SIGNAL( popupMenu( int, const TQPoint& ) ), this, TQ_SLOT( localPopupMenu( int, const TQPoint& ) ) );
 
     setCentralWidget( _panner );
 
@@ -211,14 +211,14 @@ KDatMainWindow::KDatMainWindow()
     _tree->insertItem( _backupProfileRootNode = new BackupProfileRootNode() );
     _tree->insertItem( new TapeIndexRootNode() );
 
-    connect( TapeDrive::instance(), TQT_SIGNAL( sigStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) );
+    connect( TapeDrive::instance(), TQ_SIGNAL( sigStatus( const TQString & ) ), this, TQ_SLOT( status( const TQString & ) ) );
 
     setTapePresent( FALSE );
 
-    connect( Options::instance(), TQT_SIGNAL( sigTapeDevice() ), this, TQT_SLOT( slotTapeDevice() ) );
+    connect( Options::instance(), TQ_SIGNAL( sigTapeDevice() ), this, TQ_SLOT( slotTapeDevice() ) );
 
-    connect( TapeManager::instance(), TQT_SIGNAL( sigTapeMounted() )  , this, TQT_SLOT( slotTapeMounted() ) );
-    connect( TapeManager::instance(), TQT_SIGNAL( sigTapeUnmounted() ), this, TQT_SLOT( slotTapeUnmounted() ) );
+    connect( TapeManager::instance(), TQ_SIGNAL( sigTapeMounted() )  , this, TQ_SLOT( slotTapeMounted() ) );
+    connect( TapeManager::instance(), TQ_SIGNAL( sigTapeUnmounted() ), this, TQ_SLOT( slotTapeUnmounted() ) );
 
     configureUI( 0 );
 }
@@ -1354,7 +1354,7 @@ void KDatMainWindow::create_backup_dialog()
      to accomodate a wider message :( */
   //  _cancel->setGeometry( TQRect( 50, 170, 0, 0 ) );   /* 2002-01-28 LEW */
   _cancel->setGeometry( TQRect( 50, 230, 0, 0 ) );
-  connect( _cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( backupCancel() ) );
+  connect( _cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( backupCancel() ) );
 
   _continue = new KPushButton( KStdGuiItem::cont(), _backupdialog );
   _continue->setFixedSize( 80, _continue->sizeHint().height() );
@@ -1362,7 +1362,7 @@ void KDatMainWindow::create_backup_dialog()
   _continue->setDefault( TRUE );
   //  _continue->setGeometry( TQRect( 200, 170, 0, 0 ) );   /* 2002-01-28 LEW */
   _continue->setGeometry( TQRect( 200, 230, 0, 0 ) );
-  connect( _continue, TQT_SIGNAL( clicked() ), this, TQT_SLOT( backupContinue() ) );
+  connect( _continue, TQ_SIGNAL( clicked() ), this, TQ_SLOT( backupContinue() ) );
 
   _backupdialog->show();
 }
diff --git a/kdat/Node.cpp b/kdat/Node.cpp
index e8322e2..5134caa 100644
--- a/kdat/Node.cpp
+++ b/kdat/Node.cpp
@@ -1186,9 +1186,9 @@ TapeDriveNode::TapeDriveNode()
 {
     setDelayedExpanding( TRUE );
 
-    connect( TapeManager::instance(), TQT_SIGNAL( sigTapeMounted() )        , this, TQT_SLOT( slotTapeMounted() ) );
-    connect( TapeManager::instance(), TQT_SIGNAL( sigTapeUnmounted() )      , this, TQT_SLOT( slotTapeUnmounted() ) );
-    connect( TapeManager::instance(), TQT_SIGNAL( sigTapeModified( Tape* ) ), this, TQT_SLOT( slotTapeModified( Tape* ) ) );
+    connect( TapeManager::instance(), TQ_SIGNAL( sigTapeMounted() )        , this, TQ_SLOT( slotTapeMounted() ) );
+    connect( TapeManager::instance(), TQ_SIGNAL( sigTapeUnmounted() )      , this, TQ_SLOT( slotTapeUnmounted() ) );
+    connect( TapeManager::instance(), TQ_SIGNAL( sigTapeModified( Tape* ) ), this, TQ_SLOT( slotTapeModified( Tape* ) ) );
 }
 
 bool TapeDriveNode::isType( int type )
@@ -1336,9 +1336,9 @@ TapeIndexRootNode::TapeIndexRootNode()
 {
     setDelayedExpanding( TRUE );
 
-    connect( TapeManager::instance(), TQT_SIGNAL( sigTapeAdded( Tape* ) )   , this, TQT_SLOT( slotTapeAdded( Tape* ) ) );
-    connect( TapeManager::instance(), TQT_SIGNAL( sigTapeRemoved( Tape* ) ) , this, TQT_SLOT( slotTapeRemoved( Tape* ) ) );
-    connect( TapeManager::instance(), TQT_SIGNAL( sigTapeModified( Tape* ) ), this, TQT_SLOT( slotTapeModified( Tape* ) ) );
+    connect( TapeManager::instance(), TQ_SIGNAL( sigTapeAdded( Tape* ) )   , this, TQ_SLOT( slotTapeAdded( Tape* ) ) );
+    connect( TapeManager::instance(), TQ_SIGNAL( sigTapeRemoved( Tape* ) ) , this, TQ_SLOT( slotTapeRemoved( Tape* ) ) );
+    connect( TapeManager::instance(), TQ_SIGNAL( sigTapeModified( Tape* ) ), this, TQ_SLOT( slotTapeModified( Tape* ) ) );
 }
 
 bool TapeIndexRootNode::isType( int type )
@@ -1471,12 +1471,12 @@ BackupProfileRootNode::BackupProfileRootNode()
 {
     setDelayedExpanding( TRUE );
 
-    connect( BackupProfileManager::instance(), TQT_SIGNAL( sigBackupProfileAdded( BackupProfile* ) )   ,
-             this, TQT_SLOT( slotBackupProfileAdded( BackupProfile* ) ) );
-    connect( BackupProfileManager::instance(), TQT_SIGNAL( sigBackupProfileRemoved( BackupProfile* ) ) ,
-             this, TQT_SLOT( slotBackupProfileRemoved( BackupProfile* ) ) );
-    connect( BackupProfileManager::instance(), TQT_SIGNAL( sigBackupProfileModified( BackupProfile* ) ),
-             this, TQT_SLOT( slotBackupProfileModified( BackupProfile* ) ) );
+    connect( BackupProfileManager::instance(), TQ_SIGNAL( sigBackupProfileAdded( BackupProfile* ) )   ,
+             this, TQ_SLOT( slotBackupProfileAdded( BackupProfile* ) ) );
+    connect( BackupProfileManager::instance(), TQ_SIGNAL( sigBackupProfileRemoved( BackupProfile* ) ) ,
+             this, TQ_SLOT( slotBackupProfileRemoved( BackupProfile* ) ) );
+    connect( BackupProfileManager::instance(), TQ_SIGNAL( sigBackupProfileModified( BackupProfile* ) ),
+             this, TQ_SLOT( slotBackupProfileModified( BackupProfile* ) ) );
 }
 
 void BackupProfileRootNode::setSelected( BackupProfile* pBackupProfile )
diff --git a/kdat/OptionsDlg.cpp b/kdat/OptionsDlg.cpp
index 3f29fae..22d7304 100644
--- a/kdat/OptionsDlg.cpp
+++ b/kdat/OptionsDlg.cpp
@@ -41,11 +41,11 @@ OptionsDlg::OptionsDlg( TQWidget* parent, const char* name )
 	_baseWidget = new OptionsDlgWidget ( 0 );
 	setMainWidget (_baseWidget);
 	
-	connect( _baseWidget, TQT_SIGNAL( valueChanged () ), this, TQT_SLOT( slotChanged() ) );
+	connect( _baseWidget, TQ_SIGNAL( valueChanged () ), this, TQ_SLOT( slotChanged() ) );
 
-    connect( this, TQT_SIGNAL( okClicked () ), this, TQT_SLOT( slotOK() ) );
-    connect( this, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) );
-    connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
+    connect( this, TQ_SIGNAL( okClicked () ), this, TQ_SLOT( slotOK() ) );
+    connect( this, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) );
+    connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) );
 
     int size = Options::instance()->getDefaultTapeSize();
     if ( ( size >= 1024*1024 ) && ( size % ( 1024*1024 ) == 0 ) ) {
diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index b0e8199..c6498b7 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -141,10 +141,10 @@ TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name )
     l1_8->addStretch( 1 );
     l1_8->addWidget( _apply );
 
-    connect( _tapeName     , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
-    connect( _tapeSize     , TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) );
-    connect( _tapeSizeUnits, TQT_SIGNAL( activated( int ) )          , this, TQT_SLOT( slotActivated( int ) ) );
-    connect( _apply        , TQT_SIGNAL( clicked() )                 , this, TQT_SLOT( slotApply() ) );
+    connect( _tapeName     , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
+    connect( _tapeSize     , TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) );
+    connect( _tapeSizeUnits, TQ_SIGNAL( activated( int ) )          , this, TQ_SLOT( slotActivated( int ) ) );
+    connect( _apply        , TQ_SIGNAL( clicked() )                 , this, TQ_SLOT( slotApply() ) );
 }
 
 TapeInfoWidget::~TapeInfoWidget()
diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp
index 0580144..72a2505 100644
--- a/kdat/VerifyDlg.cpp
+++ b/kdat/VerifyDlg.cpp
@@ -138,17 +138,17 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList&
 
     _ok = new KPushButton( KStdGuiItem::ok(), this );
     _ok->setFixedSize( 80, _ok->sizeHint().height() );
-    connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
+    connect( _ok, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOK() ) );
     _ok->setEnabled( FALSE );
 
     _save = new TQPushButton( i18n( "&Save Log..." ), this );
     _save->setFixedSize( 80, _save->sizeHint().height() );
-    connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
+    connect( _save, TQ_SIGNAL( clicked() ), _log, TQ_SLOT( save() ) );
     _save->setEnabled( FALSE );
 
     _abort = new TQPushButton( i18n( "&Abort" ), this );
     _abort->setFixedSize( 80, _abort->sizeHint().height() );
-    connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
+    connect( _abort, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAbort() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
 
@@ -219,9 +219,9 @@ void VerifyDlg::show()
         *_proc << "-dvf" << "-";
     }
 
-    connect( _proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) );
-    connect( _proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQT_SLOT( slotStdout( TDEProcess*, char*, int ) ) );
-    connect( _proc, TQT_SIGNAL( wroteStdin( TDEProcess* ) ), this, TQT_SLOT( slotWroteStdin( TDEProcess* ) ) );
+    connect( _proc, TQ_SIGNAL( processExited( TDEProcess* ) ), this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) );
+    connect( _proc, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), this, TQ_SLOT( slotStdout( TDEProcess*, char*, int ) ) );
+    connect( _proc, TQ_SIGNAL( wroteStdin( TDEProcess* ) ), this, TQ_SLOT( slotWroteStdin( TDEProcess* ) ) );
 
     _startTime = time( NULL );
     startTimer( 100 );
diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp
index 499027b..8768000 100644
--- a/kdat/VerifyOptDlg.cpp
+++ b/kdat/VerifyOptDlg.cpp
@@ -98,10 +98,10 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo
     _entry->setFocus();
     _entry->selectAll();
 
-    connect( _entry, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( okClicked() ) );
-    connect( browse, TQT_SIGNAL( clicked() )      , this, TQT_SLOT( slotBrowse() ) );
-    connect( ok    , TQT_SIGNAL( clicked() )      , this, TQT_SLOT( okClicked() ) );
-    connect( cancel, TQT_SIGNAL( clicked() )      , this, TQT_SLOT( reject() ) );
+    connect( _entry, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( okClicked() ) );
+    connect( browse, TQ_SIGNAL( clicked() )      , this, TQ_SLOT( slotBrowse() ) );
+    connect( ok    , TQ_SIGNAL( clicked() )      , this, TQ_SLOT( okClicked() ) );
+    connect( cancel, TQ_SIGNAL( clicked() )      , this, TQ_SLOT( reject() ) );
 }
 
 VerifyOptDlg::~VerifyOptDlg()