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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 9 insertions, 9 deletions

diff --git a/kspread/kspread_canvas.cpp b/kspread/kspread_canvas.cpp
index 837f6e98..1f52a955 100644
--- a/kspread/kspread_canvas.cpp
+++ b/kspread/kspread_canvas.cpp
@@ -3848,7 +3848,7 @@ void Canvas::copyOasisObjects()
     // We'll create a store (ZIP format) in memory
     TQBuffer buffer;
     TQCString mimeType = "application/vnd.oasis.opendocument.spreadsheet";
-    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 );
diff --git a/kspread/kspread_doc.cpp b/kspread/kspread_doc.cpp
index 7643b31d..99feebe5 100644
--- a/kspread/kspread_doc.cpp
+++ b/kspread/kspread_doc.cpp
@@ -648,7 +648,7 @@ bool Doc::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, SaveFlag
 
     contentTmpFile.setAutoDelete( true );
     TQFile* tmpFile = contentTmpFile.file();
-    KoXmlWriter contentTmpWriter( TQT_TQIODEVICE(tmpFile), 1 );
+    KoXmlWriter contentTmpWriter( tmpFile, 1 );
 
 
 
@@ -765,7 +765,7 @@ bool Doc::saveOasisHelper( KoStore* store, KoXmlWriter* manifestWriter, SaveFlag
 
    // And now we can copy over the contents from the tempfile to the real one
     tmpFile->close();
-    contentWriter->addCompleteElement( TQT_TQIODEVICE(tmpFile) );
+    contentWriter->addCompleteElement( tmpFile );
     contentTmpFile.close();
 
 
diff --git a/kspread/kspread_map.cpp b/kspread/kspread_map.cpp
index d54c340a..af6133ea 100644
--- a/kspread/kspread_map.cpp
+++ b/kspread/kspread_map.cpp
@@ -216,7 +216,7 @@ bool Map::saveOasis( KoXmlWriter & xmlWriter, KoGenStyles & mainStyles, KoStore
 
     bodyTmpFile.setAutoDelete( true );
     TQFile* tmpFile = bodyTmpFile.file();
-    KoXmlWriter bodyTmpWriter( TQT_TQIODEVICE(tmpFile) );
+    KoXmlWriter bodyTmpWriter( tmpFile );
 
 
     TQPtrListIterator<Sheet> it( m_lstSheets );
@@ -229,7 +229,7 @@ bool Map::saveOasis( KoXmlWriter & xmlWriter, KoGenStyles & mainStyles, KoStore
 
 
     tmpFile->close();
-    xmlWriter.addCompleteElement( TQT_TQIODEVICE(tmpFile) );
+    xmlWriter.addCompleteElement( tmpFile );
     bodyTmpFile.close();
 
     return true;
diff --git a/kspread/kspread_sheet.cpp b/kspread/kspread_sheet.cpp
index 8e20757e..8a4cf50a 100644
--- a/kspread/kspread_sheet.cpp
+++ b/kspread/kspread_sheet.cpp
@@ -7359,7 +7359,7 @@ TQString Sheet::saveOasisSheetStyleName( KoGenStyles &mainStyles )
 
     TQBuffer buffer;
     buffer.open( IO_WriteOnly );
-    KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) );  // TODO pass indentation level
+    KoXmlWriter elementWriter( &buffer );  // TODO pass indentation level
     saveOasisHeaderFooter(elementWriter);
 
     TQString elementContents = TQString::fromUtf8( buffer.buffer(), buffer.buffer().size() );
@@ -8220,14 +8220,14 @@ bool Sheet::insertPicture( const KoPoint& point, const TQPixmap& pixmap  )
 	TQBuffer buffer(data);
 
 	buffer.open( IO_ReadWrite );
-	pixmap.save( TQT_TQIODEVICE(&buffer) , "PNG" );
+	pixmap.save( &buffer , "PNG" );
 
 	//Reset the buffer so that KoPicture reads the whole file from the beginning
 	//(at the moment the read/write position is at the end)
 	buffer.reset();
 
 	KoPicture picture;
-	picture.load( TQT_TQIODEVICE(&buffer) , "PNG" );
+	picture.load( &buffer , "PNG" );
 
 	doc()->pictureCollection()->insertPicture(picture);
 
diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp
index 81518a4c..92d083b4 100644
--- a/kspread/kspread_view.cpp
+++ b/kspread/kspread_view.cpp
@@ -4147,7 +4147,7 @@ void View::paste()
     if( arr.isEmpty() )
       return;
     TQBuffer buffer( arr );
-    KoStore * store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read );
+    KoStore * store = KoStore::createStore( &buffer, KoStore::Read );
 
     KoOasisStore oasisStore( store );
     TQDomDocument doc;