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

diff --git a/lib/kformula/tokenstyleelement.h b/lib/kformula/tokenstyleelement.h
index 9f17b19c..db7d14f6 100644
--- a/lib/kformula/tokenstyleelement.h
+++ b/lib/kformula/tokenstyleelement.h
@@ -36,23 +36,23 @@ class TokenStyleElement : public SequenceElement {
     typedef SequenceElement inherited;
 public:
 
-    TokenStyleElement( BasicElement* parent = 0 );
+    TokenStyleElement( BasicElement* tqparent = 0 );
 
     virtual void calcSizes( const ContextStyle& context,
                             ContextStyle::TextStyle tstyle,
                             ContextStyle::IndexStyle istyle,
                             StyleAttributes& style );
 
-    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 void writeMathMLAttributes( QDomElement& element ) const ;
+    virtual bool readAttributesFromMathMLDom( const TQDomElement &element );
+    virtual void writeMathMLAttributes( TQDomElement& element ) const ;
 
     void setAbsoluteSize( double s, bool fontsize = false );
     void setRelativeSize( double s, bool fontsize = false );
@@ -70,17 +70,17 @@ protected:
     }
     CharFamily charFamily() const { return m_charFamily; }
 
-    void setMathColor( const QColor& c ) {
+    void setMathColor( const TQColor& c ) {
         m_mathColor = c; 
         m_customMathColor = true;
     }
-    QColor mathColor() const { return m_mathColor; }
+    TQColor mathColor() const { return m_mathColor; }
 
-    void setMathBackground( const QColor& bg ) { 
+    void setMathBackground( const TQColor& bg ) { 
         m_mathBackground = bg; 
         m_customMathBackground = true;
     }
-    QColor mathBackground() const { return m_mathBackground; }
+    TQColor mathBackground() const { return m_mathBackground; }
 
     void setFontWeight( bool w ) { 
         m_fontWeight = w;
@@ -94,17 +94,17 @@ protected:
     }
     bool fontStyle() const { return m_fontStyle; }
 
-    void setFontFamily( const QString& s ) { 
+    void setFontFamily( const TQString& s ) { 
         m_fontFamily = s;
         m_customFontFamily = true;
     }
-    QString fontFamily() const { return m_fontFamily; }
+    TQString fontFamily() const { return m_fontFamily; }
 
-    void setColor( const QColor& c ) { 
+    void setColor( const TQColor& c ) { 
         m_color = c; 
         m_customColor = true;
     }
-    QColor color() const { return m_color; }
+    TQColor color() const { return m_color; }
 
     bool customMathVariant() const { return m_customMathVariant; }
     bool customMathColor() const { return m_customMathColor; }
@@ -129,7 +129,7 @@ protected:
     /**
      * Return RGB string from HTML Colors. See HTML Spec, section 6.5
      */
-    QString getHtmlColor( const QString& colorStr );
+    TQString getHtmlColor( const TQString& colorStr );
 
 private:
 
@@ -140,14 +140,14 @@ private:
     double m_mathSize;
     CharStyle m_charStyle;
     CharFamily m_charFamily;
-    QColor m_mathColor;
-    QColor m_mathBackground;
+    TQColor m_mathColor;
+    TQColor m_mathBackground;
 
     // Deprecated MathML 1.01 attributes
     SizeType m_fontSizeType;
     double m_fontSize;
-    QString m_fontFamily;
-    QColor m_color;
+    TQString m_fontFamily;
+    TQColor m_color;
     bool m_fontWeight;
     bool m_fontStyle;