1 files changed, 52 insertions, 52 deletions

diff --git a/lib/kformula/fontstyle.h b/lib/kformula/fontstyle.h
index 52105821..72db8caf 100644
--- a/lib/kformula/fontstyle.h
+++ b/lib/kformula/fontstyle.h
@@ -21,8 +21,8 @@
 #ifndef FONTSTYLE_H
 #define FONTSTYLE_H
 
-#include <qstring.h>
-#include <qfont.h>
+#include <tqstring.h>
+#include <tqfont.h>
 
 #include "contextstyle.h"
 #include "kformuladefs.h"
@@ -48,56 +48,56 @@ public:
      */
     bool init( ContextStyle* context, bool install = true );
 
-    /// the table for ordinary symbols (those that have a unicode value)
+    /// the table for ordinary symbols (those that have a tqunicode value)
     const SymbolTable* symbolTable() const { return &m_symbolTable; }
     SymbolTable* symbolTable() { return &m_symbolTable; }
 
     Artwork* createArtwork(SymbolType type = EmptyBracket) const;
 
-    static QStringList missingFonts( bool install = true );
+    static TQStringList missingFonts( bool install = true );
 
     static bool m_installed;
 
-    static void testFont( QStringList& missing, const QString& fontName );
+    static void testFont( TQStringList& missing, const TQString& fontName );
 
 private:
 
-    static QStringList missingFontsInternal();
+    static TQStringList missingFontsInternal();
     static void installFonts();
 
     SymbolTable m_symbolTable;
 
 };
 
