diff options
Diffstat (limited to 'plugins/encoder')
20 files changed, 433 insertions, 422 deletions
diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui index dd32d08..0e59525 100644 --- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bExternalEncoderConfigWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bExternalEncoderConfigWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <p>K3b comes with a selection of predefined external applications that depends on the installed applications.</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Name</string> @@ -86,9 +86,9 @@ <cstring>m_viewEncoders</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -104,14 +104,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonRemove</cstring> </property> @@ -119,7 +119,7 @@ <string>Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonEdit</cstring> </property> @@ -127,7 +127,7 @@ <string>Edit...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonAdd</cstring> </property> @@ -141,7 +141,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kactivelabel.h</includehint> </includehints> diff --git a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui index 9f3fb5a..d6a472b 100644 --- a/plugins/encoder/external/base_k3bexternalencodereditwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencodereditwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bExternalEncoderEditWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bExternalEncoderEditWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -41,7 +41,7 @@ <cstring>m_editName</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -49,7 +49,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -59,7 +59,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -105,7 +105,7 @@ Please insert the command used to encode the audio data. The command has to read </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -116,7 +116,7 @@ Please insert the command used to encode the audio data. The command has to read <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkSwapByteOrder</cstring> </property> @@ -131,7 +131,7 @@ Please insert the command used to encode the audio data. The command has to read <p>If the resulting audio file sounds bad it is highly likely that the byte order is wrong and this option has to be checked.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkWriteWaveHeader</cstring> </property> @@ -154,7 +154,7 @@ Please insert the command used to encode the audio data. The command has to read <tabstop>m_editExtension</tabstop> <tabstop>m_editCommand</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index 4eb0218..52cd0d0 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -28,8 +28,8 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <qregexp.h> -#include <qfile.h> +#include <tqregexp.h> +#include <tqfile.h> #include <sys/types.h> #include <sys/wait.h> @@ -57,10 +57,10 @@ static const char s_riffHeader[] = -static K3bExternalEncoderCommand commandByExtension( const QString& extension ) +static K3bExternalEncoderCommand commandByExtension( const TQString& extension ) { - QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); - for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) + TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); + for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) if( (*it).extension == extension ) return *it; @@ -78,8 +78,8 @@ public: } K3bProcess* process; - QString fileName; - QString extension; + TQString fileName; + TQString extension; K3b::Msf length; K3bExternalEncoderCommand cmd; @@ -87,20 +87,20 @@ public: bool initialized; // the metaData we support - QString artist; - QString title; - QString comment; - QString trackNumber; - QString cdArtist; - QString cdTitle; - QString cdComment; - QString year; - QString genre; + TQString artist; + TQString title; + TQString comment; + TQString trackNumber; + TQString cdArtist; + TQString cdTitle; + TQString cdComment; + TQString year; + TQString genre; }; -K3bExternalEncoder::K3bExternalEncoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3bExternalEncoder::K3bExternalEncoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { d = new Private(); } @@ -113,7 +113,7 @@ K3bExternalEncoder::~K3bExternalEncoder() } -void K3bExternalEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value ) +void K3bExternalEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value ) { switch( f ) { case META_TRACK_TITLE: @@ -168,7 +168,7 @@ void K3bExternalEncoder::slotExternalProgramFinished( KProcess* p ) } -bool K3bExternalEncoder::openFile( const QString& ext, const QString& filename, const K3b::Msf& length ) +bool K3bExternalEncoder::openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length ) { d->fileName = filename; d->extension = ext; @@ -176,8 +176,8 @@ bool K3bExternalEncoder::openFile( const QString& ext, const QString& filename, d->length = length; // delete existing files as some programs (like flac for example) might refuse to overwrite files - if( QFile::exists( filename ) ) - QFile::remove( filename ); + if( TQFile::exists( filename ) ) + TQFile::remove( filename ); return true; } @@ -189,7 +189,7 @@ void K3bExternalEncoder::closeFile() } -bool K3bExternalEncoder::initEncoderInternal( const QString& extension ) +bool K3bExternalEncoder::initEncoderInternal( const TQString& extension ) { d->initialized = true; @@ -207,42 +207,42 @@ bool K3bExternalEncoder::initEncoderInternal( const QString& extension ) d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotExternalProgramFinished(KProcess*)) ); - connect( d->process, SIGNAL(stderrLine(const QString&)), - this, SLOT(slotExternalProgramOutputLine(const QString&)) ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), - this, SLOT(slotExternalProgramOutputLine(const QString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotExternalProgramFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), + this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), + this, TQT_SLOT(slotExternalProgramOutputLine(const TQString&)) ); // create the commandline - QStringList params = QStringList::split( ' ', d->cmd.command, false ); - for( QStringList::iterator it = params.begin(); it != params.end(); ++it ) { - (*it).replace( "%f", d->fileName ); - (*it).replace( "%a", d->artist ); - (*it).replace( "%t", d->title ); - (*it).replace( "%c", d->comment ); - (*it).replace( "%y", d->year ); - (*it).replace( "%m", d->cdTitle ); - (*it).replace( "%r", d->cdArtist ); - (*it).replace( "%x", d->cdComment ); - (*it).replace( "%n", d->trackNumber ); - (*it).replace( "%g", d->genre ); + TQStringList params = TQStringList::split( ' ', d->cmd.command, false ); + for( TQStringList::iterator it = params.begin(); it != params.end(); ++it ) { + (*it).tqreplace( "%f", d->fileName ); + (*it).tqreplace( "%a", d->artist ); + (*it).tqreplace( "%t", d->title ); + (*it).tqreplace( "%c", d->comment ); + (*it).tqreplace( "%y", d->year ); + (*it).tqreplace( "%m", d->cdTitle ); + (*it).tqreplace( "%r", d->cdArtist ); + (*it).tqreplace( "%x", d->cdComment ); + (*it).tqreplace( "%n", d->trackNumber ); + (*it).tqreplace( "%g", d->genre ); *d->process << *it; } kdDebug() << "***** external parameters:" << endl; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; // set one general error message - setLastError( i18n("Command failed: %1").arg( s ) ); + setLastError( i18n("Command failed: %1").tqarg( s ) ); if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { if( d->cmd.writeWaveHeader ) @@ -251,9 +251,9 @@ bool K3bExternalEncoder::initEncoderInternal( const QString& extension ) return true; } else { - QString commandName = d->cmd.command.section( QRegExp("\\s+"), 0 ); + TQString commandName = d->cmd.command.section( TQRegExp("\\s+"), 0 ); if( !KStandardDirs::findExe( commandName ).isEmpty() ) - setLastError( i18n("Could not find program '%1'").arg(commandName) ); + setLastError( i18n("Could not find program '%1'").tqarg(commandName) ); return false; } @@ -271,8 +271,8 @@ bool K3bExternalEncoder::writeWaveHeader() } // write the wave size - Q_INT32 dataSize( d->length.audioBytes() ); - Q_INT32 wavSize( dataSize + 44 - 8 ); + TQ_INT32 dataSize( d->length.audioBytes() ); + TQ_INT32 wavSize( dataSize + 44 - 8 ); char c[4]; c[0] = (wavSize >> 0 ) & 0xff; @@ -305,7 +305,7 @@ bool K3bExternalEncoder::writeWaveHeader() } -long K3bExternalEncoder::encodeInternal( const char* data, Q_ULONG len ) +long K3bExternalEncoder::encodeInternal( const char* data, TQ_ULONG len ) { if( !d->initialized ) if( !initEncoderInternal( d->extension ) ) @@ -347,33 +347,33 @@ long K3bExternalEncoder::encodeInternal( const char* data, Q_ULONG len ) } -void K3bExternalEncoder::slotExternalProgramOutputLine( const QString& line ) +void K3bExternalEncoder::slotExternalProgramOutputLine( const TQString& line ) { kdDebug() << "(" << d->cmd.name << ") " << line << endl; } -QStringList K3bExternalEncoder::extensions() const +TQStringList K3bExternalEncoder::extensions() const { - QStringList el; - QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); - for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) + TQStringList el; + TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); + for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) el.append( (*it).extension ); return el; } -QString K3bExternalEncoder::fileTypeComment( const QString& ext ) const +TQString K3bExternalEncoder::fileTypeComment( const TQString& ext ) const { return commandByExtension( ext ).name; } -K3bPluginConfigWidget* K3bExternalEncoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bExternalEncoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bExternalEncoderSettingsWidget( parent, name ); + return new K3bExternalEncoderSettingsWidget( tqparent, name ); } diff --git a/plugins/encoder/external/k3bexternalencoder.h b/plugins/encoder/external/k3bexternalencoder.h index 1612927..266299f 100644 --- a/plugins/encoder/external/k3bexternalencoder.h +++ b/plugins/encoder/external/k3bexternalencoder.h @@ -27,38 +27,39 @@ class KProcess; class K3bExternalEncoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3bExternalEncoder( QObject* parent = 0, const char* name = 0 ); + K3bExternalEncoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bExternalEncoder(); - QStringList extensions() const; + TQStringList extensions() const; - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent, const char* name ) const; /** * reimplemented since the external program is intended to write the file * TODO: allow writing to stdout. */ - bool openFile( const QString& ext, const QString& filename, const K3b::Msf& length ); + bool openFile( const TQString& ext, const TQString& filename, const K3b::Msf& length ); void closeFile(); class Command; private slots: void slotExternalProgramFinished( KProcess* ); - void slotExternalProgramOutputLine( const QString& ); + void slotExternalProgramOutputLine( const TQString& ); private: void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension ); - long encodeInternal( const char* data, Q_ULONG len ); - void setMetaDataInternal( MetaDataField, const QString& ); + bool initEncoderInternal( const TQString& extension ); + long encodeInternal( const char* data, TQ_ULONG len ); + void setMetaDataInternal( MetaDataField, const TQString& ); bool writeWaveHeader(); class Private; diff --git a/plugins/encoder/external/k3bexternalencodercommand.cpp b/plugins/encoder/external/k3bexternalencodercommand.cpp index 5dcfb23..57a0858 100644 --- a/plugins/encoder/external/k3bexternalencodercommand.cpp +++ b/plugins/encoder/external/k3bexternalencodercommand.cpp @@ -23,17 +23,17 @@ #include <kstandarddirs.h> -QValueList<K3bExternalEncoderCommand> K3bExternalEncoderCommand::readCommands() +TQValueList<K3bExternalEncoderCommand> K3bExternalEncoderCommand::readCommands() { KConfig* c = k3bcore->config(); c->setGroup( "K3bExternalEncoderPlugin" ); - QValueList<K3bExternalEncoderCommand> cl; + TQValueList<K3bExternalEncoderCommand> cl; - QStringList cmds = c->readListEntry( "commands" ); - for( QStringList::iterator it = cmds.begin(); it != cmds.end(); ++it ) { - QStringList cmdString = c->readListEntry( "command_" + *it ); + TQStringList cmds = c->readListEntry( "commands" ); + for( TQStringList::iterator it = cmds.begin(); it != cmds.end(); ++it ) { + TQStringList cmdString = c->readListEntry( "command_" + *it ); K3bExternalEncoderCommand cmd; cmd.name = cmdString[0]; cmd.extension = cmdString[1]; diff --git a/plugins/encoder/external/k3bexternalencodercommand.h b/plugins/encoder/external/k3bexternalencodercommand.h index 3351191..7e9db51 100644 --- a/plugins/encoder/external/k3bexternalencodercommand.h +++ b/plugins/encoder/external/k3bexternalencodercommand.h @@ -16,8 +16,8 @@ #ifndef _K3B_EXTERNAL_ENCODER_COMMAND_H_ #define _K3B_EXTERNAL_ENCODER_COMMAND_H_ -#include <qstring.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqvaluelist.h> class K3bExternalEncoderCommand { @@ -27,14 +27,14 @@ public: writeWaveHeader(false) { } - QString name; - QString extension; - QString command; + TQString name; + TQString extension; + TQString command; bool swapByteOrder; bool writeWaveHeader; - static QValueList<K3bExternalEncoderCommand> readCommands(); + static TQValueList<K3bExternalEncoderCommand> readCommands(); }; #endif diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index 3ab59c7..3daf9ad 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -17,10 +17,10 @@ #include <k3bcore.h> -#include <qcheckbox.h> -#include <qlayout.h> -#include <qlistview.h> -#include <qpushbutton.h> +#include <tqcheckbox.h> +#include <tqlayout.h> +#include <tqlistview.h> +#include <tqpushbutton.h> #include <klineedit.h> #include <kmessagebox.h> @@ -30,12 +30,12 @@ -K3bExternalEncoderEditDialog::K3bExternalEncoderEditDialog( QWidget* parent ) +K3bExternalEncoderEditDialog::K3bExternalEncoderEditDialog( TQWidget* tqparent ) : KDialogBase( Swallow, i18n("Editing external audio encoder"), Ok|Cancel, Ok, - parent ) + tqparent ) { m_editW = new base_K3bExternalEncoderEditWidget( this ); setMainWidget( m_editW ); @@ -86,7 +86,7 @@ void K3bExternalEncoderEditDialog::slotOk() i18n("Please specify the command line."), i18n("No command line specified") ); } - else if( !m_editW->m_editCommand->text().contains( "%f" ) ) { + else if( !m_editW->m_editCommand->text().tqcontains( "%f" ) ) { KMessageBox::error( this, i18n("Please add the output filename (%f) to the command line."), i18n("No filename specified") ); @@ -105,28 +105,28 @@ void K3bExternalEncoderEditDialog::slotOk() class K3bExternalEncoderSettingsWidget::Private { public: - QMap<QListViewItem*, K3bExternalEncoderCommand> commands; + TQMap<TQListViewItem*, K3bExternalEncoderCommand> commands; }; -K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bExternalEncoderSettingsWidget::K3bExternalEncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { d = new Private(); w = new base_K3bExternalEncoderConfigWidget( this ); - QHBoxLayout* lay = new QHBoxLayout( this ); + TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); lay->addWidget( w ); - connect( w->m_viewEncoders, SIGNAL(selectionChanged()), - this, SLOT(slotSelectionChanged()) ); - connect( w->m_buttonAdd, SIGNAL(clicked()), - this, SLOT(slotNewCommand()) ); - connect( w->m_buttonEdit, SIGNAL(clicked()), - this, SLOT(slotEditCommand()) ); - connect( w->m_buttonRemove, SIGNAL(clicked()), - this, SLOT(slotRemoveCommand()) ); + connect( w->m_viewEncoders, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotSelectionChanged()) ); + connect( w->m_buttonAdd, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotNewCommand()) ); + connect( w->m_buttonEdit, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotEditCommand()) ); + connect( w->m_buttonRemove, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotRemoveCommand()) ); m_editDlg = new K3bExternalEncoderEditDialog( this ); } @@ -143,9 +143,9 @@ void K3bExternalEncoderSettingsWidget::slotNewCommand() // clear the dialog m_editDlg->setCommand( K3bExternalEncoderCommand() ); - if( m_editDlg->exec() == QDialog::Accepted ) { + if( m_editDlg->exec() == TQDialog::Accepted ) { K3bExternalEncoderCommand cmd = m_editDlg->currentCommand(); - d->commands.insert( new QListViewItem( w->m_viewEncoders, + d->commands.insert( new TQListViewItem( w->m_viewEncoders, w->m_viewEncoders->lastItem(), cmd.name, cmd.extension, @@ -164,9 +164,9 @@ void K3bExternalEncoderSettingsWidget::slotSelectionChanged() void K3bExternalEncoderSettingsWidget::slotEditCommand() { - if( QListViewItem* item = w->m_viewEncoders->selectedItem() ) { + if( TQListViewItem* item = w->m_viewEncoders->selectedItem() ) { m_editDlg->setCommand( d->commands[item] ); - if( m_editDlg->exec() == QDialog::Accepted ) { + if( m_editDlg->exec() == TQDialog::Accepted ) { d->commands[item] = m_editDlg->currentCommand(); } } @@ -175,7 +175,7 @@ void K3bExternalEncoderSettingsWidget::slotEditCommand() void K3bExternalEncoderSettingsWidget::slotRemoveCommand() { - if( QListViewItem* item = w->m_viewEncoders->selectedItem() ) { + if( TQListViewItem* item = w->m_viewEncoders->selectedItem() ) { d->commands.erase( item ); delete item; } @@ -187,11 +187,11 @@ void K3bExternalEncoderSettingsWidget::loadConfig() d->commands.clear(); w->m_viewEncoders->clear(); - QValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); - for( QValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); + TQValueList<K3bExternalEncoderCommand> cmds( K3bExternalEncoderCommand::readCommands() ); + for( TQValueList<K3bExternalEncoderCommand>::iterator it = cmds.begin(); it != cmds.end(); ++it ) { K3bExternalEncoderCommand& cmd = *it; - d->commands.insert( new QListViewItem( w->m_viewEncoders, + d->commands.insert( new TQListViewItem( w->m_viewEncoders, w->m_viewEncoders->lastItem(), cmd.name, cmd.extension, @@ -207,10 +207,10 @@ void K3bExternalEncoderSettingsWidget::saveConfig() c->deleteGroup( "K3bExternalEncoderPlugin", true ); c->setGroup( "K3bExternalEncoderPlugin" ); - QStringList cmdNames; - for( QMapIterator<QListViewItem*, K3bExternalEncoderCommand> it = d->commands.begin(); + TQStringList cmdNames; + for( TQMapIterator<TQListViewItem*, K3bExternalEncoderCommand> it = d->commands.begin(); it != d->commands.end(); ++it ) { - QStringList cmd; + TQStringList cmd; cmd << it.data().name << it.data().extension << it.data().command; if( it.data().swapByteOrder ) cmd << "swap"; diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.h b/plugins/encoder/external/k3bexternalencoderconfigwidget.h index 4f6dd47..c8c607a 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.h +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.h @@ -27,9 +27,10 @@ class K3bExternalEncoderEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - K3bExternalEncoderEditDialog( QWidget* parent ); + K3bExternalEncoderEditDialog( TQWidget* tqparent ); ~K3bExternalEncoderEditDialog(); K3bExternalEncoderCommand currentCommand() const; @@ -46,9 +47,10 @@ class K3bExternalEncoderEditDialog : public KDialogBase class K3bExternalEncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bExternalEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bExternalEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bExternalEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui index 199895e..81cb521 100644 --- a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui +++ b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bLameEncoderSettingsWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,11 +20,11 @@ <property name="margin"> <number>0</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>m_mainTab</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -35,7 +35,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_groupVariableBitrate</cstring> </property> @@ -46,15 +46,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioQualityLevel</cstring> </property> @@ -65,7 +65,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelQualityLevel</cstring> </property> @@ -77,13 +77,13 @@ <property name="text"> <string>textLabel1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>m_qualityLevelFrame</cstring> </property> @@ -116,22 +116,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -143,11 +143,11 @@ <property name="text"> <string>high quality</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -160,7 +160,7 @@ <string>small file</string> </property> </widget> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_sliderQuality</cstring> </property> @@ -191,22 +191,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioManual</cstring> </property> @@ -214,7 +214,7 @@ <string>Manual settings:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelManualSettings</cstring> </property> @@ -229,15 +229,15 @@ <property name="text"> <string>textLabel2</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> @@ -259,14 +259,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>5</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_buttonManualSettings</cstring> </property> @@ -283,7 +283,7 @@ </widget> </hbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -294,7 +294,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -324,9 +324,9 @@ <p><b>This setting has no influence on the size of the resulting file.</b></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -335,7 +335,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -348,7 +348,7 @@ <string>fast encoding</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -360,7 +360,7 @@ <property name="text"> <string>high quality</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -368,7 +368,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -387,7 +387,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkCopyright</cstring> </property> @@ -398,7 +398,7 @@ <string>Mark the encoded file as being copyrighted.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkOriginal</cstring> </property> @@ -409,7 +409,7 @@ <string>Mark the encoded file as being a copy.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkISO</cstring> </property> @@ -424,7 +424,7 @@ This results in many wasted bits for high bitrate encodings but will ensure strict ISO compatibility. This compatibility might be important for hardware players.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkError</cstring> </property> @@ -473,7 +473,7 @@ This results in many wasted bits for high bitrate encodings but will ensure <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui index a3bff90..e0ac569 100644 --- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui +++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bManualBitrateSettingsWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>base_K3bManualBitrateSettingsWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioConstantBitrate</cstring> </property> @@ -41,9 +41,9 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -73,7 +73,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioVariableBitrate</cstring> </property> @@ -81,7 +81,7 @@ <string>Variable Bitrate</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5</cstring> </property> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -134,7 +134,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>m_checkBitrateMaximum</cstring> </property> @@ -142,7 +142,7 @@ <string>Maximum bitrate:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>m_checkBitrateMinimum</cstring> </property> @@ -150,7 +150,7 @@ <string>Minimum bitrate:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>m_checkBitrateAverage</cstring> </property> @@ -166,7 +166,7 @@ <string>Average bitrate:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>m_spinAverageBitrate</cstring> </property> @@ -190,7 +190,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -269,5 +269,5 @@ The input will be encoded as a mono signal. If it was a stereo signal, it will b <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index 089c7d0..19cbf16 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -28,18 +28,18 @@ #include <kcombobox.h> #include <kdialogbase.h> -#include <qlayout.h> -#include <qcstring.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qspinbox.h> -#include <qgroupbox.h> -#include <qbuttongroup.h> -#include <qtextcodec.h> -#include <qfile.h> -#include <qslider.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqcstring.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqspinbox.h> +#include <tqgroupbox.h> +#include <tqbuttongroup.h> +#include <tqtextcodec.h> +#include <tqfile.h> +#include <tqslider.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <stdio.h> #include <lame/lame.h> @@ -135,15 +135,15 @@ public: char buffer[8000]; - QString filename; + TQString filename; FILE* fid; }; -K3bLameEncoder::K3bLameEncoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3bLameEncoder::K3bLameEncoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { d = new Private(); } @@ -157,12 +157,12 @@ K3bLameEncoder::~K3bLameEncoder() } -bool K3bLameEncoder::openFile( const QString& extension, const QString& filename, const K3b::Msf& length ) +bool K3bLameEncoder::openFile( const TQString& extension, const TQString& filename, const K3b::Msf& length ) { closeFile(); d->filename = filename; - d->fid = ::fopen( QFile::encodeName( filename ), "w+" ); + d->fid = ::fopen( TQFile::encodeName( filename ), "w+" ); if( d->fid ) return initEncoder( extension, length ); else @@ -187,13 +187,13 @@ void K3bLameEncoder::closeFile() } -const QString& K3bLameEncoder::filename() const +const TQString& K3bLameEncoder::filename() const { return d->filename; } -bool K3bLameEncoder::initEncoderInternal( const QString&, const K3b::Msf& length ) +bool K3bLameEncoder::initEncoderInternal( const TQString&, const K3b::Msf& length ) { KConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); @@ -226,7 +226,7 @@ bool K3bLameEncoder::initEncoderInternal( const QString&, const K3b::Msf& length // // Mode // - QString mode = c->readEntry( "Mode", "stereo" ); + TQString mode = c->readEntry( "Mode", "stereo" ); if( mode == "stereo" ) lame_set_mode( d->flags, STEREO ); else if( mode == "joint" ) @@ -323,7 +323,7 @@ bool K3bLameEncoder::initEncoderInternal( const QString&, const K3b::Msf& length } -long K3bLameEncoder::encodeInternal( const char* data, Q_ULONG len ) +long K3bLameEncoder::encodeInternal( const char* data, TQ_ULONG len ) { // FIXME: we may have to swap data here int size = lame_encode_buffer_interleaved( d->flags, @@ -355,11 +355,11 @@ void K3bLameEncoder::finishEncoderInternal() } -void K3bLameEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value ) +void K3bLameEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value ) { // let's not use UTF-8 here since I don't know how to tell lame... // FIXME: when we use the codec we only get garbage. Why? - QTextCodec* codec = 0;//QTextCodec::codecForName( "ISO8859-1" ); + TQTextCodec* codec = 0;//TQTextCodec::codecForName( "ISO8859-1" ); // if( !codec ) // kdDebug() << "(K3bLameEncoder) could not find codec ISO8859-1." << endl; @@ -398,8 +398,8 @@ void K3bLameEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, cons -K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { m_w = new base_K3bLameEncoderSettingsWidget( this ); m_w->m_sliderQuality->setRange( 0, 9 ); @@ -411,26 +411,26 @@ K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( QWidget* parent, con m_manualSettingsDlg->setMainWidget( m_brW ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); + m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); + m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); + m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); - QHBoxLayout* lay = new QHBoxLayout( this ); + TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); lay->addWidget( m_w ); // TODO: add whatsthis help for the quality level. - // QString qualityLevelWhatsThis = i18n("<p>"); + // TQString qualityLevelWhatsThis = i18n("<p>"); - connect( m_w->m_buttonManualSettings, SIGNAL(clicked()), - this, SLOT(slotShowManualSettings()) ); - connect( m_w->m_sliderQuality, SIGNAL(valueChanged(int)), - this, SLOT(slotQualityLevelChanged(int)) ); + connect( m_w->m_buttonManualSettings, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotShowManualSettings()) ); + connect( m_w->m_sliderQuality, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotQualityLevelChanged(int)) ); updateManualSettingsLabel(); slotQualityLevelChanged( 5 ); @@ -452,7 +452,7 @@ void K3bLameEncoderSettingsWidget::slotShowManualSettings() int av = m_brW->m_spinAverageBitrate->value(); int mode = m_brW->m_comboMode->currentItem(); - if( m_manualSettingsDlg->exec() == QDialog::Rejected ) { + if( m_manualSettingsDlg->exec() == TQDialog::Rejected ) { m_brW->m_radioConstantBitrate->setChecked( constant ); m_brW->m_comboConstantBitrate->setCurrentItem( constBitrate ); m_brW->m_comboMaximumBitrate->setCurrentItem( max ); @@ -469,11 +469,11 @@ void K3bLameEncoderSettingsWidget::updateManualSettingsLabel() { if( m_brW->m_radioConstantBitrate->isChecked() ) m_w->m_labelManualSettings->setText( i18n("Constant Bitrate: %1 kbps (%2)") - .arg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()]) - .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); + .tqarg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()]) + .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); else m_w->m_labelManualSettings->setText( i18n("Variable Bitrate (%1)") - .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); + .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); } @@ -488,7 +488,7 @@ void K3bLameEncoderSettingsWidget::loadConfig() KConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); - QString mode = c->readEntry( "Mode", "stereo" ); + TQString mode = c->readEntry( "Mode", "stereo" ); if( mode == "stereo" ) m_brW->m_comboMode->setCurrentItem( 0 ); else if( mode == "joint" ) @@ -507,9 +507,9 @@ void K3bLameEncoderSettingsWidget::loadConfig() else m_brW->m_radioConstantBitrate->setChecked( true ); - m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Constant Bitrate", 128 )) ); - m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Maximum Bitrate", 224 )) ); - m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Minimum Bitrate", 32 )) ); + m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Constant Bitrate", 128 )) ); + m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Maximum Bitrate", 224 )) ); + m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Minimum Bitrate", 32 )) ); m_brW->m_spinAverageBitrate->setValue( c->readNumEntry( "Average Bitrate", 128) ); m_brW->m_checkBitrateMaximum->setChecked( c->readBoolEntry( "Use Maximum Bitrate", false ) ); @@ -535,7 +535,7 @@ void K3bLameEncoderSettingsWidget::saveConfig() KConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); - QString mode; + TQString mode; switch( m_brW->m_comboMode->currentItem() ) { case 0: mode = "stereo"; @@ -574,19 +574,19 @@ void K3bLameEncoderSettingsWidget::saveConfig() -QStringList K3bLameEncoder::extensions() const +TQStringList K3bLameEncoder::extensions() const { - return QStringList( "mp3" ); + return TQStringList( "mp3" ); } -QString K3bLameEncoder::fileTypeComment( const QString& ) const +TQString K3bLameEncoder::fileTypeComment( const TQString& ) const { return "MPEG1 Layer III (mp3)"; } -long long K3bLameEncoder::fileSize( const QString&, const K3b::Msf& msf ) const +long long K3bLameEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { KConfig* c = k3bcore->config(); c->setGroup( "K3bLameEncoderPlugin" ); @@ -617,10 +617,10 @@ long long K3bLameEncoder::fileSize( const QString&, const K3b::Msf& msf ) const } -K3bPluginConfigWidget* K3bLameEncoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bLameEncoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bLameEncoderSettingsWidget( parent, name ); + return new K3bLameEncoderSettingsWidget( tqparent, name ); } diff --git a/plugins/encoder/lame/k3blameencoder.h b/plugins/encoder/lame/k3blameencoder.h index 424ea64..25f5975 100644 --- a/plugins/encoder/lame/k3blameencoder.h +++ b/plugins/encoder/lame/k3blameencoder.h @@ -30,32 +30,33 @@ class KDialogBase; class K3bLameEncoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3bLameEncoder( QObject* parent = 0, const char* name = 0 ); + K3bLameEncoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bLameEncoder(); - bool openFile( const QString& extension, const QString& filename, const K3b::Msf& length ); + bool openFile( const TQString& extension, const TQString& filename, const K3b::Msf& length ); bool isOpen() const; void closeFile(); - const QString& filename() const; + const TQString& filename() const; - QStringList extensions() const; + TQStringList extensions() const; - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; - long long fileSize( const QString&, const K3b::Msf& msf ) const; + long long fileSize( const TQString&, const K3b::Msf& msf ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension, const K3b::Msf& length ); - long encodeInternal( const char* data, Q_ULONG len ); - void setMetaDataInternal( MetaDataField, const QString& ); + bool initEncoderInternal( const TQString& extension, const K3b::Msf& length ); + long encodeInternal( const char* data, TQ_ULONG len ); + void setMetaDataInternal( MetaDataField, const TQString& ); class Private; Private* d; @@ -65,9 +66,10 @@ class K3bLameEncoder : public K3bAudioEncoder class K3bLameEncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bLameEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bLameEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bLameEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui index 3e31265..d669f1e 100644 --- a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui +++ b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>base_K3bOggVorbisEncoderSettingsWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -31,15 +31,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioQualityLevel</cstring> </property> @@ -56,7 +56,7 @@ <string><p>Vorbis' audio quality is not best measured in kilobits per second, but on a scale from -1 to 10 called "quality". <p>For now, quality -1 is roughly equivalent to 45kbps average, 5 is roughly 160kbps, and 10 gives about 400kbps. Most people seeking very-near-CD-quality audio encode at a quality of 5 or, for lossless stereo coupling, 6. The default setting is quality 3, which at approximately 110kbps gives a smaller filesize and significantly better fidelity than .mp3 compression at 128kbps. <p><em>This explanation was copied from the www.vorbis.com FAQ.</em></string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_labelQualityLevel</cstring> </property> @@ -68,13 +68,13 @@ <property name="text"> <string>textLabel1</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame6</cstring> </property> @@ -101,22 +101,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQSlider" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_slideQualityLevel</cstring> </property> @@ -136,7 +136,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -148,11 +148,11 @@ <property name="text"> <string>high quality</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -179,14 +179,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioManual</cstring> </property> @@ -194,9 +194,9 @@ <string>M&anual settings:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -212,14 +212,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -239,7 +239,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_checkBitrateUpper</cstring> </property> @@ -247,7 +247,7 @@ <string>&Upper bitrate:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_checkBitrateLower</cstring> </property> @@ -295,7 +295,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -303,7 +303,7 @@ <string>kbps</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -311,7 +311,7 @@ <string>kbps</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -319,7 +319,7 @@ <string>kbps</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_checkBitrateNominal</cstring> </property> @@ -383,7 +383,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index 54e6ecb..22f49a6 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -26,15 +26,15 @@ #include <kdebug.h> #include <knuminput.h> -#include <qlayout.h> -#include <qradiobutton.h> -#include <qslider.h> -#include <qlcdnumber.h> -#include <qcheckbox.h> -#include <qcstring.h> -#include <qtooltip.h> -#include <qwhatsthis.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqradiobutton.h> +#include <tqslider.h> +#include <tqlcdnumber.h> +#include <tqcheckbox.h> +#include <tqcstring.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> +#include <tqlabel.h> #include <vorbis/vorbisenc.h> @@ -124,8 +124,8 @@ public: }; -K3bOggVorbisEncoder::K3bOggVorbisEncoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3bOggVorbisEncoder::K3bOggVorbisEncoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { d = new Private(); } @@ -138,7 +138,7 @@ K3bOggVorbisEncoder::~K3bOggVorbisEncoder() } -bool K3bOggVorbisEncoder::initEncoderInternal( const QString&, const K3b::Msf& ) +bool K3bOggVorbisEncoder::initEncoderInternal( const TQString&, const K3b::Msf& ) { cleanup(); @@ -194,7 +194,7 @@ bool K3bOggVorbisEncoder::initEncoderInternal( const QString&, const K3b::Msf& ) vorbis_comment_init( d->vorbisComment ); // add the encoder tag (so everybody knows we did it! ;) - vorbis_comment_add_tag( d->vorbisComment, QCString("ENCODER").data(), QCString("K3bOggVorbisEncoderPlugin").data() ); + vorbis_comment_add_tag( d->vorbisComment, TQCString("ENCODER").data(), TQCString("K3bOggVorbisEncoderPlugin").data() ); // set up the analysis state and auxiliary encoding storage d->vorbisDspState = new vorbis_dsp_state; @@ -251,7 +251,7 @@ bool K3bOggVorbisEncoder::writeOggHeaders() // This ensures the actual // audio data will start on a new page, as per spec // - QByteArray data; + TQByteArray data; while( ogg_stream_flush( d->oggStream, d->oggPage ) ) { writeData( (char*)d->oggPage->header, d->oggPage->header_len ); writeData( (char*)d->oggPage->body, d->oggPage->body_len ); @@ -263,7 +263,7 @@ bool K3bOggVorbisEncoder::writeOggHeaders() } -long K3bOggVorbisEncoder::encodeInternal( const char* data, Q_ULONG len ) +long K3bOggVorbisEncoder::encodeInternal( const char* data, TQ_ULONG len ) { if( !d->headersWritten ) if( !writeOggHeaders() ) @@ -328,10 +328,10 @@ void K3bOggVorbisEncoder::finishEncoderInternal() } -void K3bOggVorbisEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value ) +void K3bOggVorbisEncoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value ) { if( d->vorbisComment ) { - QCString key; + TQCString key; switch( f ) { case META_TRACK_TITLE: @@ -426,13 +426,13 @@ void K3bOggVorbisEncoder::loadConfig() -K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { w = new base_K3bOggVorbisEncoderSettingsWidget( this ); - QString ttQuality = i18n("Controls the quality of the encoded files."); - QString wsQuality = i18n("<p>Vorbis' audio quality is not best measured in kilobits per second, " + TQString ttQuality = i18n("Controls the quality of the encoded files."); + TQString wsQuality = i18n("<p>Vorbis' audio quality is not best measured in kilobits per second, " "but on a scale from -1 to 10 called <em>quality</em>." "<p>For now, quality -1 is roughly equivalent to 45kbps average, " "5 is roughly 160kbps, and 10 gives about 400kbps. " @@ -442,21 +442,21 @@ K3bOggVorbisEncoderSettingsWidget::K3bOggVorbisEncoderSettingsWidget( QWidget* p "than .mp3 compression at 128kbps." "<p><em>This explanation is based on the one from the www.vorbis.com FAQ.</em>"); - QToolTip::add( w->m_radioQualityLevel, ttQuality ); - QToolTip::add( w->m_labelQualityLevel, ttQuality ); - QToolTip::add( w->m_slideQualityLevel, ttQuality ); - QWhatsThis::add( w->m_radioQualityLevel, wsQuality ); - QWhatsThis::add( w->m_labelQualityLevel, wsQuality ); - QWhatsThis::add( w->m_slideQualityLevel, wsQuality ); + TQToolTip::add( w->m_radioQualityLevel, ttQuality ); + TQToolTip::add( w->m_labelQualityLevel, ttQuality ); + TQToolTip::add( w->m_slideQualityLevel, ttQuality ); + TQWhatsThis::add( w->m_radioQualityLevel, wsQuality ); + TQWhatsThis::add( w->m_labelQualityLevel, wsQuality ); + TQWhatsThis::add( w->m_slideQualityLevel, wsQuality ); - QHBoxLayout* lay = new QHBoxLayout( this ); + TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); lay->addWidget( w ); - connect( w->m_slideQualityLevel, SIGNAL(valueChanged(int)), - this, SLOT(slotQualityLevelChanged(int)) ); + connect( w->m_slideQualityLevel, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotQualityLevelChanged(int)) ); slotQualityLevelChanged( 4 ); } @@ -469,8 +469,8 @@ K3bOggVorbisEncoderSettingsWidget::~K3bOggVorbisEncoderSettingsWidget() void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val ) { - w->m_labelQualityLevel->setText( QString::number(val) + " " - + i18n("(targetted VBR of %1)").arg(s_rough_average_quality_level_bitrates[val+1]) ); + w->m_labelQualityLevel->setText( TQString::number(val) + " " + + i18n("(targetted VBR of %1)").tqarg(s_rough_average_quality_level_bitrates[val+1]) ); } @@ -510,13 +510,13 @@ void K3bOggVorbisEncoderSettingsWidget::saveConfig() } -QString K3bOggVorbisEncoder::fileTypeComment( const QString& ) const +TQString K3bOggVorbisEncoder::fileTypeComment( const TQString& ) const { return i18n("Ogg-Vorbis"); } -long long K3bOggVorbisEncoder::fileSize( const QString&, const K3b::Msf& msf ) const +long long K3bOggVorbisEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { KConfig* c = k3bcore->config(); c->setGroup( "K3bOggVorbisEncoderPlugin" ); @@ -545,10 +545,10 @@ long long K3bOggVorbisEncoder::fileSize( const QString&, const K3b::Msf& msf ) c } -K3bPluginConfigWidget* K3bOggVorbisEncoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bOggVorbisEncoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bOggVorbisEncoderSettingsWidget( parent, name ); + return new K3bOggVorbisEncoderSettingsWidget( tqparent, name ); } diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.h b/plugins/encoder/ogg/k3boggvorbisencoder.h index 0148713..801021f 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.h +++ b/plugins/encoder/ogg/k3boggvorbisencoder.h @@ -27,28 +27,29 @@ class base_K3bOggVorbisEncoderSettingsWidget; class K3bOggVorbisEncoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3bOggVorbisEncoder( QObject* parent = 0, const char* name = 0 ); + K3bOggVorbisEncoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bOggVorbisEncoder(); - QStringList extensions() const { return QStringList("ogg"); } + TQStringList extensions() const { return TQStringList("ogg"); } - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; - long long fileSize( const QString&, const K3b::Msf& msf ) const; + long long fileSize( const TQString&, const K3b::Msf& msf ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: void loadConfig(); void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension, const K3b::Msf& length ); - long encodeInternal( const char* data, Q_ULONG len ); - void setMetaDataInternal( MetaDataField, const QString& ); + bool initEncoderInternal( const TQString& extension, const K3b::Msf& length ); + long encodeInternal( const char* data, TQ_ULONG len ); + void setMetaDataInternal( MetaDataField, const TQString& ); bool writeOggHeaders(); void cleanup(); @@ -62,9 +63,10 @@ class K3bOggVorbisEncoder : public K3bAudioEncoder class K3bOggVorbisEncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bOggVorbisEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bOggVorbisEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bOggVorbisEncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/skeleton.cpp b/plugins/encoder/skeleton.cpp index 7a46caf..ef1a1c9 100644 --- a/plugins/encoder/skeleton.cpp +++ b/plugins/encoder/skeleton.cpp @@ -25,8 +25,8 @@ K_EXPORT_COMPONENT_FACTORY( libk3b<name>encoder, K3bPluginFactory<K3b<name>Encoder>( "libk3b<name>encoder" ) ) -K3b<name>Encoder::K3b<name>Encoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3b<name>Encoder::K3b<name>Encoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { } @@ -36,14 +36,14 @@ K3b<name>Encoder::~K3b<name>Encoder() } -bool K3b<name>Encoder::initEncoderInternal( const QString& ) +bool K3b<name>Encoder::initEncoderInternal( const TQString& ) { // PUT YOUR CODE HERE return false; } -long K3b<name>Encoder::encodeInternal( const char* data, Q_ULONG len ) +long K3b<name>Encoder::encodeInternal( const char* data, TQ_ULONG len ) { // PUT YOUR CODE HERE return false; @@ -56,43 +56,43 @@ void K3b<name>Encoder::finishEncoderInternal() } -void K3b<name>Encoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const QString& value ) +void K3b<name>Encoder::setMetaDataInternal( K3bAudioEncoder::MetaDataField f, const TQString& value ) { // PUT YOUR CODE HERE } -QStringList K3b<name>Encoder::extensions() const +TQStringList K3b<name>Encoder::extensions() const { // PUT YOUR CODE HERE - return QStringList( "" ); + return TQStringList( "" ); } -QString K3b<name>Encoder::fileTypeComment( const QString& ) const +TQString K3b<name>Encoder::fileTypeComment( const TQString& ) const { // PUT YOUR CODE HERE return ""; } -long long K3b<name>Encoder::fileSize( const QString&, const K3b::Msf& msf ) const +long long K3b<name>Encoder::fileSize( const TQString&, const K3b::Msf& msf ) const { // PUT YOUR CODE HERE return -1; } -K3bPluginConfigWidget* K3b<name>Encoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3b<name>Encoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3b<name>EncoderSettingsWidget( parent, name ); + return new K3b<name>EncoderSettingsWidget( tqparent, name ); } -K3b<name>EncoderSettingsWidget::K3b<name>EncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3b<name>EncoderSettingsWidget::K3b<name>EncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { } diff --git a/plugins/encoder/skeleton.h b/plugins/encoder/skeleton.h index 78c733e..49258f3 100644 --- a/plugins/encoder/skeleton.h +++ b/plugins/encoder/skeleton.h @@ -24,36 +24,38 @@ class K3b<name>Encoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3b<name>Encoder( QObject* parent = 0, const char* name = 0 ); + K3b<name>Encoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3b<name>Encoder(); - QStringList extensions() const; + TQStringList extensions() const; - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; - long long fileSize( const QString&, const K3b::Msf& msf ) const; + long long fileSize( const TQString&, const K3b::Msf& msf ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; private: void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension ); - long encodeInternal( const char* data, Q_ULONG len ); - void setMetaDataInternal( MetaDataField, const QString& ); + bool initEncoderInternal( const TQString& extension ); + long encodeInternal( const char* data, TQ_ULONG len ); + void setMetaDataInternal( MetaDataField, const TQString& ); }; class K3b<name>EncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3b<name>EncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3b<name>EncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3b<name>EncoderSettingsWidget(); public slots: diff --git a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui index 7d8ee43..7fb8008 100644 --- a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui +++ b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>base_K3bSoxEncoderConfigWidget</class> <author>Sebastian Trueg</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkManual</cstring> </property> @@ -28,9 +28,9 @@ <string>Manual settings (used for all file types)</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -46,22 +46,22 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>10</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -69,7 +69,7 @@ <string>Sample rate:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>Signed Linear</string> @@ -121,7 +121,7 @@ <p><b>U-law</b> (actually shorthand for mu-law) and <b>A-law</b> are the U.S. and international standards for logarithmic telephone sound compression. When uncompressed u-law has roughly the precision of 14-bit PCM audio and A-law has roughly the precision of 13-bit PCM audio. A-law and u-law data is sometimes encoded using a reversed bit-ordering (i.e. MSB becomes LSB).<br> <b>ADPCM </b> is a form of sound compression that has a good compromise between good sound quality and fast encoding/decoding time. It is used for telephone sound compression and places where full fidelity is not as important. When uncompressed it has roughly the precision of 16-bit PCM audio. Popular versions of ADPCM include G.726, MS ADPCM, and IMA ADPCM. It has different meanings in different file handlers. In .wav files it represents MS ADPCM files, in all others it means G.726 ADPCM. <br> <b>IMA ADPCM</b> is a specific form of ADPCM compression, slightly simpler and slightly lower fidelity than Microsoft's flavor of ADPCM. IMA ADPCM is also called DVI ADPCM.<br> <b>GSM</b> is a standard used for telephone sound compression in European countries and is gaining popularity because of its good quality. It is usually CPU intensive to work with GSM audio data.</p> <p><em>Description based on the SoX manpage</em></p></string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_editSamplerate</cstring> </property> @@ -135,7 +135,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -143,7 +143,7 @@ <string>Data size:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -151,7 +151,7 @@ <string>Data encoding:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -159,7 +159,7 @@ <string>Channels:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>1 (mono)</string> @@ -182,7 +182,7 @@ <bool>false</bool> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>Bytes</string> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>250</width> <height>16</height> @@ -254,5 +254,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index ecae2e4..d170ab8 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -27,13 +27,13 @@ #include <kconfig.h> #include <klocale.h> -#include <qfileinfo.h> -#include <qfile.h> -#include <qvalidator.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qlayout.h> +#include <tqfileinfo.h> +#include <tqfile.h> +#include <tqvalidator.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqlayout.h> #include <sys/types.h> #include <sys/wait.h> @@ -50,19 +50,19 @@ class K3bSoxProgram : public K3bExternalProgram : K3bExternalProgram( "sox" ) { } - bool scan( const QString& p ) { + bool scan( const TQString& p ) { if( p.isEmpty() ) return false; - QString path = p; - QFileInfo fi( path ); + TQString path = p; + TQFileInfo fi( path ); if( fi.isDir() ) { if( path[path.length()-1] != '/' ) path.append("/"); path.append("sox"); } - if( !QFile::exists( path ) ) + if( !TQFile::exists( path ) ) return false; K3bExternalBin* bin = 0; @@ -73,10 +73,10 @@ class K3bSoxProgram : public K3bExternalProgram vp << path << "-h"; if( vp.start( KProcess::Block, KProcess::AllOutput ) ) { - int pos = out.output().find( "sox: SoX Version" ); + int pos = out.output().tqfind( "sox: SoX Version" ); if ( pos < 0 ) - pos = out.output().find( "sox: SoX v" ); // newer sox versions - int endPos = out.output().find( "\n", pos ); + pos = out.output().tqfind( "sox: SoX v" ); // newer sox versions + int endPos = out.output().tqfind( "\n", pos ); if( pos > 0 && endPos > 0 ) { pos += 17; bin = new K3bExternalBin( this ); @@ -88,8 +88,8 @@ class K3bSoxProgram : public K3bExternalProgram return true; } else { - pos = out.output().find( "sox: Version" ); - endPos = out.output().find( "\n", pos ); + pos = out.output().tqfind( "sox: Version" ); + endPos = out.output().tqfind( "\n", pos ); if( pos > 0 && endPos > 0 ) { pos += 13; bin = new K3bExternalBin( this ); @@ -118,12 +118,12 @@ public: } K3bProcess* process; - QString fileName; + TQString fileName; }; -K3bSoxEncoder::K3bSoxEncoder( QObject* parent, const char* name ) - : K3bAudioEncoder( parent, name ) +K3bSoxEncoder::K3bSoxEncoder( TQObject* tqparent, const char* name ) + : K3bAudioEncoder( tqparent, name ) { if( k3bcore->externalBinManager()->program( "sox" ) == 0 ) k3bcore->externalBinManager()->addProgram( new K3bSoxProgram() ); @@ -160,7 +160,7 @@ void K3bSoxEncoder::slotSoxFinished( KProcess* p ) } -bool K3bSoxEncoder::openFile( const QString& ext, const QString& filename, const K3b::Msf& ) +bool K3bSoxEncoder::openFile( const TQString& ext, const TQString& filename, const K3b::Msf& ) { d->fileName = filename; return initEncoderInternal( ext ); @@ -173,7 +173,7 @@ void K3bSoxEncoder::closeFile() } -bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) +bool K3bSoxEncoder::initEncoderInternal( const TQString& extension ) { const K3bExternalBin* soxBin = k3bcore->externalBinManager()->binObject( "sox" ); if( soxBin ) { @@ -182,12 +182,12 @@ bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) d->process->setSplitStdout(true); d->process->setRawStdin(true); - connect( d->process, SIGNAL(processExited(KProcess*)), - this, SLOT(slotSoxFinished(KProcess*)) ); - connect( d->process, SIGNAL(stderrLine(const QString&)), - this, SLOT(slotSoxOutputLine(const QString&)) ); - connect( d->process, SIGNAL(stdoutLine(const QString&)), - this, SLOT(slotSoxOutputLine(const QString&)) ); + connect( d->process, TQT_SIGNAL(processExited(KProcess*)), + this, TQT_SLOT(slotSoxFinished(KProcess*)) ); + connect( d->process, TQT_SIGNAL(stderrLine(const TQString&)), + this, TQT_SLOT(slotSoxOutputLine(const TQString&)) ); + connect( d->process, TQT_SIGNAL(stdoutLine(const TQString&)), + this, TQT_SLOT(slotSoxOutputLine(const TQString&)) ); // input settings *d->process << soxBin->path @@ -204,13 +204,13 @@ bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) KConfig* c = k3bcore->config(); c->setGroup( "K3bSoxEncoderPlugin" ); if( c->readBoolEntry( "manual settings", false ) ) { - *d->process << "-r" << QString::number( c->readNumEntry( "samplerate", 44100 ) ) - << "-c" << QString::number( c->readNumEntry( "channels", 2 ) ); + *d->process << "-r" << TQString::number( c->readNumEntry( "samplerate", 44100 ) ) + << "-c" << TQString::number( c->readNumEntry( "channels", 2 ) ); int size = c->readNumEntry( "data size", 16 ); - *d->process << ( size == 8 ? QString("-b") : ( size == 32 ? QString("-l") : QString("-w") ) ); + *d->process << ( size == 8 ? TQString("-b") : ( size == 32 ? TQString("-l") : TQString("-w") ) ); - QString encoding = c->readEntry( "data encoding", "signed" ); + TQString encoding = c->readEntry( "data encoding", "signed" ); if( encoding == "unsigned" ) *d->process << "-u"; else if( encoding == "u-law" ) @@ -232,9 +232,9 @@ bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) *d->process << d->fileName; kdDebug() << "***** sox parameters:" << endl; - const QValueList<QCString>& args = d->process->args(); - QString s; - for( QValueList<QCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { + const TQValueList<TQCString>& args = d->process->args(); + TQString s; + for( TQValueList<TQCString>::const_iterator it = args.begin(); it != args.end(); ++it ) { s += *it + " "; } kdDebug() << s << flush << endl; @@ -249,7 +249,7 @@ bool K3bSoxEncoder::initEncoderInternal( const QString& extension ) } -long K3bSoxEncoder::encodeInternal( const char* data, Q_ULONG len ) +long K3bSoxEncoder::encodeInternal( const char* data, TQ_ULONG len ) { if( d->process ) { if( d->process->isRunning() ) @@ -262,15 +262,15 @@ long K3bSoxEncoder::encodeInternal( const char* data, Q_ULONG len ) } -void K3bSoxEncoder::slotSoxOutputLine( const QString& line ) +void K3bSoxEncoder::slotSoxOutputLine( const TQString& line ) { kdDebug() << "(sox) " << line << endl; } -QStringList K3bSoxEncoder::extensions() const +TQStringList K3bSoxEncoder::extensions() const { - static QStringList s_extensions; + static TQStringList s_extensions; if( s_extensions.isEmpty() ) { s_extensions << "au" << "8svx" @@ -296,11 +296,11 @@ QStringList K3bSoxEncoder::extensions() const if( k3bcore->externalBinManager()->foundBin( "sox" ) ) return s_extensions; else - return QStringList(); // no sox -> no encoding + return TQStringList(); // no sox -> no encoding } -QString K3bSoxEncoder::fileTypeComment( const QString& ext ) const +TQString K3bSoxEncoder::fileTypeComment( const TQString& ext ) const { if( ext == "au" ) return i18n("Sun AU"); @@ -345,7 +345,7 @@ QString K3bSoxEncoder::fileTypeComment( const QString& ext ) const } -long long K3bSoxEncoder::fileSize( const QString&, const K3b::Msf& msf ) const +long long K3bSoxEncoder::fileSize( const TQString&, const K3b::Msf& msf ) const { // for now we make a rough assumption based on the settings KConfig* c = k3bcore->config(); @@ -364,21 +364,21 @@ long long K3bSoxEncoder::fileSize( const QString&, const K3b::Msf& msf ) const } -K3bPluginConfigWidget* K3bSoxEncoder::createConfigWidget( QWidget* parent, +K3bPluginConfigWidget* K3bSoxEncoder::createConfigWidget( TQWidget* tqparent, const char* name ) const { - return new K3bSoxEncoderSettingsWidget( parent, name ); + return new K3bSoxEncoderSettingsWidget( tqparent, name ); } -K3bSoxEncoderSettingsWidget::K3bSoxEncoderSettingsWidget( QWidget* parent, const char* name ) - : K3bPluginConfigWidget( parent, name ) +K3bSoxEncoderSettingsWidget::K3bSoxEncoderSettingsWidget( TQWidget* tqparent, const char* name ) + : K3bPluginConfigWidget( tqparent, name ) { w = new base_K3bSoxEncoderConfigWidget( this ); - w->m_editSamplerate->setValidator( new QIntValidator( w->m_editSamplerate ) ); + w->m_editSamplerate->setValidator( new TQIntValidator( TQT_TQOBJECT(w->m_editSamplerate) ) ); - QHBoxLayout* lay = new QHBoxLayout( this ); + TQHBoxLayout* lay = new TQHBoxLayout( this ); lay->setMargin( 0 ); lay->addWidget( w ); @@ -401,9 +401,9 @@ void K3bSoxEncoderSettingsWidget::loadConfig() int channels = c->readNumEntry( "channels", 2 ); w->m_comboChannels->setCurrentItem( channels == 4 ? 2 : channels-1 ); - w->m_editSamplerate->setText( QString::number( c->readNumEntry( "samplerate", 44100 ) ) ); + w->m_editSamplerate->setText( TQString::number( c->readNumEntry( "samplerate", 44100 ) ) ); - QString encoding = c->readEntry( "data encoding", "signed" ); + TQString encoding = c->readEntry( "data encoding", "signed" ); if( encoding == "unsigned" ) w->m_comboEncoding->setCurrentItem(1); else if( encoding == "u-law" ) @@ -448,7 +448,7 @@ void K3bSoxEncoderSettingsWidget::saveConfig() c->writeEntry( "samplerate", w->m_editSamplerate->text().toInt() ); - QString enc; + TQString enc; switch( w->m_comboEncoding->currentItem() ) { case 1: enc = "unsigned"; diff --git a/plugins/encoder/sox/k3bsoxencoder.h b/plugins/encoder/sox/k3bsoxencoder.h index 555f44e..1a923c9 100644 --- a/plugins/encoder/sox/k3bsoxencoder.h +++ b/plugins/encoder/sox/k3bsoxencoder.h @@ -27,36 +27,37 @@ class KProcess; class K3bSoxEncoder : public K3bAudioEncoder { Q_OBJECT + TQ_OBJECT public: - K3bSoxEncoder( QObject* parent = 0, const char* name = 0 ); + K3bSoxEncoder( TQObject* tqparent = 0, const char* name = 0 ); ~K3bSoxEncoder(); - QStringList extensions() const; + TQStringList extensions() const; - QString fileTypeComment( const QString& ) const; + TQString fileTypeComment( const TQString& ) const; - long long fileSize( const QString&, const K3b::Msf& msf ) const; + long long fileSize( const TQString&, const K3b::Msf& msf ) const; int pluginSystemVersion() const { return 3; } - K3bPluginConfigWidget* createConfigWidget( QWidget* parent = 0, + K3bPluginConfigWidget* createConfigWidget( TQWidget* tqparent = 0, const char* name = 0 ) const; /** * reimplemented since sox writes the file itself */ - bool openFile( const QString& ext, const QString& filename, const K3b::Msf& ); + bool openFile( const TQString& ext, const TQString& filename, const K3b::Msf& ); void closeFile(); private slots: void slotSoxFinished( KProcess* ); - void slotSoxOutputLine( const QString& ); + void slotSoxOutputLine( const TQString& ); private: void finishEncoderInternal(); - bool initEncoderInternal( const QString& extension ); - long encodeInternal( const char* data, Q_ULONG len ); + bool initEncoderInternal( const TQString& extension ); + long encodeInternal( const char* data, TQ_ULONG len ); class Private; Private* d; @@ -66,9 +67,10 @@ class K3bSoxEncoder : public K3bAudioEncoder class K3bSoxEncoderSettingsWidget : public K3bPluginConfigWidget { Q_OBJECT + TQ_OBJECT public: - K3bSoxEncoderSettingsWidget( QWidget* parent = 0, const char* name = 0 ); + K3bSoxEncoderSettingsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~K3bSoxEncoderSettingsWidget(); public slots: |