4 files changed, 38 insertions, 36 deletions

diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp b/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
index fd47c52..d4ab6a9 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
+++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
@@ -31,8 +31,8 @@ extern "C" {
 K_EXPORT_COMPONENT_FACTORY( libk3bffmpegdecoder, K3bPluginFactory<K3bFFMpegDecoderFactory>( "k3bffmpegdecoder" ) )
 
 
-K3bFFMpegDecoderFactory::K3bFFMpegDecoderFactory( QObject* parent, const char* name )
-  : K3bAudioDecoderFactory( parent, name )
+K3bFFMpegDecoderFactory::K3bFFMpegDecoderFactory( TQObject* tqparent, const char* name )
+  : K3bAudioDecoderFactory( tqparent, name )
 {
 }
 
@@ -42,10 +42,10 @@ K3bFFMpegDecoderFactory::~K3bFFMpegDecoderFactory()
 }
 
 
-K3bAudioDecoder* K3bFFMpegDecoderFactory::createDecoder( QObject* parent, 
+K3bAudioDecoder* K3bFFMpegDecoderFactory::createDecoder( TQObject* tqparent, 
 							 const char* name ) const
 {
-  return new K3bFFMpegDecoder( parent, name );
+  return new K3bFFMpegDecoder( tqparent, name );
 }
 
 
@@ -66,8 +66,8 @@ bool K3bFFMpegDecoderFactory::canDecode( const KURL& url )
 
 
 
-K3bFFMpegDecoder::K3bFFMpegDecoder( QObject* parent, const char* name )
-  : K3bAudioDecoder( parent, name ),
+K3bFFMpegDecoder::K3bFFMpegDecoder( TQObject* tqparent, const char* name )
+  : K3bAudioDecoder( tqparent, name ),
     m_file(0)
 {
 }
@@ -78,7 +78,7 @@ K3bFFMpegDecoder::~K3bFFMpegDecoder()
 }
 
 
-QString K3bFFMpegDecoder::fileType() const
+TQString K3bFFMpegDecoder::fileType() const
 {
   return m_type;
 }
diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h
index 1c21827..59d7ef0 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h
+++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h
@@ -24,9 +24,10 @@ class K3bFFMpegFile;
 class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  K3bFFMpegDecoderFactory( QObject* parent = 0, const char* name = 0 );
+  K3bFFMpegDecoderFactory( TQObject* tqparent = 0, const char* name = 0 );
   ~K3bFFMpegDecoderFactory();
 
   bool canDecode( const KURL& filename );
@@ -35,7 +36,7 @@ class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory
 
   bool multiFormatDecoder() const { return true; }
 
-  K3bAudioDecoder* createDecoder( QObject* parent = 0, 
+  K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, 
 				  const char* name = 0 ) const;
 };
 
@@ -43,12 +44,13 @@ class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory
 class K3bFFMpegDecoder : public K3bAudioDecoder
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  K3bFFMpegDecoder( QObject* parent = 0, const char* name = 0 );
+  K3bFFMpegDecoder( TQObject* tqparent = 0, const char* name = 0 );
   ~K3bFFMpegDecoder();
 
-  QString fileType() const;
+  TQString fileType() const;
 
   void cleanup();
 
@@ -61,7 +63,7 @@ class K3bFFMpegDecoder : public K3bAudioDecoder
 
  private:
   K3bFFMpegFile* m_file;
-  QString m_type;
+  TQString m_type;
 };
 
 #endif
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
index 514fd67..898c47d 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -48,12 +48,12 @@ public:
   char* outputBufferPos;
   int outputBufferSize;
   AVPacket packet;
-  Q_UINT8* packetData;
+  TQ_UINT8* packetData;
   int packetSize;
 };
 
 
-K3bFFMpegFile::K3bFFMpegFile( const QString& filename )
+K3bFFMpegFile::K3bFFMpegFile( const TQString& filename )
   : m_filename(filename)
 {
   d = new Private;
@@ -187,7 +187,7 @@ int K3bFFMpegFile::type() const
 }
 
 
