TQt4 port k3b

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1233803 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

4 files changed, 25 insertions, 23 deletions

diff --git a/plugins/decoder/musepack/k3bmpcdecoder.cpp b/plugins/decoder/musepack/k3bmpcdecoder.cpp
index 0cdf644..6975bee 100644
--- a/plugins/decoder/musepack/k3bmpcdecoder.cpp
+++ b/plugins/decoder/musepack/k3bmpcdecoder.cpp
@@ -26,8 +26,8 @@
 K_EXPORT_COMPONENT_FACTORY( libk3bmpcdecoder, K3bPluginFactory<K3bMpcDecoderFactory>( "libk3bmpcdecoder" ) )
 
 
-K3bMpcDecoderFactory::K3bMpcDecoderFactory( QObject* parent, const char* name )
-  : K3bAudioDecoderFactory( parent, name )
+K3bMpcDecoderFactory::K3bMpcDecoderFactory( TQObject* tqparent, const char* name )
+  : K3bAudioDecoderFactory( tqparent, name )
 {
 }
 
@@ -37,10 +37,10 @@ K3bMpcDecoderFactory::~K3bMpcDecoderFactory()
 }
 
 
-K3bAudioDecoder* K3bMpcDecoderFactory::createDecoder( QObject* parent, 
+K3bAudioDecoder* K3bMpcDecoderFactory::createDecoder( TQObject* tqparent, 
 							 const char* name ) const
 {
-  return new K3bMpcDecoder( parent, name );
+  return new K3bMpcDecoder( tqparent, name );
 }
 
 
@@ -55,8 +55,8 @@ bool K3bMpcDecoderFactory::canDecode( const KURL& url )
 
 
 
-K3bMpcDecoder::K3bMpcDecoder( QObject* parent, const char* name )
-  : K3bAudioDecoder( parent, name )
+K3bMpcDecoder::K3bMpcDecoder( TQObject* tqparent, const char* name )
+  : K3bAudioDecoder( tqparent, name )
 {
   m_mpc = new K3bMpcWrapper();
 }
@@ -68,7 +68,7 @@ K3bMpcDecoder::~K3bMpcDecoder()
 }
 
 
-QString K3bMpcDecoder::fileType() const
+TQString K3bMpcDecoder::fileType() const
 {
   return i18n("Musepack");
 }
diff --git a/plugins/decoder/musepack/k3bmpcdecoder.h b/plugins/decoder/musepack/k3bmpcdecoder.h
index 74dc509..d0f6935 100644
--- a/plugins/decoder/musepack/k3bmpcdecoder.h
+++ b/plugins/decoder/musepack/k3bmpcdecoder.h
@@ -24,16 +24,17 @@ class K3bMpcWrapper;
 class K3bMpcDecoderFactory : public K3bAudioDecoderFactory
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  K3bMpcDecoderFactory( QObject* parent = 0, const char* name = 0 );
+  K3bMpcDecoderFactory( TQObject* tqparent = 0, const char* name = 0 );
   ~K3bMpcDecoderFactory();
 
   bool canDecode( const KURL& filename );
 
   int pluginSystemVersion() const { return 3; }
 
-  K3bAudioDecoder* createDecoder( QObject* parent = 0, 
+  K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, 
 				  const char* name = 0 ) const;
 };
 
@@ -41,12 +42,13 @@ class K3bMpcDecoderFactory : public K3bAudioDecoderFactory
 class K3bMpcDecoder : public K3bAudioDecoder
 {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  K3bMpcDecoder( QObject* parent = 0, const char* name = 0 );
+  K3bMpcDecoder( TQObject* tqparent = 0, const char* name = 0 );
   ~K3bMpcDecoder();
 
-  QString fileType() const;
+  TQString fileType() const;
 
  protected:
   bool analyseFileInternal( K3b::Msf& frames, int& samplerate, int& ch );
diff --git a/plugins/decoder/musepack/k3bmpcwrapper.cpp b/plugins/decoder/musepack/k3bmpcwrapper.cpp
index 9f54b28..75153b5 100644
--- a/plugins/decoder/musepack/k3bmpcwrapper.cpp
+++ b/plugins/decoder/musepack/k3bmpcwrapper.cpp
@@ -16,31 +16,31 @@
 #include "k3bmpcwrapper.h"
 
 #include <kdebug.h>
-#include <qfile.h>
+#include <tqfile.h>
 
 
 mpc_int32_t read_impl( void* data, void* ptr, mpc_int32_t size )
 {
-  QFile* input = static_cast<QFile*>( data );
+  TQFile* input = static_cast<TQFile*>( data );
   return input->readBlock( (char*)ptr, size );
 }
 
 
 mpc_bool_t seek_impl( void* data, mpc_int32_t offset )
 {
-  QFile* input = static_cast<QFile*>( data );
+  TQFile* input = static_cast<TQFile*>( data );
   return input->at( offset );
 }
 
 mpc_int32_t tell_impl( void* data )
 {
-  QFile* input = static_cast<QFile*>( data );
+  TQFile* input = static_cast<TQFile*>( data );
   return input->at();
 }
 
 mpc_int32_t get_size_impl( void* data )
 {
-  QFile* input = static_cast<QFile*>( data );
+  TQFile* input = static_cast<TQFile*>( data );
   return input->size();
 }
 
@@ -64,7 +64,7 @@ static int shift_signed( MPC_SAMPLE_FORMAT val, int shift )
 
 K3bMpcWrapper::K3bMpcWrapper()
 {
-  m_input = new QFile();
+  m_input = new TQFile();
 
   m_reader           = new mpc_reader;
   m_reader->read     = read_impl;
@@ -91,7 +91,7 @@ K3bMpcWrapper::~K3bMpcWrapper()
 }
 
 
-bool K3bMpcWrapper::open( const QString& filename )
+bool K3bMpcWrapper::open( const TQString& filename )
 {
   close();
 
diff --git a/plugins/decoder/musepack/k3bmpcwrapper.h b/plugins/decoder/musepack/k3bmpcwrapper.h
index 743e25f..e0f42de 100644
--- a/plugins/decoder/musepack/k3bmpcwrapper.h
+++ b/plugins/decoder/musepack/k3bmpcwrapper.h
@@ -20,13 +20,13 @@
 #include <config.h>
 #endif
 
-#include <qstring.h>
+#include <tqstring.h>
 
 #include <k3bmsf.h>
 
 #include MPC_HEADER_FILE
 
-class QFile;
+class TQFile;
 
 
 class K3bMpcWrapper
@@ -35,7 +35,7 @@ class K3bMpcWrapper
   K3bMpcWrapper();
   ~K3bMpcWrapper();
 
-  bool open( const QString& filename );
+  bool open( const TQString& filename );
   void close();
 
   int decode( char*, int max );
@@ -46,10 +46,10 @@ class K3bMpcWrapper
   int samplerate() const;
   unsigned int channels() const;
 
-  QFile* input() const { return m_input; }
+  TQFile* input() const { return m_input; }
 
  private:
-  QFile* m_input;
+  TQFile* m_input;
   mpc_reader* m_reader;
   mpc_decoder* m_decoder;
   mpc_streaminfo* m_info;