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

19 files changed, 34 insertions, 34 deletions

diff --git a/mpeglib/example/cddaplay/Makefile.am b/mpeglib/example/cddaplay/Makefile.am
index 49f42a2a..a7a5286c 100644
--- a/mpeglib/example/cddaplay/Makefile.am
+++ b/mpeglib/example/cddaplay/Makefile.am
@@ -10,7 +10,7 @@ cddaplay_SOURCES	=	cddaplay.cpp
 
 noinst_HEADERS		=	
 
-cddaplay_LDFLAGS	=	$(all_libraries) 
+cddaplay_LDFLAGS	=	$(all_libraries) $(LIB_QT)
 
 
 cddaplay_LDADD		=	../../lib/libmpeg.la \
diff --git a/mpeglib/example/mpgplay/Makefile.am b/mpeglib/example/mpgplay/Makefile.am
index c76bd4d1..303823d3 100644
--- a/mpeglib/example/mpgplay/Makefile.am
+++ b/mpeglib/example/mpgplay/Makefile.am
@@ -10,7 +10,7 @@ mpgplay_SOURCES		=	mpgplay.cpp
 
 noinst_HEADERS		=	
 
-mpgplay_LDFLAGS         =       $(all_libraries) 
+mpgplay_LDFLAGS         =       $(all_libraries) $(LIB_QT)
 
 mpgplay_LDADD		=	../../lib/libmpeg.la \
 				$(THIS_LIB_LIBS)
diff --git a/mpeglib/example/splay/Makefile.am b/mpeglib/example/splay/Makefile.am
index 76e04cff..9da0145c 100644
--- a/mpeglib/example/splay/Makefile.am
+++ b/mpeglib/example/splay/Makefile.am
@@ -12,12 +12,12 @@ mp3framing_SOURCES      =       mp3framing.cpp
 
 noinst_HEADERS		=	
 
-splay_LDFLAGS		=	$(all_libraries) 
+splay_LDFLAGS		=	$(all_libraries) $(LIB_QT)
 
 splay_LDADD		=	../../lib/libmpeg.la \
 				$(THIS_LIB_LIBS)
 
-mp3framing_LDFLAGS      =       $(all_libraries)
+mp3framing_LDFLAGS      =       $(all_libraries) $(LIB_QT)
 mp3framing_LDADD        =       ../../lib/libmpeg.la \
 				$(THIS_LIB_LIBS)
 
diff --git a/mpeglib/example/splay/mp3framing.cpp b/mpeglib/example/splay/mp3framing.cpp
index 586899a3..ad17657c 100644
--- a/mpeglib/example/splay/mp3framing.cpp
+++ b/mpeglib/example/splay/mp3framing.cpp
@@ -30,8 +30,8 @@ using namespace std;
 #include <unistd.h>
 
 #define INPUT_SIZE  8192
