rename the following methods:

tqparent parent
tqmask mask


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

26 files changed, 39 insertions, 39 deletions

diff --git a/kmid/README b/kmid/README
index 3b819871..52c5f759 100644
--- a/kmid/README
+++ b/kmid/README
@@ -60,7 +60,7 @@ Index
     
 3. Compiling consoleKMid
 -----------------
-   Do a configure from the tqparent directory, then go to the player directory,
+   Do a configure from the parent directory, then go to the player directory,
    and do a 'make' . Simple , isn't it ?
 
    By default it will use the external midi device, if you want to use another
diff --git a/kmid/channel.cpp b/kmid/channel.cpp
index a4547767..2fe22de6 100644
--- a/kmid/channel.cpp
+++ b/kmid/channel.cpp
@@ -39,7 +39,7 @@
 #include "instrname.h"
 #include <kiconloader.h>
 
-KMidChannel::KMidChannel(int chn,TQWidget *tqparent) : TQWidget (tqparent)
+KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
 {
     channel=chn;
     replay=TRUE;
diff --git a/kmid/channel3d.cpp b/kmid/channel3d.cpp
index 8a24410b..d3bef7fd 100644
--- a/kmid/channel3d.cpp
+++ b/kmid/channel3d.cpp
@@ -25,7 +25,7 @@
 #include "channel3d.h"
 #include <tqpainter.h>
 
-KMidChannel3D::KMidChannel3D (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent)
+KMidChannel3D::KMidChannel3D (int chn,TQWidget *parent) : KMidChannel(chn,parent)
 {
 }
 
diff --git a/kmid/channel3d.h b/kmid/channel3d.h
index 2ce8de10..a8c81da0 100644
--- a/kmid/channel3d.h
+++ b/kmid/channel3d.h
@@ -30,7 +30,7 @@
 class KMidChannel3D : public KMidChannel
 {
 public:
-    KMidChannel3D(int chn,TQWidget *tqparent);
+    KMidChannel3D(int chn,TQWidget *parent);
 
 
     virtual void drawDo   (TQPainter *qpaint,int x,int p);
diff --git a/kmid/channel4d.cpp b/kmid/channel4d.cpp
index a12165eb..4f47c3ae 100644
--- a/kmid/channel4d.cpp
+++ b/kmid/channel4d.cpp
@@ -25,7 +25,7 @@
 #include "channel4d.h"
 #include <tqpainter.h>
 
-KMidChannel4D::KMidChannel4D  (int chn,TQWidget *tqparent) : KMidChannel(chn,tqparent)
+KMidChannel4D::KMidChannel4D  (int chn,TQWidget *parent) : KMidChannel(chn,parent)
 {
     brushR = new TQBrush (red);
     brushW = new TQBrush (white);
diff --git a/kmid/channel4d.h b/kmid/channel4d.h
index e5cba3c7..e6326f4a 100644
--- a/kmid/channel4d.h
+++ b/kmid/channel4d.h
@@ -36,7 +36,7 @@ private:
     TQPen   *penR;
 
 public:
-    KMidChannel4D(int chn,TQWidget *tqparent);
+    KMidChannel4D(int chn,TQWidget *parent);
 
 
     virtual void drawDo   (TQPainter *qpaint,int x,int p);
diff --git a/kmid/channelcfgdlg.cpp b/kmid/channelcfgdlg.cpp
index 4384dd7c..db320a28 100644
--- a/kmid/channelcfgdlg.cpp
+++ b/kmid/channelcfgdlg.cpp
@@ -12,7 +12,7 @@
 #include <tqlayout.h>
 #include <tqvbuttongroup.h>
 
-ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *tqparent,const char *name) : KDialogBase(tqparent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok)
+ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok)
 {
     TQWidget *page = new TQWidget( this );
     setMainWidget(page);
diff --git a/kmid/channelcfgdlg.h b/kmid/channelcfgdlg.h
index 040b741b..21a33198 100644
--- a/kmid/channelcfgdlg.h
+++ b/kmid/channelcfgdlg.h
@@ -35,7 +35,7 @@ class ChannelViewConfigDialog : public KDialogBase
 
 public:
     
-    ChannelViewConfigDialog(TQWidget *tqparent,const char *name);
+    ChannelViewConfigDialog(TQWidget *parent,const char *name);
     
 private:
     TQVButtonGroup *qbg;
diff --git a/kmid/collectdlg.cpp b/kmid/collectdlg.cpp
index a98a8a05..11158b18 100644
--- a/kmid/collectdlg.cpp
+++ b/kmid/collectdlg.cpp
@@ -38,7 +38,7 @@
 #include "songlist.h"
 #include "slman.h"
 
-CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *tqparent,const char *name) : TQDialog(tqparent,name,TRUE)
+CollectionDialog::CollectionDialog(SLManager *slm,int selC,TQWidget *parent,const char *name) : TQDialog(parent,name,TRUE)
 {
 setCaption(i18n("Collections Manager"));
 ok=new KPushButton(KStdGuiItem::ok(),this);
diff --git a/kmid/collectdlg.h b/kmid/collectdlg.h
index a53dff70..31981d8c 100644
--- a/kmid/collectdlg.h
+++ b/kmid/collectdlg.h
@@ -49,7 +49,7 @@ protected:
 	void addSong(const KURL &);
 public:
 
-	CollectionDialog(SLManager *slm,int selc,TQWidget *tqparent,const char *name);
+	CollectionDialog(SLManager *slm,int selc,TQWidget *parent,const char *name);
 
 public slots:
 	void collectionselected(int idx);
diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp
index 7485a109..72436009 100644
--- a/kmid/kdisptext.cpp
+++ b/kmid/kdisptext.cpp
@@ -40,7 +40,7 @@
 //#define DRAW_BOUNDING_RECTS
 
 
-KDisplayText::KDisplayText(TQWidget *tqparent,const char *name) : TQScrollView(tqparent,name)
+KDisplayText::KDisplayText(TQWidget *parent,const char *name) : TQScrollView(parent,name)
 {
   first_line_[0]=first_line_[1]=NULL;
   linked_list_[0]=linked_list_[1]=NULL;
diff --git a/kmid/kdisptext.h b/kmid/kdisptext.h
index 2b9c3fed..8cd9939f 100644
--- a/kmid/kdisptext.h
+++ b/kmid/kdisptext.h
@@ -92,7 +92,7 @@ protected:
     virtual void timerEvent(TQTimerEvent *e);
     
 public:
-    KDisplayText(TQWidget *tqparent,const char *name);
+    KDisplayText(TQWidget *parent,const char *name);
     virtual ~KDisplayText();
     
     void ClearEv(bool totally=true);
diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp
index 21bdbbd5..355f9578 100644
--- a/kmid/klcdnumber.cpp
+++ b/kmid/klcdnumber.cpp
@@ -28,8 +28,8 @@
 
 #define BUTTONWIDTH 9
 
-KLCDNumber::KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name)
-    : TQWidget(tqparent,name)
+KLCDNumber::KLCDNumber(int _numDigits,TQWidget *parent,const char *name)
+    : TQWidget(parent,name)
 {
     initDigits();
     setUserChangeValue=false;
@@ -47,8 +47,8 @@ KLCDNumber::KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name)
     setLCDColor(100,255,100);
 }
 
-KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name)
-    : TQWidget(tqparent,name)
+KLCDNumber::KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name)
+    : TQWidget(parent,name)
 {
     initDigits();
     setUserChangeValue=_setUserChangeValue;
diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h
index d7be294f..cf1fca4e 100644
--- a/kmid/klcdnumber.h
+++ b/kmid/klcdnumber.h
@@ -101,8 +101,8 @@ public:
     void initDigits(void);
 
 public:
-    KLCDNumber(int _numDigits,TQWidget *tqparent,const char *name);
-    KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *tqparent,const char *name);
+    KLCDNumber(int _numDigits,TQWidget *parent,const char *name);
+    KLCDNumber(bool _setUserChangeValue,int _numDigits,TQWidget *parent,const char *name);
 
     void setUserSetDefaultValue(bool _userSetDefaultValue);
     void setDefaultValue(double v);