-QString K3bFFMpegFile::typeComment() const
+TQString K3bFFMpegFile::typeComment() const
 {
   switch( type() ) {
   case CODEC_ID_WMAV1:
@@ -199,45 +199,45 @@ QString K3bFFMpegFile::typeComment() const
   case CODEC_ID_AAC:
     return i18n("Advanced Audio Coding (AAC)");
   default:
-    return QString::fromLocal8Bit( d->codec->name );
+    return TQString::fromLocal8Bit( d->codec->name );
   }
 }
 
 
-QString K3bFFMpegFile::title() const
+TQString K3bFFMpegFile::title() const
 {
   // FIXME: is this UTF8 or something??
   if( d->formatContext->title[0] != '\0' )
-    return QString::fromLocal8Bit( d->formatContext->title );
+    return TQString::fromLocal8Bit( d->formatContext->title );
   else
-    return QString::null;
+    return TQString();
 }
 
 
-QString K3bFFMpegFile::author() const
+TQString K3bFFMpegFile::author() const
 {
   // FIXME: is this UTF8 or something??
   if( d->formatContext->author[0] != '\0' )
-    return QString::fromLocal8Bit( d->formatContext->author );
+    return TQString::fromLocal8Bit( d->formatContext->author );
   else
-    return QString::null;
+    return TQString();
 }
 
 
-QString K3bFFMpegFile::comment() const
+TQString K3bFFMpegFile::comment() const
 {
   // FIXME: is this UTF8 or something??
   if( d->formatContext->comment[0] != '\0' )
-    return QString::fromLocal8Bit( d->formatContext->comment );
+    return TQString::fromLocal8Bit( d->formatContext->comment );
   else
-    return QString::null;
+    return TQString();
 }
 
 
 int K3bFFMpegFile::read( char* buf, int bufLen )
 {
   if( fillOutputBuffer() > 0 ) {
-    int len = QMIN(bufLen, d->outputBufferSize);
+    int len = TQMIN(bufLen, d->outputBufferSize);
     ::memcpy( buf, d->outputBufferPos, len );
 
     // TODO: only swap if needed
@@ -316,7 +316,7 @@ bool K3bFFMpegFile::seek( const K3b::Msf& msf )
   d->packetSize = 0;
 
   double seconds = (double)msf.totalFrames()/75.0;
-  Q_UINT64 timestamp = (Q_UINT64)(seconds * (double)AV_TIME_BASE);
+  TQ_UINT64 timestamp = (TQ_UINT64)(seconds * (double)AV_TIME_BASE);
 
   // FIXME: do we really need the start_time and why?
 #if LIBAVFORMAT_BUILD >= 4619
@@ -353,7 +353,7 @@ K3bFFMpegWrapper* K3bFFMpegWrapper::instance()
 }
 
 
-K3bFFMpegFile* K3bFFMpegWrapper::open( const QString& filename ) const
+K3bFFMpegFile* K3bFFMpegWrapper::open( const TQString& filename ) const
 {
   K3bFFMpegFile* file = new K3bFFMpegFile( filename );
   if( file->open() ) {
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h
index 63b5f58..60d6dd3 100644
--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.h
+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.h
@@ -30,7 +30,7 @@ class K3bFFMpegFile
  public:
   ~K3bFFMpegFile();
 
-  const QString& filename() const { return m_filename; }
+  const TQString& filename() const { return m_filename; }
 
   bool open();
   void close();
@@ -43,21 +43,21 @@ class K3bFFMpegFile
    * ffmpeg internal enumeration
    */
   int type() const;
-  QString typeComment() const;
+  TQString typeComment() const;
 
-  QString title() const;
-  QString author() const;
-  QString comment() const;
+  TQString title() const;
+  TQString author() const;
+  TQString comment() const;
 
   int read( char* buf, int bufLen );
   bool seek( const K3b::Msf& );
 
  private:
-  K3bFFMpegFile( const QString& filename );
+  K3bFFMpegFile( const TQString& filename );
   int readPacket();
   int fillOutputBuffer();
 
-  QString m_filename;
+  TQString m_filename;
 
   class Private;
   Private* d;
@@ -72,7 +72,7 @@ class K3bFFMpegWrapper
   /**
    * returns 0 on failure.
    */
-  K3bFFMpegFile* open( const QString& filename ) const;
+  K3bFFMpegFile* open( const TQString& filename ) const;
 
   static K3bFFMpegWrapper* instance();