rename the following methods:

tqparent parent
tqmask mask

12 files changed, 32 insertions, 32 deletions

diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp
index b824959..8b5d787 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.cpp
@@ -43,8 +43,8 @@
 #include <tqinputdialog.h>
 #include <designerinterface.h>
 
-CppEditor::CppEditor( const TQString &fn, TQWidget *tqparent, const char *name, DesignerInterface *i )
-    : Editor( fn, tqparent, name ), dIface( i )
+CppEditor::CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i )
+    : Editor( fn, parent, name ), dIface( i )
 {
     if ( dIface )
 	dIface->addRef();
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h
index 1b4aa62..eb72bbd 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppeditor.h
@@ -47,7 +47,7 @@ class  CppEditor : public Editor
     TQ_OBJECT
 
 public:
-    CppEditor( const TQString &fn, TQWidget *tqparent, const char *name, DesignerInterface *i );
+    CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i );
     ~CppEditor();
 
     virtual EditorCompletion *completionManager() { return completion; }
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
index 9d34421..d7969ce 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
@@ -72,10 +72,10 @@ TQRESULT EditorInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInter
 }
 
 TQWidget *EditorInterfaceImpl::editor( bool readonly,
-				      TQWidget *tqparent, TQUnknownInterface *iface )
+				      TQWidget *parent, TQUnknownInterface *iface )
 {
     if ( !viewManager ) {
-	( (EditorInterfaceImpl*)this )->viewManager = new ViewManager( tqparent, 0 );
+	( (EditorInterfaceImpl*)this )->viewManager = new ViewManager( parent, 0 );
 	( (EditorInterfaceImpl*)this )->viewManager->showMarkerWidget( FALSE );
 	if ( iface )
 	    iface->queryInterface( IID_Designer, (TQUnknownInterface**) &dIface );
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
index 5bae764..23d4e6e 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
@@ -54,7 +54,7 @@ public:
     TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
     TQ_REFCOUNT;
 
-    TQWidget *editor( bool readonly, TQWidget *tqparent, TQUnknownInterface *designerIface );
+    TQWidget *editor( bool readonly, TQWidget *parent, TQUnknownInterface *designerIface );
 
     void setText( const TQString &txt );
     TQString text() const;
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
index da857b5..a053b81 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
@@ -40,19 +40,19 @@
 #include <tqmetaobject.h>
 
 LanguageInterfaceImpl::LanguageInterfaceImpl( TQUnknownInterface *outer )
-    : tqparent( outer ), ref( 0 )
+    : parent( outer ), ref( 0 )
 {
 }
 
 ulong LanguageInterfaceImpl::addRef()
 {
-    return tqparent ? tqparent->addRef() : ref++;
+    return parent ? parent->addRef() : ref++;
 }
 
 ulong LanguageInterfaceImpl::release()
 {
-    if ( tqparent )
-	return tqparent->release();
+    if ( parent )
+	return parent->release();
     if ( !--ref ) {
 	delete this;
 	return 0;
@@ -62,8 +62,8 @@ ulong LanguageInterfaceImpl::release()
 
 TQRESULT LanguageInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface )
 {
-    if ( tqparent )
-	return tqparent->queryInterface( uuid, iface );
+    if ( parent )
+	return parent->queryInterface( uuid, iface );
 
     *iface = 0;
     if ( uuid == IID_TQUnknown )
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h
index a998dc6..e60cf3b 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.h
@@ -82,7 +82,7 @@ public:
     TQStrList signalNames( TQObject *obj ) const;
 
 private:
-    TQUnknownInterface *tqparent;
+    TQUnknownInterface *parent;
     ulong ref;
 
 };
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp
index a9d38e8..ff285e0 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.cpp
@@ -36,7 +36,7 @@
 #include <preferences.h>
 
 PreferenceInterfaceImpl::PreferenceInterfaceImpl( TQUnknownInterface *outer )
-    : tqparent( outer ),
+    : parent( outer ),
       ref( 0 ),
       cppEditorSyntax( 0 )
 {
@@ -48,13 +48,13 @@ PreferenceInterfaceImpl::~PreferenceInterfaceImpl()
 
 ulong PreferenceInterfaceImpl::addRef()
 {
-    return tqparent ? tqparent->addRef() : ref++;
+    return parent ? parent->addRef() : ref++;
 }
 
 ulong PreferenceInterfaceImpl::release()
 {
-    if ( tqparent )
-	return tqparent->release();
+    if ( parent )
+	return parent->release();
     if ( !--ref ) {
 	delete this;
 	return 0;
@@ -64,8 +64,8 @@ ulong PreferenceInterfaceImpl::release()
 
 TQRESULT PreferenceInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface )
 {
-    if ( tqparent )
-	return tqparent->queryInterface( uuid, iface );
+    if ( parent )
+	return parent->queryInterface( uuid, iface );
 
     *iface = 0;
     if ( uuid == IID_TQUnknown )
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h
index af2c838..aacc9f6 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/preferenceinterfaceimpl.h
@@ -54,7 +54,7 @@ public:
     void deletePreferenceObject( Preference * );
 
 private:
-    TQUnknownInterface *tqparent;
+    TQUnknownInterface *parent;
     int ref;
     TQWidget *cppEditorSyntax;
 
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp
index 279a350..372dd05 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.cpp
@@ -36,7 +36,7 @@
 #include "projectsettings.h"
 
 ProjectSettingsInterfaceImpl::ProjectSettingsInterfaceImpl( TQUnknownInterface *outer )
-    : tqparent( outer ),
+    : parent( outer ),
       ref( 0 ),
       settingsTab( 0 )
 {
@@ -44,13 +44,13 @@ ProjectSettingsInterfaceImpl::ProjectSettingsInterfaceImpl( TQUnknownInterface *
 
 ulong ProjectSettingsInterfaceImpl::addRef()
 {
-    return tqparent ? tqparent->addRef() : ref++;
+    return parent ? parent->addRef() : ref++;
 }
 
 ulong ProjectSettingsInterfaceImpl::release()
 {
-    if ( tqparent )
-	return tqparent->release();
+    if ( parent )
+	return parent->release();
     if ( !--ref ) {
 	delete this;
 	return 0;
@@ -90,8 +90,8 @@ void ProjectSettingsInterfaceImpl::deleteProjectSettingsObject( ProjectSettings
 
 TQRESULT ProjectSettingsInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface )
 {
-    if ( tqparent )
-	return tqparent->queryInterface( uuid, iface );
+    if ( parent )
+	return parent->queryInterface( uuid, iface );
 
     *iface = 0;
     if ( uuid == IID_TQUnknown )
diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h
index 5dd0625..1b4009e 100644
--- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h
+++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettingsinterfaceimpl.h
@@ -54,7 +54,7 @@ public:
     TQRESULT queryInterface( const TQUuid &uuid, TQUnknownInterface **iface );
 
 private:
-    TQUnknownInterface *tqparent;
+    TQUnknownInterface *parent;
     int ref;
     CppProjectSettings *settingsTab;
 };
diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index f8f2dd3..aa763cf 100644
--- a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -60,8 +60,8 @@
 #endif
 
 SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w,
-			      TQWidget* tqparent, DesignerFormWindow *fw, const char* name, bool modal, WFlags fl )
-    : SqlFormWizardBase( tqparent, name, modal, fl ), widget( w ), appIface( aIface ),
+			      TQWidget* parent, DesignerFormWindow *fw, const char* name, bool modal, WFlags fl )
+    : SqlFormWizardBase( parent, name, modal, fl ), widget( w ), appIface( aIface ),
      mode( None )
 {
     appIface->addRef();
@@ -307,10 +307,10 @@ void SqlFormWizard::setupPage1()
     setNextEnabled( databasePage, FALSE );
 }
 
-static TQPushButton *create_widget( TQWidget *tqparent, const char *name,
+static TQPushButton *create_widget( TQWidget *parent, const char *name,
 				   const TQString &txt, const TQRect &r, DesignerFormWindow *fw )
 {
-    TQPushButton *pb = (TQPushButton*)fw->create( "TQPushButton", tqparent, name );
+    TQPushButton *pb = (TQPushButton*)fw->create( "TQPushButton", parent, name );
     pb->setText( txt );
     pb->setGeometry( r );
     fw->setPropertyChanged( pb, "text", TRUE );
diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h
index eb6558c..9093a1b 100644
--- a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h
+++ b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.h
@@ -44,7 +44,7 @@ class SqlFormWizard : public SqlFormWizardBase
     TQ_OBJECT
 
 public:
-    SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* tqparent = 0, DesignerFormWindow *fw = 0,
+    SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, TQWidget* parent = 0, DesignerFormWindow *fw = 0,
 		   const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~SqlFormWizard();