Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit fb6b4d204d1155fa3a1bc7a128873340db1524f7)

5 files changed, 10 insertions, 10 deletions

diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index 8356ede9..f00232cb 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -269,7 +269,7 @@ KoTextCursor * KWOasisPasteCommand::execute( KoTextCursor *c )
 
     TQBuffer buffer( m_data );
 
-    KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read );
+    KoStore * store = KoStore::createStore( &buffer, KoStore::Read );
     KWDocument* kwdoc = textdoc->textFrameSet()->kWordDocument();
     KWOasisLoader loader( kwdoc );
     loader.insertOasisData( store, c );
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index 0453407a..5a6e886e 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -2843,7 +2843,7 @@ bool KWDocument::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, S
         // storing the content into a buffer.
         TQBuffer buffer( headerFooterContent );
         buffer.open( IO_WriteOnly );
-        KoXmlWriter headerFooterTmpWriter( TQT_TQIODEVICE(&buffer) );  // TODO pass indentation level
+        KoXmlWriter headerFooterTmpWriter( &buffer );  // TODO pass indentation level
 
         // The order we write out header, header-left, etc. is important. So, we go here
         // the dirty way to collect them first and then flush them ordered out.
@@ -3021,7 +3021,7 @@ TQDragObject* KWDocument::dragSelectedPrivate( TQWidget *parent, const TQValueLi
     // We'll create a store (ZIP format) in memory
     TQBuffer buffer;
     TQCString mimeType = KWOasisSaver::selectionMimeType();
-    KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Write, mimeType );
+    KoStore* store = KoStore::createStore( &buffer, KoStore::Write, mimeType );
     Q_ASSERT( store );
     Q_ASSERT( !store->bad() );
     KoOasisStore oasisStore( store );
@@ -3189,7 +3189,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle
 
         TQBuffer buffer;
         buffer.open( IO_WriteOnly );
-        KoXmlWriter footnoteSepTmpWriter( TQT_TQIODEVICE(&buffer) );  // TODO pass indentation level
+        KoXmlWriter footnoteSepTmpWriter( &buffer );  // TODO pass indentation level
         footnoteSepTmpWriter.startElement( "style:footnote-sep" );
         TQString tmp;
         switch( m_footNoteSeparatorLinePos )
@@ -3237,7 +3237,7 @@ void KWDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyle
         if ( m_pageColumns.columns > 1 ) {
             buffer.setBuffer(TQByteArray()); // clear data
             buffer.open( IO_WriteOnly );
-            KoXmlWriter columnsTmpWriter( TQT_TQIODEVICE(&buffer) );  // TODO pass indentation level
+            KoXmlWriter columnsTmpWriter( &buffer );  // TODO pass indentation level
             columnsTmpWriter.startElement( "style:columns" );
             columnsTmpWriter.addAttribute( "fo:column-count", m_pageColumns.columns );
             columnsTmpWriter.addAttributePt( "fo:column-gap", m_pageColumns.ptColumnSpacing );
diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp
index a6a31f7c..98f27cfa 100644
--- a/kword/KWFormulaFrameSet.cpp
+++ b/kword/KWFormulaFrameSet.cpp
@@ -275,7 +275,7 @@ void KWFormulaFrameSet::saveOasis(KoXmlWriter& writer, KoSavingContext& context,
 
 	writer.startElement( "draw:object" );
 	writer.startElement( "math:math" );
-    writer.addCompleteElement( TQT_TQIODEVICE(tmpFile) );
+    writer.addCompleteElement( tmpFile );
 	writer.endElement(); // math:math
 	writer.endElement(); // draw:object
     writer.endElement(); // draw:frame
diff --git a/kword/KWOasisSaver.cpp b/kword/KWOasisSaver.cpp
index 2d1ed6cb..2ed453d0 100644
--- a/kword/KWOasisSaver.cpp
+++ b/kword/KWOasisSaver.cpp
@@ -27,7 +27,7 @@ KWOasisSaver::KWOasisSaver( KWDocument* doc )
     : m_doc( doc )
 {
     const TQCString mimeType = selectionMimeType();
-    m_store = KoStore::createStore( TQT_TQIODEVICE(&m_buffer), KoStore::Write, mimeType );
+    m_store = KoStore::createStore( &m_buffer, KoStore::Write, mimeType );
     Q_ASSERT( m_store );
     Q_ASSERT( !m_store->bad() );
 
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 633e0f3d..de64037d 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -2435,7 +2435,7 @@ void KWView::pasteData( TQMimeSource* data, bool drop )
                 if( !arr.isEmpty() )
                 {
                     TQBuffer buffer( arr );
-                    KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read );
+                    KoStore * store = KoStore::createStore( &buffer, KoStore::Read );
                     KWOasisLoader oasisLoader( m_doc );
                     TQValueList<KWFrame *> frames = oasisLoader.insertOasisData( store, 0 /* no cursor */ );
                     delete store;
@@ -6118,7 +6118,7 @@ void KWView::savePicture()
                     TQFile file( url.path() );
                     if ( file.open( IO_ReadWrite ) )
                     {
-                        picture.save( TQT_TQIODEVICE(&file) );
+                        picture.save( &file );
                         file.close();
                     }
                     else
@@ -6137,7 +6137,7 @@ void KWView::savePicture()
                         TQFile file( tempFile.name() );
                         if ( file.open( IO_ReadWrite ) )
                         {
-                            picture.save( TQT_TQIODEVICE(&file) );
+                            picture.save( &file );
                             file.close();
                             if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) )
                             {