Rename a number of old tq methods that are no longer tq specific

2 files changed, 31 insertions, 31 deletions

diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc
index 3e9237fb..215c4f01 100644
--- a/filters/karbon/xcf/xcfexport.cc
+++ b/filters/karbon/xcf/xcfexport.cc
@@ -52,7 +52,7 @@ XcfExport::XcfExport( KoFilter*, const char*, const TQStringList& )
 	m_zoomY = 1.0;
 }
 
-KoFilter::ConversiontqStatus
+KoFilter::ConversionStatus
 XcfExport::convert( const TQCString& from, const TQCString& to )
 {
 	if( to != "image/x-xcf-gimp" || from != "application/x-karbon" )
@@ -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 );
 	}
 }
 
diff --git a/filters/karbon/xcf/xcfexport.h b/filters/karbon/xcf/xcfexport.h
index 82d86883..f6a7be70 100644
--- a/filters/karbon/xcf/xcfexport.h
+++ b/filters/karbon/xcf/xcfexport.h
@@ -40,7 +40,7 @@ public:
 	XcfExport( KoFilter* parent, const char* name, const TQStringList& );
 	virtual ~XcfExport() {}
 
-	virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+	virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 
 	virtual void visitVDocument( VDocument& document );
 	virtual void visitVLayer( VLayer& layer );