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

7 files changed, 42 insertions, 42 deletions

diff --git a/libk3b/videodvd/k3bvideodvd.cpp b/libk3b/videodvd/k3bvideodvd.cpp
index 8692c04..47de0d0 100644
--- a/libk3b/videodvd/k3bvideodvd.cpp
+++ b/libk3b/videodvd/k3bvideodvd.cpp
@@ -22,7 +22,7 @@
 
 #include <k3bdevice.h>
 
-#include <qfile.h>
+#include <tqfile.h>
 
 #include <klocale.h>
 
@@ -61,7 +61,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
   //
   // Initialize libdvdread
   //
-  dvd_reader_t* dvdReaderT = DVDOpen( QFile::encodeName(dev->blockDeviceName()) );
+  dvd_reader_t* dvdReaderT = DVDOpen( TQFile::encodeName(dev->blockDeviceName()) );
   if( !dvdReaderT ) {
     kdDebug() << "(K3bVideoDVD) Could not open device " << dev->blockDeviceName() << endl;
     return false;
@@ -77,7 +77,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
     DVDClose( dvdReaderT );
     return false;
   }
-  m_volumeIdentifier = QString::fromLatin1( v, 32 );
+  m_volumeIdentifier = TQString::tqfromLatin1( v, 32 );
 
   //
   // Open the VMG info
@@ -160,7 +160,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
 							  titleIfo->vtsi_mat->vts_audio_attr[j].lang_code>>8, 
 							  titleIfo->vtsi_mat->vts_audio_attr[j].lang_code & 0xff );
       else
-	m_titles[i].m_audioStreams[j].m_langCode = QString::null;
+	m_titles[i].m_audioStreams[j].m_langCode = TQString();
     }
 
     //
@@ -175,7 +175,7 @@ bool K3bVideoDVD::VideoDVD::open( K3bDevice::Device* dev )
 							       titleIfo->vtsi_mat->vts_subp_attr[j].lang_code>>8, 
 							       titleIfo->vtsi_mat->vts_subp_attr[j].lang_code & 0xff );
       else
-	m_titles[i].m_subPictureStreams[j].m_langCode = QString::null;
+	m_titles[i].m_subPictureStreams[j].m_langCode = TQString();
     }
 
     //
@@ -244,7 +244,7 @@ void K3bVideoDVD::VideoDVD::debug() const
 }
 
 
