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

diff --git a/kword/KWFrameLayout.h b/kword/KWFrameLayout.h
index c13d18b8..140d1284 100644
--- a/kword/KWFrameLayout.h
+++ b/kword/KWFrameLayout.h
@@ -19,10 +19,10 @@
 #ifndef KWFRAMELAYOUT_H
 #define KWFRAMELAYOUT_H
 
-#include <qptrlist.h>
+#include <tqptrlist.h>
 #include <kdebug.h>
 #include <KoRect.h>
-#include <qmap.h>
+#include <tqmap.h>
 
 class KWDocument;
 class KWFrameSet;
@@ -68,7 +68,7 @@ public:
         // frame number for the given page.... -1 if no frame on that page
         // The first frame is number 0.
         int frameNumberForPage( int page ) const;
-        // The last frame we need (0-based), layout() will delete any frame after that
+        // The last frame we need (0-based), tqlayout() will delete any frame after that
         int lastFrameNumber( int lastPage ) const;
 
         void debug();
@@ -77,26 +77,26 @@ public:
 
     /**
      * Constructor
-     * @param doc the KWDocument we're layouting
+     * @param doc the KWDocument we're tqlayouting
      * @param headersFooters list of header and footer HFFs (see definition of HeaderFooterFrameset)
      * @param footnotes list of footnotes framesets HFFs
      * @param endnotes list of endnotes framesets HFFs
      */
-    KWFrameLayout( KWDocument* doc, QPtrList<HeaderFooterFrameset>& headersFooters,
-                   QPtrList<HeaderFooterFrameset>& footnotes, QPtrList<HeaderFooterFrameset>& endnotes )
+    KWFrameLayout( KWDocument* doc, TQPtrList<HeaderFooterFrameset>& headersFooters,
+                   TQPtrList<HeaderFooterFrameset>& footnotes, TQPtrList<HeaderFooterFrameset>& endnotes )
         : m_headersFooters( headersFooters ), m_footnotes( footnotes ), m_endnotes( endnotes ), m_doc( doc )
         {}
 
     enum { DontRemovePages = 1 };
     /**
-     * The main method of this file. Do the frame layout.
+     * The main method of this file. Do the frame tqlayout.
      * @param mainTextFrameSet if set, its frames will be resized. Usually: set in WP mode, not set in DTP mode.
      * @param numColumns number of columns to create for the main textframeset. Only relevant if mainTextFrameSet!=0.
-     * @param fromPage first page to layout ( 0-based )
-     * @param toPage last page to layout ( 0-based )
+     * @param fromPage first page to tqlayout ( 0-based )
+     * @param toPage last page to tqlayout ( 0-based )
      * @param flags see enum above
      */
-    void layout( KWFrameSet* mainTextFrameSet, int numColumns,
+    void tqlayout( KWFrameSet* mainTextFrameSet, int numColumns,
                  int fromPage, int toPage, uint flags );
 
 protected:
@@ -108,10 +108,10 @@ protected:
 
 private:
     // A _ref_ to a list. Must remain alive as long as this object.
-    QPtrList<HeaderFooterFrameset>& m_headersFooters;
-    QPtrList<HeaderFooterFrameset>& m_footnotes;
-    QPtrList<HeaderFooterFrameset>& m_endnotes;
-    QMap<KWFrameSet *, bool> m_framesetsToUpdate;
+    TQPtrList<HeaderFooterFrameset>& m_headersFooters;
+    TQPtrList<HeaderFooterFrameset>& m_footnotes;
+    TQPtrList<HeaderFooterFrameset>& m_endnotes;
+    TQMap<KWFrameSet *, bool> m_framesetsToUpdate;
     KWDocument* m_doc;
     int m_lastMainFramePage;
 };