Qt4: get rid of qta in favor of qtu

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index a7d8b967cc17b951dfbb51c4270cadd483b2d8be..339ef03fc92552bd2a27285059d987392e0d8965 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -396,7 +396,7 @@ void OpenDialog::updateMRL() {
     if( ui.slaveCheckbox->isChecked() ) {
         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() ) {
         mrl += QString( " :%1=%2" ).arg( storedMethod ).
                                   arg( ui.cacheSpinBox->value() );
@@ -412,7 +412,7 @@ void OpenDialog::newCachingMethod( QString method )
 {
     if( method != storedMethod ) {
         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 );
     }
 }

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index b2495b9b96825d67eb6be69e159b25da73d2021f..56e11615e106fc61fa81d7d061841702ac313277 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -137,7 +137,7 @@ public:
 
         if( !value.isEmpty() )
         {
-            char *psz = config_StringEscape( qta(value) );
+            char *psz = config_StringEscape( qtu(value) );
             if( psz )
             {
                 QString v = QString( psz );
@@ -339,7 +339,7 @@ void SoutDialog::setOptions()
 {
     QString profileString =
         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;
 
 #define setProfile( muxName, hasVideo, vCodecName, hasAudio, aCodecName ) \
@@ -497,7 +497,7 @@ void SoutDialog::updateMRL()
     sout.i_ab = ui.aBitrateSpin->value();
     sout.i_vb = ui.vBitrateSpin->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_name = strdup( qtu( ui.sapName->text() ) );
 

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 591158d979c93c4d4657d2f5df085ea0af88541d..45d116bbaed4e561515ce80fcb20f31f13b75dbc 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -85,7 +85,6 @@ struct intf_sys_t
 #define qfu( i ) QString::fromUtf8( i )
 #define qtr( i ) QString::fromUtf8( _(i) )
 #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 BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )