1 files changed, 14 insertions, 14 deletions

diff --git a/lib/kotext/KoRichText.h b/lib/kotext/KoRichText.h
index 8e82bd9c..44c360d5 100644
--- a/lib/kotext/KoRichText.h
+++ b/lib/kotext/KoRichText.h
@@ -45,7 +45,7 @@
 #include <tqsize.h>
 #include <tqvaluelist.h>
 #include <tqobject.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqpainter.h>
 #include "KoComplexText.h"
 
@@ -93,7 +93,7 @@ public:
 
     // this is the same struct as in qtextengine_p.h. Don't change!
     uchar softBreak      :1;     // Potential linebreak point
-    uchar whiteSpace     :1;     // A unicode whitespace character, except NBSP, ZWNBSP
+    uchar whiteSpace     :1;     // A tqunicode whitespace character, except NBSP, ZWNBSP
     uchar charStop       :1;     // Valid cursor position (for left/right arrow)
     uchar wordStop       :1;     // Valid cursor position (for ctrl + left/right arrow) (TODO: use)
     //uchar nobreak        :1;
@@ -477,13 +477,13 @@ public:
     KoTextTableCell( KoTextTable* table, int row, int column );
     virtual ~KoTextTableCell();
 
-    TQSize sizeHint() const ;
-    TQSize minimumSize() const ;
-    TQSize maximumSize() const ;
+    TQSize tqsizeHint() const ;
+    TQSize tqminimumSize() const ;
+    TQSize tqmaximumSize() const ;
     TQSizePolicy::ExpandData expanding() const;
     bool isEmpty() const;
     void setGeometry( const TQRect& ) ;
-    TQRect geometry() const;
+    TQRect tqgeometry() const;
 
     bool hasHeightForWidth() const;
     int heightForWidth( int ) const;
@@ -502,7 +502,7 @@ public:
     void draw( int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected );
 
     TQBrush *backGround() const { return background; }
-    virtual void invalidate();
+    virtual void tqinvalidate();
 
     int verticalAlignmentOffset() const;
     int horizontalAlignmentOffset() const;
@@ -552,7 +552,7 @@ public:
     Placement placement() const { return place; }
     bool isNested() const { return TRUE; }
     void resize( int nwidth );
-    virtual void invalidate();
+    virtual void tqinvalidate();
     /// ## TQString anchorAt( TQPainter* p, int x, int y );
 
     virtual bool enter( KoTextCursor *c, KoTextDocument *&doc, KoTextParag *&parag, int &idx, int &ox, int &oy, bool atEnd = FALSE );
@@ -564,12 +564,12 @@ public:
 
     TQString richText() const;
 
-    int minimumWidth() const { return layout ? layout->minimumSize().width() : 0; }
-    int widthHint() const { return ( layout ? layout->sizeHint().width() : 0 ) + 2 * outerborder; }
+    int minimumWidth() const { return tqlayout ? tqlayout->tqminimumSize().width() : 0; }
+    int widthHint() const { return ( tqlayout ? tqlayout->tqsizeHint().width() : 0 ) + 2 * outerborder; }
 
     TQPtrList<KoTextTableCell> tableCells() const { return cells; }
 
-    TQRect geometry() const { return layout ? layout->geometry() : TQRect(); }
+    TQRect tqgeometry() const { return tqlayout ? tqlayout->tqgeometry() : TQRect(); }
     bool isStretching() const { return stretch; }
 
 private:
@@ -577,7 +577,7 @@ private:
     void addCell( KoTextTableCell* cell );
 
 private:
-    TQGridLayout* layout;
+    TQGridLayout* tqlayout;
     TQPtrList<KoTextTableCell> cells;
     TQPainter* painter;
     int cachewidth;
@@ -697,7 +697,7 @@ struct KoTextParagLineStart
 #endif
     {  }
 #ifndef TQT_NO_COMPLEXTEXT
-    KoTextParagLineStart( KoBidiContext *c, KoBidiStatus s ) : y(0), baseLine(0), h(0),
+    KoTextParagLineStart( KoBidiContext *c, KoBiditqStatus s ) : y(0), baseLine(0), h(0),
                                                                lineSpacing( 0 ), hyphenated( false ),
 	status( s ), bidicontext( c ) { if ( bidicontext ) bidicontext->ref(); }
 #endif
@@ -728,7 +728,7 @@ public:
     short lineSpacing;
     bool hyphenated;
 #ifndef TQT_NO_COMPLEXTEXT
-    KoBidiStatus status;
+    KoBiditqStatus status;
 #endif
     int w;