Commit 18eb8839 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: get rid of qta in favor of qtu

parent a19acf0b
...@@ -396,7 +396,7 @@ void OpenDialog::updateMRL() { ...@@ -396,7 +396,7 @@ void OpenDialog::updateMRL() {
if( ui.slaveCheckbox->isChecked() ) { if( ui.slaveCheckbox->isChecked() ) {
mrl += " :input-slave=" + ui.slaveText->text(); mrl += " :input-slave=" + ui.slaveText->text();
} }
int i_cache = config_GetInt( p_intf, qta( storedMethod ) ); int i_cache = config_GetInt( p_intf, qtu( storedMethod ) );
if( i_cache != ui.cacheSpinBox->value() ) { if( i_cache != ui.cacheSpinBox->value() ) {
mrl += QString( " :%1=%2" ).arg( storedMethod ). mrl += QString( " :%1=%2" ).arg( storedMethod ).
arg( ui.cacheSpinBox->value() ); arg( ui.cacheSpinBox->value() );
...@@ -412,7 +412,7 @@ void OpenDialog::newCachingMethod( QString method ) ...@@ -412,7 +412,7 @@ void OpenDialog::newCachingMethod( QString method )
{ {
if( method != storedMethod ) { if( method != storedMethod ) {
storedMethod = method; storedMethod = method;
int i_value = config_GetInt( p_intf, qta( storedMethod ) ); int i_value = config_GetInt( p_intf, qtu( storedMethod ) );
ui.cacheSpinBox->setValue( i_value ); ui.cacheSpinBox->setValue( i_value );
} }
} }
......
...@@ -137,7 +137,7 @@ public: ...@@ -137,7 +137,7 @@ public:
if( !value.isEmpty() ) if( !value.isEmpty() )
{ {
char *psz = config_StringEscape( qta(value) ); char *psz = config_StringEscape( qtu(value) );
if( psz ) if( psz )
{ {
QString v = QString( psz ); QString v = QString( psz );
...@@ -339,7 +339,7 @@ void SoutDialog::setOptions() ...@@ -339,7 +339,7 @@ void SoutDialog::setOptions()
{ {
QString profileString = QString profileString =
ui.profileBox->itemData( ui.profileBox->currentIndex() ).toString(); ui.profileBox->itemData( ui.profileBox->currentIndex() ).toString();
msg_Dbg( p_intf, "Profile Used: %s", qta( profileString )); msg_Dbg( p_intf, "Profile Used: %s", qtu( profileString ));
int index; int index;
#define setProfile( muxName, hasVideo, vCodecName, hasAudio, aCodecName ) \ #define setProfile( muxName, hasVideo, vCodecName, hasAudio, aCodecName ) \
...@@ -497,7 +497,7 @@ void SoutDialog::updateMRL() ...@@ -497,7 +497,7 @@ void SoutDialog::updateMRL()
sout.i_ab = ui.aBitrateSpin->value(); sout.i_ab = ui.aBitrateSpin->value();
sout.i_vb = ui.vBitrateSpin->value(); sout.i_vb = ui.vBitrateSpin->value();
sout.i_channels = ui.aChannelsSpin->value(); sout.i_channels = ui.aChannelsSpin->value();
sout.f_scale = atof( qta( ui.vScaleBox->currentText() ) ); sout.f_scale = atof( qtu( ui.vScaleBox->currentText() ) );
sout.psz_group = strdup( qtu( ui.sapGroup->text() ) ); sout.psz_group = strdup( qtu( ui.sapGroup->text() ) );
sout.psz_name = strdup( qtu( ui.sapName->text() ) ); sout.psz_name = strdup( qtu( ui.sapName->text() ) );
......
...@@ -85,7 +85,6 @@ struct intf_sys_t ...@@ -85,7 +85,6 @@ struct intf_sys_t
#define qfu( i ) QString::fromUtf8( i ) #define qfu( i ) QString::fromUtf8( i )
#define qtr( i ) QString::fromUtf8( _(i) ) #define qtr( i ) QString::fromUtf8( _(i) )
#define qtu( i ) ((i).toUtf8().constData()) #define qtu( i ) ((i).toUtf8().constData())
#define qta( i ) ((i).toAscii().constData())
#define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) ) #define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
#define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) ) #define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
......
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