1 files changed, 21 insertions, 21 deletions

diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp
index 8a26d2a..1c66805 100644
--- a/kdat/BackupDlg.cpp
+++ b/kdat/BackupDlg.cpp
@@ -51,8 +51,8 @@
 
 BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir, const TQStringList& files, bool oneFilesystem, bool incremental,
                       const TQString & snapshot, bool removeSnapshot, int archiveSize, Tape* tape,
-                      TQWidget* parent, const char* name )
-        : TQDialog( parent, name, TRUE ),
+                      TQWidget* tqparent, const char* name )
+        : TQDialog( tqparent, name, TRUE ),
           _proc( NULL ),
           _tarParser( NULL ),
           _archiveName( archiveName ),
@@ -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->sizeHint().height() );
+    lbl1->setFixedSize( labelWidth, lbl1->tqsizeHint().height() );
 
     _elapsedTime = new TQLabel( i18n( "00:00:00" ), f1 );
-    _elapsedTime->setFixedHeight( _elapsedTime->sizeHint().height() );
+    _elapsedTime->setFixedHeight( _elapsedTime->tqsizeHint().height() );
 
     TQLabel* lbl2 = new TQLabel( i18n( "Time remaining:" ), f2 );
-    lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
+    lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
 
     _timeRemaining = new TQLabel( i18n( "00:00:00" ), f2 );
-    _timeRemaining->setFixedHeight( _timeRemaining->sizeHint().height() );
+    _timeRemaining->setFixedHeight( _timeRemaining->tqsizeHint().height() );
 
     TQLabel* lbl3 = new TQLabel( i18n( "Total KB:" ), f1 );
-    lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
+    lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
 
     TQLabel* totalKbytes = new TQLabel( Util::kbytesToString( archiveSize ), f1 );
-    totalKbytes->setFixedHeight( totalKbytes->sizeHint().height() );
+    totalKbytes->setFixedHeight( totalKbytes->tqsizeHint().height() );
 
     TQLabel* lbl4 = new TQLabel( i18n( "KB written:" ), f2 );
-    lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
+    lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
 
     _kbytesWritten = new TQLabel( i18n( "0KB" ), f2 );
-    _kbytesWritten->setFixedHeight( _kbytesWritten->sizeHint().height() );
+    _kbytesWritten->setFixedHeight( _kbytesWritten->tqsizeHint().height() );
 
     TQLabel* lbl5 = new TQLabel( i18n( "Transfer rate:" ), f1 );
-    lbl5->setFixedSize( labelWidth, lbl5->sizeHint().height() );
+    lbl5->setFixedSize( labelWidth, lbl5->tqsizeHint().height() );
 
     _transferRate = new TQLabel( i18n( "0KB/min" ), f1 );
-    _transferRate->setFixedHeight( _transferRate->sizeHint().height() );
+    _transferRate->setFixedHeight( _transferRate->tqsizeHint().height() );
 
     TQLabel* lbl6 = new TQLabel( i18n( "Files:" ), f2 );
-    lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
+    lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
 
     _fileCount = new TQLabel( i18n( "0" ), f2 );
-    _fileCount->setFixedHeight( _fileCount->sizeHint().height() );
+    _fileCount->setFixedHeight( _fileCount->tqsizeHint().height() );
 
     _log = new LoggerWidget( i18n( "Backup log:" ), this );
 
     _ok = new KPushButton( KStdGuiItem::ok(), this );
-    _ok->setFixedSize( 80, _ok->sizeHint().height() );
+    _ok->setFixedSize( 80, _ok->tqsizeHint().height() );
     connect( _ok, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOK() ) );
     _ok->setEnabled( FALSE );
 
     _save = new TQPushButton( i18n( "Save Log..." ), this );
-    _save->setFixedSize( 80, _save->sizeHint().height() );
+    _save->setFixedSize( 80, _save->tqsizeHint().height() );
     connect( _save, TQT_SIGNAL( clicked() ), _log, TQT_SLOT( save() ) );
     _save->setEnabled( FALSE );
 
     _abort = new KPushButton( KStdGuiItem::cancel(), this );
-    _abort->setFixedSize( 80, _abort->sizeHint().height() );
+    _abort->setFixedSize( 80, _abort->tqsizeHint().height() );
     connect( _abort, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAbort() ) );
 
     TQVBoxLayout* l1 = new TQVBoxLayout( this, 8, 4 );
@@ -299,13 +299,13 @@ void BackupDlg::slotProcessExited( KProcess* )
 
     if ( _fileName.length() > 0 ) {
         _archive->addFile( _fileSize, _fileMTime, _fileStartRecord, _totalRecords, _fileName );
-        _fileName = TQString::null;
+        _fileName = TQString();
     }
 
     TapeDrive::instance()->close();
     TapeDrive::instance()->open();
 
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
     delete _proc;
 
     _tape->addChild( _archive );
@@ -381,7 +381,7 @@ void BackupDlg::slotOK()
 
 void BackupDlg::slotAbort()
 {
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
     if ( _proc ) {
         _proc->kill();
         delete _proc;
@@ -426,7 +426,7 @@ void BackupDlg::updateStats()
     _kbytesWritten->setText( str );
 
     if ( elapsed > 0 ) {
-        str = i18n( "%1/min" ).arg(Util::kbytesToString( (int)_totalKBytes *60 / elapsed ) );
+        str = i18n( "%1/min" ).tqarg(Util::kbytesToString( (int)_totalKBytes *60 / elapsed ) );
         _transferRate->setText( str );
     }
 }