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

10 files changed, 45 insertions, 45 deletions

diff --git a/mpeglib/lib/util/abstract/threadQueue.cpp b/mpeglib/lib/util/abstract/threadQueue.cpp
index 1b130ba9..fd8a4a39 100644
--- a/mpeglib/lib/util/abstract/threadQueue.cpp
+++ b/mpeglib/lib/util/abstract/threadQueue.cpp
@@ -12,7 +12,7 @@
 
 #include "threadQueue.h"
 
-#define _MAX_THREAD_IN_QUEUE 5
+#define _MAX_THREAD_IN_TQUEUE 5
 
 #include <iostream>
 
@@ -37,9 +37,9 @@ WaitThreadEntry::~WaitThreadEntry() {
 
 
 ThreadQueue::ThreadQueue() {
-  waitThreadEntries=new WaitThreadEntry* [_MAX_THREAD_IN_QUEUE];
+  waitThreadEntries=new WaitThreadEntry* [_MAX_THREAD_IN_TQUEUE];
   int i;
-  for(i=0;i<_MAX_THREAD_IN_QUEUE;i++) {
+  for(i=0;i<_MAX_THREAD_IN_TQUEUE;i++) {
     waitThreadEntries[i]=new WaitThreadEntry();
   }
   abs_thread_mutex_init(&queueMut);
@@ -56,7 +56,7 @@ ThreadQueue::~ThreadQueue() {
     exit(0);
   }
   int i;
-  for(i=0;i<_MAX_THREAD_IN_QUEUE;i++) {
+  for(i=0;i<_MAX_THREAD_IN_TQUEUE;i++) {
     delete waitThreadEntries[i];
   }
   delete [] waitThreadEntries;
@@ -73,14 +73,14 @@ void ThreadQueue::waitForExclusiveAccess() {
   }
   // wait
   size++;
-  if (size == _MAX_THREAD_IN_QUEUE) {
-    cout << "Aieee! ThreadQueue can only buffer:"<<_MAX_THREAD_IN_QUEUE<<endl;
+  if (size == _MAX_THREAD_IN_TQUEUE) {
+    cout << "Aieee! ThreadQueue can only buffer:"<<_MAX_THREAD_IN_TQUEUE<<endl;
     exit(0);
   }
   abs_thread_cond_t* waitCond=&(waitThreadEntries[insertPos]->waitCond);
   insertPos++;
   // wrap counter
-  if (insertPos == _MAX_THREAD_IN_QUEUE) {
+  if (insertPos == _MAX_THREAD_IN_TQUEUE) {
     insertPos=0;
   }
   abs_thread_cond_wait(waitCond,&queueMut);
@@ -98,7 +98,7 @@ void ThreadQueue::releaseExclusiveAccess() {
   abs_thread_cond_t* waitCond=&(waitThreadEntries[removePos]->waitCond);
   removePos++;
   // wrap counter
-  if (removePos == _MAX_THREAD_IN_QUEUE) {
+  if (removePos == _MAX_THREAD_IN_TQUEUE) {
     removePos=0;
   }
   size--;
diff --git a/mpeglib/lib/util/abstract/threadQueue.h b/mpeglib/lib/util/abstract/threadQueue.h
index 4c650e21..765713b6 100644
--- a/mpeglib/lib/util/abstract/threadQueue.h
+++ b/mpeglib/lib/util/abstract/threadQueue.h
@@ -11,8 +11,8 @@
  */
 
 
-#ifndef __THREADQUEUE_H
-#define __THREADQUEUE_H
+#ifndef __THREADTQUEUE_H
+#define __THREADTQUEUE_H
 
 
 #include "abs_thread.h"
diff --git a/mpeglib/lib/util/dynBuffer.cpp b/mpeglib/lib/util/dynBuffer.cpp
index c93d5381..c1eb2a9d 100644
--- a/mpeglib/lib/util/dynBuffer.cpp
+++ b/mpeglib/lib/util/dynBuffer.cpp
@@ -132,7 +132,7 @@ void DynBuffer::grow(int size) {
 }
 
 
-int DynBuffer::find(char zeichen) {
+int DynBuffer::tqfind(char zeichen) {
   int i;
   int nlen=len();
   for(i=0;i<nlen;i++) {
diff --git a/mpeglib/lib/util/dynBuffer.h b/mpeglib/lib/util/dynBuffer.h
index 7ba99d42..6d8b186b 100644
--- a/mpeglib/lib/util/dynBuffer.h
+++ b/mpeglib/lib/util/dynBuffer.h
@@ -39,7 +39,7 @@ class DynBuffer {
   
   void append(char* buffer,int buflen);
 
-  int find(char zeichen);
+  int tqfind(char zeichen);
   int len();
 
   void setData(char* msg);
diff --git a/mpeglib/lib/util/mmx/mmx_asm.h b/mpeglib/lib/util/mmx/mmx_asm.h
index 8717eff5..d1c2a0bd 100644
--- a/mpeglib/lib/util/mmx/mmx_asm.h
+++ b/mpeglib/lib/util/mmx/mmx_asm.h
@@ -208,7 +208,7 @@ typedef	union {
 			      : "X" (mem))
 
 
-#define	maskmovq(regs,maskreg)		mmx_r2ri (maskmovq, regs, maskreg)
+#define	tqmaskmovq(regs,tqmaskreg)		mmx_r2ri (tqmaskmovq, regs, tqmaskreg)
 
 #define	movntq_r2m(mmreg,var)		mmx_r2m (movntq, mmreg, var)
 
diff --git a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
index 171f4e97..86b0b135 100644
--- a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
+++ b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
@@ -21,7 +21,7 @@
  * Erik Corry's multi-byte dither routines.
  *
  * The basic idea is that the Init generates all the necessary tables.
- * The tables incorporate the information about the layout of pixels
+ * The tables incorporate the information about the tqlayout of pixels
  * in the XImage, so that it should be able to cope with 15-bit, 16-bit
  * 24-bit (non-packed) and 32-bit (10-11 bits per color!) screens.
  * At present it cannot cope with 24-bit packed mode, since this involves
@@ -131,9 +131,9 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask,
 				      unsigned int greenMask,
 				      unsigned int blueMask) {
   
-  unsigned PIXVAL red_mask = redMask;
-  unsigned PIXVAL green_mask =greenMask;
-  unsigned PIXVAL blue_mask = blueMask;
+  unsigned PIXVAL red_tqmask = redMask;
+  unsigned PIXVAL green_tqmask =greenMask;
+  unsigned PIXVAL blue_tqmask = blueMask;
 
   int CR, CB, i;
     
@@ -197,12 +197,12 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask,
      * Set up entries 0-255 in rgb-to-pixel value tables.
      */
     for (i = 0; i < 256; i++) {
-      r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_mask));
-      r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_mask);
-      g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_mask));
-      g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_mask);
-      b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_mask));
-      b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_mask);
+      r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_tqmask));
+      r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_tqmask);
+      g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_tqmask));
+      g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_tqmask);
+      b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_tqmask));
+      b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_tqmask);
       /*
        * If we have 16-bit output depth, then we double the value
        * in the top word. This means that we can write out both
diff --git a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp
index 757f0676..1de9cc17 100644
--- a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp
+++ b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp
@@ -26,8 +26,8 @@ static unsigned short MMX16_Vredcoeff[]   = {0x66, 0x66, 0x66, 0x66};
 static unsigned short MMX16_Ugrncoeff[]   = {0xffe8, 0xffe8, 0xffe8, 0xffe8};
 static unsigned short MMX16_Vgrncoeff[]   = {0xffcd, 0xffcd, 0xffcd, 0xffcd};
 static unsigned short MMX16_Ycoeff[]      = {0x4a, 0x4a, 0x4a, 0x4a};   
-static unsigned short MMX16_redmask[]     = {0xf800, 0xf800, 0xf800, 0xf800}; 
-static unsigned short MMX16_grnmask[]     = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; 
+static unsigned short MMX16_redtqmask[]     = {0xf800, 0xf800, 0xf800, 0xf800}; 
+static unsigned short MMX16_grntqmask[]     = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; 
 
 void dummy_dithermmx16() {
   cout << "MMX16_0"<<MMX16_0<<endl;
@@ -38,8 +38,8 @@ void dummy_dithermmx16() {
   cout << "MMX16_Ugrncoeff:"<<MMX16_Ugrncoeff<<endl;
   cout << "MMX16_Vgrncoeff:"<<MMX16_Vgrncoeff<<endl;
   cout << "MMX16_Ycoeff:"<<MMX16_Ycoeff<<endl;
-  cout << "MMX16_redmask:"<<MMX16_redmask<<endl;
-  cout << "MMX16_grnmask:"<<MMX16_grnmask<<endl;
+  cout << "MMX16_redtqmask:"<<MMX16_redtqmask<<endl;
+  cout << "MMX16_grntqmask:"<<MMX16_grntqmask<<endl;
   cout << "MMX16_00FFw:"<<MMX16_00FFw<<endl;
 }
 
@@ -114,11 +114,11 @@ void  ditherBlock(unsigned char *lum,
          "punpcklbw      %%mm4,                  %%mm4\n"
          "punpcklbw      %%mm5,                  %%mm5\n"
 
-         "pand           MMX16_redmask,            %%mm4\n"
+         "pand           MMX16_redtqmask,            %%mm4\n"
          "psllw          $3,                     %%mm5\n"  // GREEN       1
          "punpcklbw      %%mm6,                  %%mm6\n"
-         "pand           MMX16_grnmask,            %%mm5\n"
-         "pand           MMX16_redmask,            %%mm6\n"
+         "pand           MMX16_grntqmask,            %%mm5\n"
+         "pand           MMX16_redtqmask,            %%mm6\n"
          "por            %%mm5,                  %%mm4\n" //
          "psrlw          $11,                    %%mm6\n"                // BLUE        1
          "movq           %%mm3,                  %%mm5\n" // lum2
@@ -145,10 +145,10 @@ void  ditherBlock(unsigned char *lum,
          "pmullw         MMX16_Ycoeff,             %%mm6\n"  // lum3
          "punpcklbw      %%mm7,                  %%mm7\n"
          "psllw          $3,                             %%mm5\n"  // GREEN 2
-         "pand                   MMX16_redmask,    %%mm7\n"
-         "pand                   MMX16_redmask,    %%mm3\n"
+         "pand                   MMX16_redtqmask,    %%mm7\n"
+         "pand                   MMX16_redtqmask,    %%mm3\n"
          "psrlw          $11,                            %%mm7\n"  // BLUE  2
-         "pand                   MMX16_grnmask,    %%mm5\n"
+         "pand                   MMX16_grntqmask,    %%mm5\n"
          "por                    %%mm7,                  %%mm3\n"
 	 
          "movq                   (%2),        %%mm7\n"  // L4 load lum2
@@ -186,11 +186,11 @@ void  ditherBlock(unsigned char *lum,
          "punpcklbw      %%mm5,                  %%mm5\n"
          "punpcklbw      %%mm6,                  %%mm6\n"
          "psllw          $3,                             %%mm5\n" // GREEN 3
-         "pand                   MMX16_redmask,    %%mm4\n"
+         "pand                   MMX16_redtqmask,    %%mm4\n"
          "psraw          $6,                             %%mm3\n" // psr 6
          "psraw          $6,                             %%mm0\n"
-         "pand                   MMX16_redmask,    %%mm6\n" // BLUE
-         "pand                   MMX16_grnmask,    %%mm5\n"
+         "pand                   MMX16_redtqmask,    %%mm6\n" // BLUE
+         "pand                   MMX16_grntqmask,    %%mm5\n"
          "psrlw          $11,                            %%mm6\n"  // BLUE  3
          "por                    %%mm5,                  %%mm4\n"
          "psraw          $6,                             %%mm7\n"
@@ -201,11 +201,11 @@ void  ditherBlock(unsigned char *lum,
          "punpcklbw      %%mm3,                  %%mm3\n"
          "punpcklbw      %%mm0,                  %%mm0\n"
          "punpcklbw      %%mm7,                  %%mm7\n"
-         "pand                   MMX16_redmask,    %%mm3\n"
-         "pand                   MMX16_redmask,    %%mm7\n" // BLUE
+         "pand                   MMX16_redtqmask,    %%mm3\n"
+         "pand                   MMX16_redtqmask,    %%mm7\n" // BLUE
          "psllw          $3,                             %%mm0\n" // GREEN 4
          "psrlw          $11,                            %%mm7\n"
-         "pand                   MMX16_grnmask,    %%mm0\n"
+         "pand                   MMX16_grntqmask,    %%mm0\n"
          "por                    %%mm7,                  %%mm3\n"
          "por                    %%mm0,                  %%mm3\n"
 
diff --git a/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h b/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h
index 5c7ae574..6feeee6b 100644
--- a/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h
+++ b/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h
@@ -20,8 +20,8 @@
 
 /* gcc 3.3.1 and later optimise the "not used" (only in asm code)
    symbols away. So we need to mark them as used. */
