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, 80 insertions, 80 deletions

diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc
index 3d671ecb..ff40cd72 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cc
@@ -19,13 +19,13 @@
 DESCRIPTION
 
    When reading, the point of this module is toperform a depth-first traversal
-   of an OLE file. This ensures that a parent object is processed only after
+   of an OLE file. This ensures that a tqparent object is processed only after
    its child objects have been processed.
 */
 
 #include <olefilter.h>
 
-#include <qfile.h>
+#include <tqfile.h>
 #include <ktempfile.h>
 #include <kgenericfactory.h>
 #include <kmimetype.h>
@@ -55,7 +55,7 @@ protected:
 
 K_EXPORT_COMPONENT_FACTORY( libolefilter, OLEFilterFactory() )
 
-OLEFilter::OLEFilter(KoFilter *, const char *, const QStringList&) :
+OLEFilter::OLEFilter(KoFilter *, const char *, const TQStringList&) :
                      KoEmbeddingFilter(), numPic( 0 ),
                      docfile( 0 ), m_embeddeeData( 0 ),
                      m_embeddeeLength( 0 ), success( true )
@@ -69,7 +69,7 @@ OLEFilter::~OLEFilter()
     delete docfile;
 }
 
-KoFilter::ConversionStatus OLEFilter::convert( const QCString& from, const QCString& to )
+KoFilter::ConversiontqStatus OLEFilter::convert( const TQCString& from, const TQCString& to )
 {
     if(to!="application/x-kword" &&
        to!="application/x-kspread" &&
@@ -83,7 +83,7 @@ KoFilter::ConversionStatus OLEFilter::convert( const QCString& from, const QCStr
        from!="application/x-hancomword")
         return KoFilter::NotImplemented;
 
-    QFile in(m_chain->inputFile());
+    TQFile in(m_chain->inputFile());
     if(!in.open(IO_ReadOnly)) {
         kdError(s_area) << "OLEFilter::filter(): Unable to open input" << endl;
         in.close();
@@ -118,16 +118,16 @@ void OLEFilter::commSlotDelayStream( const char* delay )
     emit internalCommDelayStream( delay );
 }
 
-void OLEFilter::commSlotShapeID( unsigned int& shapeID )
+void OLEFilter::commSlotShapeID( unsigned int& tqshapeID )
 {
-    emit internalCommShapeID( shapeID );
+    emit internalCommShapeID( tqshapeID );
 }
 
 void OLEFilter::slotSavePart(
-    const QString &nameIN,
-    QString &storageId,
-    QString &mimeType,
-    const QString &extension,
+    const TQString &nameIN,
+    TQString &storageId,
+    TQString &mimeType,
+    const TQString &extension,
     unsigned int length,
     const char *data)
 {
@@ -140,7 +140,7 @@ void OLEFilter::slotSavePart(
     {
         // The part is already there, this is a lookup operation
         // -> return the part id.
-        storageId = QString::number( id );
+        storageId = TQString::number( id );
         mimeType = internalPartMimeType( nameIN );
     }
     else
@@ -149,13 +149,13 @@ void OLEFilter::slotSavePart(
         m_embeddeeData = data;
         m_embeddeeLength = length;
 
-        QString srcMime( KoEmbeddingFilter::mimeTypeByExtension( extension ) );
+        TQString srcMime( KoEmbeddingFilter::mimeTypeByExtension( extension ) );
         if ( srcMime == KMimeType::defaultMimeType() )
             kdWarning( s_area ) << "Couldn't determine the mimetype from the extension" << endl;
 
-        KoFilter::ConversionStatus status;
-        QCString destMime( mimeType.latin1() );
-        storageId = QString::number( embedPart( srcMime.latin1(), destMime, status, nameIN ) );
+        KoFilter::ConversiontqStatus status;
+        TQCString destMime( mimeType.latin1() );
+        storageId = TQString::number( embedPart( srcMime.latin1(), destMime, status, nameIN ) );
 
         // copy back what the method returned
         mimeType = destMime;
@@ -170,18 +170,18 @@ void OLEFilter::slotSavePart(
 }
 
 void OLEFilter::slotSaveDocumentInformation(
-    const QString &fullName,
-    const QString &title,
-    const QString &company,
-    const QString &email,
-    const QString &telephone,
-    const QString &fax,
-    const QString &postalCode,
-    const QString &country,
-    const QString &city,
-    const QString &street,
-    const QString &docTitle,
-    const QString &docAbstract)
+    const TQString &fullName,
+    const TQString &title,
+    const TQString &company,
+    const TQString &email,
+    const TQString &telephone,
+    const TQString &fax,
+    const TQString &postalCode,
+    const TQString &country,
+    const TQString &city,
+    const TQString &street,
+    const TQString &docTitle,
+    const TQString &docAbstract)
 {
     KoDocumentInfo *info = new KoDocumentInfo();
     KoDocumentInfoAuthor *author = static_cast<KoDocumentInfoAuthor *>(info->page("author"));
@@ -207,26 +207,26 @@ void OLEFilter::slotSaveDocumentInformation(
     	return;
     }
 
-    QCString data = info->save().toCString();
+    TQCString data = info->save().toCString();
     // Important: don't use data.length() here. It's slow, and dangerous (in case of a '\0' somewhere)
     // The -1 is because we don't want to write the final \0.
-    Q_LONG length = data.size()-1;
+    TQ_LONG length = data.size()-1;
 
     if(docInfo->writeBlock(data, length) != length)
 	kdError(s_area) << "OLEFilter::slotSaveDocumentInformation(): Could not write to KoStore!" << endl;
 }
 
 void OLEFilter::slotSavePic(
-    const QString &nameIN,
-    QString &storageId,
-    const QString &extension,
+    const TQString &nameIN,
+    TQString &storageId,
+    const TQString &extension,
     unsigned int length,
     const char *data)
 {
     if(nameIN.isEmpty())
         return;
 
-    QMap<QString, QString>::ConstIterator it = imageMap.find(nameIN);
+    TQMap<TQString, TQString>::ConstIterator it = imageMap.tqfind(nameIN);
 
     if (it != imageMap.end())
         // The key is already here - return the part id.
@@ -234,7 +234,7 @@ void OLEFilter::slotSavePic(
     else
     {
         // It's not here, so let's generate one.
-        storageId = QString( "pictures/picture%1.%2" ).arg( numPic++ ).arg( extension );
+        storageId = TQString( "pictures/picture%1.%2" ).tqarg( numPic++ ).tqarg( extension );
         imageMap.insert(nameIN, storageId);
         KoStoreDevice* pic = m_chain->storageFile( storageId, KoStore::Write );
         if(!pic)
@@ -253,9 +253,9 @@ void OLEFilter::slotSavePic(
 
 // ##### Only used for lookup now!
 void OLEFilter::slotPart(
-    const QString& nameIN,
-    QString &storageId,
-    QString &mimeType)
+    const TQString& nameIN,
+    TQString &storageId,
+    TQString &mimeType)
 {
     if (nameIN.isEmpty())
         return;
@@ -265,7 +265,7 @@ void OLEFilter::slotPart(
     if (id != -1)
     {
         // The key is already here - return the part id.
-        storageId = QString::number( id );
+        storageId = TQString::number( id );
         mimeType = internalPartMimeType( nameIN );
     }
     else
@@ -280,11 +280,11 @@ void OLEFilter::slotGetStream(const int &handle, myFile &stream) {
 // I can't guarantee that you get the right stream as the names
 // in a OLE 2 file are not unique! (searching only the current dir!)
 // Don't forget the delete [] the stream.data ptr!
-void OLEFilter::slotGetStream(const QString &name, myFile &stream) {
+void OLEFilter::slotGetStream(const TQString &name, myFile &stream) {
 
     KLaola::NodeList handle;
 
-    handle=docfile->find(name, true);  // search only in current dir!
+    handle=docfile->tqfind(name, true);  // search only in current dir!
 
     if (handle.count()==1)
         stream=docfile->stream(handle.at(0));
@@ -294,14 +294,14 @@ void OLEFilter::slotGetStream(const QString &name, myFile &stream) {
     }
 }
 
-void OLEFilter::savePartContents( QIODevice* file )
+void OLEFilter::savePartContents( TQIODevice* file )
 {
     if ( m_embeddeeData != 0 && m_embeddeeLength != 0 )
         file->writeBlock( m_embeddeeData, m_embeddeeLength );
 }
 
 // The recursive method to do all the work
-void OLEFilter::convert( const QCString& mimeTypeHint )
+void OLEFilter::convert( const TQCString& mimeTypeHint )
 {
     KLaola::NodeList list=docfile->parseCurrentDir();
     KLaola::OLENode *node;
@@ -318,7 +318,7 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
                 else {
                     // Get the storage name of the part (dirname==key), and associate the
                     // mimeType with it for later use.
-                    QCString mimeHint( mimeTypeHelper() );
+                    TQCString mimeHint( mimeTypeHelper() );
                     if ( mimeHint.isEmpty() )
                         mimeHint = "application/x-kword"; // will be converted to a dummy KWord part
                     startInternalEmbedding( node->name(), mimeHint );
@@ -333,8 +333,8 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
     }
 
     if(!onlyDirs) {
-        QStringList nodeNames;
-        QCString mimeType;
+        TQStringList nodeNames;
+        TQCString mimeType;
         if ( !mimeTypeHint.isEmpty() )
             mimeType = mimeTypeHint;
         else
@@ -348,30 +348,30 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
 
             myFile main;
             KLaola::NodeList tmp;
-            tmp=docfile->find("WordDocument", true);
+            tmp=docfile->tqfind("WordDocument", true);
 
             if(tmp.count()==1) {
                 // okay, not a dummy
                 main=docfile->stream(tmp.at(0));
 
                 myFile table0, table1, data;
-                tmp=docfile->find("0Table", true);
+                tmp=docfile->tqfind("0Table", true);
                 if(tmp.count()==1)
                     table0=docfile->stream(tmp.at(0));
 
-                tmp=docfile->find("1Table", true);
+                tmp=docfile->tqfind("1Table", true);
                 if(tmp.count()==1)
                     table1=docfile->stream(tmp.at(0));
 
-                tmp=docfile->find("Data", true);
+                tmp=docfile->tqfind("Data", true);
                 if(tmp.count()==1)
                     data=docfile->stream(tmp.at(0));
 
                 myFilter=new WordFilter(main, table0, table1, data);
 
                 // forward the internal communication calls
-                connect( this, SIGNAL( internalCommShapeID( unsigned int& ) ), myFilter, SIGNAL( internalCommShapeID( unsigned int& ) ) );
-                connect( this, SIGNAL( internalCommDelayStream( const char* ) ), myFilter, SIGNAL( internalCommDelayStream( const char* ) ) );
+                connect( this, TQT_SIGNAL( internalCommShapeID( unsigned int& ) ), myFilter, TQT_SIGNAL( internalCommShapeID( unsigned int& ) ) );
+                connect( this, TQT_SIGNAL( internalCommDelayStream( const char* ) ), myFilter, TQT_SIGNAL( internalCommDelayStream( const char* ) ) );
             }
         }
         else if ( mimeType == "application/x-kspread" ) {
@@ -380,11 +380,11 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
             myFile workbook;
             KLaola::NodeList tmp;
 
-            tmp = docfile->find( "Workbook", true );
+            tmp = docfile->tqfind( "Workbook", true );
             if ( tmp.count() == 1 )
                 workbook = docfile->stream( tmp.at( 0 ) );
             else {
-                tmp = docfile->find( "Book", true );
+                tmp = docfile->tqfind( "Book", true );
                 if ( tmp.count() == 1 )
                     workbook = docfile->stream( tmp.at( 0 ) );
             }
@@ -398,23 +398,23 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
             myFile main, currentUser, pictures, summary, documentSummary;
             KLaola::NodeList tmp;
 
-            tmp=docfile->find("PowerPoint Document", true);
+            tmp=docfile->tqfind("PowerPoint Document", true);
             if(tmp.count()==1)
                 main=docfile->stream(tmp.at(0));
 
-            tmp=docfile->find("Current User", true);
+            tmp=docfile->tqfind("Current User", true);
             if(tmp.count()==1)
                 currentUser=docfile->stream(tmp.at(0));
 
-            tmp=docfile->find("Pictures", true);
+            tmp=docfile->tqfind("Pictures", true);
             if(tmp.count()==1)
                 pictures=docfile->stream(tmp.at(0));
 
-            tmp=docfile->find("SummaryInformation", true);
+            tmp=docfile->tqfind("SummaryInformation", true);
             if(tmp.count()==1)
                 summary=docfile->stream(tmp.at(0));
 
-            tmp=docfile->find("DocumentSummaryInformation", true);
+            tmp=docfile->tqfind("DocumentSummaryInformation", true);
             if(tmp.count()==1)
                 documentSummary=docfile->stream(tmp.at(0));
 
@@ -426,7 +426,7 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
             myFile prvText;
             KLaola::NodeList tmp;
 
-            tmp = docfile->find( "PrvText", true );
+            tmp = docfile->tqfind( "PrvText", true );
             if( tmp.count() == 1 ) prvText = docfile->stream( tmp.at( 0 ) );
 
             myFilter = new HancomWordFilter( prvText );
@@ -451,9 +451,9 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
         // Launch the filtering process...
         success=myFilter->filter();
         // ...and fetch the file
-        QCString file;
+        TQCString file;
         if(!myFilter->plainString()) {
-            const QDomDocument * const part=myFilter->part();
+            const TQDomDocument * const part=myFilter->part();
             file=part->toCString();
         }
         else
@@ -467,7 +467,7 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
         }
 
         // Write it to the gzipped tar file
-        bool ret = dev->writeBlock(file.data(), file.size()-1) == static_cast<Q_LONG>( file.size() - 1 );
+        bool ret = dev->writeBlock(file.data(), file.size()-1) == static_cast<TQ_LONG>( file.size() - 1 );
         if (!ret)
             kdError(s_area) << "OLEFilter::slotSavePic(): Could not write to KoStore!" << endl;
         delete myFilter;
@@ -475,32 +475,32 @@ void OLEFilter::convert( const QCString& mimeTypeHint )
 }
 
 void OLEFilter::connectCommon(FilterBase **myFilter) {
-    QObject::connect(
+    TQObject::connect(
         *myFilter,
-        SIGNAL(signalSaveDocumentInformation(const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &)),
+        TQT_SIGNAL(signalSaveDocumentInformation(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)),
         this,
-        SLOT(slotSaveDocumentInformation(const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &, const QString &)));
+        TQT_SLOT(slotSaveDocumentInformation(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, const TQString &)));
 
-    QObject::connect(
+    TQObject::connect(
         *myFilter,
-        SIGNAL(signalSavePic(const QString &, QString &, const QString &, unsigned int, const char *)),
+        TQT_SIGNAL(signalSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *)),
         this,
-        SLOT(slotSavePic(const QString &, QString &, const QString &, unsigned int, const char *)));
-    QObject::connect(
+        TQT_SLOT(slotSavePic(const TQString &, TQString &, const TQString &, unsigned int, const char *)));
+    TQObject::connect(
         *myFilter,
-        SIGNAL(signalSavePart(const QString &, QString &, QString &, const QString &, unsigned int, const char *)),
+        TQT_SIGNAL(signalSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *)),
         this,
-        SLOT(slotSavePart(const QString &, QString &, QString &, const QString &, unsigned int, const char *)));
-    QObject::connect(*myFilter, SIGNAL(signalPart(const QString&, QString &, QString &)),
-                     this, SLOT(slotPart(const QString&, QString &, QString &)));
-    QObject::connect(*myFilter, SIGNAL(signalGetStream(const int &, myFile &)), this,
-                     SLOT(slotGetStream(const int &, myFile &)));
-    QObject::connect(*myFilter, SIGNAL(signalGetStream(const QString &, myFile &)), this,
-                     SLOT(slotGetStream(const QString &, myFile &)));
-    QObject::connect(*myFilter, SIGNAL(sigProgress(int)), this, SIGNAL(sigProgress(int)));
+        TQT_SLOT(slotSavePart(const TQString &, TQString &, TQString &, const TQString &, unsigned int, const char *)));
+    TQObject::connect(*myFilter, TQT_SIGNAL(signalPart(const TQString&, TQString &, TQString &)),
+                     this, TQT_SLOT(slotPart(const TQString&, TQString &, TQString &)));
+    TQObject::connect(*myFilter, TQT_SIGNAL(signalGetStream(const int &, myFile &)), this,
+                     TQT_SLOT(slotGetStream(const int &, myFile &)));
+    TQObject::connect(*myFilter, TQT_SIGNAL(signalGetStream(const TQString &, myFile &)), this,
+                     TQT_SLOT(slotGetStream(const TQString &, myFile &)));
+    TQObject::connect(*myFilter, TQT_SIGNAL(sigProgress(int)), this, TQT_SIGNAL(sigProgress(int)));
 }
 
-QCString OLEFilter::mimeTypeHelper()
+TQCString OLEFilter::mimeTypeHelper()
 {
     KLaola::NodeList list = docfile->parseCurrentDir();
     KLaola::OLENode* node = list.first();