Remove additional unneeded tq method conversions

11 files changed, 105 insertions, 105 deletions

diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cc
index a17f94da..82debb58 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.cc
+++ b/filters/karbon/applixgraphics/applixgraphicimport.cc
@@ -189,10 +189,10 @@ KoFilter::ConversionStatus APPLIXGRAPHICImport::convert( const TQCString& from,
       TQMessageBox::critical (0L, "Applixgraphics header problem",
                                   TQString ("The Applixgraphics header is not correct. "
                                            "May be it is not an applixgraphics file! <BR>"
-                                           "This is the header line I did read:<BR><B>%1</B>").tqarg(mystr.latin1()),
+                                           "This is the header line I did read:<BR><B>%1</B>").arg(mystr.latin1()),
 				    "Comma");
 
-      // i18n( "What is the separator used in this file ? First line is \n%1" ).tqarg(firstLine),
+      // i18n( "What is the separator used in this file ? First line is \n%1" ).arg(firstLine),
       return KoFilter::StupidError;
     }
 
diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cc
index 32a0845c..77a650bb 100644
--- a/filters/karbon/eps/epsimport.cc
+++ b/filters/karbon/eps/epsimport.cc
@@ -93,7 +93,7 @@ EpsImport::convert( const TQCString& from, const TQCString& to )
 
 	// sed filter
 	TQString sedFilter = TQString ("sed -e \"s/%%BoundingBox: 0 0 612 792/%%BoundingBox: %1 %2 %3 %4/g\"").
