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

1 files changed, 3 insertions, 3 deletions

diff --git a/mpeglib/lib/mpegplay/mpegExtension.cpp b/mpeglib/lib/mpegplay/mpegExtension.cpp
index 657fe683..3fc89215 100644
--- a/mpeglib/lib/mpegplay/mpegExtension.cpp
+++ b/mpeglib/lib/mpegplay/mpegExtension.cpp
@@ -89,7 +89,7 @@ int MpegExtension::processExtra_bit_info(MpegVideoStream* mpegVideoStream) {
 
 
 
-int MpegExtension::next_bits(int num,unsigned int mask,
+int MpegExtension::next_bits(int num,unsigned int tqmask,
 			     MpegVideoStream* input) {
   unsigned int data;
 
@@ -97,11 +97,11 @@ int MpegExtension::next_bits(int num,unsigned int mask,
 
   data=input->showBits(num);
 
-  /* Compare bit stream and mask. Set return value toTRUE if equal, FALSE if
+  /* Compare bit stream and tqmask. Set return value toTRUE if equal, FALSE if
      differs. 
   */
 
-  if (mask == data) {
+  if (tqmask == data) {
     return true;
   } 
   return false;