rename the following methods:

tqparent parent
tqmask mask

1 files changed, 9 insertions, 9 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqrichtext_p.h b/tqtinterface/qt4/src/kernel/tqrichtext_p.h
index bcfdb9b..90dc963 100644
--- a/tqtinterface/qt4/src/kernel/tqrichtext_p.h
+++ b/tqtinterface/qt4/src/kernel/tqrichtext_p.h
@@ -2619,7 +2619,7 @@ class TQ_EXPORT TQTextCustomItem
 {
 public:
     TQTextCustomItem( TQTextDocument *p )
-	:  xpos(0), ypos(-1), width(-1), height(0), tqparent( p )
+	:  xpos(0), ypos(-1), width(-1), height(0), parent( p )
     {}
     virtual ~TQTextCustomItem();
     virtual void draw(TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected ) = 0;
@@ -2657,7 +2657,7 @@ public:
     virtual void setParagraph( TQTextParagraph *p ) { parag = p; }
     TQTextParagraph *paragraph() const { return parag; }
 
-    TQTextDocument *tqparent;
+    TQTextDocument *parent;
     TQTextParagraph *parag;
 
     virtual void pageBreak( int  y, TQTextFlow* flow );
@@ -2808,7 +2808,7 @@ public:
     int stretch() const { return stretch_; }
 
     TQTextDocument* richText()  const { return richtext; }
-    TQTextTable* table() const { return tqparent; }
+    TQTextTable* table() const { return parent; }
 
     void draw( TQPainter* p, int x, int y, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected );
 
@@ -2820,7 +2820,7 @@ public:
 
 private:
     TQRect geom;
-    TQTextTable* tqparent;
+    TQTextTable* parent;
     TQTextDocument* richtext;
     int row_;
     int col_;
@@ -2953,7 +2953,7 @@ public:
     TQTextDocument( TQTextDocument *p );
     virtual ~TQTextDocument();
 
-    TQTextDocument *tqparent() const { return par; }
+    TQTextDocument *parent() const { return par; }
     TQTextParagraph *parentParagraph() const { return parentPar; }
 
     void setText( const TQString &text, const TQString &context );
@@ -3665,7 +3665,7 @@ public:
     virtual ~TQTextFormat();
 
     TQTextFormat( const TQStyleSheetItem *s );
-    TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *tqparent = 0 );
+    TQTextFormat( const TQFont &f, const TQColor &c, TQTextFormatCollection *parent = 0 );
     TQTextFormat( const TQTextFormat &fm );
     TQTextFormat makeTextFormat( const TQStyleSheetItem *style, const TQMap<TQString,TQString>& attr, double scaleFontsFactor ) const;
     TQTextFormat& operator=( const TQTextFormat &fm );
@@ -3696,7 +3696,7 @@ public:
     void setVAlign( VerticalAlignment a );
 
     bool operator==( const TQTextFormat &f ) const;
-    TQTextFormatCollection *tqparent() const;
+    TQTextFormatCollection *parent() const;
     const TQString &key() const;
 
     static TQString getKey( const TQFont &f, const TQColor &c, bool misspelled, VerticalAlignment vAlign );
@@ -4006,7 +4006,7 @@ inline void TQTextDocument::takeFlow()
 
 inline bool TQTextDocument::useDoubleBuffer( TQTextParagraph *parag, TQPainter *p )
 {
-    return ( !parag->document()->tqparent() || parag->document()->nextDoubleBuffered ) &&
+    return ( !parag->document()->parent() || parag->document()->nextDoubleBuffered ) &&
 	( !p || !p->tqdevice() || p->tqdevice()->devType() != TQInternal::Printer );
 }
 
@@ -4037,7 +4037,7 @@ inline bool TQTextFormat::operator==( const TQTextFormat &f ) const
     return k == f.k;
 }
 
-inline TQTextFormatCollection *TQTextFormat::tqparent() const
+inline TQTextFormatCollection *TQTextFormat::parent() const
 {
     return collection;
 }