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

diff --git a/kword/KWLoadingInfo.h b/kword/KWLoadingInfo.h
index fd0645a84..81c91477f 100644
--- a/kword/KWLoadingInfo.h
+++ b/kword/KWLoadingInfo.h
@@ -20,9 +20,9 @@
 #ifndef KWLOADINGINFO_H
 #define KWLOADINGINFO_H
 
-#include <qstring.h>
-#include <qvaluelist.h>
-#include <qdict.h>
+#include <tqstring.h>
+#include <tqvaluelist.h>
+#include <tqdict.h>
 #include <KoPageLayout.h>
 
 class KoTextParag;
@@ -37,47 +37,47 @@ public:
     ~KWLoadingInfo() {}
 
     /// Current master-page name (OASIS loading)
-    QString m_currentMasterPage;
+    TQString m_currentMasterPage;
 
     /// Bookmarks (kword-1.3 XML: they need all framesets to be loaded first)
     struct BookMark
     {
-        QString bookname;
+        TQString bookname;
         int paragStartIndex;
         int paragEndIndex;
-        QString frameSetName;
+        TQString frameSetName;
         int cursorStartIndex;
         int cursorEndIndex;
     };
 
-    typedef QValueList<BookMark> BookMarkList;
+    typedef TQValueList<BookMark> BookMarkList;
     BookMarkList bookMarkList;
 
     /// Bookmarks (OASIS XML). Only need to store bookmark starts, until hitting bookmark ends
     struct BookmarkStart {
-        BookmarkStart() {} // for stupid QValueList
+        BookmarkStart() {} // for stupid TQValueList
         BookmarkStart( KWTextDocument* _doc, KoTextParag* par, int ind )
             : doc( _doc ), parag( par ), pos( ind ) {}
         KWTextDocument* doc;
         KoTextParag* parag;
         int pos;
     };
-    typedef QMap<QString, BookmarkStart> BookmarkStartsMap;
+    typedef TQMap<TQString, BookmarkStart> BookmarkStartsMap;
     BookmarkStartsMap m_bookmarkStarts;
 
     // Text frame chains; see KWTextFrameSet::loadOasisText
 
-    void storeNextFrame( KWFrame* thisFrame, const QString& chainNextName ) {
+    void storeNextFrame( KWFrame* thisFrame, const TQString& chainNextName ) {
         m_nextFrameDict.insert( chainNextName, thisFrame );
     }
-    KWFrame* chainPrevFrame( const QString& frameName ) const {
+    KWFrame* chainPrevFrame( const TQString& frameName ) const {
         return m_nextFrameDict[frameName]; // returns 0 if not found
     }
 
-    void storeFrameName( KWFrame* frame, const QString& name ) {
+    void storeFrameName( KWFrame* frame, const TQString& name ) {
         m_frameNameDict.insert( name, frame );
     }
-    KWFrame* frameByName( const QString& name ) const {
+    KWFrame* frameByName( const TQString& name ) const {
         return m_frameNameDict[name]; // returns 0 if not found
     }
 
@@ -86,8 +86,8 @@ public:
 
 private:
     // Ignore warnings about operator delete from those dicts; we don't use it here...
-    QDict<KWFrame> m_nextFrameDict;
-    QDict<KWFrame> m_frameNameDict;
+    TQDict<KWFrame> m_nextFrameDict;
+    TQDict<KWFrame> m_frameNameDict;
 };
 
 #endif /* KWLOADINGINFO_H */