TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 13 insertions, 13 deletions

diff --git a/lib/store/KoTarStore.cpp b/lib/store/KoTarStore.cpp
index fc516894..97f0b519 100644
--- a/lib/store/KoTarStore.cpp
+++ b/lib/store/KoTarStore.cpp
@@ -19,7 +19,7 @@
 
 #include "KoTarStore.h"
 
-#include <qbuffer.h>
+#include <tqbuffer.h>
 
 #include <ktar.h>
 #include <kdebug.h>
@@ -27,7 +27,7 @@
 #include <kdeversion.h>
 #include <kio/netaccess.h>
 
-KoTarStore::KoTarStore( const QString & _filename, Mode _mode, const QCString & appIdentification )
+KoTarStore::KoTarStore( const TQString & _filename, Mode _mode, const TQCString & appIdentification )
 {
     kdDebug(s_area) << "KoTarStore Constructor filename = " << _filename
                     << " mode = " << int(_mode) << endl;
@@ -40,7 +40,7 @@ KoTarStore::KoTarStore( const QString & _filename, Mode _mode, const QCString &
         m_pTar->setOrigFileName( completeMagic( appIdentification ) );
 }
 
-KoTarStore::KoTarStore( QIODevice *dev, Mode mode, const QCString & appIdentification )
+KoTarStore::KoTarStore( TQIODevice *dev, Mode mode, const TQCString & appIdentification )
 {
     m_pTar = new KTar( dev );
 
@@ -50,7 +50,7 @@ KoTarStore::KoTarStore( QIODevice *dev, Mode mode, const QCString & appIdentific
         m_pTar->setOrigFileName( completeMagic( appIdentification ) );
 }
 
-KoTarStore::KoTarStore( QWidget* window, const KURL& _url, const QString & _filename, Mode _mode, const QCString & appIdentification )
+KoTarStore::KoTarStore( TQWidget* window, const KURL& _url, const TQString & _filename, Mode _mode, const TQCString & appIdentification )
 {
     kdDebug(s_area) << "KoTarStore Constructor url= " << _url.prettyURL()
                     << " filename = " << _filename
@@ -96,10 +96,10 @@ KoTarStore::~KoTarStore()
     }
 }
 
-QCString KoTarStore::completeMagic( const QCString& appMimetype )
+TQCString KoTarStore::completeMagic( const TQCString& appMimetype )
 {
-    kdDebug()<<"QCString KoTarStore::completeMagic( const QCString& appMimetype )********************\n";
-    QCString res( "KOffice " );
+    kdDebug()<<"TQCString KoTarStore::completeMagic( const TQCString& appMimetype )********************\n";
+    TQCString res( "KOffice " );
     res += appMimetype;
     res += '\004'; // Two magic bytes to make the identification
     res += '\006'; // more reliable (DF)
@@ -122,16 +122,16 @@ bool KoTarStore::init( Mode _mode )
 // When reading, m_stream comes directly from KArchiveFile::device()
 // When writing, m_stream buffers the data into m_byteArray
 
-bool KoTarStore::openWrite( const QString& /*name*/ )
+bool KoTarStore::openWrite( const TQString& /*name*/ )
 {
     // Prepare memory buffer for writing
     m_byteArray.resize( 0 );
-    m_stream = new QBuffer( m_byteArray );
+    m_stream = TQT_TQIODEVICE(new TQBuffer( m_byteArray ));
     m_stream->open( IO_WriteOnly );
     return true;
 }
 
-bool KoTarStore::openRead( const QString& name )
+bool KoTarStore::openRead( const TQString& name )
 {
     const KTarEntry * entry = m_pTar->directory()->entry( name );
     if ( entry == 0L )
@@ -166,7 +166,7 @@ bool KoTarStore::closeWrite()
     return true;
 }
 
-bool KoTarStore::enterRelativeDirectory( const QString& dirName )
+bool KoTarStore::enterRelativeDirectory( const TQString& dirName )
 {
     if ( m_mode == Read ) {
         if ( !m_currentDir ) {
@@ -184,7 +184,7 @@ bool KoTarStore::enterRelativeDirectory( const QString& dirName )
         return true;
 }
 
-bool KoTarStore::enterAbsoluteDirectory( const QString& path )
+bool KoTarStore::enterAbsoluteDirectory( const TQString& path )
 {
     if ( path.isEmpty() )
     {
@@ -200,7 +200,7 @@ bool KoTarStore::enterAbsoluteDirectory( const QString& path )
         return true;
 }
 
-bool KoTarStore::fileExists( const QString& absPath ) const
+bool KoTarStore::fileExists( const TQString& absPath ) const
 {
     return m_pTar->directory()->entry( absPath ) != 0;
 }