rename the following methods:

tqparent parent
tqmask mask

1 files changed, 10 insertions, 10 deletions

diff --git a/tqtinterface/qt4/src/kernel/tqapplication.cpp b/tqtinterface/qt4/src/kernel/tqapplication.cpp
index 0e3b55c..d2cc4a2 100644
--- a/tqtinterface/qt4/src/kernel/tqapplication.cpp
+++ b/tqtinterface/qt4/src/kernel/tqapplication.cpp
@@ -545,7 +545,7 @@ TQ_EXPORT bool qt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) {
     if ( !top || modal == top )			// don't block event
 	return TRUE;
 
-    TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a tqparent of our widget
+    TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget
     while ( p ) {
 	if ( p == top )
 	    return TRUE;
@@ -1397,22 +1397,22 @@ static TQVFuncList *postRList = 0;		// list of post routines
   long before the TQApplication destructor is called, for example.
 
   For modules and libraries, using a reference-counted initialization
-  manager or TQt' tqparent-child delete mechanism may be better. Here is
-  an example of a private class which uses the tqparent-child mechanism
+  manager or TQt' parent-child delete mechanism may be better. Here is
+  an example of a private class which uses the parent-child mechanism
   to call a cleanup function at the right time:
 
   \code
     class MyPrivateInitStuff: public TQObject {
     private:
-	MyPrivateInitStuff( TQObject * tqparent ): TQObject( tqparent) {
+	MyPrivateInitStuff( TQObject * parent ): TQObject( parent) {
 	    // initialization goes here
 	}
 	MyPrivateInitStuff * p;
 
     public:
-	static MyPrivateInitStuff * initStuff( TQObject * tqparent ) {
+	static MyPrivateInitStuff * initStuff( TQObject * parent ) {
 	    if ( !p )
-		p = new MyPrivateInitStuff( tqparent );
+		p = new MyPrivateInitStuff( parent );
 	    return p;
 	}
 
@@ -1422,7 +1422,7 @@ static TQVFuncList *postRList = 0;		// list of post routines
     }
   \endcode
 
-  By selecting the right tqparent widget/object, this can often be made
+  By selecting the right parent widget/object, this can often be made
   to clean up the module's data at the exact right moment.
 */
 
@@ -2920,7 +2920,7 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets,
 
 	// make sure the application font is complete
 	app_font->detach();
-	app_font->d->tqmask = TQFontPrivate::Complete;
+	app_font->d->mask = TQFontPrivate::Complete;
 
 	all = app_fonts != 0;
 	delete app_fonts;
@@ -3226,7 +3226,7 @@ void TQApplication::aboutTQt()
   Returns the value that is returned from the receiver's event handler.
 
   For certain types of events (e.g. mouse and key events),
-  the event will be propagated to the receiver's tqparent and so on up to
+  the event will be propagated to the receiver's parent and so on up to
   the top-level object if the receiver is not interested in the event
   (i.e., it returns FALSE).
 
@@ -4656,7 +4656,7 @@ TQ_EXPORT bool qt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) {
     if ( !top || modal == top )			// don't block event
 	return TRUE;
 
-    TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a tqparent of our widget
+    TQWidget * p = widget->parentWidget(); // Check if the active modal widget is a parent of our widget
     while ( p ) {
 	if ( p == top )
 	    return TRUE;