1 files changed, 15 insertions, 15 deletions

diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 955b21f5..64dafd6a 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -109,9 +109,9 @@ DCOPObject* KarbonPart::dcopObject()
 }
 
 void
-KarbonPart::setPageLayout( KoPageLayout& layout, KoUnit::Unit _unit )
+KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit )
 {
-	m_pageLayout = layout;
+	m_pageLayout = tqlayout;
 	m_doc.setUnit( _unit );
 	m_doc.setWidth( m_pageLayout.ptWidth );
 	m_doc.setHeight( m_pageLayout.ptHeight );
@@ -308,7 +308,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ
 		return false;
 	}
 
-	TQString masterPageName = "Standard"; // use default layout as fallback
+	TQString masterPageName = "Standard"; // use default tqlayout as fallback
 	TQDomElement *master = styles.masterPages()[ masterPageName ];
 	if ( !master ) //last test...
 		master = styles.masterPages()[ "Default" ];
@@ -319,7 +319,7 @@ KarbonPart::loadOasis( const TQDomDocument &doc, KoOasisStyles &styles, const TQ
 		master = it.current();
 	}
 	Q_ASSERT( master );
-	const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() ) ) : 0;
+	const TQDomElement *style = master ? styles.findStyle( master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() ) ) : 0;
 	if( style )
 	{
 		m_pageLayout.loadOasis( *style );
@@ -371,7 +371,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
     KoGenStyle pageLayout = m_pageLayout.saveOasis();
     TQString layoutName = mainStyles.lookup( pageLayout, "PL" );
     KoGenStyle masterPage( KoGenStyle::STYLE_MASTER );
-    masterPage.addAttribute( "style:page-layout-name", layoutName );
+    masterPage.addAttribute( "style:page-tqlayout-name", layoutName );
     mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering );
 
     KTempFile contentTmpFile;
@@ -435,7 +435,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
     it = styleList.begin();
 
     for( ; it != styleList.end(); ++it )
-        (*it).style->writeStyle( styleWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties" );
+        (*it).style->writeStyle( styleWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties" );
 
     styleWriter->endElement(); // office:automatic-styles
 
@@ -495,19 +495,19 @@ KarbonPart::saveOasisSettings( KoXmlWriter &/*settingsWriter*/ )
 void
 KarbonPart::insertObject( VObject* object )
 {
-	// don't repaint here explicitly. some commands might want to insert many
+	// don't tqrepaint here explicitly. some commands might want to insert many
 	// objects.
 	m_doc.append( object );
 	setModified( true );
 }
 
 void
-KarbonPart::addCommand( VCommand* cmd, bool repaint )
+KarbonPart::addCommand( VCommand* cmd, bool tqrepaint )
 {
 	m_commandHistory->addCommand( cmd );
 	setModified( true );
 
-	if( repaint )
+	if( tqrepaint )
 		repaintAllViews();
 }
 
@@ -530,12 +530,12 @@ KarbonPart::clearHistory()
 }
 
 void
-KarbonPart::repaintAllViews( bool repaint )
+KarbonPart::repaintAllViews( bool tqrepaint )
 {
 	TQPtrListIterator<KoView> itr( views() );
 
 	for( ; itr.current() ; ++itr )
-		static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( repaint );
+		static_cast<KarbonView*>( itr.current() )->canvasWidget()->repaintAll( tqrepaint );
 }
 
 void
@@ -561,19 +561,19 @@ KarbonPart::paintContent( TQPainter& painter, const TQRect& rect,
 	painter.eraseRect( rect );
 	VPainterFactory *painterFactory = new VPainterFactory;
 	//TQPaintDeviceMetrics metrics( painter.device() );
-	painterFactory->setPainter( painter.device(), rect.width(), rect.height() );
+	painterFactory->setPainter( painter.tqdevice(), rect.width(), rect.height() );
 	VPainter *p = painterFactory->painter();
 	//VPainter *p = new VKoPainter( painter.device() );
 	p->begin();
 	p->setZoomFactor( zoomFactor );
-	kdDebug(38000) << "painter.worldMatrix().dx() : " << painter.worldMatrix().dx() << endl;
-	kdDebug(38000) << "painter.worldMatrix().dy() : " << painter.worldMatrix().dy() << endl;
+	kdDebug(38000) << "painter.tqworldMatrix().dx() : " << painter.tqworldMatrix().dx() << endl;
+	kdDebug(38000) << "painter.tqworldMatrix().dy() : " << painter.tqworldMatrix().dy() << endl;
 	kdDebug(38000) << "rect.x() : "<< rect.x() << endl;
 	kdDebug(38000) << "rect.y() : "<< rect.y() << endl;
 	kdDebug(38000) << "rect.width() : "<< rect.width() << endl;
 	kdDebug(38000) << "rect.height() : "<< rect.height() << endl;
 	r = document().boundingBox();
-	TQWMatrix mat = painter.worldMatrix();
+	TQWMatrix mat = painter.tqworldMatrix();
 	mat.scale( 1, -1 );
 	mat.translate( 0, -r.height() * zoomFactor );
 	p->setWorldMatrix( mat );