diff options
Diffstat (limited to 'kdat')
39 files changed, 145 insertions, 145 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/ArchiveInfoWidget.h b/kdat/ArchiveInfoWidget.h index 0d2809f..b24bfff 100644 --- a/kdat/ArchiveInfoWidget.h +++ b/kdat/ArchiveInfoWidget.h @@ -31,7 +31,7 @@ class Archive; * @short Display/edit information about an archive index. */ class ArchiveInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT Archive* _archive; TQLineEdit* _archiveName; diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp index 381bcf7..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 ); @@ -305,7 +305,7 @@ void BackupDlg::slotProcessExited( TDEProcess* ) TapeDrive::instance()->close(); TapeDrive::instance()->open(); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); delete _proc; _tape->addChild( _archive ); @@ -381,7 +381,7 @@ void BackupDlg::slotOK() void BackupDlg::slotAbort() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); if ( _proc ) { _proc->kill(); delete _proc; diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h index 57bd333..c0822eb 100644 --- a/kdat/BackupDlg.h +++ b/kdat/BackupDlg.h @@ -36,7 +36,7 @@ class TarParser; * @short Status dialog for backing up files. */ class BackupDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT TDEProcess* _proc; TarParser* _tarParser; 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/BackupOptDlg.h b/kdat/BackupOptDlg.h index 0ad4fd8..88f44f0 100644 --- a/kdat/BackupOptDlg.h +++ b/kdat/BackupOptDlg.h @@ -28,7 +28,7 @@ class BackupProfileWidget; * @short Display/edit the parameters for a backup operation. */ class BackupOptDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT BackupProfileWidget* _profile; public: 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/BackupProfileInfoWidget.h b/kdat/BackupProfileInfoWidget.h index 246c4d2..8ff1bd0 100644 --- a/kdat/BackupProfileInfoWidget.h +++ b/kdat/BackupProfileInfoWidget.h @@ -27,7 +27,7 @@ class BackupProfileWidget; * @short Display/edit information about a backup profile. */ class BackupProfileInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT BackupProfile* _backupProfile; TQLineEdit* _name; diff --git a/kdat/BackupProfileManager.h b/kdat/BackupProfileManager.h index 040e9fa..84adf43 100644 --- a/kdat/BackupProfileManager.h +++ b/kdat/BackupProfileManager.h @@ -38,7 +38,7 @@ * The BackupProfileManager follows the Singleton pattern. */ class BackupProfileManager : public TQObject { - Q_OBJECT + TQ_OBJECT static BackupProfileManager* _instance; 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/BackupProfileWidget.h b/kdat/BackupProfileWidget.h index 5090774..4fd4060 100644 --- a/kdat/BackupProfileWidget.h +++ b/kdat/BackupProfileWidget.h @@ -34,7 +34,7 @@ class BackupProfile; * @short Display/edit the parameters for a backup operation. */ class BackupProfileWidget : public KTabCtl { - Q_OBJECT + TQ_OBJECT TQLineEdit* _archiveName; TQComboBox* _workingDir; diff --git a/kdat/FileInfoWidget.h b/kdat/FileInfoWidget.h index 36e26e4..618ba06 100644 --- a/kdat/FileInfoWidget.h +++ b/kdat/FileInfoWidget.h @@ -27,7 +27,7 @@ class TQLabel; * @short Display information about a local file. */ class FileInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQLabel* _fileName; TQLabel* _ctime; 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/FormatOptDlg.h b/kdat/FormatOptDlg.h index b4d6c13..9186202 100644 --- a/kdat/FormatOptDlg.h +++ b/kdat/FormatOptDlg.h @@ -29,7 +29,7 @@ class TQLineEdit; * @short Display/edit options for formatting a tape. */ class FormatOptDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT TQString _name; int _size; diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp index 4c9ff2f..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 ); @@ -221,13 +221,13 @@ void IndexDlg::slotOK() void IndexDlg::slotAbort() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); _aborted = TRUE; } void IndexDlg::timerEvent( TQTimerEvent* ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); // Rewind tape. _log->append( i18n( "Rewinding tape." ) ); @@ -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/IndexDlg.h b/kdat/IndexDlg.h index 0d13741..14d6eb7 100644 --- a/kdat/IndexDlg.h +++ b/kdat/IndexDlg.h @@ -37,7 +37,7 @@ class TarParser; * @short Status dialog for recreating a tape index. */ class IndexDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT TarParser* _tarParser; Tape* _tape; diff --git a/kdat/InfoShellWidget.h b/kdat/InfoShellWidget.h index f461fb9..ad0ded6 100644 --- a/kdat/InfoShellWidget.h +++ b/kdat/InfoShellWidget.h @@ -25,7 +25,7 @@ * @short A suitable parent for the info widgets. */ class InfoShellWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index 86a4fef..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 ) ), TQT_TQOBJECT(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 ) ), TQT_TQOBJECT(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 ) ), TQT_TQOBJECT(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 ) ), TQT_TQOBJECT(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 ); @@ -173,9 +173,9 @@ KDatMainWindow::KDatMainWindow() _statusBar->insertItem( i18n( "Ready." ), 0 ); #ifdef KDAT_HORIZONTAL_LAYOUT /* 2002-01-20 LEW */ - _panner = new TQSplitter( Qt::Horizontal, this, "panner"); + _panner = new TQSplitter( TQt::Horizontal, this, "panner"); #else - _panner = new TQSplitter( Qt::Vertical, this, "panner"); + _panner = new TQSplitter( TQt::Vertical, this, "panner"); #endif /* KDAT_HORIZONTAL_LAYOUT */ // Create info viewers. @@ -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/KDatMainWindow.h b/kdat/KDatMainWindow.h index f709f5f..34772dc 100644 --- a/kdat/KDatMainWindow.h +++ b/kdat/KDatMainWindow.h @@ -52,7 +52,7 @@ class TapeInfoWidget; * @short The KDat main window. Everything happens from here. */ class KDatMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT private: diff --git a/kdat/LoggerWidget.h b/kdat/LoggerWidget.h index 00e80c9..221962b 100644 --- a/kdat/LoggerWidget.h +++ b/kdat/LoggerWidget.h @@ -27,7 +27,7 @@ class TQMultiLineEdit; * @short A titled logging widget with a save option. */ class LoggerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQMultiLineEdit* _mle; public: 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/Node.h b/kdat/Node.h index 81e1757..5a55aed 100644 --- a/kdat/Node.h +++ b/kdat/Node.h @@ -816,7 +816,7 @@ public: * @short This node represents a tape drive. */ class TapeDriveNode : public TQObject, public Node { - Q_OBJECT + TQ_OBJECT MountedArchiveNode* findArchiveNode( Archive* archive ); @@ -874,7 +874,7 @@ public slots: * @short This node represents the root of the tape index subtree. */ class TapeIndexRootNode : public TQObject, public Node { - Q_OBJECT + TQ_OBJECT TapeNode* findTapeNode( Tape* tape ); @@ -981,7 +981,7 @@ public: * @short This node represents the root of the backup profile subtree. */ class BackupProfileRootNode : public TQObject, public Node { - Q_OBJECT + TQ_OBJECT BackupProfileNode* findBackupProfileNode( BackupProfile* backupProfile ); diff --git a/kdat/Options.h b/kdat/Options.h index 7543897..237ab75 100644 --- a/kdat/Options.h +++ b/kdat/Options.h @@ -27,7 +27,7 @@ class TDEConfig; * @short The central repository for user preferences. */ class Options : public TQObject { - Q_OBJECT + TQ_OBJECT TDEConfig* _config; int _defaultTapeSize; 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/OptionsDlg.h b/kdat/OptionsDlg.h index db62244..9359639 100644 --- a/kdat/OptionsDlg.h +++ b/kdat/OptionsDlg.h @@ -28,7 +28,7 @@ class OptionsDlgWidget; * @short Display/edit user preferences. */ class OptionsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT private slots: void slotOK(); diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui index d5e7767..c7464a0 100644 --- a/kdat/OptionsDlgWidget.ui +++ b/kdat/OptionsDlgWidget.ui @@ -374,16 +374,16 @@ You must still specify the block size.</string> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">OptionsDlgWidget.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>doBrowseTapeDevice()</signal> <signal>doBrowseTarCommand()</signal> <signal>valueChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="protected">slotValueChanged()</slot> <slot access="protected">slotBrowseTapeDevice()</slot> <slot access="protected">slotBrowseTarCommand()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="11" margin="6"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> @@ -210,7 +210,7 @@ c/o rolandg at onlinehome.de: 2001-08-01 These are possible sources of bugs: -1) don't return 0 instead of a null QString +1) don't return 0 instead of a null TQString (e.g., BackupProfile::getWorkingDirectory()) 2) don't test for FALSE predicate values with !(). Use == FALSE instead. @@ -218,7 +218,7 @@ c/o rolandg at onlinehome.de: _relativeFiles.remove(_relativeFiles.first()) Instead, separate the two: - QString my_first = _relativeFiles.first(); + TQString my_first = _relativeFiles.first(); _relativeFiles.remove( my_first ); This may be important with any call to .remove() diff --git a/kdat/TapeDrive.h b/kdat/TapeDrive.h index dea4dbf..8e6bc1c 100644 --- a/kdat/TapeDrive.h +++ b/kdat/TapeDrive.h @@ -27,7 +27,7 @@ class Tape; * @short An OO interface to the tape drive. */ class TapeDrive : public TQObject { - Q_OBJECT + TQ_OBJECT int _fd; bool _readOnly; diff --git a/kdat/TapeFileInfoWidget.h b/kdat/TapeFileInfoWidget.h index c0f4476..c5b3bf9 100644 --- a/kdat/TapeFileInfoWidget.h +++ b/kdat/TapeFileInfoWidget.h @@ -29,7 +29,7 @@ class File; * @short Display information about a tape file. */ class TapeFileInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT File* _file; TQLabel* _fileName; 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/TapeInfoWidget.h b/kdat/TapeInfoWidget.h index 106adcd..4d9cf0a 100644 --- a/kdat/TapeInfoWidget.h +++ b/kdat/TapeInfoWidget.h @@ -32,7 +32,7 @@ class Tape; * @short Display/edit information about a tape index. */ class TapeInfoWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT Tape* _tape; TQLineEdit* _tapeName; diff --git a/kdat/TapeManager.h b/kdat/TapeManager.h index 2a7bd02..06cbb6c 100644 --- a/kdat/TapeManager.h +++ b/kdat/TapeManager.h @@ -42,7 +42,7 @@ * The TapeManager follows the Singleton pattern. */ class TapeManager : public TQObject { - Q_OBJECT + TQ_OBJECT static TapeManager* _instance; diff --git a/kdat/TarParser.h b/kdat/TarParser.h index c9301aa..ee01226 100644 --- a/kdat/TarParser.h +++ b/kdat/TarParser.h @@ -167,7 +167,7 @@ union record * @short A parser for GNU tar archives. */ class TarParser : public TQObject { - Q_OBJECT + TQ_OBJECT char _buf[512]; int _bufIdx; diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp index c43fa00..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 ); @@ -233,7 +233,7 @@ void VerifyDlg::show() void VerifyDlg::slotProcessExited( TDEProcess* ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); delete _proc; // Set this, or we get caught in a loop. @@ -307,7 +307,7 @@ void VerifyDlg::slotAbort() void VerifyDlg::timerEvent( TQTimerEvent* ) { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); int oldElapsed = 0; diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h index fbde1da..bb330f3 100644 --- a/kdat/VerifyDlg.h +++ b/kdat/VerifyDlg.h @@ -36,7 +36,7 @@ class TapeDrive; * @short Status dialog for verifying/restoring parts of an archive. */ class VerifyDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT bool _restore; TDEProcess* _proc; 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() diff --git a/kdat/VerifyOptDlg.h b/kdat/VerifyOptDlg.h index a08d80e..c1444f8 100644 --- a/kdat/VerifyOptDlg.h +++ b/kdat/VerifyOptDlg.h @@ -31,7 +31,7 @@ class TQLineEdit; * have been combined into a single dialog. */ class VerifyOptDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT bool _restore; TQString _workingDir; diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp index 24712d4..f3a98ce 100644 --- a/kdat/ktreeview.cpp +++ b/kdat/ktreeview.cpp @@ -350,7 +350,7 @@ void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& textRect.setCoords(l - 1, t - 1, r + 1, b + 1); p->setPen(TQPen(TQt::yellow, 0, TQt::DotLine)); p->setBackgroundColor(fc); - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->drawRect(textRect); textRect.setCoords(l - 2, t - 2, r + 2, b + 2); p->setPen(fc); @@ -1701,7 +1701,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) { // first: check which button was pressed - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) { // RB: the MMB is hardcoded to the "rubberband" scroll mode if (!rubberband_mode) { @@ -1709,7 +1709,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) } return; } - else if ( ( rubberband_mode ) && ( e->button() != Qt::RightButton ) ) + else if ( ( rubberband_mode ) && ( e->button() != TQt::RightButton ) ) { // another button was pressed while rubberbanding, stop the move. // RB: if we allow other buttons while rubberbanding the tree can expand @@ -1751,7 +1751,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) // hit item (to show info on the file/dir label clicked) else if (item->boundingRect(indentation(item)).contains(cellCoord)) { setCurrentItem(itemClicked); // highlight item - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { emit popupMenu( itemClicked, mapToGlobal( TQPoint( e->pos().x(), e->pos().y() ) ) ); } } @@ -1761,7 +1761,7 @@ void KTreeView::mousePressEvent(TQMouseEvent *e) void KTreeView::mouseReleaseEvent(TQMouseEvent *e) { /* if it's the MMB end rubberbanding */ - if (rubberband_mode && e->button()==Qt::MidButton) + if (rubberband_mode && e->button()==TQt::MidButton) { end_rubberband(); } diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h index 4cb7958..a6031c4 100644 --- a/kdat/ktreeview.h +++ b/kdat/ktreeview.h @@ -398,7 +398,7 @@ typedef bool (*KForEvery) class KTreeView : public TQGridView { friend class KTreeViewItem; - Q_OBJECT + TQ_OBJECT public: /** |