1 files changed, 29 insertions, 29 deletions

diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp
index 3e94ae8..4d0801e 100644
--- a/kdat/TapeInfoWidget.cpp
+++ b/kdat/TapeInfoWidget.cpp
@@ -21,7 +21,7 @@
 
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 
 #include <kapplication.h>
@@ -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,10 +202,10 @@ void TapeInfoWidget::setTape( Tape* tape )
         used *= blockSize / 1024;
     }
     if ( _tape->getSize() > 0 ) {
-        tmp = TQString::tqfromLatin1( "%1 / %2 (%3%)")
-          .tqarg(Util::kbytesToString( used ))
-          .tqarg(Util::kbytesToString( _tape->getSize() ))
-          .tqarg(used * 100 / _tape->getSize() );
+        tmp = TQString::fromLatin1( "%1 / %2 (%3%)")
+          .arg(Util::kbytesToString( used ))
+          .arg(Util::kbytesToString( _tape->getSize() ))
+          .arg(used * 100 / _tape->getSize() );
     } else {
         tmp = Util::kbytesToString( used );
     }