rename the following methods:

tqparent parent
tqmask mask

1 files changed, 15 insertions, 15 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqmetaobject.cpp b/tqtinterface/qt4/src/kernel/tqmetaobject.cpp
index 6b2b17f..0476c8b 100644
--- a/tqtinterface/qt4/src/kernel/tqmetaobject.cpp
+++ b/tqtinterface/qt4/src/kernel/tqmetaobject.cpp
@@ -206,8 +206,8 @@ bool TQMetaProperty::stdSet() const
 //     if ( !testFlags( Override ) || testFlags( Writable ) )
 // 	return testFlags( StdSet );
 //     const TQMetaObject* mo = (*meta);
-//     const TQMetaProperty* tqparent = mo->resolveProperty( this );
-//     return tqparent ? tqparent->stdSet() : FALSE;
+//     const TQMetaProperty* parent = mo->resolveProperty( this );
+//     return parent ? parent->stdSet() : FALSE;
 
 	// [FIXME]
 	printf("[WARNING] bool TQMetaProperty::stdSet() const unimplemented\n\r");
@@ -1182,7 +1182,7 @@ int TQMetaObject::indexOfProperty( const TQMetaProperty* prop, bool super ) cons
 
 /*!\internal
 
-  Returns the tqparent property of property \a p or 0, if the property
+  Returns the parent property of property \a p or 0, if the property
   cannot be resolved.
 
   \a p has to be contained in this meta object
@@ -1535,8 +1535,8 @@ bool TQMetaProperty::writable() const
     if ( !testFlags( Override ) || testFlags( Writable ) )
 	return testFlags( Writable );
     const TQMetaObject* mo = (*meta);
-    const TQMetaProperty* tqparent = mo->resolveProperty( this );
-    return tqparent ? tqparent->writable() : FALSE;
+    const TQMetaProperty* parent = mo->resolveProperty( this );
+    return parent ? parent->writable() : FALSE;
 }
 
 /*!\internal
@@ -1546,8 +1546,8 @@ bool TQMetaProperty::stdSet() const
     if ( !testFlags( Override ) || testFlags( Writable ) )
 	return testFlags( StdSet );
     const TQMetaObject* mo = (*meta);
-    const TQMetaProperty* tqparent = mo->resolveProperty( this );
-    return tqparent ? tqparent->stdSet() : FALSE;
+    const TQMetaProperty* parent = mo->resolveProperty( this );
+    return parent ? parent->stdSet() : FALSE;
 }
 
 /*!\internal
@@ -1577,8 +1577,8 @@ bool TQMetaProperty::isValid() const
     if ( !testFlags( Override ) || testFlags( Readable ) )
 	return testFlags( Readable );
     const TQMetaObject* mo = (*meta);
-    const TQMetaProperty* tqparent = mo->resolveProperty( this );
-    return tqparent ? tqparent->isValid() : FALSE;
+    const TQMetaProperty* parent = mo->resolveProperty( this );
+    return parent ? parent->isValid() : FALSE;
 }
 
 bool TQMetaProperty::isSetType() const
@@ -1659,8 +1659,8 @@ bool TQMetaProperty::designable( TQObject* o ) const
     }
     if ( testFlags( DesignableOverride ) ) {
 	const TQMetaObject* mo = (*meta);
-	const TQMetaProperty* tqparent = mo->resolveProperty( this );
-	return tqparent ? tqparent->designable() : FALSE;
+	const TQMetaProperty* parent = mo->resolveProperty( this );
+	return parent ? parent->designable() : FALSE;
     }
     return !testFlags( NotDesignable );
 }
@@ -1680,8 +1680,8 @@ bool TQMetaProperty::scriptable( TQObject* o ) const
     }
     if ( testFlags( ScriptableOverride ) ) {
 	const TQMetaObject* mo = (*meta);
-	const TQMetaProperty* tqparent = mo->resolveProperty( this );
-	return tqparent ? tqparent->scriptable() : FALSE;
+	const TQMetaProperty* parent = mo->resolveProperty( this );
+	return parent ? parent->scriptable() : FALSE;
     }
     return !testFlags( NotScriptable );
 }
@@ -1703,8 +1703,8 @@ bool TQMetaProperty::stored( TQObject* o ) const
     }
     if ( testFlags( StoredOverride ) ) {
 	const TQMetaObject* mo = (*meta);
-	const TQMetaProperty* tqparent = mo->resolveProperty( this );
-	return tqparent ? tqparent->stored() : FALSE;
+	const TQMetaProperty* parent = mo->resolveProperty( this );
+	return parent ? parent->stored() : FALSE;
     }
     return !testFlags( NotStored );
 }