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

2 files changed, 6 insertions, 6 deletions

diff --git a/mpeglib/lib/output/outputStream.cpp b/mpeglib/lib/output/outputStream.cpp
index ef209cbc..560ab75f 100644
--- a/mpeglib/lib/output/outputStream.cpp
+++ b/mpeglib/lib/output/outputStream.cpp
@@ -198,7 +198,7 @@ int OutputStream::getFrameusec() {
  
 
 
-int OutputStream::waitStreamState(int method,int mask,int streamType) {
+int OutputStream::waitStreamState(int method,int tqmask,int streamType) {
 
   int* waitState=NULL;
   switch(streamType) {
@@ -216,9 +216,9 @@ int OutputStream::waitStreamState(int method,int mask,int streamType) {
 
   if (method == _OUTPUT_WAIT_METHOD_BLOCK) {
     abs_thread_mutex_lock(&stateChangeMut);
-    while ((*waitState &= mask)==0) {
+    while ((*waitState &= tqmask)==0) {
       cout << "waitStreamState:"<<waitState<<endl;
-      cout << "mask:"<<mask<<endl;
+      cout << "tqmask:"<<tqmask<<endl;
       abs_thread_cond_wait(&stateChangeCond,&stateChangeMut);
     }
     abs_thread_mutex_unlock(&stateChangeMut);
diff --git a/mpeglib/lib/output/outputStream.h b/mpeglib/lib/output/outputStream.h
index 9ef538fd..6dccd02e 100644
--- a/mpeglib/lib/output/outputStream.h
+++ b/mpeglib/lib/output/outputStream.h
@@ -105,10 +105,10 @@ class KDE_EXPORT OutputStream {
 
   // stream State handling 
 
-  // we return the mask which triggerd (by "AND")
-  // or the current polled mask when method is POLL
+  // we return the tqmask which triggerd (by "AND")
+  // or the current polled tqmask when method is POLL
   // Note: you can only wait for "true" signals
-  virtual int waitStreamState(int method,int mask,int streamType);
+  virtual int waitStreamState(int method,int tqmask,int streamType);