rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 13 deletions

diff --git a/lib/kformula/basicelement.h b/lib/kformula/basicelement.h
index 025dfbc6..1fe46cc1 100644
--- a/lib/kformula/basicelement.h
+++ b/lib/kformula/basicelement.h
@@ -87,7 +87,7 @@ public:
      * (The SequenceElement's tqchildren are simply counted.)
      */
 
-    BasicElement(BasicElement* tqparent = 0);
+    BasicElement(BasicElement* parent = 0);
     virtual ~BasicElement();
 
     // deep copy
@@ -102,7 +102,7 @@ public:
 
     /**
      * @returns whether the child should be read-only. The idea is
-     * that a read-only tqparent has read-only tqchildren.
+     * that a read-only parent has read-only tqchildren.
      */
     virtual bool readOnly( const BasicElement* child ) const;
 
@@ -114,7 +114,7 @@ public:
     /**
      * Provide fast access to the rootElement for each child.
      */
-    virtual const FormulaElement* formula() const { return tqparent->formula(); }
+    virtual const FormulaElement* formula() const { return parent->formula(); }
 
     /**
      * @returns the character that represents this element. Used for
@@ -167,7 +167,7 @@ public:
 
     /**
      * Draws the whole element including its tqchildren.
-     * The `parentOrigin' is the point this element's tqparent starts.
+     * The `parentOrigin' is the point this element's parent starts.
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( TQPainter& painter, const LuPixelRect& r,
@@ -340,9 +340,9 @@ public:
 
     // basic support
 
-    const BasicElement* getParent() const { return tqparent; }
-    BasicElement* getParent() { return tqparent; }
-    void setParent(BasicElement* p) { tqparent = p; }
+    const BasicElement* getParent() const { return parent; }
+    BasicElement* getParent() { return parent; }
+    void setParent(BasicElement* p) { parent = p; }
 
     luPixel getX() const { return m_x; }
     luPixel getY() const { return m_y; }
@@ -377,7 +377,7 @@ public:
      * Same as above, just MathML.
      * It shouldn't be redefined but for exceptional cases, use the general writeMathML* API instead
      */
-    virtual void writeMathML( TQDomDocument& doc, TQDomNode& tqparent, bool oasisFormat = false ) const ;
+    virtual void writeMathML( TQDomDocument& doc, TQDomNode& parent, bool oasisFormat = false ) const ;
 
     /**
      * Set this element attribute, build tqchildren and
@@ -396,7 +396,7 @@ public:
     static int getEvilDestructionCount() { return evilDestructionCount; }
 
     /**
-     * @returns our type. This is an object from our tqparent's syntax tree
+     * @returns our type. This is an object from our parent's syntax tree
      * or 0 if there was a very bad parsing error.
      */
     ElementType* getElementType() const { return elementType; }
@@ -495,11 +495,11 @@ private:
     double str2size( const TQString& str, SizeType* st, uint index, SizeType type );
 
     /**
-     * Our tqparent.
-     * The tqparent might not be null except for the FormulaElement
+     * Our parent.
+     * The parent might not be null except for the FormulaElement
      * that is the top of the element tree.
      */
-    BasicElement* tqparent;
+    BasicElement* parent;
 
     /**
      * This elements size.
@@ -509,7 +509,7 @@ private:
     luPixel m_height;
 
     /**
-     * Our position relative to our tqparent.
+     * Our position relative to our parent.
      */
     //KoPoint position;
     luPixel m_x;