rename the following methods:

tqparent parent
tqmask mask

7 files changed, 18 insertions, 18 deletions

diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp
index 4dd152f6e..bab9b9767 100644
--- a/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp
+++ b/experimental/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp
@@ -40,8 +40,8 @@
 #include <tqstyle.h>
 
 
-ColorButton::ColorButton(TQWidget *tqparent, const char *name)
-    : TQButton(tqparent, name), mousepressed(FALSE)
+ColorButton::ColorButton(TQWidget *parent, const char *name)
+    : TQButton(parent, name), mousepressed(FALSE)
 {
     setAcceptDrops(TRUE);
     col = Qt::black;
@@ -49,8 +49,8 @@ ColorButton::ColorButton(TQWidget *tqparent, const char *name)
 }
 
 
-ColorButton::ColorButton(const TQColor &c, TQWidget *tqparent, const char *name)
-    : TQButton(tqparent, name)
+ColorButton::ColorButton(const TQColor &c, TQWidget *parent, const char *name)
+    : TQButton(parent, name)
 {
     setAcceptDrops(TRUE);
     col = c;
diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp
index 6939ceffb..36a5927ba 100644
--- a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.cpp
@@ -70,9 +70,9 @@ void BoldListBoxText::paint( TQPainter* painter )
     TQListBoxText::paint( painter );
 }
 
-PaletteEditorAdvanced::PaletteEditorAdvanced( TQWidget * tqparent,
+PaletteEditorAdvanced::PaletteEditorAdvanced( TQWidget * parent,
 					      const char * name, bool modal, WFlags f )
-    : PaletteEditorAdvancedBase( tqparent, name, modal, f ), selectedPalette(0)
+    : PaletteEditorAdvancedBase( parent, name, modal, f ), selectedPalette(0)
 {
     editPalette = TQApplication::palette();
     setPreviewPalette( editPalette );
@@ -591,10 +591,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( TQt::BackgroundMode mode )
 }
 
 TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init,
-					    TQt::BackgroundMode mode, TQWidget* tqparent,
+					    TQt::BackgroundMode mode, TQWidget* parent,
 					    const char* name )
 {
-    PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( tqparent, name, TRUE );
+    PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( parent, name, TRUE );
     dlg->setupBackgroundMode( mode );
 
     if ( init != TQPalette() )
diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h
index be78f5bf0..d78bc8561 100644
--- a/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h
+++ b/experimental/tqtinterface/qt4/tools/qtconfig/paletteeditoradvanced.h
@@ -41,12 +41,12 @@ class PaletteEditorAdvanced : public PaletteEditorAdvancedBase
     Q_OBJECT
     TQ_OBJECT
 public:
-    PaletteEditorAdvanced( TQWidget * tqparent=0, const char * name=0,
+    PaletteEditorAdvanced( TQWidget * parent=0, const char * name=0,
 			   bool modal=FALSE, WFlags f=0 );
     ~PaletteEditorAdvanced();
 
     static TQPalette getPalette( bool *ok, const TQPalette &pal, TQt::BackgroundMode mode = TQt::PaletteBackground,
-				TQWidget* tqparent = 0, const char* name = 0 );
+				TQWidget* parent = 0, const char* name = 0 );
 
 protected Q_SLOTS:
     void paletteSelected(int);
diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp
index 212978769..5f926cac3 100644
--- a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp
+++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.cpp
@@ -36,8 +36,8 @@
 #include <tqvbox.h>
 #include <tqpainter.h>
 
-PreviewFrame::PreviewFrame( TQWidget *tqparent, const char *name )
-    : TQVBox( tqparent, name )
+PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
+    : TQVBox( parent, name )
 {
     setMinimumSize(200, 200);
     setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h
index bbb03ac53..bb919aad4 100644
--- a/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h
+++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewframe.h
@@ -45,8 +45,8 @@ class Workspace : public TQWorkspace
     TQ_OBJECT
 
 public:
-    Workspace( TQWidget* tqparent = 0, const char* name = 0 )
-        : TQWorkspace( tqparent, name ) {}
+    Workspace( TQWidget* parent = 0, const char* name = 0 )
+        : TQWorkspace( parent, name ) {}
     ~Workspace() {}
 
 protected:
@@ -59,7 +59,7 @@ class PreviewFrame : public TQVBox
     TQ_OBJECT
 
 public:
-    PreviewFrame( TQWidget *tqparent = 0, const char *name = 0 );
+    PreviewFrame( TQWidget *parent = 0, const char *name = 0 );
     void setPreviewPalette(TQPalette);
 
 private:
diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp
index 9ab05547b..70f536c88 100644
--- a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp
+++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.cpp
@@ -35,8 +35,8 @@
 
 #include <tqobjectlist.h>
 
-PreviewWidget::PreviewWidget( TQWidget *tqparent, const char *name )
-    : PreviewWidgetBase( tqparent, name )
+PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
+    : PreviewWidgetBase( parent, name )
 {
     // install event filter on child widgets
     TQObjectList *l = queryList("TQWidget");
diff --git a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h
index 8fb12d664..8533a4794 100644
--- a/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h
+++ b/experimental/tqtinterface/qt4/tools/qtconfig/previewwidget.h
@@ -42,7 +42,7 @@ class PreviewWidget : public PreviewWidgetBase
     TQ_OBJECT
 
 public:
-    PreviewWidget( TQWidget *tqparent = 0, const char *name = 0 );
+    PreviewWidget( TQWidget *parent = 0, const char *name = 0 );
 
     void closeEvent(TQCloseEvent *);
     bool eventFilter(TQObject *, TQEvent *);