TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/karbon/core/vimage.cc b/karbon/core/vimage.cc
index a8bbf138..7f75254b 100644
--- a/karbon/core/vimage.cc
+++ b/karbon/core/vimage.cc
@@ -9,20 +9,20 @@
 #include "vfill.h"
 #include "vstroke.h"
 
-#include <qdom.h>
-#include <qimage.h>
+#include <tqdom.h>
+#include <tqimage.h>
 #include <KoRect.h>
 
 #include <render/vqpainter.h>
 
 #include <kdebug.h>
 
-VImage::VImage( VObject *parent, const QString &fname ) : VObject( parent ), m_image( 0L ), m_fname( fname )
+VImage::VImage( VObject *tqparent, const TQString &fname ) : VObject( tqparent ), m_image( 0L ), m_fname( fname )
 {
 	m_stroke = new VStroke( this );
 	m_stroke->setType( VStroke::none );
 	m_fill = new VFill();
-	m_image = new QImage( m_fname );
+	m_image = new TQImage( m_fname );
 	if( m_image->depth() != 32 )
         *m_image = m_image->convertDepth( 32 );
 	m_image->setAlphaBuffer( true );
@@ -33,7 +33,7 @@ VImage::VImage( VObject *parent, const QString &fname ) : VObject( parent ), m_i
 VImage::VImage( const VImage &other ) : VObject( other )
 {
 	if( other.m_image )
-		m_image = new QImage( *other.m_image );
+		m_image = new TQImage( *other.m_image );
 	else
 		m_image			= 0L;
 
@@ -77,17 +77,17 @@ VImage::draw( VPainter *painter, const KoRect * ) const
 	    painter->lineTo( bl );
 	    painter->lineTo( tl );
 
-		painter->setRasterOp( Qt::XorROP );
+		painter->setRasterOp( TQt::XorROP );
 		//painter->setPen( stroke() );
-		painter->setPen( Qt::yellow );
-		painter->setBrush( Qt::NoBrush );
+		painter->setPen( TQt::yellow );
+		painter->setBrush( TQt::NoBrush );
 		painter->strokePath();
 		return;
 	}
 
 	//painter->setWorldMatrix( m_matrix );
 
-	//*m_image = m_image->smoothScale( m_image->width() * zoomFactor, m_image->height() * zoomFactor, QImage::ScaleMin );
+	//*m_image = m_image->smoothScale( m_image->width() * zoomFactor, m_image->height() * zoomFactor, TQ_ScaleMin );
 	m_boundingBox = KoRect( 0, 0, m_image->width(), m_image->height() );
 	m_boundingBox = m_boundingBox.transform( m_matrix );
 	if( !m_image->isNull() )
@@ -95,9 +95,9 @@ VImage::draw( VPainter *painter, const KoRect * ) const
 }
 
 void
-VImage::transform( const QWMatrix& m )
+VImage::transform( const TQWMatrix& m )
 {
-	//QWMatrix m2 = m;
+	//TQWMatrix m2 = m;
 	//m_matrix *= m2.scale( 1.0, -1.0 );
 	m_matrix *= m;
 	kdDebug(38000) << "dx : " << m.dx() << ", dy : " << m.dy() << endl;
@@ -111,11 +111,11 @@ VImage::clone() const
 }
 
 void
-VImage::save( QDomElement& element ) const
+VImage::save( TQDomElement& element ) const
 {
 	if( state() != deleted )
 	{
-		QDomElement me = element.ownerDocument().createElement( "IMAGE" );
+		TQDomElement me = element.ownerDocument().createElement( "IMAGE" );
 		element.appendChild( me );
 
 		me.setAttribute( "fname", m_fname );
@@ -129,7 +129,7 @@ VImage::save( QDomElement& element ) const
 }
 
 void
-VImage::load( const QDomElement& element )
+VImage::load( const TQDomElement& element )
 {
 	setState( normal );
 	m_fname = element.attribute( "fname" );
@@ -141,7 +141,7 @@ VImage::load( const QDomElement& element )
 						element.attribute( "dy", "0.0" ).toDouble() );
 	kdDebug(38000) << "VImage::load : " << m_fname.latin1() << endl;
 	delete m_image;
-	m_image = new QImage( m_fname );
+	m_image = new TQImage( m_fname );
 	if( m_image->depth() != 32 )
         *m_image = m_image->convertDepth( 32 );
 	m_image->setAlphaBuffer( true );