-QString K3bVideoDVD::audioFormatString( int format )
+TQString K3bVideoDVD::audioFormatString( int format )
 {
   switch( format ) {
   case AUDIO_FORMAT_AC3:
@@ -263,7 +263,7 @@ QString K3bVideoDVD::audioFormatString( int format )
 }
 
 
-QString K3bVideoDVD::audioCodeExtensionString( int ext )
+TQString K3bVideoDVD::audioCodeExtensionString( int ext )
 {
   switch( ext ) {
   case AUDIO_CODE_EXT_UNSPECIFIED:
@@ -282,7 +282,7 @@ QString K3bVideoDVD::audioCodeExtensionString( int ext )
 }
 
 
-QString K3bVideoDVD::subPictureCodeModeString( int mode )
+TQString K3bVideoDVD::subPictureCodeModeString( int mode )
 {
   switch( mode ) {
   case SUBPIC_CODE_MODE_RLE:
@@ -295,7 +295,7 @@ QString K3bVideoDVD::subPictureCodeModeString( int mode )
 }
 
 
-QString K3bVideoDVD::subPictureCodeExtensionString( int ext )
+TQString K3bVideoDVD::subPictureCodeExtensionString( int ext )
 {
   switch( ext ) {
   case SUBPIC_CODE_EXT_UNSPECIFIED:
@@ -305,13 +305,13 @@ QString K3bVideoDVD::subPictureCodeExtensionString( int ext )
   case SUBPIC_CODE_EXT_CAPTION_BIGGER_SIZE:
     return i18n("Caption with bigger size character");
   case SUBPIC_CODE_EXT_CAPTION_FOR_CHILDREN:
-    return i18n("Caption for children");
+    return i18n("Caption for tqchildren");
   case SUBPIC_CODE_EXT_CLOSED_CAPTION_NORMAL_SIZE:
     return i18n("Closed caption with normal size character");
   case SUBPIC_CODE_EXT_CLOSED_CAPTION_BIGGER_SIZE:
     return i18n("Closed caption with bigger size character");
   case SUBPIC_CODE_EXT_CLOSED_CAPTION_FOR_CHILDREN:
-    return i18n("Closed caption for children");
+    return i18n("Closed caption for tqchildren");
   case SUBPIC_CODE_EXT_FORCED_CAPTION:
     return i18n("Forced caption");
   case SUBPIC_CODE_EXT_DIR_COMMENTS_NORMAL_SIZE:
@@ -319,7 +319,7 @@ QString K3bVideoDVD::subPictureCodeExtensionString( int ext )
   case SUBPIC_CODE_EXT_DIR_COMMENTS_BIGGER_SIZE:
     return i18n("Director's comments with bigger size characters");
   case SUBPIC_CODE_EXT_DIR_COMMENTS_FOR_CHILDREN:
-    return i18n("Director's comments for children");
+    return i18n("Director's comments for tqchildren");
   default:
     return i18n("unknown code extension");
   }
diff --git a/libk3b/videodvd/k3bvideodvd.h b/libk3b/videodvd/k3bvideodvd.h
index 180a6f5..a3ee19d 100644
--- a/libk3b/videodvd/k3bvideodvd.h
+++ b/libk3b/videodvd/k3bvideodvd.h
@@ -20,8 +20,8 @@
 
 #include <k3b_export.h>
 
-#include <qstring.h>
-#include <qvaluevector.h>
+#include <tqstring.h>
+#include <tqvaluevector.h>
 
 
 namespace K3bDevice {
@@ -65,7 +65,7 @@ namespace K3bVideoDVD
       bool open( K3bDevice::Device* dev );
       
       K3bDevice::Device* device() const { return m_device; }
-      const QString& volumeIdentifier() const { return m_volumeIdentifier; }
+      const TQString& volumeIdentifier() const { return m_volumeIdentifier; }
       unsigned int numTitles() const { return m_titles.count(); }
       
       /**
@@ -78,14 +78,14 @@ namespace K3bVideoDVD
       
     private:
       K3bDevice::Device* m_device;
-      QValueVector<Title> m_titles;
-      QString m_volumeIdentifier;
+      TQValueVector<Title> m_titles;
+      TQString m_volumeIdentifier;
     };
 
-  LIBK3B_EXPORT QString audioFormatString( int format );
-  LIBK3B_EXPORT QString audioCodeExtensionString( int ext );
-  LIBK3B_EXPORT QString subPictureCodeModeString( int mode );
-  LIBK3B_EXPORT QString subPictureCodeExtensionString( int ext );
+  LIBK3B_EXPORT TQString audioFormatString( int format );
+  LIBK3B_EXPORT TQString audioCodeExtensionString( int ext );
+  LIBK3B_EXPORT TQString subPictureCodeModeString( int mode );
+  LIBK3B_EXPORT TQString subPictureCodeExtensionString( int ext );
 }
 
 #endif
diff --git a/libk3b/videodvd/k3bvideodvdaudiostream.h b/libk3b/videodvd/k3bvideodvdaudiostream.h
index 78068f0..b5719f9 100644
--- a/libk3b/videodvd/k3bvideodvdaudiostream.h
+++ b/libk3b/videodvd/k3bvideodvdaudiostream.h
@@ -18,7 +18,7 @@
 
 #include <k3b_export.h>
 
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace K3bVideoDVD
@@ -37,14 +37,14 @@ namespace K3bVideoDVD
   };
 
   enum AudioQuantization {
-    AUDIO_QUANTIZATION_16BIT = 0,
-    AUDIO_QUANTIZATION_20BIT = 1,
-    AUDIO_QUANTIZATION_24BIT = 2
+    AUDIO_TQUANTIZATION_16BIT = 0,
+    AUDIO_TQUANTIZATION_20BIT = 1,
+    AUDIO_TQUANTIZATION_24BIT = 2
   };
 
   enum AudioSampleFrequency {
-    AUDIO_SAMPLE_FREQ_48HZ = 0,
-    AUDIO_SAMPLE_FREQ_96HZ = 1
+    AUDIO_SAMPLE_FRETQ_48HZ = 0,
+    AUDIO_SAMPLE_FRETQ_96HZ = 1
   };
 
   enum AudioCodeExtension {
@@ -64,7 +64,7 @@ namespace K3bVideoDVD
        * \return A two chars language code or the empty string
        * if the language is undefined.
        */
-      const QString& langCode() const { return m_langCode; }
+      const TQString& langCode() const { return m_langCode; }
       
       /**
        * \see AudioFormat
@@ -103,7 +103,7 @@ namespace K3bVideoDVD
       unsigned short m_codeExtension;
       bool m_multiChannelExt;
       unsigned short m_channels:3;
-      QString m_langCode;
+      TQString m_langCode;
 
       friend class VideoDVD;
     };
diff --git a/libk3b/videodvd/k3bvideodvdsubpicturestream.h b/libk3b/videodvd/k3bvideodvdsubpicturestream.h
index b32407d..c9b6126 100644
--- a/libk3b/videodvd/k3bvideodvdsubpicturestream.h
+++ b/libk3b/videodvd/k3bvideodvdsubpicturestream.h
@@ -18,7 +18,7 @@
 
 #include <k3b_export.h>
 
-#include <qstring.h>
+#include <tqstring.h>
 
 
 namespace K3bVideoDVD
@@ -54,11 +54,11 @@ namespace K3bVideoDVD
        * \return A two chars language code or the empty string
        * if the language is undefined.
        */
-      const QString& langCode() const { return m_langCode; }
+      const TQString& langCode() const { return m_langCode; }
 
     private:
       unsigned int m_codeMode:3;
-      QString m_langCode;
+      TQString m_langCode;
       unsigned int m_codeExtension;
 
       friend class VideoDVD;
diff --git a/libk3b/videodvd/k3bvideodvdtime.cpp b/libk3b/videodvd/k3bvideodvdtime.cpp
index acc6aec..93840c5 100644
--- a/libk3b/videodvd/k3bvideodvdtime.cpp
+++ b/libk3b/videodvd/k3bvideodvdtime.cpp
@@ -76,19 +76,19 @@ double K3bVideoDVD::Time::frameRate() const
 }
 
 
-QString K3bVideoDVD::Time::toString( bool includeFrames ) const
+TQString K3bVideoDVD::Time::toString( bool includeFrames ) const
 {
   // FIXME: use a d-pointer
   const_cast<K3bVideoDVD::Time*>(this)->makeValid();
 
   if( includeFrames )
-    return QString().sprintf( "%02d:%02d:%02d.%02d", 
+    return TQString().sprintf( "%02d:%02d:%02d.%02d", 
 			      m_hour,
 			      m_minute,
 			      m_second,
 			      m_frame & 0x3f );
   else
-    return QString().sprintf( "%02d:%02d:%02d", 
+    return TQString().sprintf( "%02d:%02d:%02d", 
 			      m_hour,
 			      m_minute,
 			      m_second + ( m_frame > 0 ? 1 : 0 ) );
diff --git a/libk3b/videodvd/k3bvideodvdtime.h b/libk3b/videodvd/k3bvideodvdtime.h
index f486741..5af771c 100644
--- a/libk3b/videodvd/k3bvideodvdtime.h
+++ b/libk3b/videodvd/k3bvideodvdtime.h
@@ -18,7 +18,7 @@
 
 #include <k3b_export.h>
 
-#include <qstring.h>
+#include <tqstring.h>
 
 /**
  * This should not be confused with K3b::Msf
@@ -45,7 +45,7 @@ namespace K3bVideoDVD
       // FIXME: is this useful?
       double frameRate() const;
 
-      QString toString( bool includeFrames = true ) const;
+      TQString toString( bool includeFrames = true ) const;
 
     private:
       void makeValid();
diff --git a/libk3b/videodvd/k3bvideodvdtitle.h b/libk3b/videodvd/k3bvideodvdtitle.h
index 17f31a3..4872c7b 100644
--- a/libk3b/videodvd/k3bvideodvdtitle.h
+++ b/libk3b/videodvd/k3bvideodvdtitle.h
@@ -24,7 +24,7 @@
 #include <k3bvideodvdsubpicturestream.h>
 #include <k3bvideodvdptt.h>
 
-#include <qvaluevector.h>
+#include <tqvaluevector.h>
 
 
 namespace K3bVideoDVD
@@ -85,7 +85,7 @@ namespace K3bVideoDVD
       /**
        * \return A video capture
        */
-      //      QBitmap videoCapture( const Time& ) const;
+      //      TQBitmap videoCapture( const Time& ) const;
       
     private:
       unsigned int m_titleNum;
@@ -98,10 +98,10 @@ namespace K3bVideoDVD
       Time m_playbackTime;
       
       VideoStream m_videoStream;
-      QValueVector<AudioStream> m_audioStreams;
-      QValueVector<SubPictureStream> m_subPictureStreams;
+      TQValueVector<AudioStream> m_audioStreams;
+      TQValueVector<SubPictureStream> m_subPictureStreams;
 
-      QValueVector<PTT> m_ptts;
+      TQValueVector<PTT> m_ptts;
 
       //      VideoDVD* m_videoDVD;