Skip to content

V
vlc-2-2
Commit c49da8a2 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: QString::number is more maintainable than QString("%1").arg syntax

parent 319a10e6
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
modules/gui/qt4/components/open_panels.cpp
View file @ c49da8a2
...@@ -1047,12 +1047,12 @@ void CaptureOpenPanel::updateMRL() ...@@ -1047,12 +1047,12 @@ void CaptureOpenPanel::updateMRL()
else return; else return;
fileList << mrl; mrl = ""; fileList << mrl; mrl = "";
mrl += " :dvb-frequency=" + QString("%1").arg( bdaFreq->value() ); mrl += " :dvb-frequency=" + QString::number( bdaFreq->value() );
if( bdas->isChecked() || bdac->isChecked() ) if( bdas->isChecked() || bdac->isChecked() )
mrl += " :dvb-srate=" + QString("%1").arg( bdaSrate->value() ); mrl += " :dvb-srate=" + QString::number( bdaSrate->value() );
else if( bdat->isChecked() ) else if( bdat->isChecked() )
mrl += " :dvb-bandwidth=" + mrl += " :dvb-bandwidth=" +
QString("%1").arg( bdaBandBox->itemData( QString::number( bdaBandBox->itemData(
bdaBandBox->currentIndex() ).toInt() ); bdaBandBox->currentIndex() ).toInt() );
break; break;
case DSHOW_DEVICE: case DSHOW_DEVICE:
...@@ -1069,22 +1069,22 @@ void CaptureOpenPanel::updateMRL() ...@@ -1069,22 +1069,22 @@ void CaptureOpenPanel::updateMRL()
fileList << "v4l://"; fileList << "v4l://";
mrl += " :v4l-vdev=" + v4lVideoDevice->text(); mrl += " :v4l-vdev=" + v4lVideoDevice->text();
mrl += " :v4l-adev=" + v4lAudioDevice->text(); mrl += " :v4l-adev=" + v4lAudioDevice->text();
mrl += " :v4l-norm=" + QString("%1").arg( v4lNormBox->currentIndex() ); mrl += " :v4l-norm=" + QString::number( v4lNormBox->currentIndex() );
mrl += " :v4l-frequency=" + QString("%1").arg( v4lFreq->value() ); mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() );
break; break;
case V4L2_DEVICE: case V4L2_DEVICE:
fileList << "v4l2://"; fileList << "v4l2://";
mrl += " :v4l2-dev=" + v4l2VideoDevice->text(); mrl += " :v4l2-dev=" + v4l2VideoDevice->text();
mrl += " :v4l2-adev=" + v4l2AudioDevice->text(); mrl += " :v4l2-adev=" + v4l2AudioDevice->text();
mrl += " :v4l2-standard=" + QString("%1").arg( v4l2StdBox->currentIndex() ); mrl += " :v4l2-standard=" + QString::number( v4l2StdBox->currentIndex() );
break; break;
case JACK_DEVICE: case JACK_DEVICE:
mrl = "jack://"; mrl = "jack://";
mrl += "channels=" + QString("%1").arg( jackChannels->value() ); mrl += "channels=" + QString::number( jackChannels->value() );
mrl += ":ports=" + jackPortsSelected->text(); mrl += ":ports=" + jackPortsSelected->text();
fileList << mrl; mrl = ""; fileList << mrl; mrl = "";
mrl += " :jack-input-caching=" + QString("%1").arg( jackCaching->value() ); mrl += " :jack-input-caching=" + QString::number( jackCaching->value() );
if ( jackPace->isChecked() ) if ( jackPace->isChecked() )
{ {
mrl += " :jack-input-use-vlc-pace"; mrl += " :jack-input-use-vlc-pace";
...@@ -1098,22 +1098,22 @@ void CaptureOpenPanel::updateMRL() ...@@ -1098,22 +1098,22 @@ void CaptureOpenPanel::updateMRL()
fileList << "pvr://"; fileList << "pvr://";
mrl += " :pvr-device=" + pvrDevice->text(); mrl += " :pvr-device=" + pvrDevice->text();
mrl += " :pvr-radio-device=" + pvrRadioDevice->text(); mrl += " :pvr-radio-device=" + pvrRadioDevice->text();
mrl += " :pvr-norm=" + QString("%1").arg( pvrNormBox->currentIndex() ); mrl += " :pvr-norm=" + QString::number( pvrNormBox->currentIndex() );
if( pvrFreq->value() ) if( pvrFreq->value() )
mrl += " :pvr-frequency=" + QString("%1").arg( pvrFreq->value() ); mrl += " :pvr-frequency=" + QString::number( pvrFreq->value() );
if( pvrBitr->value() ) if( pvrBitr->value() )
mrl += " :pvr-bitrate=" + QString("%1").arg( pvrBitr->value() ); mrl += " :pvr-bitrate=" + QString::number( pvrBitr->value() );
break; break;
case DVB_DEVICE: case DVB_DEVICE:
fileList << "dvb://"; fileList << "dvb://";
mrl += " :dvb-adapter=" + QString("%1").arg( dvbCard->value() ); mrl += " :dvb-adapter=" + QString::number( dvbCard->value() );
mrl += " :dvb-frequency=" + QString("%1").arg( dvbFreq->value() ); mrl += " :dvb-frequency=" + QString::number( dvbFreq->value() );
mrl += " :dvb-srate=" + QString("%1").arg( dvbSrate->value() ); mrl += " :dvb-srate=" + QString::number( dvbSrate->value() );
break; break;
#endif #endif
case SCREEN_DEVICE: case SCREEN_DEVICE:
fileList << "screen://"; fileList << "screen://";
mrl = " :screen-fps=" + QString("%1").arg( screenFPS->value() ); mrl = " :screen-fps=" + QString::number( screenFPS->value() );
updateButtons(); updateButtons();
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment