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

diff --git a/lib/kofficeui/KoZoomHandler.h b/lib/kofficeui/KoZoomHandler.h
index 903d2e11..ab5dbe15 100644
--- a/lib/kofficeui/KoZoomHandler.h
+++ b/lib/kofficeui/KoZoomHandler.h
@@ -103,17 +103,17 @@ public:
     
     // Input: pt. Output: pixels. Resolution and zoom are applied.
     int zoomItX( double z ) const {
-        return qRound( m_zoomedResolutionX * z );
+        return tqRound( m_zoomedResolutionX * z );
     }
     int zoomItY( double z ) const {
-        return qRound( m_zoomedResolutionY * z );
+        return tqRound( m_zoomedResolutionY * z );
     }
 
-    QPoint zoomPoint( const KoPoint & p ) const {
-        return QPoint( zoomItX( p.x() ), zoomItY( p.y() ) );
+    TQPoint zoomPoint( const KoPoint & p ) const {
+        return TQPoint( zoomItX( p.x() ), zoomItY( p.y() ) );
     }
-    QRect zoomRect( const KoRect & r ) const {
-        QRect _r;
+    TQRect zoomRect( const KoRect & r ) const {
+        TQRect _r;
         _r.setCoords( zoomItX( r.left() ),  zoomItY( r.top() ),
                       zoomItX( r.right() ), zoomItY( r.bottom() ) );
         return _r;
@@ -128,8 +128,8 @@ public:
      * (like when inserting a picture), but then please take
      * care of it afterwards, when you know the reference point.
      */
-    QSize zoomSize( const KoSize & s ) const {
-        return QSize( zoomItX( s.width() ), zoomItY( s.height() ) );
+    TQSize zoomSize( const KoSize & s ) const {
+        return TQSize( zoomItX( s.width() ), zoomItY( s.height() ) );
     }
 
     // Input: pixels. Output: pt.
@@ -139,10 +139,10 @@ public:
     double unzoomItY( int y ) const {
         return static_cast<double>( y ) / m_zoomedResolutionY;
     }
-    KoPoint unzoomPoint( const QPoint & p ) const {
+    KoPoint unzoomPoint( const TQPoint & p ) const {
         return KoPoint( unzoomItX( p.x() ), unzoomItY( p.y() ) );
     }
-    KoRect unzoomRect( const QRect & r ) const {
+    KoRect unzoomRect( const TQRect & r ) const {
         KoRect _r;
         _r.setCoords( unzoomItX( r.left() ),  unzoomItY( r.top() ),
                       unzoomItX( r.right() ), unzoomItY( r.bottom() ) );