diff --git a/kmid/kmid_part.cpp b/kmid/kmid_part.cpp
index 5e800aaa..239e8b40 100644
--- a/kmid/kmid_part.cpp
+++ b/kmid/kmid_part.cpp
@@ -38,10 +38,10 @@ KMidFactory::~KMidFactory()
 }
 
 KParts::Part *KMidFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *tqparent, const char *name, const char*,
+                                            TQObject *parent, const char *name, const char*,
     const TQStringList& )
 {
-  KParts::Part *obj = new KMidPart(parentWidget, widgetName, tqparent, name);
+  KParts::Part *obj = new KMidPart(parentWidget, widgetName, parent, name);
   return obj;
 }
 
@@ -66,8 +66,8 @@ KInstance *KMidFactory::instance()
 }
 
   KMidPart::KMidPart(TQWidget *parentWidget, const char *widgetName,
-                     TQObject *tqparent, const char *name)
-: KParts::ReadOnlyPart(tqparent, name)
+                     TQObject *parent, const char *name)
+: KParts::ReadOnlyPart(parent, name)
 {
   setInstance(KMidFactory::instance());
 
@@ -133,8 +133,8 @@ void KMidPart::slotStop()
 {
   widget->stop();
 }
-KMidBrowserExtension::KMidBrowserExtension(KMidPart *tqparent)
-    : KParts::BrowserExtension(tqparent, "KMidBrowserExtension")
+KMidBrowserExtension::KMidBrowserExtension(KMidPart *parent)
+    : KParts::BrowserExtension(parent, "KMidBrowserExtension")
 {
 }
 
diff --git a/kmid/kmid_part.h b/kmid/kmid_part.h
index cb4b2d2c..9cb5a564 100644
--- a/kmid/kmid_part.h
+++ b/kmid/kmid_part.h
@@ -18,7 +18,7 @@ class KDE_EXPORT KMidFactory : public KParts::Factory
     virtual ~KMidFactory();
 
     virtual KParts::Part* createPartObject(TQWidget *parentWidget, const char *widgetName,
-                TQObject* tqparent = 0, const char* name = 0,
+                TQObject* parent = 0, const char* name = 0,
                 const char* classname = TQOBJECT_OBJECT_NAME_STRING,
                 const TQStringList &args = TQStringList());
 
@@ -35,7 +35,7 @@ class KMidPart: public KParts::ReadOnlyPart
   TQ_OBJECT
   public:
     KMidPart(TQWidget *parentWidget, const char *widgetName, 
-             TQObject *tqparent, const char *name);
+             TQObject *parent, const char *name);
     virtual ~KMidPart();
 
 
