diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 19:21:21 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 19:21:21 +0000 |
commit | d8cc8bdfa7fa624a526d5aa1626974e1444cb799 (patch) | |
tree | f295f1c545b319963d5357af79fe08991d8141d9 /libk3b/plugin | |
parent | 2a39a080579fb52a2599c02b2939795385b89093 (diff) | |
download | k3b-d8cc8bdfa7fa624a526d5aa1626974e1444cb799.tar.gz k3b-d8cc8bdfa7fa624a526d5aa1626974e1444cb799.zip |
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
Diffstat (limited to 'libk3b/plugin')
-rw-r--r-- | libk3b/plugin/k3baudiodecoder.cpp | 52 | ||||
-rw-r--r-- | libk3b/plugin/k3baudiodecoder.h | 32 | ||||
-rw-r--r-- | libk3b/plugin/k3baudioencoder.cpp | 38 | ||||
-rw-r--r-- | libk3b/plugin/k3baudioencoder.h | 37 | ||||
-rw-r--r-- | libk3b/plugin/k3baudiooutputplugin.h | 11 | ||||
-rw-r--r-- | libk3b/plugin/k3baudioserver.cpp | 18 | ||||
-rw-r--r-- | libk3b/plugin/k3baudioserver.h | 15 | ||||
-rw-r--r-- | libk3b/plugin/k3bplugin.cpp | 6 | ||||
-rw-r--r-- | libk3b/plugin/k3bplugin.h | 57 | ||||
-rw-r--r-- | libk3b/plugin/k3bpluginconfigwidget.cpp | 4 | ||||
-rw-r--r-- | libk3b/plugin/k3bpluginconfigwidget.h | 7 | ||||
-rw-r--r-- | libk3b/plugin/k3bpluginfactory.h | 10 | ||||
-rw-r--r-- | libk3b/plugin/k3bpluginmanager.cpp | 54 | ||||
-rw-r--r-- | libk3b/plugin/k3bpluginmanager.h | 21 | ||||
-rw-r--r-- | libk3b/plugin/k3bprojectplugin.h | 51 | ||||
-rw-r--r-- | libk3b/plugin/libsamplerate/samplerate.h | 4 | ||||
-rw-r--r-- | libk3b/plugin/libsamplerate/src_sinc.c | 12 |
17 files changed, 219 insertions, 210 deletions
diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp index 82f4adb..54fe8ad 100644 --- a/libk3b/plugin/k3baudiodecoder.cpp +++ b/libk3b/plugin/k3baudiodecoder.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kfilemetainfo.h> -#include <qmap.h> +#include <tqmap.h> #include <math.h> @@ -98,16 +98,16 @@ public: char* decodingBufferPos; int decodingBufferFill; - QMap<QString, QString> technicalInfoMap; - QMap<MetaDataField, QString> metaInfoMap; + TQMap<TQString, TQString> technicalInfoMap; + TQMap<MetaDataField, TQString> metaInfoMap; bool valid; }; -K3bAudioDecoder::K3bAudioDecoder( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bAudioDecoder::K3bAudioDecoder( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); } @@ -129,7 +129,7 @@ K3bAudioDecoder::~K3bAudioDecoder() } -void K3bAudioDecoder::setFilename( const QString& filename ) +void K3bAudioDecoder::setFilename( const TQString& filename ) { m_fileName = filename; delete d->metaInfo; @@ -302,7 +302,7 @@ int K3bAudioDecoder::decode( char* _data, int maxLen ) // clear out the decoding buffer - read = QMIN( maxLen, d->decodingBufferFill ); + read = TQMIN( maxLen, d->decodingBufferFill ); ::memcpy( _data, d->decodingBufferPos, read ); d->decodingBufferPos += read; d->decodingBufferFill -= read; @@ -321,7 +321,7 @@ int K3bAudioDecoder::decode( char* _data, int maxLen ) int K3bAudioDecoder::resample( char* data, int maxLen ) { if( !d->resampleState ) { - d->resampleState = src_new( SRC_SINC_MEDIUM_QUALITY, d->channels, 0 ); + d->resampleState = src_new( SRC_SINC_MEDIUM_TQUALITY, d->channels, 0 ); if( !d->resampleState ) { kdDebug() << "(K3bAudioDecoder) unable to initialize resampler." << endl; return -1; @@ -375,7 +375,7 @@ void K3bAudioDecoder::from16bitBeSignedToFloat( char* src, float* dest, int samp { while( samples ) { samples--; - dest[samples] = static_cast<float>( Q_INT16(((src[2*samples]<<8)&0xff00)|(src[2*samples+1]&0x00ff)) / 32768.0 ); + dest[samples] = static_cast<float>( TQ_INT16(((src[2*samples]<<8)&0xff00)|(src[2*samples+1]&0x00ff)) / 32768.0 ); } } @@ -386,7 +386,7 @@ void K3bAudioDecoder::fromFloatTo16BitBeSigned( float* src, char* dest, int samp samples--; float scaled = src[samples] * 32768.0; - Q_INT16 val = 0; + TQ_INT16 val = 0; // clipping if( scaled >= ( 1.0 * 0x7FFF ) ) @@ -407,8 +407,8 @@ void K3bAudioDecoder::from8BitTo16BitBeSigned( char* src, char* dest, int sample while( samples ) { samples--; - float scaled = static_cast<float>(Q_UINT8(src[samples])-128) / 128.0 * 32768.0; - Q_INT16 val = 0; + float scaled = static_cast<float>(TQ_UINT8(src[samples])-128) / 128.0 * 32768.0; + TQ_INT16 val = 0; // clipping if( scaled >= ( 1.0 * 0x7FFF ) ) @@ -462,7 +462,7 @@ bool K3bAudioDecoder::seek( const K3b::Msf& pos ) kdDebug() << "(K3bAudioDecoder) seeking " << bytesToDecode << " bytes." << endl; char buffi[10*2352]; while( bytesToDecode > 0 ) { - int read = decode( buffi, QMIN(10*2352, bytesToDecode) ); + int read = decode( buffi, TQMIN(10*2352, bytesToDecode) ); if( read <= 0 ) return false; @@ -502,9 +502,9 @@ void K3bAudioDecoder::cleanup() } -QString K3bAudioDecoder::metaInfo( MetaDataField f ) +TQString K3bAudioDecoder::metaInfo( MetaDataField f ) { - if( d->metaInfoMap.contains( f ) ) + if( d->metaInfoMap.tqcontains( f ) ) return d->metaInfoMap[f]; // fall back to KFileMetaInfo @@ -512,7 +512,7 @@ QString K3bAudioDecoder::metaInfo( MetaDataField f ) d->metaInfo = new KFileMetaInfo( filename() ); if( d->metaInfo->isValid() ) { - QString tag; + TQString tag; switch( f ) { case META_TITLE: tag = "Title"; @@ -536,11 +536,11 @@ QString K3bAudioDecoder::metaInfo( MetaDataField f ) return item.string(); } - return QString::null; + return TQString(); } -void K3bAudioDecoder::addMetaInfo( MetaDataField f, const QString& value ) +void K3bAudioDecoder::addMetaInfo( MetaDataField f, const TQString& value ) { if( !value.isEmpty() ) d->metaInfoMap[f] = value; @@ -549,23 +549,23 @@ void K3bAudioDecoder::addMetaInfo( MetaDataField f, const QString& value ) } -QStringList K3bAudioDecoder::supportedTechnicalInfos() const +TQStringList K3bAudioDecoder::supportedTechnicalInfos() const { - QStringList l; - for( QMap<QString, QString>::const_iterator it = d->technicalInfoMap.begin(); + TQStringList l; + for( TQMap<TQString, TQString>::const_iterator it = d->technicalInfoMap.begin(); it != d->technicalInfoMap.end(); ++it ) l.append( it.key() ); return l; } -QString K3bAudioDecoder::technicalInfo( const QString& key ) const +TQString K3bAudioDecoder::technicalInfo( const TQString& key ) const { return d->technicalInfoMap[key]; } -void K3bAudioDecoder::addTechnicalInfo( const QString& key, const QString& value ) +void K3bAudioDecoder::addTechnicalInfo( const TQString& key, const TQString& value ) { d->technicalInfoMap[key] = value; } @@ -574,17 +574,17 @@ void K3bAudioDecoder::addTechnicalInfo( const QString& key, const QString& value K3bAudioDecoder* K3bAudioDecoderFactory::createDecoder( const KURL& url ) { kdDebug() << "(K3bAudioDecoderFactory::createDecoder( " << url.path() << " )" << endl; - QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioDecoder" ); + TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioDecoder" ); // first search for a single format decoder - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { K3bAudioDecoderFactory* f = dynamic_cast<K3bAudioDecoderFactory*>( it.current() ); if( f && !f->multiFormatDecoder() && f->canDecode( url ) ) { kdDebug() << "1" << endl; return f->createDecoder();} } // no single format decoder. Search for a multi format decoder - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { K3bAudioDecoderFactory* f = dynamic_cast<K3bAudioDecoderFactory*>( it.current() ); if( f && f->multiFormatDecoder() && f->canDecode( url ) ) { kdDebug() << "2" << endl; return f->createDecoder();} diff --git a/libk3b/plugin/k3baudiodecoder.h b/libk3b/plugin/k3baudiodecoder.h index 69f594c..ed13c66 100644 --- a/libk3b/plugin/k3baudiodecoder.h +++ b/libk3b/plugin/k3baudiodecoder.h @@ -31,12 +31,13 @@ * * Instances are created by K3bAudioDecoderFactory **/ -class LIBK3B_EXPORT K3bAudioDecoder : public QObject +class LIBK3B_EXPORT K3bAudioDecoder : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bAudioDecoder( QObject* parent = 0, const char* name = 0 ); + K3bAudioDecoder( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bAudioDecoder(); @@ -44,7 +45,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * Set the file to decode. Be aware that one cannot rely * on the file length until analyseFile() has been called. */ - void setFilename( const QString& ); + void setFilename( const TQString& ); /** * Since this may take a while depending on the filetype it is best @@ -87,7 +88,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * the default implementation returns the infos set via @p addMetaInfo * and uses KFileMetaInfo if none was set */ - virtual QString metaInfo( MetaDataField ); + virtual TQString metaInfo( MetaDataField ); /** * The filetype is only used for informational purposes. @@ -95,7 +96,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * as it enhances usability. * @returne The filetype of the decoded file. */ - virtual QString fileType() const { return QString::null; } + virtual TQString fileType() const { return TQString(); } /** * This method may be reimplemented to provide technical information about @@ -103,7 +104,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * * the default implementation returns the infos set via @p addTechnicalInfo */ - virtual QStringList supportedTechnicalInfos() const; + virtual TQStringList supportedTechnicalInfos() const; /** * The framework will call this method with all strings returned by the @@ -111,7 +112,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject * * the default implementation returns the infos set via @p addTechnicalInfo */ - virtual QString technicalInfo( const QString& ) const; + virtual TQString technicalInfo( const TQString& ) const; /** * returnes -1 on error, 0 when finished, length of data otherwise @@ -144,7 +145,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject */ virtual K3b::Msf length() const { return m_length; } - const QString& filename() const { return m_fileName; } + const TQString& filename() const { return m_fileName; } // some helper methods static void fromFloatTo16BitBeSigned( float* src, char* dest, int samples ); @@ -155,13 +156,13 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject /** * Use this method if using the default implementation of @p metaInfo */ - void addMetaInfo( MetaDataField, const QString& ); + void addMetaInfo( MetaDataField, const TQString& ); /** * Use this method if using the default implementation of @p technicalInfo * and @p supportedTechnicalInfos. */ - void addTechnicalInfo( const QString&, const QString& ); + void addTechnicalInfo( const TQString&, const TQString& ); /** * This will be called once before the first call to decodeInternal. @@ -191,7 +192,7 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject private: int resample( char* data, int maxLen ); - QString m_fileName; + TQString m_fileName; K3b::Msf m_length; class Private; @@ -209,16 +210,17 @@ class LIBK3B_EXPORT K3bAudioDecoder : public QObject class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin { Q_OBJECT + TQ_OBJECT public: - K3bAudioDecoderFactory( QObject* parent = 0, const char* name = 0 ) - : K3bPlugin( parent, name ) { + K3bAudioDecoderFactory( TQObject* tqparent = 0, const char* name = 0 ) + : K3bPlugin( tqparent, name ) { } virtual ~K3bAudioDecoderFactory() { } - QString group() const { return "AudioDecoder"; } + TQString group() const { return "AudioDecoder"; } /** * K3b uses this flag to decide which plugins to test first @@ -239,7 +241,7 @@ class LIBK3B_EXPORT K3bAudioDecoderFactory : public K3bPlugin */ virtual bool canDecode( const KURL& filename ) = 0; - virtual K3bAudioDecoder* createDecoder( QObject* parent = 0, const char* name = 0 ) const = 0; + virtual K3bAudioDecoder* createDecoder( TQObject* tqparent = 0, const char* name = 0 ) const = 0; /** * Searching for an audiodecoder for @p filename. diff --git a/libk3b/plugin/k3baudioencoder.cpp b/libk3b/plugin/k3baudioencoder.cpp index 3b1309a..d7f72d1 100644 --- a/libk3b/plugin/k3baudioencoder.cpp +++ b/libk3b/plugin/k3baudioencoder.cpp @@ -15,7 +15,7 @@ #include "k3baudioencoder.h" -#include <qfile.h> +#include <tqfile.h> #include <kdebug.h> @@ -27,15 +27,15 @@ public: : outputFile(0) { } - QFile* outputFile; - QString outputFilename; + TQFile* outputFile; + TQString outputFilename; - QString lastErrorString; + TQString lastErrorString; }; -K3bAudioEncoder::K3bAudioEncoder( QObject* parent, const char* name ) - : K3bPlugin( parent, name ) +K3bAudioEncoder::K3bAudioEncoder( TQObject* tqparent, const char* name ) + : K3bPlugin( tqparent, name ) { d = new Private(); } @@ -48,11 +48,11 @@ K3bAudioEncoder::~K3bAudioEncoder() } -bool K3bAudioEncoder::openFile( const QString& ext, const QString& filename, const K3b::Msf& length ) +bool K3bAudioEncoder::openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length ) { closeFile(); - d->outputFile = new QFile( filename ); + d->outputFile = new TQFile( filename ); if( d->outputFile->open( IO_WriteOnly ) ) { return initEncoder( ext, length ); } @@ -81,35 +81,35 @@ void K3bAudioEncoder::closeFile() d->outputFile->close(); delete d->outputFile; d->outputFile = 0; - d->outputFilename = QString::null; + d->outputFilename = TQString(); } } -const QString& K3bAudioEncoder::filename() const +const TQString& K3bAudioEncoder::filename() const { if( d->outputFile ) return d->outputFilename; else - return QString::null; + return TQString(); } -void K3bAudioEncoder::setMetaData( K3bAudioEncoder::MetaDataField f, const QString& data ) +void K3bAudioEncoder::setMetaData( K3bAudioEncoder::MetaDataField f, const TQString& data ) { if( !data.isEmpty() ) return setMetaDataInternal( f, data ); } -long K3bAudioEncoder::encode( const char* data, Q_ULONG len ) +long K3bAudioEncoder::encode( const char* data, TQ_ULONG len ) { return encodeInternal( data, len ); } -bool K3bAudioEncoder::initEncoder( const QString& ext, const K3b::Msf& length ) +bool K3bAudioEncoder::initEncoder( const TQString& ext, const K3b::Msf& length ) { if( !isOpen() ) { kdDebug() << "(K3bAudioEncoder) call to initEncoder without openFile!" << endl; @@ -120,7 +120,7 @@ bool K3bAudioEncoder::initEncoder( const QString& ext, const K3b::Msf& length ) } -Q_LONG K3bAudioEncoder::writeData( const char* data, Q_ULONG len ) +TQ_LONG K3bAudioEncoder::writeData( const char* data, TQ_ULONG len ) { if( d->outputFile ) { return d->outputFile->writeBlock( data, len ); @@ -132,14 +132,14 @@ Q_LONG K3bAudioEncoder::writeData( const char* data, Q_ULONG len ) } -bool K3bAudioEncoder::initEncoderInternal( const QString&, const K3b::Msf& ) +bool K3bAudioEncoder::initEncoderInternal( const TQString&, const K3b::Msf& ) { // do nothing return true; } -void K3bAudioEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField, const QString& ) +void K3bAudioEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField, const TQString& ) { // do nothing } @@ -158,13 +158,13 @@ void K3bAudioEncoder::finishEncoderInternal() } -void K3bAudioEncoder::setLastError( const QString& e ) +void K3bAudioEncoder::setLastError( const TQString& e ) { d->lastErrorString = e; } -QString K3bAudioEncoder::lastErrorString() const +TQString K3bAudioEncoder::lastErrorString() const { if( d->lastErrorString.isEmpty() ) return i18n("An unknown error occurred."); diff --git a/libk3b/plugin/k3baudioencoder.h b/libk3b/plugin/k3baudioencoder.h index 137b49d..b3fc01b 100644 --- a/libk3b/plugin/k3baudioencoder.h +++ b/libk3b/plugin/k3baudioencoder.h @@ -33,9 +33,10 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin { Q_OBJECT + TQ_OBJECT public: - K3bAudioEncoder( QObject* parent = 0, const char* name = 0 ); + K3bAudioEncoder( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bAudioEncoder(); // TODO: if the following methods are to be activated the config methods in @@ -52,7 +53,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin */ // virtual void readConfig( KConfig* ); - QString group() const { return "AudioEncoder"; } + TQString group() const { return "AudioEncoder"; } /** * This should return the fileextensions supported by the filetype written in the @@ -61,19 +62,19 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * in handy if the encoder is based on some external program or lib which is not * available on runtime.) */ - virtual QStringList extensions() const = 0; + virtual TQStringList extensions() const = 0; /** * The filetype as presented to the user. */ - virtual QString fileTypeComment( const QString& extension ) const = 0; + virtual TQString fileTypeComment( const TQString& extension ) const = 0; /** * Determine the filesize of the encoded file (~) * default implementation returnes -1 (unknown) * First parameter is the extension to be used */ - virtual long long fileSize( const QString&, const K3b::Msf& ) const { return -1; } + virtual long long fileSize( const TQString&, const K3b::Msf& ) const { return -1; } /** * The default implementation openes the file for writing with @@ -81,7 +82,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * @param extension the filetype to be used. * */ - virtual bool openFile( const QString& extension, const QString& filename, const K3b::Msf& length ); + virtual bool openFile( const TQString& extension, const TQString& filename, const K3b::Msf& length ); /** @@ -101,11 +102,11 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin /** * The default implementation returnes the filename set in openFile - * or QString::null if no file has been opened. + * or TQString() if no file has been opened. * Normally this does not need to be reimplemented but it has to be * if openFile is reimplemented. */ - virtual const QString& filename() const; + virtual const TQString& filename() const; enum MetaDataField { META_TRACK_TITLE, @@ -123,7 +124,7 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * calling openFile and before calling encode. * This calls setMetaDataInternal. */ - void setMetaData( MetaDataField, const QString& ); + void setMetaData( MetaDataField, const TQString& ); /** * Returnes the amount of actually written bytes or -1 if an error @@ -132,20 +133,20 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * Be aware that the returned amount of written data may very well differ * from len since the data is encoded. */ - long encode( const char*, Q_ULONG len ); + long encode( const char*, TQ_ULONG len ); /** * Use this signal in case of an error to provide the user with information * about the problem. */ - virtual QString lastErrorString() const; + virtual TQString lastErrorString() const; protected: /** * Called by the default implementation of openFile * This calls initEncoderInternal. */ - bool initEncoder( const QString& extension, const K3b::Msf& length ); + bool initEncoder( const TQString& extension, const K3b::Msf& length ); /** * Called by the deafult implementation of openFile @@ -158,14 +159,14 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * using the default implementation of openFile * Returnes the number of bytes actually written. */ - Q_LONG writeData( const char*, Q_ULONG len ); + TQ_LONG writeData( const char*, TQ_ULONG len ); /** * initzialize the decoder structures. * default implementation does nothing * this may already write data. */ - virtual bool initEncoderInternal( const QString& extension, const K3b::Msf& length ); + virtual bool initEncoderInternal( const TQString& extension, const K3b::Msf& length ); /** * reimplement this if the encoder needs to do some @@ -180,20 +181,20 @@ class LIBK3B_EXPORT K3bAudioEncoder : public K3bPlugin * Should return the amount of actually written bytes (may be 0) and -1 * on error. */ - // TODO: use Q_INT16* instead of char* + // TODO: use TQ_INT16* instead of char* // FIXME: why little endian while CDs use big endian??? - virtual long encodeInternal( const char*, Q_ULONG len ) = 0; + virtual long encodeInternal( const char*, TQ_ULONG len ) = 0; /** * default implementation does nothing * this may already write data. */ - virtual void setMetaDataInternal( MetaDataField, const QString& ); + virtual void setMetaDataInternal( MetaDataField, const TQString& ); /** * Use this in combination with the default implementation of lastError() */ - void setLastError( const QString& ); + void setLastError( const TQString& ); private: class Private; diff --git a/libk3b/plugin/k3baudiooutputplugin.h b/libk3b/plugin/k3baudiooutputplugin.h index 97e897a..fdd57a5 100644 --- a/libk3b/plugin/k3baudiooutputplugin.h +++ b/libk3b/plugin/k3baudiooutputplugin.h @@ -25,18 +25,19 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin { Q_OBJECT + TQ_OBJECT public: virtual ~K3bAudioOutputPlugin() { } - QString group() const { return "AudioOutput"; } + TQString group() const { return "AudioOutput"; } /** * This is the short name of the sound system which can be used * to specify the sound system on the command line (like "arts", "alsa", or "oss") */ - virtual QCString soundSystem() const = 0; + virtual TQCString soundSystem() const = 0; /** * Initialize the plugin. @@ -51,7 +52,7 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin */ virtual void cleanup() {} - virtual QString lastErrorMessage() const { return QString::null; } + virtual TQString lastErrorMessage() const { return TQString(); } /** * Let there be sound... @@ -61,8 +62,8 @@ class LIBK3B_EXPORT K3bAudioOutputPlugin : public K3bPlugin virtual int write( char* data, int len ) = 0; protected: - K3bAudioOutputPlugin( QObject* parent = 0, const char* name = 0 ) - : K3bPlugin( parent, name ) { + K3bAudioOutputPlugin( TQObject* tqparent = 0, const char* name = 0 ) + : K3bPlugin( tqparent, name ) { } }; diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp index ecfb25f..3251ed5 100644 --- a/libk3b/plugin/k3baudioserver.cpp +++ b/libk3b/plugin/k3baudioserver.cpp @@ -89,8 +89,8 @@ private: }; -K3bAudioServer::K3bAudioServer( QObject* parent, const char* name ) - : QObject( parent, name ), +K3bAudioServer::K3bAudioServer( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), m_usedOutputPlugin(0), m_pluginInitialized(false), m_client(0) @@ -107,7 +107,7 @@ K3bAudioServer::~K3bAudioServer() } -bool K3bAudioServer::setOutputMethod( const QCString& name ) +bool K3bAudioServer::setOutputMethod( const TQCString& name ) { if( K3bAudioOutputPlugin* p = findOutputPlugin( name ) ) { setOutputPlugin( p ); @@ -153,8 +153,8 @@ void K3bAudioServer::attachClient( K3bAudioClient* c ) if( m_usedOutputPlugin && !m_pluginInitialized ) { if( !m_usedOutputPlugin->init() ) { emit error( i18n("Could not initialize Audio Output plugin %1 (%2)") - .arg(m_usedOutputPlugin->pluginInfo().name()) - .arg(m_usedOutputPlugin->lastErrorMessage()) ); + .tqarg(m_usedOutputPlugin->pluginInfo().name()) + .tqarg(m_usedOutputPlugin->lastErrorMessage()) ); } else m_pluginInitialized = true; @@ -184,11 +184,11 @@ void K3bAudioServer::detachClient( K3bAudioClient* c ) } -K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const QCString& name ) +K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const TQCString& name ) { - QPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioOutput" ); + TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( "AudioOutput" ); - for( QPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { + for( TQPtrListIterator<K3bPlugin> it( fl ); it.current(); ++it ) { K3bAudioOutputPlugin* f = dynamic_cast<K3bAudioOutputPlugin*>( it.current() ); if( f && f->soundSystem() == name ) { @@ -202,7 +202,7 @@ K3bAudioOutputPlugin* K3bAudioServer::findOutputPlugin( const QCString& name ) } -void K3bAudioServer::customEvent( QCustomEvent* e ) +void K3bAudioServer::customEvent( TQCustomEvent* e ) { if( K3bProgressInfoEvent* be = dynamic_cast<K3bProgressInfoEvent*>(e) ) { if( be->type() == K3bProgressInfoEvent::InfoMessage ) { diff --git a/libk3b/plugin/k3baudioserver.h b/libk3b/plugin/k3baudioserver.h index 1e8d4a8..b428056 100644 --- a/libk3b/plugin/k3baudioserver.h +++ b/libk3b/plugin/k3baudioserver.h @@ -16,7 +16,7 @@ #ifndef _K3B_AUDIO_SERVER_H_ #define _K3B_AUDIO_SERVER_H_ -#include <qobject.h> +#include <tqobject.h> #include "k3b_export.h" class K3bAudioOutputPlugin; class K3bAudioClient; @@ -26,18 +26,19 @@ class K3bAudioClient; * The AudioServer manages AudioClients to play audio data through * some output plugin. */ -class LIBK3B_EXPORT K3bAudioServer : public QObject +class LIBK3B_EXPORT K3bAudioServer : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bAudioServer( QObject* parent = 0, const char* name = 0 ); + K3bAudioServer( TQObject* tqparent = 0, const char* name = 0 ); ~K3bAudioServer(); /** * Returns false in case the named output method could not be found. */ - bool setOutputMethod( const QCString& name ); + bool setOutputMethod( const TQCString& name ); void setOutputPlugin( K3bAudioOutputPlugin* p ); /** @@ -62,13 +63,13 @@ class LIBK3B_EXPORT K3bAudioServer : public QObject /** * Find a plugin by classname. */ - static K3bAudioOutputPlugin* findOutputPlugin( const QCString& name ); + static K3bAudioOutputPlugin* findOutputPlugin( const TQCString& name ); signals: - void error( const QString& ); + void error( const TQString& ); private: - void customEvent( QCustomEvent* e ); + void customEvent( TQCustomEvent* e ); class Private; friend class Private; diff --git a/libk3b/plugin/k3bplugin.cpp b/libk3b/plugin/k3bplugin.cpp index db75bb4..6929bd0 100644 --- a/libk3b/plugin/k3bplugin.cpp +++ b/libk3b/plugin/k3bplugin.cpp @@ -17,8 +17,8 @@ #include "k3bplugin.h" -K3bPlugin::K3bPlugin( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bPlugin::K3bPlugin( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { } @@ -28,7 +28,7 @@ K3bPlugin::~K3bPlugin() } -K3bPluginConfigWidget* K3bPlugin::createConfigWidget( QWidget*, const char* ) const +K3bPluginConfigWidget* K3bPlugin::createConfigWidget( TQWidget*, const char* ) const { return 0; } diff --git a/libk3b/plugin/k3bplugin.h b/libk3b/plugin/k3bplugin.h index f4501a7..1eeb622 100644 --- a/libk3b/plugin/k3bplugin.h +++ b/libk3b/plugin/k3bplugin.h @@ -17,7 +17,7 @@ #ifndef _K3B_PLUGIN_H_ #define _K3B_PLUGIN_H_ -#include <qobject.h> +#include <tqobject.h> #include <kgenericfactory.h> #include "k3b_export.h" @@ -25,7 +25,7 @@ class K3bPluginConfigWidget; -class QWidget; +class TQWidget; @@ -37,13 +37,13 @@ class K3bPluginInfo K3bPluginInfo() { } - K3bPluginInfo( QString libraryName, - QString name, - QString author, - QString email, - QString comment, - QString version, - QString licence ) + K3bPluginInfo( TQString libraryName, + TQString name, + TQString author, + TQString email, + TQString comment, + TQString version, + TQString licence ) : m_libraryName(libraryName), m_name(name), m_author(author), @@ -53,38 +53,39 @@ class K3bPluginInfo m_licence(licence) { } - const QString& name() const { return m_name; } - const QString& author() const { return m_author; } - const QString& email() const { return m_email; } - const QString& comment() const { return m_comment; } - const QString& version() const { return m_version; } - const QString& licence() const { return m_licence; } + const TQString& name() const { return m_name; } + const TQString& author() const { return m_author; } + const TQString& email() const { return m_email; } + const TQString& comment() const { return m_comment; } + const TQString& version() const { return m_version; } + const TQString& licence() const { return m_licence; } - const QString& libraryName() const { return m_libraryName; } + const TQString& libraryName() const { return m_libraryName; } private: - QString m_libraryName; - - QString m_name; - QString m_author; - QString m_email; - QString m_comment; - QString m_version; - QString m_licence; + TQString m_libraryName; + + TQString m_name; + TQString m_author; + TQString m_email; + TQString m_comment; + TQString m_version; + TQString m_licence; }; /** * Base class for all plugins. You may use the K3bPluginFactory to make your plugin available. */ -class LIBK3B_EXPORT K3bPlugin : public QObject +class LIBK3B_EXPORT K3bPlugin : public TQObject { Q_OBJECT + TQ_OBJECT friend class K3bPluginManager; public: - K3bPlugin( QObject* parent = 0, const char* name = 0 ); + K3bPlugin( TQObject* tqparent = 0, const char* name = 0 ); virtual ~K3bPlugin(); const K3bPluginInfo& pluginInfo() const { return m_pluginInfo; } @@ -97,14 +98,14 @@ class LIBK3B_EXPORT K3bPlugin : public QObject /** * The plugin group. */ - virtual QString group() const = 0; + virtual TQString group() const = 0; /** * Returns a widget which configures the plugin. * * The caller has to destroy the widget */ - virtual K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, const char* name = 0 ) const; + virtual K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: K3bPluginInfo m_pluginInfo; diff --git a/libk3b/plugin/k3bpluginconfigwidget.cpp b/libk3b/plugin/k3bpluginconfigwidget.cpp index 09b7f0b..b93fa9d 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.cpp +++ b/libk3b/plugin/k3bpluginconfigwidget.cpp @@ -22,8 +22,8 @@ #include <kdebug.h> -K3bPluginConfigWidget::K3bPluginConfigWidget( QWidget* parent, const char* name ) - : QWidget( parent, name ) +K3bPluginConfigWidget::K3bPluginConfigWidget( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { } diff --git a/libk3b/plugin/k3bpluginconfigwidget.h b/libk3b/plugin/k3bpluginconfigwidget.h index baa07ab..3e5068d 100644 --- a/libk3b/plugin/k3bpluginconfigwidget.h +++ b/libk3b/plugin/k3bpluginconfigwidget.h @@ -17,15 +17,16 @@ #ifndef _K3B_PLUGIN_CONFIG_WIDGET_H_ #define _K3B_PLUGIN_CONFIG_WIDGET_H_ -#include <qwidget.h> +#include <tqwidget.h> #include "k3b_export.h" -class LIBK3B_EXPORT K3bPluginConfigWidget : public QWidget +class LIBK3B_EXPORT K3bPluginConfigWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - K3bPluginConfigWidget( QWidget* parent = 0, const char* name = 0 ); + K3bPluginConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ); virtual ~K3bPluginConfigWidget(); public slots: diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h index 6dbc6cb..463703f 100644 --- a/libk3b/plugin/k3bpluginfactory.h +++ b/libk3b/plugin/k3bpluginfactory.h @@ -23,7 +23,7 @@ #include <klocale.h> /** - * Template based on KGenericFactory. This is just here to avoid using the QStringList args parameter + * Template based on KGenericFactory. This is just here to avoid using the TQStringList args parameter * in every plugin's constructor. * * Use this as follows: @@ -64,14 +64,14 @@ class K3bPluginFactory : public KLibFactory } } - virtual QObject* createObject( QObject *parent, const char *name, - const char*, const QStringList& ) { + virtual TQObject* createObject( TQObject *tqparent, const char *name, + const char*, const TQStringList& ) { initializeMessageCatalogue(); - return new T( parent, name ); + return new T( tqparent, name ); } private: - QCString m_instanceName; + TQCString m_instanceName; bool m_catalogueInitialized; static KInstance* s_instance; diff --git a/libk3b/plugin/k3bpluginmanager.cpp b/libk3b/plugin/k3bpluginmanager.cpp index 3e963a2..5436251 100644 --- a/libk3b/plugin/k3bpluginmanager.cpp +++ b/libk3b/plugin/k3bpluginmanager.cpp @@ -27,23 +27,23 @@ #include <kmessagebox.h> #include <klibloader.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qdir.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqdir.h> class K3bPluginManager::Private { public: - QPtrList<K3bPlugin> plugins; + TQPtrList<K3bPlugin> plugins; }; -K3bPluginManager::K3bPluginManager( QObject* parent, const char* name ) - : QObject( parent, name ) +K3bPluginManager::K3bPluginManager( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { d = new Private(); } @@ -56,14 +56,14 @@ K3bPluginManager::~K3bPluginManager() -QStringList K3bPluginManager::groups() const +TQStringList K3bPluginManager::groups() const { - QStringList grps; + TQStringList grps; - QPtrList<K3bPlugin> fl; - for( QPtrListIterator<K3bPlugin> it( d->plugins ); + TQPtrList<K3bPlugin> fl; + for( TQPtrListIterator<K3bPlugin> it( d->plugins ); it.current(); ++it ) { - if( !grps.contains( it.current()->group() ) ) + if( !grps.tqcontains( it.current()->group() ) ) grps.append( it.current()->group() ); } @@ -71,10 +71,10 @@ QStringList K3bPluginManager::groups() const } -QPtrList<K3bPlugin> K3bPluginManager::plugins( const QString& group ) const +TQPtrList<K3bPlugin> K3bPluginManager::plugins( const TQString& group ) const { - QPtrList<K3bPlugin> fl; - for( QPtrListIterator<K3bPlugin> it( d->plugins ); + TQPtrList<K3bPlugin> fl; + for( TQPtrListIterator<K3bPlugin> it( d->plugins ); it.current(); ++it ) { if( it.current()->group() == group || group.isEmpty() ) fl.append( it.current() ); @@ -83,12 +83,12 @@ QPtrList<K3bPlugin> K3bPluginManager::plugins( const QString& group ) const } -void K3bPluginManager::loadPlugin( const QString& fileName ) +void K3bPluginManager::loadPlugin( const TQString& fileName ) { KSimpleConfig c( fileName, true ); c.setGroup( "K3b Plugin" ); - QString libName = c.readEntry( "Lib" ); + TQString libName = c.readEntry( "Lib" ); if( libName.isEmpty() ) { kdDebug() << "(K3bPluginManager) no Lib specified in " << fileName << endl; return; @@ -115,7 +115,7 @@ void K3bPluginManager::loadPlugin( const QString& fileName ) // make sure to only use the latest version of one plugin bool addPlugin = true; - for( QPtrListIterator<K3bPlugin> it( d->plugins ); *it; ++it ) { + for( TQPtrListIterator<K3bPlugin> it( d->plugins ); *it; ++it ) { if( it.current()->pluginInfo().name() == plugin->pluginInfo().name() ) { if( K3bVersion(it.current()->pluginInfo().version()) < K3bVersion(plugin->pluginInfo().version()) ) { K3bPlugin* p = it.current(); @@ -145,12 +145,12 @@ void K3bPluginManager::loadPlugin( const QString& fileName ) void K3bPluginManager::loadAll() { // we simply search the K3b plugin dir for now - QStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" ); + TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/plugins/" ); - for( QStringList::const_iterator it = dirs.begin(); + for( TQStringList::const_iterator it = dirs.begin(); it != dirs.end(); ++it ) { - QStringList entries = QDir(*it).entryList( "*.plugin", QDir::Files ); - for( QStringList::const_iterator it2 = entries.begin(); + TQStringList entries = TQDir(*it).entryList( "*.plugin", TQDir::Files ); + for( TQStringList::const_iterator it2 = entries.begin(); it2 != entries.end(); ++it2 ) { loadPlugin( *it + *it2 ); } @@ -163,25 +163,25 @@ int K3bPluginManager::pluginSystemVersion() const } -int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, QWidget* parent, const char* name ) +int K3bPluginManager::execPluginDialog( K3bPlugin* plugin, TQWidget* tqparent, const char* name ) { - KDialogBase dlg( parent, + KDialogBase dlg( tqparent, name, true, - i18n("Configure plugin %1").arg( plugin->pluginInfo().name() ) ); + i18n("Configure plugin %1").tqarg( plugin->pluginInfo().name() ) ); K3bPluginConfigWidget* configWidget = plugin->createConfigWidget( &dlg ); if( configWidget ) { dlg.setMainWidget( configWidget ); - connect( &dlg, SIGNAL(applyClicked()), configWidget, SLOT(saveConfig()) ); - connect( &dlg, SIGNAL(okClicked()), configWidget, SLOT(saveConfig()) ); + connect( &dlg, TQT_SIGNAL(applyClicked()), configWidget, TQT_SLOT(saveConfig()) ); + connect( &dlg, TQT_SIGNAL(okClicked()), configWidget, TQT_SLOT(saveConfig()) ); configWidget->loadConfig(); int r = dlg.exec(); delete configWidget; return r; } else { - KMessageBox::sorry( parent, i18n("No settings available for plugin %1.").arg( plugin->pluginInfo().name() ) ); + KMessageBox::sorry( tqparent, i18n("No settings available for plugin %1.").tqarg( plugin->pluginInfo().name() ) ); return 0; } } diff --git a/libk3b/plugin/k3bpluginmanager.h b/libk3b/plugin/k3bpluginmanager.h index 9295dee..c047c1a 100644 --- a/libk3b/plugin/k3bpluginmanager.h +++ b/libk3b/plugin/k3bpluginmanager.h @@ -16,14 +16,14 @@ #ifndef _K3B_PLUGIN_MANAGER_H_ #define _K3B_PLUGIN_MANAGER_H_ -#include <qobject.h> -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqptrlist.h> +#include <tqstringlist.h> #include "k3b_export.h" class K3bPlugin; -class QWidget; +class TQWidget; /** @@ -32,23 +32,24 @@ class QWidget; * Like the K3bCore the single instance (which has to be created manually) * can be obtained with the k3bpluginmanager macro. */ -class LIBK3B_EXPORT K3bPluginManager : public QObject +class LIBK3B_EXPORT K3bPluginManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - K3bPluginManager( QObject* parent = 0, const char* name = 0 ); + K3bPluginManager( TQObject* tqparent = 0, const char* name = 0 ); ~K3bPluginManager(); /** * if group is empty all plugins are returned */ - QPtrList<K3bPlugin> plugins( const QString& group = QString::null ) const; + TQPtrList<K3bPlugin> plugins( const TQString& group = TQString() ) const; /** * Returnes a list of the available groups. */ - QStringList groups() const; + TQStringList groups() const; int pluginSystemVersion() const; @@ -58,9 +59,9 @@ class LIBK3B_EXPORT K3bPluginManager : public QObject */ void loadAll(); - void loadPlugin( const QString& fileName ); + void loadPlugin( const TQString& fileName ); - int execPluginDialog( K3bPlugin*, QWidget* parent = 0, const char* name = 0 ); + int execPluginDialog( K3bPlugin*, TQWidget* tqparent = 0, const char* name = 0 ); private: class Private; diff --git a/libk3b/plugin/k3bprojectplugin.h b/libk3b/plugin/k3bprojectplugin.h index c15b9a3..a8d0c47 100644 --- a/libk3b/plugin/k3bprojectplugin.h +++ b/libk3b/plugin/k3bprojectplugin.h @@ -17,7 +17,7 @@ #define _K3B_PROJECT_PLUGIN_H_ #include <k3bplugin.h> -#include <qstring.h> +#include <tqstring.h> #include "k3b_export.h" class K3bDoc; @@ -26,8 +26,8 @@ class K3bDoc; * K3bProjectPluginGUIBase interface. That way K3b can embed the GUI into * a fancy dialog which fits the overall look. * - * This is not derived from QWidget to make it possible to inherit - * from other QWidget derivates. + * This is not derived from TQWidget to make it possible to inherit + * from other TQWidget derivates. */ class K3bProjectPluginGUIBase { @@ -35,13 +35,13 @@ class K3bProjectPluginGUIBase K3bProjectPluginGUIBase() {} virtual ~K3bProjectPluginGUIBase() {} - virtual QWidget* qWidget() = 0; + virtual TQWidget* qWidget() = 0; /** * Title used for the GUI */ - virtual QString title() const = 0; - virtual QString subTitle() const { return QString::null; } + virtual TQString title() const = 0; + virtual TQString subTitle() const { return TQString(); } virtual void readSettings( KConfigBase* ) {} virtual void saveSettings( KConfigBase* ) {} @@ -68,6 +68,7 @@ class K3bProjectPluginGUIBase class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin { Q_OBJECT + TQ_OBJECT public: /** @@ -76,8 +77,8 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin * @p activate() will not be used. A plugin has a GUI if it's functionality is started * by some user input. */ - K3bProjectPlugin( int type, bool gui = false, QObject* parent = 0, const char* name = 0 ) - : K3bPlugin( parent, name ), + K3bProjectPlugin( int type, bool gui = false, TQObject* tqparent = 0, const char* name = 0 ) + : K3bPlugin( tqparent, name ), m_type(type), m_hasGUI(gui) { } @@ -100,7 +101,7 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin }; // TODO: maybe we should use something like "ProjectPlugin/AudioCD" based on the type? - QString group() const { return "ProjectPlugin"; } + TQString group() const { return "ProjectPlugin"; } /** * audio, data, videocd, or videodvd @@ -112,23 +113,23 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin /** * Text used for menu entries and the like. */ - const QString& text() const { return m_text; } - const QString& toolTip() const { return m_toolTip; } - const QString& whatsThis() const { return m_whatsThis; } - const QString& icon() const { return m_icon; } + const TQString& text() const { return m_text; } + const TQString& toolTip() const { return m_toolTip; } + const TQString& whatsThis() const { return m_whatsThis; } + const TQString& icon() const { return m_icon; } bool hasGUI() const { return m_hasGUI; } /** * Create the GUI which provides the features for the plugin. * This only needs to be implemented in case hasGUI returns true. - * The returned object has to be a QWidget based class. + * The returned object has to be a TQWidget based class. * * @param doc based on the type returned by the factory * this will be the doc to work on. It should * be dynamically casted to the needed project type. */ - virtual K3bProjectPluginGUIBase* createGUI( K3bDoc* doc, QWidget* = 0, const char* = 0 ) { Q_UNUSED(doc); return 0; } + virtual K3bProjectPluginGUIBase* createGUI( K3bDoc* doc, TQWidget* = 0, const char* = 0 ) { Q_UNUSED(doc); return 0; } /** * This is where the action happens. @@ -138,23 +139,23 @@ class LIBK3B_EXPORT K3bProjectPlugin : public K3bPlugin * this will be the doc to work on. It should * be dynamically casted to the needed project type. * - * @param parent the parent widget to be used for things like progress dialogs. + * @param tqparent the tqparent widget to be used for things like progress dialogs. */ - virtual void activate( K3bDoc* doc, QWidget* parent ) { Q_UNUSED(doc); Q_UNUSED(parent); } + virtual void activate( K3bDoc* doc, TQWidget* tqparent ) { Q_UNUSED(doc); Q_UNUSED(tqparent); } protected: - void setText( const QString& s ) { m_text = s; } - void setToolTip( const QString& s ) { m_toolTip = s; } - void setWhatsThis( const QString& s ) { m_whatsThis = s; } - void setIcon( const QString& s ) { m_icon = s; } + void setText( const TQString& s ) { m_text = s; } + void setToolTip( const TQString& s ) { m_toolTip = s; } + void setWhatsThis( const TQString& s ) { m_whatsThis = s; } + void setIcon( const TQString& s ) { m_icon = s; } private: int m_type; bool m_hasGUI; - QString m_text; - QString m_toolTip; - QString m_whatsThis; - QString m_icon; + TQString m_text; + TQString m_toolTip; + TQString m_whatsThis; + TQString m_icon; }; diff --git a/libk3b/plugin/libsamplerate/samplerate.h b/libk3b/plugin/libsamplerate/samplerate.h index dfc4448..f83ae48 100644 --- a/libk3b/plugin/libsamplerate/samplerate.h +++ b/libk3b/plugin/libsamplerate/samplerate.h @@ -123,8 +123,8 @@ const char* src_strerror (int error) ; enum { - SRC_SINC_BEST_QUALITY = 0, - SRC_SINC_MEDIUM_QUALITY = 1, + SRC_SINC_BEST_TQUALITY = 0, + SRC_SINC_MEDIUM_TQUALITY = 1, SRC_SINC_FASTEST = 2, SRC_ZERO_ORDER_HOLD = 3, SRC_LINEAR = 4 diff --git a/libk3b/plugin/libsamplerate/src_sinc.c b/libk3b/plugin/libsamplerate/src_sinc.c index ddfc06b..cca8b64 100644 --- a/libk3b/plugin/libsamplerate/src_sinc.c +++ b/libk3b/plugin/libsamplerate/src_sinc.c @@ -114,10 +114,10 @@ const char* sinc_get_name (int src_enum) { switch (src_enum) - { case SRC_SINC_BEST_QUALITY : + { case SRC_SINC_BEST_TQUALITY : return "Best Sinc Interpolator" ; - case SRC_SINC_MEDIUM_QUALITY : + case SRC_SINC_MEDIUM_TQUALITY : return "Medium Sinc Interpolator" ; case SRC_SINC_FASTEST : @@ -131,10 +131,10 @@ const char* sinc_get_description (int src_enum) { switch (src_enum) - { case SRC_SINC_BEST_QUALITY : + { case SRC_SINC_BEST_TQUALITY : return "Band limitied sinc interpolation, best quality, 97dB SNR, 96% BW." ; - case SRC_SINC_MEDIUM_QUALITY : + case SRC_SINC_MEDIUM_TQUALITY : return "Band limitied sinc interpolation, medium quality, 97dB SNR, 90% BW." ; case SRC_SINC_FASTEST : @@ -170,7 +170,7 @@ sinc_set_converter (SRC_PRIVATE *psrc, int src_enum) psrc->reset = sinc_reset ; switch (src_enum) - { case SRC_SINC_BEST_QUALITY : + { case SRC_SINC_BEST_TQUALITY : temp_filter.coeffs = high_qual_coeffs ; temp_filter.coeff_half_len = (sizeof (high_qual_coeffs) / sizeof (coeff_t)) - 1 ; temp_filter.index_inc = 128 ; @@ -178,7 +178,7 @@ sinc_set_converter (SRC_PRIVATE *psrc, int src_enum) temp_filter.coeff_len = sizeof (high_qual_coeffs) / sizeof (coeff_t) ; break ; - case SRC_SINC_MEDIUM_QUALITY : + case SRC_SINC_MEDIUM_TQUALITY : temp_filter.coeffs = mid_qual_coeffs ; temp_filter.coeff_half_len = (sizeof (mid_qual_coeffs) / sizeof (coeff_t)) - 1 ; temp_filter.index_inc = 128 ; |