TQt4 port kdeadmin

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1237416 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 23 insertions, 23 deletions

diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp
index 7a0d71a..2808f86 100644
--- a/kdat/IndexDlg.cpp
+++ b/kdat/IndexDlg.cpp
@@ -41,8 +41,8 @@
 
 #include "IndexDlg.moc"
 
-IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name )
-        : TQDialog( parent, name, TRUE ),
+IndexDlg::IndexDlg( Tape* tape, TQWidget* tqparent, const char* name )
+        : TQDialog( tqparent, name, TRUE ),
           _tarParser( NULL ),
           _tape( tape ),
           _archive( NULL ),
@@ -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->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( "Archives:" ), f2 );
-    lbl2->setFixedSize( labelWidth, lbl2->sizeHint().height() );
+    lbl2->setFixedSize( labelWidth, lbl2->tqsizeHint().height() );
 
     _archives = new TQLabel( i18n( "0" ), f2 );
-    _archives->setFixedHeight( _archives->sizeHint().height() );
+    _archives->setFixedHeight( _archives->tqsizeHint().height() );
 
     TQLabel* lbl3 = new TQLabel( i18n( "KB read:" ), f1 );
-    lbl3->setFixedSize( labelWidth, lbl3->sizeHint().height() );
+    lbl3->setFixedSize( labelWidth, lbl3->tqsizeHint().height() );
 
     _kbytesRead = new TQLabel( i18n( "0KB" ), f1 );
-    _kbytesRead->setFixedHeight( _kbytesRead->sizeHint().height() );
+    _kbytesRead->setFixedHeight( _kbytesRead->tqsizeHint().height() );
 
     TQLabel* lbl4 = new TQLabel( i18n( "Files:" ), f2 );
-    lbl4->setFixedSize( labelWidth, lbl4->sizeHint().height() );
+    lbl4->setFixedSize( labelWidth, lbl4->tqsizeHint().height() );
 
     _files = new TQLabel( i18n( "0" ), f2 );
-    _files->setFixedHeight( _kbytesRead->sizeHint().height() );
+    _files->setFixedHeight( _kbytesRead->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( "Total files:" ), f2 );
-    lbl6->setFixedSize( labelWidth, lbl6->sizeHint().height() );
+    lbl6->setFixedSize( labelWidth, lbl6->tqsizeHint().height() );
 
     _totalFiles = new TQLabel( i18n( "0" ), f2 );
-    _totalFiles->setFixedHeight( _totalFiles->sizeHint().height() );
+    _totalFiles->setFixedHeight( _totalFiles->tqsizeHint().height() );
 
     _log = new LoggerWidget( i18n( "Index 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 TQPushButton( i18n( "Abort" ), 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 );
@@ -221,13 +221,13 @@ void IndexDlg::slotOK()
 
 void IndexDlg::slotAbort()
 {
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
     _aborted = TRUE;
 }
 
 void IndexDlg::timerEvent( TQTimerEvent* )
 {
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
 
     // Rewind tape.
     _log->append( i18n( "Rewinding tape." ) );
@@ -275,12 +275,12 @@ void IndexDlg::timerEvent( TQTimerEvent* )
                 _archiveCount++;
                 msg.setNum( _archiveCount );
                 _archives->setText( msg );
-                msg = i18n( "Indexing archive %1." ).arg( _archiveCount );
+                msg = i18n( "Indexing archive %1." ).tqarg( _archiveCount );
                 _log->append( msg );
 
-                msg = i18n( "Archive %1" ).arg( _archiveCount );
+                msg = i18n( "Archive %1" ).tqarg( _archiveCount );
                 _archive = new Archive( _tape, 0, msg );
-                _fileName = TQString::null;
+                _fileName = TQString();
                 _fileSize = -1;
                 _fileMTime = -1;
                 _fileStartRecord = -1;
@@ -349,7 +349,7 @@ void IndexDlg::updateStats()
     _kbytesRead->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 );
     }
 }