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

diff --git a/lib/kformula/glyphelement.h b/lib/kformula/glyphelement.h
index 425caf10..dd6c6e8c 100644
--- a/lib/kformula/glyphelement.h
+++ b/lib/kformula/glyphelement.h
@@ -27,11 +27,11 @@ KFORMULA_NAMESPACE_BEGIN
 class GlyphElement : public TextElement {
     typedef TextElement inherited;
 public:
-    GlyphElement( BasicElement* parent = 0 );
+    GlyphElement( 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,
@@ -39,27 +39,27 @@ public:
 							StyleAttributes& style );
 
     /**
-     * Draws the whole element including its children.
-     * The `parentOrigin' is the point this element's parent starts.
-     * We can use our parentPosition to get our own origin then.
+     * Draws the whole element including its tqchildren.
+     * The `tqparentOrigin' is the point this element's tqparent starts.
+     * We can use our tqparentPosition to get our own origin then.
      */
-    virtual void draw( QPainter& painter, const LuPixelRect& r,
+    virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& parentOrigin );
+                       const LuPixelPoint& tqparentOrigin );
 
 protected:
-    virtual bool readAttributesFromMathMLDom( const QDomElement &element );
+    virtual bool readAttributesFromMathMLDom( const TQDomElement &element );
 
 private:
-    virtual QString getElementName() const { return "mglyph"; }
-    virtual void writeMathMLAttributes( QDomElement& element ) const ;
+    virtual TQString getElementName() const { return "mglyph"; }
+    virtual void writeMathMLAttributes( TQDomElement& element ) const ;
 
-    QChar m_char;         // Char to be shown
-    QString m_fontFamily; // Font family to use
-    QString m_alt;        // Alternative text if font family not found
+    TQChar m_char;         // Char to be shown
+    TQString m_fontFamily; // Font family to use
+    TQString m_alt;        // Alternative text if font family not found
     bool m_hasFont;       // Whether required font is available
 };