TQt4 port krusader

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krusader@1239136 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

12 files changed, 111 insertions, 111 deletions

diff --git a/iso/iso.cpp b/iso/iso.cpp
index 8b7ebe6..b1c7fe3 100644
--- a/iso/iso.cpp
+++ b/iso/iso.cpp
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include <klargefile.h>
-#include <qfile.h>
+#include <tqfile.h>
 #include <kurl.h>
 #include <kdebug.h>
 #include <kinstance.h>
@@ -78,7 +78,7 @@ int kdemain( int argc, char **argv )
 }
 
 
-kio_isoProtocol::kio_isoProtocol( const QCString &pool, const QCString &app ) : SlaveBase( "iso", pool, app )
+kio_isoProtocol::kio_isoProtocol( const TQCString &pool, const TQCString &app ) : SlaveBase( "iso", pool, app )
 {
   kdDebug() << "kio_isoProtocol::kio_isoProtocol" << endl;
   m_isoFile = 0L;
@@ -89,7 +89,7 @@ kio_isoProtocol::~kio_isoProtocol()
     delete m_isoFile;
 }
 
-bool kio_isoProtocol::checkNewFile( QString fullPath, QString & path, int startsec )
+bool kio_isoProtocol::checkNewFile( TQString fullPath, TQString & path, int startsec )
 {
     kdDebug()   << "kio_isoProtocol::checkNewFile " << fullPath << " startsec: " <<
         startsec << endl;
@@ -100,7 +100,7 @@ bool kio_isoProtocol::checkNewFile( QString fullPath, QString & path, int starts
     {
         // Has it changed ?
         struct stat statbuf;
-        if ( ::stat( QFile::encodeName( m_isoFile->fileName() ), &statbuf ) == 0 )
+        if ( ::stat( TQFile::encodeName( m_isoFile->fileName() ), &statbuf ) == 0 )
         {
             if ( m_mtime == statbuf.st_mtime )
             {
@@ -122,21 +122,21 @@ bool kio_isoProtocol::checkNewFile( QString fullPath, QString & path, int starts
 
     // Find where the iso file is in the full path
     int pos = 0;
-    QString isoFile;
-    path = QString::null;
+    TQString isoFile;
+    path = TQString();
 
     int len = fullPath.length();
     if ( len != 0 && fullPath[ len - 1 ] != '/' )
         fullPath += '/';
 
     kdDebug()   << "the full path is " << fullPath << endl;
-    while ( (pos=fullPath.find( '/', pos+1 )) != -1 )
+    while ( (pos=fullPath.tqfind( '/', pos+1 )) != -1 )
     {
-        QString tryPath = fullPath.left( pos );
+        TQString tryPath = fullPath.left( pos );
         kdDebug()   << fullPath << "  trying " << tryPath << endl;
 
         KDE_struct_stat statbuf;
-        if ( KDE_lstat( QFile::encodeName(tryPath), &statbuf ) == 0 && !S_ISDIR(statbuf.st_mode) )
+        if ( KDE_lstat( TQFile::encodeName(tryPath), &statbuf ) == 0 && !S_ISDIR(statbuf.st_mode) )
         {
             isoFile = tryPath;
             m_mtime = statbuf.st_mtime;
@@ -150,7 +150,7 @@ bool kio_isoProtocol::checkNewFile( QString fullPath, QString & path, int starts
                     path.truncate( len - 1 );
             }
             else
-                path = QString::fromLatin1("/");
+                path = TQString::tqfromLatin1("/");
             kdDebug()   << "Found. isoFile=" << isoFile << " path=" << path << endl;
             break;
         }
@@ -234,10 +234,10 @@ void kio_isoProtocol::listDir( const KURL & url )
 {
     kdDebug() << "kio_isoProtocol::listDir " << url.url() << endl;
 
-    QString path;
+    TQString path;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
     {
-        QCString _path( QFile::encodeName(url.path()));
+        TQCString _path( TQFile::encodeName(url.path()));
         kdDebug()  << "Checking (stat) on " << _path << endl;
         struct stat buff;
         if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
@@ -259,10 +259,10 @@ void kio_isoProtocol::listDir( const KURL & url )
 
     if ( path.isEmpty() )
     {
-        KURL redir( QString::fromLatin1( "iso:/") );
+        KURL redir( TQString::tqfromLatin1( "iso:/") );
         kdDebug() << "url.path()==" << url.path() << endl;
         if (url.hasRef()) redir.setRef(url.htmlRef());
-        redir.setPath( url.path() + QString::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()   << QString("Looking for entry %1").arg(path) << endl;
+        kdDebug()   << TQString("Looking for entry %1").tqarg(path) << endl;
         const KArchiveEntry* e = root->entry( path );
         if ( !e )
         {
@@ -291,11 +291,11 @@ void kio_isoProtocol::listDir( const KURL & url )
         dir = root;
     }
 
-    QStringList l = dir->entries();
+    TQStringList l = dir->entries();
     totalSize( l.count() );
 
     UDSEntry entry;
-    QStringList::Iterator it = l.begin();
+    TQStringList::Iterator it = l.begin();
     for( ; it != l.end(); ++it )
     {
         kdDebug()   << (*it) << endl;
@@ -315,7 +315,7 @@ void kio_isoProtocol::listDir( const KURL & url )
 
 void kio_isoProtocol::stat( const KURL & url )
 {
-    QString path;
+    TQString path;
     UDSEntry entry;
 
     kdDebug() << "kio_isoProtocol::stat " << url.url() << endl;
@@ -323,7 +323,7 @@ void kio_isoProtocol::stat( const KURL & url )
     {
         // We may be looking at a real directory - this happens
         // when pressing up after being in the root of an archive
-        QCString _path( QFile::encodeName(url.path()));
+        TQCString _path( TQFile::encodeName(url.path()));
         kdDebug()  << "kio_isoProtocol::stat (stat) on " << _path << endl;
         struct stat buff;
         if ( ::stat( _path.data(), &buff ) == -1 || !S_ISDIR( buff.st_mode ) ) {
@@ -356,7 +356,7 @@ void kio_isoProtocol::stat( const KURL & url )
     const KArchiveEntry* isoEntry;
     if ( path.isEmpty() )
     {
-        path = QString::fromLatin1( "/" );
+        path = TQString::tqfromLatin1( "/" );
         isoEntry = root;
     } else {
         isoEntry = root->entry( path );
@@ -371,11 +371,11 @@ void kio_isoProtocol::stat( const KURL & url )
     finished();
 }
 
-void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const QString &path )
+void kio_isoProtocol::getFile( const KIsoFile *isoFileEntry, const TQString &path )
 {
     unsigned long long size, pos = 0;
     bool mime=false,zlib=false;
-    QByteArray fileData, pointer_block, inbuf, outbuf;
+    TQByteArray fileData, pointer_block, inbuf, outbuf;
     char *pptr = 0;
     compressed_file_header *hdr;
     int block_shift;
@@ -489,7 +489,7 @@ void kio_isoProtocol::get( const KURL & url )
 {
     kdDebug()  << "kio_isoProtocol::get" << url.url() << endl;
 
-    QString path;
+    TQString path;
     if ( !checkNewFile( url.path(), path, url.hasRef() ? url.htmlRef().toInt() : -1 ) )
     {
         error( KIO::ERR_DOES_NOT_EXIST, url.path() );
diff --git a/iso/iso.h b/iso/iso.h
index 079f68e..6b16b63 100644
--- a/iso/iso.h
+++ b/iso/iso.h
@@ -31,7 +31,7 @@ class KIso;
 class kio_isoProtocol : public KIO::SlaveBase
 {
 public:
-    kio_isoProtocol( const QCString &pool, const QCString &app );
+    kio_isoProtocol( const TQCString &pool, const TQCString &app );
     virtual ~kio_isoProtocol();
 
     virtual void listDir( const KURL & url );
@@ -39,9 +39,9 @@ public:
     virtual void get( const KURL & url );
 
 protected:
-    void getFile( const KIsoFile *isoFileEntry, const QString &path );
+    void getFile( const KIsoFile *isoFileEntry, const TQString &path );
     void createUDSEntry( const KArchiveEntry * isoEntry, KIO::UDSEntry & entry );
-    bool checkNewFile( QString fullPath, QString & path, int startsec );
+    bool checkNewFile( TQString fullPath, TQString & path, int startsec );
 
     KIso * m_isoFile;
     time_t m_mtime;
diff --git a/iso/kiso.cpp b/iso/kiso.cpp
index 6bc4241..61baaf4 100644
--- a/iso/kiso.cpp
+++ b/iso/kiso.cpp
@@ -27,9 +27,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <qcstring.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <tqcstring.h>
+#include <tqdir.h>
+#include <tqfile.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>
@@ -39,7 +39,7 @@
 
 #include "kiso.h"
 #include "libisofs/isofs.h"
-#include "qfilehack.h"
+#include "tqfilehack.h"
 
 
 #ifdef __linux__
@@ -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
@@ -102,16 +102,16 @@ class KIso::KIsoPrivate
 {
 public:
     KIsoPrivate() {}
-    QStringList dirList;
+    TQStringList dirList;
 };
 
-KIso::KIso( const QString& filename, const QString & _mimetype )
+KIso::KIso( const TQString& filename, const TQString & _mimetype )
     : KArchive( 0L )
 {
     m_startsec = -1;
     m_filename = filename;
     d = new KIsoPrivate;
-    QString mimetype( _mimetype );
+    TQString mimetype( _mimetype );
     bool forced = true;
     if ( mimetype.isEmpty() )
     {
@@ -128,7 +128,7 @@ KIso::KIso( const QString& filename, const QString & _mimetype )
         else
         {
             // Something else. Check if it's not really gzip though (e.g. for KOffice docs)
-            QFile file( filename );
+            TQFile file( filename );
             if ( file.open( IO_ReadOnly ) )
             {
                 unsigned char firstByte = file.getch();
@@ -152,26 +152,26 @@ KIso::KIso( const QString& filename, const QString & _mimetype )
     prepareDevice( filename, mimetype, forced );
 }
 
-void KIso::prepareDevice( const QString & filename,
-                            const QString & mimetype, bool forced )
+void KIso::prepareDevice( const TQString & filename,
+                            const TQString & mimetype, bool forced )
 {
-  /* 'hack' for Qt's false assumption that only S_ISREG is seekable */
+  /* 'hack' for TQt's false assumption that only S_ISREG is seekable */
   if( "inode/blockdevice" == mimetype )
-      setDevice( new QFileHack( filename ) );
+      setDevice( new TQFileHack( filename ) );
   else
   {
     if( "application/x-gzip" == mimetype
        || "application/x-bzip2" == mimetype)
         forced = true;
 
-    QIODevice *dev = KFilterDev::deviceForFile( filename, mimetype, forced );
+    TQIODevice *dev = KFilterDev::deviceForFile( filename, mimetype, forced );
     if( dev )
       setDevice( dev );
   }
 
 }
 
-KIso::KIso( QIODevice * dev )
+KIso::KIso( TQIODevice * dev )
     : KArchive( dev )
 {
     d = new KIsoPrivate;
@@ -190,7 +190,7 @@ KIso::~KIso()
 /* callback function for libisofs */
 static int readf(char *buf, int start, int len,void *udata) {
 
-    QIODevice* dev = ( static_cast<KIso*> (udata) )->device();
+    TQIODevice* dev = ( static_cast<KIso*> (udata) )->device();
 
     if (dev->at(start<<11)) {
         if ((dev->readBlock(buf, len<<11)) != -1) return (len);
@@ -204,7 +204,7 @@ static int readf(char *buf, int start, int len,void *udata) {
 static int mycallb(struct iso_directory_record *idr,void *udata) {
 
     KIso *iso = static_cast<KIso*> (udata);
-    QString path,user,group,symlink;
+    TQString path,user,group,symlink;
     int i;
     int access;
     int time,cdate,adate;
@@ -249,7 +249,7 @@ static int mycallb(struct iso_directory_record *idr,void *udata) {
             if (!special) {
                 if (iso->joliet) {
                     for (i=0;i<(isonum_711(idr->name_len)-1);i+=2) {
-                        QChar ch( be2me_16(*((ushort*)&(idr->name[i]))) );
+                        TQChar ch( be2me_16(*((ushort*)&(idr->name[i]))) );
                         if (ch==';') break;
                         path+=ch;
                     }
@@ -292,12 +292,12 @@ void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
     int i,size;
     boot_head boot;
     boot_entry *be;
-    QString path;
+    TQString path;
     KIsoFile *entry;
     
     entry=new KIsoFile( this, "Catalog", dirent->permissions() & ~S_IFDIR,
         dirent->date(), dirent->adate(), dirent->cdate(),
-        dirent->user(), dirent->group(), QString::null,
+        dirent->user(), dirent->group(), TQString(),
         isonum_731(bootdesc->boot_catalog)<<11, 2048 );
     dirent->addEntry(entry);
     if (!ReadBootTable(&readf,isonum_731(bootdesc->boot_catalog),&boot,this)) {
@@ -307,10 +307,10 @@ void KIso::addBoot(struct el_torito_boot_descriptor* bootdesc) {
             size=BootImageSize( isonum_711(((struct default_entry*) be->data)->media),
                                 isonum_721(((struct default_entry*) be->data)->seccount));
             path="Default Image";
-            if (i>1) path += " (" + QString::number(i) + ")";
+            if (i>1) path += " (" + TQString::number(i) + ")";
             entry=new KIsoFile( this, path, dirent->permissions() & ~S_IFDIR,
                 dirent->date(), dirent->adate(), dirent->cdate(),
-                dirent->user(), dirent->group(), QString::null,
+                dirent->user(), dirent->group(), TQString(),
                 isonum_731(((struct default_entry*) be->data)->start)<<11, size<<9 );
             dirent->addEntry(entry);
             be=be->next;
@@ -335,7 +335,7 @@ void KIso::readParams()
 bool KIso::openArchive( int mode )
 {
     iso_vol_desc *desc;
-    QString path,tmp,uid,gid;
+    TQString path,tmp,uid,gid;
     struct stat buf;
     int tracks[2*100],trackno=0,i,access,c_b,c_i,c_j;
     KArchiveDirectory *root;
@@ -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);
     }
@@ -375,10 +375,10 @@ bool KIso::openArchive( int mode )
         c_b=1;c_i=1;c_j=1;       
         root=rootDir();
         if (trackno>1) {
-            path=QString::null;
-            QTextOStream(&path) << "Track " << tracks[(i<<1)+1];
+            path=TQString();
+            TQTextOStream(&path) << "Track " << tracks[(i<<1)+1];
             root = new KIsoDirectory( this, path, access | S_IFDIR,
-                buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, QString::null );
+                buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString() );
             rootDir()->addEntry(root);
         }
 
@@ -395,10 +395,10 @@ bool KIso::openArchive( int mode )
                     bootdesc=(struct el_torito_boot_descriptor*) &(desc->data);
                     if ( !memcmp(EL_TORITO_ID,bootdesc->system_id,ISODCL(8,39)) ) {
                         path="El Torito Boot";
-                        if (c_b>1) path += " (" + QString::number(c_b) + ")";
+                        if (c_b>1) path += " (" + TQString::number(c_b) + ")";
                         
                         dirent = new KIsoDirectory( this, path, access | S_IFDIR,
-                            buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, QString::null );
+                            buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString() );
                         root->addEntry(dirent);
                         
                         addBoot(bootdesc);
@@ -411,14 +411,14 @@ bool KIso::openArchive( int mode )
                     idr=(struct iso_directory_record*) &( ((struct iso_primary_descriptor*) &desc->data)->root_directory_record);
                     joliet = JolietLevel(&desc->data);
                     if (joliet) {
-                        QTextOStream(&path) << "Joliet level " << joliet;
-                        if (c_j>1) path += " (" + QString::number(c_j) + ")";
+                        TQTextOStream(&path) << "Joliet level " << joliet;
+                        if (c_j>1) path += " (" + TQString::number(c_j) + ")";
                     } else {
                         path = "ISO9660";
-                        if (c_i>1) path += " (" + QString::number(c_i) + ")";
+                        if (c_i>1) path += " (" + TQString::number(c_i) + ")";
                     }
                     dirent = new KIsoDirectory( this, path, access | S_IFDIR,
-                        buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, QString::null );
+                        buf.st_mtime, buf.st_atime, buf.st_ctime, uid, gid, TQString() );
                     root->addEntry(dirent);
                     level=0;
                     mycallb(idr, this );
@@ -439,12 +439,12 @@ bool KIso::closeArchive()
     return true;
 }
 
-bool KIso::writeDir( const QString&, const QString&, const QString& )
+bool KIso::writeDir( const TQString&, const TQString&, const TQString& )
 {
     return false;
 }
 
-bool KIso::prepareWriting( const QString&, const QString&, const QString&, uint)
+bool KIso::prepareWriting( const TQString&, const TQString&, const TQString&, uint)
 {
     return false;
 }
diff --git a/iso/kiso.h b/iso/kiso.h
index ceddb4a..546b09a 100644
--- a/iso/kiso.h
+++ b/iso/kiso.h
@@ -25,10 +25,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <qdatetime.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qdict.h>
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+#include <tqdict.h>
 
 #include "kisofile.h"
 #include "kisodirectory.h"
@@ -50,15 +50,15 @@ public:
      * Do not use application/x-tgz or so. Only the compression layer !
      * If the mimetype is ommitted, it will be determined from the filename.
      */
-    KIso( const QString& filename, const QString & mimetype = QString::null );
+    KIso( const TQString& filename, const TQString & mimetype = TQString() );
 
     /**
      * Creates an instance that operates on the given device.
-     * The device can be compressed (KFilterDev) or not (QFile, etc.).
-     * WARNING: don't assume that giving a QFile here will decompress the file,
+     * The device can be compressed (KFilterDev) or not (TQFile, etc.).
+     * WARNING: don't assume that giving a TQFile here will decompress the file,
      * in case it's compressed!
      */
-    KIso( QIODevice * dev );
+    KIso( TQIODevice * dev );
 
     /**
      * If the .iso is still opened, then it will be
@@ -68,12 +68,12 @@ public:
 
     /**
      * The name of the os file, as passed to the constructor
-     * Null if you used the QIODevice constructor.
+     * Null if you used the TQIODevice constructor.
      */
-    QString fileName() { return m_filename; }
+    TQString fileName() { return m_filename; }
 
-    bool writeDir( const QString& , const QString& , const QString& );
-    bool prepareWriting( const QString& , const QString& , const QString& , uint );
+    bool writeDir( const TQString& , const TQString& , const TQString& );
+    bool prepareWriting( const TQString& , const TQString& , const TQString& , uint );
     bool doneWriting( uint );
 
     void setStartSec(int startsec) { m_startsec = startsec; }
@@ -98,10 +98,10 @@ private:
      * @internal
      */
     void addBoot(struct el_torito_boot_descriptor* bootdesc);
-    void prepareDevice( const QString & filename, const QString & mimetype, bool forced = false );
+    void prepareDevice( const TQString & filename, const TQString & mimetype, bool forced = false );
     int m_startsec;
 
-    QString m_filename;
+    TQString m_filename;
 protected:
     virtual void virtual_hook( int id, void* data );
 private:
diff --git a/iso/kisodirectory.cpp b/iso/kisodirectory.cpp
index f354383..74987a2 100644
--- a/iso/kisodirectory.cpp
+++ b/iso/kisodirectory.cpp
@@ -17,9 +17,9 @@
 
 #include "kisodirectory.h"
 
-KIsoDirectory::KIsoDirectory( KArchive* archive, const QString& name, int access,
-    int date, int adate, int cdate, const QString& user, const QString& group,
-    const QString& symlink) :
+KIsoDirectory::KIsoDirectory( KArchive* archive, const TQString& name, int access,
+    int date, int adate, int cdate, const TQString& user, const TQString& group,
+    const TQString& symlink) :
         KArchiveDirectory(archive, name, access, date, user, group, symlink) {
                                
 
diff --git a/iso/kisodirectory.h b/iso/kisodirectory.h
index 0b59719..74045ac 100644
--- a/iso/kisodirectory.h
+++ b/iso/kisodirectory.h
@@ -18,7 +18,7 @@
 #ifndef KISODIRECTORY_H
 #define KISODIRECTORY_H
 
-#include <qstring.h>
+#include <tqstring.h>
 #include <karchive.h>
 
 /**
@@ -27,9 +27,9 @@
 
 class KIsoDirectory : public KArchiveDirectory  {
 public: 
-    KIsoDirectory( KArchive* archive, const QString& name, int access, int date,
-                    int adate,int cdate, const QString& user, const QString& group,
-                   const QString& symlink);
+    KIsoDirectory( KArchive* archive, const TQString& name, int access, int date,
+                    int adate,int cdate, const TQString& user, const TQString& group,
+                   const TQString& symlink);
     ~KIsoDirectory();
     int adate() const { return m_adate; }
     int cdate() const { return m_cdate; }
diff --git a/iso/kisofile.cpp b/iso/kisofile.cpp
index 1d23b9c..afac16b 100644
--- a/iso/kisofile.cpp
+++ b/iso/kisofile.cpp
@@ -18,9 +18,9 @@
 #include "kisofile.h"
 #include <kdebug.h>
 
-KIsoFile::KIsoFile( KArchive* archive, const QString& name, int access,
-    int date, int adate,int cdate, const QString& user, const QString& group,
-    const QString& symlink,int pos, int size) :
+KIsoFile::KIsoFile( KArchive* archive, const TQString& name, int access,
+    int date, int adate,int cdate, const TQString& user, const TQString& group,
+    const TQString& symlink,int pos, int size) :
         KArchiveFile(archive, name, access, date, user, group, symlink, pos, size) {
 
 
@@ -38,8 +38,8 @@ void KIsoFile::setZF(char algo[2],char parms[2],int realsize) {
     m_realsize=realsize;
 }
 
-QByteArray KIsoFile::data(long long pos, int count) const {
-    QByteArray r;
+TQByteArray KIsoFile::data(long long pos, int count) const {
+    TQByteArray r;
     int rlen;
     
     if ( archive()->device()->at(position()+pos) &&
diff --git a/iso/kisofile.h b/iso/kisofile.h
index a30fc75..193509c 100644
--- a/iso/kisofile.h
+++ b/iso/kisofile.h
@@ -18,7 +18,7 @@
 #ifndef KISOFILE_H
 #define KISOFILE_H
 
-#include <qstring.h>
+#include <tqstring.h>
 #include <karchive.h>
 
 /**
@@ -27,16 +27,16 @@
 
 class KIsoFile : public KArchiveFile  {
 public: 
-    KIsoFile( KArchive* archive, const QString& name, int access, int date,
-                    int adate,int cdate, const QString& user, const QString& group,
-                   const QString& symlink, int pos, int size);
+    KIsoFile( KArchive* archive, const TQString& name, int access, int date,
+                    int adate,int cdate, const TQString& user, const TQString& group,
+                   const TQString& symlink, int pos, int size);
     ~KIsoFile();
     void setZF(char algo[2],char parms[2],int realsize);
     int adate() const { return m_adate; }
     int cdate() const { return m_cdate; }
     long long realsize() const { return m_realsize; }
 
-    virtual QByteArray data(long long pos, int count) const;
+    virtual TQByteArray data(long long pos, int count) const;
 private:
     /* hide this member function, it's broken by design, because the full
     data often requires too much memory */
diff --git a/iso/libisofs/iso_fs.h b/iso/libisofs/iso_fs.h
index 43353b0..b726b9f 100644
--- a/iso/libisofs/iso_fs.h
+++ b/iso/libisofs/iso_fs.h
@@ -131,13 +131,13 @@ struct hs_primary_descriptor {
 	char root_directory_record	[ISODCL (181, 214)]; /* 9.1 */
 };
 
-/* We use this to help us look up the parent inode numbers. */
+/* We use this to help us look up the tqparent inode numbers. */
 
 struct iso_path_table{
 	char  name_len[1];		  /* 711 */
 	char  ext_attr_length[1]; /* 711 */
 	char  extent[4];		  /* 731 */
-	char  parent[2];	      /* 721 */
+	char  tqparent[2];	      /* 721 */
 	char  name[1];
 };
 
diff --git a/iso/libisofs/isofs.h b/iso/libisofs/isofs.h
index 52190e6..30c18db 100644
--- a/iso/libisofs/isofs.h
+++ b/iso/libisofs/isofs.h
@@ -45,7 +45,7 @@ typedef struct _rr_entry {
 	int		serno;
 	int		dev_major;
 	int		dev_minor;
-	int		pl;	/* parent location */
+	int		pl;	/* tqparent location */
 	int		cl; /* child location */
 	int		re; /* relocated */
 	char	z_algo[2]; /* zizofs algorithm */
@@ -62,7 +62,7 @@ typedef struct _iso_vol_desc {
 typedef struct _boot_entry {
 	struct _boot_entry	*next;
 	struct _boot_entry	*prev;
-	struct _boot_entry  *parent;
+	struct _boot_entry  *tqparent;
 	struct _boot_entry  *child;
 	char	data[32];
 }
diff --git a/iso/qfilehack.cpp b/iso/qfilehack.cpp
index 6f0b99d..234f404 100644
--- a/iso/qfilehack.cpp
+++ b/iso/qfilehack.cpp
@@ -15,24 +15,24 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qfilehack.h"
+#include "tqfilehack.h"
 
-QFileHack::QFileHack(){
+TQFileHack::TQFileHack(){
 }
 
-QFileHack::QFileHack( const QString & name ) : QFile(name) {
+TQFileHack::TQFileHack( const TQString & name ) : TQFile(name) {
 }
 
-QFileHack::~QFileHack(){
+TQFileHack::~TQFileHack(){
 }
 
-bool QFileHack::open ( int m ) {
+bool TQFileHack::open ( int m ) {
     bool ret;
 
 #ifdef __linux__
     m |= IO_Async; //On linux, set O_NONBLOCK, opens CD-ROMs faster
 #endif
-    ret=QFile::open(m);
+    ret=TQFile::open(m);
     if (ret && isSequentialAccess() ) {
         setType(IO_Direct);
     }
diff --git a/iso/qfilehack.h b/iso/qfilehack.h
index 5e9e247..ba3b57f 100644
--- a/iso/qfilehack.h
+++ b/iso/qfilehack.h
@@ -15,23 +15,23 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef QFILEHACK_H
-#define QFILEHACK_H
+#ifndef TQFILEHACK_H
+#define TQFILEHACK_H
 
-#include <qfile.h>
-#include <qstring.h>
+#include <tqfile.h>
+#include <tqstring.h>
 
 /**
   *@author Szombathelyi Gy�rgy
-  * Qt thinks if a file is not S_IFREG, you cannot seek in it. It's false (what about
+  * TQt thinks if a file is not S_IFREG, you cannot seek in it. It's false (what about
   * block devices for example?
   */
 
-class QFileHack : public QFile  {
+class TQFileHack : public TQFile  {
 public: 
-    QFileHack();
-    QFileHack( const QString & name );
-    ~QFileHack();
+    TQFileHack();
+    TQFileHack( const TQString & name );
+    ~TQFileHack();
     virtual bool open ( int m );
 };