From 644e85d451b96982107f4e70977f0ff08b91291d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:07 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 44ec35d6f3ec0bf8067f31896d7721ac3082f66f. --- iso/iso.cpp | 10 +++++----- iso/kiso.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'iso') diff --git a/iso/iso.cpp b/iso/iso.cpp index 3a66edc..24023ca 100644 --- a/iso/iso.cpp +++ b/iso/iso.cpp @@ -150,7 +150,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star path.truncate( len - 1 ); } else - path = TQString::fromLatin1("/"); + path = TQString::tqfromLatin1("/"); kdDebug() << "Found. isoFile=" << isoFile << " path=" << path << endl; break; } @@ -259,10 +259,10 @@ void kio_isoProtocol::listDir( const KURL & url ) if ( path.isEmpty() ) { - KURL redir( TQString::fromLatin1( "iso:/") ); + KURL redir( TQString::tqfromLatin1( "iso:/") ); kdDebug() << "url.path()==" << url.path() << endl; if (url.hasRef()) redir.setRef(url.htmlRef()); - redir.setPath( url.path() + TQString::fromLatin1("/") ); + redir.setPath( url.path() + TQString::tqfromLatin1("/") ); kdDebug() << "kio_isoProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); @@ -274,7 +274,7 @@ void kio_isoProtocol::listDir( const KURL & url ) const KArchiveDirectory* dir; if (!path.isEmpty() && path != "/") { - kdDebug() << TQString("Looking for entry %1").arg(path) << endl; + kdDebug() << TQString("Looking for entry %1").tqarg(path) << endl; const KArchiveEntry* e = root->entry( path ); if ( !e ) { @@ -356,7 +356,7 @@ void kio_isoProtocol::stat( const KURL & url ) const KArchiveEntry* isoEntry; if ( path.isEmpty() ) { - path = TQString::fromLatin1( "/" ); + path = TQString::tqfromLatin1( "/" ); isoEntry = root; } else { isoEntry = root->entry( path ); diff --git a/iso/kiso.cpp b/iso/kiso.cpp index 0fe4655..9f87d5f 100644 --- a/iso/kiso.cpp +++ b/iso/kiso.cpp @@ -55,7 +55,7 @@ //////////////////////////////////////////////////////////////////////// /** - * puts the track layout of the device 'fname' into 'tracks' + * puts the track tqlayout of the device 'fname' into 'tracks' * tracks structure: start sector, track number, ... * tracks should be 100*2 entry long (this is the maximum in the CD-ROM standard) * currently it's linux only, porters are welcome @@ -359,7 +359,7 @@ bool KIso::openArchive( int mode ) memset(&buf,0,sizeof(struct stat)); buf.st_mode=0777; } else { - /* If it's a block device, try to query the track layout (for multisession) */ + /* If it's a block device, try to query the track tqlayout (for multisession) */ if (m_startsec == -1 && S_ISBLK(buf.st_mode)) trackno=getTracks(m_filename.latin1(),(int*) &tracks); } -- cgit v1.2.1