TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


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

6 files changed, 45 insertions, 45 deletions

diff --git a/mpg123_artsplugin/dxhead.h b/mpg123_artsplugin/dxhead.h
index 16a6a0fc..c84b15c9 100644
--- a/mpg123_artsplugin/dxhead.h
+++ b/mpg123_artsplugin/dxhead.h
@@ -10,7 +10,7 @@ Copyright 1998 Xing Technology Corp.
 -----------------------------------------------------------*/  
 /* A Xing header may be present in the ancillary
  * data field of the first frame of an mp3 bitstream
- * The Xing header (optionally) contains
+ * The Xing header (optionally) tqcontains
  *      frames      total number of audio frames in the bitstream
  *      bytes       total number of bytes in the bitstream
  *      toc         table of contents
diff --git a/mpg123_artsplugin/mpg123/buffer.c b/mpg123_artsplugin/mpg123/buffer.c
index 3c85b654..33b4c92b 100644
--- a/mpg123_artsplugin/mpg123/buffer.c
+++ b/mpg123_artsplugin/mpg123/buffer.c
@@ -95,7 +95,7 @@ void buffer_loop(struct audio_info_struct *ai, sigset_t *oldsigset)
 
 	catchsignal (SIGINT, catch_interrupt);
 	catchsignal (SIGUSR1, catch_usr1);
-	sigprocmask (SIG_SETMASK, oldsigset, NULL);
+	sigproctqmask (SIG_SETMASK, oldsigset, NULL);
 #ifndef NO_DECODE_AUDIO
 	if (param.outmode == DECODE_AUDIO) {
 		if (audio_open(ai) < 0) {
diff --git a/mpg123_artsplugin/mpg123/common.c b/mpg123_artsplugin/mpg123/common.c
index 65d658fd..cd7cc121 100644
--- a/mpg123_artsplugin/mpg123/common.c
+++ b/mpg123_artsplugin/mpg123/common.c
@@ -114,7 +114,7 @@ void (*catchsignal(int signum, void(*handler)()))()
 #endif
 
     new_sa.sa_handler = handler;
-    sigemptyset(&new_sa.sa_mask);
+    sigemptyset(&new_sa.sa_tqmask);
     new_sa.sa_flags = 0;
     if (sigaction(signum, &new_sa, &old_sa) == -1)
 	return ((void (*)()) -1);
diff --git a/mpg123_artsplugin/mpg123/httpget.c b/mpg123_artsplugin/mpg123/httpget.c
index 71750115..12c6941f 100644
--- a/mpg123_artsplugin/mpg123/httpget.c
+++ b/mpg123_artsplugin/mpg123/httpget.c
@@ -83,7 +83,7 @@ void readstring (char *string, int maxlen, FILE *f)
 void encode64 (char *source,char *destination)
 {
   static char *Base64Digits =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
   int n = 0;
   int ssiz=strlen(source);
   int i;
diff --git a/mpg123_artsplugin/mpg123/layer3.c b/mpg123_artsplugin/mpg123/layer3.c
index b4f33510..b012047a 100644
--- a/mpg123_artsplugin/mpg123/layer3.c
+++ b/mpg123_artsplugin/mpg123/layer3.c
@@ -612,7 +612,7 @@ static int pretab2[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 #define BITSHIFT ((sizeof(long)-1)*8)
 #define REFRESH_MASK \
   while(num < BITSHIFT) { \
-    mask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \
+    tqmask |= ((unsigned long)getbyte(&bsi))<<(BITSHIFT-num); \
     num += 8; \
     part2remain -= 8; }
 
@@ -626,10 +626,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
   int *me;
 
   int num=getbitoffset(&bsi);
-  long mask;
+  long tqmask;
   /* we must split this, because for num==0 the shift is undefined if you do it in one step */
