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

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

21 files changed, 24 insertions, 24 deletions

diff --git a/filters/generic_wrapper/generic_filter.cpp b/filters/generic_wrapper/generic_filter.cpp
index 112c29d1..147ba128 100644
--- a/filters/generic_wrapper/generic_filter.cpp
+++ b/filters/generic_wrapper/generic_filter.cpp
@@ -87,7 +87,7 @@ KoFilter::ConversionStatus GenericFilter::doImport()
 
     TQFile tempFile(temp.name());
 
-    m_out = KoStore::createStore(TQT_TQIODEVICE(&tempFile), KoStore::Write);
+    m_out = KoStore::createStore(&tempFile, KoStore::Write);
 
     if (!m_out || !m_out->open("root"))
     {
diff --git a/filters/karbon/ai/aiimport.cpp b/filters/karbon/ai/aiimport.cpp
index 0af2cc93..190dc4c8 100644
--- a/filters/karbon/ai/aiimport.cpp
+++ b/filters/karbon/ai/aiimport.cpp
@@ -73,7 +73,7 @@ AiImport::convert( const TQCString& from, const TQCString& to )
         TQDomDocument doc ("DOC");
 	KarbonAIParserBase parser;
 
-        if (!parser.parse (*TQT_TQIODEVICE(&fileIn), doc))
+        if (!parser.parse(fileIn, doc))
         {
 		fileIn.close();
 		return KoFilter::CreationError;
diff --git a/filters/karbon/eps/epsimport.cpp b/filters/karbon/eps/epsimport.cpp
index 72bb1334..b8230856 100644
--- a/filters/karbon/eps/epsimport.cpp
+++ b/filters/karbon/eps/epsimport.cpp
@@ -81,7 +81,7 @@ EpsImport::convert( const TQCString& from, const TQCString& to )
 
 	if ( file.open(IO_ReadOnly) )
 	{
-		extractor.parse (*TQT_TQIODEVICE(&file));
+		extractor.parse(file);
 		llx = extractor.llx();
 		lly = extractor.lly();
 		urx = extractor.urx();
diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp
index 0c977398..229bd4ce 100644
--- a/filters/kivio/imageexport/kivio_imageexport.cpp
+++ b/filters/kivio/imageexport/kivio_imageexport.cpp
@@ -152,7 +152,7 @@ KoFilter::ConversionStatus ImageExport::convert(const TQCString& from, const TQC
   TQPixmap pixmap = TQPixmap(size);
   pixmap.fill(TQt::white);
   KivioScreenPainter kpainter;
-  kpainter.start(TQT_TQPAINTDEVICE(&pixmap));
+  kpainter.start(&pixmap);
 
   float translationX = border;
   float translationY = border;
diff --git a/filters/kspread/latex/export/document.cpp b/filters/kspread/latex/export/document.cpp
index 45cdbb73..6d5dafe0 100644
--- a/filters/kspread/latex/export/document.cpp
+++ b/filters/kspread/latex/export/document.cpp
@@ -56,7 +56,7 @@ void Document::generate()
 	if(_file.open(IO_WriteOnly))
 	{
 		kdDebug(30522) << "GENERATION" << endl;
-		_out.setDevice(TQT_TQIODEVICE(&_file));
+		_out.setDevice(&_file);
 		_document.generate(_out, !isEmbeded());
 		//_out << getDocument();
 		_file.close();
diff --git a/filters/kugar/kugarnop/kugarnopimport.cpp b/filters/kugar/kugarnop/kugarnopimport.cpp
index f3b132db..cb0a0ff4 100644
--- a/filters/kugar/kugarnop/kugarnopimport.cpp
+++ b/filters/kugar/kugarnop/kugarnopimport.cpp
@@ -43,7 +43,7 @@ KoFilter::ConversionStatus KugarNOPImport::convert( const TQCString& /*from*/, c
 	}
 	
 	KoDocument *doc=m_chain->outputDocument();
-	doc->loadXML(TQT_TQIODEVICE(&in),TQDomDocument());
+	doc->loadXML(&in,TQDomDocument());
 	in.close();
 	doc->resetURL();
 
diff --git a/filters/kword/amipro/amiproexport.cpp b/filters/kword/amipro/amiproexport.cpp
index e6703fc0..6fef9654 100644
--- a/filters/kword/amipro/amiproexport.cpp
+++ b/filters/kword/amipro/amiproexport.cpp
@@ -72,7 +72,7 @@ bool AmiProWorker::doCloseFile(void)
   if( !out.open( IO_WriteOnly ) )
     return FALSE;
   TQTextStream stream;
-  stream.setDevice( TQT_TQIODEVICE(&out) );
+  stream.setDevice( &out );
   stream << result; 
   return TRUE;
 }
diff --git a/filters/kword/amipro/amiproparser.cpp b/filters/kword/amipro/amiproparser.cpp
index 3b07c201..a73e7456 100644
--- a/filters/kword/amipro/amiproparser.cpp
+++ b/filters/kword/amipro/amiproparser.cpp
@@ -134,7 +134,7 @@ bool AmiProParser::process( const TQString& filename )
     return setResult( FileError );
 
   TQTextStream stream;
-  stream.setDevice( TQT_TQIODEVICE(&in) );
+  stream.setDevice( &in );
 
   // the first should be "[ver]"
   line = stream.readLine();
diff --git a/filters/kword/ascii/asciiexport.cpp b/filters/kword/ascii/asciiexport.cpp
index 1bea9a26..bbf4dcab 100644
--- a/filters/kword/ascii/asciiexport.cpp
+++ b/filters/kword/ascii/asciiexport.cpp
@@ -120,7 +120,7 @@ private:
 
 bool ASCIIWorker::doOpenFile(const TQString& filenameOut, const TQString& /*to*/)
 {
-    m_ioDevice = TQT_TQIODEVICE(new TQFile(filenameOut));
+    m_ioDevice = new TQFile(filenameOut);
 
     if (!m_ioDevice)
     {
diff --git a/filters/kword/hancomword/hancomwordimport.cpp b/filters/kword/hancomword/hancomwordimport.cpp
index bfab48ab..561d0cc4 100644
--- a/filters/kword/hancomword/hancomwordimport.cpp
+++ b/filters/kword/hancomword/hancomwordimport.cpp
@@ -172,7 +172,7 @@ TQByteArray HancomWordImport::Private::createContent()
   TQBuffer contentBuffer( contentData );
 
   contentBuffer.open( IO_WriteOnly );
-  contentWriter = new KoXmlWriter( TQT_TQIODEVICE(&contentBuffer) );
+  contentWriter = new KoXmlWriter( &contentBuffer );
 
   contentWriter->startDocument( "office:document-content" );
   contentWriter->startElement( "office:document-content" );
@@ -224,7 +224,7 @@ TQByteArray HancomWordImport::Private::createStyles()
   TQBuffer stylesBuffer( stylesData );
 
   stylesBuffer.open( IO_WriteOnly );
-  stylesWriter = new KoXmlWriter( TQT_TQIODEVICE(&stylesBuffer) );
+  stylesWriter = new KoXmlWriter( &stylesBuffer );
 
   stylesWriter->startDocument( "office:document-styles" );
   stylesWriter->startElement( "office:document-styles" );
@@ -280,7 +280,7 @@ TQByteArray HancomWordImport::Private::createManifest()
   TQBuffer manifestBuffer( manifestData );
 
   manifestBuffer.open( IO_WriteOnly );
-  manifestWriter = new KoXmlWriter( TQT_TQIODEVICE(&manifestBuffer) );
+  manifestWriter = new KoXmlWriter( &manifestBuffer );
   
   manifestWriter->startDocument( "manifest:manifest" );
   manifestWriter->startElement( "manifest:manifest" );
diff --git a/filters/kword/html/export/ExportFilter.cpp b/filters/kword/html/export/ExportFilter.cpp
index 96f0b6c5..1d7cffa6 100644
--- a/filters/kword/html/export/ExportFilter.cpp
+++ b/filters/kword/html/export/ExportFilter.cpp
@@ -472,7 +472,7 @@ bool HtmlWorker::doFullParagraph(const TQString& paraText,
 
 bool HtmlWorker::doOpenFile(const TQString& filenameOut, const TQString& /*to*/)
 {
-    m_ioDevice=TQT_TQIODEVICE(new TQFile(filenameOut));
+    m_ioDevice=new TQFile(filenameOut);
 
     if (!m_ioDevice)
     {
diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp
index 9e10ad9c..12fc94ea 100644
--- a/filters/kword/kword1.3/import/kword13import.cpp
+++ b/filters/kword/kword1.3/import/kword13import.cpp
@@ -199,7 +199,7 @@ KoFilter::ConversionStatus KWord13Import::convert( const TQCString& from, const
 
         TQFile file( fileName );
         file.open( IO_ReadOnly );
-        if ( ! parseRoot( TQT_TQIODEVICE(&file), kwordDocument ) )
+        if ( ! parseRoot( &file, kwordDocument ) )
         {
             kdError(30520) << "Could not process document! Aborting!" << endl;
             file.close();
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
index bf2ca8a5..e3276785 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
@@ -107,7 +107,7 @@ void KWord13OasisGenerator::preparePageLayout( void )
         // ### TODO: test
         TQBuffer buffer;
         buffer.open( IO_WriteOnly );
-        KoXmlWriter element ( TQT_TQIODEVICE(&buffer) );
+        KoXmlWriter element ( &buffer );
         element.startElement("style:columns");
         element.addAttribute( "fo:column-count", columns );
         element.addAttributePt( "fo:column-gap", positiveNumberOrNull( m_kwordDocument->getProperty( "PAPER:columnspacing", "PAPER:ptColumnspc" ) ) );
@@ -932,7 +932,7 @@ bool KWord13OasisGenerator::generate ( const TQString& fileName, KWord13Document
     TQByteArray manifestData;
     TQBuffer manifestBuffer( manifestData );
     manifestBuffer.open( IO_WriteOnly );
-    m_manifestWriter = new KoXmlWriter( TQT_TQIODEVICE(&manifestBuffer) );
+    m_manifestWriter = new KoXmlWriter( &manifestBuffer );
     m_manifestWriter->startDocument( "manifest:manifest" );
     m_manifestWriter->startElement( "manifest:manifest" );
     m_manifestWriter->addAttribute( "xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0" );
diff --git a/filters/kword/latex/export/xml2latexparser.cpp b/filters/kword/latex/export/xml2latexparser.cpp
index 88936c9a..42e37f47 100644
--- a/filters/kword/latex/export/xml2latexparser.cpp
+++ b/filters/kword/latex/export/xml2latexparser.cpp
@@ -60,7 +60,7 @@ void Xml2LatexParser::generate()
 	if(_file.open(IO_WriteOnly))
 	{
 		kdDebug(30522) << "GENERATION" << endl;
-		_out.setDevice(TQT_TQIODEVICE(&_file));
+		_out.setDevice(&_file);
 		if(!Config::instance()->isEmbeded())
 			FileHeader::instance()->generate(_out);
 		_document.generate(_out, !Config::instance()->isEmbeded());
diff --git a/filters/kword/libexport/KWEFBaseWorker.cpp b/filters/kword/libexport/KWEFBaseWorker.cpp
index a47f647d..e6cf1a49 100644
--- a/filters/kword/libexport/KWEFBaseWorker.cpp
+++ b/filters/kword/libexport/KWEFBaseWorker.cpp
@@ -136,7 +136,7 @@ bool KWEFBaseWorker::loadAndConvertToImage(const TQString& strName, const TQStri
         return false;
     }
 
-    imageIO.setIODevice(TQT_TQIODEVICE(&buffer));
+    imageIO.setIODevice(&buffer);
     imageIO.setFormat(outExtension.utf8());
 
     if (!imageIO.write())
diff --git a/filters/kword/libexport/KWEFKWordLeader.cpp b/filters/kword/libexport/KWEFKWordLeader.cpp
index 17e1d517..bd0df63a 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cpp
+++ b/filters/kword/libexport/KWEFKWordLeader.cpp
@@ -1413,7 +1413,7 @@ KoFilter::ConversionStatus KWEFKWordLeader::convert( KoFilterChain* chain,
         else
         {
             TQFile file( filename );
-            if ( ! ProcessStoreFile( TQT_TQIODEVICE(&file), ProcessDocTag, this ) )
+            if ( ! ProcessStoreFile( &file, ProcessDocTag, this ) )
             {
                 kdError(30508) << "Could not process document! Aborting!" << endl;
                 doAbortFile();
diff --git a/filters/kword/mswrite/mswriteexport.cpp b/filters/kword/mswrite/mswriteexport.cpp
index abf007f8..879ad60e 100644
--- a/filters/kword/mswrite/mswriteexport.cpp
+++ b/filters/kword/mswrite/mswriteexport.cpp
@@ -1188,7 +1188,7 @@ public:
 					outBuffer.open (IO_WriteOnly);
 
 					// write BMP
-					imageIO.setIODevice (TQT_TQIODEVICE(&outBuffer));
+					imageIO.setIODevice (&outBuffer);
 					imageIO.setFormat ("BMP");
 					if (!imageIO.write ())
 					{
diff --git a/filters/kword/oowriter/ExportFilter.cpp b/filters/kword/oowriter/ExportFilter.cpp
index d96b451a..8be165c3 100644
--- a/filters/kword/oowriter/ExportFilter.cpp
+++ b/filters/kword/oowriter/ExportFilter.cpp
@@ -1400,7 +1400,7 @@ bool OOWriterWorker::makePicture( const FrameAnchor& anchor, const AnchorType an
         TQBuffer buffer( image.copy() ); // Be more safe than sorry and do not allow shallow copy
         KoPicture pic;
         buffer.open( IO_ReadOnly );
-        if ( pic.load( TQT_TQIODEVICE(&buffer), strExtension ) )
+        if ( pic.load( &buffer, strExtension ) )
         {
             const TQSize size ( pic.getOriginalSize() );
             height = size.height();
diff --git a/filters/kword/rtf/export/ExportFilter.cpp b/filters/kword/rtf/export/ExportFilter.cpp
index eba2b645..2b97d0a0 100644
--- a/filters/kword/rtf/export/ExportFilter.cpp
+++ b/filters/kword/rtf/export/ExportFilter.cpp
@@ -888,7 +888,7 @@ bool RTFWorker::doFooter(const FooterData& footer)
 
 bool RTFWorker::doOpenFile(const TQString& filenameOut, const TQString& /*to*/)
 {
-    m_ioDevice=TQT_TQIODEVICE(new TQFile(filenameOut));
+    m_ioDevice=new TQFile(filenameOut);
 
     if (!m_ioDevice)
     {
diff --git a/filters/kword/wml/wmlexport.cpp b/filters/kword/wml/wmlexport.cpp
index 978cb14d..df6dd3d5 100644
--- a/filters/kword/wml/wmlexport.cpp
+++ b/filters/kword/wml/wmlexport.cpp
@@ -71,7 +71,7 @@ bool WMLWorker::doCloseFile(void)
   if( !out.open( IO_WriteOnly ) )
     return FALSE;
   TQTextStream stream;
-  stream.setDevice( TQT_TQIODEVICE(&out) );
+  stream.setDevice( &out );
   stream << result; 
   return TRUE;
 }
diff --git a/filters/kword/wml/wmlparser.cpp b/filters/kword/wml/wmlparser.cpp
index 81ccbd24..e704061a 100644
--- a/filters/kword/wml/wmlparser.cpp
+++ b/filters/kword/wml/wmlparser.cpp
@@ -429,7 +429,7 @@ WMLLayout& WMLLayout::operator=( const WMLLayout& l )
 void WMLParser::parse( const char* filename )
 {
    TQFile f( filename );
-   TQXmlInputSource source( TQT_TQIODEVICE(&f) );
+   TQXmlInputSource source( &f );
    TQXmlSimpleReader reader;
    WMLHandler handler( this );
    reader.setContentHandler( &handler );