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

diff --git a/kword/KWOasisSaver.cpp b/kword/KWOasisSaver.cpp
index b4f3fd54..2d1ed6cb 100644
--- a/kword/KWOasisSaver.cpp
+++ b/kword/KWOasisSaver.cpp
@@ -26,8 +26,8 @@
 KWOasisSaver::KWOasisSaver( KWDocument* doc )
     : m_doc( doc )
 {
-    const QCString mimeType = selectionMimeType();
-    m_store = KoStore::createStore( &m_buffer, KoStore::Write, mimeType );
+    const TQCString mimeType = selectionMimeType();
+    m_store = KoStore::createStore( TQT_TQIODEVICE(&m_buffer), KoStore::Write, mimeType );
     Q_ASSERT( m_store );
     Q_ASSERT( !m_store->bad() );
 
@@ -42,9 +42,9 @@ KWOasisSaver::KWOasisSaver( KWDocument* doc )
     bodyWriter->startElement( "office:text" );
 }
 
-void KWOasisSaver::saveParagraphs( const QValueList<const KoTextParag *>& paragraphs )
+void KWOasisSaver::saveParagraphs( const TQValueList<const KoTextParag *>& paragraphs )
 {
-    for ( QValueList<const KoTextParag *>::const_iterator it = paragraphs.begin(),
+    for ( TQValueList<const KoTextParag *>::const_iterator it = paragraphs.begin(),
                                                    end = paragraphs.end();
                   it != end ; ++it ) {
         saveParagraph( *it );
@@ -58,10 +58,10 @@ void KWOasisSaver::saveParagraph( const KoTextParag* parag )
     parag->saveOasis( *bodyWriter, *m_savingContext, 0, parag->length()-2, true );
 }
 
-QByteArray KWOasisSaver::data() const
+TQByteArray KWOasisSaver::data() const
 {
     Q_ASSERT( !m_store ); // forgot to call finish() (or to check its return value) ?
-    return m_buffer.buffer();
+    return const_cast<TQBuffer&>(m_buffer).buffer();
 }
 
 KWOasisSaver::~KWOasisSaver()
@@ -92,7 +92,7 @@ bool KWOasisSaver::finish()
     //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
     m_doc->saveOasisDocumentStyles( m_store, m_mainStyles, *m_savingContext,
                                     KWDocument::SaveSelected /* simply means not SaveAll */,
-                                    QByteArray() /* no headers/footers */ );
+                                    TQByteArray() /* no headers/footers */ );
     if ( !m_store->close() ) // done with styles.xml
         return false;
 
@@ -104,8 +104,8 @@ bool KWOasisSaver::finish()
 
 void KWOasisSaver::writeAutomaticStyles( KoXmlWriter& contentWriter, KoGenStyles& mainStyles, bool stylesDotXml )
 {
-    QValueList<KoGenStyles::NamedStyle> styles = mainStyles.styles( KoGenStyle::STYLE_AUTO, stylesDotXml );
-    QValueList<KoGenStyles::NamedStyle>::const_iterator it = styles.begin();
+    TQValueList<KoGenStyles::NamedStyle> styles = mainStyles.styles( KoGenStyle::STYLE_AUTO, stylesDotXml );
+    TQValueList<KoGenStyles::NamedStyle>::const_iterator it = styles.begin();
     for ( ; it != styles.end() ; ++it ) {
         (*it).style->writeStyle( &contentWriter, mainStyles, "style:style", (*it).name, "style:paragraph-properties" );
     }