rename the following methods:

tqparent parent
tqmask mask


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

18 files changed, 42 insertions, 42 deletions

diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 1c21d15..596cbcb 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -37,8 +37,8 @@
 /***************************************************************************
   * constructor
 **/
-DiskList::DiskList(TQObject *tqparent, const char *name)
-    : TQObject(tqparent,name)
+DiskList::DiskList(TQObject *parent, const char *name)
+    : TQObject(parent,name)
 {
    kdDebug() << k_funcinfo << endl;
 
diff --git a/kdf/disklist.h b/kdf/disklist.h
index 638dc59..fbce6c2 100644
--- a/kdf/disklist.h
+++ b/kdf/disklist.h
@@ -97,7 +97,7 @@ class DiskList : public TQObject
 {  Q_OBJECT
   TQ_OBJECT
 public:
-   DiskList( TQObject *tqparent=0, const char *name=0 );
+   DiskList( TQObject *parent=0, const char *name=0 );
  ~DiskList();
    int readFSTAB();
    int readDF();
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index 721f10d..155e6e2 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -65,14 +65,14 @@ void DiskEntry::init()
 
 }
 
-DiskEntry::DiskEntry(TQObject *tqparent, const char *name)
- : TQObject (tqparent, name)
+DiskEntry::DiskEntry(TQObject *parent, const char *name)
+ : TQObject (parent, name)
 {
   init();
 }
 
-DiskEntry::DiskEntry(const TQString & deviceName, TQObject *tqparent, const char *name)
- : TQObject (tqparent, name)
+DiskEntry::DiskEntry(const TQString & deviceName, TQObject *parent, const char *name)
+ : TQObject (parent, name)
 {
   init();
 
diff --git a/kdf/disks.h b/kdf/disks.h
index d27bc0b..2993323 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -42,8 +42,8 @@ class DiskEntry : public TQObject
   Q_OBJECT
   TQ_OBJECT
 public:
-  DiskEntry(TQObject *tqparent=0, const char *name=0);
-  DiskEntry(const TQString & deviceName, TQObject *tqparent=0, const char *name=0);
+  DiskEntry(TQObject *parent=0, const char *name=0);
+  DiskEntry(const TQString & deviceName, TQObject *parent=0, const char *name=0);
   ~DiskEntry();
   TQString lastSysError() {return sysStringErrOut; }
   TQString deviceName() const { return device; }
diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp
index 72389ef..2e26113 100644
--- a/kdf/kcmdf.cpp
+++ b/kdf/kcmdf.cpp
@@ -32,8 +32,8 @@
 
 #include "kcmdf.h"
 
-KDiskFreeWidget::KDiskFreeWidget( TQWidget *tqparent, const char *name )
- : KCModule( tqparent, name )
+KDiskFreeWidget::KDiskFreeWidget( TQWidget *parent, const char *name )
+ : KCModule( parent, name )
 {
   setButtons(Help);
 
@@ -57,9 +57,9 @@ TQString KDiskFreeWidget::quickHelp() const
 
 extern "C"
 {
-  KDE_EXPORT KCModule* create_kdf( TQWidget *tqparent, const char * /*name*/ )
+  KDE_EXPORT KCModule* create_kdf( TQWidget *parent, const char * /*name*/ )
   {
-    return new KDiskFreeWidget( tqparent , "kdf" );
+    return new KDiskFreeWidget( parent , "kdf" );
   }
 }
 
diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h
index a33739c..7f5adef 100644
--- a/kdf/kcmdf.h
+++ b/kdf/kcmdf.h
@@ -36,7 +36,7 @@ class KDiskFreeWidget : public KCModule
   TQ_OBJECT
   
   public:
-    KDiskFreeWidget( TQWidget *tqparent=0, const char *name=0 );
+    KDiskFreeWidget( TQWidget *parent=0, const char *name=0 );
     ~KDiskFreeWidget();
 
     TQString quickHelp() const;
diff --git a/kdf/kdf.h b/kdf/kdf.h
index 176e7b0..d2fceed 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -34,7 +34,7 @@ class KDFTopLevel : public KMainWindow
   TQ_OBJECT
 
   public:
-    KDFTopLevel(TQWidget *tqparent=0, const char *name=0);
+    KDFTopLevel(TQWidget *parent=0, const char *name=0);
     ~KDFTopLevel() { };
 
   protected slots:
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index 2478d28..6831868 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -50,8 +50,8 @@ static bool GUI;
 #endif
 
 
-KDFConfigWidget::KDFConfigWidget(TQWidget *tqparent, const char *name, bool init)
-  : TQWidget( tqparent, name)
+KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init)
+  : TQWidget( parent, name)
 {
 
   mTabName.resize(8);
diff --git a/kdf/kdfconfig.h b/kdf/kdfconfig.h
index b1d8821..7c6aea3 100644
--- a/kdf/kdfconfig.h
+++ b/kdf/kdfconfig.h
@@ -60,7 +60,7 @@ class KDFConfigWidget : public TQWidget
   };
 
   public:
-    KDFConfigWidget( TQWidget *tqparent=0, const char *name=0, bool init=false);
+    KDFConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false);
     ~KDFConfigWidget();
 
   public slots:
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index c81d5a3..8fbb97c 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -56,8 +56,8 @@ static bool GUI;
 
 /**************************************************************/
 
-CListViewItem::CListViewItem( CListView * tqparent, TQListViewItem * after )
-  :TQListViewItem( tqparent, after )
+CListViewItem::CListViewItem( CListView * parent, TQListViewItem * after )
+  :TQListViewItem( parent, after )
 {}
 
 int CListViewItem::compare ( TQListViewItem *i, int column, bool ) const
@@ -92,8 +92,8 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full)
 
 /**************************************************************/
 
