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/k3bdirview.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/k3bdirview.cpp')

diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp
index d40b775..50c69b0 100644
--- a/src/k3bdirview.cpp
+++ b/src/k3bdirview.cpp
@@ -48,7 +48,7 @@
 #include <tqheader.h>
 #include <tqsplitter.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqiconset.h>
 #include <tqvaluelist.h>
 #include <tqlabel.h>
@@ -247,7 +247,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium )
       else {
 	if( KMessageBox::questionYesNo( this,
 					i18n("Found %1. Do you want K3b to mount the data part "
-					     "or show all the tracks?").arg( i18n("Video CD") ),
+					     "or show all the tracks?").tqarg( i18n("Video CD") ),
 					i18n("Video CD"),
 					i18n("Mount CD"),
 					i18n("Show Video Tracks") ) == KMessageBox::No ) {
@@ -260,7 +260,7 @@ void K3bDirView::showMediumInfo( const K3bMedium& medium )
     else if( medium.content() & K3bMedium::CONTENT_AUDIO ) {
       if( KMessageBox::questionYesNo( this,
 				      i18n("Found %1. Do you want K3b to mount the data part "
-					   "or show all the tracks?").arg( i18n("Audio CD") ),
+					   "or show all the tracks?").tqarg( i18n("Audio CD") ),
 				      i18n("Audio CD"),
 				      i18n("Mount CD"),
 				      i18n("Show Audio Tracks") ) == KMessageBox::No ) {
@@ -298,9 +298,9 @@ void K3bDirView::slotMountFinished( const TQString& mp )
   else {
     m_viewStack->raiseWidget( m_fileView );
     K3bPassivePopup::showPopup( i18n("<p>K3b was unable to mount medium <b>%1</b> in device <em>%2 - %3</em>")
-				.arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
-				.arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
-				.arg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
+				.tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
+				.tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
+				.tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
 				i18n("Mount Failed"),
 				K3bPassivePopup::Warning );
   }
@@ -314,9 +314,9 @@ void K3bDirView::slotUnmountFinished( bool success )
   }
   else {
     K3bPassivePopup::showPopup( i18n("<p>K3b was unable to unmount medium <b>%1</b> in device <em>%2 - %3</em>")
-				.arg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
-				.arg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
-				.arg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
+				.tqarg( k3bappcore->mediaCache()->medium( k3bappcore->appDeviceManager()->currentDevice() ).shortString() )
+				.tqarg( k3bappcore->appDeviceManager()->currentDevice()->vendor() )
+				.tqarg( k3bappcore->appDeviceManager()->currentDevice()->description() ),
 				i18n("Unmount Failed"),
 				K3bPassivePopup::Warning );
   }
-- 
cgit v1.2.3