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

diff --git a/lib/kotext/KoTextFormatter.h b/lib/kotext/KoTextFormatter.h
index ad1204378..0e2bcf6fc 100644
--- a/lib/kotext/KoTextFormatter.h
+++ b/lib/kotext/KoTextFormatter.h
@@ -37,7 +37,7 @@ public:
     KoTextFormatter();
     virtual ~KoTextFormatter();
 
-    virtual bool format( KoTextDocument *doc, KoTextParag *parag, int start, const QMap<int, KoTextParagLineStart*> &oldLineStarts, int& y, int& widthUsed );
+    virtual bool format( KoTextDocument *doc, KoTextParag *parag, int start, const TQMap<int, KoTextParagLineStart*> &oldLineStarts, int& y, int& widthUsed );
 
     // Called after formatting a paragraph
     virtual void postFormat( KoTextParag* parag );
@@ -69,7 +69,7 @@ public:
 protected:
     // Return ww (in LU) and pixelww (in pixels)
     // Should be called only once per char
-    QPair<int, int> determineCharWidth();
+    TQPair<int, int> determineCharWidth();
 
     KoTextParagLineStart *koFormatLine(
         KoTextZoomHandler *zh,
@@ -103,7 +103,7 @@ private:
 
     // When moving a big item down, we might want to rollback
     // to the 'best position for it' if we can't make it fit anywhere else.
-    QPair<int,int> maxAvailableWidth; // first=y  second=available width
+    TQPair<int,int> maxAvailableWidth; // first=y  second=available width
 
     // Information on current char
     KoTextStringChar *c;