rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 14 insertions, 14 deletions

diff --git a/src/kmplayerprocess.h b/src/kmplayerprocess.h
index 02f9c6d..8e9add1 100644
--- a/src/kmplayerprocess.h
+++ b/src/kmplayerprocess.h
@@ -60,7 +60,7 @@ public:
     enum State {
         NotRunning = 0, Ready, Buffering, Playing
     };
-    Process (TQObject * tqparent, Settings * settings, const char * n);
+    Process (TQObject * parent, Settings * settings, const char * n);
     virtual ~Process ();
     virtual void init ();
     virtual void initProcess (Viewer *);
@@ -122,7 +122,7 @@ class MPlayerBase : public Process {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MPlayerBase (TQObject * tqparent, Settings * settings, const char * n);
+    MPlayerBase (TQObject * parent, Settings * settings, const char * n);
     ~MPlayerBase ();
     void initProcess (Viewer *);
 public slots:
@@ -148,7 +148,7 @@ class KDE_EXPORT MPlayer : public MPlayerBase {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MPlayer (TQObject * tqparent, Settings * settings);
+    MPlayer (TQObject * parent, Settings * settings);
     ~MPlayer ();
     virtual void init ();
     virtual TQString menuName () const;
@@ -210,7 +210,7 @@ public:
     void read (KConfig *);
     void sync (bool fromUI);
     void prefLocation (TQString & item, TQString & icon, TQString & tab);
-    TQFrame * prefPage (TQWidget * tqparent);
+    TQFrame * prefPage (TQWidget * parent);
     TQRegExp m_patterns[pat_last];
     int cachesize;
     TQString mplayer_path;
@@ -239,7 +239,7 @@ class MEncoder : public MPlayerBase, public Recorder {
     Q_OBJECT
   TQ_OBJECT
 public:
-    MEncoder (TQObject * tqparent, Settings * settings);
+    MEncoder (TQObject * parent, Settings * settings);
     ~MEncoder ();
     virtual void init ();
     virtual bool deMediafiedPlay ();
@@ -255,7 +255,7 @@ class KMPLAYER_NO_EXPORT MPlayerDumpstream
     Q_OBJECT
   TQ_OBJECT
 public:
-    MPlayerDumpstream (TQObject * tqparent, Settings * settings);
+    MPlayerDumpstream (TQObject * parent, Settings * settings);
     ~MPlayerDumpstream ();
     virtual void init ();
     virtual bool deMediafiedPlay ();
@@ -274,7 +274,7 @@ class KMPLAYER_EXPORT CallbackProcess : public Process {
   TQ_OBJECT
     friend class Callback;
 public:
-    CallbackProcess (TQObject * tqparent, Settings * settings, const char * n, const TQString & menu);
+    CallbackProcess (TQObject * parent, Settings * settings, const char * n, const TQString & menu);
     ~CallbackProcess ();
     virtual void setStatusMessage (const TQString & msg);
     virtual void setErrorMessage (int code, const TQString & msg);
@@ -351,7 +351,7 @@ struct KMPLAYER_NO_EXPORT TypeNode : public ConfigNode {
     KDE_NO_CDTOR_EXPORT ~TypeNode () {}
     NodePtr childFromTag (const TQString & tag);
     void changedXML (TQTextStream & out);
-    TQWidget * createWidget (TQWidget * tqparent);
+    TQWidget * createWidget (TQWidget * parent);
     const char * nodeName () const { return tag.ascii (); }
     TQString tag;
 };
@@ -367,7 +367,7 @@ public:
     void read (KConfig *);
     void sync (bool fromUI);
     void prefLocation (TQString & item, TQString & icon, TQString & tab);
-    TQFrame * prefPage (TQWidget * tqparent);
+    TQFrame * prefPage (TQWidget * parent);
 private:
     CallbackProcess * m_process;
     XMLPreferencesFrame * m_configframe;
@@ -380,7 +380,7 @@ class KMPLAYER_NO_EXPORT Xine : public CallbackProcess, public Recorder {
     Q_OBJECT
   TQ_OBJECT
 public:
-    Xine (TQObject * tqparent, Settings * settings);
+    Xine (TQObject * parent, Settings * settings);
     ~Xine ();
 public slots:
     bool ready (Viewer *);
@@ -393,7 +393,7 @@ class KMPLAYER_NO_EXPORT GStreamer : public CallbackProcess {
     Q_OBJECT
   TQ_OBJECT
 public:
-    GStreamer (TQObject * tqparent, Settings * settings);
+    GStreamer (TQObject * parent, Settings * settings);
     ~GStreamer ();
 public slots:
     virtual bool ready (Viewer *);
@@ -406,7 +406,7 @@ class KMPLAYER_EXPORT FFMpeg : public Process, public Recorder {
     Q_OBJECT
   TQ_OBJECT
 public:
-    FFMpeg (TQObject * tqparent, Settings * settings);
+    FFMpeg (TQObject * parent, Settings * settings);
     ~FFMpeg ();
     virtual void init ();
     virtual bool deMediafiedPlay ();
@@ -430,7 +430,7 @@ public:
         BecauseDone = 0, BecauseError = 1, BecauseStopped = 2
     };
 
-    NpStream (TQObject *tqparent, TQ_UINT32 stream_id, const KURL & url);
+    NpStream (TQObject *parent, TQ_UINT32 stream_id, const KURL & url);
     ~NpStream ();
 
     void open ();
@@ -460,7 +460,7 @@ class KMPLAYER_NO_EXPORT NpPlayer : public Process {
     Q_OBJECT
   TQ_OBJECT
 public:
-    NpPlayer (TQObject * tqparent, Settings * settings, const TQString & srv);
+    NpPlayer (TQObject * parent, Settings * settings, const TQString & srv);
     ~NpPlayer ();
     virtual void init ();
     virtual bool deMediafiedPlay ();