-  mask  = ((unsigned long) getbits(&bsi,num))<<BITSHIFT;
-  mask <<= 8-num;
+  tqmask  = ((unsigned long) getbits(&bsi,num))<<BITSHIFT;
+  tqmask <<= 8-num;
   part2remain -= num;
 
   {
@@ -702,10 +702,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
           register short *val = h->table;
           REFRESH_MASK;
           while((y=*val++)<0) {
-            if (mask < 0)
+            if (tqmask < 0)
               val -= y;
             num--;
-            mask <<= 1;
+            tqmask <<= 1;
           }
           x = y >> 4;
           y &= 0xf;
@@ -713,23 +713,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
         if(x == 15 && h->linbits) {
           max[lwin] = cb;
           REFRESH_MASK;
-          x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+          x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits);
           num -= h->linbits+1;
-          mask <<= h->linbits;
-          if(mask < 0)
+          tqmask <<= h->linbits;
+          if(tqmask < 0)
             *xrpnt = REAL_MUL(-ispow[x], v);
           else
             *xrpnt = REAL_MUL(ispow[x], v);
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else if(x) {
           max[lwin] = cb;
-          if(mask < 0)
+          if(tqmask < 0)
             *xrpnt = REAL_MUL(-ispow[x], v);
           else
             *xrpnt = REAL_MUL(ispow[x], v);
           num--;
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else
           *xrpnt = DOUBLE_TO_REAL(0.0);
@@ -737,23 +737,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
         if(y == 15 && h->linbits) {
           max[lwin] = cb;
           REFRESH_MASK;
-          y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+          y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits);
           num -= h->linbits+1;
-          mask <<= h->linbits;
-          if(mask < 0)
+          tqmask <<= h->linbits;
+          if(tqmask < 0)
             *xrpnt = REAL_MUL(-ispow[y], v);
           else
             *xrpnt = REAL_MUL(ispow[y], v);
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else if(y) {
           max[lwin] = cb;
-          if(mask < 0)
+          if(tqmask < 0)
             *xrpnt = REAL_MUL(-ispow[y], v);
           else
             *xrpnt = REAL_MUL(ispow[y], v);
           num--;
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else
           *xrpnt = DOUBLE_TO_REAL(0.0);
@@ -767,10 +767,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
 
       REFRESH_MASK;
       while((a=*val++)<0) {
-        if (mask < 0)
+        if (tqmask < 0)
           val -= a;
         num--;
-        mask <<= 1;
+        tqmask <<= 1;
       }
       if(part2remain+num <= 0) {
 	num -= part2remain+num;
@@ -800,12 +800,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
           if(part2remain+num <= 0) {
             break;
           }
-          if(mask < 0) 
+          if(tqmask < 0) 
             *xrpnt = -v;
           else
             *xrpnt = v;
           num--;
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else
           *xrpnt = DOUBLE_TO_REAL(0.0);
@@ -879,10 +879,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
           register short *val = h->table;
           REFRESH_MASK;
           while((y=*val++)<0) {
-            if (mask < 0)
+            if (tqmask < 0)
               val -= y;
             num--;
-            mask <<= 1;
+            tqmask <<= 1;
           }
           x = y >> 4;
           y &= 0xf;
@@ -891,23 +891,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
         if (x == 15 && h->linbits) {
           max = cb;
 	  REFRESH_MASK;
-          x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+          x += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits);
           num -= h->linbits+1;
-          mask <<= h->linbits;
-          if(mask < 0)
+          tqmask <<= h->linbits;
+          if(tqmask < 0)
             *xrpnt++ = REAL_MUL(-ispow[x], v);
           else
             *xrpnt++ = REAL_MUL(ispow[x], v);
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else if(x) {
           max = cb;
-          if(mask < 0)
+          if(tqmask < 0)
             *xrpnt++ = REAL_MUL(-ispow[x], v);
           else
             *xrpnt++ = REAL_MUL(ispow[x], v);
           num--;
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else
           *xrpnt++ = DOUBLE_TO_REAL(0.0);
@@ -915,23 +915,23 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
         if (y == 15 && h->linbits) {
           max = cb;
 	  REFRESH_MASK;
-          y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
+          y += ((unsigned long) tqmask) >> (BITSHIFT+8-h->linbits);
           num -= h->linbits+1;
-          mask <<= h->linbits;
-          if(mask < 0)
+          tqmask <<= h->linbits;
+          if(tqmask < 0)
             *xrpnt++ = REAL_MUL(-ispow[y], v);
           else
             *xrpnt++ = REAL_MUL(ispow[y], v);
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else if(y) {
           max = cb;
-          if(mask < 0)
+          if(tqmask < 0)
             *xrpnt++ = REAL_MUL(-ispow[y], v);
           else
             *xrpnt++ = REAL_MUL(ispow[y], v);
           num--;
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else
           *xrpnt++ = DOUBLE_TO_REAL(0.0);
@@ -947,10 +947,10 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
 
       REFRESH_MASK;
       while((a=*val++)<0) {
-        if (mask < 0)
+        if (tqmask < 0)
           val -= a;
         num--;
-        mask <<= 1;
+        tqmask <<= 1;
       }
       if(part2remain+num <= 0) {
 	num -= part2remain+num;
@@ -978,12 +978,12 @@ static int III_dequantize_sample(real xr[SBLIMIT][SSLIMIT],int *scf,
           if(part2remain+num <= 0) {
             break;
           }
-          if(mask < 0)
+          if(tqmask < 0)
             *xrpnt++ = -v;
           else
             *xrpnt++ = v;
           num--;
-          mask <<= 1;
+          tqmask <<= 1;
         }
         else
           *xrpnt++ = DOUBLE_TO_REAL(0.0);
diff --git a/mpg123_artsplugin/mpg123/xfermem.h b/mpg123_artsplugin/mpg123/xfermem.h
index ae7e5afd..8d94c863 100644
--- a/mpg123_artsplugin/mpg123/xfermem.h
+++ b/mpg123_artsplugin/mpg123/xfermem.h
@@ -6,7 +6,7 @@
  *
  *   This is a stand-alone module which implements a unidirectional,
  *   fast pipe using mmap().  Its primary use is to transfer large
- *   amounts of data from a parent process to its child process,
+ *   amounts of data from a tqparent process to its child process,
  *   with a buffer in between which decouples blocking conditions
  *   on both sides.  Control information is transferred between the
  *   processes through a socketpair.  See xftest.c for an example on