diff options
author | Timothy Pearson <[email protected]> | 2011-12-18 18:28:18 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-18 18:28:18 -0600 |
commit | b836ed566cdce05ae8408705487cd10a423f3a90 (patch) | |
tree | b37e97e4b5b83e83ba02c8e8db096303faff99bf /kdat | |
parent | 377fa3a2775cdb3194315bb83e21744dc7c97bbf (diff) | |
download | tdeadmin-b836ed566cdce05ae8408705487cd10a423f3a90.tar.gz tdeadmin-b836ed566cdce05ae8408705487cd10a423f3a90.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kdat')
-rw-r--r-- | kdat/ArchiveInfoWidget.cpp | 20 | ||||
-rw-r--r-- | kdat/BackupDlg.cpp | 30 | ||||
-rw-r--r-- | kdat/BackupDlg.h | 2 | ||||
-rw-r--r-- | kdat/BackupOptDlg.cpp | 4 | ||||
-rw-r--r-- | kdat/BackupProfileInfoWidget.cpp | 12 | ||||
-rw-r--r-- | kdat/BackupProfileWidget.cpp | 20 | ||||
-rw-r--r-- | kdat/FileInfoWidget.cpp | 44 | ||||
-rw-r--r-- | kdat/FormatOptDlg.cpp | 18 | ||||
-rw-r--r-- | kdat/IndexDlg.cpp | 30 | ||||
-rw-r--r-- | kdat/IndexDlg.h | 2 | ||||
-rw-r--r-- | kdat/KDat.kdoc | 4 | ||||
-rw-r--r-- | kdat/KDatMainWindow.cpp | 40 | ||||
-rw-r--r-- | kdat/LoggerWidget.cpp | 2 | ||||
-rw-r--r-- | kdat/Node.cpp | 52 | ||||
-rw-r--r-- | kdat/OptionsDlgWidget.ui | 6 | ||||
-rw-r--r-- | kdat/TapeDrive.cpp | 34 | ||||
-rw-r--r-- | kdat/TapeDrive.h | 2 | ||||
-rw-r--r-- | kdat/TapeFileInfoWidget.cpp | 32 | ||||
-rw-r--r-- | kdat/TapeInfoWidget.cpp | 50 | ||||
-rw-r--r-- | kdat/VerifyDlg.cpp | 32 | ||||
-rw-r--r-- | kdat/VerifyDlg.h | 2 | ||||
-rw-r--r-- | kdat/VerifyOptDlg.cpp | 12 | ||||
-rw-r--r-- | kdat/ktreeview.cpp | 18 | ||||
-rw-r--r-- | kdat/ktreeview.h | 2 |
24 files changed, 235 insertions, 235 deletions
diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp index 875c21d..c3838d4 100644 --- a/kdat/ArchiveInfoWidget.cpp +++ b/kdat/ArchiveInfoWidget.cpp @@ -43,25 +43,25 @@ ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name ) TQLabel* lbl2 = new TQLabel( i18n( "Created on:" ), this ); TQLabel* lbl3 = new TQLabel( i18n( "Size:" ), this ); - int max = lbl1->tqsizeHint().width(); - if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width(); - if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width(); + int max = lbl1->sizeHint().width(); + if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width(); + if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width(); - lbl1->setFixedSize( max, lbl1->tqsizeHint().height() ); - lbl2->setFixedSize( max, lbl2->tqsizeHint().height() ); - lbl3->setFixedSize( max, lbl3->tqsizeHint().height() ); + lbl1->setFixedSize( max, lbl1->sizeHint().height() ); + lbl2->setFixedSize( max, lbl2->sizeHint().height() ); + lbl3->setFixedSize( max, lbl3->sizeHint().height() ); _archiveName = new TQLineEdit( this ); - _archiveName->setFixedHeight( _archiveName->tqsizeHint().height() ); + _archiveName->setFixedHeight( _archiveName->sizeHint().height() ); _ctime = new TQLabel( "???", this ); - _ctime->setFixedHeight( _ctime->tqsizeHint().height() ); + _ctime->setFixedHeight( _ctime->sizeHint().height() ); _size = new TQLabel( "???", this ); - _size->setFixedHeight( _size->tqsizeHint().height() ); + _size->setFixedHeight( _size->sizeHint().height() ); _apply = new KPushButton( KStdGuiItem::apply(), this ); - _apply->setFixedSize( 80, _apply->tqsizeHint().height() ); + _apply->setFixedSize( 80, _apply->sizeHint().height() ); _apply->setEnabled( FALSE ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 ); diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp index 93bf65d..bd47226 100644 --- a/kdat/BackupDlg.cpp +++ b/kdat/BackupDlg.cpp @@ -93,55 +93,55 @@ BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir, f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 ); - lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() ); + lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() ); _elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 ); - _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() ); + _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() ); TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 ); - lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() ); + lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() ); _timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 ); - _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() ); + _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() ); TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 ); - lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() ); + lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() ); TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( archiveSize ), f1 ); - totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() ); + totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() ); TQLabel* lbl4 = new TQLabel( i18n( "KB written:" ), f2 ); - lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() ); + lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() ); _kbytesWritten = new TQLabel( i18n( "0KB" ), f2 ); - _kbytesWritten->setFixedHeight( _kbytesWritten->tqsizeHint().height() ); + _kbytesWritten->setFixedHeight( _kbytesWritten->sizeHint().height() ); TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 ); - lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() ); + lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() ); _transferRate = new TQLabel( i18n( "0KB/min" ), f1 ); - _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() ); + _transferRate->setFixedHeight( _transferRate->sizeHint().height() ); TQLabel* lbl6 = new TQLabel( i18n( "Files:" ), f2 ); - lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() ); + lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() ); _fileCount = new TQLabel( i18n( "0" ), f2 ); - _fileCount->setFixedHeight( _fileCount->tqsizeHint().height() ); + _fileCount->setFixedHeight( _fileCount->sizeHint().height() ); _log = new LoggerWidget( i18n( "Backup log:" ), this ); _ok = new KPushButton( KStdGuiItem::ok(), this ); - _ok->setFixedSize( 80, _ok->tqsizeHint().height() ); + _ok->setFixedSize( 80, _ok->sizeHint().height() ); connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) ); _ok->setEnabled( FALSE ); _save = new TQPushButton( i18n( "Save Log..." ), this ); - _save->setFixedSize( 80, _save->tqsizeHint().height() ); + _save->setFixedSize( 80, _save->sizeHint().height() ); connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) ); _save->setEnabled( FALSE ); _abort = new KPushButton( KStdGuiItem::cancel(), this ); - _abort->setFixedSize( 80, _abort->tqsizeHint().height() ); + _abort->setFixedSize( 80, _abort->sizeHint().height() ); connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h index d98d91c..092f7c0 100644 --- a/kdat/BackupDlg.h +++ b/kdat/BackupDlg.h @@ -33,7 +33,7 @@ class Tape; class TarParser; /** - * @short tqStatus dialog for backing up files. + * @short Status dialog for backing up files. */ class BackupDlg : public TQDialog { Q_OBJECT diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp index 58ae673..b5311ac 100644 --- a/kdat/BackupOptDlg.cpp +++ b/kdat/BackupOptDlg.cpp @@ -42,10 +42,10 @@ BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, cons _profile->setBackupProfile( backupProfile ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this ); - ok->setFixedSize( 80, ok->tqsizeHint().height() ); + ok->setFixedSize( 80, ok->sizeHint().height() ); connect( ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this ); - cancel->setFixedSize( 80, ok->tqsizeHint().height() ); + cancel->setFixedSize( 80, ok->sizeHint().height() ); connect( cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp index a40b94c..7e4a918 100644 --- a/kdat/BackupProfileInfoWidget.cpp +++ b/kdat/BackupProfileInfoWidget.cpp @@ -42,23 +42,23 @@ BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char* { TQLabel* lbl1 = new TQLabel( i18n( "Backup profile name:" ), this ); - int max = lbl1->tqsizeHint().width(); + int max = lbl1->sizeHint().width(); - lbl1->setFixedSize( max, lbl1->tqsizeHint().height() ); + lbl1->setFixedSize( max, lbl1->sizeHint().height() ); _name = new TQLineEdit( this ); - _name->setFixedHeight( _name->tqsizeHint().height() ); + _name->setFixedHeight( _name->sizeHint().height() ); _profile = new BackupProfileWidget( this ); TQPushButton* getSelection = new TQPushButton( i18n( "Files >>" ), this ); - getSelection->setFixedSize( 80, getSelection->tqsizeHint().height() ); + getSelection->setFixedSize( 80, getSelection->sizeHint().height() ); TQPushButton* setSelection = new TQPushButton( i18n( "<< Files" ), this ); - setSelection->setFixedSize( 80, setSelection->tqsizeHint().height() ); + setSelection->setFixedSize( 80, setSelection->sizeHint().height() ); _apply = new KPushButton( KStdGuiItem::apply(), this ); - _apply->setFixedSize( 80, _apply->tqsizeHint().height() ); + _apply->setFixedSize( 80, _apply->sizeHint().height() ); _apply->setEnabled( FALSE ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 ); diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp index 773a8bd..45acb56 100644 --- a/kdat/BackupProfileWidget.cpp +++ b/kdat/BackupProfileWidget.cpp @@ -40,19 +40,19 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name ) addTab( one, i18n( "Backup" ) ); TQLabel* lbl1 = new TQLabel( i18n( "Archive name:" ), one ); - lbl1->setFixedSize( lbl1->tqsizeHint() ); + lbl1->setFixedSize( lbl1->sizeHint() ); _archiveName = new TQLineEdit( one ); - _archiveName->setFixedHeight( _archiveName->tqsizeHint().height() ); + _archiveName->setFixedHeight( _archiveName->sizeHint().height() ); TQLabel* lbl2 = new TQLabel( i18n( "Working folder:" ), one ); - lbl2->setFixedSize( lbl2->tqsizeHint() ); + lbl2->setFixedSize( lbl2->sizeHint() ); _workingDir = new TQComboBox( FALSE, one ); - _workingDir->setFixedHeight( _workingDir->tqsizeHint().height() ); + _workingDir->setFixedHeight( _workingDir->sizeHint().height() ); TQLabel* lbl3 = new TQLabel( i18n( "Backup files:" ), one ); - lbl3->setFixedHeight( lbl3->tqsizeHint().height() ); + lbl3->setFixedHeight( lbl3->sizeHint().height() ); _files = new TQListBox( one ); @@ -60,20 +60,20 @@ BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name ) addTab( two, i18n( "Tar Options" ) ); _oneFilesystem = new TQCheckBox( i18n( "Stay on one filesystem" ), two ); - _oneFilesystem->setFixedHeight( _oneFilesystem->tqsizeHint().height() ); + _oneFilesystem->setFixedHeight( _oneFilesystem->sizeHint().height() ); _incremental = new TQCheckBox( i18n( "GNU listed incremental" ), two ); - _incremental->setFixedHeight( _incremental->tqsizeHint().height() ); + _incremental->setFixedHeight( _incremental->sizeHint().height() ); connect( _incremental, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIncrementalToggled( bool ) ) ); _snapshotLabel = new TQLabel( i18n( "Snapshot file:" ), two ); - _snapshotLabel->setFixedSize( _snapshotLabel->tqsizeHint() ); + _snapshotLabel->setFixedSize( _snapshotLabel->sizeHint() ); _snapshotFile = new TQLineEdit( two ); - _snapshotFile->setFixedHeight( _snapshotFile->tqsizeHint().height() ); + _snapshotFile->setFixedHeight( _snapshotFile->sizeHint().height() ); _removeSnapshot = new TQCheckBox( i18n( "Remove snapshot file before backup" ), two ); - _removeSnapshot->setFixedHeight( _removeSnapshot->tqsizeHint().height() ); + _removeSnapshot->setFixedHeight( _removeSnapshot->sizeHint().height() ); slotIncrementalToggled( FALSE ); diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp index e8991a8..5b75cf7 100644 --- a/kdat/FileInfoWidget.cpp +++ b/kdat/FileInfoWidget.cpp @@ -47,42 +47,42 @@ FileInfoWidget::FileInfoWidget( TQWidget* parent, const char* name ) TQLabel* lbl6 = new TQLabel( i18n( "Owner:" ), this ); TQLabel* lbl7 = new TQLabel( i18n( "Group:" ), this ); - int max = lbl1->tqsizeHint().width(); - if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width(); - if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width(); - if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width(); - if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width(); - if ( lbl6->tqsizeHint().width() > max ) max = lbl6->tqsizeHint().width(); - if ( lbl7->tqsizeHint().width() > max ) max = lbl7->tqsizeHint().width(); - - lbl1->setFixedSize( max, lbl1->tqsizeHint().height() ); - lbl2->setFixedSize( max, lbl2->tqsizeHint().height() ); - lbl3->setFixedSize( max, lbl3->tqsizeHint().height() ); - lbl4->setFixedSize( max, lbl4->tqsizeHint().height() ); - lbl5->setFixedSize( max, lbl5->tqsizeHint().height() ); - lbl6->setFixedSize( max, lbl6->tqsizeHint().height() ); - lbl7->setFixedSize( max, lbl7->tqsizeHint().height() ); + int max = lbl1->sizeHint().width(); + if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width(); + if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width(); + if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width(); + if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width(); + if ( lbl6->sizeHint().width() > max ) max = lbl6->sizeHint().width(); + if ( lbl7->sizeHint().width() > max ) max = lbl7->sizeHint().width(); + + lbl1->setFixedSize( max, lbl1->sizeHint().height() ); + lbl2->setFixedSize( max, lbl2->sizeHint().height() ); + lbl3->setFixedSize( max, lbl3->sizeHint().height() ); + lbl4->setFixedSize( max, lbl4->sizeHint().height() ); + lbl5->setFixedSize( max, lbl5->sizeHint().height() ); + lbl6->setFixedSize( max, lbl6->sizeHint().height() ); + lbl7->setFixedSize( max, lbl7->sizeHint().height() ); _fileName = new TQLabel( "???", this ); - _fileName->setFixedHeight( _fileName->tqsizeHint().height() ); + _fileName->setFixedHeight( _fileName->sizeHint().height() ); _ctime = new TQLabel( "???", this ); - _ctime->setFixedHeight( _ctime->tqsizeHint().height() ); + _ctime->setFixedHeight( _ctime->sizeHint().height() ); _mtime = new TQLabel( "???", this ); - _mtime->setFixedHeight( _mtime->tqsizeHint().height() ); + _mtime->setFixedHeight( _mtime->sizeHint().height() ); _atime = new TQLabel( "???", this ); - _atime->setFixedHeight( _atime->tqsizeHint().height() ); + _atime->setFixedHeight( _atime->sizeHint().height() ); _size = new TQLabel( "???", this ); - _size->setFixedHeight( _size->tqsizeHint().height() ); + _size->setFixedHeight( _size->sizeHint().height() ); _owner = new TQLabel( "???", this ); - _owner->setFixedHeight( _owner->tqsizeHint().height() ); + _owner->setFixedHeight( _owner->sizeHint().height() ); _group = new TQLabel( "???", this ); - _group->setFixedHeight( _group->tqsizeHint().height() ); + _group->setFixedHeight( _group->sizeHint().height() ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 ); diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp index f6084de..81a74f4 100644 --- a/kdat/FormatOptDlg.cpp +++ b/kdat/FormatOptDlg.cpp @@ -43,28 +43,28 @@ FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char* TQLabel* lbl1 = new TQLabel( i18n( "Tape name:" ), this ); TQLabel* lbl2 = new TQLabel( i18n( "Tape size:" ), this ); - int max = lbl1->tqsizeHint().width(); - if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width(); + int max = lbl1->sizeHint().width(); + if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width(); - lbl1->setFixedSize( max, lbl1->tqsizeHint().height() ); - lbl2->setFixedSize( max, lbl2->tqsizeHint().height() ); + lbl1->setFixedSize( max, lbl1->sizeHint().height() ); + lbl2->setFixedSize( max, lbl2->sizeHint().height() ); _entry = new TQLineEdit( this ); _entry->setText( def ); - _entry->setFixedHeight( _entry->tqsizeHint().height() ); + _entry->setFixedHeight( _entry->sizeHint().height() ); _tapeSize = new TQLineEdit( this ); - _tapeSize->setFixedSize( 48, _tapeSize->tqsizeHint().height() ); + _tapeSize->setFixedSize( 48, _tapeSize->sizeHint().height() ); _tapeSizeUnits = new TQComboBox( this ); - _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->tqsizeHint().height() ); + _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->sizeHint().height() ); _tapeSizeUnits->insertItem( "MB" ); _tapeSizeUnits->insertItem( "GB" ); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this ); - ok->setFixedSize( 80, ok->tqsizeHint().height() ); + ok->setFixedSize( 80, ok->sizeHint().height() ); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this ); - cancel->setFixedSize( 80, cancel->tqsizeHint().height() ); + cancel->setFixedSize( 80, cancel->sizeHint().height() ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); TQHBoxLayout* l2 = new TQHBoxLayout(); diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp index bd1f62c..92621b6 100644 --- a/kdat/IndexDlg.cpp +++ b/kdat/IndexDlg.cpp @@ -70,55 +70,55 @@ IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name ) f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 ); - lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() ); + lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() ); _elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 ); - _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() ); + _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() ); TQLabel* lbl2 = new TQLabel( i18n( "Archives:" ), f2 ); - lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() ); + lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() ); _archives = new TQLabel( i18n( "0" ), f2 ); - _archives->setFixedHeight( _archives->tqsizeHint().height() ); + _archives->setFixedHeight( _archives->sizeHint().height() ); TQLabel* lbl3 = new TQLabel( i18n( "KB read:" ), f1 ); - lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() ); + lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() ); _kbytesRead = new TQLabel( i18n( "0KB" ), f1 ); - _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() ); + _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() ); TQLabel* lbl4 = new TQLabel( i18n( "Files:" ), f2 ); - lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() ); + lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() ); _files = new TQLabel( i18n( "0" ), f2 ); - _files->setFixedHeight( _kbytesRead->tqsizeHint().height() ); + _files->setFixedHeight( _kbytesRead->sizeHint().height() ); TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 ); - lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() ); + lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() ); _transferRate = new TQLabel( i18n( "0KB/min" ), f1 ); - _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() ); + _transferRate->setFixedHeight( _transferRate->sizeHint().height() ); TQLabel* lbl6 = new TQLabel( i18n( "Total files:" ), f2 ); - lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() ); + lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() ); _totalFiles = new TQLabel( i18n( "0" ), f2 ); - _totalFiles->setFixedHeight( _totalFiles->tqsizeHint().height() ); + _totalFiles->setFixedHeight( _totalFiles->sizeHint().height() ); _log = new LoggerWidget( i18n( "Index log:" ), this ); _ok = new KPushButton( KStdGuiItem::ok(), this ); - _ok->setFixedSize( 80, _ok->tqsizeHint().height() ); + _ok->setFixedSize( 80, _ok->sizeHint().height() ); connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) ); _ok->setEnabled( FALSE ); _save = new TQPushButton( i18n( "Save Log..." ), this ); - _save->setFixedSize( 80, _save->tqsizeHint().height() ); + _save->setFixedSize( 80, _save->sizeHint().height() ); connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) ); _save->setEnabled( FALSE ); _abort = new TQPushButton( i18n( "Abort" ), this ); - _abort->setFixedSize( 80, _abort->tqsizeHint().height() ); + _abort->setFixedSize( 80, _abort->sizeHint().height() ); connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); diff --git a/kdat/IndexDlg.h b/kdat/IndexDlg.h index ffbc505..41a4070 100644 --- a/kdat/IndexDlg.h +++ b/kdat/IndexDlg.h @@ -34,7 +34,7 @@ class Tape; class TarParser; /** - * @short tqStatus dialog for recreating a tape index. + * @short Status dialog for recreating a tape index. */ class IndexDlg : public TQDialog { Q_OBJECT diff --git a/kdat/KDat.kdoc b/kdat/KDat.kdoc index 21b5a50..2bf6349 100644 --- a/kdat/KDat.kdoc +++ b/kdat/KDat.kdoc @@ -387,7 +387,7 @@ TapeDrive::seek=TapeDrive.html#seek TapeDrive::unlock=TapeDrive.html#unlock TapeDrive::write=TapeDrive.html#write TapeDrive::slotTapeBlockSize=TapeDrive.html#slotTapeBlockSize -TapeDrive::slottqStatus=TapeDrive.html#slottqStatus +TapeDrive::slotStatus=TapeDrive.html#slotStatus TapeDrive::status=TapeDrive.html#status TapeInfoDlg=TapeInfoDlg.html TapeInfoDlg=TapeInfoDlg.html @@ -475,7 +475,7 @@ KTreeViewItem::KTreeViewItem=KTreeViewItem.html#KTreeViewItem KTreeViewItem::KTreeViewItem=KTreeViewItem.html#KTreeViewItem KTreeViewItem::~KTreeViewItem=KTreeViewItem.html#~KTreeViewItem KTreeViewItem::appendChild=KTreeViewItem.html#appendChild -KTreeViewItem::tqchildAt=KTreeViewItem.html#tqchildAt +KTreeViewItem::childAt=KTreeViewItem.html#childAt KTreeViewItem::childCount=KTreeViewItem.html#childCount KTreeViewItem::childIndex=KTreeViewItem.html#childIndex KTreeViewItem::expandButtonClicked=KTreeViewItem.html#expandButtonClicked diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index 3bc2b6d..9a7d776 100644 --- a/kdat/KDatMainWindow.cpp +++ b/kdat/KDatMainWindow.cpp @@ -211,7 +211,7 @@ KDatMainWindow::KDatMainWindow() _tree->insertItem( _backupProfileRootNode = new BackupProfileRootNode() ); _tree->insertItem( new TapeIndexRootNode() ); - connect( TapeDrive::instance(), TQT_SIGNAL( sigtqStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) ); + connect( TapeDrive::instance(), TQT_SIGNAL( sigStatus( const TQString & ) ), this, TQT_SLOT( status( const TQString & ) ) ); setTapePresent( FALSE ); @@ -446,7 +446,7 @@ void KDatMainWindow::fileBackup() backupProfile.setRemoveSnapshot( bp->getRemoveSnapshot() ); } else { TQString name; - name = i18n( "Archive created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) ); + name = i18n( "Archive created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) ); name = name.stripWhiteSpace(); TQStringList files; @@ -556,15 +556,15 @@ void KDatMainWindow::doVerify( bool restore ) Archive* archive = 0; // Check for marked files first. for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) { - if ( ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ) || - ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->hasSelectedChildren() )) { - archiveNode = (MountedArchiveNode*)_tapeDriveNode->tqchildAt( i ); + if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) || + ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->hasSelectedChildren() )) { + archiveNode = (MountedArchiveNode*)_tapeDriveNode->childAt( i ); archive = archiveNode->getArchive(); /* 2002-01-30 LEW */ #ifdef DEBUG printf("KDatMainWindow::doVerify: %d node of %s: ", i, (SelectableNode*)_tapeDriveNode->getText().latin1() ); - if( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ){ + if( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ){ printf("is completely selected\n"); } else { printf("is partially selected\n"); @@ -608,10 +608,10 @@ void KDatMainWindow::doVerify( bool restore ) } for ( int i = rangeableNode->childCount() - 1; i >= 0; i-- ) { - if ( ((Node*)rangeableNode->tqchildAt( i ))->isType( Node::MountedTapeDirectoryNodeType ) ) { - files.append( ((MountedTapeDirectoryNode*)rangeableNode->tqchildAt( i ))->getFullPath() ); - } else if ( ((Node*)rangeableNode->tqchildAt( i ))->isType( Node::MountedTapeFileNodeType ) ) { - files.append( ((MountedTapeFileNode*)rangeableNode->tqchildAt( i ))->getFullPath() ); + if ( ((Node*)rangeableNode->childAt( i ))->isType( Node::MountedTapeDirectoryNodeType ) ) { + files.append( ((MountedTapeDirectoryNode*)rangeableNode->childAt( i ))->getFullPath() ); + } else if ( ((Node*)rangeableNode->childAt( i ))->isType( Node::MountedTapeFileNodeType ) ) { + files.append( ((MountedTapeFileNode*)rangeableNode->childAt( i ))->getFullPath() ); } else { assert( FALSE ); } @@ -634,7 +634,7 @@ void KDatMainWindow::doVerify( bool restore ) } for ( int i = archiveNode->childCount() - 1; i >= 0; i-- ) { - stack.push( (RangeableNode*)archiveNode->tqchildAt( i ) ); + stack.push( (RangeableNode*)archiveNode->childAt( i ) ); } RangeableNode* sel = 0; while ( stack.count() > 0 ) { @@ -654,7 +654,7 @@ void KDatMainWindow::doVerify( bool restore ) } } else if ( sel->hasSelectedChildren() ) { for ( int i = sel->childCount() - 1; i >= 0; i-- ) { - stack.push( (RangeableNode*)sel->tqchildAt( i ) ); + stack.push( (RangeableNode*)sel->childAt( i ) ); } } } @@ -865,7 +865,7 @@ void KDatMainWindow::fileFormatTape() i18n("Format Tape"), i18n("Format")); if (result == KMessageBox::Continue ) { TQString name; - name = i18n( "Tape created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::tqcurrentDate(), true) ); + name = i18n( "Tape created on %1" ).tqarg( KGlobal::locale()->formatDate(TQDate::currentDate(), true) ); FormatOptDlg dlg( name.stripWhiteSpace(), this ); if ( dlg.exec() != TQDialog::Accepted ) { return; @@ -1165,7 +1165,7 @@ void KDatMainWindow::getBackupFiles( TQStringList& files ) files.append( sel->getFullPath() ); } else if ( sel->hasSelectedChildren() ) { for ( int i = sel->childCount() - 1; i >= 0; i-- ) { - stack.push( (ArchiveableNode*)sel->tqchildAt( i ) ); + stack.push( (ArchiveableNode*)sel->childAt( i ) ); } } } @@ -1192,9 +1192,9 @@ void KDatMainWindow::setBackupFiles( const TQStringList& files ) } int i; for ( i = n->childCount() - 1; i >=0; i-- ) { - tmp = ((ArchiveableNode*)n->tqchildAt( i ))->getFullPath(); + tmp = ((ArchiveableNode*)n->childAt( i ))->getFullPath(); if ( tmp == (*it).left( tmp.length() ) ) { - n = (ArchiveableNode*)n->tqchildAt( i ); + n = (ArchiveableNode*)n->childAt( i ); break; } } @@ -1251,8 +1251,8 @@ void KDatMainWindow::configureUI( Tape* tape ) bool canRestore = ( tape ) && ( sel ) && sel->isType( Node::RangeableNodeType ); if ( !canRestore ) { for ( int i = _tapeDriveNode->childCount() - 1; i >= 0; i-- ) { - if ( ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->isSelected() ) || - ( ((SelectableNode*)_tapeDriveNode->tqchildAt( i ))->hasSelectedChildren() )) { + if ( ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->isSelected() ) || + ( ((SelectableNode*)_tapeDriveNode->childAt( i ))->hasSelectedChildren() )) { canRestore = TRUE; break; } @@ -1348,7 +1348,7 @@ void KDatMainWindow::create_backup_dialog() _lbl->setGeometry( TQRect( 30, 20, 350, 200 ) ); _cancel = new KPushButton( KStdGuiItem::cancel(), _backupdialog ); - _cancel->setFixedSize( 80, _cancel->tqsizeHint().height() ); + _cancel->setFixedSize( 80, _cancel->sizeHint().height() ); _cancel->setEnabled( TRUE ); /* 2002-01-24 LEW: looks like we can't increase the button width to accomodate a wider message :( */ @@ -1357,7 +1357,7 @@ void KDatMainWindow::create_backup_dialog() connect( _cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( backupCancel() ) ); _continue = new KPushButton( KStdGuiItem::cont(), _backupdialog ); - _continue->setFixedSize( 80, _continue->tqsizeHint().height() ); + _continue->setFixedSize( 80, _continue->sizeHint().height() ); _continue->setEnabled( TRUE ); _continue->setDefault( TRUE ); // _continue->setGeometry( TQRect( 200, 170, 0, 0 ) ); /* 2002-01-28 LEW */ diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp index 3505dfb..6adc0f1 100644 --- a/kdat/LoggerWidget.cpp +++ b/kdat/LoggerWidget.cpp @@ -33,7 +33,7 @@ LoggerWidget::LoggerWidget( const TQString & title, TQWidget* parent, const char : TQWidget( parent, name ) { TQLabel* lbl1 = new TQLabel( title, this ); - lbl1->setFixedHeight( lbl1->tqsizeHint().height() ); + lbl1->setFixedHeight( lbl1->sizeHint().height() ); _mle = new TQMultiLineEdit( this ); _mle->setReadOnly( TRUE ); diff --git a/kdat/Node.cpp b/kdat/Node.cpp index 006e978..6e1b174 100644 --- a/kdat/Node.cpp +++ b/kdat/Node.cpp @@ -58,7 +58,7 @@ void Node::insertNode( Node* child ) if ( lastParent != this ) { // Recompute lastDirIndex. for ( lastDirIndex = 0; - ( lastDirIndex < childCount() ) && ( ((Node*)tqchildAt( lastDirIndex ))->getType() == TapeDirectoryNodeType ); + ( lastDirIndex < childCount() ) && ( ((Node*)childAt( lastDirIndex ))->getType() == TapeDirectoryNodeType ); lastDirIndex++ ); lastParent = this; } @@ -83,7 +83,7 @@ void Node::insertNode( Node* child ) while ( min < max ) { mid = ( max - min ) / 2 + min; //mid = ( min + max ) / 2; - if ( child->getText().compare( tqchildAt( mid )->getText() ) < 0 ) { + if ( child->getText().compare( childAt( mid )->getText() ) < 0 ) { max = mid - 1; } else { min = mid + 1; @@ -94,8 +94,8 @@ void Node::insertNode( Node* child ) // KLUDGE! mid -= 5; if ( mid < smin ) mid = smin; - if ( ((Node*)tqchildAt( mid ))->getType() != child->getType() ) mid++; - for ( ; ( mid <= smax ) && ( child->getText().compare( tqchildAt( mid )->getText() ) > 0 ); mid++ ); + if ( ((Node*)childAt( mid ))->getType() != child->getType() ) mid++; + for ( ; ( mid <= smax ) && ( child->getText().compare( childAt( mid )->getText() ) > 0 ); mid++ ); //printf( "index = %d, text = '%s'\n", mid, child->getText().data() ); insertChild( mid, child ); } else { @@ -181,14 +181,14 @@ bool TapeNode::validate() // Remove deleted archives. Archive* a; for ( uint j = 0; j < childCount(); ) { - a = ((ArchiveNode*)tqchildAt( j ))->getArchive(); + a = ((ArchiveNode*)childAt( j ))->getArchive(); for ( i.toFirst(); i.current(); ++i ) { if ( i.current() == a ) { break; } } if ( !i.current() ) { - removeChild( tqchildAt( j ) ); + removeChild( childAt( j ) ); } else { j++; } @@ -235,8 +235,8 @@ ArchiveNode* TapeNode::findArchiveNode( Archive* archive ) { ArchiveNode* n = 0; for ( uint i = 0; i < childCount(); i++ ) { - if ( ((ArchiveNode*)tqchildAt( i ))->getArchive() == archive ) { - n = (ArchiveNode*)tqchildAt( i ); + if ( ((ArchiveNode*)childAt( i ))->getArchive() == archive ) { + n = (ArchiveNode*)childAt( i ); break; } } @@ -411,7 +411,7 @@ void SelectableNode::doUpdateState() bool hasSelected = FALSE; bool allSelected = TRUE; for ( uint i = 0; i < childCount(); i++ ) { - switch ( ((SelectableNode*)tqchildAt( i ))->_state ) { + switch ( ((SelectableNode*)childAt( i ))->_state ) { case SelAll: oneSelected = TRUE; hasSelected = TRUE; @@ -446,12 +446,12 @@ void SelectableNode::doSetSelected( bool select ) // All my tqchildren get the same selection state. for ( uint i = 0; i < childCount(); i++ ) { if ( select ) { - if ( !((SelectableNode*)tqchildAt( i ))->isSelected() ) { - ((SelectableNode*)tqchildAt( i ))->doSetSelected( TRUE ); + if ( !((SelectableNode*)childAt( i ))->isSelected() ) { + ((SelectableNode*)childAt( i ))->doSetSelected( TRUE ); } } else { - if ( ((SelectableNode*)tqchildAt( i ))->isSelected() || ((SelectableNode*)tqchildAt( i ))->hasSelectedChildren() ) { - ((SelectableNode*)tqchildAt( i ))->doSetSelected( FALSE ); + if ( ((SelectableNode*)childAt( i ))->isSelected() || ((SelectableNode*)childAt( i ))->hasSelectedChildren() ) { + ((SelectableNode*)childAt( i ))->doSetSelected( FALSE ); } } } @@ -549,7 +549,7 @@ void SelectableNode::paintText( TQPainter* p, int indent, int cellHeight, p->fontMetrics().leading()) / 2); if (highlighted) { paintHighlight(p, indent, cg, owner->hasFocus(), - (TQt::GUIStyle)owner->tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;) + (TQt::GUIStyle)owner->tqstyle().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;) p->setPen(cg.base()); p->setBackgroundColor(cg.text()); } @@ -657,8 +657,8 @@ void MountedArchiveNode::setSelected( bool select ) // Deselect all other archives. Node* parent = (Node*)getParent(); for ( int i = parent->childCount() - 1; i >= 0; i-- ) { - if ( parent->tqchildAt( i ) != this ) { - ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE ); + if ( parent->childAt( i ) != this ) { + ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE ); } } } @@ -757,8 +757,8 @@ void MountedTapeDirectoryNode::setSelected( bool select ) parent = (Node*)parent->getParent(); } for ( int i = parent->childCount() - 1; i >= 0; i-- ) { - if ( parent->tqchildAt( i ) != arcNode ) { - ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE ); + if ( parent->childAt( i ) != arcNode ) { + ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE ); } } } @@ -863,8 +863,8 @@ void MountedTapeFileNode::setSelected( bool select ) parent = (Node*)parent->getParent(); } for ( int i = parent->childCount() - 1; i >= 0; i-- ) { - if ( parent->tqchildAt( i ) != arcNode ) { - ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE ); + if ( parent->childAt( i ) != arcNode ) { + ((SelectableNode*)parent->childAt( i ))->setSelected( FALSE ); } } } @@ -1304,14 +1304,14 @@ void TapeDriveNode::slotTapeModified( Tape* tape ) // Remove deleted archives. Archive* a; for ( uint j = 0; j < childCount(); ) { - a = ((MountedArchiveNode*)tqchildAt( j ))->getArchive(); + a = ((MountedArchiveNode*)childAt( j ))->getArchive(); for ( i.toFirst(); i.current(); ++i ) { if ( i.current() == a ) { break; } } if ( !i.current() ) { - Node::removeChild( tqchildAt( j ) ); + Node::removeChild( childAt( j ) ); } else { j++; } @@ -1322,8 +1322,8 @@ MountedArchiveNode* TapeDriveNode::findArchiveNode( Archive* archive ) { MountedArchiveNode* n = 0; for ( uint i = 0; i < childCount(); i++ ) { - if ( ((MountedArchiveNode*)tqchildAt( i ))->getArchive() == archive ) { - n = (MountedArchiveNode*)tqchildAt( i ); + if ( ((MountedArchiveNode*)childAt( i ))->getArchive() == archive ) { + n = (MountedArchiveNode*)childAt( i ); break; } } @@ -1417,7 +1417,7 @@ TapeNode* TapeIndexRootNode::findTapeNode( Tape* tape ) { TapeNode* n = 0; for ( uint i = 0; i < childCount(); i++ ) { - n = (TapeNode*)tqchildAt( i ); + n = (TapeNode*)childAt( i ); if ( n->getTape() == tape ) { return n; } @@ -1575,7 +1575,7 @@ BackupProfileNode* BackupProfileRootNode::findBackupProfileNode( BackupProfile* { BackupProfileNode* n = 0; for ( uint i = 0; i < childCount(); i++ ) { - n = (BackupProfileNode*)tqchildAt( i ); + n = (BackupProfileNode*)childAt( i ); if ( n->getBackupProfile() == backupProfile ) { return n; } diff --git a/kdat/OptionsDlgWidget.ui b/kdat/OptionsDlgWidget.ui index aaa9348..f4c96a6 100644 --- a/kdat/OptionsDlgWidget.ui +++ b/kdat/OptionsDlgWidget.ui @@ -43,7 +43,7 @@ <property name="name"> <cstring>_defaultTapeSize</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>96</width> <height>0</height> @@ -60,7 +60,7 @@ <property name="name"> <cstring>_tapeBlockSize</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>96</width> <height>0</height> @@ -283,7 +283,7 @@ You must still specify the block size.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kdat/TapeDrive.cpp b/kdat/TapeDrive.cpp index 4fbcb25..2e4c59b 100644 --- a/kdat/TapeDrive.cpp +++ b/kdat/TapeDrive.cpp @@ -170,15 +170,15 @@ bool TapeDrive::isTapePresent() } // Get tape status. - struct mtget tapetqStatus; - int ret = ioctl( _fd, MTIOCGET, &tapetqStatus ); + struct mtget tapeStatus; + int ret = ioctl( _fd, MTIOCGET, &tapeStatus ); if ( ret < 0 ) { return FALSE; } // Check for the presence of a tape. -// if ( !GMT_DR_OPEN( tapetqStatus.mt_gstat ) ) { - if ( GMT_ONLINE( tapetqStatus.mt_gstat ) ) { +// if ( !GMT_DR_OPEN( tapeStatus.mt_gstat ) ) { + if ( GMT_ONLINE( tapeStatus.mt_gstat ) ) { // Lock the tape drive door. //struct mtop tapeOp; //tapeOp.mt_op = MTLOCK; @@ -189,9 +189,9 @@ bool TapeDrive::isTapePresent() //} if ( _readOnly ) { - emit sigtqStatus( i18n( "Tape mounted readonly." ) ); + emit sigStatus( i18n( "Tape mounted readonly." ) ); } else { - emit sigtqStatus( i18n( "Tape mounted read/write." ) ); + emit sigStatus( i18n( "Tape mounted read/write." ) ); } return TRUE; } else { @@ -221,14 +221,14 @@ Tape* TapeDrive::readHeader() _tape = NULL; // Rewind tape. - emit sigtqStatus( "Rewinding tape..." ); + emit sigStatus( "Rewinding tape..." ); if ( !rewind() ) { KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Rewinding tape failed." )); return NULL; } // KDat magic string. - emit sigtqStatus( i18n( "Reading magic string..." ) ); + emit sigStatus( i18n( "Reading magic string..." ) ); char magic[9]; if ( read( magic, 9 ) < 9 ) { KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading magic string failed." )); @@ -240,7 +240,7 @@ Tape* TapeDrive::readHeader() } // Read version number. - emit sigtqStatus( i18n( "Reading version number..." ) ); + emit sigStatus( i18n( "Reading version number..." ) ); int version; if ( read( (char*)&version, 4 ) < 4 ) { KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading version number failed." )); @@ -252,7 +252,7 @@ Tape* TapeDrive::readHeader() } // Read tape ID. - emit sigtqStatus( i18n( "Reading tape ID..." ) ); + emit sigStatus( i18n( "Reading tape ID..." ) ); int len; if ( read( (char*)&len, 4 ) < 4 ) { KMessageBox::error( KDatMainWindow::getInstance(), i18n( "Reading tape ID length failed." )); @@ -517,12 +517,12 @@ bool TapeDrive::seek( int file, int tarBlock ) flush(); // Go to the desired archive. - emit sigtqStatus( i18n( "Skipping to archive..." ) ); + emit sigStatus( i18n( "Skipping to archive..." ) ); int curFile = getFile(); // printf( "TapeDrive::seek() -- curFile = %d\n", curFile ); if ( curFile < 0 ) { - emit sigtqStatus( i18n( "Rewinding tape..." ) ); + emit sigStatus( i18n( "Rewinding tape..." ) ); rewind(); curFile = 0; } @@ -539,11 +539,11 @@ bool TapeDrive::seek( int file, int tarBlock ) // printf( "TapeDrive::seek() -- desired tapeBlock = %d\n", tapeBlock ); // Go to the desired record within the archive. - emit sigtqStatus( i18n( "Skipping to block..." ) ); + emit sigStatus( i18n( "Skipping to block..." ) ); int curBlock = getBlock(); // printf( "TapeDrive::seek() -- curBlock = %d\n", curBlock ); if ( curBlock < 0 ) { - emit sigtqStatus( i18n( "Rewinding tape..." ) ); + emit sigStatus( i18n( "Rewinding tape..." ) ); rewind(); nextFile( file ); if ( ( curBlock = getBlock() ) < 0 ) { @@ -597,13 +597,13 @@ bool TapeDrive::pastEOF() return FALSE; } - struct mtget tapetqStatus; - if ( ioctl( _fd, MTIOCGET, &tapetqStatus ) < 0 ) { + struct mtget tapeStatus; + if ( ioctl( _fd, MTIOCGET, &tapeStatus ) < 0 ) { printf( "TapeDrive::pastEOF() -- ioctl( MTIOCGET ) failed!\n" ); return FALSE; } - return GMT_EOF( tapetqStatus.mt_gstat ); + return GMT_EOF( tapeStatus.mt_gstat ); } bool TapeDrive::setBlockSize( int blockSize ) diff --git a/kdat/TapeDrive.h b/kdat/TapeDrive.h index 06a0b82..7e49aa2 100644 --- a/kdat/TapeDrive.h +++ b/kdat/TapeDrive.h @@ -242,7 +242,7 @@ signals: * * @param msg The informational message. */ - void sigtqStatus( const TQString & msg ); + void sigStatus( const TQString & msg ); }; #endif diff --git a/kdat/TapeFileInfoWidget.cpp b/kdat/TapeFileInfoWidget.cpp index 2a87862..239d7f1 100644 --- a/kdat/TapeFileInfoWidget.cpp +++ b/kdat/TapeFileInfoWidget.cpp @@ -39,32 +39,32 @@ TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* parent, const char* name ) TQLabel* lbl4 = new TQLabel( i18n( "Start record:" ), this ); TQLabel* lbl5 = new TQLabel( i18n( "End record:" ), this ); - int max = lbl1->tqsizeHint().width(); - if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width(); - if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width(); - if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width(); - if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width(); - - lbl1->setFixedSize( max, lbl1->tqsizeHint().height() ); - lbl2->setFixedSize( max, lbl2->tqsizeHint().height() ); - lbl3->setFixedSize( max, lbl3->tqsizeHint().height() ); - lbl4->setFixedSize( max, lbl4->tqsizeHint().height() ); - lbl5->setFixedSize( max, lbl5->tqsizeHint().height() ); + int max = lbl1->sizeHint().width(); + if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width(); + if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width(); + if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width(); + if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width(); + + lbl1->setFixedSize( max, lbl1->sizeHint().height() ); + lbl2->setFixedSize( max, lbl2->sizeHint().height() ); + lbl3->setFixedSize( max, lbl3->sizeHint().height() ); + lbl4->setFixedSize( max, lbl4->sizeHint().height() ); + lbl5->setFixedSize( max, lbl5->sizeHint().height() ); _fileName = new TQLabel( "???", this ); - _fileName->setFixedHeight( _fileName->tqsizeHint().height() ); + _fileName->setFixedHeight( _fileName->sizeHint().height() ); _mtime = new TQLabel( "???", this ); - _mtime->setFixedHeight( _mtime->tqsizeHint().height() ); + _mtime->setFixedHeight( _mtime->sizeHint().height() ); _size = new TQLabel( "???", this ); - _size->setFixedHeight( _size->tqsizeHint().height() ); + _size->setFixedHeight( _size->sizeHint().height() ); _startRecord = new TQLabel( "???", this ); - _startRecord->setFixedHeight( _startRecord->tqsizeHint().height() ); + _startRecord->setFixedHeight( _startRecord->sizeHint().height() ); _endRecord = new TQLabel( "???", this ); - _endRecord->setFixedHeight( _endRecord->tqsizeHint().height() ); + _endRecord->setFixedHeight( _endRecord->sizeHint().height() ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 ); diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp index 3e94ae8..9ee819a 100644 --- a/kdat/TapeInfoWidget.cpp +++ b/kdat/TapeInfoWidget.cpp @@ -49,50 +49,50 @@ TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name ) TQLabel* lbl6 = new TQLabel( i18n( "Archive count:" ), this ); TQLabel* lbl7 = new TQLabel( i18n( "Space used:" ), this ); - int max = lbl1->tqsizeHint().width(); - if ( lbl2->tqsizeHint().width() > max ) max = lbl2->tqsizeHint().width(); - if ( lbl3->tqsizeHint().width() > max ) max = lbl3->tqsizeHint().width(); - if ( lbl4->tqsizeHint().width() > max ) max = lbl4->tqsizeHint().width(); - if ( lbl5->tqsizeHint().width() > max ) max = lbl5->tqsizeHint().width(); - if ( lbl6->tqsizeHint().width() > max ) max = lbl6->tqsizeHint().width(); - if ( lbl7->tqsizeHint().width() > max ) max = lbl7->tqsizeHint().width(); - - lbl1->setFixedSize( max, lbl1->tqsizeHint().height() ); - lbl2->setFixedSize( max, lbl2->tqsizeHint().height() ); - lbl3->setFixedSize( max, lbl3->tqsizeHint().height() ); - lbl4->setFixedSize( max, lbl4->tqsizeHint().height() ); - lbl5->setFixedSize( max, lbl5->tqsizeHint().height() ); - lbl6->setFixedSize( max, lbl6->tqsizeHint().height() ); - lbl7->setFixedSize( max, lbl7->tqsizeHint().height() ); + int max = lbl1->sizeHint().width(); + if ( lbl2->sizeHint().width() > max ) max = lbl2->sizeHint().width(); + if ( lbl3->sizeHint().width() > max ) max = lbl3->sizeHint().width(); + if ( lbl4->sizeHint().width() > max ) max = lbl4->sizeHint().width(); + if ( lbl5->sizeHint().width() > max ) max = lbl5->sizeHint().width(); + if ( lbl6->sizeHint().width() > max ) max = lbl6->sizeHint().width(); + if ( lbl7->sizeHint().width() > max ) max = lbl7->sizeHint().width(); + + lbl1->setFixedSize( max, lbl1->sizeHint().height() ); + lbl2->setFixedSize( max, lbl2->sizeHint().height() ); + lbl3->setFixedSize( max, lbl3->sizeHint().height() ); + lbl4->setFixedSize( max, lbl4->sizeHint().height() ); + lbl5->setFixedSize( max, lbl5->sizeHint().height() ); + lbl6->setFixedSize( max, lbl6->sizeHint().height() ); + lbl7->setFixedSize( max, lbl7->sizeHint().height() ); _tapeName = new TQLineEdit( this ); - _tapeName->setFixedHeight( _tapeName->tqsizeHint().height() ); + _tapeName->setFixedHeight( _tapeName->sizeHint().height() ); _tapeSize = new TQLineEdit( this ); - _tapeSize->setFixedSize( 48, _tapeSize->tqsizeHint().height() ); + _tapeSize->setFixedSize( 48, _tapeSize->sizeHint().height() ); _tapeSizeUnits = new TQComboBox( this ); - _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->tqsizeHint().height() ); + _tapeSizeUnits->setFixedSize( 48, _tapeSizeUnits->sizeHint().height() ); _tapeSizeUnits->insertItem( "MB" ); _tapeSizeUnits->insertItem( "GB" ); _tapeID = new TQLabel( "???", this ); - _tapeID->setFixedHeight( _tapeID->tqsizeHint().height() ); + _tapeID->setFixedHeight( _tapeID->sizeHint().height() ); _ctime = new TQLabel( "???", this ); - _ctime->setFixedHeight( _ctime->tqsizeHint().height() ); + _ctime->setFixedHeight( _ctime->sizeHint().height() ); _mtime = new TQLabel( "???", this ); - _mtime->setFixedHeight( _mtime->tqsizeHint().height() ); + _mtime->setFixedHeight( _mtime->sizeHint().height() ); _archiveCount = new TQLabel( "???", this ); - _archiveCount->setFixedHeight( _archiveCount->tqsizeHint().height() ); + _archiveCount->setFixedHeight( _archiveCount->sizeHint().height() ); _spaceUsed = new TQLabel( "???", this ); - _spaceUsed->setFixedHeight( _spaceUsed->tqsizeHint().height() ); + _spaceUsed->setFixedHeight( _spaceUsed->sizeHint().height() ); _apply = new KPushButton( KStdGuiItem::apply(), this ); - _apply->setFixedSize( 80, _apply->tqsizeHint().height() ); + _apply->setFixedSize( 80, _apply->sizeHint().height() ); _apply->setEnabled( FALSE ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 4, 4 ); @@ -202,7 +202,7 @@ void TapeInfoWidget::setTape( Tape* tape ) used *= blockSize / 1024; } if ( _tape->getSize() > 0 ) { - tmp = TQString::tqfromLatin1( "%1 / %2 (%3%)") + tmp = TQString::fromLatin1( "%1 / %2 (%3%)") .tqarg(Util::kbytesToString( used )) .tqarg(Util::kbytesToString( _tape->getSize() )) .tqarg(used * 100 / _tape->getSize() ); diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp index 209c177..f15dcff 100644 --- a/kdat/VerifyDlg.cpp +++ b/kdat/VerifyDlg.cpp @@ -89,46 +89,46 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList& f2->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); TQLabel* lbl1 = new TQLabel( i18n( "Elapsed time:" ), f1 ); - lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() ); + lbl1->setFixedSize( labelWidth, lbl1->sizeHint().height() ); _elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 ); - _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() ); + _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() ); TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 ); - lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() ); + lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() ); _timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 ); - _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() ); + _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() ); TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 ); - lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() ); + lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() ); TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( _archiveSize ), f1 ); - totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() ); + totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() ); TQLabel* lbl4 = new TQLabel( i18n( "KB read:" ), f2 ); - lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() ); + lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() ); _kbytesRead = new TQLabel( i18n( "0KB" ), f2 ); - _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() ); + _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() ); TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 ); - lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() ); + lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() ); _transferRate = new TQLabel( i18n( "0KB/min" ), f1 ); - _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() ); + _transferRate->setFixedHeight( _transferRate->sizeHint().height() ); TQLabel* lbl6; if ( _restore ) { lbl6 = new TQLabel( i18n( "Files:" ), f2 ); - lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() ); + lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() ); } else { lbl6 = new TQLabel( i18n( "Differences:" ), f2 ); - lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() ); + lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() ); } _files = new TQLabel( "0", f2 ); - _files->setFixedHeight( _files->tqsizeHint().height() ); + _files->setFixedHeight( _files->sizeHint().height() ); if ( _restore ) { _log = new LoggerWidget( i18n( "Restore log:" ), this ); @@ -137,17 +137,17 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList& } _ok = new KPushButton( KStdGuiItem::ok(), this ); - _ok->setFixedSize( 80, _ok->tqsizeHint().height() ); + _ok->setFixedSize( 80, _ok->sizeHint().height() ); connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) ); _ok->setEnabled( FALSE ); _save = new TQPushButton( i18n( "&Save Log..." ), this ); - _save->setFixedSize( 80, _save->tqsizeHint().height() ); + _save->setFixedSize( 80, _save->sizeHint().height() ); connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) ); _save->setEnabled( FALSE ); _abort = new TQPushButton( i18n( "&Abort" ), this ); - _abort->setFixedSize( 80, _abort->tqsizeHint().height() ); + _abort->setFixedSize( 80, _abort->sizeHint().height() ); connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h index 41df846..e9b5db6 100644 --- a/kdat/VerifyDlg.h +++ b/kdat/VerifyDlg.h @@ -33,7 +33,7 @@ class LoggerWidget; class TapeDrive; /** - * @short tqStatus dialog for verifying/restoring parts of an archive. + * @short Status dialog for verifying/restoring parts of an archive. */ class VerifyDlg : public TQDialog { Q_OBJECT diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp index a1f1353..f65d41f 100644 --- a/kdat/VerifyOptDlg.cpp +++ b/kdat/VerifyOptDlg.cpp @@ -51,14 +51,14 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo } else { lbl1 = new TQLabel( i18n( "Verify in folder:" ), this ); } - lbl1->setFixedSize( lbl1->tqsizeHint() ); + lbl1->setFixedSize( lbl1->sizeHint() ); _entry = new TQLineEdit( this ); _entry->setText( def ); - _entry->setFixedHeight( _entry->tqsizeHint().height() ); + _entry->setFixedHeight( _entry->sizeHint().height() ); TQPushButton* browse = new TQPushButton( i18n( "..." ), this ); - browse->setFixedSize( browse->tqsizeHint() ); + browse->setFixedSize( browse->sizeHint() ); TQLabel* lbl2; if ( _restore ) { @@ -66,15 +66,15 @@ VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, boo } else { lbl2 = new TQLabel( i18n( "Verify files:" ), this ); } - lbl2->setFixedHeight( lbl2->tqsizeHint().height() ); + lbl2->setFixedHeight( lbl2->sizeHint().height() ); TQListBox* fileList = new TQListBox( this ); fileList->insertStringList(files); KPushButton* ok = new KPushButton( KStdGuiItem::ok(), this ); - ok->setFixedSize( 80, ok->tqsizeHint().height() ); + ok->setFixedSize( 80, ok->sizeHint().height() ); KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), this ); - cancel->setFixedSize( 80, cancel->tqsizeHint().height() ); + cancel->setFixedSize( 80, cancel->sizeHint().height() ); TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 ); diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp index 516fb92..9c08c54 100644 --- a/kdat/ktreeview.cpp +++ b/kdat/ktreeview.cpp @@ -121,7 +121,7 @@ TQRect KTreeViewItem::boundingRect(int indent) const } // returns the child item at the specified index -KTreeViewItem* KTreeViewItem::tqchildAt(int index) const +KTreeViewItem* KTreeViewItem::childAt(int index) const { if (!hasChild()) return 0; @@ -333,14 +333,14 @@ void KTreeViewItem::paintExpandButton(TQPainter* p, int indent, int cellHeight) } // paint the highlight -void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& tqcolorGroup, +void KTreeViewItem::paintHighlight(TQPainter* p, int indent, const TQColorGroup& colorGroup, bool hasFocus, TQt::GUIStyle style) const { TQColor fc; if (style == TQt::WindowsStyle) fc = TQt::darkBlue; /* hardcoded in TQt */ else - fc = tqcolorGroup.text(); + fc = colorGroup.text(); TQRect textRect = textBoundingRect(indent); int t,l,b,r; textRect.coords(&l, &t, &r, &b); @@ -372,7 +372,7 @@ void KTreeViewItem::paintText(TQPainter* p, int indent, int cellHeight, p->fontMetrics().leading()) / 2); if (highlighted) { paintHighlight(p, indent, cg, owner->hasFocus(), - (TQt::GUIStyle)owner->tqstyle().tqstyleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;) + (TQt::GUIStyle)owner->tqstyle().styleHint(TQStyle::SH_GUIStyle)); // TQt3 doesn't make this easy ;) p->setPen(cg.base()); p->setBackgroundColor(cg.text()); } @@ -599,7 +599,7 @@ KTreeView::KTreeView(TQWidget *parent, //case WindowsStyle: //case MotifStyle: setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); - setBackgroundColor(tqcolorGroup().base()); + setBackgroundColor(colorGroup().base()); //break; /*default: setFrameStyle(TQFrame::Panel | TQFrame::Plain); @@ -1649,7 +1649,7 @@ void KTreeView::lowerItem(KTreeViewItem *item) bool autoU = autoUpdate(); setAutoUpdate(FALSE); takeItem(item); - insertItem(itemParent->tqchildAt(itemChildIndex), item, FALSE); + insertItem(itemParent->childAt(itemChildIndex), item, FALSE); if(autoU && isVisible()) tqrepaint(); setAutoUpdate(autoU); @@ -1859,7 +1859,7 @@ void KTreeView::paintCell(TQPainter* p, int row, int) return; p->setClipRect(cellRect(), TQPainter::CoordPainter ); - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); int indent = indentation(item); item->paint(p, indent, cg, current == row); /* highlighted */ @@ -1875,7 +1875,7 @@ void KTreeView::raiseItem(KTreeViewItem *item) bool autoU = autoUpdate(); setAutoUpdate(FALSE); takeItem(item); - insertItem(itemParent->tqchildAt(--itemChildIndex), item, TRUE); + insertItem(itemParent->childAt(--itemChildIndex), item, TRUE); if(autoU && isVisible()) tqrepaint(); setAutoUpdate(autoU); @@ -1961,7 +1961,7 @@ void KTreeView::split(KTreeViewItem *item) bool autoU = autoUpdate(); setAutoUpdate(FALSE); takeItem(item); - appendChildItem(itemParent->tqchildAt(--itemChildIndex), item); + appendChildItem(itemParent->childAt(--itemChildIndex), item); if(autoU && isVisible()) tqrepaint(); setAutoUpdate(autoU); diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h index d0af2d5..deed0f8 100644 --- a/kdat/ktreeview.h +++ b/kdat/ktreeview.h @@ -70,7 +70,7 @@ public: * Returns a pointer to the child item at the given index in this * item's sub tree, or 0 if not found. */ - KTreeViewItem* tqchildAt(int index) const; + KTreeViewItem* childAt(int index) const; /** * Returns the number of child items in this item's sub tree. |