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

diff --git a/kpresenter/KPrBezierCurveObject.cpp b/kpresenter/KPrBezierCurveObject.cpp
index 152d466d..0b12115e 100644
--- a/kpresenter/KPrBezierCurveObject.cpp
+++ b/kpresenter/KPrBezierCurveObject.cpp
@@ -24,9 +24,9 @@
 #include "KPrQuadricBezierCurveObjectIface.h"
 #include "KPrUtils.h"
 #include <KoTextZoomHandler.h>
-#include <qpainter.h>
-#include <qwmatrix.h>
-#include <qdom.h>
+#include <tqpainter.h>
+#include <tqwmatrix.h>
+#include <tqdom.h>
 #include "KoPointArray.h"
 #include <kdebug.h>
 
@@ -60,31 +60,31 @@ KPrBezierCurveObject &KPrBezierCurveObject::operator=( const KPrBezierCurveObjec
 bool KPrBezierCurveObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
 {
     KoRect rect( getRect() );
-    sc.xmlWriter.addAttribute("svg:viewBox", QString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) )
-                                                                   .arg( int( rect.height() * 100 ) ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) )
+                                                                   .tqarg( int( rect.height() * 100 ) ) );
 
     unsigned int pointCount = points.count();
     unsigned int pos = 0;
 
-    QString d;
-    d += QString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) )
-                            .arg( int( points.at(pos).y() * 100 ) );
+    TQString d;
+    d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) )
+                            .tqarg( int( points.at(pos).y() * 100 ) );
 
     while ( pos + 4 <= pointCount )
     {
-        d += QString( "C%1 %2 %3 %4 %5 %6" ).arg( int( points.at( pos + 2 ).x() * 100 ) )
-                                            .arg( int( points.at( pos + 2 ).y() * 100 ) )
-                                            .arg( int( points.at( pos + 3 ).x() * 100 ) )
-                                            .arg( int( points.at( pos + 3 ).y() * 100 ) )
-                                            .arg( int( points.at( pos + 1 ).x() * 100 ) )
-                                            .arg( int( points.at( pos + 1 ).y() * 100 ) );
+        d += TQString( "C%1 %2 %3 %4 %5 %6" ).tqarg( int( points.at( pos + 2 ).x() * 100 ) )
+                                            .tqarg( int( points.at( pos + 2 ).y() * 100 ) )
+                                            .tqarg( int( points.at( pos + 3 ).x() * 100 ) )
+                                            .tqarg( int( points.at( pos + 3 ).y() * 100 ) )
+                                            .tqarg( int( points.at( pos + 1 ).x() * 100 ) )
+                                            .tqarg( int( points.at( pos + 1 ).y() * 100 ) );
         pos += 4;
     }
 
     if ( pos < pointCount )
     {
-        d += QString( "L%1 %2" ).arg( int( points.at( pos + 1 ).x() * 100 ) )
-                                .arg( int( points.at( pos + 1 ).y() * 100 ) );
+        d += TQString( "L%1 %2" ).tqarg( int( points.at( pos + 1 ).x() * 100 ) )
+                                .tqarg( int( points.at( pos + 1 ).y() * 100 ) );
     }
 
     sc.xmlWriter.addAttribute( "svg:d", d );
@@ -99,7 +99,7 @@ const char * KPrBezierCurveObject::getOasisElementName() const
 }
 
 
-void KPrBezierCurveObject::loadOasis( const QDomElement &element, KoOasisContext & context,  KPrLoadingInfo* info )
+void KPrBezierCurveObject::loadOasis( const TQDomElement &element, KoOasisContext & context,  KPrLoadingInfo* info )
 {
     kdDebug(33001) << "KPrBezierCurveObject::loadOasis" << endl;
     KPrPointObject::loadOasis( element, context, info );
@@ -110,12 +110,12 @@ void KPrBezierCurveObject::loadOasis( const QDomElement &element, KoOasisContext
     loadOasisMarker( context );
 }
 
-QDomDocumentFragment KPrBezierCurveObject::save( QDomDocument& doc, double offset )
+TQDomDocumentFragment KPrBezierCurveObject::save( TQDomDocument& doc, double offset )
 {
     return KPrPointObject::save( doc,offset );
 }
 
-double KPrBezierCurveObject::load(const QDomElement &element)
+double KPrBezierCurveObject::load(const TQDomElement &element)
 {
     double offset = KPrPointObject::load( element );