diff options
Diffstat (limited to 'plugins')
17 files changed, 73 insertions, 73 deletions
diff --git a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp index 3e97cda..64ef721 100644 --- a/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp +++ b/plugins/audiooutput/alsa/k3balsaoutputplugin.cpp @@ -25,7 +25,7 @@ #include <kconfig.h> #include <kdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <alsa/asoundlib.h> @@ -109,7 +109,7 @@ bool K3bAlsaOutputPlugin::recoverFromError( int err ) if( err == -EPIPE ) { err = snd_pcm_prepare( d->pcm_playback ); if( err < 0 ) { - d->lastErrorMessage = i18n("Internal Alsa problem: %1").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Internal Alsa problem: %1").arg(snd_strerror(err)); return false; } } @@ -121,7 +121,7 @@ bool K3bAlsaOutputPlugin::recoverFromError( int err ) // unable to wake up pcm device, restart it err = snd_pcm_prepare( d->pcm_playback ); if( err < 0 ) { - d->lastErrorMessage = i18n("Internal Alsa problem: %1").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Internal Alsa problem: %1").arg(snd_strerror(err)); return false; } } @@ -153,7 +153,7 @@ bool K3bAlsaOutputPlugin::init() int err = snd_pcm_open( &d->pcm_playback, alsaDevice.local8Bit(), SND_PCM_STREAM_PLAYBACK, 0 ); if( err < 0 ) { - d->lastErrorMessage = i18n("Could not open alsa audio device '%1' (%2).").tqarg(alsaDevice).tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not open alsa audio device '%1' (%2).").arg(alsaDevice).arg(snd_strerror(err)); d->error = true; return false; } @@ -174,20 +174,20 @@ bool K3bAlsaOutputPlugin::setupHwParams() int err = 0; if( ( err = snd_pcm_hw_params_malloc( &hw_params ) ) < 0 ) { - d->lastErrorMessage = i18n("Could not allocate hardware parameter structure (%1)").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not allocate hardware parameter structure (%1)").arg(snd_strerror(err)); d->error = true; return false; } if( (err = snd_pcm_hw_params_any( d->pcm_playback, hw_params )) < 0) { - d->lastErrorMessage = i18n("Could not initialize hardware parameter structure (%1).").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not initialize hardware parameter structure (%1).").arg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; } if( (err = snd_pcm_hw_params_set_access( d->pcm_playback, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) { - d->lastErrorMessage = i18n("Could not set access type (%1).").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set access type (%1).").arg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; @@ -195,7 +195,7 @@ bool K3bAlsaOutputPlugin::setupHwParams() if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_BE)) < 0) { if( (err = snd_pcm_hw_params_set_format( d->pcm_playback, hw_params, SND_PCM_FORMAT_S16_LE)) < 0) { - d->lastErrorMessage = i18n("Could not set sample format (%1).").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set sample format (%1).").arg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; @@ -208,7 +208,7 @@ bool K3bAlsaOutputPlugin::setupHwParams() d->sampleRate = 44100; if( (err = snd_pcm_hw_params_set_rate_near( d->pcm_playback, hw_params, &d->sampleRate, 0)) < 0) { - d->lastErrorMessage = i18n("Could not set sample rate (%1).").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set sample rate (%1).").arg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; @@ -217,14 +217,14 @@ bool K3bAlsaOutputPlugin::setupHwParams() kdDebug() << "(K3bAlsaOutputPlugin) samplerate set to " << d->sampleRate << endl; if( (err = snd_pcm_hw_params_set_channels( d->pcm_playback, hw_params, 2)) < 0) { - d->lastErrorMessage = i18n("Could not set channel count (%1).").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set channel count (%1).").arg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; } if( (err = snd_pcm_hw_params( d->pcm_playback, hw_params )) < 0) { - d->lastErrorMessage = i18n("Could not set parameters (%1).").tqarg(snd_strerror(err)); + d->lastErrorMessage = i18n("Could not set parameters (%1).").arg(snd_strerror(err)); snd_pcm_hw_params_free( hw_params ); d->error = true; return false; diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp index 40a61c9..7177071 100644 --- a/plugins/decoder/flac/k3bflacdecoder.cpp +++ b/plugins/decoder/flac/k3bflacdecoder.cpp @@ -394,9 +394,9 @@ TQString K3bFLACDecoder::technicalInfo( const TQString& info ) const else if( info == i18n("Channels") ) return TQString::number(d->channels); else if( info == i18n("Sampling Rate") ) - return i18n("%1 Hz").tqarg(d->rate); + return i18n("%1 Hz").arg(d->rate); else if( info == i18n("Sample Size") ) - return i18n("%1 bits").tqarg(d->bitsPerSample); + return i18n("%1 bits").arg(d->bitsPerSample); } return TQString(); diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp index 8532da9..8103b44 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp @@ -125,7 +125,7 @@ bool K3bLibsndfileDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerat addMetaInfo( META_COMMENT, sf_get_string(d->sndfile, SF_STR_COMMENT) ); addTechnicalInfo( i18n("Channels"), TQString::number(d->sndinfo.channels) ); - addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").tqarg(d->sndinfo.samplerate) ); + addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").arg(d->sndinfo.samplerate) ); frames = (unsigned long)ceil(d->sndinfo.frames / d->sndinfo.samplerate * 75.0); samplerate = d->sndinfo.samplerate; diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp index 9fe9b15..951caa2 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.cpp +++ b/plugins/decoder/mp3/k3bmaddecoder.cpp @@ -415,12 +415,12 @@ TQString K3bMadDecoder::technicalInfo( const TQString& name ) const } } else if( name == i18n("Sampling Rate") ) - return i18n("%1 Hz").tqarg(d->firstHeader.samplerate); + return i18n("%1 Hz").arg(d->firstHeader.samplerate); else if( name == i18n("Bitrate") ) { if( d->vbr ) return i18n("VBR"); else - return i18n("%1 bps").tqarg(d->firstHeader.bitrate); + return i18n("%1 bps").arg(d->firstHeader.bitrate); } else if( name == i18n("Layer") ){ switch( d->firstHeader.layer ) { diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp index b48a85d..717c1a2 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.cpp +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.cpp @@ -120,13 +120,13 @@ bool K3bOggVorbisDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate // add technical infos addTechnicalInfo( i18n("Version"), TQString::number(d->vInfo->version) ); addTechnicalInfo( i18n("Channels"), TQString::number(d->vInfo->channels) ); - addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").tqarg(d->vInfo->rate) ); + addTechnicalInfo( i18n("Sampling Rate"), i18n("%1 Hz").arg(d->vInfo->rate) ); if( d->vInfo->bitrate_upper > 0 ) - addTechnicalInfo( i18n("Bitrate Upper"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_upper) ); + addTechnicalInfo( i18n("Bitrate Upper"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_upper) ); if( d->vInfo->bitrate_nominal > 0 ) - addTechnicalInfo( i18n("Bitrate Nominal"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_nominal) ); + addTechnicalInfo( i18n("Bitrate Nominal"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_nominal) ); if( d->vInfo->bitrate_lower > 0 ) - addTechnicalInfo( i18n("Bitrate Lower"), i18n( "%1 bps" ).tqarg(d->vInfo->bitrate_lower) ); + addTechnicalInfo( i18n("Bitrate Lower"), i18n( "%1 bps" ).arg(d->vInfo->bitrate_lower) ); frames = K3b::Msf::fromSeconds(seconds); samplerate = d->vInfo->rate; diff --git a/plugins/decoder/wave/k3bwavedecoder.cpp b/plugins/decoder/wave/k3bwavedecoder.cpp index 1c0fd57..28f873a 100644 --- a/plugins/decoder/wave/k3bwavedecoder.cpp +++ b/plugins/decoder/wave/k3bwavedecoder.cpp @@ -350,9 +350,9 @@ TQString K3bWaveDecoder::technicalInfo( const TQString& name ) const if( name == i18n("Channels") ) return TQString::number(d->channels); else if( name == i18n("Sampling Rate") ) - return i18n("%1 Hz").tqarg(d->sampleRate); + return i18n("%1 Hz").arg(d->sampleRate); else if( name == i18n("Sample Size") ) - return i18n("%1 bits").tqarg(d->sampleSize); + return i18n("%1 bits").arg(d->sampleSize); else return TQString(); } diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui index 5c69fec..1f61071 100644 --- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui +++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui @@ -88,7 +88,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp index 7f54bf9..2290012 100644 --- a/plugins/encoder/external/k3bexternalencoder.cpp +++ b/plugins/encoder/external/k3bexternalencoder.cpp @@ -242,7 +242,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension ) kdDebug() << s << flush << endl; // set one general error message - setLastError( i18n("Command failed: %1").tqarg( s ) ); + setLastError( i18n("Command failed: %1").arg( s ) ); if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) { if( d->cmd.writeWaveHeader ) @@ -253,7 +253,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension ) else { TQString commandName = d->cmd.command.section( TQRegExp("\\s+"), 0 ); if( !KStandardDirs::findExe( commandName ).isEmpty() ) - setLastError( i18n("Could not find program '%1'").tqarg(commandName) ); + setLastError( i18n("Could not find program '%1'").arg(commandName) ); return false; } diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp index 7f2b289..1628d8c 100644 --- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp +++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp @@ -18,7 +18,7 @@ #include <k3bcore.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> diff --git a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui index d7ed073..a874760 100644 --- a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui +++ b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -77,7 +77,7 @@ <property name="text"> <string>textLabel1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -125,7 +125,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -143,7 +143,7 @@ <property name="text"> <string>high quality</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -200,7 +200,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -229,7 +229,7 @@ <property name="text"> <string>textLabel2</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -237,7 +237,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -259,7 +259,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>5</height> @@ -326,7 +326,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -360,7 +360,7 @@ <property name="text"> <string>high quality</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui index f22ad76..9df1c17 100644 --- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui +++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui @@ -43,7 +43,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp index 8946f19..9abfa37 100644 --- a/plugins/encoder/lame/k3blameencoder.cpp +++ b/plugins/encoder/lame/k3blameencoder.cpp @@ -28,14 +28,14 @@ #include <kcombobox.h> #include <kdialogbase.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcstring.h> #include <tqradiobutton.h> #include <tqcheckbox.h> #include <tqspinbox.h> #include <tqgroupbox.h> #include <tqbuttongroup.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqfile.h> #include <tqslider.h> #include <tqlabel.h> @@ -411,13 +411,13 @@ K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* parent, co m_manualSettingsDlg->setMainWidget( m_brW ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); + m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); + m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); for( int i = 0; s_lame_bitrates[i]; ++i ) - m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) ); + m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) ); TQHBoxLayout* lay = new TQHBoxLayout( this ); @@ -469,11 +469,11 @@ void K3bLameEncoderSettingsWidget::updateManualSettingsLabel() { if( m_brW->m_radioConstantBitrate->isChecked() ) m_w->m_labelManualSettings->setText( i18n("Constant Bitrate: %1 kbps (%2)") - .tqarg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()]) - .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); + .arg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()]) + .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); else m_w->m_labelManualSettings->setText( i18n("Variable Bitrate (%1)") - .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); + .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) ); } @@ -507,9 +507,9 @@ void K3bLameEncoderSettingsWidget::loadConfig() else m_brW->m_radioConstantBitrate->setChecked( true ); - 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_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_spinAverageBitrate->setValue( c->readNumEntry( "Average Bitrate", 128) ); m_brW->m_checkBitrateMaximum->setChecked( c->readBoolEntry( "Use Maximum Bitrate", false ) ); diff --git a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui index d0a6f2d..a76c3c5 100644 --- a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui +++ b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -68,7 +68,7 @@ <property name="text"> <string>textLabel1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -110,7 +110,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -148,7 +148,7 @@ <property name="text"> <string>high quality</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -196,7 +196,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp index 7878497..685d9e0 100644 --- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp +++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <knuminput.h> -#include <tqlayout.h> +#include <layout.h> #include <tqradiobutton.h> #include <tqslider.h> #include <tqlcdnumber.h> @@ -470,7 +470,7 @@ K3bOggVorbisEncoderSettingsWidget::~K3bOggVorbisEncoderSettingsWidget() void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val ) { w->m_labelQualityLevel->setText( TQString::number(val) + " " - + i18n("(targetted VBR of %1)").tqarg(s_rough_average_quality_level_bitrates[val+1]) ); + + i18n("(targetted VBR of %1)").arg(s_rough_average_quality_level_bitrates[val+1]) ); } diff --git a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui index 332dce0..ce874d3 100644 --- a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui +++ b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui @@ -30,7 +30,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> @@ -55,7 +55,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>250</width> <height>16</height> diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp index ee69541..674091b 100644 --- a/plugins/encoder/sox/k3bsoxencoder.cpp +++ b/plugins/encoder/sox/k3bsoxencoder.cpp @@ -33,7 +33,7 @@ #include <tqlineedit.h> #include <tqcombobox.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <sys/types.h> #include <sys/wait.h> diff --git a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp index 5211b36..bc210a6 100644 --- a/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp +++ b/plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp @@ -46,7 +46,7 @@ #include <tqwhatsthis.h> #include <tqpair.h> #include <tqvaluelist.h> -#include <tqlayout.h> +#include <layout.h> #include <tqptrdict.h> @@ -104,7 +104,7 @@ K3bAudioMetainfoRenamerPluginWidget::K3bAudioMetainfoRenamerPluginWidget( K3bDoc d->viewFiles->addColumn( i18n("Old Name") ); d->viewFiles->setNoItemText( i18n("Please click the Scan button to search for renameable files.") ); - // tqlayout + // layout TQVBoxLayout* box = new TQVBoxLayout( this ); box->setMargin( 0 ); box->setSpacing( KDialog::spacingHint() ); @@ -203,7 +203,7 @@ void K3bAudioMetainfoRenamerPluginWidget::scanDir( K3bDirItem* dir, TQListViewIt d->dirItemDict.insert( dir, viewRoot ); - for( TQPtrListIterator<K3bDataItem> it( dir->tqchildren() ); it.current(); ++it ) { + for( TQPtrListIterator<K3bDataItem> it( dir->children() ); it.current(); ++it ) { K3bDataItem* item = it.current(); if( item->isFile() ) { @@ -334,9 +334,9 @@ TQString K3bAudioMetainfoRenamerPluginWidget::createNewName( K3bFileItem* item ) kdDebug() << "(K3bAudioMetainfoRenamerPluginWidget) file with name " << newName << extension << " already exists" << endl; int i = 1; - while( existsOtherItemWithSameName( item, newName + TQString( " (%1)").tqarg(i) + extension ) ) + while( existsOtherItemWithSameName( item, newName + TQString( " (%1)").arg(i) + extension ) ) i++; - newName.append( TQString( " (%1)").tqarg(i) ); + newName.append( TQString( " (%1)").arg(i) ); } // append extension |