TQt4 port soundkonverter

This enables compilation under both Qt3 and Qt4


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

1 files changed, 21 insertions, 21 deletions

diff --git a/src/cdmanager.cpp b/src/cdmanager.cpp
index cd9dd27..758c7ee 100755
--- a/src/cdmanager.cpp
+++ b/src/cdmanager.cpp
@@ -4,8 +4,8 @@
 #include "cddb.h"
 #include "conversionoptions.h"
 
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <tqstringlist.h>
+#include <tqvaluelist.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -17,13 +17,13 @@
 
 // TODO implement reading of cd data
 
-CDDevice::CDDevice( const QString& _device )
+CDDevice::CDDevice( const TQString& _device )
 {
-    QStringList s;
+    TQStringList s;
     bool init = false;
-    QValueList<int> qvl;
+    TQValueList<int> qvl;
     int i;
-    QStringList dcopList, devList;
+    TQStringList dcopList, devList;
     bool ok = false;
 
     tags.clear();
@@ -43,7 +43,7 @@ CDDevice::CDDevice( const QString& _device )
                 i += 13;
             }
             if( devList.count() > 1 ) {
-                QString choice = KInputDialog::getItem( i18n("Audio CD"), i18n("Several audio CDs found. Choose one:"), devList, 0, false, &ok );
+                TQString choice = KInputDialog::getItem( i18n("Audio CD"), i18n("Several audio CDs found. Choose one:"), devList, 0, false, &ok );
                 if( ok ) s.append( choice );
                 else s.append( 0 ); // TODO if canceled, the cd opener should close, not use the first item
             }
@@ -120,11 +120,11 @@ CDManager::~CDManager()
     while( cdDevices.count() > 0 ) delete cdDevices.first();
 }
 
-QString CDManager::newCDDevice( const QString& device )
+TQString CDManager::newCDDevice( const TQString& device )
 {
     CDDevice* cdDevice = new CDDevice( device );
 
-    for( QValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
+    for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
         if( (*it)->device = cdDevice->device ) {
             cdDevices.remove( *it );
             delete (*it);
@@ -136,22 +136,22 @@ QString CDManager::newCDDevice( const QString& device )
     return cdDevice->device;
 }
 
-QValueList<TagData*> CDManager::getTrackList( const QString& device )
+TQValueList<TagData*> CDManager::getTrackList( const TQString& device )
 {
-    for( QValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
+    for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
         if( (*it)->device = device ) return (*it)->tags;
     }
 
-    QValueList<TagData*> list;
+    TQValueList<TagData*> list;
     return list;
 }
 
-TagData* CDManager::getTags( const QString& device, int track )
+TagData* CDManager::getTags( const TQString& device, int track )
 {
-    for( QValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
+    for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
         if( (*it)->device = device ) {
             if( track > 0 ) {
-                QValueList<TagData*>::Iterator tag = (*it)->tags.at( track - 1 );
+                TQValueList<TagData*>::Iterator tag = (*it)->tags.at( track - 1 );
                 return (*tag);
             }
             else {
@@ -163,27 +163,27 @@ TagData* CDManager::getTags( const QString& device, int track )
     return 0;
 }
 
-int CDManager::getTrackCount( const QString& device )
+int CDManager::getTrackCount( const TQString& device )
 {
-    for( QValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
+    for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
         if( (*it)->device = device ) return (*it)->trackCount;
     }
 
     return 0;
 }
 
-int CDManager::getTimeCount( const QString& device )
+int CDManager::getTimeCount( const TQString& device )
 {
-    for( QValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
+    for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
         if( (*it)->device = device ) return (*it)->timeCount;
     }
 
     return 0;
 }
 
-void CDManager::setDiscTags( const QString& device, TagData* tags )
+void CDManager::setDiscTags( const TQString& device, TagData* tags )
 {
-    for( QValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
+    for( TQValueList<CDDevice*>::Iterator it = cdDevices.begin(); it != cdDevices.end(); ++it ) {
         if( (*it)->device = device ) (*it)->discTags = tags;
     }
 }