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

diff --git a/kword/KWVariable.h b/kword/KWVariable.h
index 545bea90..005ca434 100644
--- a/kword/KWVariable.h
+++ b/kword/KWVariable.h
@@ -20,9 +20,9 @@
 #ifndef variable_h
 #define variable_h
 
-#include <qstring.h>
-#include <qdatetime.h>
-#include <qasciidict.h>
+#include <tqstring.h>
+#include <tqdatetime.h>
+#include <tqasciidict.h>
 
 #include "defs.h"
 
@@ -35,7 +35,7 @@ class KWFootNoteFrameSet;
 class KoVariable;
 class KoPageVariable;
 class KoMailMergeVariable;
-class QDomElement;
+class TQDomElement;
 class KoTextFormat;
 
 
@@ -44,10 +44,10 @@ class KWVariableSettings : public KoVariableSettings
  public:
     KWVariableSettings();
     virtual ~KWVariableSettings() {}
-    virtual void save( QDomElement &parentElem );
-    virtual void load( QDomElement &elem );
+    virtual void save( TQDomElement &tqparentElem );
+    virtual void load( TQDomElement &elem );
     void saveNoteConfiguration( KoXmlWriter& writer ) const;
-    void loadNoteConfiguration( const QDomElement& parent );
+    void loadNoteConfiguration( const TQDomElement& tqparent );
     void changeFootNoteCounter( KoParagCounter _c );
     void changeEndNoteCounter( KoParagCounter _c );
     KoParagCounter endNoteCounter() const { return m_endNoteCounter;}
@@ -62,7 +62,7 @@ class KWVariableCollection : public KoVariableCollection
  public:
     KWVariableCollection(KWVariableSettings *_settings, KoVariableFormatCollection* coll);
     virtual KoVariable *createVariable( int type, short int subtype, KoVariableFormatCollection * coll, KoVariableFormat *varFormat,KoTextDocument *textdoc, KoDocument * doc, int _correct, bool _forceDefaultFormat=false, bool loadFootNote= true );
-    virtual KoVariable* loadOasisField( KoTextDocument* textdoc, const QDomElement& tag, KoOasisContext& context );
+    virtual KoVariable* loadOasisField( KoTextDocument* textdoc, const TQDomElement& tag, KoOasisContext& context );
 
  private:
     KWDocument *m_doc;
@@ -77,7 +77,7 @@ public:
     KWPgNumVariable( KoTextDocument *textdoc, int subtype, KoVariableFormat *varFormat ,KoVariableCollection *_varColl, KWDocument *doc );
 
     virtual void recalc();
-    virtual QString text(bool realValue=false);
+    virtual TQString text(bool realValue=false);
 
 private:
     KWDocument *m_doc;
@@ -90,10 +90,10 @@ private:
 class KWMailMergeVariable : public KoMailMergeVariable
 {
 public:
-    KWMailMergeVariable( KoTextDocument *textdoc, const QString &name, KoVariableFormat *varFormat,KoVariableCollection *_varColl, KWDocument *doc );
+    KWMailMergeVariable( KoTextDocument *textdoc, const TQString &name, KoVariableFormat *varFormat,KoVariableCollection *_varColl, KWDocument *doc );
 
-    virtual QString text(bool realValue=false);
-    virtual QString value() const;
+    virtual TQString text(bool realValue=false);
+    virtual TQString value() const;
     virtual void recalc();
  private:
     KWDocument *m_doc;
@@ -116,24 +116,24 @@ public:
     void setNumberingType( Numbering _type );
     Numbering numberingType() const { return m_numberingType;}
 
-    void setManualString( const QString & _str ) { m_varValue=QVariant(_str);}
-    QString manualString() const { return m_varValue.toString();}
+    void setManualString( const TQString & _str ) { m_varValue=TQVariant(_str);}
+    TQString manualString() const { return m_varValue.toString();}
 
     virtual void resize();
-    virtual void drawCustomItem( QPainter* p, int x, int y, int wpix, int hpix, int ascentpix, int /*cx*/, int /*cy*/, int /*cw*/, int /*ch*/, const QColorGroup& cg, bool selected, int offset, bool drawingShadow );
+    virtual void drawCustomItem( TQPainter* p, int x, int y, int wpix, int hpix, int ascentpix, int /*cx*/, int /*cy*/, int /*cw*/, int /*ch*/, const TQColorGroup& cg, bool selected, int offset, bool drawingShadow );
 
     /** The frameset that contains the text for this footnote */
     KWFootNoteFrameSet * frameSet() const { return m_frameset; }
     void setFrameSet( KWFootNoteFrameSet* fs ) { Q_ASSERT( !m_frameset ); m_frameset = fs; }
 
-    virtual void saveVariable( QDomElement &parentElem );
-    virtual void load( QDomElement &elem );
+    virtual void saveVariable( TQDomElement &tqparentElem );
+    virtual void load( TQDomElement &elem );
 
-    virtual void loadOasis( const QDomElement &footNoteTag, KoOasisContext& context );
+    virtual void loadOasis( const TQDomElement &footNoteTag, KoOasisContext& context );
     virtual void saveOasis( KoXmlWriter& writer, KoSavingContext& context ) const;
 
 
-    virtual QString text(bool realValue=false);
+    virtual TQString text(bool realValue=false);
     // Nothing to do here. Numbering done by KWTextFrameSet::renumberFootNotes
     virtual void recalc() { }
 
@@ -155,9 +155,9 @@ public:
     virtual void setDeleted( bool del );
 
     void formatedNote();
-    virtual QString fieldCode();
+    virtual TQString fieldCode();
 protected:
-    QString applyStyle();
+    TQString applyStyle();
 
 private:
     KWDocument *m_doc;
@@ -174,7 +174,7 @@ class KWStatisticVariable : public KoStatisticVariable
 public:
     KWStatisticVariable( KoTextDocument *textdoc, int subtype, KoVariableFormat *varFormat,KoVariableCollection *_varColl, KWDocument *doc );
     virtual void recalc();
-    virtual QString text(bool realValue=false);
+    virtual TQString text(bool realValue=false);
 
 protected:
     KWDocument *m_doc;