@@ -59,7 +59,7 @@ class KMidBrowserExtension : public KParts::BrowserExtension
   TQ_OBJECT
     friend class KMidPart;
   public:
-  KMidBrowserExtension(KMidPart *tqparent);
+  KMidBrowserExtension(KMidPart *parent);
   virtual ~KMidBrowserExtension();
 };
 
diff --git a/kmid/kmidbutton.h b/kmid/kmidbutton.h
index ceba94a5..ca48d9fb 100644
--- a/kmid/kmidbutton.h
+++ b/kmid/kmidbutton.h
@@ -15,7 +15,7 @@ protected:
     
 public:
     
-    KMidButton (TQWidget *tqparent,const char *name) : TQPushButton (tqparent,name)
+    KMidButton (TQWidget *parent,const char *name) : TQPushButton (parent,name)
     {
     };
     
diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp
index a0088266..706e7cbf 100644
--- a/kmid/kmidclient.cpp
+++ b/kmid/kmidclient.cpp
@@ -65,8 +65,8 @@
 //#define TEMPHACK
 
 
-kmidClient::kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name)
-    :  DCOPObject("KMidIface"), TQWidget(tqparent,name)
+kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name)
+    :  DCOPObject("KMidIface"), TQWidget(parent,name)
 {
     actionCollection=ac;
     KConfig *cfg=kapp->config();
diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h
index 39ecbd50..dbfa7518 100644
--- a/kmid/kmidclient.h
+++ b/kmid/kmidclient.h
@@ -106,7 +106,7 @@ private:
     int openFile(const char *filename);
     void allNotesOff(void);
 public:
-    kmidClient(TQWidget *tqparent, KActionCollection *ac, const char *name=0);
+    kmidClient(TQWidget *parent, KActionCollection *ac, const char *name=0);
     ~kmidClient();
 
     char *midiFileName(void) {return midifile_opened;};
diff --git a/kmid/main.cpp b/kmid/main.cpp
index 3bafb1f9..45cd1fab 100644
--- a/kmid/main.cpp
+++ b/kmid/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 /*
     struct sigaction act;
     act.sa_handler = SIG_DFL;
-    sigemptyset(&(act.sa_tqmask));
+    sigemptyset(&(act.sa_mask));
     act.sa_flags=0;
 
     sigaction(SIGINT, &act, NULL);
diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp
index 7c26c295..00497d05 100644
--- a/kmid/midicfgdlg.cpp
+++ b/kmid/midicfgdlg.cpp
@@ -38,7 +38,7 @@
 #include <kstandarddirs.h>
 
 MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
-    TQWidget *tqparent,const char *name) : KDialogBase(tqparent,name,TRUE,
+    TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,
       i18n("Configure MIDI Devices"), KDialogBase::Ok|KDialogBase::Cancel)
 {
   setMinimumSize(360,240);
diff --git a/kmid/midicfgdlg.h b/kmid/midicfgdlg.h
index bab949b8..dd67cf6d 100644
--- a/kmid/midicfgdlg.h
+++ b/kmid/midicfgdlg.h
@@ -38,7 +38,7 @@ class MidiConfigDialog : public KDialogBase
 
 public:
 
-  MidiConfigDialog(DeviceManager *dm,TQWidget *tqparent,const char *name);
+  MidiConfigDialog(DeviceManager *dm,TQWidget *parent,const char *name);
 
 public slots:
   void deviceselected(int idx);
diff --git a/kmid/qslidertime.cpp b/kmid/qslidertime.cpp
index e7313d22..ba1b62f8 100644
--- a/kmid/qslidertime.cpp
+++ b/kmid/qslidertime.cpp
@@ -28,8 +28,8 @@
 
 #define ARROW_LENGTH    13 
 
-QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *tqparent, const char *name)
-					: TQWidget (tqparent,name)
+QSliderTime::QSliderTime( TQSlider *ksl, TQWidget *parent, const char *name)
+					: TQWidget (parent,name)
 {
 kslider=ksl;
 
diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h
index c42632b0..a409332b 100644
--- a/kmid/qslidertime.h
+++ b/kmid/qslidertime.h
@@ -39,7 +39,7 @@ private:
 int fontheight;
 public:
 
-  QSliderTime( TQSlider *ksl, TQWidget *tqparent = NULL, const char *name = NULL );
+  QSliderTime( TQSlider *ksl, TQWidget *parent = NULL, const char *name = NULL );
 
   int getFontHeight(void) {return fontheight;};
 
diff --git a/kmid/rhythmview.cpp b/kmid/rhythmview.cpp
index a10bb79c..49499d46 100644
--- a/kmid/rhythmview.cpp
+++ b/kmid/rhythmview.cpp
@@ -23,7 +23,7 @@
 ***************************************************************************/
 #include "rhythmview.h"
 
-RhythmView::RhythmView (TQWidget *tqparent, const char *name) : TQWidget (tqparent,name)
+RhythmView::RhythmView (TQWidget *parent, const char *name) : TQWidget (parent,name)
 {
     lamps=NULL;
     setRhythm(4,4);
diff --git a/kmid/rhythmview.h b/kmid/rhythmview.h
index 3754c074..97a7ae1a 100644
--- a/kmid/rhythmview.h
+++ b/kmid/rhythmview.h
@@ -34,7 +34,7 @@ class RhythmView : public TQWidget
     KLed **lamps;
     
 public:
-    RhythmView (TQWidget *tqparent, const char *name);
+    RhythmView (TQWidget *parent, const char *name);
     ~RhythmView();
 
     void setRhythm(int numerator,int denominator);