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, 17 insertions, 17 deletions

diff --git a/kpresenter/KPrEllipseObject.cpp b/kpresenter/KPrEllipseObject.cpp
index d20f540f..c1209775 100644
--- a/kpresenter/KPrEllipseObject.cpp
+++ b/kpresenter/KPrEllipseObject.cpp
@@ -23,11 +23,11 @@
 #include "KPrGradient.h"
 
 #include <kdebug.h>
-#include <qbitmap.h>
-#include <qregion.h>
-#include <qdom.h>
-#include <qpicture.h>
-#include <qpainter.h>
+#include <tqbitmap.h>
+#include <tqregion.h>
+#include <tqdom.h>
+#include <tqpicture.h>
+#include <tqpainter.h>
 #include <KoTextZoomHandler.h>
 #include <KoOasisContext.h>
 
@@ -38,8 +38,8 @@ KPrEllipseObject::KPrEllipseObject()
 {
 }
 
-KPrEllipseObject::KPrEllipseObject( const KoPen &_pen, const QBrush &_brush, FillType _fillType,
-                                  const QColor &_gColor1, const QColor &_gColor2, BCType _gType,
+KPrEllipseObject::KPrEllipseObject( const KoPen &_pen, const TQBrush &_brush, FillType _fillType,
+                                  const TQColor &_gColor1, const TQColor &_gColor2, BCType _gType,
                                   bool _unbalanced, int _xfactor, int _yfactor)
     : KPr2DObject( _pen, _brush, _fillType, _gColor1, _gColor2, _gType, _unbalanced, _xfactor, _yfactor )
 {
@@ -57,23 +57,23 @@ DCOPObject* KPrEllipseObject::dcopObject()
     return dcop;
 }
 
-void KPrEllipseObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandler,
+void KPrEllipseObject::paint( TQPainter* _painter, KoTextZoomHandler *_zoomHandler,
                              int /* pageNum */, bool drawingShadow, bool drawContour )
 {
     int ow = _zoomHandler->zoomItX( ext.width() );
     int oh = _zoomHandler->zoomItY( ext.height() );
-    QSize size( _zoomHandler->zoomSize( ext ) );
+    TQSize size( _zoomHandler->zoomSize( ext ) );
 
     if ( drawContour ) {
-        QPen pen3( Qt::black, 1, Qt::DotLine );
+        TQPen pen3( TQt::black, 1, TQt::DotLine );
         _painter->setPen( pen3 );
-        _painter->setRasterOp( Qt::NotXorROP );
+        _painter->setRasterOp( TQt::NotXorROP );
         _painter->drawEllipse( 0, 0, ow, oh );
         return;
     }
 
-    QPen pen2 = pen.zoomedPen( _zoomHandler );
-    int pw = ( pen2.style() == Qt::NoPen ) ? 1 : pen2.width();
+    TQPen pen2 = pen.zoomedPen( _zoomHandler );
+    int pw = ( pen2.style() == TQt::NoPen ) ? 1 : pen2.width();
     _painter->setPen( pen2 );
 
     if ( drawingShadow || getFillType() == FT_BRUSH || !gradient )
@@ -82,10 +82,10 @@ void KPrEllipseObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandle
         if ( m_redrawGradientPix || gradient->size() != size ) {
             m_redrawGradientPix = false;
             gradient->setSize( size );
-            QRegion clipregion( 0, 0, ow - pw + 1, oh - pw + 1, QRegion::Ellipse );
+            TQRegion clipregion( 0, 0, ow - pw + 1, oh - pw + 1, TQRegion::Ellipse );
             m_gradientPix.resize ( ow, oh );
-            m_gradientPix.fill( Qt::white );
-            QPainter p;
+            m_gradientPix.fill( TQt::white );
+            TQPainter p;
             p.begin( &m_gradientPix );
             p.setClipRegion( clipregion );
             p.drawPixmap( 0, 0, gradient->pixmap() );
@@ -96,7 +96,7 @@ void KPrEllipseObject::paint( QPainter* _painter, KoTextZoomHandler *_zoomHandle
 
         _painter->drawPixmap( pw / 2, pw / 2, m_gradientPix, 0, 0, ow - pw + 1, oh - pw + 1 );
 
-        _painter->setBrush( Qt::NoBrush );
+        _painter->setBrush( TQt::NoBrush );
     }
     _painter->drawEllipse( pw / 2, pw / 2, ow - pw + 1, oh - pw + 1 );
 }