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

5 files changed, 9 insertions, 9 deletions

diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h
index d56f25aa..98780096 100644
--- a/mpeglib/lib/frame/IOFrameQueue.h
+++ b/mpeglib/lib/frame/IOFrameQueue.h
@@ -12,8 +12,8 @@
 
 
 
-#ifndef __IOFRAMEQUEUE_H
-#define __IOFRAMEQUEUE_H
+#ifndef __IOFRAMETQUEUE_H
+#define __IOFRAMETQUEUE_H
 
 #include "frameQueue.h"
 #include <kdemacros.h>
diff --git a/mpeglib/lib/frame/README b/mpeglib/lib/frame/README
index 9e21059f..e54bd918 100644
--- a/mpeglib/lib/frame/README
+++ b/mpeglib/lib/frame/README
@@ -27,7 +27,7 @@ IOFrameQueues
 =============
 
 IOFrameQueues deal with the problem, that you first start
-with an empty  FrameQueue (this is a FrameQueue which contains
+with an empty  FrameQueue (this is a FrameQueue which tqcontains
 prealloceated data, but the data is empty (eg:all pcm samples zero)
 Only after converting an "empty" Frame by a decoder (mp3decoder)
 the frame if "full" (== Frame with data)
@@ -58,7 +58,7 @@ A IOFrameQueue, which allows converting "dataFrames back to continous
 stream".
 What is this?
 Lets say an application wants only 20 byte from a dataFrame which
-contains 3KB of data?
+tqcontains 3KB of data?
 There must be some mechanism to read less or more data from the
 queue. And the data should be written to a continus memory
 segment.
diff --git a/mpeglib/lib/frame/audioFrameQueue.h b/mpeglib/lib/frame/audioFrameQueue.h
index 7e7a01c0..0582af76 100644
--- a/mpeglib/lib/frame/audioFrameQueue.h
+++ b/mpeglib/lib/frame/audioFrameQueue.h
@@ -12,8 +12,8 @@
 
 
 
-#ifndef __AUDIOFRAMEQUE_H
-#define __AUDIOFRAMEQUE_H
+#ifndef __AUDIOFRAMETQUE_H
+#define __AUDIOFRAMETQUE_H
 
 #include "IOFrameQueue.h"
 #include "floatFrame.h"
diff --git a/mpeglib/lib/frame/frameQueue.h b/mpeglib/lib/frame/frameQueue.h
index 27747aa3..6e42c678 100644
--- a/mpeglib/lib/frame/frameQueue.h
+++ b/mpeglib/lib/frame/frameQueue.h
@@ -13,8 +13,8 @@
 
 
 
-#ifndef __FRAMEQUEUE_H
-#define __FRAMEQUEUE_H
+#ifndef __FRAMETQUEUE_H
+#define __FRAMETQUEUE_H
 
 #include "frame.h"
 
diff --git a/mpeglib/lib/frame/framer.cpp b/mpeglib/lib/frame/framer.cpp
index d380b2ec..2882864d 100644
--- a/mpeglib/lib/frame/framer.cpp
+++ b/mpeglib/lib/frame/framer.cpp
@@ -223,7 +223,7 @@ int Framer::read_frame(RawDataBuffer* ,RawDataBuffer* ) {
 
 void Framer::unsync(RawDataBuffer* ,int ) {
   if (lConstruct == false) {
-    // invalidate header in buffer
+    // tqinvalidate header in buffer
     cout << "direct virtual call Framer::unsync"<<endl;
   }
 }