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

diff --git a/lib/kformula/paddedelement.h b/lib/kformula/paddedelement.h
index 591f87bf..6d552837 100644
--- a/lib/kformula/paddedelement.h
+++ b/lib/kformula/paddedelement.h
@@ -28,11 +28,11 @@ class PaddedElement : public SequenceElement {
     typedef SequenceElement inherited;
     enum SizeType { NoSize, RelativeSize, AbsoluteSize, PixelSize, WidthRelativeSize, HeightRelativeSize };
 public:
-    PaddedElement( BasicElement* parent = 0 );
+    PaddedElement( BasicElement* tqparent = 0 );
 
     /**
      * Calculates our width and height and
-     * our children's parentPosition.
+     * our tqchildren's tqparentPosition.
      */
     virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
@@ -40,16 +40,16 @@ public:
 							StyleAttributes& style );
 
 protected:
-    virtual bool readAttributesFromMathMLDom(const QDomElement& element);
+    virtual bool readAttributesFromMathMLDom(const TQDomElement& element);
 
 private:
-    virtual QString getElementName() const { return "mpadded"; }
-    virtual void writeMathMLAttributes( QDomElement& element ) const ;
+    virtual TQString getElementName() const { return "mpadded"; }
+    virtual void writeMathMLAttributes( TQDomElement& element ) const ;
 
-    double readSizeAttribute( const QString& str, SizeType* st, bool* relative );
-    double getSize( const QString& str, SizeType* st );
-    double str2size( const QString& str, SizeType* st, SizeType type );
-    void writeSizeAttribute( QDomElement element, const QString& str,
+    double readSizeAttribute( const TQString& str, SizeType* st, bool* relative );
+    double getSize( const TQString& str, SizeType* st );
+    double str2size( const TQString& str, SizeType* st, SizeType type );
+    void writeSizeAttribute( TQDomElement element, const TQString& str,
                              SizeType st, bool relative, double s ) const ;
     luPixel calcSize( const ContextStyle& context, SizeType type,
                       bool relative, double length, luPixel width,