-KDFWidget::KDFWidget( TQWidget *tqparent, const char *name, bool init )
-  : TQWidget(tqparent, name), mOptionDialog(0), mPopup(0), mTimer(0)
+KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init )
+  : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0)
 {
   connect(&mDiskList , TQT_SIGNAL(readDFDone() ),
            this, TQT_SLOT (updateDFDone()) );
@@ -131,7 +131,7 @@ KDFWidget::KDFWidget( TQWidget *tqparent, const char *name, bool init )
       this, TQT_SLOT(columnSizeChanged(int, int, int)) );
     makeColumns();
 
-    mIsTopLevel = TQString(tqparent->className()) == "KDFTopLevel" ? true : false;
+    mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false;
   }
 
   loadSettings();
diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h
index af2daa5..79b8715 100644
--- a/kdf/kdfwidget.h
+++ b/kdf/kdfwidget.h
@@ -75,7 +75,7 @@ class CTabEntry
 class CListViewItem : public TQListViewItem
 {
   public:
-    CListViewItem ( CListView * tqparent, TQListViewItem * after );
+    CListViewItem ( CListView * parent, TQListViewItem * after );
  
     virtual int compare ( TQListViewItem* i, int col, bool) const;
     	
@@ -108,7 +108,7 @@ class KDFWidget : public TQWidget
     };
 
   public:
-    KDFWidget( TQWidget *tqparent=0, const char *name=0, bool init=false);
+    KDFWidget( TQWidget *parent=0, const char *name=0, bool init=false);
     ~KDFWidget( void );
 
   public slots:
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index fb85996..8960e2f 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -196,12 +196,12 @@ void KwikDisk::updateDFDone()
          // Special root icon, normal user cant mount.
          //
          // 2000-01-23 Espen Sand
-         // Careful here: If the tqmask has not been defined we can
-         // not use TQPixmap::tqmask() because it returns 0 => segfault
+         // Careful here: If the mask has not been defined we can
+         // not use TQPixmap::mask() because it returns 0 => segfault
          //