-            tqarg(llx).tqarg(lly).tqarg(urx).tqarg(ury);
+            arg(llx).arg(lly).arg(urx).arg(ury);
 
 	// Build ghostscript call to convert ps/eps -> ai:
 	TQString command(
diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc
index 3e79e3ab..8c4c2795 100644
--- a/filters/karbon/msod/msod.cc
+++ b/filters/karbon/msod/msod.cc
@@ -39,18 +39,18 @@ Msod::Msod(
     m_dpi = dpi;
     m_images.setAutoDelete(true);
     m_opt = new Options(*this);
-    m_tqshape.data = 0L;
-    m_tqshape.length = 0;
+    m_shape.data = 0L;
+    m_shape.length = 0;
 }
 
 Msod::~Msod()
 {
-    delete [] m_tqshape.data;
+    delete [] m_shape.data;
     delete m_opt;
 }
 
 void Msod::drawShape(
-    unsigned tqshapeType,
+    unsigned shapeType,
     TQ_UINT32 bytes,
     TQDataStream &operands)
 {
@@ -262,25 +262,25 @@ void Msod::drawShape(
     };
     struct
     {
-        TQ_UINT32 spid;                  // The tqshape id
+        TQ_UINT32 spid;                  // The shape id
         union
         {
             TQ_UINT32 info;
             struct
             {
-                TQ_UINT32 fGroup : 1;    // This tqshape is a group tqshape
-                TQ_UINT32 fChild : 1;    // Not a top-level tqshape
-                TQ_UINT32 fPatriarch : 1; // This is the topmost group tqshape.
+                TQ_UINT32 fGroup : 1;    // This shape is a group shape
+                TQ_UINT32 fChild : 1;    // Not a top-level shape
+                TQ_UINT32 fPatriarch : 1; // This is the topmost group shape.
                                         // Exactly one of these per drawing.
                 TQ_UINT32 fDeleted : 1;  // The shape.has been deleted
-                TQ_UINT32 fOleShape : 1; // The tqshape is an OLE object
+                TQ_UINT32 fOleShape : 1; // The shape is an OLE object
                 TQ_UINT32 fHaveMaster : 1; // Shape has a hspMaster property
                 TQ_UINT32 fFlipH : 1;    // Shape is flipped horizontally
                 TQ_UINT32 fFlipV : 1;    // Shape is flipped vertically
-                TQ_UINT32 fConnector : 1; // Connector type of tqshape
+                TQ_UINT32 fConnector : 1; // Connector type of shape
                 TQ_UINT32 fHaveAnchor : 1; // Shape has an anchor of some kind
-                TQ_UINT32 fBackground : 1; // Background tqshape
-                TQ_UINT32 fHaveSpt : 1;  // Shape has a tqshape type property
+                TQ_UINT32 fBackground : 1; // Background shape
+                TQ_UINT32 fHaveSpt : 1;  // Shape has a shape type property
                 TQ_UINT32 reserved : 20; // Not yet used
             } fields;
         } grfPersistent;
@@ -291,12 +291,12 @@ void Msod::drawShape(
     operands >> data.spid;
     operands >> data.grfPersistent.info;
     bytes -= 8;
-	kdDebug(s_area) << "tqshape-id: " << data.spid << " type: " << funcTab[tqshapeType] << " (" << tqshapeType << ")" <<
+	kdDebug(s_area) << "shape-id: " << data.spid << " type: " << funcTab[shapeType] << " (" << shapeType << ")" <<
         (data.grfPersistent.fields.fGroup ? " group" : "") <<
         (data.grfPersistent.fields.fChild ? " child" : "") <<
         (data.grfPersistent.fields.fPatriarch ? " patriarch" : "") <<
         (data.grfPersistent.fields.fDeleted ? " deleted" : "") <<
-        (data.grfPersistent.fields.fOleShape ? " oletqshape" : "") <<
+        (data.grfPersistent.fields.fOleShape ? " oleshape" : "") <<
         (data.grfPersistent.fields.fHaveMaster ? " master" : "") <<
         (data.grfPersistent.fields.fFlipH ? " flipv" : "") <<
         (data.grfPersistent.fields.fConnector ? " connector" : "") <<
@@ -309,9 +309,9 @@ void Msod::drawShape(
     if ((!m_isRequiredDrawing) && (m_requestedShapeId != data.spid))
         return;
 
-    // An active tqshape! Let's draw it...
+    // An active shape! Let's draw it...
 
-    switch (tqshapeType)
+    switch (shapeType)
     {
     case 0:
         if (m_opt->m_pVertices)
@@ -493,7 +493,7 @@ TQSize Msod::normaliseSize(
 }
 
 bool Msod::parse(
-    unsigned tqshapeId,
+    unsigned shapeId,
     const TQString &file,
     const char *delayStream)
 {
@@ -505,19 +505,19 @@ bool Msod::parse(
         return false;
     }
     TQDataStream stream(&in);
-    bool result = parse(tqshapeId, stream, in.size(), delayStream);
+    bool result = parse(shapeId, stream, in.size(), delayStream);
     in.close();
     return result;
 }
 
 bool Msod::parse(
-    unsigned tqshapeId,
+    unsigned shapeId,
     TQDataStream &stream,
     unsigned size,
     const char *delayStream)
 {
     stream.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
-    m_requestedShapeId = tqshapeId;
+    m_requestedShapeId = shapeId;
     m_isRequiredDrawing = false;
     m_delayStream = delayStream;
 
@@ -854,8 +854,8 @@ void Msod::opDg(Header &, TQ_UINT32, TQDataStream &operands)
 {
     struct
     {
-        TQ_UINT32 csp;        // The number of tqshapes in this drawing.
-        TQ_UINT32 spidCur;    // The last tqshape ID given to an SP in this DG.
+        TQ_UINT32 csp;        // The number of shapes in this drawing.
+        TQ_UINT32 spidCur;    // The last shape ID given to an SP in this DG.
     } data;
 
     operands >> data.csp >> data.spidCur;
@@ -878,10 +878,10 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands)
 {
     struct
     {
-        TQ_UINT32 spidMax;    // The current maximum tqshape ID.
+        TQ_UINT32 spidMax;    // The current maximum shape ID.
         TQ_UINT32 cidcl;      // The number of ID clusters (FIDCLs).
-        TQ_UINT32 cspSaved;   // The total number of tqshapes saved.
-                        // (including deleted tqshapes, if undo
+        TQ_UINT32 cspSaved;   // The total number of shapes saved.
+                        // (including deleted shapes, if undo
                         // information was saved).
         TQ_UINT32 cdgSaved;   // The total number of drawings saved.
     } data;
@@ -896,7 +896,7 @@ void Msod::opDgg(Header &, TQ_UINT32, TQDataStream &operands)
     unsigned i;
 
     operands >> data.spidMax >> data.cidcl >> data.cspSaved >> data.cdgSaved;
-    kdDebug(s_area) << data.cspSaved << " tqshapes in " <<
+    kdDebug(s_area) << data.cspSaved << " shapes in " <<
         data.cidcl - 1 << " clusters in " <<
         data.cdgSaved << " drawings" << endl;
     for (i = 0; i < data.cidcl - 1; i++)
@@ -943,31 +943,31 @@ void Msod::opSolvercontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands)
 
 void Msod::opSp(Header &op, TQ_UINT32 bytes, TQDataStream &operands)
 {
-    // We want to defer the act of drawing a tqshape until we have seen any options
+    // We want to defer the act of drawing a shape until we have seen any options
     // that may affect it. Thus, we merely store the data away, and let opSpContainer
     // do all the ahrd work.
 
-    m_tqshape.type = op.opcode.fields.inst;
-    m_tqshape.length = bytes;
-    m_tqshape.data = new char [bytes];
-    operands.readRawBytes(m_tqshape.data, bytes);
+    m_shape.type = op.opcode.fields.inst;
+    m_shape.length = bytes;
+    m_shape.data = new char [bytes];
+    operands.readRawBytes(m_shape.data, bytes);
 }
 
 void Msod::opSpcontainer(Header &, TQ_UINT32 bytes, TQDataStream &operands)
 {
     walk(bytes, operands);
 
-    // Having gathered all the information for this tqshape, we can now draw it.
+    // Having gathered all the information for this shape, we can now draw it.
 
     TQByteArray  a;
 
-    a.setRawData(m_tqshape.data, m_tqshape.length);
+    a.setRawData(m_shape.data, m_shape.length);
     TQDataStream s(a, IO_ReadOnly);
     s.setByteOrder(TQDataStream::LittleEndian); // Great, I love TQt !
-    drawShape(m_tqshape.type, m_tqshape.length, s);
-    a.resetRawData(m_tqshape.data, m_tqshape.length);
-    delete [] m_tqshape.data;
-    m_tqshape.data = 0L;
+    drawShape(m_shape.type, m_shape.length, s);
+    a.resetRawData(m_shape.data, m_shape.length);
+    delete [] m_shape.data;
+    m_shape.data = 0L;
 }
 
 void Msod::opSpgr(Header &, TQ_UINT32, TQDataStream &operands)
@@ -1097,7 +1097,7 @@ void Msod::Options::initialise()
     m_geoTop = 0;
     m_geoRight = 21600;
     m_geoBottom = 21600;
-    m_tqshapePath = 1;
+    m_shapePath = 1;
     delete m_pVertices;
     m_pVertices = 0L;
     m_fShadowOK = true;
@@ -1233,7 +1233,7 @@ void Msod::Options::walk(TQ_UINT32 bytes, TQDataStream &operands)
             m_geoBottom = op.value;
             break;
         case 324:
-            m_tqshapePath = op.value;
+            m_shapePath = op.value;
             break;
         case 383:
             m_fShadowOK = (op.value & 0x0020) != 0;
diff --git a/filters/karbon/msod/msod.h b/filters/karbon/msod/msod.h
index f53146bf..3db6fc2f 100644
--- a/filters/karbon/msod/msod.h
+++ b/filters/karbon/msod/msod.h
@@ -44,15 +44,15 @@ public:
         unsigned dpi);
     virtual ~Msod();
 
-    // Called to parse the given file. We extract a drawing by tqshapeId.
+    // Called to parse the given file. We extract a drawing by shapeId.
     // If the drawing is not found, the return value will be false.
 
     bool parse(
-        unsigned tqshapeId,
+        unsigned shapeId,
         const TQString &file,
         const char *delayStream = 0L);
     bool parse(
-        unsigned tqshapeId,
+        unsigned shapeId,
         TQDataStream &stream,
         unsigned size,
         const char *delayStream = 0L);
@@ -114,14 +114,14 @@ private:
         unsigned type;
         char *data;
         unsigned length;
-    } m_tqshape;
+    } m_shape;
 
     TQPoint normalisePoint(
         TQDataStream &operands);
     TQSize normaliseSize(
         TQDataStream &operands);
     void drawShape(
-        unsigned tqshapeType,
+        unsigned shapeType,
         TQ_UINT32 bytes,
         TQDataStream &operands);
 
@@ -244,7 +244,7 @@ private:
         TQ_UINT32 m_geoTop;
         TQ_UINT32 m_geoRight;
         TQ_UINT32 m_geoBottom;
-        TQ_UINT32 m_tqshapePath;
+        TQ_UINT32 m_shapePath;
         TQPointArray *m_pVertices;
         bool m_fShadowOK;
         bool m_f3DOK;
diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc
index c3ee7b2a..e25889c0 100644
--- a/filters/karbon/msod/msodimport.cc
+++ b/filters/karbon/msod/msodimport.cc
@@ -51,13 +51,13 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     if (to != "application/x-karbon" || from != "image/x-msod")
         return KoFilter::NotImplemented;
 
-    // Get configuration data: the tqshape id, and any delay stream that we were given.
-    unsigned tqshapeId;
-    emit commSignalShapeID( tqshapeId );
+    // Get configuration data: the shape id, and any delay stream that we were given.
+    unsigned shapeId;
+    emit commSignalShapeID( shapeId );
     const char *delayStream = 0L;
     emit commSignalDelayStream( delayStream );
     kdDebug( s_area ) << "##################################################################" << endl;
-    kdDebug( s_area ) << "tqshape id: " << tqshapeId << endl;
+    kdDebug( s_area ) << "shape id: " << shapeId << endl;
     kdDebug( s_area ) << "delay stream: " << delayStream << endl;
     kdDebug( s_area ) << "##################################################################" << endl;
 /*
@@ -68,9 +68,9 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     kdDebug(s_area) << "MSODImport::filter: config: " << config << endl;
     for (i = 0; i < args.count(); i++)
     {
-        if (args[i].startsWith("tqshape-id="))
+        if (args[i].startsWith("shape-id="))
         {
-            tqshapeId = args[i].mid(9).toUInt();
+            shapeId = args[i].mid(9).toUInt();
         }
         else
         if (args[i].startsWith("delay-stream="))
@@ -91,7 +91,7 @@ KoFilter::ConversionStatus MSODImport::convert( const TQCString& from, const TQC
     m_text += "<DOC mime=\"application/x-karbon\" syntaxVersion=\"0.1\" editor=\"WMF import filter\">\n";
     m_text += "  <LAYER name=\"Layer\" visible=\"1\">\n";
 
-    if (!parse(tqshapeId, m_chain->inputFile(), delayStream))
+    if (!parse(shapeId, m_chain->inputFile(), delayStream))
         return KoFilter::WrongFormat;
 
     // close doc
diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h
index 9c721882..9264b7d5 100644
--- a/filters/karbon/msod/msodimport.h
+++ b/filters/karbon/msod/msodimport.h
@@ -68,7 +68,7 @@ protected:
 signals:
     // Communication signals to the parent filters
     void commSignalDelayStream( const char* delay );
-    void commSignalShapeID( unsigned int& tqshapeID );
+    void commSignalShapeID( unsigned int& shapeID );
 
 private:
     virtual void savePartContents( TQIODevice* file );
diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cc
index 07381db8..a5ed9b40 100644
--- a/filters/karbon/svg/svgexport.cc
+++ b/filters/karbon/svg/svgexport.cc
@@ -171,7 +171,7 @@ TQString
 SvgExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " id=\"%1\"" ).tqarg( obj->name() );
+		return TQString( " id=\"%1\"" ).arg( obj->name() );
 	return TQString();
 }
 
@@ -490,9 +490,9 @@ SvgExport::visitVText( VText& text )
 		*m_body << " font-weight=\"bold\"";
 	if( text.font().italic() )
 		*m_body << " font-style=\"italic\"";
-	if( text.tqalignment() == VText::Center )
+	if( text.alignment() == VText::Center )
 		*m_body << " text-anchor=\"middle\"";
-	else if( text.tqalignment() == VText::Right )
+	else if( text.alignment() == VText::Right )
 		*m_body << " text-anchor=\"end\"";
 
 	*m_body << ">" << endl;
diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cc
index 580512dc..9d323d3d 100644
--- a/filters/karbon/svg/svgimport.cc
+++ b/filters/karbon/svg/svgimport.cc
@@ -138,7 +138,7 @@ void SvgImport::convert()
 	m_outerRect = m_document.boundingBox();
 
 	// undo y-mirroring
-	//m_debug->append(TQString("%1\tUndo Y-mirroring.").tqarg(m_time.elapsed()));
+	//m_debug->append(TQString("%1\tUndo Y-mirroring.").arg(m_time.elapsed()));
 	if( !docElem.attribute( "viewBox" ).isEmpty() )
 	{
 		// allow for viewbox def with ',' or whitespace
@@ -692,17 +692,17 @@ void SvgImport::parsePA( VObject *obj, SvgGraphicsContext *gc, const TQString &c
 					//kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
 					//kdDebug() << gc->fill.gradient().vector().x() << endl;
-					double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox );
-					double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox );
+					double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
+					double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
 					gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					if(gc->fill.gradient().type() == VGradient::radial)
 					{
-						offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
-						offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
+						offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
+						offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
 						gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					}
-					offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox );
-					offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox );
+					offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox );
+					offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox );
 					gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 					//kdDebug() << offsety << endl;
 					//kdDebug() << gc->fill.gradient().origin().x() << endl;
diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cc
index 636268b7..e1599a8c 100644
--- a/filters/karbon/xaml/xamlexport.cc
+++ b/filters/karbon/xaml/xamlexport.cc
@@ -161,7 +161,7 @@ TQString
 XAMLExport::getID( VObject *obj )
 {
 	if( obj && !obj->name().isEmpty() )
-		return TQString( " Name=\"%1\"" ).tqarg( obj->name() );
+		return TQString( " Name=\"%1\"" ).arg( obj->name() );
 	return TQString();
 }
 
diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cc
index cbe8ddbb..002001e2 100644
--- a/filters/karbon/xaml/xamlimport.cc
+++ b/filters/karbon/xaml/xamlimport.cc
@@ -24,9 +24,9 @@
 #include <kdebug.h>
 #include <KoUnit.h>
 #include <KoGlobal.h>
-#include <tqshapes/vellipse.h>
-#include <tqshapes/vrectangle.h>
-#include <tqshapes/vpolygon.h>
+#include <shapes/vellipse.h>
+#include <shapes/vrectangle.h>
+#include <shapes/vpolygon.h>
 #include <commands/vtransformcmd.h>
 #include <core/vsegment.h>
 #include <core/vtext.h>
@@ -466,14 +466,14 @@ XAMLImport::parsePA( VObject *obj, XAMLGraphicsContext *gc, const TQString &comm
 				//kdDebug() << "!!!!!!bbox y : " << bbox.y() << endl;
 				//kdDebug() << gc->fill.gradient().origin().x() << endl;
 				//kdDebug() << gc->fill.gradient().vector().x() << endl;
-				double offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().x() ), true, false, bbox );
-				double offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().origin().y() ), false, true, bbox );
+				double offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().x() ), true, false, bbox );
+				double offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().origin().y() ), false, true, bbox );
 				gc->fill.gradient().setOrigin( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
-				offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
-				offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
+				offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().x() ), true, false, bbox );
+				offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().focalPoint().y() ), false, true, bbox );
 				gc->fill.gradient().setFocalPoint( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
-				offsetx = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().x() ), true, false, bbox );
-				offsety = parseUnit( TQString( "%1%" ).tqarg( gc->fill.gradient().vector().y() ), false, true, bbox );
+				offsetx = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().x() ), true, false, bbox );
+				offsety = parseUnit( TQString( "%1%" ).arg( gc->fill.gradient().vector().y() ), false, true, bbox );
 				gc->fill.gradient().setVector( KoPoint( bbox.x() + offsetx, bbox.y() + offsety ) );
 				//kdDebug() << offsety << endl;
 				//kdDebug() << gc->fill.gradient().origin().x() << endl;
diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc
index 8de11197..215c4f01 100644
--- a/filters/karbon/xcf/xcfexport.cc
+++ b/filters/karbon/xcf/xcfexport.cc
@@ -128,10 +128,10 @@ XcfExport::visitVDocument( VDocument& document )
 
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for layer and channel offsets.
-	m_stream->tqdevice()->at(
+	m_stream->device()->at(
 		// current position + (number layers + number channels + 2) * 4.
 		current + ( document.layers().count() + 3 + 2 ) * 4 );
 
@@ -142,7 +142,7 @@ XcfExport::visitVDocument( VDocument& document )
 	for( ; itr.current(); ++itr )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 
 		// Write layer.
@@ -150,31 +150,31 @@ XcfExport::visitVDocument( VDocument& document )
 
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save layer offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Append a zero offset to indicate end of layer offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
 
 
 	// Return to end offset.
-	m_stream->tqdevice()->at( end );
+	m_stream->device()->at( end );
 
 	// Append a zero offset to indicate end of channel offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
@@ -279,13 +279,13 @@ XcfExport::visitVLayer( VLayer& layer )
 	TQIODevice::Offset end = 0;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for hierarchy offsets.
-	m_stream->tqdevice()->at( current + 8 );
+	m_stream->device()->at( current + 8 );
 
 	// Save start offset.
-	start = m_stream->tqdevice()->at();
+	start = m_stream->device()->at();
 
 
 	// Write hierarchy.
@@ -293,10 +293,10 @@ XcfExport::visitVLayer( VLayer& layer )
 
 
 	// Save end offset.
-	end = m_stream->tqdevice()->at();
+	end = m_stream->device()->at();
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Save hierarchy offset.
 	*m_stream << start;
@@ -333,15 +333,15 @@ XcfExport::writeHierarchy()
 	int height = m_height;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for level offsets.
-	m_stream->tqdevice()->at( current + ( levels + 1 ) * 4 );
+	m_stream->device()->at( current + ( levels + 1 ) * 4 );
 
 	for( int i = 0; i < levels; ++i )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 		if( i == 0 )
 		{
@@ -360,23 +360,23 @@ XcfExport::writeHierarchy()
 		}
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save level offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 
 	// Return to current offset.
-	m_stream->tqdevice()->at( current );
+	m_stream->device()->at( current );
 
 	// Append a zero offset to indicate end of level offsets.
 	*m_stream << static_cast<TQ_UINT32>( 0 );
@@ -398,15 +398,15 @@ XcfExport::writeLevel()
 	int tiles = rows * cols;
 
 	// Save current offset.
-	current = m_stream->tqdevice()->at();
+	current = m_stream->device()->at();
 
 	// Leave space for tile offsets.
-	m_stream->tqdevice()->at( current + ( tiles + 1 ) * 4 );
+	m_stream->device()->at( current + ( tiles + 1 ) * 4 );
 
 	for( int i = 0; i < tiles; ++i )
 	{
 		// Save start offset.
-		start = m_stream->tqdevice()->at();
+		start = m_stream->device()->at();
 
 
 		// TODO: Save tile.
@@ -425,19 +425,19 @@ XcfExport::writeLevel()
 
 
 		// Save end offset.
-		end = m_stream->tqdevice()->at();
+		end = m_stream->device()->at();
 
 		// Return to current offset.
-		m_stream->tqdevice()->at( current );
+		m_stream->device()->at( current );
 
 		// Save tile offset.
 		*m_stream << start;
 
 		// Increment offset.
-		current = m_stream->tqdevice()->at();
+		current = m_stream->device()->at();
 
 		// Return to end offset.
-		m_stream->tqdevice()->at( end );
+		m_stream->device()->at( end );
 	}
 }