-#define _QUEUE_FLOAT 1
-#define _QUEUE_INT   2
+#define _TQUEUE_FLOAT 1
+#define _TQUEUE_INT   2
 
 
 void usage() {
@@ -52,7 +52,7 @@ void initDSP(DSPWrapper* dsp) {
 
 
 int main(int argc, char** argv) {
-  int queueType=_QUEUE_INT;
+  int queueType=_TQUEUE_INT;
   int samples=8192;
 
   PCMFrame* outFrame;
@@ -67,7 +67,7 @@ int main(int argc, char** argv) {
       break;
     }
     case 'f': {    
-      queueType=_QUEUE_FLOAT;
+      queueType=_TQUEUE_FLOAT;
       break;
     }
     case 'c': {    
@@ -101,10 +101,10 @@ int main(int argc, char** argv) {
   // so we need a _FRAME_AUDIO_PCM type and we need
   // for splay at least MP3FRAMESIZE
   AudioFrameQueue* frameQueue;
-  if (queueType == _QUEUE_INT) {
+  if (queueType == _TQUEUE_INT) {
     frameQueue=new AudioFrameQueue(500,MP3FRAMESIZE,_FRAME_AUDIO_PCM);
   }
-  if (queueType == _QUEUE_FLOAT) {
+  if (queueType == _TQUEUE_FLOAT) {
     frameQueue=new AudioFrameQueue(100,MP3FRAMESIZE,_FRAME_AUDIO_FLOAT);
   }
    
@@ -188,12 +188,12 @@ int main(int argc, char** argv) {
   //
   // we need to setup the dsp manually, when we do not play pcmFrames directly
   //
-  if (queueType == _QUEUE_INT) {
+  if (queueType == _TQUEUE_INT) {
     AudioFrame* audioFrame=frameQueue->getCurrent();
     dsp->audioSetup(audioFrame);
   }
   
-  if (queueType == _QUEUE_FLOAT) {
+  if (queueType == _TQUEUE_FLOAT) {
     AudioFrame* audioFrame=frameQueue->getCurrent();
     dsp->audioSetup(audioFrame->getStereo(),16,
 		    audioFrame->getSigned(),
@@ -220,7 +220,7 @@ int main(int argc, char** argv) {
 
     
 
-    if (queueType == _QUEUE_INT) {
+    if (queueType == _TQUEUE_INT) {
       cout << "reading :"<<samples<<" data"<<endl;
       hasRead=frameQueue->copy(outFrame->getData(),samples);
       dsp->audioPlay((char*)outFrame->getData(),hasRead*sizeof(short int));
@@ -228,7 +228,7 @@ int main(int argc, char** argv) {
     }
 
 
-    if (queueType == _QUEUE_FLOAT) {
+    if (queueType == _TQUEUE_FLOAT) {
       int n;
 
       hasRead=frameQueue->copy(left,right,samples);
diff --git a/mpeglib/example/tplay/Makefile.am b/mpeglib/example/tplay/Makefile.am
index c79a2805..2f298a80 100644
--- a/mpeglib/example/tplay/Makefile.am
+++ b/mpeglib/example/tplay/Makefile.am
@@ -10,7 +10,7 @@ tplay_SOURCES		=	tplay.cpp
 
 noinst_HEADERS		=	
 
-tplay_LDFLAGS		=	$(all_libraries) 
+tplay_LDFLAGS		=	$(all_libraries) $(LIB_QT)
 
 
 tplay_LDADD		=	../../lib/libmpeg.la \
diff --git a/mpeglib/example/yaf/yafcdda/Makefile.am b/mpeglib/example/yaf/yafcdda/Makefile.am
index 2930f348..287fc8ea 100644
--- a/mpeglib/example/yaf/yafcdda/Makefile.am
+++ b/mpeglib/example/yaf/yafcdda/Makefile.am
@@ -10,7 +10,7 @@ yaf_cdda_SOURCES	=	cdda_control.cpp
 
 noinst_HEADERS		=	
 
-yaf_cdda_LDFLAGS	=	$(all_libraries) $(KDE_RPATH)
+yaf_cdda_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) $(LIB_QT)
 
 
 yaf_cdda_LDADD		=	../yafxplayer/libyafxplayer.la \
diff --git a/mpeglib/example/yaf/yafcore/buffer.cpp b/mpeglib/example/yaf/yafcore/buffer.cpp
index 3c58f0ee..3f3d6158 100644
--- a/mpeglib/example/yaf/yafcore/buffer.cpp
+++ b/mpeglib/example/yaf/yafcore/buffer.cpp
@@ -122,7 +122,7 @@ void Buffer::grow(int size) {
 }
 
 
-int Buffer::find(char zeichen) {
+int Buffer::tqfind(char zeichen) {
   int i;
   int nlen=len();
   for(i=0;i<nlen;i++) {
diff --git a/mpeglib/example/yaf/yafcore/buffer.h b/mpeglib/example/yaf/yafcore/buffer.h
index 7c1a3d5c..165c607c 100644
--- a/mpeglib/example/yaf/yafcore/buffer.h
+++ b/mpeglib/example/yaf/yafcore/buffer.h
@@ -40,7 +40,7 @@ class KDE_EXPORT Buffer {
   
   void append(char* buffer,int buflen);
 
-  int find(char zeichen);
+  int tqfind(char zeichen);
   int len();
 
   void setData(char* msg);
diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.cpp b/mpeglib/example/yaf/yafcore/inputDecoder.cpp
index e24b7758..cc8aa0a5 100644
--- a/mpeglib/example/yaf/yafcore/inputDecoder.cpp
+++ b/mpeglib/example/yaf/yafcore/inputDecoder.cpp
@@ -173,13 +173,13 @@ void InputDecoder::doSomething(){
 
 
 
-int InputDecoder::getDecoderStatus() {
+int InputDecoder::getDecodertqStatus() {
   return status;
 }
 
 
 
-void InputDecoder::setDecoderStatus(int newState) {
+void InputDecoder::setDecodertqStatus(int newState) {
 
   // First start a new thread with start()!
   // Their is no recovery if the thread status is set to exit!
diff --git a/mpeglib/example/yaf/yafcore/inputDecoder.h b/mpeglib/example/yaf/yafcore/inputDecoder.h
index 0a5623a0..6382228d 100644
--- a/mpeglib/example/yaf/yafcore/inputDecoder.h
+++ b/mpeglib/example/yaf/yafcore/inputDecoder.h
@@ -49,8 +49,8 @@ class KDE_EXPORT InputDecoder {
   virtual const char* processCommand(int command,const char* args);
   virtual void doSomething();
 
-  virtual void setDecoderStatus(int status);
-  int getDecoderStatus();
+  virtual void setDecodertqStatus(int status);
+  int getDecodertqStatus();
 
   const char* getReturnCode();
 
diff --git a/mpeglib/example/yaf/yafcore/lineStack.cpp b/mpeglib/example/yaf/yafcore/lineStack.cpp
index 871665ed..c72a1104 100644
--- a/mpeglib/example/yaf/yafcore/lineStack.cpp
+++ b/mpeglib/example/yaf/yafcore/lineStack.cpp
@@ -30,7 +30,7 @@ LineStack::~LineStack() {
 
 int LineStack::hasLine() {
   int nPos;
-  nPos=stack->find('\n');
+  nPos=stack->tqfind('\n');
   if (nPos == -1) return false;
   return true;
 
@@ -45,7 +45,7 @@ void LineStack::nextLine(Buffer* nextLine) {
   char* data=stack->getData();
   int nSize=stack->getSize();
 
-  nPos=stack->find('\n');
+  nPos=stack->tqfind('\n');
   if (nPos == -1) {
     nextLine->clear();
     return;
diff --git a/mpeglib/example/yaf/yafcore/parser.cpp b/mpeglib/example/yaf/yafcore/parser.cpp
index 21b27c6b..f9e8fdaa 100644
--- a/mpeglib/example/yaf/yafcore/parser.cpp
+++ b/mpeglib/example/yaf/yafcore/parser.cpp
@@ -101,7 +101,7 @@ void Parser::parse(char* strStart,int* nCommand){
   
 
 int Parser::isOK(){
-  // a Commandline ist valid when it contains :
+  // a Commandline ist valid when it tqcontains :
 
   // * 2 * (identifer/value)
   // * first identifier ist "Command"
diff --git a/mpeglib/example/yaf/yafcore/yaf_control.cpp b/mpeglib/example/yaf/yafcore/yaf_control.cpp
index 6e789588..6192f36b 100644
--- a/mpeglib/example/yaf/yafcore/yaf_control.cpp
+++ b/mpeglib/example/yaf/yafcore/yaf_control.cpp
@@ -37,7 +37,7 @@ void yaf_control(InputInterface* input,
  
   while(1) {
 
-    status=decoder->getDecoderStatus();
+    status=decoder->getDecodertqStatus();
 
     if (status == _DECODER_STATUS_EXIT) {
       break;
diff --git a/mpeglib/example/yaf/yafmpgplay/Makefile.am b/mpeglib/example/yaf/yafmpgplay/Makefile.am
index c9fd9b55..811e3d9a 100644
--- a/mpeglib/example/yaf/yafmpgplay/Makefile.am
+++ b/mpeglib/example/yaf/yafmpgplay/Makefile.am
@@ -11,7 +11,7 @@ yaf_mpgplay_SOURCES	=	mpg_control.cpp
 noinst_HEADERS		=	
 
 
-yaf_mpgplay_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) 
+yaf_mpgplay_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) $(LIB_QT)
 
 
 yaf_mpgplay_LDADD	=	../yafcore/libyafcore.la \
diff --git a/mpeglib/example/yaf/yafsplay/Makefile.am b/mpeglib/example/yaf/yafsplay/Makefile.am
index 463ec7db..40c8196d 100644
--- a/mpeglib/example/yaf/yafsplay/Makefile.am
+++ b/mpeglib/example/yaf/yafsplay/Makefile.am
@@ -11,7 +11,7 @@ yaf_splay_SOURCES	=	splay_control.cpp
 
 noinst_HEADERS		=	
 
-yaf_splay_LDFLAGS	=	$(all_libraries) $(KDE_RPATH)
+yaf_splay_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) $(LIB_QT)
 
 
 yaf_splay_LDADD		=	../yafxplayer/libyafxplayer.la \
diff --git a/mpeglib/example/yaf/yaftplay/Makefile.am b/mpeglib/example/yaf/yaftplay/Makefile.am
index 2d82700d..96b596ba 100644
--- a/mpeglib/example/yaf/yaftplay/Makefile.am
+++ b/mpeglib/example/yaf/yaftplay/Makefile.am
@@ -9,7 +9,7 @@ yaf_tplay_SOURCES	=	tplay_control.cpp
 
 noinst_HEADERS		=	
 
-yaf_tplay_LDFLAGS	=	$(all_libraries) $(KDE_RPATH)
+yaf_tplay_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) $(LIB_QT)
 
 
 yaf_tplay_LDADD		=	../yafcore/libyafcore.la \
diff --git a/mpeglib/example/yaf/yafvorbis/Makefile.am b/mpeglib/example/yaf/yafvorbis/Makefile.am
index f0a01965..d07fdbdf 100644
--- a/mpeglib/example/yaf/yafvorbis/Makefile.am
+++ b/mpeglib/example/yaf/yafvorbis/Makefile.am
@@ -10,7 +10,7 @@ yaf_vorbis_SOURCES	=	vorbis_control.cpp
 
 noinst_HEADERS		=	
 
-yaf_vorbis_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) 
+yaf_vorbis_LDFLAGS	=	$(all_libraries) $(KDE_RPATH) $(LIB_QT)
 
 yaf_vorbis_LDADD	=	 \
 				../yafcore/libyafcore.la \
diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp
index 4b3bf3b3..00e9a213 100644
--- a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp
+++ b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp
@@ -29,7 +29,7 @@ InputDecoderXPlayer::InputDecoderXPlayer(YafOutputStream* yafOutput) :
   this->yafOutput=yafOutput;
   ct=new CommandTableXPlayer();
   
-  setDecoderStatus(_DECODER_STATUS_IDLE);
+  setDecodertqStatus(_DECODER_STATUS_IDLE);
   appendCommandTable(ct);
   majorMode=_PLAYER_MAJOR_MODE_OFF;
   setRuntimeInfo(false);
@@ -161,7 +161,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){
   }
  
   if (command == _PLAYER_PLAY) {
-    setDecoderStatus(_DECODER_STATUS_WORKING);
+    setDecodertqStatus(_DECODER_STATUS_WORKING);
     setMajorMode(_PLAYER_MAJOR_MODE_PLAYING);
     return"";
   }
@@ -186,7 +186,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){
       return "already output file selected";
     }    
     yafOutput->setStreamFile(args);
-    // now we have set the fifo. But we must say the parent
+    // now we have set the fifo. But we must say the tqparent
     // process that we start with waiting
 
     cout << "Command:0 Msg:fileopen before"<<endl;
diff --git a/mpeglib/example/yaf/yafyuv/Makefile.am b/mpeglib/example/yaf/yafyuv/Makefile.am
index 3400a34c..47767a3c 100644
--- a/mpeglib/example/yaf/yafyuv/Makefile.am
+++ b/mpeglib/example/yaf/yafyuv/Makefile.am
@@ -11,7 +11,7 @@ yaf_yuv_SOURCES		=	yuv_control.cpp
 
 noinst_HEADERS		=	
 
-yaf_yuv_LDFLAGS		=	$(all_libraries) $(KDE_RPATH)
+yaf_yuv_LDFLAGS		=	$(all_libraries) $(KDE_RPATH) $(LIB_QT)
 
 
 yaf_yuv_LDADD		=	../yafxplayer/libyafxplayer.la \