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

diff --git a/kword/KWTextDocument.h b/kword/KWTextDocument.h
index c1a6bb84..261694a5 100644
--- a/kword/KWTextDocument.h
+++ b/kword/KWTextDocument.h
@@ -35,6 +35,7 @@ class KoTextDocCommand;
 class KWTextDocument : public KoTextDocument
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /** A real text document inside a frameset */
     KWTextDocument( KWTextFrameSet * textfs, KoTextFormatCollection *fc, KoTextFormatter *formatter = 0L );
@@ -49,23 +50,23 @@ public:
      * Note that this can be 0L (e.g. for paragraphs in the paragdia preview) */
     KWTextFrameSet * textFrameSet() const { return m_textfs; }
 
-    virtual KoTextDocCommand *deleteTextCommand( KoTextDocument *textdoc, int id, int index, const QMemArray<KoTextStringChar> & str, const CustomItemsMap & customItemsMap, const QValueList<KoParagLayout> & oldParagLayouts );
+    virtual KoTextDocCommand *deleteTextCommand( KoTextDocument *textdoc, int id, int index, const TQMemArray<KoTextStringChar> & str, const CustomItemsMap & customItemsMap, const TQValueList<KoParagLayout> & oldParagLayouts );
 
     /// Extensions to KoTextParag::loadOasisSpan
-    virtual bool loadSpanTag( const QDomElement& tag, KoOasisContext& context,
+    virtual bool loadSpanTag( const TQDomElement& tag, KoOasisContext& context,
                               KoTextParag* parag, uint pos,
-                              QString& textData, KoTextCustomItem* & customItem );
+                              TQString& textData, KoTextCustomItem* & customItem );
     /// Extensions to KoTextDocument::loadOasisText
-    virtual bool loadOasisBodyTag( const QDomElement& tag, KoOasisContext& context,
+    virtual bool loadOasisBodyTag( const TQDomElement& tag, KoOasisContext& context,
                                    KoTextParag* & lastParagraph, KoStyleCollection * styleColl,
                                    KoTextParag* nextParagraph );
 protected:
     void init();
 private:
-    void appendBookmark( KoTextParag* parag, int pos, KoTextParag* endParag, int endPos, const QString& name );
-    void loadOasisFootnote( const QDomElement& tag, KoOasisContext& context,
+    void appendBookmark( KoTextParag* parag, int pos, KoTextParag* endParag, int endPos, const TQString& name );
+    void loadOasisFootnote( const TQDomElement& tag, KoOasisContext& context,
                             KoTextCustomItem* & customItem );
-    void loadOasisTOC( const QDomElement& tag, KoOasisContext& context, KoTextParag* & lastParagraph, KoStyleCollection* styleColl, KoTextParag* nextParagraph );
+    void loadOasisTOC( const TQDomElement& tag, KoOasisContext& context, KoTextParag* & lastParagraph, KoStyleCollection* styleColl, KoTextParag* nextParagraph );
 
     KWTextFrameSet * m_textfs;
 };