-         if( pix->tqmask() != 0 )
+         if( pix->mask() != 0 )
          {
-            TQBitmap *bm = new TQBitmap(*(pix->tqmask()));
+            TQBitmap *bm = new TQBitmap(*(pix->mask()));
             if( bm != 0 )
             {
                TQPainter qp( bm );
diff --git a/kdf/listview.cpp b/kdf/listview.cpp
index df11e96..49021ee 100644
--- a/kdf/listview.cpp
+++ b/kdf/listview.cpp
@@ -34,8 +34,8 @@
 
 template class TQDict<TQPixmap>;
 
-CListView::CListView( TQWidget *tqparent, const char *name, int visibleItem )
-  :KListView( tqparent, name ),  mVisibleItem(TQMAX( 1, visibleItem ))
+CListView::CListView( TQWidget *parent, const char *name, int visibleItem )
+  :KListView( parent, name ),  mVisibleItem(TQMAX( 1, visibleItem ))
 {
   setVisibleItem(visibleItem);
   mPixDict.setAutoDelete(true);
@@ -76,12 +76,12 @@ const TQPixmap &CListView::icon( const TQString &iconName, bool drawBorder )
     {
       //
       // 2000-01-23 Espen Sand
-      // Careful here: If the tqmask has not been defined we can
-      // not use TQPixmap::tqmask() because it returns 0 => segfault
+      // Careful here: If the mask has not been defined we can
+      // not use TQPixmap::mask() because it returns 0 => segfault
       //
-      if( pix->tqmask() != 0 )
+      if( pix->mask() != 0 )
       {
-	TQBitmap *bm = new TQBitmap(*(pix->tqmask()));
+	TQBitmap *bm = new TQBitmap(*(pix->mask()));
 	if( bm != 0 )
 	{
 	  TQPainter qp(bm);
diff --git a/kdf/listview.h b/kdf/listview.h
index c937539..96ae398 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -31,7 +31,7 @@ class CListView : public KListView
   TQ_OBJECT
 
   public:
-    CListView( TQWidget *tqparent=0, const char *name=0, int visibleItem=10 );
+    CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
     
     void setVisibleItem( int visibleItem, bool updateSize=true );
     virtual TQSize tqsizeHint( void ) const; 
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 12d968a..1819760 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -47,8 +47,8 @@ static bool GUI;
 #endif
 
 
-MntConfigWidget::MntConfigWidget(TQWidget *tqparent, const char *name, bool init)
-  : TQWidget(tqparent, name)
+MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
+  : TQWidget(parent, name)
 {
   mInitializing = false;
 
diff --git a/kdf/mntconfig.h b/kdf/mntconfig.h
index f3f0d56..682c229 100644
--- a/kdf/mntconfig.h
+++ b/kdf/mntconfig.h
@@ -59,7 +59,7 @@ class MntConfigWidget : public TQWidget
     };
 
   public:
-    MntConfigWidget( TQWidget *tqparent=0, const char *name=0, bool init=false );
+    MntConfigWidget( TQWidget *parent=0, const char *name=0, bool init=false );
     ~MntConfigWidget();
 
   public slots:
diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp
index 39df7a0..6734294 100644
--- a/kdf/optiondialog.cpp
+++ b/kdf/optiondialog.cpp
@@ -23,9 +23,9 @@
 #include "mntconfig.h"
 #include "optiondialog.h"
 
-COptionDialog::COptionDialog( TQWidget *tqparent, const char *name, bool modal )
+COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal )
   :KDialogBase( Tabbed, i18n("Configure"), Help|Apply|Ok|Cancel, Ok,
-	        tqparent, name, modal )
+	        parent, name, modal )
 {
   setHelp( "kcontrol/kdf/index.html", TQString() );
 
diff --git a/kdf/optiondialog.h b/kdf/optiondialog.h
index ea3f4c3..848a126 100644
--- a/kdf/optiondialog.h
+++ b/kdf/optiondialog.h
@@ -31,7 +31,7 @@ class COptionDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    COptionDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
+    COptionDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
     ~COptionDialog( void );
 
   protected slots: