From 650b58e8e66f8e3e1cf78ee3e0037f4c9e00699a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:55:47 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit ef5831dd5c8811c94c9b1bc1377a90174d17c82c.
---
 src/k3bdiskinfoview.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'src/k3bdiskinfoview.cpp')

diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index 45dafba..028e020 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -27,13 +27,13 @@
 #include <k3biso9660.h>
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfont.h>
 #include <tqcolor.h>
 #include <tqheader.h>
 #include <tqstring.h>
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqpixmap.h>
 #include <tqregion.h>
 #include <tqframe.h>
@@ -231,7 +231,7 @@ void K3bDiskInfoView::reloadMedium()
       // if we have multiple sessions we create a header item for every session
       KListViewItem* trackItem = 0;
       if( medium().diskInfo().numSessions() > 1 && medium().toc()[0].session() > 0 ) {
-	trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").arg(1) );
+	trackItem = new HeaderViewItem( trackHeaderItem, item, i18n("Session %1").tqarg(1) );
 	lastSession = 1;
       }
       else
@@ -248,7 +248,7 @@ void K3bDiskInfoView::reloadMedium()
 	  trackItem->setOpen(true);
 	  trackItem = new HeaderViewItem( trackHeaderItem,
 					  m_infoView->lastItem()->parent(),
-					  i18n("Session %1").arg(lastSession) );
+					  i18n("Session %1").tqarg(lastSession) );
 	}
 
         item = new KListViewItem( trackItem, item );
@@ -269,21 +269,21 @@ void K3bDiskInfoView::reloadMedium()
 	  else
 	    text = i18n("Data");
         }
-        item->setText( 0, i18n("%1 (%2)").arg( TQString::number(index).rightJustify( 2, ' ' )).arg(text) );
+        item->setText( 0, i18n("%1 (%2)").tqarg( TQString::number(index).rightJustify( 2, ' ' )).tqarg(text) );
 	item->setText( 1, TQString( "%1/%2" )
-		       .arg( track.copyPermitted() ? i18n("copy") : i18n("no copy") )
-		       .arg( track.type() == K3bTrack::AUDIO
+		       .tqarg( track.copyPermitted() ? i18n("copy") : i18n("no copy") )
+		       .tqarg( track.type() == K3bTrack::AUDIO
 			    ? ( track.preEmphasis() ?  i18n("preemp") : i18n("no preemp") )
 			    : ( track.recordedIncremental() ?  i18n("incremental") : i18n("uninterrupted") ) ) );
         item->setText( 2,
 		       TQString("%1 - %2")
-		       .arg(track.firstSector().lba())
-		       .arg(track.lastSector().lba()) );
+		       .tqarg(track.firstSector().lba())
+		       .tqarg(track.lastSector().lba()) );
         item->setText( 3, TQString::number( track.length().lba() ) + " (" + track.length().toString() + ")" );
 
 #ifdef K3B_DEBUG
         if( track.type() == K3bTrack::AUDIO )
-	  item->setText( 4, TQString( "%1 (%2)" ).arg(track.index0().toString()).arg(track.index0().lba()) );
+	  item->setText( 4, TQString( "%1 (%2)" ).tqarg(track.index0().toString()).tqarg(track.index0().lba()) );
 #endif
         ++index;
       }
@@ -350,24 +350,24 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
   if( info.isDvdMedia() )
     atipChild = new KListViewItem( atipItem, atipChild,
 				   i18n("Media ID:"),
-				   !info.mediaId().isEmpty() ? TQString::fromLatin1( info.mediaId() ) : i18n("unknown") );
+				   !info.mediaId().isEmpty() ? TQString::tqfromLatin1( info.mediaId() ) : i18n("unknown") );
 
 
   atipChild = new KListViewItem( atipItem, atipChild,
 				 i18n("Capacity:"),
-				 i18n("%1 min").arg(info.capacity().toString()),
+				 i18n("%1 min").tqarg(info.capacity().toString()),
 				 KIO::convertSize(info.capacity().mode1Bytes()) );
 
   if( !info.empty() )
     atipChild = new KListViewItem( atipItem, atipChild,
 				   i18n("Used Capacity:"),
-				   i18n("%1 min").arg(info.size().toString()),
+				   i18n("%1 min").tqarg(info.size().toString()),
 				   KIO::convertSize(info.size().mode1Bytes()) );
 
   if( info.appendable() )
     atipChild = new KListViewItem( atipItem, atipChild,
 				   i18n("Remaining:"),
-				   i18n("%1 min").arg( info.remainingSize().toString() ),
+				   i18n("%1 min").tqarg( info.remainingSize().toString() ),
 				   KIO::convertSize(info.remainingSize().mode1Bytes()) );
 
   atipChild = new KListViewItem( atipItem, atipChild,
@@ -427,7 +427,7 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
 	if( info.isDvdMedia() )
 	  s.append( TQString().sprintf( "%.1fx (%d KB/s)", (double)*it / 1385.0, *it ) );
 	else
-	  s.append( TQString( "%1x (%2 KB/s)" ).arg( *it/175 ).arg( *it ) );
+	  s.append( TQString( "%1x (%2 KB/s)" ).tqarg( *it/175 ).tqarg( *it ) );
       }
 
     atipChild->setText( 1, s );
@@ -476,10 +476,10 @@ void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescr
 //   iso9660Child = new KListViewItem( iso9660Item, iso9660Child,
 // 				    i18n("Volume Size:"),
 // 				    TQString( "%1 (%2*%3)" )
-// 				    .arg(iso.logicalBlockSize
+// 				    .tqarg(iso.logicalBlockSize
 // 					 *iso.volumeSpaceSize)
-// 				    .arg(iso.logicalBlockSize)
-// 				    .arg(iso.volumeSpaceSize),
+// 				    .tqarg(iso.logicalBlockSize)
+// 				    .tqarg(iso.volumeSpaceSize),
 // 				    KIO::convertSize(iso.logicalBlockSize
 // 						     *iso.volumeSpaceSize)  );
 
-- 
cgit v1.2.3