summaryrefslogtreecommitdiffstats
path: root/kioslave/iso
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
commitf7e71d47719ab6094cf4a9fafffa5ea351973522 (patch)
tree30834aa632d442019e14f88685001d94657d060b /kioslave/iso
parentb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff)
downloadtdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz
tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/iso')
-rw-r--r--kioslave/iso/iso.cpp16
-rw-r--r--kioslave/iso/kiso.cpp2
-rw-r--r--kioslave/iso/kisofile.cpp2
3 files changed, 10 insertions, 10 deletions
diff --git a/kioslave/iso/iso.cpp b/kioslave/iso/iso.cpp
index 268805770..310e222c7 100644
--- a/kioslave/iso/iso.cpp
+++ b/kioslave/iso/iso.cpp
@@ -130,7 +130,7 @@ bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int star
fullPath += '/';
kdDebug() << "the full path is " << fullPath << endl;
- while ( (pos=fullPath.find( '/', pos+1 )) != -1 )
+ while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 )
{
TQString tryPath = fullPath.left( pos );
kdDebug() << fullPath << " trying " << tryPath << endl;
@@ -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(TQString("Looking for entry %1").arg(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 );
@@ -407,8 +407,8 @@ void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &pat
ptrblock_bytes = (nblocks+1) * 4;
pointer_block=isoFileEntry->data( hdr->header_size << 2, ptrblock_bytes );
if (pointer_block.size() == ptrblock_bytes &&
- inbuf.resize(block_size2) &&
- outbuf.resize(block_size)) {
+ inbuf.tqresize(block_size2) &&
+ outbuf.tqresize(block_size)) {
pptr = pointer_block.data();
} else {
diff --git a/kioslave/iso/kiso.cpp b/kioslave/iso/kiso.cpp
index dff111bff..f487ad2f5 100644
--- a/kioslave/iso/kiso.cpp
+++ b/kioslave/iso/kiso.cpp
@@ -157,7 +157,7 @@ void KIso::prepareDevice( const TQString & filename,
{
/* 'hack' for Qt's false assumption that only S_ISREG is seekable */
if( "inode/blockdevice" == mimetype )
- setDevice( new QFileHack( filename ) );
+ setDevice( TQT_TQIODEVICE(new QFileHack( filename )) );
else
{
if( "application/x-gzip" == mimetype
diff --git a/kioslave/iso/kisofile.cpp b/kioslave/iso/kisofile.cpp
index afac16b74..9be5dfad1 100644
--- a/kioslave/iso/kisofile.cpp
+++ b/kioslave/iso/kisofile.cpp
@@ -43,7 +43,7 @@ TQByteArray KIsoFile::data(long long pos, int count) const {
int rlen;
if ( archive()->device()->at(position()+pos) &&
- r.resize( ((pos+count) < size()) ? count : size()-pos) ) {
+ r.tqresize( ((pos+count) < size()) ? count : size()-pos) ) {
rlen=archive()->device()->readBlock( r.data(), r.size() );
if (rlen ==- 1) r.resize(0);
else if (rlen != (int)r.size()) r.resize(rlen);