-#if defined(__GNUC_PREREQ__) && !defined(__GNUC_PREREQ)
-#define __GNUC_PREREQ __GNUC_PREREQ__
+#if defined(__GNUC_PRERETQ__) && !defined(__GNUC_PREREQ)
+#define __GNUC_PREREQ __GNUC_PRERETQ__
 #endif
 #ifdef __GNUC_PREREQ
 #if __GNUC_PREREQ (3,1)
diff --git a/mpeglib/lib/util/render/x11/initDisplay.cpp b/mpeglib/lib/util/render/x11/initDisplay.cpp
index d0029eb6..2a62e721 100644
--- a/mpeglib/lib/util/render/x11/initDisplay.cpp
+++ b/mpeglib/lib/util/render/x11/initDisplay.cpp
@@ -128,7 +128,7 @@ void CreateFullColorWindow (XWindow* xwindow) {
   int depth; 
   Visual *visual;
   XSetWindowAttributes xswa;
-  unsigned long mask;
+  unsigned long tqmask;
   unsigned int c_class;
   int screen;
   Display *dpy=xwindow->display;
@@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) {
     cout << "visual is null"<<endl;
     return;
   }
-  mask = CWBackPixel | CWColormap | CWBorderPixel;
+  tqmask = CWBackPixel | CWColormap | CWBorderPixel;
   if (xwindow->colormap==0) {
     xswa.colormap = XCreateColormap(dpy,
 				    XRootWindow(dpy, screen),
@@ -166,7 +166,7 @@ void CreateFullColorWindow (XWindow* xwindow) {
   /*
   xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h,
 				  (unsigned int) 1, depth, c_class, 
-				  visual, mask, &xswa);
+				  visual, tqmask, &xswa);
   */
 }
 
diff --git a/mpeglib/lib/util/render/x11/x11Surface.cpp b/mpeglib/lib/util/render/x11/x11Surface.cpp
index d7b8f052..0aaf7743 100644
--- a/mpeglib/lib/util/render/x11/x11Surface.cpp
+++ b/mpeglib/lib/util/render/x11/x11Surface.cpp
@@ -183,7 +183,7 @@ int X11Surface::open(int width, int height,const char *title, bool border) {
   } else {
     // depth is <= 8
     // allocate memory for dithertables
-    // gets the rgb masks
+    // gets the rgb tqmasks
     initColorDisplay(xWindow);
     // create 8 bit dithertables 
     // create private colormap