-const QChar spaceChar = 0x0020;
-const QChar leftParenthesisChar = 0x0028;
-const QChar rightParenthesisChar = 0x0029;
-const QChar leftSquareBracketChar = 0x005B;
-const QChar rightSquareBracketChar = 0x005D;
-const QChar leftCurlyBracketChar = 0x007B;
-const QChar verticalLineChar = 0x007C;
-const QChar rightCurlyBracketChar = 0x007D;
-const QChar leftAngleBracketChar = 0x2329;
-const QChar rightAngleBracketChar = 0x232A;
-const QChar slashChar = 0x002F;
-const QChar backSlashChar = 0x005C;
-const QChar integralChar = 0x222B;
-const QChar summationChar = 0x2211;
-const QChar productChar = 0x220F;
-const QChar applyFunctionChar = 0x2061;
-const QChar invisibleTimes = 0x2062;
-const QChar invisibleComma = 0x2063;
-
-extern const QChar leftRoundBracket[];
-extern const QChar leftSquareBracket[];
-extern const QChar leftCurlyBracket[];
-
-extern const QChar leftLineBracket[];
-extern const QChar rightLineBracket[];
-
-extern const QChar rightRoundBracket[];
-extern const QChar rightSquareBracket[];
-extern const QChar rightCurlyBracket[];
+const TQChar spaceChar = 0x0020;
+const TQChar leftParenthesisChar = 0x0028;
+const TQChar rightParenthesisChar = 0x0029;
+const TQChar leftSquareBracketChar = 0x005B;
+const TQChar rightSquareBracketChar = 0x005D;
+const TQChar leftCurlyBracketChar = 0x007B;
+const TQChar verticalLineChar = 0x007C;
+const TQChar rightCurlyBracketChar = 0x007D;
+const TQChar leftAngleBracketChar = 0x2329;
+const TQChar rightAngleBracketChar = 0x232A;
+const TQChar slashChar = 0x002F;
+const TQChar backSlashChar = 0x005C;
+const TQChar integralChar = 0x222B;
+const TQChar summationChar = 0x2211;
+const TQChar productChar = 0x220F;
+const TQChar applyFunctionChar = 0x2061;
+const TQChar invisibleTimes = 0x2062;
+const TQChar invisibleComma = 0x2063;
+
+extern const TQChar leftRoundBracket[];
+extern const TQChar leftSquareBracket[];
+extern const TQChar leftCurlyBracket[];
+
+extern const TQChar leftLineBracket[];
+extern const TQChar rightLineBracket[];
+
+extern const TQChar rightRoundBracket[];
+extern const TQChar rightSquareBracket[];
+extern const TQChar rightCurlyBracket[];
 
 /*
  * A piece of art that may be used by any element.
@@ -111,21 +111,21 @@ public:
     virtual void calcSizes( const ContextStyle& style,
                             ContextStyle::TextStyle tstyle,
 							double factor,
-                            luPt parentSize );
+                            luPt tqparentSize );
     virtual void calcSizes( const ContextStyle& style,
                             ContextStyle::TextStyle tstyle,
 							double factor );
 
-    virtual void draw( QPainter& painter, const LuPixelRect& r,
+    virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
 					   StyleAttributes& style,
-					   luPt parentSize, const LuPixelPoint& origin );
-    virtual void draw( QPainter& painter, const LuPixelRect& r,
+					   luPt tqparentSize, const LuPixelPoint& origin );
+    virtual void draw( TQPainter& painter, const LuPixelRect& r,
                        const ContextStyle& context,
                        ContextStyle::TextStyle tstyle,
 					   StyleAttributes& style,
-                       const LuPixelPoint& parentOrigin );
+                       const LuPixelPoint& tqparentOrigin );
 
     luPixel getWidth() const { return size.width(); }
     luPixel getHeight() const { return size.height(); }
@@ -151,20 +151,20 @@ public:
 
 protected:
 
-    void calcCharSize( const ContextStyle& style, luPt height, QChar ch );
-    void drawCharacter( QPainter& painter, const ContextStyle& style,
-                        luPixel x, luPixel y, luPt height, QChar ch );
+    void calcCharSize( const ContextStyle& style, luPt height, TQChar ch );
+    void drawCharacter( TQPainter& painter, const ContextStyle& style,
+                        luPixel x, luPixel y, luPt height, TQChar ch );
 
-    void calcCharSize( const ContextStyle& style, QFont f, luPt height, QChar c );
-    void drawCharacter( QPainter& painter, const ContextStyle& style,
-                        QFont f,
+    void calcCharSize( const ContextStyle& style, TQFont f, luPt height, TQChar c );
+    void drawCharacter( TQPainter& painter, const ContextStyle& style,
+                        TQFont f,
                         luPixel x, luPixel y, luPt height, uchar c );
 
-    void calcRoundBracket( const ContextStyle& style, const QChar chars[], luPt height, luPt charHeight );
-    void calcCurlyBracket( const ContextStyle& style, const QChar chars[], luPt height, luPt charHeight );
+    void calcRoundBracket( const ContextStyle& style, const TQChar chars[], luPt height, luPt charHeight );
+    void calcCurlyBracket( const ContextStyle& style, const TQChar chars[], luPt height, luPt charHeight );
 
-    void drawBigRoundBracket( QPainter& p, const ContextStyle& style, const QChar chars[], luPixel x, luPixel y, luPt charHeight );
-    void drawBigCurlyBracket( QPainter& p, const ContextStyle& style, const QChar chars[], luPixel x, luPixel y, luPt charHeight );
+    void drawBigRoundBracket( TQPainter& p, const ContextStyle& style, const TQChar chars[], luPixel x, luPixel y, luPt charHeight );
+    void drawBigCurlyBracket( TQPainter& p, const ContextStyle& style, const TQChar chars[], luPixel x, luPixel y, luPt charHeight );
 
 private:
 
@@ -179,9 +179,9 @@ private:
     SymbolType type;
 
     bool calcCMDelimiterSize( const ContextStyle& context, uchar c,
-                              luPt fontSize, luPt parentSize );
+                              luPt fontSize, luPt tqparentSize );
     void calcLargest( const ContextStyle& context, uchar c, luPt fontSize );
-    void drawCMDelimiter( QPainter& painter, const ContextStyle& style,
+    void drawCMDelimiter( TQPainter& painter, const ContextStyle& style,
                           luPixel x, luPixel y, luPt height );
 
     short cmChar;