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

5 files changed, 9 insertions, 9 deletions

diff --git a/kscd/libwm/audio/audio_sun.c b/kscd/libwm/audio/audio_sun.c
index 93ce78d2..12b7c55c 100644
--- a/kscd/libwm/audio/audio_sun.c
+++ b/kscd/libwm/audio/audio_sun.c
@@ -54,7 +54,7 @@
  * a marker into the audio stream; when the audio device driver encounters the
  * marker, it increments a field in a status structure.  When we see that
  * field go up, we grab the next status structure from the queue and send it
- * to the tqparent process.
+ * to the parent process.
  *
  * The minimum size of the queue depends on the latency of the audio stream.
  */
@@ -284,7 +284,7 @@ sun_audio_send_status( void )
 	int			qhead;
 
 	/*
-	 * Now send the most current status information to our tqparent.
+	 * Now send the most current status information to our parent.
 	 */
 	if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
 		perror("AUDIO_GETINFO");
diff --git a/kscd/libwm/cddaslave.c b/kscd/libwm/cddaslave.c
index dac475e8..b378f95d 100644
--- a/kscd/libwm/cddaslave.c
+++ b/kscd/libwm/cddaslave.c
@@ -169,7 +169,7 @@ receive_command(struct cdda_device *dev, struct cdda_block* blk)
   if (read(0, inbuf, 1) <= 0) {
     wmcdda_close(dev);
     oops->wmaudio_close();
-/*    ERRORLOG("cddaslave: tqparent died, exit\n");*/
+/*    ERRORLOG("cddaslave: parent died, exit\n");*/
     exit(0);
   }
 
diff --git a/kscd/libwm/plat_linux_audio.c b/kscd/libwm/plat_linux_audio.c
index 690a36e5..9cec45cb 100644
--- a/kscd/libwm/plat_linux_audio.c
+++ b/kscd/libwm/plat_linux_audio.c
@@ -57,7 +57,7 @@ static char plat_linux_audio_id[] = "$Id$";
  * a marker into the audio stream; when the audio device driver encounters the
  * marker, it increments a field in a status structure.  When we see that
  * field go up, we grab the next status structure from the queue and send it
- * to the tqparent process.
+ * to the parent process.
  *
  * The minimum size of the queue depends on the latency of the audio stream.
  */
@@ -275,7 +275,7 @@ wmaudio_send_status( void )
 	int			qhead;
 
 	/*
-	 * Now send the most current status information to our tqparent.
+	 * Now send the most current status information to our parent.
 	 */
 	if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
 		perror("AUDIO_GETINFO");
diff --git a/kscd/libwm/plat_sun.c b/kscd/libwm/plat_sun.c
index 8d09efee..4e61d68f 100644
--- a/kscd/libwm/plat_sun.c
+++ b/kscd/libwm/plat_sun.c
@@ -111,7 +111,7 @@ sigthawinit( void )
   struct sigaction sa;
   
   sa.sa_handler = thawme;
-  sigemptyset(&sa.sa_tqmask);
+  sigemptyset(&sa.sa_mask);
   sa.sa_flags = 0;
   
   sigaction(SIGTHAW, &sa, NULL);
@@ -400,7 +400,7 @@ gen_get_drive_status( struct wm_drive *d,
        * Now install the no-op signal handler.
        */
       new_sig.sa_handler = do_nothing;
-      memset(&new_sig.sa_tqmask, 0, sizeof(new_sig.sa_tqmask));
+      memset(&new_sig.sa_mask, 0, sizeof(new_sig.sa_mask));
       new_sig.sa_flags = 0;
       if (sigaction(SIGALRM, &new_sig, &old_sig))
 	perror("sigaction");
diff --git a/kscd/libwm/plat_sun_audio.c b/kscd/libwm/plat_sun_audio.c
index 3c9dfdc1..34603991 100644
--- a/kscd/libwm/plat_sun_audio.c
+++ b/kscd/libwm/plat_sun_audio.c
@@ -59,7 +59,7 @@ static char plat_sun_audio_id[] = "$Id$";
  * a marker into the audio stream; when the audio device driver encounters the
  * marker, it increments a field in a status structure.  When we see that
  * field go up, we grab the next status structure from the queue and send it
- * to the tqparent process.
+ * to the parent process.
  *
  * The minimum size of the queue depends on the latency of the audio stream.
  */
@@ -279,7 +279,7 @@ wmaudio_send_status( void )
 	int			qhead;
 
 	/*
-	 * Now send the most current status information to our tqparent.
+	 * Now send the most current status information to our parent.
 	 */
 	if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
 		perror("AUDIO_GETINFO");